From 1dfadce210d8f758cd838c9bc9601b499f878093 Mon Sep 17 00:00:00 2001 From: Julien Finet Date: Thu, 1 Sep 2011 10:57:12 -0400 Subject: [PATCH] Normalize SIGNALS/SLOTS for performance. Fixed using Qt/util/normalize More info: http://marcmutz.wordpress.com/effective-qt/prefer-to-use-normalised-signalslot-signatures/ --- .../ctkHostAppExampleWidget.cpp | 2 +- Libs/Core/Testing/Cpp/ctkWorkflowTest2.cpp | 46 +++++++++---------- Libs/Core/ctkCheckableModelHelper.cpp | 40 ++++++++-------- Libs/Core/ctkErrorLogFDMessageHandler.cpp | 4 +- Libs/Core/ctkModelTester.cpp | 36 +++++++-------- Libs/Core/ctkWorkflow.cpp | 4 +- Libs/DICOM/Core/ctkDICOMDatabase.cpp | 2 +- Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp | 16 +++---- .../Widgets/ctkDICOMDirectoryListWidget.cpp | 2 +- Libs/DICOM/Widgets/ctkDICOMImportWidget.cpp | 4 +- .../Widgets/ctkDICOMServerNodeWidget.cpp | 8 ++-- .../Python/Core/ctkAbstractPythonManager.cpp | 8 ++-- .../Python/Widgets/ctkPythonConsole.cpp | 8 ++-- .../Testing/Cpp/ctkVTKObjectTestHelper.cpp | 8 ++-- .../VTK/Core/ctkVTKConnection.cpp | 8 ++-- .../VTK/Widgets/ctkVTKScalarBarWidget.cpp | 8 ++-- .../VTK/Widgets/ctkVTKScalarsToColorsView.cpp | 2 +- .../Widgets/ctkVTKScalarsToColorsWidget.cpp | 18 ++++---- .../VTK/Widgets/ctkVTKTextPropertyWidget.cpp | 10 ++-- .../VTK/Widgets/ctkVTKThresholdWidget.cpp | 4 +- .../Testing/Cpp/ctkDateRangeWidgetTest1.cpp | 4 +- .../Testing/Cpp/ctkDirectoryButtonTest1.cpp | 4 +- .../Testing/Cpp/ctkDoubleRangeSliderTest2.cpp | 2 +- ...seOfWorkflowWidgetUsingSignalsAndSlots.cpp | 18 ++++---- .../Testing/Cpp/ctkFontButtonTest1.cpp | 2 +- .../Testing/Cpp/ctkModalityWidgetTest1.cpp | 2 +- .../Testing/Cpp/ctkSettingsPanelTest1.cpp | 2 +- .../Testing/Cpp/ctkWorkflowWidgetTest2.cpp | 36 +++++++-------- Libs/Widgets/ctkAddRemoveComboBox.cpp | 16 +++---- Libs/Widgets/ctkCheckableComboBox.cpp | 8 ++-- Libs/Widgets/ctkCheckableHeaderView.cpp | 16 +++---- Libs/Widgets/ctkConsole.cpp | 8 ++-- Libs/Widgets/ctkDateRangeWidget.cpp | 12 ++--- Libs/Widgets/ctkDoubleRangeSlider.cpp | 4 +- Libs/Widgets/ctkDoubleSlider.cpp | 4 +- Libs/Widgets/ctkErrorLogWidget.cpp | 16 +++---- Libs/Widgets/ctkFileDialog.cpp | 2 +- Libs/Widgets/ctkMaterialPropertyWidget.cpp | 4 +- Libs/Widgets/ctkMatrixWidget.cpp | 2 +- Libs/Widgets/ctkMenuComboBox.cpp | 2 +- Libs/Widgets/ctkPathLineEdit.cpp | 6 +-- Libs/Widgets/ctkRangeSlider.cpp | 2 +- Libs/Widgets/ctkRangeWidget.cpp | 6 +-- Libs/Widgets/ctkSearchBox.cpp | 2 +- Libs/Widgets/ctkSettingsDialog.cpp | 8 ++-- Libs/Widgets/ctkSettingsPanel.cpp | 4 +- Libs/Widgets/ctkTreeComboBox.cpp | 4 +- .../ctkConfigurationAdminActivator.cpp | 2 +- .../ctkSimpleSoapServer.cpp | 4 +- 49 files changed, 220 insertions(+), 220 deletions(-) diff --git a/Applications/ctkExampleHost/ctkHostAppExampleWidget.cpp b/Applications/ctkExampleHost/ctkHostAppExampleWidget.cpp index bfffd0aabc..9989d9c5a3 100644 --- a/Applications/ctkExampleHost/ctkHostAppExampleWidget.cpp +++ b/Applications/ctkExampleHost/ctkHostAppExampleWidget.cpp @@ -45,7 +45,7 @@ ctkHostAppExampleWidget::ctkHostAppExampleWidget(QWidget *parent) : connect(&this->Host->getAppProcess(),SIGNAL(error(QProcess::ProcessError)),SLOT(appProcessError(QProcess::ProcessError))); connect(&this->Host->getAppProcess(),SIGNAL(stateChanged(QProcess::ProcessState)),SLOT(appProcessStateChanged(QProcess::ProcessState))); connect(ui->placeholderFrame,SIGNAL(resized()),SLOT(placeholderResized())); - connect(this->Host,SIGNAL( stateChangedReceived(ctkDicomAppHosting::State)),SLOT(appStateChanged(ctkDicomAppHosting::State))); + connect(this->Host,SIGNAL(stateChangedReceived(ctkDicomAppHosting::State)),SLOT(appStateChanged(ctkDicomAppHosting::State))); } diff --git a/Libs/Core/Testing/Cpp/ctkWorkflowTest2.cpp b/Libs/Core/Testing/Cpp/ctkWorkflowTest2.cpp index 481295affb..6a295ea41d 100644 --- a/Libs/Core/Testing/Cpp/ctkWorkflowTest2.cpp +++ b/Libs/Core/Testing/Cpp/ctkWorkflowTest2.cpp @@ -145,45 +145,45 @@ int ctkWorkflowTest2(int argc, char * argv [] ) ctkExampleWorkflowStepUsingSignalsAndSlots* qObject4 = new ctkExampleWorkflowStepUsingSignalsAndSlots(step4); // use the qObjects for validation - QObject::connect(step1->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(const QString&)), - qObject1, SLOT(validate(const QString&))); - QObject::connect(step2->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(const QString&)), - qObject2, SLOT(validate(const QString&))); + QObject::connect(step1->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(QString)), + qObject1, SLOT(validate(QString))); + QObject::connect(step2->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(QString)), + qObject2, SLOT(validate(QString))); // step 3's validation will always fail - QObject::connect(step3->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(const QString&)), + QObject::connect(step3->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(QString)), qObject3, SLOT(validateFails())); - QObject::connect(step4->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(const QString&)), - qObject4, SLOT(validate(const QString&))); + QObject::connect(step4->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(QString)), + qObject4, SLOT(validate(QString))); // use the qObjects for entry processing QObject::connect( - step1->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject1, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + step1->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject1, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); QObject::connect( - step2->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject2, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + step2->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject2, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); QObject::connect( - step3->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject3, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + step3->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject3, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); QObject::connect( - step4->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject4, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + step4->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject4, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); // use the qObjects for exit processing QObject::connect( - step1->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject1, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + step1->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject1, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); QObject::connect( - step2->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject2, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + step2->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject2, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); QObject::connect( - step3->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject3, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + step3->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject3, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); QObject::connect( - step4->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject4, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + step4->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject4, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); step1->setHasValidateCommand(1); step2->setHasValidateCommand(1); diff --git a/Libs/Core/ctkCheckableModelHelper.cpp b/Libs/Core/ctkCheckableModelHelper.cpp index 02be119372..d98f96c5fa 100644 --- a/Libs/Core/ctkCheckableModelHelper.cpp +++ b/Libs/Core/ctkCheckableModelHelper.cpp @@ -308,36 +308,36 @@ void ctkCheckableModelHelper::setModel(QAbstractItemModel *newModel) if(current) { this->disconnect( - current, SIGNAL(headerDataChanged(Qt::Orientation, int, int)), - this, SLOT(onHeaderDataChanged(Qt::Orientation, int, int))); + current, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), + this, SLOT(onHeaderDataChanged(Qt::Orientation,int,int))); this->disconnect( - current, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), - this, SLOT(onDataChanged(const QModelIndex&, const QModelIndex&))); + current, SIGNAL(dataChanged(QModelIndex,QModelIndex)), + this, SLOT(onDataChanged(QModelIndex,QModelIndex))); this->disconnect( - current, SIGNAL(columnsInserted(const QModelIndex &, int, int)), - this, SLOT(onColumnsInserted(const QModelIndex &, int, int))); + current, SIGNAL(columnsInserted(QModelIndex,int,int)), + this, SLOT(onColumnsInserted(QModelIndex,int,int))); this->disconnect( - current, SIGNAL(rowsInserted(const QModelIndex &, int, int)), - this, SLOT(onRowsInserted(const QModelIndex &, int, int))); + current, SIGNAL(rowsInserted(QModelIndex,int,int)), + this, SLOT(onRowsInserted(QModelIndex,int,int))); } d->Model = newModel; if(newModel) { this->connect( - newModel, SIGNAL(headerDataChanged(Qt::Orientation, int, int)), - this, SLOT(onHeaderDataChanged(Qt::Orientation, int, int))); + newModel, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), + this, SLOT(onHeaderDataChanged(Qt::Orientation,int,int))); if (d->PropagateDepth != 0) { this->connect( - newModel, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), - this, SLOT(onDataChanged(const QModelIndex&, const QModelIndex&))); + newModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), + this, SLOT(onDataChanged(QModelIndex,QModelIndex))); } this->connect( - newModel, SIGNAL(columnsInserted(const QModelIndex &, int, int)), - this, SLOT(onColumnsInserted(const QModelIndex &, int, int))); + newModel, SIGNAL(columnsInserted(QModelIndex,int,int)), + this, SLOT(onColumnsInserted(QModelIndex,int,int))); this->connect( - newModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)), - this, SLOT(onRowsInserted(const QModelIndex &, int, int))); + newModel, SIGNAL(rowsInserted(QModelIndex,int,int)), + this, SLOT(onRowsInserted(QModelIndex,int,int))); if (d->ForceCheckability) { @@ -385,15 +385,15 @@ void ctkCheckableModelHelper::setPropagateDepth(int depth) if (depth != 0) { this->connect( - this->model(), SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), - this, SLOT(onDataChanged(const QModelIndex&, const QModelIndex&)), Qt::UniqueConnection); + this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), + this, SLOT(onDataChanged(QModelIndex,QModelIndex)), Qt::UniqueConnection); this->updateHeadersFromItems(); } else { this->disconnect( - this->model(), SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), - this, SLOT(onDataChanged(const QModelIndex&, const QModelIndex&))); + this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), + this, SLOT(onDataChanged(QModelIndex,QModelIndex))); } } diff --git a/Libs/Core/ctkErrorLogFDMessageHandler.cpp b/Libs/Core/ctkErrorLogFDMessageHandler.cpp index 0bf832b622..b6c8b461d6 100644 --- a/Libs/Core/ctkErrorLogFDMessageHandler.cpp +++ b/Libs/Core/ctkErrorLogFDMessageHandler.cpp @@ -54,8 +54,8 @@ ctkFDHandler::ctkFDHandler(ctkErrorLogFDMessageHandler* messageHandler, + QDir::separator () + "ctkFDHandler-%1.XXXXXX.txt"; this->OutputFile.setFileTemplate(outputFileTemplateName.arg(this->FDNumber)); - connect(&this->OutputFileWatcher, SIGNAL(fileChanged(const QString&)), - SLOT(outputFileChanged(const QString&))); + connect(&this->OutputFileWatcher, SIGNAL(fileChanged(QString)), + SLOT(outputFileChanged(QString))); } // -------------------------------------------------------------------------- diff --git a/Libs/Core/ctkModelTester.cpp b/Libs/Core/ctkModelTester.cpp index 98c8f52263..e4c6db6f40 100644 --- a/Libs/Core/ctkModelTester.cpp +++ b/Libs/Core/ctkModelTester.cpp @@ -102,30 +102,30 @@ void ctkModelTester::setModel(QAbstractItemModel *_model) } if (_model) { - connect(_model, SIGNAL(columnsAboutToBeInserted(const QModelIndex &, int, int)), - this, SLOT(onColumnsAboutToBeInserted(const QModelIndex& , int, int))); - connect(_model, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)), - this, SLOT(onColumnsAboutToBeRemoved(const QModelIndex& , int, int))); - connect(_model, SIGNAL(columnsInserted(const QModelIndex &, int, int)), - this, SLOT(onColumnsInserted(const QModelIndex& , int, int))); - connect(_model, SIGNAL(columnsRemoved(const QModelIndex &, int, int)), - this, SLOT(onColumnsRemoved(const QModelIndex& , int, int))); - connect(_model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), - this, SLOT(onDataChanged(const QModelIndex& , const QModelIndex &))); + connect(_model, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), + this, SLOT(onColumnsAboutToBeInserted(QModelIndex,int,int))); + connect(_model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), + this, SLOT(onColumnsAboutToBeRemoved(QModelIndex,int,int))); + connect(_model, SIGNAL(columnsInserted(QModelIndex,int,int)), + this, SLOT(onColumnsInserted(QModelIndex,int,int))); + connect(_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), + this, SLOT(onColumnsRemoved(QModelIndex,int,int))); + connect(_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), + this, SLOT(onDataChanged(QModelIndex,QModelIndex))); connect(_model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), this, SLOT(onHeaderDataChanged(Qt::Orientation,int,int))); connect(_model, SIGNAL(layoutAboutToBeChanged()), this, SLOT(onLayoutAboutToBeChanged())); connect(_model, SIGNAL(layoutChanged()), this, SLOT(onLayoutChanged())); connect(_model, SIGNAL(modelAboutToBeReset()), this, SLOT(onModelAboutToBeReset())); connect(_model, SIGNAL(modelReset()), this, SLOT(onModelReset())); - connect(_model, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)), - this, SLOT(onRowsAboutToBeInserted(const QModelIndex& , int, int))); - connect(_model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)), - this, SLOT(onRowsAboutToBeRemoved(const QModelIndex& , int, int))); - connect(_model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), - this, SLOT(onRowsInserted(const QModelIndex& , int, int))); - connect(_model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), - this, SLOT(onRowsRemoved(const QModelIndex& , int, int))); + connect(_model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), + this, SLOT(onRowsAboutToBeInserted(QModelIndex,int,int))); + connect(_model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), + this, SLOT(onRowsAboutToBeRemoved(QModelIndex,int,int))); + connect(_model, SIGNAL(rowsInserted(QModelIndex,int,int)), + this, SLOT(onRowsInserted(QModelIndex,int,int))); + connect(_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), + this, SLOT(onRowsRemoved(QModelIndex,int,int))); } d->Model = _model; this->testModel(); diff --git a/Libs/Core/ctkWorkflow.cpp b/Libs/Core/ctkWorkflow.cpp index 4d2aacd255..14d1d306db 100644 --- a/Libs/Core/ctkWorkflow.cpp +++ b/Libs/Core/ctkWorkflow.cpp @@ -90,8 +90,8 @@ void ctkWorkflowPrivate::addStep(ctkWorkflowStep* step) // Setup the signal/slot that triggers the evaluation of the validation results // after validate(const QString&) is called this->connect( - step->ctkWorkflowStepQObject(), SIGNAL(validationComplete(bool, const QString&)), - q, SLOT(evaluateValidationResults(bool, const QString&))); + step->ctkWorkflowStepQObject(), SIGNAL(validationComplete(bool,QString)), + q, SLOT(evaluateValidationResults(bool,QString))); this->connect( step->ctkWorkflowStepQObject(), SIGNAL(onEntryComplete()), diff --git a/Libs/DICOM/Core/ctkDICOMDatabase.cpp b/Libs/DICOM/Core/ctkDICOMDatabase.cpp index cdcba7e229..c6c7bceae5 100644 --- a/Libs/DICOM/Core/ctkDICOMDatabase.cpp +++ b/Libs/DICOM/Core/ctkDICOMDatabase.cpp @@ -143,7 +143,7 @@ void ctkDICOMDatabase::openDatabase(const QString databaseFile, const QString& c if (!isInMemory()) { QFileSystemWatcher* watcher = new QFileSystemWatcher(QStringList(databaseFile),this); - connect(watcher, SIGNAL( fileChanged(const QString&)),this, SIGNAL ( databaseChanged() ) ); + connect(watcher, SIGNAL(fileChanged(QString)),this, SIGNAL (databaseChanged()) ); } } diff --git a/Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp b/Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp index f5f7446064..30ad258020 100644 --- a/Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp +++ b/Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp @@ -148,7 +148,7 @@ ctkDICOMAppWidget::ctkDICOMAppWidget(QWidget* _parent):Superclass(_parent), this->setDatabaseDirectory(databaseDirectory); d->DirectoryButton->setDirectory(databaseDirectory); - connect(d->DirectoryButton, SIGNAL(directoryChanged(const QString&)), this, SLOT(setDatabaseDirectory(const QString&))); + connect(d->DirectoryButton, SIGNAL(directoryChanged(QString)), this, SLOT(setDatabaseDirectory(QString))); //Initialize import widget d->ImportDialog = new ctkFileDialog(); @@ -160,19 +160,19 @@ ctkDICOMAppWidget::ctkDICOMAppWidget(QWidget* _parent):Superclass(_parent), d->ImportDialog->setWindowModality(Qt::ApplicationModal); //connect signal and slots - connect(d->TreeView, SIGNAL(clicked(const QModelIndex&)), d->ThumbnailsWidget, SLOT(onModelSelected(const QModelIndex &))); - connect(d->TreeView, SIGNAL(clicked(const QModelIndex&)), d->ImagePreview, SLOT(onModelSelected(const QModelIndex &))); - connect(d->TreeView, SIGNAL(clicked(const QModelIndex&)), this, SLOT(onModelSelected(const QModelIndex &))); + connect(d->TreeView, SIGNAL(clicked(QModelIndex)), d->ThumbnailsWidget, SLOT(onModelSelected(QModelIndex))); + connect(d->TreeView, SIGNAL(clicked(QModelIndex)), d->ImagePreview, SLOT(onModelSelected(QModelIndex))); + connect(d->TreeView, SIGNAL(clicked(QModelIndex)), this, SLOT(onModelSelected(QModelIndex))); - connect(d->ThumbnailsWidget, SIGNAL(selected(const ctkThumbnailWidget&)), this, SLOT(onThumbnailSelected(const ctkThumbnailWidget&))); - connect(d->ThumbnailsWidget, SIGNAL(doubleClicked(const ctkThumbnailWidget&)), this, SLOT(onThumbnailDoubleClicked(const ctkThumbnailWidget&))); + connect(d->ThumbnailsWidget, SIGNAL(selected(ctkThumbnailWidget)), this, SLOT(onThumbnailSelected(ctkThumbnailWidget))); + connect(d->ThumbnailsWidget, SIGNAL(doubleClicked(ctkThumbnailWidget)), this, SLOT(onThumbnailDoubleClicked(ctkThumbnailWidget))); connect(d->ImportDialog, SIGNAL(fileSelected(QString)),this,SLOT(onImportDirectory(QString))); - connect(d->QueryRetrieveWidget, SIGNAL( canceled() ), d->QueryRetrieveWidget, SLOT( hide() ) ); + connect(d->QueryRetrieveWidget, SIGNAL(canceled()), d->QueryRetrieveWidget, SLOT(hide()) ); connect(d->ImagePreview, SIGNAL(requestNextImage()), this, SLOT(onNextImage())); connect(d->ImagePreview, SIGNAL(requestPreviousImage()), this, SLOT(onPreviousImage())); - connect(d->ImagePreview, SIGNAL(imageDisplayed(int, int)), this, SLOT(onImagePreviewDisplayed(int,int))); + connect(d->ImagePreview, SIGNAL(imageDisplayed(int,int)), this, SLOT(onImagePreviewDisplayed(int,int))); connect(d->SearchOption, SIGNAL(parameterChanged()), this, SLOT(onSearchParameterChanged())); diff --git a/Libs/DICOM/Widgets/ctkDICOMDirectoryListWidget.cpp b/Libs/DICOM/Widgets/ctkDICOMDirectoryListWidget.cpp index eab74acd89..1cbe8b911f 100644 --- a/Libs/DICOM/Widgets/ctkDICOMDirectoryListWidget.cpp +++ b/Libs/DICOM/Widgets/ctkDICOMDirectoryListWidget.cpp @@ -130,7 +130,7 @@ void ctkDICOMDirectoryListWidget::setDICOMDatabase(ctkDICOMDatabase* dicomDataba d->directoryListView->setModel(d->directoryListModel); connect ( d->directoryListView->selectionModel(), - SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(directorySelectionChanged(const QItemSelection & , const QItemSelection & ))); diff --git a/Libs/DICOM/Widgets/ctkDICOMImportWidget.cpp b/Libs/DICOM/Widgets/ctkDICOMImportWidget.cpp index ecb6d9ab39..f45e8c5ab5 100644 --- a/Libs/DICOM/Widgets/ctkDICOMImportWidget.cpp +++ b/Libs/DICOM/Widgets/ctkDICOMImportWidget.cpp @@ -65,8 +65,8 @@ ctkDICOMImportWidget::ctkDICOMImportWidget(QWidget* parentWidget) d->directoryList->setModel(d->FileSystemModel); //connect signals and slots - connect(d->DirectoryWidget, SIGNAL(directoryChanged(const QString&)), - this, SLOT(onTopDirectoryChanged(const QString&))); + connect(d->DirectoryWidget, SIGNAL(directoryChanged(QString)), + this, SLOT(onTopDirectoryChanged(QString))); this->onTopDirectoryChanged(d->DirectoryWidget->directory()); } diff --git a/Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp b/Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp index 140f39c47e..f5da78a1a1 100644 --- a/Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp +++ b/Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp @@ -73,11 +73,11 @@ ctkDICOMServerNodeWidget::ctkDICOMServerNodeWidget(QWidget* parentWidget) this->readSettings(); - connect(d->CallingAETitle, SIGNAL(textChanged(const QString&)), + connect(d->CallingAETitle, SIGNAL(textChanged(QString)), this, SLOT(saveSettings())); - connect(d->StorageAETitle, SIGNAL(textChanged(const QString&)), + connect(d->StorageAETitle, SIGNAL(textChanged(QString)), this, SLOT(saveSettings())); - connect(d->StoragePort, SIGNAL(textChanged(const QString&)), + connect(d->StoragePort, SIGNAL(textChanged(QString)), this, SLOT(saveSettings())); connect(d->AddButton, SIGNAL(clicked()), @@ -87,7 +87,7 @@ ctkDICOMServerNodeWidget::ctkDICOMServerNodeWidget(QWidget* parentWidget) connect(d->NodeTable, SIGNAL(cellChanged(int,int)), this, SLOT(saveSettings())); - connect(d->NodeTable, SIGNAL(currentItemChanged(QTableWidgetItem*, QTableWidgetItem*)), + connect(d->NodeTable, SIGNAL(currentItemChanged(QTableWidgetItem*,QTableWidgetItem*)), this, SLOT(updateRemoveButtonEnableState())); } diff --git a/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp b/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp index 751e3b76e4..944c987cc0 100644 --- a/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp +++ b/Libs/Scripting/Python/Core/ctkAbstractPythonManager.cpp @@ -84,10 +84,10 @@ void ctkAbstractPythonManager::initPythonQt() PythonQtObjectPtr _mainContext = PythonQt::self()->getMainModule(); - this->connect(PythonQt::self(), SIGNAL(pythonStdOut(const QString&)), - SLOT(printStdout(const QString&))); - this->connect(PythonQt::self(), SIGNAL(pythonStdErr(const QString&)), - SLOT(printStderr(const QString&))); + this->connect(PythonQt::self(), SIGNAL(pythonStdOut(QString)), + SLOT(printStdout(QString))); + this->connect(PythonQt::self(), SIGNAL(pythonStdErr(QString)), + SLOT(printStderr(QString))); PythonQt_init_QtBindings(); diff --git a/Libs/Scripting/Python/Widgets/ctkPythonConsole.cpp b/Libs/Scripting/Python/Widgets/ctkPythonConsole.cpp index ea7d350543..ac88ad5366 100644 --- a/Libs/Scripting/Python/Widgets/ctkPythonConsole.cpp +++ b/Libs/Scripting/Python/Widgets/ctkPythonConsole.cpp @@ -349,10 +349,10 @@ void ctkPythonConsole::initialize(ctkAbstractPythonManager* newPythonManager) d->initializeInteractiveConsole(); - this->connect(PythonQt::self(), SIGNAL(pythonStdOut(const QString&)), - d, SLOT(printOutputMessage(const QString&))); - this->connect(PythonQt::self(), SIGNAL(pythonStdErr(const QString&)), - d, SLOT(printErrorMessage(const QString&))); + this->connect(PythonQt::self(), SIGNAL(pythonStdOut(QString)), + d, SLOT(printOutputMessage(QString))); + this->connect(PythonQt::self(), SIGNAL(pythonStdErr(QString)), + d, SLOT(printErrorMessage(QString))); PythonQt::self()->setRedirectStdInCallBack( ctkConsole::stdInRedirectCallBack, reinterpret_cast(this)); diff --git a/Libs/Visualization/VTK/Core/Testing/Cpp/ctkVTKObjectTestHelper.cpp b/Libs/Visualization/VTK/Core/Testing/Cpp/ctkVTKObjectTestHelper.cpp index b777ebbef6..f5bce3c8f5 100644 --- a/Libs/Visualization/VTK/Core/Testing/Cpp/ctkVTKObjectTestHelper.cpp +++ b/Libs/Visualization/VTK/Core/Testing/Cpp/ctkVTKObjectTestHelper.cpp @@ -145,7 +145,7 @@ bool ctkVTKObjectTest::test() // Set a new connection (protected) connection = this->qvtkConnect(object, vtkCommand::ModifiedEvent, - this, SLOT( onVTKObjectModifiedProtected ( ) )); + this, SLOT(onVTKObjectModifiedProtected())); if (connection.isEmpty()) { qDebug() << __LINE__ << "ctkVTKObject::qvtkConnect() failed: "<< connection; @@ -202,11 +202,11 @@ bool ctkVTKObjectTest::test() // Set new connections this->qvtkConnect(object, vtkCommand::ModifiedEvent, - this, SLOT(onVTKObjectModifiedPublic ())); + this, SLOT(onVTKObjectModifiedPublic())); this->qvtkConnect(object, vtkCommand::WarningEvent, - this, SLOT(onVTKObjectModifiedPublic( ))); + this, SLOT(onVTKObjectModifiedPublic())); int disconnected = this->qvtkDisconnect(object, vtkCommand::NoEvent, - this, SLOT(onVTKObjectModifiedPublic() )); + this, SLOT(onVTKObjectModifiedPublic())); if (disconnected != 2) { qDebug() << __LINE__ << "qvtkDisconnect failed" << disconnected; diff --git a/Libs/Visualization/VTK/Core/ctkVTKConnection.cpp b/Libs/Visualization/VTK/Core/ctkVTKConnection.cpp index ab9f482d82..3cbd1157b6 100644 --- a/Libs/Visualization/VTK/Core/ctkVTKConnection.cpp +++ b/Libs/Visualization/VTK/Core/ctkVTKConnection.cpp @@ -84,11 +84,11 @@ void ctkVTKConnectionPrivate::connect() switch (this->SlotType) { case ctkVTKConnectionPrivate::ARG_VTKOBJECT_AND_VTKOBJECT: - QObject::connect(q, SIGNAL(emitExecute(vtkObject*, vtkObject*)), + QObject::connect(q, SIGNAL(emitExecute(vtkObject*,vtkObject*)), this->QtObject, this->QtSlot.toLatin1(), this->ConnectionType); break; case ctkVTKConnectionPrivate::ARG_VTKOBJECT_VOID_ULONG_VOID: - QObject::connect(q, SIGNAL(emitExecute(vtkObject*, void*, unsigned long, void*)), + QObject::connect(q, SIGNAL(emitExecute(vtkObject*,void*,ulong,void*)), this->QtObject, this->QtSlot.toLatin1(), this->ConnectionType); break; default: @@ -133,11 +133,11 @@ void ctkVTKConnectionPrivate::disconnect() switch (this->SlotType) { case ctkVTKConnectionPrivate::ARG_VTKOBJECT_AND_VTKOBJECT: - QObject::disconnect(q, SIGNAL(emitExecute(vtkObject*, vtkObject*)), + QObject::disconnect(q, SIGNAL(emitExecute(vtkObject*,vtkObject*)), this->QtObject,this->QtSlot.toLatin1().data()); break; case ctkVTKConnectionPrivate::ARG_VTKOBJECT_VOID_ULONG_VOID: - QObject::disconnect(q, SIGNAL(emitExecute(vtkObject*, void*, unsigned long, void*)), + QObject::disconnect(q, SIGNAL(emitExecute(vtkObject*,void*,ulong,void*)), this->QtObject, this->QtSlot.toLatin1().data()); break; default: diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKScalarBarWidget.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKScalarBarWidget.cpp index cc00c9d7e5..6f4ab9763e 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKScalarBarWidget.cpp +++ b/Libs/Visualization/VTK/Widgets/ctkVTKScalarBarWidget.cpp @@ -61,10 +61,10 @@ void ctkVTKScalarBarWidgetPrivate::init() q, SLOT(setMaxNumberOfColors(int))); QObject::connect(this->NumberOfLabelsSpinBox, SIGNAL(valueChanged(int)), q, SLOT(setNumberOfLabels(int))); - QObject::connect(this->TitleTextPropertyWidget, SIGNAL(textChanged(const QString&)), - q, SLOT(setTitle(const QString&))); - QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(textChanged(const QString&)), - q, SLOT(setLabelsFormat(const QString&))); + QObject::connect(this->TitleTextPropertyWidget, SIGNAL(textChanged(QString)), + q, SLOT(setTitle(QString))); + QObject::connect(this->LabelsTextPropertyWidget, SIGNAL(textChanged(QString)), + q, SLOT(setLabelsFormat(QString))); } //----------------------------------------------------------------------------- diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp index 004969fac0..9061e0e2b4 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp +++ b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp @@ -101,7 +101,7 @@ void ctkVTKScalarsToColorsView::addPlot(vtkPlot* plot) if (vtkColorTransferControlPointsItem::SafeDownCast(plot)) { this->qvtkConnect(plot, vtkControlPointsItem::CurrentPointEditEvent, - this, SLOT(editPoint(vtkObject*, void*))); + this, SLOT(editPoint(vtkObject*,void*))); } this->Superclass::addPlot(plot); } diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.cpp index 2cd4de7d5f..49a4d39f0a 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.cpp +++ b/Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.cpp @@ -88,8 +88,8 @@ void ctkVTKScalarsToColorsWidgetPrivate::setupUi(QWidget* widget) QObject::connect(this->PointIdSpinBox, SIGNAL(valueChanged(int)), q, SLOT(onCurrentPointChanged(int))); this->PointIdSpinBox->setValue(-1); - QObject::connect(this->ColorPickerButton, SIGNAL(colorChanged(const QColor&)), - q, SLOT(onColorChanged(const QColor&))); + QObject::connect(this->ColorPickerButton, SIGNAL(colorChanged(QColor)), + q, SLOT(onColorChanged(QColor))); QObject::connect(this->OpacitySpinBox, SIGNAL(valueChanged(double)), q, SLOT(onOpacityChanged(double))); QObject::connect(this->MidPointSpinBox, SIGNAL(valueChanged(double)), @@ -99,13 +99,13 @@ void ctkVTKScalarsToColorsWidgetPrivate::setupUi(QWidget* widget) this->ColorPickerButton->setVisible(false); this->OpacityLabel->setVisible(false); this->OpacitySpinBox->setVisible(false); - QObject::connect(this->XRangeSlider, SIGNAL(valuesChanged(double, double)), - q, SLOT(setXRange(double, double))); - QObject::connect(this->YRangeSlider, SIGNAL(valuesChanged(double, double)), - q, SLOT(setYRange(double, double))); - QObject::connect(this->XRangeSlider, SIGNAL(valuesChanged(double, double)), + QObject::connect(this->XRangeSlider, SIGNAL(valuesChanged(double,double)), + q, SLOT(setXRange(double,double))); + QObject::connect(this->YRangeSlider, SIGNAL(valuesChanged(double,double)), + q, SLOT(setYRange(double,double))); + QObject::connect(this->XRangeSlider, SIGNAL(valuesChanged(double,double)), q, SIGNAL(axesModified())); - QObject::connect(this->YRangeSlider, SIGNAL(valuesChanged(double, double)), + QObject::connect(this->YRangeSlider, SIGNAL(valuesChanged(double,double)), q, SIGNAL(axesModified())); q->qvtkConnect(this->View->chart()->GetAxis(0),vtkCommand::ModifiedEvent, @@ -198,7 +198,7 @@ void ctkVTKScalarsToColorsWidget::onPlotAdded(vtkPlot* plot) if (vtkControlPointsItem::SafeDownCast(plot)) { this->qvtkConnect(plot, vtkControlPointsItem::CurrentPointChangedEvent, - this, SLOT(setCurrentPoint(vtkObject*, void*))); + this, SLOT(setCurrentPoint(vtkObject*,void*))); } } diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.cpp index 2c44f6bde1..fc071d17cf 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.cpp +++ b/Libs/Visualization/VTK/Widgets/ctkVTKTextPropertyWidget.cpp @@ -58,14 +58,14 @@ void ctkVTKTextPropertyWidgetPrivate::init() Q_Q(ctkVTKTextPropertyWidget); this->setupUi(q); q->updateFromTextProperty(); - QObject::connect(this->TextLineEdit, SIGNAL(textChanged(const QString&)), - q, SIGNAL(textChanged(const QString&))); + QObject::connect(this->TextLineEdit, SIGNAL(textChanged(QString)), + q, SIGNAL(textChanged(QString))); QObject::connect(this->ColorPickerButton, SIGNAL(colorChanged(QColor)), - q, SLOT(setColor(const QColor&))); + q, SLOT(setColor(QColor))); QObject::connect(this->OpacitySlider, SIGNAL(valueChanged(double)), q, SLOT(setOpacity(double))); - QObject::connect(this->FontComboBox, SIGNAL(currentIndexChanged(const QString&)), - q, SLOT(setFont(const QString&))); + QObject::connect(this->FontComboBox, SIGNAL(currentIndexChanged(QString)), + q, SLOT(setFont(QString))); QObject::connect(this->BoldCheckBox, SIGNAL(toggled(bool)), q, SLOT(setBold(bool))); QObject::connect(this->ItalicCheckBox, SIGNAL(toggled(bool)), diff --git a/Libs/Visualization/VTK/Widgets/ctkVTKThresholdWidget.cpp b/Libs/Visualization/VTK/Widgets/ctkVTKThresholdWidget.cpp index 849785557c..7b1f6d7619 100644 --- a/Libs/Visualization/VTK/Widgets/ctkVTKThresholdWidget.cpp +++ b/Libs/Visualization/VTK/Widgets/ctkVTKThresholdWidget.cpp @@ -71,8 +71,8 @@ void ctkVTKThresholdWidgetPrivate::setupUi(QWidget* widget) Q_ASSERT(q == widget); this->Ui_ctkVTKThresholdWidget::setupUi(widget); - QObject::connect(this->ThresholdSliderWidget, SIGNAL(valuesChanged(double, double)), - q, SLOT(setThresholdValues(double, double))); + QObject::connect(this->ThresholdSliderWidget, SIGNAL(valuesChanged(double,double)), + q, SLOT(setThresholdValues(double,double))); QObject::connect(this->OpacitySliderWidget, SIGNAL(valueChanged(double)), q, SLOT(setOpacity(double))); } diff --git a/Libs/Widgets/Testing/Cpp/ctkDateRangeWidgetTest1.cpp b/Libs/Widgets/Testing/Cpp/ctkDateRangeWidgetTest1.cpp index d77a982342..8c1eda53e9 100644 --- a/Libs/Widgets/Testing/Cpp/ctkDateRangeWidgetTest1.cpp +++ b/Libs/Widgets/Testing/Cpp/ctkDateRangeWidgetTest1.cpp @@ -156,8 +156,8 @@ int ctkDateRangeWidgetTest1(int argc, char * argv [] ) return EXIT_FAILURE; } - QSignalSpy startSpy(&dateRange, SIGNAL(startDateTimeChanged(const QDateTime&))); - QSignalSpy endSpy(&dateRange, SIGNAL(endDateTimeChanged(const QDateTime&))); + QSignalSpy startSpy(&dateRange, SIGNAL(startDateTimeChanged(QDateTime))); + QSignalSpy endSpy(&dateRange, SIGNAL(endDateTimeChanged(QDateTime))); dateRange.setLastWeek(); if (startSpy.count() != 1 || endSpy.count() != 1) diff --git a/Libs/Widgets/Testing/Cpp/ctkDirectoryButtonTest1.cpp b/Libs/Widgets/Testing/Cpp/ctkDirectoryButtonTest1.cpp index f6017bb6f7..3f5a20fa90 100644 --- a/Libs/Widgets/Testing/Cpp/ctkDirectoryButtonTest1.cpp +++ b/Libs/Widgets/Testing/Cpp/ctkDirectoryButtonTest1.cpp @@ -91,8 +91,8 @@ int ctkDirectoryButtonTest1(int argc, char * argv [] ) return EXIT_FAILURE; } - QSignalSpy spyDirectoryChanged(&button, SIGNAL(directoryChanged(const QString&))); - QSignalSpy spyDirectorySelected(&button, SIGNAL(directorySelected(const QString&))); + QSignalSpy spyDirectoryChanged(&button, SIGNAL(directoryChanged(QString))); + QSignalSpy spyDirectorySelected(&button, SIGNAL(directorySelected(QString))); button.setDirectory(QDir::home().absolutePath()); if ( QDir(button.directory()) != QDir::home() || diff --git a/Libs/Widgets/Testing/Cpp/ctkDoubleRangeSliderTest2.cpp b/Libs/Widgets/Testing/Cpp/ctkDoubleRangeSliderTest2.cpp index 0d51628603..0c1ffd5711 100644 --- a/Libs/Widgets/Testing/Cpp/ctkDoubleRangeSliderTest2.cpp +++ b/Libs/Widgets/Testing/Cpp/ctkDoubleRangeSliderTest2.cpp @@ -38,7 +38,7 @@ int ctkDoubleRangeSliderTest2(int argc, char * argv [] ) ctkDoubleRangeSlider slider(Qt::Horizontal); - QSignalSpy spyRange(&slider, SIGNAL(rangeChanged(double, double))); + QSignalSpy spyRange(&slider, SIGNAL(rangeChanged(double,double))); slider.setRange(200., 499.01); diff --git a/Libs/Widgets/Testing/Cpp/ctkExampleUseOfWorkflowWidgetUsingSignalsAndSlots.cpp b/Libs/Widgets/Testing/Cpp/ctkExampleUseOfWorkflowWidgetUsingSignalsAndSlots.cpp index 4cf1473dba..5c383417fb 100644 --- a/Libs/Widgets/Testing/Cpp/ctkExampleUseOfWorkflowWidgetUsingSignalsAndSlots.cpp +++ b/Libs/Widgets/Testing/Cpp/ctkExampleUseOfWorkflowWidgetUsingSignalsAndSlots.cpp @@ -105,19 +105,19 @@ int ctkExampleUseOfWorkflowWidgetUsingSignalsAndSlots(int argc, char * argv [] ) qObject3->setWidget(testStep3->stepArea()); // use the qObjects for validation - QObject::connect(testStep1->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(const QString&)), qObject1, SLOT(validate(const QString&))); - QObject::connect(testStep2->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(const QString&)), qObject2, SLOT(validate(const QString&))); - QObject::connect(testStep3->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(const QString&)), qObject3, SLOT(validate(const QString&))); + QObject::connect(testStep1->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(QString)), qObject1, SLOT(validate(QString))); + QObject::connect(testStep2->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(QString)), qObject2, SLOT(validate(QString))); + QObject::connect(testStep3->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(QString)), qObject3, SLOT(validate(QString))); // use the qObjects for entry processing - QObject::connect(testStep1->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject1, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); - QObject::connect(testStep2->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject2, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); - QObject::connect(testStep3->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject3, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + QObject::connect(testStep1->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject1, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); + QObject::connect(testStep2->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject2, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); + QObject::connect(testStep3->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject3, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); // use the qObjects for exit processing - QObject::connect(testStep1->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject1, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); - QObject::connect(testStep2->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject2, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); - QObject::connect(testStep3->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject3, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + QObject::connect(testStep1->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject1, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); + QObject::connect(testStep2->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject2, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); + QObject::connect(testStep3->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), qObject3, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); // use the qObjects for populating the stepWidgetsList QObject::connect(testStep1->ctkWorkflowStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject1, SLOT(createUserInterface())); diff --git a/Libs/Widgets/Testing/Cpp/ctkFontButtonTest1.cpp b/Libs/Widgets/Testing/Cpp/ctkFontButtonTest1.cpp index 9649eebb69..c35d36120f 100644 --- a/Libs/Widgets/Testing/Cpp/ctkFontButtonTest1.cpp +++ b/Libs/Widgets/Testing/Cpp/ctkFontButtonTest1.cpp @@ -54,7 +54,7 @@ int ctkFontButtonTest1(int argc, char * argv [] ) return EXIT_FAILURE; } - QSignalSpy spyFontChanged(&button, SIGNAL(currentFontChanged(const QFont&))); + QSignalSpy spyFontChanged(&button, SIGNAL(currentFontChanged(QFont))); button.setCurrentFont(customFont2); if ( button.currentFont() != customFont2 || diff --git a/Libs/Widgets/Testing/Cpp/ctkModalityWidgetTest1.cpp b/Libs/Widgets/Testing/Cpp/ctkModalityWidgetTest1.cpp index 43db4f19a9..55f3ec16e7 100644 --- a/Libs/Widgets/Testing/Cpp/ctkModalityWidgetTest1.cpp +++ b/Libs/Widgets/Testing/Cpp/ctkModalityWidgetTest1.cpp @@ -36,7 +36,7 @@ int ctkModalityWidgetTest1(int argc, char * argv [] ) ctkModalityWidget modalityWidget; - QSignalSpy spy(&modalityWidget, SIGNAL(selectedModalitiesChanged(const QStringList&))); + QSignalSpy spy(&modalityWidget, SIGNAL(selectedModalitiesChanged(QStringList))); modalityWidget.unselectAll(); if (spy.count() != 1) diff --git a/Libs/Widgets/Testing/Cpp/ctkSettingsPanelTest1.cpp b/Libs/Widgets/Testing/Cpp/ctkSettingsPanelTest1.cpp index 52375adcdc..5037043561 100644 --- a/Libs/Widgets/Testing/Cpp/ctkSettingsPanelTest1.cpp +++ b/Libs/Widgets/Testing/Cpp/ctkSettingsPanelTest1.cpp @@ -112,7 +112,7 @@ int ctkSettingsPanelTest1(int argc, char * argv [] ) QLineEdit* lineEdit = new QLineEdit("default", &settingsPanel); settingsPanel.registerProperty("key 2", lineEdit, "text", - SIGNAL(textChanged(const QString&))); + SIGNAL(textChanged(QString))); // Check value after a property is registered QVariant lineEditVal = settings.value("key 2"); diff --git a/Libs/Widgets/Testing/Cpp/ctkWorkflowWidgetTest2.cpp b/Libs/Widgets/Testing/Cpp/ctkWorkflowWidgetTest2.cpp index 873d8c50b1..ff7b291b95 100644 --- a/Libs/Widgets/Testing/Cpp/ctkWorkflowWidgetTest2.cpp +++ b/Libs/Widgets/Testing/Cpp/ctkWorkflowWidgetTest2.cpp @@ -596,27 +596,27 @@ int ctkWorkflowWidgetTest2(int argc, char * argv [] ) // use the qObjects for validation QObject::connect(step1->ctkWorkflowStepQObject(), - SIGNAL(invokeValidateCommand(const QString&)), - qObject1, SLOT(validate(const QString&))); + SIGNAL(invokeValidateCommand(QString)), + qObject1, SLOT(validate(QString))); QObject::connect(step2->ctkWorkflowStepQObject(), - SIGNAL(invokeValidateCommand(const QString&)), - qObject2, SLOT(validate(const QString&))); + SIGNAL(invokeValidateCommand(QString)), + qObject2, SLOT(validate(QString))); // use the qObjects for entry processing QObject::connect(step1->ctkWorkflowStepQObject(), - SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject1, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject1, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); QObject::connect(step2->ctkWorkflowStepQObject(), - SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject2, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject2, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); // use the qObjects for exit processing QObject::connect(step1->ctkWorkflowStepQObject(), - SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject1, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject1, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); QObject::connect(step2->ctkWorkflowStepQObject(), - SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject2, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject2, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); // use the qObjects for populating the stepWidgetsList QObject::connect(step1->ctkWorkflowStepQObject(), @@ -681,16 +681,16 @@ int ctkWorkflowWidgetTest2(int argc, char * argv [] ) qObject3->setWidget(step3->stepArea()); // use the qObjects for validation - QObject::connect(step3->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(const QString&)), - qObject3, SLOT(validate(const QString&))); + QObject::connect(step3->ctkWorkflowStepQObject(), SIGNAL(invokeValidateCommand(QString)), + qObject3, SLOT(validate(QString))); // use the qObjects for entry processing - QObject::connect(step3->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject3, SLOT(onEntry(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + QObject::connect(step3->ctkWorkflowStepQObject(), SIGNAL(invokeOnEntryCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject3, SLOT(onEntry(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); // use the qObjects for exit processing - QObject::connect(step3->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType)), - qObject3, SLOT(onExit(const ctkWorkflowStep*, const ctkWorkflowInterstepTransition::InterstepTransitionType))); + QObject::connect(step3->ctkWorkflowStepQObject(), SIGNAL(invokeOnExitCommand(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType)), + qObject3, SLOT(onExit(const ctkWorkflowStep*,ctkWorkflowInterstepTransition::InterstepTransitionType))); // use the qObjects for populating the stepWidgetsList QObject::connect(step3->ctkWorkflowStepQObject(), SIGNAL(invokeCreateUserInterfaceCommand()), qObject3, SLOT(createUserInterface())); diff --git a/Libs/Widgets/ctkAddRemoveComboBox.cpp b/Libs/Widgets/ctkAddRemoveComboBox.cpp index 480cb8965a..35c788fe55 100644 --- a/Libs/Widgets/ctkAddRemoveComboBox.cpp +++ b/Libs/Widgets/ctkAddRemoveComboBox.cpp @@ -105,19 +105,19 @@ void ctkAddRemoveComboBoxPrivate::connectComboBox(QComboBox* comboBox) q, SIGNAL(currentIndexChanged(int))); /* this->connect(d->ComboBox->model(), - SIGNAL(rowsAboutToBeInserted(const QModelIndex & _parent, int start, int end )), - SLOT(onRowsAboutToBeInserted(const QModelIndex & _parent, int start, int end ))); + SIGNAL(rowsAboutToBeInserted(QModelIndex&_parent,int start,int end)), + SLOT(onRowsAboutToBeInserted(QModelIndex&_parent,int start,int end))); */ QObject::connect(comboBox->model(), - SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)), - q, SLOT(onRowsAboutToBeRemoved(const QModelIndex & , int , int ))); + SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), + q, SLOT(onRowsAboutToBeRemoved(QModelIndex,int,int))); QObject::connect(comboBox->model(), - SIGNAL(rowsInserted(const QModelIndex &, int, int )), - q, SLOT(onRowsInserted(const QModelIndex &, int, int))); + SIGNAL(rowsInserted(QModelIndex,int,int)), + q, SLOT(onRowsInserted(QModelIndex,int,int))); QObject::connect(comboBox->model(), - SIGNAL(rowsRemoved(const QModelIndex &, int, int)), - q, SLOT(onRowsRemoved(const QModelIndex &, int, int ))); + SIGNAL(rowsRemoved(QModelIndex,int,int)), + q, SLOT(onRowsRemoved(QModelIndex,int,int))); } // -------------------------------------------------------------------------- diff --git a/Libs/Widgets/ctkCheckableComboBox.cpp b/Libs/Widgets/ctkCheckableComboBox.cpp index 644ede87e2..7e97fd2d52 100644 --- a/Libs/Widgets/ctkCheckableComboBox.cpp +++ b/Libs/Widgets/ctkCheckableComboBox.cpp @@ -240,14 +240,14 @@ bool ctkCheckableComboBox::eventFilter(QObject *o, QEvent *e) void ctkCheckableComboBox::setCheckableModel(QAbstractItemModel* newModel) { Q_D(ctkCheckableComboBox); - this->disconnect(this->model(), SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), - this, SLOT(onDataChanged(const QModelIndex&, const QModelIndex&))); + this->disconnect(this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), + this, SLOT(onDataChanged(QModelIndex,QModelIndex))); if (newModel != this->model()) { this->setModel(newModel); } - this->connect(this->model(), SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), - this, SLOT(onDataChanged(const QModelIndex&, const QModelIndex&))); + this->connect(this->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), + this, SLOT(onDataChanged(QModelIndex,QModelIndex))); d->CheckableModelHelper->setModel(newModel); d->updateCheckedList(); } diff --git a/Libs/Widgets/ctkCheckableHeaderView.cpp b/Libs/Widgets/ctkCheckableHeaderView.cpp index 777b681fe9..43906d0f46 100644 --- a/Libs/Widgets/ctkCheckableHeaderView.cpp +++ b/Libs/Widgets/ctkCheckableHeaderView.cpp @@ -185,16 +185,16 @@ void ctkCheckableHeaderView::setModel(QAbstractItemModel *newModel) if (current) { this->disconnect( - current, SIGNAL(headerDataChanged(Qt::Orientation, int, int)), - this, SLOT(onHeaderDataChanged(Qt::Orientation, int, int))); + current, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), + this, SLOT(onHeaderDataChanged(Qt::Orientation,int,int))); this->disconnect( current, SIGNAL(modelReset()), this, SLOT(updateHeaderPixmaps())); this->disconnect( - current, SIGNAL(columnsInserted(const QModelIndex &, int, int)), + current, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(onHeaderSectionInserted())); this->disconnect( - current, SIGNAL(rowsInserted(const QModelIndex &, int, int)), + current, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(onHeaderSectionInserted())); } this->QHeaderView::setModel(newModel); @@ -202,21 +202,21 @@ void ctkCheckableHeaderView::setModel(QAbstractItemModel *newModel) if(newModel) { this->connect( - newModel, SIGNAL(headerDataChanged(Qt::Orientation, int, int)), - this, SLOT(onHeaderDataChanged(Qt::Orientation, int, int))); + newModel, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), + this, SLOT(onHeaderDataChanged(Qt::Orientation,int,int))); this->connect( newModel, SIGNAL(modelReset()), this, SLOT(updateHeaderPixmaps())); if(this->orientation() == Qt::Horizontal) { this->connect( - newModel, SIGNAL(columnsInserted(const QModelIndex &, int, int)), + newModel, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(onHeaderSectionInserted())); } else { this->connect( - newModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)), + newModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(onHeaderSectionInserted())); } } diff --git a/Libs/Widgets/ctkConsole.cpp b/Libs/Widgets/ctkConsole.cpp index ee25e30c38..9c6053d33f 100644 --- a/Libs/Widgets/ctkConsole.cpp +++ b/Libs/Widgets/ctkConsole.cpp @@ -402,16 +402,16 @@ void ctkConsolePrivate::setCompleter(ctkConsoleCompleter* completer) if (this->Completer) { this->Completer->setWidget(0); - disconnect(this->Completer, SIGNAL(activated(const QString&)), - this, SLOT(insertCompletion(const QString&))); + disconnect(this->Completer, SIGNAL(activated(QString)), + this, SLOT(insertCompletion(QString))); } this->Completer = completer; if (this->Completer) { this->Completer->setWidget(this); - connect(this->Completer, SIGNAL(activated(const QString&)), - this, SLOT(insertCompletion(const QString&))); + connect(this->Completer, SIGNAL(activated(QString)), + this, SLOT(insertCompletion(QString))); } } diff --git a/Libs/Widgets/ctkDateRangeWidget.cpp b/Libs/Widgets/ctkDateRangeWidget.cpp index a9ee8c15df..2933823f00 100644 --- a/Libs/Widgets/ctkDateRangeWidget.cpp +++ b/Libs/Widgets/ctkDateRangeWidget.cpp @@ -133,13 +133,13 @@ ctkDateRangeWidget::ctkDateRangeWidget(QWidget* _parent) : Superclass(_parent) QObject::connect(d->SelectRangeRadioButton, SIGNAL(clicked()), this, SLOT(setSelectRange())); - QObject::connect(d->StartDate, SIGNAL(dateTimeChanged(const QDateTime&)), - this, SIGNAL(startDateTimeChanged(const QDateTime&))); - QObject::connect(d->EndDate, SIGNAL(dateTimeChanged(const QDateTime&)), - this, SIGNAL(endDateTimeChanged(const QDateTime&))); - QObject::connect(d->StartDate, SIGNAL(dateTimeChanged(const QDateTime&)), + QObject::connect(d->StartDate, SIGNAL(dateTimeChanged(QDateTime)), + this, SIGNAL(startDateTimeChanged(QDateTime))); + QObject::connect(d->EndDate, SIGNAL(dateTimeChanged(QDateTime)), + this, SIGNAL(endDateTimeChanged(QDateTime))); + QObject::connect(d->StartDate, SIGNAL(dateTimeChanged(QDateTime)), this, SLOT(onDateTimeChanged())); - QObject::connect(d->EndDate, SIGNAL(dateTimeChanged(const QDateTime&)), + QObject::connect(d->EndDate, SIGNAL(dateTimeChanged(QDateTime)), this, SLOT(onDateTimeChanged())); } diff --git a/Libs/Widgets/ctkDoubleRangeSlider.cpp b/Libs/Widgets/ctkDoubleRangeSlider.cpp index e307a08e75..4d8c8d2df3 100644 --- a/Libs/Widgets/ctkDoubleRangeSlider.cpp +++ b/Libs/Widgets/ctkDoubleRangeSlider.cpp @@ -117,8 +117,8 @@ void ctkDoubleRangeSliderPrivate::connectSlider() q, SIGNAL(sliderPressed())); q->connect(this->Slider, SIGNAL(sliderReleased()), q, SIGNAL(sliderReleased())); - q->connect(this->Slider, SIGNAL(rangeChanged(int, int)), - q, SLOT(onRangeChanged(int, int))); + q->connect(this->Slider, SIGNAL(rangeChanged(int,int)), + q, SLOT(onRangeChanged(int,int))); } // -------------------------------------------------------------------------- diff --git a/Libs/Widgets/ctkDoubleSlider.cpp b/Libs/Widgets/ctkDoubleSlider.cpp index af6c5abe13..6868eb8d6b 100644 --- a/Libs/Widgets/ctkDoubleSlider.cpp +++ b/Libs/Widgets/ctkDoubleSlider.cpp @@ -87,8 +87,8 @@ void ctkDoubleSliderPrivate::init() q->connect(this->Slider, SIGNAL(sliderMoved(int)), q, SLOT(onSliderMoved(int))); q->connect(this->Slider, SIGNAL(sliderPressed()), q, SIGNAL(sliderPressed())); q->connect(this->Slider, SIGNAL(sliderReleased()), q, SIGNAL(sliderReleased())); - q->connect(this->Slider, SIGNAL(rangeChanged(int, int)), - q, SLOT(onRangeChanged(int, int))); + q->connect(this->Slider, SIGNAL(rangeChanged(int,int)), + q, SLOT(onRangeChanged(int,int))); q->setSizePolicy(this->Slider->sizePolicy()); q->setAttribute(Qt::WA_WState_OwnSizePolicy, false); diff --git a/Libs/Widgets/ctkErrorLogWidget.cpp b/Libs/Widgets/ctkErrorLogWidget.cpp index c62861f862..000c6fc5e9 100644 --- a/Libs/Widgets/ctkErrorLogWidget.cpp +++ b/Libs/Widgets/ctkErrorLogWidget.cpp @@ -128,14 +128,14 @@ void ctkErrorLogWidget::setErrorLogModel(ctkErrorLogModel * newErrorLogModel) if (this->errorLogModel()) { - disconnect(this->errorLogModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)), - this, SLOT(onRowsInserted(const QModelIndex&, int, int))); + disconnect(this->errorLogModel(), SIGNAL(rowsInserted(QModelIndex,int,int)), + this, SLOT(onRowsInserted(QModelIndex,int,int))); disconnect(this->errorLogModel(), SIGNAL(logLevelFilterChanged()), this, SLOT(onLogLevelFilterChanged())); - disconnect(d->SelectionModel.data(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(onSelectionChanged(const QItemSelection &, const QItemSelection &))); + disconnect(d->SelectionModel.data(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), + this, SLOT(onSelectionChanged(QItemSelection,QItemSelection))); d->SelectionModel.clear(); } @@ -144,8 +144,8 @@ void ctkErrorLogWidget::setErrorLogModel(ctkErrorLogModel * newErrorLogModel) if (newErrorLogModel) { - connect(this->errorLogModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)), - this, SLOT(onRowsInserted(const QModelIndex&, int, int))); + connect(this->errorLogModel(), SIGNAL(rowsInserted(QModelIndex,int,int)), + this, SLOT(onRowsInserted(QModelIndex,int,int))); connect(this->errorLogModel(), SIGNAL(logLevelFilterChanged()), this, SLOT(onLogLevelFilterChanged())); @@ -160,8 +160,8 @@ void ctkErrorLogWidget::setErrorLogModel(ctkErrorLogModel * newErrorLogModel) d->SelectionModel = QSharedPointer(new QItemSelectionModel(this->errorLogModel())); d->SelectionModel->reset(); - connect(d->SelectionModel.data(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(onSelectionChanged(const QItemSelection &, const QItemSelection &))); + connect(d->SelectionModel.data(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), + this, SLOT(onSelectionChanged(QItemSelection,QItemSelection))); d->ErrorLogTableView->setSelectionModel(d->SelectionModel.data()); diff --git a/Libs/Widgets/ctkFileDialog.cpp b/Libs/Widgets/ctkFileDialog.cpp index 86f2ff8a82..49cf3c7cf5 100644 --- a/Libs/Widgets/ctkFileDialog.cpp +++ b/Libs/Widgets/ctkFileDialog.cpp @@ -71,7 +71,7 @@ void ctkFileDialogPrivate::init() button->installEventFilter(q); QObject::connect(this->listView()->selectionModel(), - SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + SIGNAL(selectionChanged(QItemSelection,QItemSelection)), q, SLOT(onSelectionChanged())); } diff --git a/Libs/Widgets/ctkMaterialPropertyWidget.cpp b/Libs/Widgets/ctkMaterialPropertyWidget.cpp index ea0c700fda..46b7c75fc7 100644 --- a/Libs/Widgets/ctkMaterialPropertyWidget.cpp +++ b/Libs/Widgets/ctkMaterialPropertyWidget.cpp @@ -258,8 +258,8 @@ void ctkMaterialPropertyWidget::addPreset( new ctkMaterialPropertyPreviewLabel(color, opacity, ambient, diffuse, specular, power); if (!color.isValid()) { - connect(this, SIGNAL(colorChanged(const QColor&)), - preset, SLOT(setColor(const QColor&))); + connect(this, SIGNAL(colorChanged(QColor)), + preset, SLOT(setColor(QColor))); preset->setColor(this->color()); } preset->setGridOpacity(d->MaterialPropertyPreviewLabel->gridOpacity()); diff --git a/Libs/Widgets/ctkMatrixWidget.cpp b/Libs/Widgets/ctkMatrixWidget.cpp index 7ea0a0076d..1928e5a752 100644 --- a/Libs/Widgets/ctkMatrixWidget.cpp +++ b/Libs/Widgets/ctkMatrixWidget.cpp @@ -142,7 +142,7 @@ void ctkMatrixWidgetPrivate::init() // The table takes ownership of the prototype. this->Table->setItemPrototype(_item); - QObject::connect(this->Table, SIGNAL(cellChanged(int, int)), + QObject::connect(this->Table, SIGNAL(cellChanged(int,int)), q, SIGNAL(matrixChanged())); /// \todo Wrap model signals to emit signals when the matrix is changed. /// Right now you can connect to the signal: diff --git a/Libs/Widgets/ctkMenuComboBox.cpp b/Libs/Widgets/ctkMenuComboBox.cpp index 89c1ac3548..18f9a00e76 100644 --- a/Libs/Widgets/ctkMenuComboBox.cpp +++ b/Libs/Widgets/ctkMenuComboBox.cpp @@ -95,7 +95,7 @@ void ctkMenuComboBoxPrivate::init() this->SearchCompleter = new ctkCompleter(QStringList(), q); this->SearchCompleter->setCaseSensitivity(Qt::CaseInsensitive); this->SearchCompleter->setModelFiltering(ctkCompleter::FilterWordStartsWith); - q->connect(this->SearchCompleter, SIGNAL(activated(const QString&)), + q->connect(this->SearchCompleter, SIGNAL(activated(QString)), q, SLOT(onEditingFinished())); // Automatically set the minimumSizeHint of the layout to the widget diff --git a/Libs/Widgets/ctkPathLineEdit.cpp b/Libs/Widgets/ctkPathLineEdit.cpp index e65bf3dcd5..914a41e34c 100644 --- a/Libs/Widgets/ctkPathLineEdit.cpp +++ b/Libs/Widgets/ctkPathLineEdit.cpp @@ -90,9 +90,9 @@ void ctkPathLineEditPrivate::init() QSizePolicy::Expanding, QSizePolicy::Fixed, QSizePolicy::LineEdit)); - QObject::connect(this->ComboBox,SIGNAL(editTextChanged(const QString&)), - q, SLOT(setCurrentDirectory(const QString&))); - QObject::connect(this->ComboBox,SIGNAL(editTextChanged(const QString&)), + QObject::connect(this->ComboBox,SIGNAL(editTextChanged(QString)), + q, SLOT(setCurrentDirectory(QString))); + QObject::connect(this->ComboBox,SIGNAL(editTextChanged(QString)), q, SLOT(updateHasValidInput())); } diff --git a/Libs/Widgets/ctkRangeSlider.cpp b/Libs/Widgets/ctkRangeSlider.cpp index 94247e8521..cee1f14d1e 100644 --- a/Libs/Widgets/ctkRangeSlider.cpp +++ b/Libs/Widgets/ctkRangeSlider.cpp @@ -117,7 +117,7 @@ void ctkRangeSliderPrivate::init() this->m_MaximumValue = q->maximum(); this->m_MinimumPosition = q->minimum(); this->m_MaximumPosition = q->maximum(); - q->connect(q, SIGNAL(rangeChanged(int, int)), q, SLOT(onRangeChanged(int, int))); + q->connect(q, SIGNAL(rangeChanged(int,int)), q, SLOT(onRangeChanged(int,int))); } // -------------------------------------------------------------------------- diff --git a/Libs/Widgets/ctkRangeWidget.cpp b/Libs/Widgets/ctkRangeWidget.cpp index 1ee5dfc950..48f6ef6ff6 100644 --- a/Libs/Widgets/ctkRangeWidget.cpp +++ b/Libs/Widgets/ctkRangeWidget.cpp @@ -77,7 +77,7 @@ ctkRangeWidgetPrivate::ctkRangeWidgetPrivate(ctkRangeWidget& object) void ctkRangeWidgetPrivate::connectSlider() { Q_Q(ctkRangeWidget); - QObject::connect(this->Slider, SIGNAL(valuesChanged(double, double)), + QObject::connect(this->Slider, SIGNAL(valuesChanged(double,double)), q, SLOT(changeValues(double,double))); QObject::connect(this->Slider, SIGNAL(minimumValueChanged(double)), q, SLOT(changeMinimumValue(double))); @@ -97,8 +97,8 @@ void ctkRangeWidgetPrivate::connectSlider() q, SLOT(startChanging())); QObject::connect(this->Slider, SIGNAL(sliderReleased()), q, SLOT(stopChanging())); - QObject::connect(this->Slider, SIGNAL(rangeChanged(double, double)), - q, SLOT(onSliderRangeChanged(double, double))); + QObject::connect(this->Slider, SIGNAL(rangeChanged(double,double)), + q, SLOT(onSliderRangeChanged(double,double))); } // -------------------------------------------------------------------------- diff --git a/Libs/Widgets/ctkSearchBox.cpp b/Libs/Widgets/ctkSearchBox.cpp index ff4e8bdf1c..83fffd60e7 100644 --- a/Libs/Widgets/ctkSearchBox.cpp +++ b/Libs/Widgets/ctkSearchBox.cpp @@ -77,7 +77,7 @@ void ctkSearchBoxPrivate::init() // Set a text by default on the QLineEdit q->setPlaceholderText(q->tr("Search...")); - QObject::connect(q, SIGNAL(textChanged(const QString&)), + QObject::connect(q, SIGNAL(textChanged(QString)), q, SLOT(updateClearButtonState())); } diff --git a/Libs/Widgets/ctkSettingsDialog.cpp b/Libs/Widgets/ctkSettingsDialog.cpp index af8f9fa371..46a3e9441c 100644 --- a/Libs/Widgets/ctkSettingsDialog.cpp +++ b/Libs/Widgets/ctkSettingsDialog.cpp @@ -72,8 +72,8 @@ void ctkSettingsDialogPrivate::init() q->setSettings(new QSettings(q)); QObject::connect(this->SettingsTreeWidget, - SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), - q, SLOT(onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*))); + SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), + q, SLOT(onCurrentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*))); QObject::connect(this->SettingsButtonBox, SIGNAL(clicked(QAbstractButton*)), q, SLOT(onDialogButtonClicked(QAbstractButton*))); } @@ -153,8 +153,8 @@ ::addPanel(ctkSettingsPanel* panel, ctkSettingsPanel* parentPanel) parentItem->addChild(newPanelItem); d->SettingsStackedWidget->addWidget(panel); - connect(panel, SIGNAL(settingChanged(const QString&, const QVariant&)), - this, SLOT(onSettingChanged(const QString&, const QVariant&))); + connect(panel, SIGNAL(settingChanged(QString,QVariant)), + this, SLOT(onSettingChanged(QString,QVariant))); panel->setSettings(this->settings()); } diff --git a/Libs/Widgets/ctkSettingsPanel.cpp b/Libs/Widgets/ctkSettingsPanel.cpp index f687cda10d..a16095c6dc 100644 --- a/Libs/Widgets/ctkSettingsPanel.cpp +++ b/Libs/Widgets/ctkSettingsPanel.cpp @@ -133,8 +133,8 @@ void ctkSettingsPanelPrivate::init() Q_Q(ctkSettingsPanel); this->SignalMapper = new QSignalMapper(q); - QObject::connect(this->SignalMapper, SIGNAL(mapped(const QString&)), - q, SLOT(updateSetting(const QString&))); + QObject::connect(this->SignalMapper, SIGNAL(mapped(QString)), + q, SLOT(updateSetting(QString))); } // -------------------------------------------------------------------------- diff --git a/Libs/Widgets/ctkTreeComboBox.cpp b/Libs/Widgets/ctkTreeComboBox.cpp index 54263b283f..80461d81e1 100644 --- a/Libs/Widgets/ctkTreeComboBox.cpp +++ b/Libs/Widgets/ctkTreeComboBox.cpp @@ -80,9 +80,9 @@ ctkTreeComboBox::ctkTreeComboBox(QWidget* _parent):Superclass(_parent) // we install the filter AFTER the QComboBox installed it. // so that our eventFilter will be called first this->view()->viewport()->installEventFilter(this); - connect(treeView, SIGNAL(collapsed(const QModelIndex&)), + connect(treeView, SIGNAL(collapsed(QModelIndex)), this, SLOT(resizePopup())); - connect(treeView, SIGNAL(expanded(const QModelIndex&)), + connect(treeView, SIGNAL(expanded(QModelIndex)), this, SLOT(resizePopup())); } diff --git a/Plugins/org.commontk.configadmin/ctkConfigurationAdminActivator.cpp b/Plugins/org.commontk.configadmin/ctkConfigurationAdminActivator.cpp index 34780cb40d..5b8877f82c 100644 --- a/Plugins/org.commontk.configadmin/ctkConfigurationAdminActivator.cpp +++ b/Plugins/org.commontk.configadmin/ctkConfigurationAdminActivator.cpp @@ -51,7 +51,7 @@ void ctkConfigurationAdminActivator::start(ctkPluginContext* context) eventAdapter->start(); factory = new ctkConfigurationAdminFactory(context, logTracker); factory->start(); - context->connectPluginListener(factory, SLOT(pluginChanged(const ctkPluginEvent&))); + context->connectPluginListener(factory, SLOT(pluginChanged(ctkPluginEvent))); registration = context->registerService(factory); } diff --git a/Plugins/org.commontk.dah.core/ctkSimpleSoapServer.cpp b/Plugins/org.commontk.dah.core/ctkSimpleSoapServer.cpp index 3de4e85f8d..4088636225 100644 --- a/Plugins/org.commontk.dah.core/ctkSimpleSoapServer.cpp +++ b/Plugins/org.commontk.dah.core/ctkSimpleSoapServer.cpp @@ -38,11 +38,11 @@ void ctkSimpleSoapServer::incomingConnection(int socketDescriptor) ctkSoapConnectionRunnable* runnable = new ctkSoapConnectionRunnable(socketDescriptor); connect(runnable, SIGNAL(incomingSoapMessage(QtSoapMessage,QtSoapMessage*)), - this, SIGNAL(incomingSoapMessage(QtSoapMessage, QtSoapMessage*)), + this, SIGNAL(incomingSoapMessage(QtSoapMessage,QtSoapMessage*)), Qt::BlockingQueuedConnection); connect(runnable, SIGNAL(incomingWSDLMessage(QString,QString*)), - this, SIGNAL(incomingWSDLMessage(QString, QString*)), + this, SIGNAL(incomingWSDLMessage(QString,QString*)), Qt::BlockingQueuedConnection); QThreadPool::globalInstance()->start(runnable);