Skip to content

Commit 4afdf55

Browse files
jef-njef-n
committed
fix signal/slot warnings
1 parent 1e21c5a commit 4afdf55

6 files changed

+28
-30
lines changed

‎src/app/qgsmaptoolsimplify.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ QgsSimplifyDialog::QgsSimplifyDialog( QgsMapToolSimplify* tool, QWidget* parent
3939
connect( spinTolerance, SIGNAL( valueChanged( double ) ), mTool, SLOT( setTolerance( double ) ) );
4040
connect( cboToleranceUnits, SIGNAL( currentIndexChanged( int ) ), mTool, SLOT( setToleranceUnits( int ) ) );
4141
connect( okButton, SIGNAL( clicked() ), mTool, SLOT( storeSimplified() ) );
42-
connect( this, SIGNAL( finished( int ) ), mTool, SLOT( removeRubberBand() ) );
43-
4442
}
4543

4644
void QgsSimplifyDialog::updateStatusText()

‎src/app/qgsrasterlayerproperties.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
8686

8787
QPushButton* b = new QPushButton( tr( "Style" ) );
8888
QMenu* m = new QMenu( this );
89-
m->addAction( tr( "Load Style..." ), this, SLOT( on_pbnLoadStyle_clicked() ) );
90-
m->addAction( tr( "Save Style..." ), this, SLOT( on_pbnSaveStyleAs_clicked() ) );
89+
m->addAction( tr( "Load Style..." ), this, SLOT( loadStyle_clicked() ) );
90+
m->addAction( tr( "Save Style..." ), this, SLOT( saveStyleAs_clicked() ) );
9191
m->addSeparator();
92-
m->addAction( tr( "Save As Default" ), this, SLOT( on_pbnSaveDefaultStyle_clicked() ) );
93-
m->addAction( tr( "Restore Default" ), this, SLOT( on_pbnLoadDefaultStyle_clicked() ) );
92+
m->addAction( tr( "Save As Default" ), this, SLOT( saveDefaultStyle_clicked() ) );
93+
m->addAction( tr( "Restore Default" ), this, SLOT( loadDefaultStyle_clicked() ) );
9494
b->setMenu( m );
9595
connect( m, SIGNAL( aboutToShow() ), this, SLOT( aboutToShowStyleMenu() ) );
9696
buttonBox->addButton( b, QDialogButtonBox::ResetRole );
@@ -1633,7 +1633,7 @@ QLinearGradient QgsRasterLayerProperties::highlightGradient()
16331633
// Next four methods for saving and restoring qml style state
16341634
//
16351635
//
1636-
void QgsRasterLayerProperties::on_pbnLoadDefaultStyle_clicked()
1636+
void QgsRasterLayerProperties::loadDefaultStyle_clicked()
16371637
{
16381638
bool defaultLoadedFlag = false;
16391639
QString myMessage = mRasterLayer->loadDefaultStyle( defaultLoadedFlag );
@@ -1652,7 +1652,7 @@ void QgsRasterLayerProperties::on_pbnLoadDefaultStyle_clicked()
16521652
}
16531653
}
16541654

1655-
void QgsRasterLayerProperties::on_pbnSaveDefaultStyle_clicked()
1655+
void QgsRasterLayerProperties::saveDefaultStyle_clicked()
16561656
{
16571657

16581658
apply(); // make sure the style to save is uptodate
@@ -1673,7 +1673,7 @@ void QgsRasterLayerProperties::on_pbnSaveDefaultStyle_clicked()
16731673
}
16741674

16751675

1676-
void QgsRasterLayerProperties::on_pbnLoadStyle_clicked()
1676+
void QgsRasterLayerProperties::loadStyle_clicked()
16771677
{
16781678
QSettings settings;
16791679
QString lastUsedDir = settings.value( "style/lastStyleDir", "." ).toString();
@@ -1704,7 +1704,7 @@ void QgsRasterLayerProperties::on_pbnLoadStyle_clicked()
17041704
}
17051705

17061706

1707-
void QgsRasterLayerProperties::on_pbnSaveStyleAs_clicked()
1707+
void QgsRasterLayerProperties::saveStyleAs_clicked()
17081708
{
17091709
QSettings settings;
17101710
QString lastUsedDir = settings.value( "style/lastStyleDir", "." ).toString();

‎src/app/qgsrasterlayerproperties.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ class APP_EXPORT QgsRasterLayerProperties : public QgsOptionsDialogBase, private
8888
private slots:
8989
void on_mRenderTypeComboBox_currentIndexChanged( int index );
9090
/** Load the default style when appropriate button is pressed. */
91-
void on_pbnLoadDefaultStyle_clicked();
91+
void loadDefaultStyle_clicked();
9292
/** Save the default style when appropriate button is pressed. */
93-
void on_pbnSaveDefaultStyle_clicked();
93+
void saveDefaultStyle_clicked();
9494
/** Load a saved style when appropriate button is pressed. */
95-
void on_pbnLoadStyle_clicked();
95+
void loadStyle_clicked();
9696
/** Save a style when appriate button is pressed. */
97-
void on_pbnSaveStyleAs_clicked();
97+
void saveStyleAs_clicked();
9898
/** Help button */
9999
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
100100

‎src/app/qgsvectorlayerproperties.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
8484

8585
QPushButton* b = new QPushButton( tr( "Style" ) );
8686
QMenu* m = new QMenu( this );
87-
mActionLoadStyle = m->addAction( tr( "Load Style..." ), this, SLOT( on_pbnLoadStyle_clicked() ) );
88-
mActionSaveStyleAs = m->addAction( tr( "Save Style..." ), this, SLOT( on_pbnSaveStyleAs_clicked() ) );
87+
mActionLoadStyle = m->addAction( tr( "Load Style..." ), this, SLOT( loadStyle_clicked() ) );
88+
mActionSaveStyleAs = m->addAction( tr( "Save Style..." ), this, SLOT( saveStyleAs_clicked() ) );
8989
m->addSeparator();
90-
m->addAction( tr( "Save As Default" ), this, SLOT( on_pbnSaveDefaultStyle_clicked() ) );
91-
m->addAction( tr( "Restore Default" ), this, SLOT( on_pbnLoadDefaultStyle_clicked() ) );
90+
m->addAction( tr( "Save As Default" ), this, SLOT( saveDefaultStyle_clicked() ) );
91+
m->addAction( tr( "Restore Default" ), this, SLOT( loadDefaultStyle_clicked() ) );
9292
b->setMenu( m );
9393
connect( m, SIGNAL( aboutToShow() ), this, SLOT( aboutToShowStyleMenu() ) );
9494
buttonBox->addButton( b, QDialogButtonBox::ResetRole );
@@ -669,7 +669,7 @@ void QgsVectorLayerProperties::on_mCrsSelector_crsChanged( QgsCoordinateReferenc
669669
layer->setCrs( crs );
670670
}
671671

672-
void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()
672+
void QgsVectorLayerProperties::loadDefaultStyle_clicked()
673673
{
674674
QString msg;
675675
bool defaultLoadedFlag = false;
@@ -727,7 +727,7 @@ void QgsVectorLayerProperties::on_pbnLoadDefaultStyle_clicked()
727727
}
728728
}
729729

730-
void QgsVectorLayerProperties::on_pbnSaveDefaultStyle_clicked()
730+
void QgsVectorLayerProperties::saveDefaultStyle_clicked()
731731
{
732732
apply();
733733
QString errorMsg;
@@ -766,7 +766,7 @@ void QgsVectorLayerProperties::on_pbnSaveDefaultStyle_clicked()
766766
}
767767

768768

769-
void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()
769+
void QgsVectorLayerProperties::loadStyle_clicked()
770770
{
771771
QSettings myQSettings; // where we keep last used filter in persistent state
772772
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", "." ).toString();
@@ -809,7 +809,7 @@ void QgsVectorLayerProperties::on_pbnLoadStyle_clicked()
809809
}
810810

811811

812-
void QgsVectorLayerProperties::on_pbnSaveStyleAs_clicked()
812+
void QgsVectorLayerProperties::saveStyleAs_clicked()
813813
{
814814
saveStyleAs( QML );
815815
}
@@ -937,11 +937,11 @@ void QgsVectorLayerProperties::loadStyleMenuTriggered( QAction *action )
937937

938938
if ( index == 0 ) //Load from filesystem
939939
{
940-
this->on_pbnLoadStyle_clicked();
940+
loadStyle_clicked();
941941
}
942942
else if ( index == 1 ) //Load from database
943943
{
944-
this->showListOfStylesFromDatabase();
944+
showListOfStylesFromDatabase();
945945
}
946946

947947
}
@@ -1117,7 +1117,7 @@ void QgsVectorLayerProperties::updateSymbologyPage()
11171117
// display the menu to choose the output format (fix #5136)
11181118
mActionSaveStyleAs->setText( tr( "Save Style" ) );
11191119
mActionSaveStyleAs->setMenu( mSaveAsMenu );
1120-
QObject::disconnect( mActionSaveStyleAs, SIGNAL( triggered() ), this, SLOT( on_pbnSaveStyleAs_clicked() ) );
1120+
QObject::disconnect( mActionSaveStyleAs, SIGNAL( triggered() ), this, SLOT( saveStyleAs_clicked() ) );
11211121
}
11221122
else
11231123
{

‎src/app/qgsvectorlayerproperties.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
104104
void on_pbnQueryBuilder_clicked();
105105
void on_pbnIndex_clicked();
106106
void on_mCrsSelector_crsChanged( QgsCoordinateReferenceSystem crs );
107-
void on_pbnLoadDefaultStyle_clicked();
108-
void on_pbnSaveDefaultStyle_clicked();
109-
void on_pbnLoadStyle_clicked();
110-
void on_pbnSaveStyleAs_clicked();
107+
void loadDefaultStyle_clicked();
108+
void saveDefaultStyle_clicked();
109+
void loadStyle_clicked();
110+
void saveStyleAs_clicked();
111111
void mOptionsStackedWidget_CurrentChanged( int indx );
112112
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
113113
void on_pbnUpdateExtents_clicked();

‎src/app/qgsvisibilitypresets.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ void QgsVisibilityPresets::applyState( const QString& presetName )
389389

390390
void QgsVisibilityPresets::reconnectToLayersStyleManager()
391391
{
392-
disconnect( 0, 0, this, SLOT( layerStyleRenamed( QString, QString ) ) );
392+
// disconnect( 0, 0, this, SLOT( layerStyleRenamed( QString, QString ) ) );
393393

394394
QSet<QString> layerIDs;
395395
foreach ( const QString& grpName, mPresets.keys() )

0 commit comments

Comments
 (0)