Prefer to use normalised signal/slot signatures
authorSergio Ahumada <sahumada@blackberry.com>
Sun, 2 Mar 2014 10:48:02 +0000 (11:48 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 3 Mar 2014 08:28:52 +0000 (09:28 +0100)
Change-Id: I87fc653492fb5857d5ddcffad4cf762eacb5f364
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
src/assistant/assistant/bookmarkfiltermodel.cpp
src/assistant/assistant/bookmarkmanager.cpp
src/assistant/assistant/bookmarkmanagerwidget.cpp
src/assistant/assistant/centralwidget.cpp
src/assistant/assistant/helpviewer_qwv.cpp
src/assistant/assistant/mainwindow.cpp
src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractpropertyeditor.cpp

index e98c031..955f4bc 100644 (file)
@@ -55,15 +55,15 @@ void BookmarkFilterModel::setSourceModel(QAbstractItemModel *_sourceModel)
     beginResetModel();
 
     if (sourceModel) {
-        disconnect(sourceModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
-            this, SLOT(changed(QModelIndex, QModelIndex)));
-        disconnect(sourceModel, SIGNAL(rowsInserted(QModelIndex, int, int)),
-            this, SLOT(rowsInserted(QModelIndex, int, int)));
+        disconnect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+            this, SLOT(changed(QModelIndex,QModelIndex)));
+        disconnect(sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+            this, SLOT(rowsInserted(QModelIndex,int,int)));
         disconnect(sourceModel,
-            SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this,
-            SLOT(rowsAboutToBeRemoved(QModelIndex, int, int)));
-        disconnect(sourceModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
-            this, SLOT(rowsRemoved(QModelIndex, int, int)));
+            SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this,
+            SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
+        disconnect(sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+            this, SLOT(rowsRemoved(QModelIndex,int,int)));
         disconnect(sourceModel, SIGNAL(layoutAboutToBeChanged()), this,
             SLOT(layoutAboutToBeChanged()));
         disconnect(sourceModel, SIGNAL(layoutChanged()), this,
@@ -76,16 +76,16 @@ void BookmarkFilterModel::setSourceModel(QAbstractItemModel *_sourceModel)
     QAbstractProxyModel::setSourceModel(sourceModel);
     sourceModel = qobject_cast<BookmarkModel*> (_sourceModel);
 
-    connect(sourceModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this,
-        SLOT(changed(QModelIndex, QModelIndex)));
+    connect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this,
+        SLOT(changed(QModelIndex,QModelIndex)));
 
-    connect(sourceModel, SIGNAL(rowsInserted(QModelIndex, int, int)),
-        this, SLOT(rowsInserted(QModelIndex, int, int)));
+    connect(sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+        this, SLOT(rowsInserted(QModelIndex,int,int)));
 
-    connect(sourceModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
-        this, SLOT(rowsAboutToBeRemoved(QModelIndex, int, int)));
-    connect(sourceModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), this,
-        SLOT(rowsRemoved(QModelIndex, int, int)));
+    connect(sourceModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+        this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
+    connect(sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this,
+        SLOT(rowsRemoved(QModelIndex,int,int)));
 
     connect(sourceModel, SIGNAL(layoutAboutToBeChanged()), this,
         SLOT(layoutAboutToBeChanged()));
index f1b511f..5dbeb8b 100644 (file)
@@ -196,18 +196,18 @@ BookmarkManager::BookmarkManager()
 
     connect(&HelpEngineWrapper::instance(), SIGNAL(setupFinished()), this,
         SLOT(setupFinished()));
-    connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), this,
+    connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this,
         SLOT(refreshBookmarkMenu()));
-    connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex, int, int)), this,
+    connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this,
         SLOT(refreshBookmarkMenu()));
-    connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this,
+    connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this,
         SLOT(refreshBookmarkMenu()));
 
-    connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), this,
+    connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this,
         SLOT(refreshBookmarkToolBar()));
-    connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex, int, int)), this,
+    connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this,
         SLOT(refreshBookmarkToolBar()));
-    connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this,
+    connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this,
         SLOT(refreshBookmarkToolBar()));
 }
 
index 93d6dc1..7bce80b 100644 (file)
@@ -86,11 +86,11 @@ BookmarkManagerWidget::BookmarkManagerWidget(BookmarkModel *sourceModel,
     new QShortcut(QKeySequence::FindNext, this, SLOT(findNext()));
     new QShortcut(QKeySequence::FindPrevious, this, SLOT(findPrevious()));
 
-    connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), this,
+    connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this,
         SLOT(refeshBookmarkCache()));
-    connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex, int, int)), this,
+    connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this,
         SLOT(refeshBookmarkCache()));
-    connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this,
+    connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this,
         SLOT(refeshBookmarkCache()));
 
     ui.treeView->setCurrentIndex(ui.treeView->indexAt(QPoint(2, 2)));
index 19a388b..a1dccc6 100644 (file)
@@ -213,11 +213,11 @@ CentralWidget::CentralWidget(QWidget *parent)
 
     connect(m_findWidget, SIGNAL(findNext()), this, SLOT(findNext()));
     connect(m_findWidget, SIGNAL(findPrevious()), this, SLOT(findPrevious()));
-    connect(m_findWidget, SIGNAL(find(QString, bool, bool)), this,
-        SLOT(find(QString, bool, bool)));
+    connect(m_findWidget, SIGNAL(find(QString,bool,bool)), this,
+        SLOT(find(QString,bool,bool)));
     connect(m_findWidget, SIGNAL(escapePressed()), this, SLOT(activateTab()));
-    connect(m_tabBar, SIGNAL(addBookmark(QString, QString)), this,
-        SIGNAL(addBookmark(QString, QString)));
+    connect(m_tabBar, SIGNAL(addBookmark(QString,QString)), this,
+        SIGNAL(addBookmark(QString,QString)));
 }
 
 CentralWidget::~CentralWidget()
index 2d7632a..81061d7 100644 (file)
@@ -306,7 +306,7 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent)
         SLOT(actionChanged()));
     connect(pageAction(QWebPage::Forward), SIGNAL(changed()), this,
         SLOT(actionChanged()));
-    connect(page(), SIGNAL(linkHovered(QString, QString, QString)), this,
+    connect(page(), SIGNAL(linkHovered(QString,QString,QString)), this,
         SIGNAL(highlighted(QString)));
     connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl)));
     connect(this, SIGNAL(loadStarted()), this, SLOT(setLoadStarted()));
index 5186de3..871f7b1 100644 (file)
@@ -164,8 +164,8 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
     openPagesDock->setWidget(openPagesManager->openPagesWidget());
     addDockWidget(Qt::LeftDockWidgetArea, openPagesDock);
 
-    connect(m_centralWidget, SIGNAL(addBookmark(QString, QString)),
-        bookMarkManager, SLOT(addBookmark(QString, QString)));
+    connect(m_centralWidget, SIGNAL(addBookmark(QString,QString)),
+        bookMarkManager, SLOT(addBookmark(QString,QString)));
     connect(bookMarkManager, SIGNAL(escapePressed()), this,
             SLOT(activateCurrentCentralWidgetTab()));
     connect(bookMarkManager, SIGNAL(setSource(QUrl)), m_centralWidget,
@@ -446,8 +446,8 @@ void MainWindow::lookForNewQtDocumentation()
         SLOT(qtDocumentationInstalled()));
     connect(m_qtDocInstaller, SIGNAL(qchFileNotFound(QString)), this,
             SLOT(resetQtDocInfo(QString)));
-    connect(m_qtDocInstaller, SIGNAL(registerDocumentation(QString, QString)),
-            this, SLOT(registerDocumentation(QString, QString)));
+    connect(m_qtDocInstaller, SIGNAL(registerDocumentation(QString,QString)),
+            this, SLOT(registerDocumentation(QString,QString)));
     if (helpEngine.qtDocInfo(QLatin1String("qt")).count() != 2)
         statusBar()->showMessage(tr("Looking for Qt Documentation..."));
     m_qtDocInstaller->installDocs();
index 5c355ff..96238f2 100644 (file)
@@ -42,8 +42,8 @@
         QDesignerPropertyEditorInterface *propertyEditor = 0;
         propertyEditor = formEditor->propertyEditor();
 
-        connect(propertyEditor, SIGNAL(propertyChanged(QString, QVariant)),
-                this, SLOT(checkProperty(QString, QVariant)));
+        connect(propertyEditor, SIGNAL(propertyChanged(QString,QVariant)),
+                this, SLOT(checkProperty(QString,QVariant)));
 //! [0]