diff options
author | Robert Loehning <robert.loehning@nokia.com> | 2012-03-05 22:30:59 +0100 |
---|---|---|
committer | Robert Löhning <robert.loehning@nokia.com> | 2012-03-06 12:46:52 +0100 |
commit | b41171c8473e7202f67aaa0f7ace1bf40e02919e (patch) | |
tree | 47de72e1d07c7bd86f7f576417ae6c32671c12a5 | |
parent | 9f05e6495dfeda3b78ba2da356832367194633bb (diff) |
Normalized connect()s
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
121 files changed, 388 insertions, 388 deletions
diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp index e1d440b74b..6f7fb47986 100644 --- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp +++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewinspector.cpp @@ -107,10 +107,10 @@ QDeclarativeViewInspector::QDeclarativeViewInspector(QDeclarativeView *view, QOb SIGNAL(objectCreationRequested(QString,QObject*,QStringList,QString,int)), data.data(), SLOT(_q_createQmlObject(QString,QObject*,QStringList,QString,int))); connect(data->debugService, - SIGNAL(objectDeletionRequested(QObject *)), data.data(), SLOT(_q_deleteQmlObject(QObject *))); + SIGNAL(objectDeletionRequested(QObject*)), data.data(), SLOT(_q_deleteQmlObject(QObject*))); connect(data->debugService, - SIGNAL(objectReparentRequested(QObject *, QObject *)), - data.data(), SLOT(_q_reparentQmlObject(QObject *, QObject *))); + SIGNAL(objectReparentRequested(QObject*,QObject*)), + data.data(), SLOT(_q_reparentQmlObject(QObject*,QObject*))); connect(data->debugService, SIGNAL(clearComponentCacheRequested()), data.data(), SLOT(_q_clearComponentCache())); connect(data->view, SIGNAL(statusChanged(QDeclarativeView::Status)), diff --git a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp index e63213d4dc..5ec86ac16a 100644 --- a/share/qtcreator/qml/qmlobserver/qmlruntime.cpp +++ b/share/qtcreator/qml/qmlobserver/qmlruntime.cpp @@ -934,7 +934,7 @@ void QDeclarativeViewer::showProxySettings() { ProxySettings settingsDlg (this); - connect (&settingsDlg, SIGNAL (accepted()), this, SLOT (proxySettingsChanged ())); + connect(&settingsDlg, SIGNAL(accepted()), this, SLOT(proxySettingsChanged())); settingsDlg.exec(); } diff --git a/share/qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchnavigation.cpp b/share/qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchnavigation.cpp index 0521014f52..b907203c92 100644 --- a/share/qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchnavigation.cpp +++ b/share/qtcreator/templates/html5app/html5applicationviewer/touchnavigation/webtouchnavigation.cpp @@ -145,7 +145,7 @@ WebTouchNavigation::WebTouchNavigation(QObject *parent, QWebPage *webPage) m_physics->setParent(this); m_scroller = new WebTouchScroller(this); - connect(m_physics, SIGNAL(positionChanged(QPointF, QPoint)), m_scroller, SLOT(scroll(QPointF, QPoint))); + connect(m_physics, SIGNAL(positionChanged(QPointF,QPoint)), m_scroller, SLOT(scroll(QPointF,QPoint))); connect(m_scroller, SIGNAL(rangeChanged(QRectF)), m_physics, SLOT(setRange(QRectF))); } diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index 29079b3ff1..b4e0699b6e 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/src/libs/extensionsystem/pluginview.cpp @@ -136,7 +136,7 @@ PluginSpec *PluginView::currentPlugin() const void PluginView::updateList() { connect(m_ui->categoryWidget, SIGNAL(itemChanged(QTreeWidgetItem*,int)), - this, SLOT(updatePluginSettings(QTreeWidgetItem*, int))); + this, SLOT(updatePluginSettings(QTreeWidgetItem*,int))); PluginCollection *defaultCollection = 0; foreach(PluginCollection *collection, p->manager->pluginCollections()) { diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index 1386ecb45a..d6c6621c80 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -445,7 +445,7 @@ QWidget* ContextPaneWidget::createFontWidget() m_textWidget = new ContextPaneTextWidget(this); connect(m_textWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant))); connect(m_textWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString))); - connect(m_textWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool))); + connect(m_textWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool))); return m_textWidget; } @@ -456,7 +456,7 @@ QWidget* ContextPaneWidget::createEasingWidget() connect(m_easingWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant))); connect(m_easingWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString))); - connect(m_easingWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool))); + connect(m_easingWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool))); return m_easingWidget; } @@ -466,7 +466,7 @@ QWidget *ContextPaneWidget::createImageWidget() m_imageWidget = new ContextPaneWidgetImage(this); connect(m_imageWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant))); connect(m_imageWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString))); - connect(m_imageWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool))); + connect(m_imageWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool))); return m_imageWidget; } @@ -476,7 +476,7 @@ QWidget *ContextPaneWidget::createBorderImageWidget() m_borderImageWidget = new ContextPaneWidgetImage(this, true); connect(m_borderImageWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant))); connect(m_borderImageWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString))); - connect(m_borderImageWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool))); + connect(m_borderImageWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool))); return m_borderImageWidget; @@ -487,7 +487,7 @@ QWidget *ContextPaneWidget::createRectangleWidget() m_rectangleWidget = new ContextPaneWidgetRectangle(this); connect(m_rectangleWidget, SIGNAL(propertyChanged(QString,QVariant)), this, SIGNAL(propertyChanged(QString,QVariant))); connect(m_rectangleWidget, SIGNAL(removeProperty(QString)), this, SIGNAL(removeProperty(QString))); - connect(m_rectangleWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool))); + connect(m_rectangleWidget, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool))); return m_rectangleWidget; } diff --git a/src/libs/qmleditorwidgets/filewidget.cpp b/src/libs/qmleditorwidgets/filewidget.cpp index e0943a59ca..b1ce0ff144 100644 --- a/src/libs/qmleditorwidgets/filewidget.cpp +++ b/src/libs/qmleditorwidgets/filewidget.cpp @@ -62,7 +62,7 @@ FileWidget::FileWidget(QWidget *parent) : QWidget(parent), m_filter("(*.*)"), m_ m_pushButton->setText("..."); connect(m_lineEdit, SIGNAL(editingFinished()), this, SLOT(lineEditChanged())); connect(m_pushButton, SIGNAL(released()), this, SLOT(onButtonReleased())); - connect(m_comboBox, SIGNAL(editTextChanged(const QString &)), this, SLOT(comboBoxChanged())); + connect(m_comboBox, SIGNAL(editTextChanged(QString)), this, SLOT(comboBoxChanged())); } FileWidget::~FileWidget() diff --git a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp index df6514b7d8..3f21a8abe4 100644 --- a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp +++ b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp @@ -154,12 +154,12 @@ QDeclarativeFolderListModel::QDeclarativeFolderListModel(QObject *parent) d = new QDeclarativeFolderListModelPrivate; d->model.setFilter(QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot); - connect(&d->model, SIGNAL(rowsInserted(const QModelIndex&,int,int)) - , this, SLOT(inserted(const QModelIndex&,int,int))); - connect(&d->model, SIGNAL(rowsRemoved(const QModelIndex&,int,int)) - , this, SLOT(removed(const QModelIndex&,int,int))); - connect(&d->model, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)) - , this, SLOT(handleDataChanged(const QModelIndex&,const QModelIndex&))); + connect(&d->model, SIGNAL(rowsInserted(QModelIndex,int,int)) + , this, SLOT(inserted(QModelIndex,int,int))); + connect(&d->model, SIGNAL(rowsRemoved(QModelIndex,int,int)) + , this, SLOT(removed(QModelIndex,int,int))); + connect(&d->model, SIGNAL(dataChanged(QModelIndex,QModelIndex)) + , this, SLOT(handleDataChanged(QModelIndex,QModelIndex))); connect(&d->model, SIGNAL(modelReset()), this, SLOT(refresh())); connect(&d->model, SIGNAL(layoutChanged()), this, SLOT(refresh())); } diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index 26b12aaada..8ed83300a3 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -62,7 +62,7 @@ ConsoleProcess::ConsoleProcess(QObject *parent) : connect(&d->m_stubServer, SIGNAL(newConnection()), SLOT(stubConnectionAvailable())); d->m_process.setProcessChannelMode(QProcess::ForwardedChannels); - connect(&d->m_process, SIGNAL(finished(int, QProcess::ExitStatus)), + connect(&d->m_process, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(stubExited())); } diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp index 267090b4ff..5c88cab335 100644 --- a/src/libs/utils/historycompleter.cpp +++ b/src/libs/utils/historycompleter.cpp @@ -129,12 +129,12 @@ int HistoryListModel::rowCount(const QModelIndex &parent) const if (qobject_cast<QLineEdit *>(lastSeenWidget)) // this will result in spamming the history with garbage in some corner cases. // not my idea. - disconnect(lastSeenWidget, SIGNAL(editingFinished ()), completer, SLOT(saveHistory())); + disconnect(lastSeenWidget, SIGNAL(editingFinished()), completer, SLOT(saveHistory())); HistoryListModel *that = const_cast<HistoryListModel *>(this); that->lastSeenWidget = completer->widget(); that->fetchHistory(); if (qobject_cast<QLineEdit *>(lastSeenWidget)) - connect(lastSeenWidget, SIGNAL(editingFinished ()), completer, SLOT(saveHistory())); + connect(lastSeenWidget, SIGNAL(editingFinished()), completer, SLOT(saveHistory())); } if (parent.isValid()) return 0; diff --git a/src/libs/utils/ssh/sftpchannel.cpp b/src/libs/utils/ssh/sftpchannel.cpp index d5cf0f6b67..585265745d 100644 --- a/src/libs/utils/ssh/sftpchannel.cpp +++ b/src/libs/utils/ssh/sftpchannel.cpp @@ -93,10 +93,10 @@ SftpChannel::SftpChannel(quint32 channelId, Qt::QueuedConnection); connect(d, SIGNAL(initializationFailed(QString)), this, SIGNAL(initializationFailed(QString)), Qt::QueuedConnection); - connect(d, SIGNAL(dataAvailable(Utils::SftpJobId, QString)), this, - SIGNAL(dataAvailable(Utils::SftpJobId, QString)), Qt::QueuedConnection); - connect(d, SIGNAL(fileInfoAvailable(Utils::SftpJobId, QList<Utils::SftpFileInfo>)), this, - SIGNAL(fileInfoAvailable(Utils::SftpJobId, QList<Utils::SftpFileInfo>)), + connect(d, SIGNAL(dataAvailable(Utils::SftpJobId,QString)), this, + SIGNAL(dataAvailable(Utils::SftpJobId,QString)), Qt::QueuedConnection); + connect(d, SIGNAL(fileInfoAvailable(Utils::SftpJobId,QList<Utils::SftpFileInfo>)), this, + SIGNAL(fileInfoAvailable(Utils::SftpJobId,QList<Utils::SftpFileInfo>)), Qt::QueuedConnection); connect(d, SIGNAL(finished(Utils::SftpJobId,QString)), this, SIGNAL(finished(Utils::SftpJobId,QString)), Qt::QueuedConnection); diff --git a/src/libs/utils/ssh/sftpfilesystemmodel.cpp b/src/libs/utils/ssh/sftpfilesystemmodel.cpp index 3c53470742..a6bfa498e6 100644 --- a/src/libs/utils/ssh/sftpfilesystemmodel.cpp +++ b/src/libs/utils/ssh/sftpfilesystemmodel.cpp @@ -288,10 +288,10 @@ void SftpFileSystemModel::handleSshConnectionFailure() void SftpFileSystemModel::handleSftpChannelInitialized() { connect(d->sftpChannel.data(), - SIGNAL(fileInfoAvailable(Utils::SftpJobId, QList<Utils::SftpFileInfo>)), - SLOT(handleFileInfo(Utils::SftpJobId, QList<Utils::SftpFileInfo>))); - connect(d->sftpChannel.data(), SIGNAL(finished(Utils::SftpJobId, QString)), - SLOT(handleSftpJobFinished(Utils::SftpJobId, QString))); + SIGNAL(fileInfoAvailable(Utils::SftpJobId,QList<Utils::SftpFileInfo>)), + SLOT(handleFileInfo(Utils::SftpJobId,QList<Utils::SftpFileInfo>))); + connect(d->sftpChannel.data(), SIGNAL(finished(Utils::SftpJobId,QString)), + SLOT(handleSftpJobFinished(Utils::SftpJobId,QString))); statRootDirectory(); } diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp index e2649941ae..0a2d3a2805 100644 --- a/src/libs/utils/submiteditorwidget.cpp +++ b/src/libs/utils/submiteditorwidget.cpp @@ -420,7 +420,7 @@ void SubmitEditorWidget::setFileModel(QAbstractItemModel *model) this, SLOT(updateSubmitAction())); connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(updateSubmitAction())); - connect(d->m_ui.fileView->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + connect(d->m_ui.fileView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(updateDiffAction())); updateActions(); } diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index 75b5fb6c1e..13f0d54dd9 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -140,20 +140,20 @@ LinearProgressWidget::LinearProgressWidget(WizardProgress *progress, QWidget *pa m_dotsItemWidget->setVisible(false); m_dotsItemWidget->setEnabled(false); - connect(m_wizardProgress, SIGNAL(itemAdded(WizardProgressItem *)), - this, SLOT(slotItemAdded(WizardProgressItem *))); - connect(m_wizardProgress, SIGNAL(itemRemoved(WizardProgressItem *)), - this, SLOT(slotItemRemoved(WizardProgressItem *))); - connect(m_wizardProgress, SIGNAL(itemChanged(WizardProgressItem *)), - this, SLOT(slotItemChanged(WizardProgressItem *))); - connect(m_wizardProgress, SIGNAL(nextItemsChanged(WizardProgressItem *, const QList<WizardProgressItem *> &)), - this, SLOT(slotNextItemsChanged(WizardProgressItem *, const QList<WizardProgressItem *> &))); - connect(m_wizardProgress, SIGNAL(nextShownItemChanged(WizardProgressItem *, WizardProgressItem *)), - this, SLOT(slotNextShownItemChanged(WizardProgressItem *, WizardProgressItem *))); - connect(m_wizardProgress, SIGNAL(startItemChanged(WizardProgressItem *)), - this, SLOT(slotStartItemChanged(WizardProgressItem *))); - connect(m_wizardProgress, SIGNAL(currentItemChanged(WizardProgressItem *)), - this, SLOT(slotCurrentItemChanged(WizardProgressItem *))); + connect(m_wizardProgress, SIGNAL(itemAdded(WizardProgressItem*)), + this, SLOT(slotItemAdded(WizardProgressItem*))); + connect(m_wizardProgress, SIGNAL(itemRemoved(WizardProgressItem*)), + this, SLOT(slotItemRemoved(WizardProgressItem*))); + connect(m_wizardProgress, SIGNAL(itemChanged(WizardProgressItem*)), + this, SLOT(slotItemChanged(WizardProgressItem*))); + connect(m_wizardProgress, SIGNAL(nextItemsChanged(WizardProgressItem*,QList<WizardProgressItem*>)), + this, SLOT(slotNextItemsChanged(WizardProgressItem*,QList<WizardProgressItem*>))); + connect(m_wizardProgress, SIGNAL(nextShownItemChanged(WizardProgressItem*,WizardProgressItem*)), + this, SLOT(slotNextShownItemChanged(WizardProgressItem*,WizardProgressItem*))); + connect(m_wizardProgress, SIGNAL(startItemChanged(WizardProgressItem*)), + this, SLOT(slotStartItemChanged(WizardProgressItem*))); + connect(m_wizardProgress, SIGNAL(currentItemChanged(WizardProgressItem*)), + this, SLOT(slotCurrentItemChanged(WizardProgressItem*))); QList<WizardProgressItem *> items = m_wizardProgress->items(); for (int i = 0; i < items.count(); i++) diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index eb42b918fa..37c8b58de8 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -194,7 +194,7 @@ public: { m_editor = parent; connect(m_editor, SIGNAL(dataRequested(Core::IEditor*,quint64)), - this, SLOT(provideData(Core::IEditor *, quint64))); + this, SLOT(provideData(Core::IEditor*,quint64))); connect(m_editor, SIGNAL(newRangeRequested(Core::IEditor*,quint64)), this, SLOT(provideNewRange(Core::IEditor*,quint64))); connect(m_editor, SIGNAL(startOfFileRequested(Core::IEditor*)), this, @@ -535,8 +535,8 @@ bool BinEditorPlugin::initialize(const QStringList &arguments, QString *errorMes Q_UNUSED(arguments) Q_UNUSED(errorMessage) - connect(Core::ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext *)), - this, SLOT(updateCurrentEditor(Core::IContext *))); + connect(Core::ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext*)), + this, SLOT(updateCurrentEditor(Core::IContext*))); addAutoReleasedObject(new BinEditorFactory(this)); addAutoReleasedObject(new BinEditorWidgetFactory); diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 21b62dee5a..a7b8d7fed7 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -212,8 +212,8 @@ BookmarkView::BookmarkView(QWidget *parent) : { setWindowTitle(tr("Bookmarks")); - connect(this, SIGNAL(clicked(const QModelIndex &)), - this, SLOT(gotoBookmark(const QModelIndex &))); + connect(this, SIGNAL(clicked(QModelIndex)), + this, SLOT(gotoBookmark(QModelIndex))); ICore::addContextObject(m_bookmarkContext); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 3dc2f4897d..b0e9a93b5b 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -64,8 +64,8 @@ CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage) : m_settingsPage(cmakeSettingsPage) { ProjectExplorer::ProjectExplorerPlugin *projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance(); - connect(projectExplorer, SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)), - this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*))); + connect(projectExplorer, SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*)), + this, SLOT(updateContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*))); Core::ActionManager *am = Core::ICore::actionManager(); diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp index b2f4965b2a..431b6c9dea 100644 --- a/src/plugins/cmakeprojectmanager/makestep.cpp +++ b/src/plugins/cmakeprojectmanager/makestep.cpp @@ -258,7 +258,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) updateDetails(); - connect(m_additionalArguments, SIGNAL(textEdited(const QString &)), this, SLOT(additionalArgumentsEdited())); + connect(m_additionalArguments, SIGNAL(textEdited(QString)), this, SLOT(additionalArgumentsEdited())); connect(m_buildTargetsList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*))); connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()), this, SLOT(updateDetails())); diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.cpp b/src/plugins/coreplugin/actionmanager/commandmappings.cpp index 01f9315af3..0584963e12 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.cpp +++ b/src/plugins/coreplugin/actionmanager/commandmappings.cpp @@ -93,8 +93,8 @@ QWidget *CommandMappings::createPage(QWidget *parent) connect(m_page->filterEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged(QString))); - connect(m_page->commandList, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), - this, SLOT(commandChanged(QTreeWidgetItem *))); + connect(m_page->commandList, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), + this, SLOT(commandChanged(QTreeWidgetItem*))); connect(m_page->targetEdit, SIGNAL(textChanged(QString)), this, SLOT(targetIdentifierChanged())); diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp index 1d14cda221..9180a752ab 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.cpp +++ b/src/plugins/coreplugin/dialogs/newdialog.cpp @@ -215,16 +215,16 @@ NewDialog::NewDialog(QWidget *parent) : m_ui->templatesView->setIconSize(QSize(ICON_SIZE, ICON_SIZE)); - connect(m_ui->templateCategoryView, SIGNAL(clicked(const QModelIndex&)), - this, SLOT(currentCategoryChanged(const QModelIndex&))); - connect(m_ui->templatesView, SIGNAL(clicked(const QModelIndex&)), - this, SLOT(currentItemChanged(const QModelIndex&))); + connect(m_ui->templateCategoryView, SIGNAL(clicked(QModelIndex)), + this, SLOT(currentCategoryChanged(QModelIndex))); + connect(m_ui->templatesView, SIGNAL(clicked(QModelIndex)), + this, SLOT(currentItemChanged(QModelIndex))); connect(m_ui->templateCategoryView->selectionModel(), - SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), - this, SLOT(currentCategoryChanged(const QModelIndex&))); + SIGNAL(currentChanged(QModelIndex,QModelIndex)), + this, SLOT(currentCategoryChanged(QModelIndex))); connect(m_ui->templatesView, - SIGNAL(doubleClicked(const QModelIndex&)), + SIGNAL(doubleClicked(QModelIndex)), this, SLOT(okButtonClicked())); connect(m_okButton, SIGNAL(clicked()), this, SLOT(okButtonClicked())); @@ -409,8 +409,8 @@ void NewDialog::currentCategoryChanged(const QModelIndex &index) m_ui->templatesView->setCurrentIndex(m_ui->templatesView->rootIndex().child(0,0)); connect(m_ui->templatesView->selectionModel(), - SIGNAL(currentChanged(const QModelIndex&,const QModelIndex&)), - this, SLOT(currentItemChanged(const QModelIndex&))); + SIGNAL(currentChanged(QModelIndex,QModelIndex)), + this, SLOT(currentItemChanged(QModelIndex))); } } diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.cpp b/src/plugins/coreplugin/dialogs/openwithdialog.cpp index 298b565594..d767c80283 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.cpp +++ b/src/plugins/coreplugin/dialogs/openwithdialog.cpp @@ -51,7 +51,7 @@ OpenWithDialog::OpenWithDialog(const QString &fileName, QWidget *parent) this, SLOT(accept())); connect(buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(reject())); - connect(editorListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem *)), + connect(editorListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(accept())); connect(editorListWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(currentItemChanged(QListWidgetItem*,QListWidgetItem*))); diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 9ab5362645..c170d248dc 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -293,7 +293,7 @@ void DocumentManager::addDocuments(const QList<IDocument *> &documents, bool add foreach (IDocument *document, documents) { if (document && !d->m_documentsWithoutWatch.contains(document)) { - connect(document, SIGNAL(destroyed(QObject *)), m_instance, SLOT(documentDestroyed(QObject *))); + connect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*))); d->m_documentsWithoutWatch.append(document); } } @@ -303,7 +303,7 @@ void DocumentManager::addDocuments(const QList<IDocument *> &documents, bool add foreach (IDocument *document, documents) { if (document && !d->m_documentsWithWatch.contains(document)) { connect(document, SIGNAL(changed()), m_instance, SLOT(checkForNewFileName())); - connect(document, SIGNAL(destroyed(QObject *)), m_instance, SLOT(documentDestroyed(QObject *))); + connect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*))); addFileInfo(document); } } @@ -437,7 +437,7 @@ bool DocumentManager::removeDocument(IDocument *document) removeFileInfo(document); disconnect(document, SIGNAL(changed()), m_instance, SLOT(checkForNewFileName())); } - disconnect(document, SIGNAL(destroyed(QObject *)), m_instance, SLOT(documentDestroyed(QObject *))); + disconnect(document, SIGNAL(destroyed(QObject*)), m_instance, SLOT(documentDestroyed(QObject*))); return addWatcher; } diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index b875f9ed9e..ca05d2ef09 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -148,8 +148,8 @@ EditorManagerPlaceHolder::EditorManagerPlaceHolder(Core::IMode *mode, QWidget *p { setLayout(new QVBoxLayout); layout()->setMargin(0); - connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode *)), - this, SLOT(currentModeChanged(Core::IMode *))); + connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)), + this, SLOT(currentModeChanged(Core::IMode*))); currentModeChanged(ModeManager::currentMode()); } @@ -289,8 +289,8 @@ EditorManager::EditorManager(QWidget *parent) : { m_instance = this; - connect(ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext *)), - this, SLOT(handleContextChange(Core::IContext *))); + connect(ICore::instance(), SIGNAL(contextAboutToChange(Core::IContext*)), + this, SLOT(handleContextChange(Core::IContext*))); const Context editManagerContext(Constants::C_EDITORMANAGER); // combined context for edit & design modes diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp index 112f074feb..d2941cce64 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp @@ -79,7 +79,7 @@ OpenEditorsWindow::OpenEditorsWindow(QWidget *parent) : layout->setMargin(0); layout->addWidget(m_editorList); - connect(m_editorList, SIGNAL(itemClicked(QTreeWidgetItem*, int)), + connect(m_editorList, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(editorClicked(QTreeWidgetItem*))); } diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp index 4c909dd445..73ac585d0d 100644 --- a/src/plugins/coreplugin/navigationwidget.cpp +++ b/src/plugins/coreplugin/navigationwidget.cpp @@ -71,8 +71,8 @@ NavigationWidgetPlaceHolder::NavigationWidgetPlaceHolder(Core::IMode *mode, QWid { setLayout(new QVBoxLayout); layout()->setMargin(0); - connect(Core::ModeManager::instance(), SIGNAL(currentModeAboutToChange(Core::IMode *)), - this, SLOT(currentModeAboutToChange(Core::IMode *))); + connect(Core::ModeManager::instance(), SIGNAL(currentModeAboutToChange(Core::IMode*)), + this, SLOT(currentModeAboutToChange(Core::IMode*))); } NavigationWidgetPlaceHolder::~NavigationWidgetPlaceHolder() diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp index b22ae99e55..bcbf8b9b80 100644 --- a/src/plugins/coreplugin/outputpane.cpp +++ b/src/plugins/coreplugin/outputpane.cpp @@ -70,8 +70,8 @@ OutputPanePlaceHolder::OutputPanePlaceHolder(Core::IMode *mode, QSplitter* paren sp.setHorizontalStretch(0); setSizePolicy(sp); layout()->setMargin(0); - connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode *)), - this, SLOT(currentModeChanged(Core::IMode *))); + connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)), + this, SLOT(currentModeChanged(Core::IMode*))); } OutputPanePlaceHolder::~OutputPanePlaceHolder() diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp index 1d4617f2ab..4c29c7c43f 100644 --- a/src/plugins/coreplugin/rightpane.cpp +++ b/src/plugins/coreplugin/rightpane.cpp @@ -57,8 +57,8 @@ RightPanePlaceHolder::RightPanePlaceHolder(Core::IMode *mode, QWidget *parent) { setLayout(new QVBoxLayout); layout()->setMargin(0); - connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode *)), - this, SLOT(currentModeChanged(Core::IMode *))); + connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*)), + this, SLOT(currentModeChanged(Core::IMode*))); } RightPanePlaceHolder::~RightPanePlaceHolder() diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index d60a759f4e..7f2030fdb7 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -713,8 +713,8 @@ CppModelManager::CppModelManager(QObject *parent) connect(session, SIGNAL(projectAdded(ProjectExplorer::Project*)), this, SLOT(onProjectAdded(ProjectExplorer::Project*))); - connect(session, SIGNAL(aboutToRemoveProject(ProjectExplorer::Project *)), - this, SLOT(onAboutToRemoveProject(ProjectExplorer::Project *))); + connect(session, SIGNAL(aboutToRemoveProject(ProjectExplorer::Project*)), + this, SLOT(onAboutToRemoveProject(ProjectExplorer::Project*))); connect(session, SIGNAL(aboutToUnloadSession(QString)), this, SLOT(onAboutToUnloadSession())); @@ -728,11 +728,11 @@ CppModelManager::CppModelManager(QObject *parent) this, SLOT(onExtraDiagnosticsUpdated(QString))); // Listen for editor closed and opened events so that we can keep track of changing files - connect(Core::ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor *)), - this, SLOT(editorOpened(Core::IEditor *))); + connect(Core::ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor*)), + this, SLOT(editorOpened(Core::IEditor*))); - connect(Core::ICore::editorManager(), SIGNAL(editorAboutToClose(Core::IEditor *)), - this, SLOT(editorAboutToClose(Core::IEditor *))); + connect(Core::ICore::editorManager(), SIGNAL(editorAboutToClose(Core::IEditor*)), + this, SLOT(editorAboutToClose(Core::IEditor*))); m_completionFallback = new InternalCompletionAssistProvider; m_completionAssistProvider = m_completionFallback; diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index 944d471392..578cbaed95 100644 --- a/src/plugins/cpptools/symbolsfindfilter.cpp +++ b/src/plugins/cpptools/symbolsfindfilter.cpp @@ -186,7 +186,7 @@ void SymbolsFindFilter::startSearch(Find::SearchResult *search) connect(watcher, SIGNAL(finished()), this, SLOT(finish())); connect(watcher, SIGNAL(resultsReadyAt(int,int)), - this, SLOT(addResults(int, int))); + this, SLOT(addResults(int,int))); watcher->setFuture(QtConcurrent::run<Find::SearchResultItem, SymbolsFindParameters, CPlusPlus::Snapshot, QSet<QString> >(runSearch, parameters, m_manager->snapshot(), projectFileNames)); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index d0a31091d5..93c3db1390 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -792,7 +792,7 @@ public slots: void attachToQmlPort(); void startRemoteEngine(); void attachExternalApplication(); - Q_SLOT void attachExternalApplication(ProjectExplorer::RunControl *rc); + Q_SLOT void attachExternalApplication(ProjectExplorer::RunControl*rc); void runScheduled(); void attachCore(); void attachToRemoteServer(const QString &spec); @@ -1842,8 +1842,8 @@ void DebuggerPluginPrivate::editorOpened(IEditor *editor) if (!textEditor) return; connect(textEditor, - SIGNAL(markRequested(TextEditor::ITextEditor*,int, TextEditor::ITextEditor::MarkRequestKind)), - SLOT(requestMark(TextEditor::ITextEditor*,int, TextEditor::ITextEditor::MarkRequestKind))); + SIGNAL(markRequested(TextEditor::ITextEditor*,int,TextEditor::ITextEditor::MarkRequestKind)), + SLOT(requestMark(TextEditor::ITextEditor*,int,TextEditor::ITextEditor::MarkRequestKind))); connect(textEditor, SIGNAL(markContextMenuRequested(TextEditor::ITextEditor*,int,QMenu*)), SLOT(requestContextMenu(TextEditor::ITextEditor*,int,QMenu*))); diff --git a/src/plugins/debugger/gdb/codagdbadapter.cpp b/src/plugins/debugger/gdb/codagdbadapter.cpp index 7ffb4e7e96..1cc5135f5e 100644 --- a/src/plugins/debugger/gdb/codagdbadapter.cpp +++ b/src/plugins/debugger/gdb/codagdbadapter.cpp @@ -157,7 +157,7 @@ void CodaGdbAdapter::setupDeviceSignals() this, SLOT(codaLogMessage(QString))); connect(m_codaDevice.data(), SIGNAL(codaEvent(Coda::CodaEvent)), this, SLOT(codaEvent(Coda::CodaEvent))); - connect(SymbianUtils::SymbianDeviceManager::instance(), SIGNAL(deviceRemoved(const SymbianUtils::SymbianDevice)), + connect(SymbianUtils::SymbianDeviceManager::instance(), SIGNAL(deviceRemoved(SymbianUtils::SymbianDevice)), this, SLOT(codaDeviceRemoved(SymbianUtils::SymbianDevice))); } diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index cb418cf5a9..a20edc8a0e 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -4627,8 +4627,8 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &settingsIdHint) connect(gdbProc(), SIGNAL(error(QProcess::ProcessError)), SLOT(handleGdbError(QProcess::ProcessError))); - connect(gdbProc(), SIGNAL(finished(int, QProcess::ExitStatus)), - SLOT(handleGdbFinished(int, QProcess::ExitStatus))); + connect(gdbProc(), SIGNAL(finished(int,QProcess::ExitStatus)), + SLOT(handleGdbFinished(int,QProcess::ExitStatus))); connect(gdbProc(), SIGNAL(readyReadStandardOutput()), SLOT(readGdbStandardOutput())); connect(gdbProc(), SIGNAL(readyReadStandardError()), diff --git a/src/plugins/debugger/lldb/guest/lldbengineguest.cpp b/src/plugins/debugger/lldb/guest/lldbengineguest.cpp index 2651c98eb0..1884512369 100644 --- a/src/plugins/debugger/lldb/guest/lldbengineguest.cpp +++ b/src/plugins/debugger/lldb/guest/lldbengineguest.cpp @@ -95,8 +95,8 @@ LldbEngineGuest::LldbEngineGuest() qRegisterMetaType<lldb::SBEvent *>("lldb::SBEvent *"); m_worker->moveToThread(&m_wThread); - connect(m_worker, SIGNAL(lldbEvent(lldb::SBEvent *)), this, - SLOT(lldbEvent(lldb::SBEvent *)), Qt::BlockingQueuedConnection); + connect(m_worker, SIGNAL(lldbEvent(lldb::SBEvent*)), this, + SLOT(lldbEvent(lldb::SBEvent*)), Qt::BlockingQueuedConnection); m_wThread.start(); setObjectName(QLatin1String("LLDBEngineGuest")); } diff --git a/src/plugins/debugger/lldb/lldbenginehost.cpp b/src/plugins/debugger/lldb/lldbenginehost.cpp index a80854111f..17d4b9be51 100644 --- a/src/plugins/debugger/lldb/lldbenginehost.cpp +++ b/src/plugins/debugger/lldb/lldbenginehost.cpp @@ -70,10 +70,10 @@ SshIODevice::SshIODevice(Utils::SshRemoteProcessRunner *r) { setOpenMode(QIODevice::ReadWrite | QIODevice::Unbuffered); connect (runner, SIGNAL(processStarted()), this, SLOT(processStarted())); - connect(runner, SIGNAL(processOutputAvailable(const QByteArray &)), - this, SLOT(outputAvailable(const QByteArray &))); - connect(runner, SIGNAL(processErrorOutputAvailable(const QByteArray &)), - this, SLOT(errorOutputAvailable(const QByteArray &))); + connect(runner, SIGNAL(processOutputAvailable(QByteArray)), + this, SLOT(outputAvailable(QByteArray))); + connect(runner, SIGNAL(processErrorOutputAvailable(QByteArray)), + this, SLOT(errorOutputAvailable(QByteArray))); } SshIODevice::~SshIODevice() @@ -158,8 +158,8 @@ LldbEngineHost::LldbEngineHost(const DebuggerStartParameters &startParameters) } else { m_guestProcess = new QProcess(this); - connect(m_guestProcess, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(finished(int, QProcess::ExitStatus))); + connect(m_guestProcess, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(finished(int,QProcess::ExitStatus))); connect(m_guestProcess, SIGNAL(readyReadStandardError()), this, SLOT(stderrReady())); @@ -189,8 +189,8 @@ LldbEngineHost::~LldbEngineHost() showMessage(QLatin1String("tear down qtcreator-lldb")); if (m_guestProcess) { - disconnect(m_guestProcess, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(finished (int, QProcess::ExitStatus))); + disconnect(m_guestProcess, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(finished(int,QProcess::ExitStatus))); m_guestProcess->terminate(); diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp index 96078d6c90..4f836b2cfc 100644 --- a/src/plugins/debugger/memoryagent.cpp +++ b/src/plugins/debugger/memoryagent.cpp @@ -147,7 +147,7 @@ void MemoryAgent::connectBinEditorWidget(QWidget *w) SIGNAL(startOfFileRequested(Core::IEditor*)), SLOT(handleStartOfFileRequested(Core::IEditor*))); connect(w, - SIGNAL(endOfFileRequested(Core::IEditor *)), + SIGNAL(endOfFileRequested(Core::IEditor*)), SLOT(handleEndOfFileRequested(Core::IEditor*))); connect(w, SIGNAL(dataChanged(Core::IEditor*,quint64,QByteArray)), diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 384f70e3cf..84793fcb37 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -161,8 +161,8 @@ void PdbEngine::setupEngine() connect(&m_pdbProc, SIGNAL(error(QProcess::ProcessError)), SLOT(handlePdbError(QProcess::ProcessError))); - connect(&m_pdbProc, SIGNAL(finished(int, QProcess::ExitStatus)), - SLOT(handlePdbFinished(int, QProcess::ExitStatus))); + connect(&m_pdbProc, SIGNAL(finished(int,QProcess::ExitStatus)), + SLOT(handlePdbFinished(int,QProcess::ExitStatus))); connect(&m_pdbProc, SIGNAL(readyReadStandardOutput()), SLOT(readPdbStandardOutput())); connect(&m_pdbProc, SIGNAL(readyReadStandardError()), diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 2dab1a1f6b..5df56a20e2 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -326,8 +326,8 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters, SIGNAL(processExited(int)), SLOT(disconnected())); connect(&d->m_applicationLauncher, - SIGNAL(appendMessage(QString, Utils::OutputFormat)), - SLOT(appendMessage(QString, Utils::OutputFormat))); + SIGNAL(appendMessage(QString,Utils::OutputFormat)), + SLOT(appendMessage(QString,Utils::OutputFormat))); connect(&d->m_applicationLauncher, SIGNAL(processStarted()), &d->m_noDebugOutputTimer, diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index f07be2ace9..439d92fdde 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -202,10 +202,10 @@ FormEditorW::FormEditorW() : m_settingsPages.append(settingsPage); } - connect(Core::ICore::editorManager(), SIGNAL(currentEditorChanged(Core::IEditor *)), - this, SLOT(currentEditorChanged(Core::IEditor *))); - connect(m_shortcutMapper, SIGNAL(mapped(QObject *)), - this, SLOT(updateShortcut(QObject *))); + connect(Core::ICore::editorManager(), SIGNAL(currentEditorChanged(Core::IEditor*)), + this, SLOT(currentEditorChanged(Core::IEditor*))); + connect(m_shortcutMapper, SIGNAL(mapped(QObject*)), + this, SLOT(updateShortcut(QObject*))); } FormEditorW::~FormEditorW() @@ -606,7 +606,7 @@ void FormEditorW::setupActions() m_actionAboutPlugins->setEnabled(false); // FWM - connect(m_fwm, SIGNAL(activeFormWindowChanged(QDesignerFormWindowInterface *)), this, SLOT(activeFormWindowChanged(QDesignerFormWindowInterface *))); + connect(m_fwm, SIGNAL(activeFormWindowChanged(QDesignerFormWindowInterface*)), this, SLOT(activeFormWindowChanged(QDesignerFormWindowInterface*))); } QToolBar *FormEditorW::createEditorToolBar() const diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index aa551b6cea..e1ebe0cabd 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -111,8 +111,8 @@ QtCreatorIntegration::QtCreatorIntegration(QDesignerFormEditorInterface *core, F setResourceEditingEnabled(false); setSlotNavigationEnabled(true); #endif - connect(this, SIGNAL(navigateToSlot(QString, QString, QStringList)), - this, SLOT(slotNavigateToSlot(QString, QString, QStringList))); + connect(this, SIGNAL(navigateToSlot(QString,QString,QStringList)), + this, SLOT(slotNavigateToSlot(QString,QString,QStringList))); connect(this, SIGNAL(helpRequested(QString,QString)), this, SLOT(slotDesignerHelpRequested(QString,QString))); slotSyncSettingsToDesigner(); diff --git a/src/plugins/find/currentdocumentfind.cpp b/src/plugins/find/currentdocumentfind.cpp index 4a3bfa4bcb..c14ef63d7f 100644 --- a/src/plugins/find/currentdocumentfind.cpp +++ b/src/plugins/find/currentdocumentfind.cpp @@ -47,7 +47,7 @@ using namespace Find::Internal; CurrentDocumentFind::CurrentDocumentFind() : m_currentFind(0) { - connect(qApp, SIGNAL(focusChanged(QWidget*, QWidget*)), + connect(qApp, SIGNAL(focusChanged(QWidget*,QWidget*)), this, SLOT(updateCandidateFindFilter(QWidget*,QWidget*))); } diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp index 17fb484d36..1a7f8eefeb 100644 --- a/src/plugins/find/findtoolbar.cpp +++ b/src/plugins/find/findtoolbar.cpp @@ -116,7 +116,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen m_ui.findEdit->setPlaceholderText(QString()); m_ui.replaceEdit->setPlaceholderText(QString()); - connect(m_ui.findEdit, SIGNAL(textChanged(const QString&)), this, SLOT(invokeFindIncremental())); + connect(m_ui.findEdit, SIGNAL(textChanged(QString)), this, SLOT(invokeFindIncremental())); connect(m_ui.findEdit, SIGNAL(returnPressed()), this, SLOT(invokeFindEnter())); connect(m_ui.replaceEdit, SIGNAL(returnPressed()), this, SLOT(invokeReplaceEnter())); @@ -414,12 +414,12 @@ QString FindToolBar::getReplaceText() void FindToolBar::setFindText(const QString &text) { - disconnect(m_ui.findEdit, SIGNAL(textChanged(const QString&)), this, SLOT(invokeFindIncremental())); + disconnect(m_ui.findEdit, SIGNAL(textChanged(QString)), this, SLOT(invokeFindIncremental())); if (hasFindFlag(Find::FindRegularExpression)) m_ui.findEdit->setText(QRegExp::escape(text)); else m_ui.findEdit->setText(text); - connect(m_ui.findEdit, SIGNAL(textChanged(const QString&)), this, SLOT(invokeFindIncremental())); + connect(m_ui.findEdit, SIGNAL(textChanged(QString)), this, SLOT(invokeFindIncremental())); } void FindToolBar::selectFindText() diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp index d7da6323b1..95bfb05043 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp +++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp @@ -105,8 +105,8 @@ bool GenericProjectPlugin::initialize(const QStringList &, QString *errorMessage connect(m_editFilesAction, SIGNAL(triggered()), this, SLOT(editFiles())); connect(ProjectExplorer::ProjectExplorerPlugin::instance(), - SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)), - this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*))); + SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*)), + this, SLOT(updateContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*))); return true; } diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp index b7c5211a5d..8d93c92938 100644 --- a/src/plugins/help/filtersettingspage.cpp +++ b/src/plugins/help/filtersettingspage.cpp @@ -80,10 +80,10 @@ QWidget *FilterSettingsPage::createPage(QWidget *parent) updateFilterPage(); - connect(m_ui.attributeWidget, SIGNAL(itemChanged(QTreeWidgetItem*, int)), + connect(m_ui.attributeWidget, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(updateFilterMap())); connect(m_ui.filterWidget, - SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, + SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(updateAttributes(QListWidgetItem*))); connect(m_ui.filterAddButton, SIGNAL(clicked()), this, SLOT(addFilter())); connect(m_ui.filterRemoveButton, SIGNAL(clicked()), this, diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index a4611bd5ec..df86dc24c8 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -360,7 +360,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) QDesktopServices::setUrlHandler("qthelp", this, "handleHelpRequest"); connect(Core::ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*, - Core::IMode*)), this, SLOT(modeChanged(Core::IMode*, Core::IMode*))); + Core::IMode*)), this, SLOT(modeChanged(Core::IMode*,Core::IMode*))); m_externalWindow = new ExternalHelpWindow; m_mode = new HelpMode; @@ -426,8 +426,8 @@ void HelpPlugin::setupUi() connect(indexWindow, SIGNAL(linkActivated(QUrl)), m_centralWidget, SLOT(setSource(QUrl))); - connect(indexWindow, SIGNAL(linksActivated(QMap<QString, QUrl>, QString)), - m_centralWidget, SLOT(showTopicChooser(QMap<QString, QUrl>, QString))); + connect(indexWindow, SIGNAL(linksActivated(QMap<QString,QUrl>,QString)), + m_centralWidget, SLOT(showTopicChooser(QMap<QString,QUrl>,QString))); QMap<QString, Core::Command*> shortcutMap; QShortcut *shortcut = new QShortcut(m_splitter); diff --git a/src/plugins/locator/executefilter.cpp b/src/plugins/locator/executefilter.cpp index 2a33573b82..4446080aa1 100644 --- a/src/plugins/locator/executefilter.cpp +++ b/src/plugins/locator/executefilter.cpp @@ -49,8 +49,8 @@ ExecuteFilter::ExecuteFilter() m_process = new Utils::QtcProcess(this); m_process->setEnvironment(Utils::Environment::systemEnvironment()); - connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, - SLOT(finished(int, QProcess::ExitStatus))); + connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, + SLOT(finished(int,QProcess::ExitStatus))); connect(m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(readStandardOutput())); connect(m_process, SIGNAL(readyReadStandardError()), this, SLOT(readStandardError())); diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp index f7ba5f8a12..299469c1eb 100644 --- a/src/plugins/locator/locatorwidget.cpp +++ b/src/plugins/locator/locatorwidget.cpp @@ -338,7 +338,7 @@ LocatorWidget::LocatorWidget(LocatorPlugin *qop) : connect(m_refreshAction, SIGNAL(triggered()), m_locatorPlugin, SLOT(refresh())); connect(m_configureAction, SIGNAL(triggered()), this, SLOT(showConfigureDialog())); - connect(m_fileLineEdit, SIGNAL(textChanged(const QString&)), + connect(m_fileLineEdit, SIGNAL(textChanged(QString)), this, SLOT(showPopup())); connect(m_completionList, SIGNAL(activated(QModelIndex)), this, SLOT(scheduleAcceptCurrentEntry())); diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp index 1b32faccde..5811532695 100644 --- a/src/plugins/locator/settingspage.cpp +++ b/src/plugins/locator/settingspage.cpp @@ -85,8 +85,8 @@ QWidget *SettingsPage::createPage(QWidget *parent) m_ui.setupUi(m_page); connect(m_ui.filterList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(updateButtonStates())); - connect(m_ui.filterList, SIGNAL(itemActivated(QListWidgetItem *)), - this, SLOT(configureFilter(QListWidgetItem *))); + connect(m_ui.filterList, SIGNAL(itemActivated(QListWidgetItem*)), + this, SLOT(configureFilter(QListWidgetItem*))); connect(m_ui.editButton, SIGNAL(clicked()), this, SLOT(configureFilter())); connect(m_ui.addButton, SIGNAL(clicked()), diff --git a/src/plugins/macros/actionmacrohandler.cpp b/src/plugins/macros/actionmacrohandler.cpp index 61f39fd9b0..f425b8fb85 100644 --- a/src/plugins/macros/actionmacrohandler.cpp +++ b/src/plugins/macros/actionmacrohandler.cpp @@ -61,8 +61,8 @@ static quint8 ACTIONNAME = 0; ActionMacroHandler::ActionMacroHandler(): m_mapper(new QSignalMapper(this)) { - connect(m_mapper, SIGNAL(mapped(const QString &)), - this, SLOT(addActionEvent(const QString &))); + connect(m_mapper, SIGNAL(mapped(QString)), + this, SLOT(addActionEvent(QString))); const Core::ActionManager *am = Core::ICore::actionManager(); connect(am, SIGNAL(commandAdded(QString)), diff --git a/src/plugins/madde/maemodeploybymountsteps.cpp b/src/plugins/madde/maemodeploybymountsteps.cpp index bbf2bfdb44..03dde4061a 100644 --- a/src/plugins/madde/maemodeploybymountsteps.cpp +++ b/src/plugins/madde/maemodeploybymountsteps.cpp @@ -132,7 +132,7 @@ private: void cancelInstallation(); void handleInstallationSuccess(); - Q_SLOT void handleFileCopied(const RemoteLinux::DeployableFile &deployable); + Q_SLOT void handleFileCopied(const RemoteLinux::DeployableFile&deployable); MaemoRemoteCopyFacility * const m_copyFacility; mutable QList<DeployableFile> m_filesToCopy; diff --git a/src/plugins/madde/maemodeployconfigurationwidget.cpp b/src/plugins/madde/maemodeployconfigurationwidget.cpp index e4d8ae5cbe..8aaa4c4aab 100644 --- a/src/plugins/madde/maemodeployconfigurationwidget.cpp +++ b/src/plugins/madde/maemodeployconfigurationwidget.cpp @@ -72,8 +72,8 @@ MaemoDeployConfigurationWidget::MaemoDeployConfigurationWidget(QWidget *parent) mainLayout->addStretch(1); connect(m_remoteLinuxWidget, - SIGNAL(currentModelChanged(const RemoteLinux::DeployableFilesPerProFile *)), - SLOT(handleCurrentModelChanged(const RemoteLinux::DeployableFilesPerProFile *))); + SIGNAL(currentModelChanged(const RemoteLinux::DeployableFilesPerProFile*)), + SLOT(handleCurrentModelChanged(const RemoteLinux::DeployableFilesPerProFile*))); handleCurrentModelChanged(m_remoteLinuxWidget->currentModel()); } diff --git a/src/plugins/madde/maemodeviceconfigwizard.cpp b/src/plugins/madde/maemodeviceconfigwizard.cpp index 6b77357e8b..94f489ef00 100644 --- a/src/plugins/madde/maemodeviceconfigwizard.cpp +++ b/src/plugins/madde/maemodeviceconfigwizard.cpp @@ -457,7 +457,7 @@ private: m_keyDeployer->deployPublicKey(sshParams, m_wizardData.publicKeyFilePath); } - Q_SLOT void handleKeyDeploymentError(const QString &errorMsg) + Q_SLOT void handleKeyDeploymentError(const QString&errorMsg) { QMessageBox::critical(this, tr("Key Deployment Failure"), errorMsg); enableInput(); diff --git a/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp b/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp index 8f12c1babb..00a5b8c5a3 100644 --- a/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp +++ b/src/plugins/madde/maemopublishingresultpagefremantlefree.cpp @@ -57,8 +57,8 @@ void MaemoPublishingResultPageFremantleFree::initializePage() connect(cancelButton(), SIGNAL(clicked()), SLOT(handleCancelRequest())); connect(m_publisher, SIGNAL(finished()), SLOT(handleFinished())); connect(m_publisher, - SIGNAL(progressReport(QString, MaemoPublisherFremantleFree::OutputType)), - SLOT(handleProgress(QString, MaemoPublisherFremantleFree::OutputType))); + SIGNAL(progressReport(QString,MaemoPublisherFremantleFree::OutputType)), + SLOT(handleProgress(QString,MaemoPublisherFremantleFree::OutputType))); m_publisher->publish(); } diff --git a/src/plugins/madde/maemoqemumanager.cpp b/src/plugins/madde/maemoqemumanager.cpp index 10b3f2ac33..4f0a29e783 100644 --- a/src/plugins/madde/maemoqemumanager.cpp +++ b/src/plugins/madde/maemoqemumanager.cpp @@ -122,14 +122,14 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent) connect(m_qemuProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(qemuProcessError(QProcess::ProcessError))); - connect(m_qemuProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, + connect(m_qemuProcess, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(qemuProcessFinished())); connect(m_qemuProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(qemuOutput())); connect(m_qemuProcess, SIGNAL(readyReadStandardError()), this, SLOT(qemuOutput())); - connect(this, SIGNAL(qemuProcessStatus(QemuStatus, QString)), - this, SLOT(qemuStatusChanged(QemuStatus, QString))); + connect(this, SIGNAL(qemuProcessStatus(QemuStatus,QString)), + this, SLOT(qemuStatusChanged(QemuStatus,QString))); } Utils::FileSystemWatcher *MaemoQemuManager::runtimeRootWatcher() diff --git a/src/plugins/madde/maemorunconfiguration.cpp b/src/plugins/madde/maemorunconfiguration.cpp index d30c0c4039..845d1422fb 100644 --- a/src/plugins/madde/maemorunconfiguration.cpp +++ b/src/plugins/madde/maemorunconfiguration.cpp @@ -71,11 +71,11 @@ MaemoRunConfiguration::MaemoRunConfiguration(AbstractQt4MaemoTarget *parent, void MaemoRunConfiguration::init() { m_remoteMounts = new MaemoRemoteMountsModel(this); - connect(m_remoteMounts, SIGNAL(rowsInserted(QModelIndex, int, int)), this, + connect(m_remoteMounts, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(handleRemoteMountsChanged())); - connect(m_remoteMounts, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, + connect(m_remoteMounts, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(handleRemoteMountsChanged())); - connect(m_remoteMounts, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, + connect(m_remoteMounts, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(handleRemoteMountsChanged())); connect(m_remoteMounts, SIGNAL(modelReset()), SLOT(handleRemoteMountsChanged())); diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp index f1baf3158c..4c970aae7f 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.cpp +++ b/src/plugins/projectexplorer/abstractprocessstep.cpp @@ -126,8 +126,8 @@ void AbstractProcessStep::setOutputParser(ProjectExplorer::IOutputParser *parser m_outputParserChain = parser; if (m_outputParserChain) { - connect(parser, SIGNAL(addOutput(QString, ProjectExplorer::BuildStep::OutputFormat)), - this, SLOT(outputAdded(QString, ProjectExplorer::BuildStep::OutputFormat))); + connect(parser, SIGNAL(addOutput(QString,ProjectExplorer::BuildStep::OutputFormat)), + this, SLOT(outputAdded(QString,ProjectExplorer::BuildStep::OutputFormat))); connect(parser, SIGNAL(addTask(ProjectExplorer::Task)), this, SLOT(taskAdded(ProjectExplorer::Task))); } @@ -204,8 +204,8 @@ void AbstractProcessStep::run(QFutureInterface<bool> &fi) this, SLOT(processReadyReadStdError()), Qt::DirectConnection); - connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(slotProcessFinished(int, QProcess::ExitStatus)), + connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(slotProcessFinished(int,QProcess::ExitStatus)), Qt::DirectConnection); m_process->setCommand(m_param.effectiveCommand(), m_param.effectiveArguments()); diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index af094f58d2..9c21a7dcfc 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -105,8 +105,8 @@ ApplicationLauncher::ApplicationLauncher(QObject *parent) this, SLOT(readStandardOutput())); connect(&d->m_guiProcess, SIGNAL(error(QProcess::ProcessError)), this, SLOT(guiProcessError())); - connect(&d->m_guiProcess, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(processDone(int, QProcess::ExitStatus))); + connect(&d->m_guiProcess, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(processDone(int,QProcess::ExitStatus))); connect(&d->m_guiProcess, SIGNAL(started()), this, SLOT(bringToForeground())); diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index 5011acf34e..983d50d0a6 100644 --- a/src/plugins/projectexplorer/buildmanager.cpp +++ b/src/plugins/projectexplorer/buildmanager.cpp @@ -132,11 +132,11 @@ BuildManager::BuildManager(ProjectExplorerPlugin *parent) this, SLOT(progressChanged())); connect(&d->m_watcher, SIGNAL(progressTextChanged(QString)), this, SLOT(progressTextChanged())); - connect(&d->m_watcher, SIGNAL(progressRangeChanged(int, int)), + connect(&d->m_watcher, SIGNAL(progressRangeChanged(int,int)), this, SLOT(progressChanged())); - connect(parent->session(), SIGNAL(aboutToRemoveProject(ProjectExplorer::Project *)), - this, SLOT(aboutToRemoveProject(ProjectExplorer::Project *))); + connect(parent->session(), SIGNAL(aboutToRemoveProject(ProjectExplorer::Project*)), + this, SLOT(aboutToRemoveProject(ProjectExplorer::Project*))); d->m_outputWindow = new Internal::CompileOutputWindow(this); pm->addObject(d->m_outputWindow); @@ -499,8 +499,8 @@ bool BuildManager::buildQueueAppend(QList<BuildStep *> steps, QStringList names) BuildStep *bs = steps.at(i); connect(bs, SIGNAL(addTask(ProjectExplorer::Task)), this, SLOT(addToTaskWindow(ProjectExplorer::Task))); - connect(bs, SIGNAL(addOutput(QString, ProjectExplorer::BuildStep::OutputFormat, ProjectExplorer::BuildStep::OutputNewlineSetting)), - this, SLOT(addToOutputWindow(QString, ProjectExplorer::BuildStep::OutputFormat, ProjectExplorer::BuildStep::OutputNewlineSetting))); + connect(bs, SIGNAL(addOutput(QString,ProjectExplorer::BuildStep::OutputFormat,ProjectExplorer::BuildStep::OutputNewlineSetting)), + this, SLOT(addToOutputWindow(QString,ProjectExplorer::BuildStep::OutputFormat,ProjectExplorer::BuildStep::OutputNewlineSetting))); if (bs->enabled()) { init = bs->init(); if (!init) diff --git a/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp b/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp index 108a352afa..dec04e4950 100644 --- a/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp +++ b/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp @@ -122,8 +122,8 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE connect(m_executableChooser, SIGNAL(changed(QString)), this, SLOT(executableEdited())); - connect(m_commandLineArgumentsLineEdit, SIGNAL(textEdited(const QString&)), - this, SLOT(argumentsEdited(const QString&))); + connect(m_commandLineArgumentsLineEdit, SIGNAL(textEdited(QString)), + this, SLOT(argumentsEdited(QString))); connect(m_workingDirectory, SIGNAL(changed(QString)), this, SLOT(workingDirectoryEdited())); connect(m_useTerminalCheck, SIGNAL(toggled(bool)), diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp index c2e5e242b9..7083002ab5 100644 --- a/src/plugins/projectexplorer/environmentwidget.cpp +++ b/src/plugins/projectexplorer/environmentwidget.cpp @@ -139,7 +139,7 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent, QWidget *additionalDetails vbox->addWidget(d->m_detailsContainer); - connect(d->m_model, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), + connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(updateButtons())); connect(d->m_editButton, SIGNAL(clicked(bool)), diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index b89e3a4274..c4fb459e18 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -164,8 +164,8 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) setLayout(layout); // connections - connect(m_listView, SIGNAL(activated(const QModelIndex&)), - this, SLOT(slotOpenItem(const QModelIndex&))); + connect(m_listView, SIGNAL(activated(QModelIndex)), + this, SLOT(slotOpenItem(QModelIndex))); setAutoSynchronization(true); } diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 70ea3ab7ea..3044da6c86 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -534,13 +534,13 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi this, SLOT(projectRemoved(ProjectExplorer::Project*))); connect(m_listWidgets[TARGET], SIGNAL(changeActiveProjectConfiguration(ProjectExplorer::ProjectConfiguration*)), - this, SLOT(setActiveTarget(ProjectExplorer::ProjectConfiguration *))); + this, SLOT(setActiveTarget(ProjectExplorer::ProjectConfiguration*))); connect(m_listWidgets[BUILD], SIGNAL(changeActiveProjectConfiguration(ProjectExplorer::ProjectConfiguration*)), - this, SLOT(setActiveBuildConfiguration(ProjectExplorer::ProjectConfiguration *))); + this, SLOT(setActiveBuildConfiguration(ProjectExplorer::ProjectConfiguration*))); connect(m_listWidgets[DEPLOY], SIGNAL(changeActiveProjectConfiguration(ProjectExplorer::ProjectConfiguration*)), - this, SLOT(setActiveDeployConfiguration(ProjectExplorer::ProjectConfiguration *))); + this, SLOT(setActiveDeployConfiguration(ProjectExplorer::ProjectConfiguration*))); connect(m_listWidgets[RUN], SIGNAL(changeActiveProjectConfiguration(ProjectExplorer::ProjectConfiguration*)), - this, SLOT(setActiveRunConfiguration(ProjectExplorer::ProjectConfiguration *))); + this, SLOT(setActiveRunConfiguration(ProjectExplorer::ProjectConfiguration*))); } void MiniProjectTargetSelector::setActiveTarget(ProjectExplorer::ProjectConfiguration *pc) diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp index ff6623b31e..98049a2a3a 100644 --- a/src/plugins/projectexplorer/processstep.cpp +++ b/src/plugins/projectexplorer/processstep.cpp @@ -263,7 +263,7 @@ ProcessStepConfigWidget::ProcessStepConfigWidget(ProcessStep *step) connect(m_ui.workingDirectory, SIGNAL(changed(QString)), this, SLOT(workingDirectoryLineEditTextEdited())); - connect(m_ui.commandArgumentsLineEdit, SIGNAL(textEdited(const QString&)), + connect(m_ui.commandArgumentsLineEdit, SIGNAL(textEdited(QString)), this, SLOT(commandArgumentsLineEditTextEdited())); } diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 68a354792c..9e68aeda44 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -343,17 +343,17 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er d->m_session = new SessionManager(this); - connect(d->m_session, SIGNAL(projectAdded(ProjectExplorer::Project *)), + connect(d->m_session, SIGNAL(projectAdded(ProjectExplorer::Project*)), this, SIGNAL(fileListChanged())); - connect(d->m_session, SIGNAL(aboutToRemoveProject(ProjectExplorer::Project *)), - this, SLOT(invalidateProject(ProjectExplorer::Project *))); - connect(d->m_session, SIGNAL(projectRemoved(ProjectExplorer::Project *)), + connect(d->m_session, SIGNAL(aboutToRemoveProject(ProjectExplorer::Project*)), + this, SLOT(invalidateProject(ProjectExplorer::Project*))); + connect(d->m_session, SIGNAL(projectRemoved(ProjectExplorer::Project*)), this, SIGNAL(fileListChanged())); connect(d->m_session, SIGNAL(projectAdded(ProjectExplorer::Project*)), this, SLOT(projectAdded(ProjectExplorer::Project*))); connect(d->m_session, SIGNAL(projectRemoved(ProjectExplorer::Project*)), this, SLOT(projectRemoved(ProjectExplorer::Project*))); - connect(d->m_session, SIGNAL(startupProjectChanged(ProjectExplorer::Project *)), + connect(d->m_session, SIGNAL(startupProjectChanged(ProjectExplorer::Project*)), this, SLOT(startupProjectChanged())); connect(d->m_session, SIGNAL(dependencyChanged(ProjectExplorer::Project*,ProjectExplorer::Project*)), this, SLOT(updateActions())); @@ -377,8 +377,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er addAutoReleasedObject(new VcsAnnotateTaskHandler); d->m_buildManager = new BuildManager(this); - connect(d->m_buildManager, SIGNAL(buildStateChanged(ProjectExplorer::Project *)), - this, SLOT(buildStateChanged(ProjectExplorer::Project *))); + connect(d->m_buildManager, SIGNAL(buildStateChanged(ProjectExplorer::Project*)), + this, SLOT(buildStateChanged(ProjectExplorer::Project*))); connect(d->m_buildManager, SIGNAL(buildQueueFinished(bool)), this, SLOT(buildQueueFinished(bool))); @@ -386,7 +386,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er d->m_outputPane = new AppOutputPane; addAutoReleasedObject(d->m_outputPane); - connect(d->m_session, SIGNAL(projectRemoved(ProjectExplorer::Project *)), + connect(d->m_session, SIGNAL(projectRemoved(ProjectExplorer::Project*)), d->m_outputPane, SLOT(projectRemoved())); connect(d->m_outputPane, SIGNAL(runControlStarted(ProjectExplorer::RunControl*)), @@ -517,7 +517,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er d->m_openWithMenu = openWith->menu(); d->m_openWithMenu->setTitle(tr("Open With")); - connect(d->m_openWithMenu, SIGNAL(triggered(QAction *)), + connect(d->m_openWithMenu, SIGNAL(triggered(QAction*)), Core::DocumentManager::instance(), SLOT(slotExecuteOpenWithMenuAction(QAction*))); // @@ -1468,8 +1468,8 @@ void ProjectExplorerPlugin::restoreSession() // update welcome page connect(Core::ModeManager::instance(), - SIGNAL(currentModeChanged(Core::IMode*, Core::IMode*)), - SLOT(currentModeChanged(Core::IMode*, Core::IMode*))); + SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)), + SLOT(currentModeChanged(Core::IMode*,Core::IMode*))); connect(d->m_welcomePage, SIGNAL(requestSession(QString)), this, SLOT(loadSession(QString))); connect(d->m_welcomePage, SIGNAL(requestProject(QString)), this, SLOT(openProjectWelcomePage(QString))); @@ -2831,7 +2831,7 @@ void ProjectExplorerPlugin::updateSessionMenu() { d->m_sessionMenu->clear(); QActionGroup *ag = new QActionGroup(d->m_sessionMenu); - connect(ag, SIGNAL(triggered(QAction *)), this, SLOT(setSession(QAction *))); + connect(ag, SIGNAL(triggered(QAction*)), this, SLOT(setSession(QAction*))); const QString &activeSession = d->m_session->activeSession(); foreach (const QString &session, d->m_session->sessions()) { QAction *act = ag->addAction(session); diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index f7d2b64b93..a7c5758531 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -168,23 +168,23 @@ FlatModel::FlatModel(SessionNode *rootNode, QObject *parent) connect(watcher, SIGNAL(hasBuildTargetsChanged(ProjectExplorer::ProjectNode*)), this, SLOT(hasBuildTargetsChanged(ProjectExplorer::ProjectNode*))); - connect(watcher, SIGNAL(foldersAboutToBeAdded(FolderNode *, const QList<FolderNode*> &)), - this, SLOT(foldersAboutToBeAdded(FolderNode *, const QList<FolderNode*> &))); + connect(watcher, SIGNAL(foldersAboutToBeAdded(FolderNode*,QList<FolderNode*>)), + this, SLOT(foldersAboutToBeAdded(FolderNode*,QList<FolderNode*>))); connect(watcher, SIGNAL(foldersAdded()), this, SLOT(foldersAdded())); - connect(watcher, SIGNAL(foldersAboutToBeRemoved(FolderNode *, const QList<FolderNode*> &)), - this, SLOT(foldersAboutToBeRemoved(FolderNode *, const QList<FolderNode*> &))); + connect(watcher, SIGNAL(foldersAboutToBeRemoved(FolderNode*,QList<FolderNode*>)), + this, SLOT(foldersAboutToBeRemoved(FolderNode*,QList<FolderNode*>))); connect(watcher, SIGNAL(foldersRemoved()), this, SLOT(foldersRemoved())); - connect(watcher, SIGNAL(filesAboutToBeAdded(FolderNode *,const QList<FileNode*> &)), - this, SLOT(filesAboutToBeAdded(FolderNode *, const QList<FileNode *> &))); + connect(watcher, SIGNAL(filesAboutToBeAdded(FolderNode*,QList<FileNode*>)), + this, SLOT(filesAboutToBeAdded(FolderNode*,QList<FileNode*>))); connect(watcher, SIGNAL(filesAdded()), this, SLOT(filesAdded())); - connect(watcher, SIGNAL(filesAboutToBeRemoved(FolderNode *, const QList<FileNode*> &)), - this, SLOT(filesAboutToBeRemoved(FolderNode *, const QList<FileNode*> &))); + connect(watcher, SIGNAL(filesAboutToBeRemoved(FolderNode*,QList<FileNode*>)), + this, SLOT(filesAboutToBeRemoved(FolderNode*,QList<FileNode*>))); connect(watcher, SIGNAL(filesRemoved()), this, SLOT(filesRemoved())); } diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index cc902ebb89..8f5f4932b0 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -300,8 +300,8 @@ void ProjectNode::registerWatcher(NodesWatcher *watcher) { if (!watcher) return; - connect(watcher, SIGNAL(destroyed(QObject *)), - this, SLOT(watcherDestroyed(QObject *))); + connect(watcher, SIGNAL(destroyed(QObject*)), + this, SLOT(watcherDestroyed(QObject*))); m_watchers.append(watcher); foreach (ProjectNode *subProject, m_subProjectNodes) subProject->registerWatcher(watcher); diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index 502fa22503..077060147f 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -110,10 +110,10 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) NodesWatcher *watcher = new NodesWatcher(this); m_explorer->session()->sessionNode()->registerWatcher(watcher); - connect(watcher, SIGNAL(foldersAboutToBeRemoved(FolderNode *, const QList<FolderNode*> &)), - this, SLOT(foldersAboutToBeRemoved(FolderNode *, const QList<FolderNode*> &))); - connect(watcher, SIGNAL(filesAboutToBeRemoved(FolderNode *, const QList<FileNode*> &)), - this, SLOT(filesAboutToBeRemoved(FolderNode *, const QList<FileNode*> &))); + connect(watcher, SIGNAL(foldersAboutToBeRemoved(FolderNode*,QList<FolderNode*>)), + this, SLOT(foldersAboutToBeRemoved(FolderNode*,QList<FolderNode*>))); + connect(watcher, SIGNAL(filesAboutToBeRemoved(FolderNode*,QList<FileNode*>)), + this, SLOT(filesAboutToBeRemoved(FolderNode*,QList<FileNode*>))); m_view = new ProjectTreeView; m_view->setModel(m_model); @@ -138,16 +138,16 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) // connections connect(m_model, SIGNAL(modelReset()), this, SLOT(initView())); - connect(m_view, SIGNAL(activated(const QModelIndex&)), - this, SLOT(openItem(const QModelIndex&))); - connect(m_view->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)), - this, SLOT(handleCurrentItemChange(const QModelIndex&))); - connect(m_view, SIGNAL(customContextMenuRequested(const QPoint&)), - this, SLOT(showContextMenu(const QPoint&))); - connect(m_explorer->session(), SIGNAL(singleProjectAdded(ProjectExplorer::Project *)), - this, SLOT(handleProjectAdded(ProjectExplorer::Project *))); - connect(m_explorer->session(), SIGNAL(startupProjectChanged(ProjectExplorer::Project *)), - this, SLOT(startupProjectChanged(ProjectExplorer::Project *))); + connect(m_view, SIGNAL(activated(QModelIndex)), + this, SLOT(openItem(QModelIndex))); + connect(m_view->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), + this, SLOT(handleCurrentItemChange(QModelIndex))); + connect(m_view, SIGNAL(customContextMenuRequested(QPoint)), + this, SLOT(showContextMenu(QPoint))); + connect(m_explorer->session(), SIGNAL(singleProjectAdded(ProjectExplorer::Project*)), + this, SLOT(handleProjectAdded(ProjectExplorer::Project*))); + connect(m_explorer->session(), SIGNAL(startupProjectChanged(ProjectExplorer::Project*)), + this, SLOT(startupProjectChanged(ProjectExplorer::Project*))); connect(m_explorer->session(), SIGNAL(aboutToLoadSession(QString)), this, SLOT(disableAutoExpand())); @@ -260,13 +260,13 @@ void ProjectTreeWidget::setAutoSynchronization(bool sync, bool syncNow) if (debug) qDebug() << (m_autoSync ? "Enabling auto synchronization" : "Disabling auto synchronization"); if (m_autoSync) { - connect(m_explorer, SIGNAL(currentNodeChanged(ProjectExplorer::Node*, ProjectExplorer::Project*)), - this, SLOT(setCurrentItem(ProjectExplorer::Node*, ProjectExplorer::Project*))); + connect(m_explorer, SIGNAL(currentNodeChanged(ProjectExplorer::Node*,ProjectExplorer::Project*)), + this, SLOT(setCurrentItem(ProjectExplorer::Node*,ProjectExplorer::Project*))); if (syncNow) setCurrentItem(m_explorer->currentNode(), ProjectExplorerPlugin::currentProject()); } else { - disconnect(m_explorer, SIGNAL(currentNodeChanged(ProjectExplorer::Node*, ProjectExplorer::Project*)), - this, SLOT(setCurrentItem(ProjectExplorer::Node*, ProjectExplorer::Project*))); + disconnect(m_explorer, SIGNAL(currentNodeChanged(ProjectExplorer::Node*,ProjectExplorer::Project*)), + this, SLOT(setCurrentItem(ProjectExplorer::Node*,ProjectExplorer::Project*))); } } diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index 2cbb0f5e5c..5ea53f46c1 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -250,7 +250,7 @@ ProjectWindow::ProjectWindow(QWidget *parent) this, SLOT(deregisterProject(ProjectExplorer::Project*))); connect(session, SIGNAL(startupProjectChanged(ProjectExplorer::Project*)), - this, SLOT(startupProjectChanged(ProjectExplorer::Project *))); + this, SLOT(startupProjectChanged(ProjectExplorer::Project*))); // Update properties to empty project for now: showProperties(-1, -1); @@ -269,8 +269,8 @@ void ProjectWindow::extensionsInitialized() QList<IProjectPanelFactory *> list = ExtensionSystem::PluginManager::instance()->getObjects<IProjectPanelFactory>(); qSort(list.begin(), list.end(), &IPanelFactory::prioritySort); foreach (IProjectPanelFactory *fac, list) - connect (fac, SIGNAL(projectUpdated(ProjectExplorer::Project *)), - this, SLOT(projectUpdated(ProjectExplorer::Project *))); + connect (fac, SIGNAL(projectUpdated(ProjectExplorer::Project*)), + this, SLOT(projectUpdated(ProjectExplorer::Project*))); } diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index e121ac0959..103bf494c2 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -100,9 +100,9 @@ SessionManager::SessionManager(QObject *parent) EditorManager *em = ICore::editorManager(); - connect(em, SIGNAL(editorCreated(Core::IEditor *, QString)), - this, SLOT(configureEditor(Core::IEditor *, QString))); - connect(ProjectExplorerPlugin::instance(), SIGNAL(currentProjectChanged(ProjectExplorer::Project *)), + connect(em, SIGNAL(editorCreated(Core::IEditor*,QString)), + this, SLOT(configureEditor(Core::IEditor*,QString))); + connect(ProjectExplorerPlugin::instance(), SIGNAL(currentProjectChanged(ProjectExplorer::Project*)), this, SLOT(updateWindowTitle())); connect(em, SIGNAL(editorOpened(Core::IEditor*)), this, SLOT(markSessionFileDirty())); @@ -772,11 +772,11 @@ void SessionManager::restoreEditors(const Utils::PersistentSettingsReader &reade { const QVariant &editorsettings = reader.restoreValue(QLatin1String("EditorSettings")); if (editorsettings.isValid()) { - connect(ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor *)), + connect(ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor*)), this, SLOT(sessionLoadingProgress())); ICore::editorManager()->restoreState( QByteArray::fromBase64(editorsettings.toByteArray())); - disconnect(ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor *)), + disconnect(ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor*)), this, SLOT(sessionLoadingProgress())); } } diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp index 384f8a1c9d..fd9a48aa75 100644 --- a/src/plugins/projectexplorer/sessiondialog.cpp +++ b/src/plugins/projectexplorer/sessiondialog.cpp @@ -140,10 +140,10 @@ SessionDialog::SessionDialog(SessionManager *sessionManager, QWidget *parent) connect(m_ui.btSwitch, SIGNAL(clicked()), this, SLOT(switchToSession())); connect(m_ui.btRename, SIGNAL(clicked()), this, SLOT(rename())); - connect(m_ui.sessionList, SIGNAL(itemDoubleClicked (QListWidgetItem *)), + connect(m_ui.sessionList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(switchToSession())); - connect(m_ui.sessionList, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), + connect(m_ui.sessionList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this, SLOT(updateActions())); m_ui.whatsASessionLabel->setOpenExternalLinks(true); diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp index d70b8108ae..39dee5ef15 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp @@ -424,8 +424,8 @@ QList<RewriterView::Error> DesignDocumentController::loadMaster(QPlainTextEdit * d->rewriterView = new RewriterView(RewriterView::Amend, d->masterModel.data()); d->rewriterView->setTextModifier( d->textModifier); - connect(d->rewriterView.data(), SIGNAL(errorsChanged(const QList<RewriterView::Error> &)), - this, SIGNAL(qmlErrorsChanged(const QList<RewriterView::Error> &))); + connect(d->rewriterView.data(), SIGNAL(errorsChanged(QList<RewriterView::Error>)), + this, SIGNAL(qmlErrorsChanged(QList<RewriterView::Error>))); d->masterModel->attachView(d->rewriterView.data()); d->model = d->masterModel; diff --git a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp index 047c38334c..c56b0260c4 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp @@ -157,7 +157,7 @@ void CustomDragAndDropIcon::paintEvent(QPaintEvent *event) void CustomDragAndDropIcon::enter() { - connect(&m_timeLine, SIGNAL( frameChanged (int)), this, SLOT(animateDrag(int))); + connect(&m_timeLine, SIGNAL(frameChanged(int)), this, SLOT(animateDrag(int))); m_timeLine.setFrameRange(0, 10); m_timeLine.setDuration(10); m_timeLine.setLoopCount(1); @@ -170,7 +170,7 @@ void CustomDragAndDropIcon::enter() void CustomDragAndDropIcon::leave() { - connect(&m_timeLine, SIGNAL( frameChanged (int)), this, SLOT(animateDrag(int))); + connect(&m_timeLine, SIGNAL(frameChanged(int)), this, SLOT(animateDrag(int))); m_timeLine.setFrameRange(0, 10); m_timeLine.setDuration(250); m_timeLine.setLoopCount(1); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp index 263743e066..0adaed1692 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp @@ -95,7 +95,7 @@ ItemLibraryTreeView::ItemLibraryTreeView(QWidget *parent) : setDragEnabled(true); setDragDropMode(QAbstractItemView::DragOnly); setUniformRowHeights(true); - connect(this, SIGNAL(clicked(const QModelIndex &)), this, SLOT(activateItem(const QModelIndex &))); + connect(this, SIGNAL(clicked(QModelIndex)), this, SLOT(activateItem(QModelIndex))); setHeaderHidden(true); setIndentation(20); setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp index 76192b898f..d5dbe61db9 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp @@ -831,7 +831,7 @@ public: QComboBoxDeclarativeUI(QObject *parent = 0) : QObject(parent), m_itemsSet(false) { cb = qobject_cast<QComboBox*>(parent); - connect(cb, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(setCurrentText(const QString &))); + connect(cb, SIGNAL(currentIndexChanged(QString)), this, SLOT(setCurrentText(QString))); } QString currentText() const diff --git a/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp index 1b1ab73be0..f7b407190d 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/filewidget.cpp @@ -58,7 +58,7 @@ FileWidget::FileWidget(QWidget *parent) : QWidget(parent), m_filter("(*.*)"), m_ m_pushButton->setText("..."); connect(m_lineEdit, SIGNAL(editingFinished()), this, SLOT(lineEditChanged())); connect(m_pushButton, SIGNAL(pressed()), this, SLOT(buttonPressed())); - connect(m_comboBox, SIGNAL(editTextChanged(const QString &)), this, SLOT(comboBoxChanged())); + connect(m_comboBox, SIGNAL(editTextChanged(QString)), this, SLOT(comboBoxChanged())); m_currentPath = QDir::currentPath(); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp index 24059afbac..a4c235aa6b 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp @@ -113,7 +113,7 @@ PropertyEditor::NodeType::NodeType(PropertyEditor *propertyEditor) : m_contextObject->setBackendValues(&m_backendValuesPropertyMap); ctxt->setContextObject(m_contextObject.data()); - connect(&m_backendValuesPropertyMap, SIGNAL(valueChanged(const QString&, const QVariant&)), propertyEditor, SLOT(changeValue(const QString&))); + connect(&m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant)), propertyEditor, SLOT(changeValue(QString))); } PropertyEditor::NodeType::~NodeType() @@ -127,7 +127,7 @@ void setupPropertyEditorValue(const QString &name, QDeclarativePropertyMap *prop PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(QDeclarativeMetaType::toQObject(propertyMap->value(propertyName))); if (!valueObject) { valueObject = new PropertyEditorValue(propertyMap); - QObject::connect(valueObject, SIGNAL(valueChanged(QString, const QVariant&)), propertyMap, SIGNAL(valueChanged(QString, const QVariant&))); + QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), propertyMap, SIGNAL(valueChanged(QString,QVariant))); QObject::connect(valueObject, SIGNAL(expressionChanged(QString)), propertyEditor, SLOT(changeExpression(QString))); propertyMap->insert(propertyName, QVariant::fromValue(valueObject)); } @@ -146,7 +146,7 @@ void createPropertyEditorValue(const QmlObjectNode &fxObjectNode, const QString PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(QDeclarativeMetaType::toQObject(propertyMap->value(propertyName))); if (!valueObject) { valueObject = new PropertyEditorValue(propertyMap); - QObject::connect(valueObject, SIGNAL(valueChanged(QString, const QVariant&)), propertyMap, SIGNAL(valueChanged(QString, const QVariant&))); + QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), propertyMap, SIGNAL(valueChanged(QString,QVariant))); QObject::connect(valueObject, SIGNAL(expressionChanged(QString)), propertyEditor, SLOT(changeExpression(QString))); propertyMap->insert(propertyName, QVariant::fromValue(valueObject)); } @@ -202,7 +202,7 @@ void PropertyEditor::NodeType::setup(const QmlObjectNode &fxObjectNode, const QS valueObject->setName("className"); valueObject->setModelNode(fxObjectNode.modelNode()); valueObject->setValue(fxObjectNode.modelNode().simplifiedTypeName()); - QObject::connect(valueObject, SIGNAL(valueChanged(QString, const QVariant&)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString, const QVariant&))); + QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant))); m_backendValuesPropertyMap.insert("className", QVariant::fromValue(valueObject)); // id @@ -211,7 +211,7 @@ void PropertyEditor::NodeType::setup(const QmlObjectNode &fxObjectNode, const QS valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap); valueObject->setName("id"); valueObject->setValue(fxObjectNode.id()); - QObject::connect(valueObject, SIGNAL(valueChanged(QString, const QVariant&)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString, const QVariant&))); + QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant))); m_backendValuesPropertyMap.insert("id", QVariant::fromValue(valueObject)); // anchors @@ -253,7 +253,7 @@ void PropertyEditor::NodeType::initialSetup(const QString &typeName, const QUrl valueObject->setName("className"); valueObject->setValue(typeName); - QObject::connect(valueObject, SIGNAL(valueChanged(QString, const QVariant&)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString, const QVariant&))); + QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant))); m_backendValuesPropertyMap.insert("className", QVariant::fromValue(valueObject)); // id @@ -262,7 +262,7 @@ void PropertyEditor::NodeType::initialSetup(const QString &typeName, const QUrl valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap); valueObject->setName("id"); valueObject->setValue("id"); - QObject::connect(valueObject, SIGNAL(valueChanged(QString, const QVariant&)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString, const QVariant&))); + QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant))); m_backendValuesPropertyMap.insert("id", QVariant::fromValue(valueObject)); ctxt->setContextProperty("anchorBackend", &m_backendAnchorBinding); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index 899f33d9ce..2b276161f8 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -378,12 +378,12 @@ void PropertyEditorNodeWrapper::setup() PropertyEditorValue *valueObject = new PropertyEditorValue(&m_valuesPropertyMap); valueObject->setName(propertyName); valueObject->setValue(fxObjectNode.instanceValue(propertyName)); - connect(valueObject, SIGNAL(valueChanged(QString, const QVariant&)), &m_valuesPropertyMap, SIGNAL(valueChanged(QString, const QVariant&))); + connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_valuesPropertyMap, SIGNAL(valueChanged(QString,QVariant))); m_valuesPropertyMap.insert(propertyName, QVariant::fromValue(valueObject)); } } } - connect(&m_valuesPropertyMap, SIGNAL(valueChanged(const QString &, const QVariant&)), this, SLOT(changeValue(const QString&))); + connect(&m_valuesPropertyMap, SIGNAL(valueChanged(QString,QVariant)), this, SLOT(changeValue(QString))); emit propertiesChanged(); emit existsChanged(); diff --git a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp index b35fa09d35..a989e2924f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/resetwidget.cpp @@ -110,7 +110,7 @@ void ResetWidget::addPropertyItem(const QString &name, int row) ResetWidgetPushButton *b = new ResetWidgetPushButton(m_tableWidget); b->setName(name); b->setText("reset"); - connect(b, SIGNAL(pressed(const QString &)), this, SLOT(buttonPressed(const QString &))); + connect(b, SIGNAL(pressed(QString)), this, SLOT(buttonPressed(QString))); b->setMaximumHeight(15); b->setMinimumHeight(10); m_tableWidget->setCellWidget(row, 2, b); diff --git a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp index ccef1508fd..23e7fac242 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp @@ -70,7 +70,7 @@ void SiblingComboBox::changeSelection(int i) void SiblingComboBox::setup() { - connect(this, SIGNAL(currentIndexChanged (int)), this, SLOT(changeSelection(int))); + connect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(changeSelection(int))); if (!m_itemNode.isValid()) return; @@ -83,7 +83,7 @@ void SiblingComboBox::setup() if (node.isValid() && (node.instanceParent().modelNode() != m_itemNode.instanceParent().modelNode())) m_itemList.removeAll(node); - disconnect(this, SIGNAL(currentIndexChanged (int)), this, SLOT(changeSelection(int))); + disconnect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(changeSelection(int))); clear(); foreach (const QmlItemNode &itemNode, m_itemList) { @@ -109,7 +109,7 @@ void SiblingComboBox::setup() insertItem(0, parentString); } setCurrentIndex(m_itemList.indexOf(m_selectedItemNode)); - connect(this, SIGNAL(currentIndexChanged (int)), this, SLOT(changeSelection(int))); + connect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(changeSelection(int))); } diff --git a/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp b/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp index 3e94704fd4..77c04a026d 100644 --- a/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp +++ b/src/plugins/qmldesigner/designercore/model/componenttextmodifier.cpp @@ -41,8 +41,8 @@ ComponentTextModifier::ComponentTextModifier(TextModifier *originalModifier, int { connect(m_originalModifier, SIGNAL(textChanged()), this, SIGNAL(textChanged())); - connect(m_originalModifier, SIGNAL(replaced(int, int, int)), this, SIGNAL(replaced(int, int, int))); - connect(m_originalModifier, SIGNAL(moved(const TextModifier::MoveInfo &)), this, SIGNAL(moved(const TextModifier::MoveInfo &))); + connect(m_originalModifier, SIGNAL(replaced(int,int,int)), this, SIGNAL(replaced(int,int,int))); + connect(m_originalModifier, SIGNAL(moved(TextModifier::MoveInfo)), this, SIGNAL(moved(TextModifier::MoveInfo))); } ComponentTextModifier::~ComponentTextModifier() diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp index 0be27aea3d..dc9793f93e 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.cpp @@ -40,7 +40,7 @@ void ModelNodePositionRecalculator::connectTo(TextModifier *textModifier) { Q_ASSERT(textModifier); - connect(textModifier, SIGNAL(moved(const TextModifier::MoveInfo &)), this, SLOT(moved(const TextModifier::MoveInfo &))); + connect(textModifier, SIGNAL(moved(TextModifier::MoveInfo)), this, SLOT(moved(TextModifier::MoveInfo))); connect(textModifier, SIGNAL(replaced(int,int,int)), this, SLOT(replaced(int,int,int))); } diff --git a/src/plugins/qmldesigner/qmlcontextpane.cpp b/src/plugins/qmldesigner/qmlcontextpane.cpp index 03f867aae6..92a73b57da 100644 --- a/src/plugins/qmldesigner/qmlcontextpane.cpp +++ b/src/plugins/qmldesigner/qmlcontextpane.cpp @@ -396,7 +396,7 @@ ContextPaneWidget* QmlContextPane::contextWidget() m_widget = new ContextPaneWidget; connect(m_widget.data(), SIGNAL(propertyChanged(QString,QVariant)), this, SLOT(onPropertyChanged(QString,QVariant))); connect(m_widget.data(), SIGNAL(removeProperty(QString)), this, SLOT(onPropertyRemoved(QString))); - connect(m_widget.data(), SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SLOT(onPropertyRemovedAndChange(QString,QString,QVariant, bool))); + connect(m_widget.data(), SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SLOT(onPropertyRemovedAndChange(QString,QString,QVariant,bool))); connect(m_widget.data(), SIGNAL(enabledChanged(bool)), this, SLOT(onEnabledChanged(bool))); connect(m_widget.data(), SIGNAL(pinnedChanged(bool)), this, SLOT(onPinnedChanged(bool))); } diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp index 7b98329583..02825d01e4 100644 --- a/src/plugins/qmljseditor/quicktoolbar.cpp +++ b/src/plugins/qmljseditor/quicktoolbar.cpp @@ -456,7 +456,7 @@ ContextPaneWidget* QuickToolBar::contextWidget() m_widget = new ContextPaneWidget; connect(m_widget.data(), SIGNAL(propertyChanged(QString,QVariant)), this, SLOT(onPropertyChanged(QString,QVariant))); connect(m_widget.data(), SIGNAL(removeProperty(QString)), this, SLOT(onPropertyRemoved(QString))); - connect(m_widget.data(), SIGNAL(removeAndChangeProperty(QString,QString,QVariant, bool)), this, SLOT(onPropertyRemovedAndChange(QString,QString,QVariant, bool))); + connect(m_widget.data(), SIGNAL(removeAndChangeProperty(QString,QString,QVariant,bool)), this, SLOT(onPropertyRemovedAndChange(QString,QString,QVariant,bool))); connect(m_widget.data(), SIGNAL(enabledChanged(bool)), this, SLOT(onEnabledChanged(bool))); connect(m_widget.data(), SIGNAL(pinnedChanged(bool)), this, SLOT(onPinnedChanged(bool))); connect(m_widget.data(), SIGNAL(closed()), this, SIGNAL(closed())); diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp index e97a07e7f0..4947d67345 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp @@ -108,8 +108,8 @@ void QmlProjectItem::setSourceDirectory(const QString &directoryPath) FileFilterBaseItem *fileFilter = qobject_cast<FileFilterBaseItem*>(contentElement); if (fileFilter) { fileFilter->setDefaultDirectory(directoryPath); - connect(fileFilter, SIGNAL(filesChanged(QSet<QString>, QSet<QString>)), - this, SIGNAL(qmlFilesChanged(QSet<QString>, QSet<QString>))); + connect(fileFilter, SIGNAL(filesChanged(QSet<QString>,QSet<QString>)), + this, SIGNAL(qmlFilesChanged(QSet<QString>,QSet<QString>))); } } diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 89efc17182..cce723a264 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -109,8 +109,8 @@ void QmlProject::parseProject(RefreshOptions options) if (component->isReady() && qobject_cast<QmlProjectItem*>(component->create())) { m_projectItem = qobject_cast<QmlProjectItem*>(component->create()); - connect(m_projectItem.data(), SIGNAL(qmlFilesChanged(QSet<QString>, QSet<QString>)), - this, SLOT(refreshFiles(QSet<QString>, QSet<QString>))); + connect(m_projectItem.data(), SIGNAL(qmlFilesChanged(QSet<QString>,QSet<QString>)), + this, SLOT(refreshFiles(QSet<QString>,QSet<QString>))); } else { messageManager->printToOutputPane(tr("Error while loading project file %1.").arg(m_fileName)); messageManager->printToOutputPane(component->errorString(), true); diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp index 3935404892..316b7cb117 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp @@ -69,7 +69,7 @@ QmlProjectRunControl::QmlProjectRunControl(QmlProjectRunConfiguration *runConfig m_mainQmlFile = runConfiguration->mainScript(); connect(&m_applicationLauncher, SIGNAL(appendMessage(QString,Utils::OutputFormat)), - this, SLOT(slotAppendMessage(QString, Utils::OutputFormat))); + this, SLOT(slotAppendMessage(QString,Utils::OutputFormat))); connect(&m_applicationLauncher, SIGNAL(processExited(int)), this, SLOT(processExited(int))); connect(&m_applicationLauncher, SIGNAL(bringToForegroundRequested(qint64)), diff --git a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp index d60e4181f3..0de80b70c6 100644 --- a/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp +++ b/src/plugins/qt4projectmanager/customwidgetwizard/classlist.cpp @@ -100,7 +100,7 @@ ClassList::ClassList(QWidget *parent) : m_model(new ClassModel) { setModel(m_model); - connect(itemDelegate(), SIGNAL(closeEditor(QWidget *, QAbstractItemDelegate::EndEditHint)), SLOT(classEdited())); + connect(itemDelegate(), SIGNAL(closeEditor(QWidget*,QAbstractItemDelegate::EndEditHint)), SLOT(classEdited())); connect(selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), this, SLOT(slotCurrentRowChanged(QModelIndex,QModelIndex))); } diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 30bf73e05d..6211c2f5bc 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -523,7 +523,7 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step) updateEffectiveQMakeCall(); updateQmlDebuggingOption(); - connect(m_ui->qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(const QString&)), + connect(m_ui->qmakeAdditonalArgumentsLineEdit, SIGNAL(textEdited(QString)), this, SLOT(qmakeArgumentsLineEdited())); connect(m_ui->buildConfigurationComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(buildConfigurationSelected())); diff --git a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp index 7b433b33c1..5f9c6dfa17 100644 --- a/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp @@ -130,7 +130,7 @@ bool CodaRunControl::setupLauncher() appendMessage(tr("Could not open serial device: %1\n").arg(m_codaDevice->device()->errorString()), Utils::ErrorMessageFormat); return false; } - connect(SymbianUtils::SymbianDeviceManager::instance(), SIGNAL(deviceRemoved(const SymbianUtils::SymbianDevice)), + connect(SymbianUtils::SymbianDeviceManager::instance(), SIGNAL(deviceRemoved(SymbianUtils::SymbianDevice)), this, SLOT(deviceRemoved(SymbianUtils::SymbianDevice))); m_state = StateConnecting; m_codaDevice->sendSerialPing(false); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp index 123fa418e6..2f5f464225 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp @@ -407,8 +407,8 @@ bool S60CreatePackageStep::createOnePackage() this, SLOT(processReadyReadStdError()), Qt::DirectConnection); - connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(packageDone(int, QProcess::ExitStatus)), + connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(packageDone(int,QProcess::ExitStatus)), Qt::DirectConnection); m_process->setWorkingDirectory(wd.absolutePath()); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp index f5ec79b453..dc0b3733a4 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp @@ -113,7 +113,7 @@ void S60DeployConfiguration::ctor() setDefaultDisplayName(defaultDisplayName()); // TODO disable S60 Deploy Configuration while parsing // requires keeping track of the parsing state of the project - connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool, bool)), + connect(qt4Target()->qt4Project(), SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)), this, SLOT(slotTargetInformationChanged(Qt4ProjectManager::Qt4ProFileNode*,bool,bool))); connect(qt4Target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)), this, SLOT(updateActiveBuildConfiguration(ProjectExplorer::BuildConfiguration*))); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp index d6fd37d426..1a186a0d07 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp @@ -355,8 +355,8 @@ S60EmulatorRunControl::S60EmulatorRunControl(S60EmulatorRunConfiguration *runCon m_executable = runConfiguration->executable(); connect(&m_applicationLauncher, SIGNAL(applicationError(QString)), this, SLOT(slotError(QString))); - connect(&m_applicationLauncher, SIGNAL(appendMessage(QString, Utils::OutputFormat)), - this, SLOT(slotAppendMessage(QString, Utils::OutputFormat))); + connect(&m_applicationLauncher, SIGNAL(appendMessage(QString,Utils::OutputFormat)), + this, SLOT(slotAppendMessage(QString,Utils::OutputFormat))); connect(&m_applicationLauncher, SIGNAL(processExited(int)), this, SLOT(processExited(int))); connect(&m_applicationLauncher, SIGNAL(bringToForegroundRequested(quint64)), diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index fffc3171ea..e935e5cea3 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -390,7 +390,7 @@ bool Qt4Project::fromMap(const QVariantMap &map) onAddedTarget(t); connect(m_nodesWatcher, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)), - this, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *,bool,bool))); + this, SIGNAL(proFileUpdated(Qt4ProjectManager::Qt4ProFileNode*,bool,bool))); // Now we emit update once :) m_rootProjectNode->emitProFileUpdatedRecursive(); diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp index 9b705c560b..789c069921 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp +++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp @@ -224,11 +224,11 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString * connect(m_cleanSubProjectContextMenu, SIGNAL(triggered()), m_qt4ProjectManager, SLOT(cleanSubDirContextMenu())); connect(m_projectExplorer, - SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*)), - this, SLOT(updateContextMenu(ProjectExplorer::Project*, ProjectExplorer::Node*))); + SIGNAL(aboutToShowContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*)), + this, SLOT(updateContextMenu(ProjectExplorer::Project*,ProjectExplorer::Node*))); - connect(m_projectExplorer->buildManager(), SIGNAL(buildStateChanged(ProjectExplorer::Project *)), - this, SLOT(buildStateChanged(ProjectExplorer::Project *))); + connect(m_projectExplorer->buildManager(), SIGNAL(buildStateChanged(ProjectExplorer::Project*)), + this, SLOT(buildStateChanged(ProjectExplorer::Project*))); connect(m_projectExplorer->session(), SIGNAL(startupProjectChanged(ProjectExplorer::Project*)), this, SLOT(startupProjectChanged())); connect(m_projectExplorer, SIGNAL(currentNodeChanged(ProjectExplorer::Node*,ProjectExplorer::Project*)), diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index 6cda0c5919..754b886f96 100644 --- a/src/plugins/qt4projectmanager/qt4target.cpp +++ b/src/plugins/qt4projectmanager/qt4target.cpp @@ -436,8 +436,8 @@ void Qt4BaseTarget::onAddedBuildConfiguration(ProjectExplorer::BuildConfiguratio Q_ASSERT(qt4bc); connect(qt4bc, SIGNAL(buildDirectoryInitialized()), this, SIGNAL(buildDirectoryInitialized())); - connect(qt4bc, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *)), - this, SLOT(onProFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *))); + connect(qt4bc, SIGNAL(proFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration*)), + this, SLOT(onProFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration*))); } void Qt4BaseTarget::onProFileEvaluateNeeded(Qt4ProjectManager::Qt4BuildConfiguration *bc) diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp index 1e3594d90f..1cfb964739 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp @@ -241,8 +241,8 @@ QWizard *AbstractMobileAppWizard::createWizardDialog(QWidget *parent, wdlg->m_maemoOptionsPage->setPngIcon(app()->pngIcon64()); wdlg->m_harmattanOptionsPage->setPngIcon(app()->pngIcon80()); wdlg->m_harmattanOptionsPage->setBoosterOptionEnabled(app()->canSupportMeegoBooster()); - connect(wdlg, SIGNAL(projectParametersChanged(QString, QString)), - SLOT(useProjectPath(QString, QString))); + connect(wdlg, SIGNAL(projectParametersChanged(QString,QString)), + SLOT(useProjectPath(QString,QString))); wdlg->addExtensionPages(wizardDialogParameters.extensionPages()); return wdlg; diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index a86bd49b25..a87ee0b8c8 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -182,7 +182,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<BaseQtVersion *> } m_ui->qtdirList->expandAll(); - connect(m_versionUi->nameEdit, SIGNAL(textEdited(const QString &)), + connect(m_versionUi->nameEdit, SIGNAL(textEdited(QString)), this, SLOT(updateCurrentQtName())); connect(m_versionUi->editPathPushButton, SIGNAL(clicked()), @@ -193,8 +193,8 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<BaseQtVersion *> connect(m_ui->delButton, SIGNAL(clicked()), this, SLOT(removeQtDir())); - connect(m_ui->qtdirList, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), - this, SLOT(versionChanged(QTreeWidgetItem *, QTreeWidgetItem *))); + connect(m_ui->qtdirList, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), + this, SLOT(versionChanged(QTreeWidgetItem*,QTreeWidgetItem*))); connect(m_debuggingHelperUi->rebuildButton, SIGNAL(clicked()), this, SLOT(buildDebuggingHelper())); diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp index acd43b91d9..7a6254b997 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.cpp +++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp @@ -131,7 +131,7 @@ void GenericDirectUploadService::handleSftpInitialized() } Q_ASSERT(!d->filesToUpload.isEmpty()); - connect(d->uploader.data(), SIGNAL(finished(Utils::SftpJobId, QString)), + connect(d->uploader.data(), SIGNAL(finished(Utils::SftpJobId,QString)), SLOT(handleUploadFinished(Utils::SftpJobId,QString))); d->state = Uploading; uploadNextFile(); diff --git a/src/plugins/remotelinux/packageuploader.cpp b/src/plugins/remotelinux/packageuploader.cpp index f958bf931a..4e17ad1104 100644 --- a/src/plugins/remotelinux/packageuploader.cpp +++ b/src/plugins/remotelinux/packageuploader.cpp @@ -68,8 +68,8 @@ void PackageUploader::uploadPackage(const SshConnection::Ptr &connection, SLOT(handleSftpChannelInitialized())); connect(m_uploader.data(), SIGNAL(initializationFailed(QString)), this, SLOT(handleSftpChannelInitializationFailed(QString))); - connect(m_uploader.data(), SIGNAL(finished(Utils::SftpJobId, QString)), - this, SLOT(handleSftpJobFinished(Utils::SftpJobId, QString))); + connect(m_uploader.data(), SIGNAL(finished(Utils::SftpJobId,QString)), + this, SLOT(handleSftpJobFinished(Utils::SftpJobId,QString))); m_uploader->initialize(); } diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index cdd3af193d..150a4a3ce8 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -96,8 +96,8 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context, Qt::QueuedConnection); connect(m_resourceEditor, SIGNAL(dirtyChanged(bool)), this, SLOT(dirtyChanged(bool))); - connect(m_resourceEditor, SIGNAL(undoStackChanged(bool, bool)), - this, SLOT(onUndoStackChanged(bool, bool))); + connect(m_resourceEditor, SIGNAL(undoStackChanged(bool,bool)), + this, SLOT(onUndoStackChanged(bool,bool))); connect(m_resourceEditor, SIGNAL(showContextMenu(QPoint,QString)), this, SLOT(showContextMenu(QPoint,QString))); connect(m_resourceEditor->commandHistory(), SIGNAL(indexChanged(int)), diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index ff9c8ada74..d0e448433e 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -51,8 +51,8 @@ using namespace Core; BaseHoverHandler::BaseHoverHandler(QObject *parent) : QObject(parent), m_diagnosticTooltip(false) { // Listen for editor opened events in order to connect to tooltip/helpid requests - connect(ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor *)), - this, SLOT(editorOpened(Core::IEditor *))); + connect(ICore::editorManager(), SIGNAL(editorOpened(Core::IEditor*)), + this, SLOT(editorOpened(Core::IEditor*))); } BaseHoverHandler::~BaseHoverHandler() @@ -63,11 +63,11 @@ void BaseHoverHandler::editorOpened(Core::IEditor *editor) if (acceptEditor(editor)) { BaseTextEditor *textEditor = qobject_cast<BaseTextEditor *>(editor); if (textEditor) { - connect(textEditor, SIGNAL(tooltipRequested(TextEditor::ITextEditor*, QPoint, int)), - this, SLOT(showToolTip(TextEditor::ITextEditor*, QPoint, int))); + connect(textEditor, SIGNAL(tooltipRequested(TextEditor::ITextEditor*,QPoint,int)), + this, SLOT(showToolTip(TextEditor::ITextEditor*,QPoint,int))); - connect(textEditor, SIGNAL(contextHelpIdRequested(TextEditor::ITextEditor*, int)), - this, SLOT(updateContextHelpId(TextEditor::ITextEditor*, int))); + connect(textEditor, SIGNAL(contextHelpIdRequested(TextEditor::ITextEditor*,int)), + this, SLOT(updateContextHelpId(TextEditor::ITextEditor*,int))); } } } diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 53788c861c..9f8540965c 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -247,7 +247,7 @@ BaseTextEditorWidget::BaseTextEditorWidget(QWidget *parent) connect(this, SIGNAL(blockCountChanged(int)), this, SLOT(slotUpdateExtraAreaWidth())); connect(this, SIGNAL(modificationChanged(bool)), this, SLOT(slotModificationChanged(bool))); connect(this, SIGNAL(cursorPositionChanged()), this, SLOT(slotCursorPositionChanged())); - connect(this, SIGNAL(updateRequest(QRect, int)), this, SLOT(slotUpdateRequest(QRect, int))); + connect(this, SIGNAL(updateRequest(QRect,int)), this, SLOT(slotUpdateRequest(QRect,int))); connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged())); // (void) new QShortcut(tr("CTRL+L"), this, SLOT(centerCursor()), 0, Qt::WidgetShortcut); @@ -2544,7 +2544,7 @@ void BaseTextEditorWidgetPrivate::setupDocumentSignals(BaseTextDocument *documen QObject::connect(doc, SIGNAL(contentsChange(int,int,int)), q, SLOT(editorContentsChange(int,int,int)), Qt::DirectConnection); QObject::connect(document, SIGNAL(changed()), q, SIGNAL(changed())); - QObject::connect(document, SIGNAL(titleChanged(QString)), q, SLOT(setDisplayName(const QString &))); + QObject::connect(document, SIGNAL(titleChanged(QString)), q, SLOT(setDisplayName(QString))); QObject::connect(document, SIGNAL(aboutToReload()), q, SLOT(documentAboutToBeReloaded())); QObject::connect(document, SIGNAL(reloaded()), q, SLOT(documentReloaded())); q->slotUpdateExtraAreaWidth(); diff --git a/src/plugins/texteditor/basetextmark.cpp b/src/plugins/texteditor/basetextmark.cpp index 6247838e02..9737314651 100644 --- a/src/plugins/texteditor/basetextmark.cpp +++ b/src/plugins/texteditor/basetextmark.cpp @@ -45,8 +45,8 @@ BaseTextMarkRegistry::BaseTextMarkRegistry(QObject *parent) : QObject(parent) { Core::EditorManager *em = Core::EditorManager::instance(); - connect(em, SIGNAL(editorOpened(Core::IEditor *)), - SLOT(editorOpened(Core::IEditor *))); + connect(em, SIGNAL(editorOpened(Core::IEditor*)), + SLOT(editorOpened(Core::IEditor*))); } void BaseTextMarkRegistry::add(BaseTextMark *mark) diff --git a/src/plugins/texteditor/icodestylepreferences.cpp b/src/plugins/texteditor/icodestylepreferences.cpp index 8f0f444214..51e8225208 100644 --- a/src/plugins/texteditor/icodestylepreferences.cpp +++ b/src/plugins/texteditor/icodestylepreferences.cpp @@ -192,8 +192,8 @@ void ICodeStylePreferences::setCurrentDelegate(ICodeStylePreferences *delegate) this, SIGNAL(currentTabSettingsChanged(TextEditor::TabSettings))); disconnect(d->m_currentDelegate, SIGNAL(currentValueChanged(QVariant)), this, SIGNAL(currentValueChanged(QVariant))); - disconnect(d->m_currentDelegate, SIGNAL(currentPreferencesChanged(TextEditor::ICodeStylePreferences *)), - this, SIGNAL(currentPreferencesChanged(TextEditor::ICodeStylePreferences *))); + disconnect(d->m_currentDelegate, SIGNAL(currentPreferencesChanged(TextEditor::ICodeStylePreferences*)), + this, SIGNAL(currentPreferencesChanged(TextEditor::ICodeStylePreferences*))); } d->m_currentDelegate = delegate; if (d->m_currentDelegate) { @@ -201,8 +201,8 @@ void ICodeStylePreferences::setCurrentDelegate(ICodeStylePreferences *delegate) this, SIGNAL(currentTabSettingsChanged(TextEditor::TabSettings))); connect(d->m_currentDelegate, SIGNAL(currentValueChanged(QVariant)), this, SIGNAL(currentValueChanged(QVariant))); - connect(d->m_currentDelegate, SIGNAL(currentPreferencesChanged(TextEditor::ICodeStylePreferences *)), - this, SIGNAL(currentPreferencesChanged(TextEditor::ICodeStylePreferences *))); + connect(d->m_currentDelegate, SIGNAL(currentPreferencesChanged(TextEditor::ICodeStylePreferences*)), + this, SIGNAL(currentPreferencesChanged(TextEditor::ICodeStylePreferences*))); } emit currentDelegateChanged(d->m_currentDelegate); emit currentPreferencesChanged(currentPreferences()); diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp index 6e719a4ea5..40eebb44d0 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp +++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp @@ -360,15 +360,15 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w) loadSettings(); loadSnippetGroup(m_ui.groupCombo->currentIndex()); - connect(m_model, SIGNAL(rowsInserted(QModelIndex, int, int)), + connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectSnippet(QModelIndex,int))); - connect(m_model, SIGNAL(rowsInserted(QModelIndex, int, int)), + connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(markSnippetsCollection())); - connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), + connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(markSnippetsCollection())); - connect(m_model, SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)), + connect(m_model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), this, SLOT(selectMovedSnippet(QModelIndex,int,int,QModelIndex,int))); - connect(m_model, SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)), + connect(m_model, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), this, SLOT(markSnippetsCollection())); connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(markSnippetsCollection())); diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index e430a23b5a..7d0f18dbac 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -577,8 +577,8 @@ IAnalyzerEngine *CallgrindToolPrivate::createEngine(const AnalyzerStartParameter { CallgrindEngine *engine = new CallgrindEngine(q, sp, runConfiguration); - connect(engine, SIGNAL(parserDataReady(CallgrindEngine *)), - SLOT(takeParserData(CallgrindEngine *))); + connect(engine, SIGNAL(parserDataReady(CallgrindEngine*)), + SLOT(takeParserData(CallgrindEngine*))); connect(engine, SIGNAL(starting(const Analyzer::IAnalyzerEngine*)), SLOT(engineStarting(const Analyzer::IAnalyzerEngine*))); connect(engine, SIGNAL(finished()), diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 8609909f65..4ea3b451ee 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -257,7 +257,7 @@ void MemcheckTool::maybeActiveRunConfigurationChanged() m_settings = settings; QTC_ASSERT(m_settings, return); - connect(m_settings, SIGNAL(destroyed(QObject *)), SLOT(settingsDestroyed(QObject *))); + connect(m_settings, SIGNAL(destroyed(QObject*)), SLOT(settingsDestroyed(QObject*))); ValgrindBaseSettings *memcheckSettings = m_settings->subConfig<ValgrindBaseSettings>(); QTC_ASSERT(memcheckSettings, return); @@ -443,7 +443,7 @@ QWidget *MemcheckTool::createWidgets() m_filterMenu->addSeparator(); m_filterMenu->addAction(m_filterProjectAction); m_filterMenu->addAction(m_suppressionSeparator); - connect(m_filterMenu, SIGNAL(triggered(QAction *)), SLOT(updateErrorFilter())); + connect(m_filterMenu, SIGNAL(triggered(QAction*)), SLOT(updateErrorFilter())); filterButton->setMenu(m_filterMenu); layout->addWidget(filterButton); diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index c07420fd71..d7f35b68ce 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -112,8 +112,8 @@ bool ValgrindEngine::start() connect(runner(), SIGNAL(processOutputReceived(QByteArray,Utils::OutputFormat)), SLOT(receiveProcessOutput(QByteArray,Utils::OutputFormat))); - connect(runner(), SIGNAL(processErrorReceived(QString, QProcess::ProcessError)), - SLOT(receiveProcessError(QString, QProcess::ProcessError))); + connect(runner(), SIGNAL(processErrorReceived(QString,QProcess::ProcessError)), + SLOT(receiveProcessError(QString,QProcess::ProcessError))); connect(runner(), SIGNAL(finished()), SLOT(runnerFinished())); diff --git a/src/plugins/valgrind/valgrindprocess.cpp b/src/plugins/valgrind/valgrindprocess.cpp index 8ae5bc20a8..b85a720487 100644 --- a/src/plugins/valgrind/valgrindprocess.cpp +++ b/src/plugins/valgrind/valgrindprocess.cpp @@ -56,8 +56,8 @@ ValgrindProcess::ValgrindProcess(QObject *parent) LocalValgrindProcess::LocalValgrindProcess(QObject *parent) : ValgrindProcess(parent) { - connect(&m_process, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SIGNAL(finished(int, QProcess::ExitStatus))); + connect(&m_process, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SIGNAL(finished(int,QProcess::ExitStatus))); connect(&m_process, SIGNAL(started()), this, SIGNAL(started())); connect(&m_process, SIGNAL(error(QProcess::ProcessError)), diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp index 2c7e8e1c82..cdc84cfd3f 100644 --- a/src/plugins/valgrind/valgrindrunner.cpp +++ b/src/plugins/valgrind/valgrindrunner.cpp @@ -105,8 +105,8 @@ void ValgrindRunner::Private::run(ValgrindProcess *_process) q, SIGNAL(processOutputReceived(QByteArray,Utils::OutputFormat))); QObject::connect(process, SIGNAL(started()), q, SLOT(processStarted())); - QObject::connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), - q, SLOT(processFinished(int, QProcess::ExitStatus))); + QObject::connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), + q, SLOT(processFinished(int,QProcess::ExitStatus))); QObject::connect(process, SIGNAL(error(QProcess::ProcessError)), q, SLOT(processError(QProcess::ProcessError))); diff --git a/src/plugins/valgrind/xmlprotocol/threadedparser.cpp b/src/plugins/valgrind/xmlprotocol/threadedparser.cpp index 4d5acf855b..489f7e8ce0 100644 --- a/src/plugins/valgrind/xmlprotocol/threadedparser.cpp +++ b/src/plugins/valgrind/xmlprotocol/threadedparser.cpp @@ -119,11 +119,11 @@ void ThreadedParser::parse(QIODevice *device) connect(parser, SIGNAL(internalError(QString)), SLOT(slotInternalError(QString)), Qt::QueuedConnection); - connect(parser, SIGNAL(errorCount(qint64, qint64)), - SIGNAL(errorCount(qint64, qint64)), + connect(parser, SIGNAL(errorCount(qint64,qint64)), + SIGNAL(errorCount(qint64,qint64)), Qt::QueuedConnection); - connect(parser, SIGNAL(suppressionCount(QString, qint64)), - SIGNAL(suppressionCount(QString, qint64)), + connect(parser, SIGNAL(suppressionCount(QString,qint64)), + SIGNAL(suppressionCount(QString,qint64)), Qt::QueuedConnection); connect(parser, SIGNAL(finished()), SIGNAL(finished()), Qt::QueuedConnection); diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 8ba89add11..e0298938d5 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -547,7 +547,7 @@ void VcsBasePlugin::initializeVcs(Core::IVersionControl *vc) if (!VcsBasePluginPrivate::m_listener) VcsBasePluginPrivate::m_listener = new Internal::StateListener(plugin); connect(VcsBasePluginPrivate::m_listener, - SIGNAL(stateChanged(VcsBase::Internal::State, Core::IVersionControl*)), + SIGNAL(stateChanged(VcsBase::Internal::State,Core::IVersionControl*)), this, SLOT(slotStateChanged(VcsBase::Internal::State,Core::IVersionControl*))); } diff --git a/src/shared/designerintegrationv2/widgethost.cpp b/src/shared/designerintegrationv2/widgethost.cpp index 65aa26c935..f599b9d409 100644 --- a/src/shared/designerintegrationv2/widgethost.cpp +++ b/src/shared/designerintegrationv2/widgethost.cpp @@ -75,8 +75,8 @@ void WidgetHost::setFormWindow(QDesignerFormWindowInterface *fw) m_formWindow->setAutoFillBackground(true); m_formWindow->setBackgroundRole(QPalette::Background); - connect(m_formResizer, SIGNAL(formWindowSizeChanged(QRect, QRect)), - this, SLOT(fwSizeWasChanged(QRect, QRect))); + connect(m_formResizer, SIGNAL(formWindowSizeChanged(QRect,QRect)), + this, SLOT(fwSizeWasChanged(QRect,QRect))); } QSize WidgetHost::formWindowSize() const diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index 48d41cdd2f..38f2c01280 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -446,7 +446,7 @@ void BookmarkWidget::setup(bool showButtons) vlayout->addWidget(toolbar); searchField->installEventFilter(this); - connect(searchField, SIGNAL(textChanged(const QString &)), this, + connect(searchField, SIGNAL(textChanged(QString)), this, SLOT(filterChanged())); treeView = new TreeView(this); diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp index d888c3e8db..1f43e30912 100644 --- a/src/shared/help/indexwindow.cpp +++ b/src/shared/help/indexwindow.cpp @@ -90,10 +90,10 @@ IndexWindow::IndexWindow() SLOT(disableSearchLineEdit())); connect(engine->indexModel(), SIGNAL(indexCreated()), this, SLOT(enableSearchLineEdit())); - connect(m_indexWidget, SIGNAL(linkActivated(QUrl, QString)), this, + connect(m_indexWidget, SIGNAL(linkActivated(QUrl,QString)), this, SIGNAL(linkActivated(QUrl))); - connect(m_indexWidget, SIGNAL(linksActivated(QMap<QString, QUrl>, QString)), - this, SIGNAL(linksActivated(QMap<QString, QUrl>, QString))); + connect(m_indexWidget, SIGNAL(linksActivated(QMap<QString,QUrl>,QString)), + this, SIGNAL(linksActivated(QMap<QString,QUrl>,QString))); connect(m_searchLineEdit, SIGNAL(returnPressed()), m_indexWidget, SLOT(activateCurrentItem())); m_indexWidget->setFrameStyle(QFrame::NoFrame); diff --git a/src/shared/modeltest/modeltest.cpp b/src/shared/modeltest/modeltest.cpp index a08ca2506a..b177322d13 100644 --- a/src/shared/modeltest/modeltest.cpp +++ b/src/shared/modeltest/modeltest.cpp @@ -44,28 +44,28 @@ ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(pare { Q_ASSERT(model); - connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), + connect(model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(runAllTests())); - connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(runAllTests())); - connect(model, SIGNAL(columnsInserted(QModelIndex, int, int)), + connect(model, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(runAllTests())); - connect(model, SIGNAL(columnsRemoved(QModelIndex, int, int)), + connect(model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(runAllTests())); - connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), + connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(runAllTests())); - connect(model, SIGNAL(headerDataChanged(Qt::Orientation, int, int)), + connect(model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), this, SLOT(runAllTests())); - connect(model, SIGNAL(layoutAboutToBeChanged ()), this, SLOT(runAllTests())); - connect(model, SIGNAL(layoutChanged ()), this, SLOT(runAllTests())); - connect(model, SIGNAL(modelReset ()), this, SLOT(runAllTests())); - connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), + connect(model, SIGNAL(layoutAboutToBeChanged()), this, SLOT(runAllTests())); + connect(model, SIGNAL(layoutChanged()), this, SLOT(runAllTests())); + connect(model, SIGNAL(modelReset()), this, SLOT(runAllTests())); + connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(runAllTests())); - connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), + connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(runAllTests())); - connect(model, SIGNAL(rowsInserted(QModelIndex, int, int)), + connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(runAllTests())); - connect(model, SIGNAL(rowsRemoved(QModelIndex, int, int)), + connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(runAllTests())); // Special checks for inserting/removing @@ -74,14 +74,14 @@ ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(pare connect(model, SIGNAL(layoutChanged()), this, SLOT(layoutChanged())); - connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)), - this, SLOT(rowsAboutToBeInserted(QModelIndex, int, int))); - connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), - this, SLOT(rowsAboutToBeRemoved(QModelIndex, int, int))); - connect(model, SIGNAL(rowsInserted(QModelIndex, int, int)), - this, SLOT(rowsInserted(QModelIndex, int, int))); - connect(model, SIGNAL(rowsRemoved(QModelIndex, int, int)), - this, SLOT(rowsRemoved(QModelIndex, int, int))); + connect(model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), + this, SLOT(rowsAboutToBeInserted(QModelIndex,int,int))); + connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), + this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int))); + connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), + this, SLOT(rowsInserted(QModelIndex,int,int))); + connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), + this, SLOT(rowsRemoved(QModelIndex,int,int))); runAllTests(); } diff --git a/src/shared/qtsingleapplication/qtsingleapplication.cpp b/src/shared/qtsingleapplication/qtsingleapplication.cpp index ab669720e4..3d9fd00809 100644 --- a/src/shared/qtsingleapplication/qtsingleapplication.cpp +++ b/src/shared/qtsingleapplication/qtsingleapplication.cpp @@ -42,9 +42,9 @@ void QtSingleApplication::sysInit(const QString &appId) { actWin = 0; firstPeer = new QtLocalPeer(this, appId); - connect(firstPeer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&))); + connect(firstPeer, SIGNAL(messageReceived(QString)), SIGNAL(messageReceived(QString))); pidPeer = new QtLocalPeer(this, appId + QLatin1Char('-') + QString::number(QCoreApplication::applicationPid(), 10)); - connect(pidPeer, SIGNAL(messageReceived(const QString&)), SIGNAL(messageReceived(const QString&))); + connect(pidPeer, SIGNAL(messageReceived(QString)), SIGNAL(messageReceived(QString))); } diff --git a/src/shared/symbianutils/symbiandevicemanager.cpp b/src/shared/symbianutils/symbiandevicemanager.cpp index c25ffdeaa0..fc50210b3d 100644 --- a/src/shared/symbianutils/symbiandevicemanager.cpp +++ b/src/shared/symbianutils/symbiandevicemanager.cpp @@ -722,7 +722,7 @@ OstChannel::OstChannel(const CodaDevicePtr &codaPtr, uchar channelId) d->m_codaPtr = codaPtr; d->m_channelId = channelId; d->m_hasReceivedData = false; - connect(codaPtr.data(), SIGNAL(unknownEvent(uchar, QByteArray)), this, SLOT(ostDataReceived(uchar,QByteArray))); + connect(codaPtr.data(), SIGNAL(unknownEvent(uchar,QByteArray)), this, SLOT(ostDataReceived(uchar,QByteArray))); connect(codaPtr->device().data(), SIGNAL(aboutToClose()), this, SLOT(deviceAboutToClose())); QIODevice::open(ReadWrite|Unbuffered); } diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 4d8dad799c..e1e263303b 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1974,18 +1974,18 @@ void tst_Dumpers::dumpQObjectSignal() // Case 3: QAbstractItemModel with connections to itself and to another // object, using different connection types. qRegisterMetaType<QModelIndex>("QModelIndex"); - connect(&m, SIGNAL(columnsAboutToBeInserted(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), &o, SLOT(deleteLater()), Qt::DirectConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(revert()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(submit()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsInserted(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)), &m, SLOT(submit()), Qt::BlockingQueuedConnection); - connect(&m, SIGNAL(columnsRemoved(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)), &m, SLOT(deleteLater()), Qt::AutoConnection); #if QT_VERSION >= 0x040600 - connect(&m, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), + connect(&m, SIGNAL(dataChanged(QModelIndex,QModelIndex)), &m, SLOT(revert()), Qt::UniqueConnection); #endif for (int signalIndex = 0; signalIndex < 17; ++signalIndex) @@ -2059,15 +2059,15 @@ void tst_Dumpers::dumpQObjectSignalList() // Case 3: QAbstractItemModel with connections to itself and to another // object, using different connection types. qRegisterMetaType<QModelIndex>("QModelIndex"); - connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), &o, SLOT(deleteLater()), Qt::DirectConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(revert()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(submit()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)), &m, SLOT(submit()), Qt::BlockingQueuedConnection); - connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)), &m, SLOT(deleteLater()), Qt::AutoConnection); testDumper(expected << "1" << "1" << "2" << "1" << "0" << "0", @@ -2125,18 +2125,18 @@ void tst_Dumpers::dumpQObjectSlot() // Case 3: QAbstractItemModel with connections to itself and to another // o, using different connection types. qRegisterMetaType<QModelIndex>("QModelIndex"); - connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), &o, SLOT(deleteLater()), Qt::DirectConnection); - connect(&o, SIGNAL(destroyed(QObject *)), + connect(&o, SIGNAL(destroyed(QObject*)), &m, SLOT(revert()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(submit()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)), &m, SLOT(submit()), Qt::BlockingQueuedConnection); - connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)), &m, SLOT(deleteLater()), Qt::AutoConnection); #if QT_VERSION >= 0x040600 - connect(&m, SIGNAL(dataChanged(QModelIndex, QModelIndex)), + connect(&m, SIGNAL(dataChanged(QModelIndex,QModelIndex)), &m, SLOT(revert()), Qt::UniqueConnection); #endif expected = QByteArray("addr='$A',numchild='1',type='$T'," @@ -2175,17 +2175,17 @@ void tst_Dumpers::dumpQObjectSlotList() // Case 3: QAbstractItemModel with connections to itself and to another // object, using different connection types. qRegisterMetaType<QModelIndex>("QModelIndex"); - connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), &o, SLOT(deleteLater()), Qt::DirectConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(revert()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(submit()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)), &m, SLOT(submit()), Qt::BlockingQueuedConnection); - connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)), &m, SLOT(deleteLater()), Qt::AutoConnection); - connect(&o, SIGNAL(destroyed(QObject *)), &m, SLOT(submit())); + connect(&o, SIGNAL(destroyed(QObject*)), &m, SLOT(submit())); testDumper("numchild='4',value='<4 items>',type='$T'," "children=[{name='2',value='deleteLater()',numchild='0'," "addr='$A',type='" NS "QObjectSlot'}," diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp index 31e4cc70ae..ccca37d368 100644 --- a/tests/auto/debugger/tst_gdb.cpp +++ b/tests/auto/debugger/tst_gdb.cpp @@ -389,8 +389,8 @@ GdbWrapper::GdbWrapper(tst_Gdb *test) : m_test(test) connect(&m_proc, SIGNAL(error(QProcess::ProcessError)), this, SLOT(handleGdbError(QProcess::ProcessError))); - connect(&m_proc, SIGNAL(finished(int, QProcess::ExitStatus)), - this, SLOT(handleGdbFinished(int, QProcess::ExitStatus))); + connect(&m_proc, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(handleGdbFinished(int,QProcess::ExitStatus))); connect(&m_proc, SIGNAL(started()), this, SLOT(handleGdbStarted())); connect(&m_proc, SIGNAL(readyReadStandardOutput()), @@ -2197,18 +2197,18 @@ void tst_Gdb::dump_QObjectSignal() // Case 3: QAbstractItemModel with connections to itself and to another // object, using different connection types. qRegisterMetaType<QModelIndex>("QModelIndex"); - connect(&m, SIGNAL(columnsAboutToBeInserted(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), &o, SLOT(deleteLater()), Qt::DirectConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(revert()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(submit()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsInserted(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)), &m, SLOT(submit()), Qt::BlockingQueuedConnection); - connect(&m, SIGNAL(columnsRemoved(const QModelIndex &, int, int)), + connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)), &m, SLOT(deleteLater()), Qt::AutoConnection); #if QT_VERSION >= 0x040600 - connect(&m, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), + connect(&m, SIGNAL(dataChanged(QModelIndex,QModelIndex)), &m, SLOT(revert()), Qt::UniqueConnection); #endif for (int signalIndex = 0; signalIndex < 17; ++signalIndex) @@ -2273,15 +2273,15 @@ void tst_Gdb::dump_QObjectSignalList() // Case 3: QAbstractItemModel with connections to itself and to another // object, using different connection types. qRegisterMetaType<QModelIndex>("QModelIndex"); - connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), &o, SLOT(deleteLater()), Qt::DirectConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(revert()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(submit()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)), &m, SLOT(submit()), Qt::BlockingQueuedConnection); - connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)), &m, SLOT(deleteLater()), Qt::AutoConnection); testDumper(expected << "1" << "1" << "2" << "1" << "0" << "0", @@ -2339,18 +2339,18 @@ void tst_Gdb::dump_QObjectSlot() // Case 3: QAbstractItemModel with connections to itself and to another // o, using different connection types. qRegisterMetaType<QModelIndex>("QModelIndex"); - connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), &o, SLOT(deleteLater()), Qt::DirectConnection); - connect(&o, SIGNAL(destroyed(QObject *)), + connect(&o, SIGNAL(destroyed(QObject*)), &m, SLOT(revert()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(submit()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)), &m, SLOT(submit()), Qt::BlockingQueuedConnection); - connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)), &m, SLOT(deleteLater()), Qt::AutoConnection); #if QT_VERSION >= 0x040600 - connect(&m, SIGNAL(dataChanged(QModelIndex, QModelIndex)), + connect(&m, SIGNAL(dataChanged(QModelIndex,QModelIndex)), &m, SLOT(revert()), Qt::UniqueConnection); #endif expected = QByteArray("addr='$A',numchild='1',type='$T'," @@ -2389,17 +2389,17 @@ void tst_Gdb::dump_QObjectSlotList() // Case 3: QAbstractItemModel with connections to itself and to another // object, using different connection types. qRegisterMetaType<QModelIndex>("QModelIndex"); - connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), &o, SLOT(deleteLater()), Qt::DirectConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(revert()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), &m, SLOT(submit()), Qt::QueuedConnection); - connect(&m, SIGNAL(columnsInserted(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsInserted(QModelIndex,int,int)), &m, SLOT(submit()), Qt::BlockingQueuedConnection); - connect(&m, SIGNAL(columnsRemoved(QModelIndex, int, int)), + connect(&m, SIGNAL(columnsRemoved(QModelIndex,int,int)), &m, SLOT(deleteLater()), Qt::AutoConnection); - connect(&o, SIGNAL(destroyed(QObject *)), &m, SLOT(submit())); + connect(&o, SIGNAL(destroyed(QObject*)), &m, SLOT(submit())); testDumper("numchild='4',value='<4 items>',type='$T'," "children=[{name='2',value='deleteLater()',numchild='0'," "addr='$A',type='" NS "QObjectSlot'}," diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index 59e4665403..6cd4b92d86 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -1556,11 +1556,11 @@ namespace qobject { Q_PROPERTY(QString myProp1 READ myProp1 WRITE setMyProp1) QString myProp1() const { return m_myProp1; } - Q_SLOT void setMyProp1(const QString &mt) { m_myProp1 = mt; } + Q_SLOT void setMyProp1(const QString&mt) { m_myProp1 = mt; } Q_PROPERTY(QString myProp2 READ myProp2 WRITE setMyProp2) QString myProp2() const { return m_myProp2; } - Q_SLOT void setMyProp2(const QString &mt) { m_myProp2 = mt; } + Q_SLOT void setMyProp2(const QString&mt) { m_myProp2 = mt; } public: Ui *m_ui; diff --git a/tests/manual/ssh/sftp/sftptest.cpp b/tests/manual/ssh/sftp/sftptest.cpp index f9e538aab5..8083ce0498 100644 --- a/tests/manual/ssh/sftp/sftptest.cpp +++ b/tests/manual/ssh/sftp/sftptest.cpp @@ -87,11 +87,11 @@ void SftpTest::handleConnected() SLOT(handleChannelInitialized())); connect(m_channel.data(), SIGNAL(initializationFailed(QString)), this, SLOT(handleChannelInitializationFailure(QString))); - connect(m_channel.data(), SIGNAL(finished(Utils::SftpJobId, QString)), - this, SLOT(handleJobFinished(Utils::SftpJobId, QString))); + connect(m_channel.data(), SIGNAL(finished(Utils::SftpJobId,QString)), + this, SLOT(handleJobFinished(Utils::SftpJobId,QString))); connect(m_channel.data(), - SIGNAL(fileInfoAvailable(Utils::SftpJobId, QList<Utils::SftpFileInfo>)), - SLOT(handleFileInfo(Utils::SftpJobId, QList<Utils::SftpFileInfo>))); + SIGNAL(fileInfoAvailable(Utils::SftpJobId,QList<Utils::SftpFileInfo>)), + SLOT(handleFileInfo(Utils::SftpJobId,QList<Utils::SftpFileInfo>))); connect(m_channel.data(), SIGNAL(closed()), this, SLOT(handleChannelClosed())); m_state = InitializingChannel; diff --git a/tests/valgrind/memcheck/testrunner.cpp b/tests/valgrind/memcheck/testrunner.cpp index f0b88ef39e..51d795d436 100644 --- a/tests/valgrind/memcheck/testrunner.cpp +++ b/tests/valgrind/memcheck/testrunner.cpp @@ -124,7 +124,7 @@ void TestRunner::init() m_runner->setProcessChannelMode(QProcess::ForwardedChannels); connect(m_runner, SIGNAL(logMessageReceived(QByteArray)), this, SLOT(logMessageReceived(QByteArray))); - connect(m_runner, SIGNAL(processErrorReceived(QString, QProcess::ProcessError)), + connect(m_runner, SIGNAL(processErrorReceived(QString,QProcess::ProcessError)), this, SLOT(internalError(QString))); Q_ASSERT(!m_parser); m_parser = new ThreadedParser; |