Skip to content
Permalink
Browse files

Fix clazy overriden signals with non signal warnings

  • Loading branch information
nyalldawson committed Sep 25, 2017
1 parent e4f17f4 commit a463acba5711780805c6b8ade1f08858a3717ac7
@@ -375,7 +375,7 @@ void QgsMapSaveDialog::copyToClipboard()
QgsApplication::taskManager()->addTask( mapRendererTask );
}

void QgsMapSaveDialog::accepted()
void QgsMapSaveDialog::onAccepted()
{
if ( mDialogType == Image )
{
@@ -76,10 +76,12 @@ class APP_EXPORT QgsMapSaveDialog: public QDialog, private Ui::QgsMapSaveDialog
//! configure a map settings object
void applyMapSettings( QgsMapSettings &mapSettings );

private slots:
void onAccepted();

private:

void lockChanged( const bool locked );
void accepted();
void copyToClipboard();

void updateDpi( int dpi );
@@ -64,7 +64,7 @@ QWidget *QgsAfsRootItem::paramWidget()
return select;
}

void QgsAfsRootItem::connectionsChanged()
void QgsAfsRootItem::onConnectionsChanged()
{
refresh();
}
@@ -32,7 +32,7 @@ class QgsAfsRootItem : public QgsDataCollectionItem

public slots:
#ifdef HAVE_GUI
void connectionsChanged();
void onConnectionsChanged();
void newConnection();
#endif
};
@@ -59,11 +59,11 @@ QList<QAction *> QgsAmsRootItem::actions( QWidget *parent )
QWidget *QgsAmsRootItem::paramWidget()
{
QgsAmsSourceSelect *select = new QgsAmsSourceSelect( 0, 0, QgsProviderRegistry::WidgetMode::Manager );
connect( select, &QgsArcGisServiceSourceSelect::connectionsChanged, this, &QgsAmsRootItem::connectionsChanged );
connect( select, &QgsArcGisServiceSourceSelect::connectionsChanged, this, &QgsAmsRootItem::onConnectionsChanged );
return select;
}

void QgsAmsRootItem::connectionsChanged()
void QgsAmsRootItem::onConnectionsChanged()
{
refresh();
}
@@ -35,7 +35,7 @@ class QgsAmsRootItem : public QgsDataCollectionItem

public slots:
#ifdef HAVE_GUI
void connectionsChanged();
void onConnectionsChanged();
void newConnection();
#endif
};
@@ -619,11 +619,11 @@ QList<QAction *> QgsMssqlRootItem::actions( QWidget *parent )
QWidget *QgsMssqlRootItem::paramWidget()
{
QgsMssqlSourceSelect *select = new QgsMssqlSourceSelect( nullptr, 0, QgsProviderRegistry::WidgetMode::Manager );
connect( select, &QgsMssqlSourceSelect::connectionsChanged, this, &QgsMssqlRootItem::connectionsChanged );
connect( select, &QgsMssqlSourceSelect::connectionsChanged, this, &QgsMssqlRootItem::onConnectionsChanged );
return select;
}

void QgsMssqlRootItem::connectionsChanged()
void QgsMssqlRootItem::onConnectionsChanged()
{
refresh();
}
@@ -45,7 +45,7 @@ class QgsMssqlRootItem : public QgsDataCollectionItem

public slots:
#ifdef HAVE_GUI
void connectionsChanged();
void onConnectionsChanged();
void newConnection();
#endif
};
@@ -91,7 +91,7 @@ QWidget *QgsGeoPackageRootItem::paramWidget()
}
#endif

void QgsGeoPackageRootItem::connectionsChanged()
void QgsGeoPackageRootItem::onConnectionsChanged()
{
refresh();
}
@@ -141,7 +141,7 @@ class QgsGeoPackageRootItem : public QgsDataCollectionItem

public slots:
void newConnection();
void connectionsChanged();
void onConnectionsChanged();
void createDatabase();
#endif
};
@@ -237,7 +237,7 @@ QWidget *QgsOWSRootItem::paramWidget()
#endif
return nullptr;
}
void QgsOWSRootItem::connectionsChanged()
void QgsOWSRootItem::onConnectionsChanged()
{
refresh();
}
@@ -57,7 +57,7 @@ class QgsOWSRootItem : public QgsDataCollectionItem

public slots:
#ifdef HAVE_GUI
void connectionsChanged();
void onConnectionsChanged();

void newConnection();
#endif
@@ -739,11 +739,11 @@ QList<QAction *> QgsPGRootItem::actions( QWidget *parent )
QWidget *QgsPGRootItem::paramWidget()
{
QgsPgSourceSelect *select = new QgsPgSourceSelect( nullptr, 0, QgsProviderRegistry::WidgetMode::Manager );
connect( select, &QgsPgSourceSelect::connectionsChanged, this, &QgsPGRootItem::connectionsChanged );
connect( select, &QgsPgSourceSelect::connectionsChanged, this, &QgsPGRootItem::onConnectionsChanged );
return select;
}

void QgsPGRootItem::connectionsChanged()
void QgsPGRootItem::onConnectionsChanged()
{
refresh();
}
@@ -46,7 +46,7 @@ class QgsPGRootItem : public QgsDataCollectionItem

public slots:
#ifdef HAVE_GUI
void connectionsChanged();
void onConnectionsChanged();
void newConnection();
#endif
};
@@ -313,11 +313,11 @@ QList<QAction *> QgsSLRootItem::actions( QWidget *parent )
QWidget *QgsSLRootItem::paramWidget()
{
QgsSpatiaLiteSourceSelect *select = new QgsSpatiaLiteSourceSelect( nullptr, 0, QgsProviderRegistry::WidgetMode::Manager );
connect( select, &QgsSpatiaLiteSourceSelect::connectionsChanged, this, &QgsSLRootItem::connectionsChanged );
connect( select, &QgsSpatiaLiteSourceSelect::connectionsChanged, this, &QgsSLRootItem::onConnectionsChanged );
return select;
}

void QgsSLRootItem::connectionsChanged()
void QgsSLRootItem::onConnectionsChanged()
{
refresh();
}
@@ -74,7 +74,7 @@ class QgsSLRootItem : public QgsDataCollectionItem

public slots:
#ifdef HAVE_GUI
void connectionsChanged();
void onConnectionsChanged();
void newConnection();
#endif
void createDatabase();
@@ -261,11 +261,11 @@ QList<QAction *> QgsWCSRootItem::actions( QWidget *parent )
QWidget *QgsWCSRootItem::paramWidget()
{
QgsWCSSourceSelect *select = new QgsWCSSourceSelect( nullptr, 0, QgsProviderRegistry::WidgetMode::Manager );
connect( select, &QgsOWSSourceSelect::connectionsChanged, this, &QgsWCSRootItem::connectionsChanged );
connect( select, &QgsOWSSourceSelect::connectionsChanged, this, &QgsWCSRootItem::onConnectionsChanged );
return select;
}

void QgsWCSRootItem::connectionsChanged()
void QgsWCSRootItem::onConnectionsChanged()
{
refresh();
}
@@ -80,7 +80,7 @@ class QgsWCSRootItem : public QgsDataCollectionItem

public slots:
#ifdef HAVE_GUI
void connectionsChanged();
void onConnectionsChanged();
void newConnection();
#endif
};
@@ -259,11 +259,11 @@ QList<QAction *> QgsWfsRootItem::actions( QWidget *parent )
QWidget *QgsWfsRootItem::paramWidget()
{
QgsWFSSourceSelect *select = new QgsWFSSourceSelect( nullptr, 0, QgsProviderRegistry::WidgetMode::Manager );
connect( select, &QgsWFSSourceSelect::connectionsChanged, this, &QgsWfsRootItem::connectionsChanged );
connect( select, &QgsWFSSourceSelect::connectionsChanged, this, &QgsWfsRootItem::onConnectionsChanged );
return select;
}

void QgsWfsRootItem::connectionsChanged()
void QgsWfsRootItem::onConnectionsChanged()
{
refresh();
}
@@ -37,7 +37,7 @@ class QgsWfsRootItem : public QgsDataCollectionItem

public slots:
#ifdef HAVE_GUI
void connectionsChanged();
void onConnectionsChanged();
void newConnection();
#endif
};
@@ -128,7 +128,7 @@ QgsWFSProgressDialog::QgsWFSProgressDialog( const QString &labelText,
mCancel = new QPushButton( cancelButtonText, this );
setCancelButton( mCancel );
mHide = new QPushButton( tr( "Hide" ), this );
connect( mHide, &QAbstractButton::clicked, this, &QgsWFSProgressDialog::hide );
connect( mHide, &QAbstractButton::clicked, this, &QgsWFSProgressDialog::hideRequest );
}

void QgsWFSProgressDialog::resizeEvent( QResizeEvent *ev )
@@ -173,7 +173,7 @@ void QgsWFSFeatureDownloader::createProgressDialog()

connect( mProgressDialog, &QProgressDialog::canceled, this, &QgsWFSFeatureDownloader::setStopFlag, Qt::DirectConnection );
connect( mProgressDialog, &QProgressDialog::canceled, this, &QgsWFSFeatureDownloader::stop );
connect( mProgressDialog, &QWidget::hide, this, &QgsWFSFeatureDownloader::hideProgressDialog );
connect( mProgressDialog, &QgsWFSProgressDialog::hideRequest, this, &QgsWFSFeatureDownloader::hideProgressDialog );

// Make sure the progress dialog has not been deleted by another thread
if ( mProgressDialog )
@@ -72,7 +72,7 @@ class QgsWFSProgressDialog: public QProgressDialog
void resizeEvent( QResizeEvent *ev ) override;

signals:
void hide();
void hideRequest();

private:
QPushButton *mCancel = nullptr;
@@ -141,7 +141,7 @@ class QgsWFSFeatureDownloader: public QgsWfsRequest
//! Whether the download should stop
bool mStop;
//! Progress dialog
QProgressDialog *mProgressDialog = nullptr;
QgsWFSProgressDialog *mProgressDialog = nullptr;

/** If the progress dialog should be shown immediately, or if it should be
let to QProgressDialog logic to decide when to show it */

0 comments on commit a463acb

Please sign in to comment.
You can’t perform that action at this time.