Skip to content

Commit 4371548

Browse files
author
mhugent
committed
Replaced activated signal with triggered signal in composer to get rid of qt3 support issues
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10985 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent cb90ab4 commit 4371548

File tree

2 files changed

+57
-57
lines changed

2 files changed

+57
-57
lines changed

src/app/composer/qgscomposer.cpp

+29-29
Original file line numberDiff line numberDiff line change
@@ -400,36 +400,36 @@ void QgsComposer::zoomFull( void )
400400
}
401401
}
402402

403-
void QgsComposer::on_mActionZoomAll_activated( void )
403+
void QgsComposer::on_mActionZoomAll_triggered()
404404
{
405405
zoomFull();
406406
mView->update();
407407
emit zoomLevelChanged();
408408
}
409409

410-
void QgsComposer::on_mActionZoomIn_activated( void )
410+
void QgsComposer::on_mActionZoomIn_triggered()
411411
{
412412
mView->scale( 2, 2 );
413413
mView->update();
414414
emit zoomLevelChanged();
415415
}
416416

417-
void QgsComposer::on_mActionZoomOut_activated( void )
417+
void QgsComposer::on_mActionZoomOut_triggered()
418418
{
419419
mView->scale( .5, .5 );
420420
mView->update();
421421
emit zoomLevelChanged();
422422
}
423423

424-
void QgsComposer::on_mActionRefreshView_activated( void )
424+
void QgsComposer::on_mActionRefreshView_triggered()
425425
{
426426
if ( mComposition )
427427
{
428428
mComposition->update();
429429
}
430430
}
431431

432-
void QgsComposer::on_mActionPrint_activated( void )
432+
void QgsComposer::on_mActionPrint_triggered()
433433
{
434434
if ( !mComposition )
435435
{
@@ -508,7 +508,7 @@ void QgsComposer::on_mActionPrint_activated( void )
508508
}
509509
}
510510

511-
void QgsComposer::on_mActionExportAsImage_activated( void )
511+
void QgsComposer::on_mActionExportAsImage_triggered()
512512
{
513513
if ( containsWMSLayer() )
514514
{
@@ -633,7 +633,7 @@ void QgsComposer::on_mActionExportAsImage_activated( void )
633633
}
634634

635635

636-
void QgsComposer::on_mActionExportAsSVG_activated( void )
636+
void QgsComposer::on_mActionExportAsSVG_triggered()
637637
{
638638
if ( containsWMSLayer() )
639639
{
@@ -718,55 +718,55 @@ void QgsComposer::on_mActionExportAsSVG_activated( void )
718718
#endif
719719
}
720720

721-
void QgsComposer::on_mActionSelectMoveItem_activated( void )
721+
void QgsComposer::on_mActionSelectMoveItem_triggered()
722722
{
723723
if ( mView )
724724
{
725725
mView->setCurrentTool( QgsComposerView::Select );
726726
}
727727
}
728728

729-
void QgsComposer::on_mActionAddNewMap_activated( void )
729+
void QgsComposer::on_mActionAddNewMap_triggered()
730730
{
731731
if ( mView )
732732
{
733733
mView->setCurrentTool( QgsComposerView::AddMap );
734734
}
735735
}
736736

737-
void QgsComposer::on_mActionAddNewLegend_activated( void )
737+
void QgsComposer::on_mActionAddNewLegend_triggered()
738738
{
739739
if ( mView )
740740
{
741741
mView->setCurrentTool( QgsComposerView::AddLegend );
742742
}
743743
}
744744

745-
void QgsComposer::on_mActionAddNewLabel_activated( void )
745+
void QgsComposer::on_mActionAddNewLabel_triggered()
746746
{
747747
if ( mView )
748748
{
749749
mView->setCurrentTool( QgsComposerView::AddLabel );
750750
}
751751
}
752752

753-
void QgsComposer::on_mActionAddNewScalebar_activated( void )
753+
void QgsComposer::on_mActionAddNewScalebar_triggered()
754754
{
755755
if ( mView )
756756
{
757757
mView->setCurrentTool( QgsComposerView::AddScalebar );
758758
}
759759
}
760760

761-
void QgsComposer::on_mActionAddImage_activated( void )
761+
void QgsComposer::on_mActionAddImage_triggered()
762762
{
763763
if ( mView )
764764
{
765765
mView->setCurrentTool( QgsComposerView::AddPicture );
766766
}
767767
}
768768

769-
void QgsComposer::on_mActionSaveAsTemplate_activated( void )
769+
void QgsComposer::on_mActionSaveAsTemplate_triggered()
770770
{
771771
//show file dialog
772772
QSettings settings;
@@ -801,7 +801,7 @@ void QgsComposer::on_mActionSaveAsTemplate_activated( void )
801801
}
802802
}
803803

804-
void QgsComposer::on_mActionLoadFromTemplate_activated( void )
804+
void QgsComposer::on_mActionLoadFromTemplate_triggered()
805805
{
806806
QSettings settings;
807807
QString openFileDir = settings.value( "UI/lastComposerTemplateDir", "" ).toString();
@@ -835,103 +835,103 @@ void QgsComposer::on_mActionLoadFromTemplate_activated( void )
835835
cleanupAfterTemplateRead();
836836
}
837837

838-
void QgsComposer::on_mActionMoveItemContent_activated( void )
838+
void QgsComposer::on_mActionMoveItemContent_triggered()
839839
{
840840
if ( mView )
841841
{
842842
mView->setCurrentTool( QgsComposerView::MoveItemContent );
843843
}
844844
}
845845

846-
void QgsComposer::on_mActionGroupItems_activated( void )
846+
void QgsComposer::on_mActionGroupItems_triggered()
847847
{
848848
if ( mView )
849849
{
850850
mView->groupItems();
851851
}
852852
}
853853

854-
void QgsComposer::on_mActionUngroupItems_activated( void )
854+
void QgsComposer::on_mActionUngroupItems_triggered()
855855
{
856856
if ( mView )
857857
{
858858
mView->ungroupItems();
859859
}
860860
}
861861

862-
void QgsComposer::on_mActionRaiseItems_activated( void )
862+
void QgsComposer::on_mActionRaiseItems_triggered()
863863
{
864864
if ( mComposition )
865865
{
866866
mComposition->raiseSelectedItems();
867867
}
868868
}
869869

870-
void QgsComposer::on_mActionLowerItems_activated( void )
870+
void QgsComposer::on_mActionLowerItems_triggered()
871871
{
872872
if ( mComposition )
873873
{
874874
mComposition->lowerSelectedItems();
875875
}
876876
}
877877

878-
void QgsComposer::on_mActionMoveItemsToTop_activated( void )
878+
void QgsComposer::on_mActionMoveItemsToTop_triggered()
879879
{
880880
if ( mComposition )
881881
{
882882
mComposition->moveSelectedItemsToTop();
883883
}
884884
}
885885

886-
void QgsComposer::on_mActionMoveItemsToBottom_activated( void )
886+
void QgsComposer::on_mActionMoveItemsToBottom_triggered()
887887
{
888888
if ( mComposition )
889889
{
890890
mComposition->moveSelectedItemsToBottom();
891891
}
892892
}
893893

894-
void QgsComposer::on_mActionAlignLeft_activated( void )
894+
void QgsComposer::on_mActionAlignLeft_triggered()
895895
{
896896
if ( mComposition )
897897
{
898898
mComposition->alignSelectedItemsLeft();
899899
}
900900
}
901901

902-
void QgsComposer::on_mActionAlignHCenter_activated( void )
902+
void QgsComposer::on_mActionAlignHCenter_triggered()
903903
{
904904
if ( mComposition )
905905
{
906906
mComposition->alignSelectedItemsHCenter();
907907
}
908908
}
909909

910-
void QgsComposer::on_mActionAlignRight_activated( void )
910+
void QgsComposer::on_mActionAlignRight_triggered()
911911
{
912912
if ( mComposition )
913913
{
914914
mComposition->alignSelectedItemsRight();
915915
}
916916
}
917917

918-
void QgsComposer::on_mActionAlignTop_activated( void )
918+
void QgsComposer::on_mActionAlignTop_triggered()
919919
{
920920
if ( mComposition )
921921
{
922922
mComposition->alignSelectedItemsTop();
923923
}
924924
}
925925

926-
void QgsComposer::on_mActionAlignVCenter_activated( void )
926+
void QgsComposer::on_mActionAlignVCenter_triggered()
927927
{
928928
if ( mComposition )
929929
{
930930
mComposition->alignSelectedItemsVCenter();
931931
}
932932
}
933933

934-
void QgsComposer::on_mActionAlignBottom_activated( void )
934+
void QgsComposer::on_mActionAlignBottom_triggered()
935935
{
936936
if ( mComposition )
937937
{
@@ -1231,7 +1231,7 @@ void QgsComposer::deleteItem( QgsComposerItem* item )
12311231
void QgsComposer::setSelectionTool()
12321232
{
12331233
mActionSelectMoveItem->setChecked( true );
1234-
on_mActionSelectMoveItem_activated();
1234+
on_mActionSelectMoveItem_triggered();
12351235
}
12361236

12371237
bool QgsComposer::containsWMSLayer() const

src/app/composer/qgscomposer.h

+28-28
Original file line numberDiff line numberDiff line change
@@ -99,87 +99,87 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
9999

100100
public slots:
101101
//! Zoom to full extent of the paper
102-
void on_mActionZoomAll_activated( void );
102+
void on_mActionZoomAll_triggered();
103103

104104
//! Zoom in
105-
void on_mActionZoomIn_activated( void );
105+
void on_mActionZoomIn_triggered();
106106

107107
//! Zoom out
108-
void on_mActionZoomOut_activated( void );
108+
void on_mActionZoomOut_triggered();
109109

110110
//! Refresh view
111-
void on_mActionRefreshView_activated( void );
111+
void on_mActionRefreshView_triggered();
112112

113113
//! Print the composition
114-
void on_mActionPrint_activated( void );
114+
void on_mActionPrint_triggered();
115115

116116
//! Print as image
117-
void on_mActionExportAsImage_activated( void );
117+
void on_mActionExportAsImage_triggered();
118118

119119
//! Print as SVG
120-
void on_mActionExportAsSVG_activated( void );
120+
void on_mActionExportAsSVG_triggered();
121121

122122
//! Select item
123-
void on_mActionSelectMoveItem_activated( void );
123+
void on_mActionSelectMoveItem_triggered();
124124

125125
//! Add new map
126-
void on_mActionAddNewMap_activated( void );
126+
void on_mActionAddNewMap_triggered();
127127

128128
//! Add new legend
129-
void on_mActionAddNewLegend_activated( void );
129+
void on_mActionAddNewLegend_triggered();
130130

131131
//! Add new label
132-
void on_mActionAddNewLabel_activated( void );
132+
void on_mActionAddNewLabel_triggered();
133133

134134
//! Add new scalebar
135-
void on_mActionAddNewScalebar_activated( void );
135+
void on_mActionAddNewScalebar_triggered();
136136

137137
//! Add new picture
138-
void on_mActionAddImage_activated( void );
138+
void on_mActionAddImage_triggered();
139139

140140
//! Save composer as template
141-
void on_mActionSaveAsTemplate_activated( void );
141+
void on_mActionSaveAsTemplate_triggered();
142142

143-
void on_mActionLoadFromTemplate_activated( void );
143+
void on_mActionLoadFromTemplate_triggered();
144144

145145
//! Set tool to move item content
146-
void on_mActionMoveItemContent_activated( void );
146+
void on_mActionMoveItemContent_triggered();
147147

148148
//! Group selected items
149-
void on_mActionGroupItems_activated( void );
149+
void on_mActionGroupItems_triggered();
150150

151151
//! Ungroup selected item group
152-
void on_mActionUngroupItems_activated( void );
152+
void on_mActionUngroupItems_triggered();
153153

154154
//! Move selected items one position up
155-
void on_mActionRaiseItems_activated( void );
155+
void on_mActionRaiseItems_triggered();
156156

157157
//!Move selected items one position down
158-
void on_mActionLowerItems_activated( void );
158+
void on_mActionLowerItems_triggered();
159159

160160
//!Move selected items to top
161-
void on_mActionMoveItemsToTop_activated( void );
161+
void on_mActionMoveItemsToTop_triggered();
162162

163163
//!Move selected items to bottom
164-
void on_mActionMoveItemsToBottom_activated( void );
164+
void on_mActionMoveItemsToBottom_triggered();
165165

166166
//!Align selected composer items left
167-
void on_mActionAlignLeft_activated( void );
167+
void on_mActionAlignLeft_triggered();
168168

169169
//!Align selected composere items horizontally centered
170-
void on_mActionAlignHCenter_activated( void );
170+
void on_mActionAlignHCenter_triggered();
171171

172172
//!Align selected composer items right
173-
void on_mActionAlignRight_activated( void );
173+
void on_mActionAlignRight_triggered();
174174

175175
//!Align selected composer items to top
176-
void on_mActionAlignTop_activated( void );
176+
void on_mActionAlignTop_triggered();
177177

178178
//!Align selected composer items vertically centered
179-
void on_mActionAlignVCenter_activated( void );
179+
void on_mActionAlignVCenter_triggered();
180180

181181
//!Align selected composer items to bottom
182-
void on_mActionAlignBottom_activated( void );
182+
void on_mActionAlignBottom_triggered();
183183

184184
//! Save window state
185185
void saveWindowState();

0 commit comments

Comments
 (0)