Commit d7d75a8a authored by Yuri Chornoivan's avatar Yuri Chornoivan

Normalize SIGNAL and SLOT signatures

Differential Revision: https://phabricator.kde.org/D15522
parent be8023f4
......@@ -63,7 +63,7 @@ KUndo2Model::KUndo2Model(QObject *parent)
{
m_stack = 0;
m_sel_model = new QItemSelectionModel(this, this);
connect(m_sel_model, SIGNAL(currentChanged(QModelIndex, QModelIndex)), this, SLOT(setStackCurrentIndex(QModelIndex)));
connect(m_sel_model, SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(setStackCurrentIndex(QModelIndex)));
m_emty_label = i18n("<empty>");
}
......
......@@ -202,7 +202,7 @@ KoCanvasControllerWidget::KoCanvasControllerWidget(KActionCollection * actionCol
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(updateCanvasOffsetX()));
connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(updateCanvasOffsetY()));
connect(d->viewportWidget, SIGNAL(sizeChanged()), this, SLOT(updateCanvasOffsetX()));
connect(proxyObject, SIGNAL(moveDocumentOffset(const QPoint&)), d->viewportWidget, SLOT(documentOffsetMoved(const QPoint&)));
connect(proxyObject, SIGNAL(moveDocumentOffset(QPoint)), d->viewportWidget, SLOT(documentOffsetMoved(QPoint)));
}
KoCanvasControllerWidget::~KoCanvasControllerWidget()
......
......@@ -179,7 +179,7 @@ void KoShapeFactoryBase::setHidden(bool hidden)
void KoShapeFactoryBase::newDocumentResourceManager(KoDocumentResourceManager *manager) const
{
d->resourceManagers.append(manager);
connect(manager, SIGNAL(destroyed(QObject *)), this, SLOT(pruneDocumentResourceManager(QObject*)));
connect(manager, SIGNAL(destroyed(QObject*)), this, SLOT(pruneDocumentResourceManager(QObject*)));
}
KoShape *KoShapeFactoryBase::createDefaultShape(KoDocumentResourceManager *documentResources) const
......
......@@ -197,8 +197,8 @@ KoToolManager::KoToolManager()
: QObject(),
d(new Private(this))
{
connect(QApplication::instance(), SIGNAL(focusChanged(QWidget*, QWidget*)),
this, SLOT(movedFocus(QWidget*, QWidget*)));
connect(QApplication::instance(), SIGNAL(focusChanged(QWidget*,QWidget*)),
this, SLOT(movedFocus(QWidget*,QWidget*)));
}
KoToolManager::~KoToolManager()
......@@ -522,15 +522,15 @@ void KoToolManager::Private::setup()
void KoToolManager::Private::connectActiveTool()
{
if (canvasData->activeTool) {
connect(canvasData->activeTool, SIGNAL(cursorChanged(const QCursor &)),
q, SLOT(updateCursor(const QCursor &)));
connect(canvasData->activeTool, SIGNAL(activateTool(const QString &)),
q, SLOT(switchToolRequested(const QString &)));
connect(canvasData->activeTool, SIGNAL(activateTemporary(const QString &)),
q, SLOT(switchToolTemporaryRequested(const QString &)));
connect(canvasData->activeTool, SIGNAL(cursorChanged(QCursor)),
q, SLOT(updateCursor(QCursor)));
connect(canvasData->activeTool, SIGNAL(activateTool(QString)),
q, SLOT(switchToolRequested(QString)));
connect(canvasData->activeTool, SIGNAL(activateTemporary(QString)),
q, SLOT(switchToolTemporaryRequested(QString)));
connect(canvasData->activeTool, SIGNAL(done()), q, SLOT(switchBackRequested()));
connect(canvasData->activeTool, SIGNAL(statusTextChanged(const QString &)),
q, SIGNAL(changedStatusText(const QString &)));
connect(canvasData->activeTool, SIGNAL(statusTextChanged(QString)),
q, SIGNAL(changedStatusText(QString)));
}
// we expect the tool to emit a cursor on activation.
......@@ -547,15 +547,15 @@ void KoToolManager::Private::disconnectActiveTool()
// data needed for the repaint
emit q->aboutToChangeTool(canvasData->canvas);
canvasData->activeTool->deactivate();
disconnect(canvasData->activeTool, SIGNAL(cursorChanged(const QCursor&)),
q, SLOT(updateCursor(const QCursor&)));
disconnect(canvasData->activeTool, SIGNAL(activateTool(const QString &)),
q, SLOT(switchToolRequested(const QString &)));
disconnect(canvasData->activeTool, SIGNAL(activateTemporary(const QString &)),
q, SLOT(switchToolTemporaryRequested(const QString &)));
disconnect(canvasData->activeTool, SIGNAL(cursorChanged(QCursor)),
q, SLOT(updateCursor(QCursor)));
disconnect(canvasData->activeTool, SIGNAL(activateTool(QString)),
q, SLOT(switchToolRequested(QString)));
disconnect(canvasData->activeTool, SIGNAL(activateTemporary(QString)),
q, SLOT(switchToolTemporaryRequested(QString)));
disconnect(canvasData->activeTool, SIGNAL(done()), q, SLOT(switchBackRequested()));
disconnect(canvasData->activeTool, SIGNAL(statusTextChanged(const QString &)),
q, SIGNAL(changedStatusText(const QString &)));
disconnect(canvasData->activeTool, SIGNAL(statusTextChanged(QString)),
q, SIGNAL(changedStatusText(QString)));
}
// emit a empty status text to clear status text from last active tool
......
......@@ -41,7 +41,7 @@ void TestResourceManager::koShapeResource()
void TestResourceManager::testUnitChanged()
{
KoCanvasResourceManager rm(0);
QSignalSpy spy(&rm, SIGNAL(canvasResourceChanged(int, const QVariant &)));
QSignalSpy spy(&rm, SIGNAL(canvasResourceChanged(int,QVariant)));
KoUnit a;
rm.setResource(KoCanvasResourceManager::Unit, a);
......@@ -116,7 +116,7 @@ void TestResourceManager::testDerivedChanged()
QCOMPARE(m.resource(key2).toInt(), 5);
QCOMPARE(m.resource(derivedKey).toInt(), 15);
QSignalSpy spy(&m, SIGNAL(canvasResourceChanged(int, const QVariant &)));
QSignalSpy spy(&m, SIGNAL(canvasResourceChanged(int,QVariant)));
m.setResource(derivedKey, 16);
......@@ -209,7 +209,7 @@ void TestResourceManager::testComplexResource()
ComplexMediatorSP mediator(new ComplexMediator(key));
m.addResourceUpdateMediator(mediator);
QSignalSpy spy(&m, SIGNAL(canvasResourceChanged(int, const QVariant &)));
QSignalSpy spy(&m, SIGNAL(canvasResourceChanged(int,QVariant)));
ComplexResourceSP r1(new ComplexResource());
r1->m_resources[complex1] = 10;
......
......@@ -99,15 +99,15 @@ void KisAcyclicSignalConnector::connectForwardVariant(QObject *sender, const cha
QObject *receiver, const char *method)
{
connect(sender, signal, this, SLOT(forwardSlotVariant(const QVariant&)));
connect(this, SIGNAL(forwardSignalVariant(const QVariant&)), receiver, method);
connect(sender, signal, this, SLOT(forwardSlotVariant(QVariant)));
connect(this, SIGNAL(forwardSignalVariant(QVariant)), receiver, method);
}
void KisAcyclicSignalConnector::connectBackwardVariant(QObject *sender, const char *signal,
QObject *receiver, const char *method)
{
connect(sender, signal, this, SLOT(backwardSlotVariant(const QVariant&)));
connect(this, SIGNAL(backwardSignalVariant(const QVariant&)), receiver, method);
connect(sender, signal, this, SLOT(backwardSlotVariant(QVariant)));
connect(this, SIGNAL(backwardSignalVariant(QVariant)), receiver, method);
}
void KisAcyclicSignalConnector::connectForwardResourcePair(QObject *sender, const char *signal, QObject *receiver, const char *method)
......
......@@ -105,13 +105,13 @@ KisImageAnimationInterface::KisImageAnimationInterface(KisImage *image)
m_d->framerate = 24;
m_d->fullClipRange = KisTimeRange::fromTime(0, 100);
connect(this, SIGNAL(sigInternalRequestTimeSwitch(int, bool)), SLOT(switchCurrentTimeAsync(int, bool)));
connect(this, SIGNAL(sigInternalRequestTimeSwitch(int,bool)), SLOT(switchCurrentTimeAsync(int,bool)));
}
KisImageAnimationInterface::KisImageAnimationInterface(const KisImageAnimationInterface &rhs, KisImage *newImage)
: m_d(new Private(*rhs.m_d, newImage))
{
connect(this, SIGNAL(sigInternalRequestTimeSwitch(int, bool)), SLOT(switchCurrentTimeAsync(int, bool)));
connect(this, SIGNAL(sigInternalRequestTimeSwitch(int,bool)), SLOT(switchCurrentTimeAsync(int,bool)));
}
KisImageAnimationInterface::~KisImageAnimationInterface()
......
......@@ -54,11 +54,11 @@ void KisImageSignalRouterTest::testSignalForwarding()
{
checkNotification(LayersChangedSignal, SIGNAL(sigLayersChangedAsync()));
checkNotification(ModifiedSignal, SIGNAL(sigImageModified()));
checkNotification(SizeChangedSignal, SIGNAL(sigSizeChanged(const QPointF&, const QPointF&)));
checkNotification(ComplexSizeChangedSignal(), SIGNAL(sigSizeChanged(const QPointF&, const QPointF&)));
checkNotification(SizeChangedSignal, SIGNAL(sigSizeChanged(QPointF,QPointF)));
checkNotification(ComplexSizeChangedSignal(), SIGNAL(sigSizeChanged(QPointF,QPointF)));
checkNotification(ProfileChangedSignal, SIGNAL(sigProfileChanged(const KoColorProfile*)));
checkNotification(ColorSpaceChangedSignal, SIGNAL(sigColorSpaceChanged(const KoColorSpace*)));
checkNotification(ResolutionChangedSignal, SIGNAL(sigResolutionChanged(double, double)));
checkNotification(ResolutionChangedSignal, SIGNAL(sigResolutionChanged(double,double)));
checkComplexSignal(emitNodeChanged(m_layer1.data()), SIGNAL(sigNodeChanged(KisNodeSP)));
checkComplexSignal(emitNodeHasBeenAdded(m_layer3.data(),0), SIGNAL(sigNodeAddedAsync(KisNodeSP)));
......
......@@ -280,7 +280,7 @@ void KisKeyframingTest::testChannelSignals()
QSignalSpy spyPostRemove(channel, SIGNAL(sigKeyframeRemoved(KisKeyframeSP)));
QSignalSpy spyPreMove(channel, SIGNAL(sigKeyframeAboutToBeMoved(KisKeyframeSP,int)));
QSignalSpy spyPostMove(channel, SIGNAL(sigKeyframeMoved(KisKeyframeSP, int)));
QSignalSpy spyPostMove(channel, SIGNAL(sigKeyframeMoved(KisKeyframeSP,int)));
QVERIFY(spyPreAdd.isValid());
QVERIFY(spyPostAdd.isValid());
......
......@@ -181,7 +181,7 @@ void KisProcessingApplicatorTest::testNoUIUpdates()
KisPaintLayerSP paintLayer1;
KisPaintLayerSP paintLayer2;
KisImageSP image = createImage(undoStore, paintLayer1, paintLayer2);
QSignalSpy uiSignalsCounter(image.data(), SIGNAL(sigImageUpdated(const QRect&)));
QSignalSpy uiSignalsCounter(image.data(), SIGNAL(sigImageUpdated(QRect)));
QRect cropRect1(40,40,86,86);
......
......@@ -195,8 +195,8 @@ void CompositeOpModel::setView(QObject* newView)
if (d->view)
{
if (d->view->canvasBase() && d->view->canvasBase()->resourceManager()) {
connect(d->view->canvasBase()->resourceManager(), SIGNAL(canvasResourceChanged(int, const QVariant&)),
this, SLOT(resourceChanged(int, const QVariant&)));
connect(d->view->canvasBase()->resourceManager(), SIGNAL(canvasResourceChanged(int,QVariant)),
this, SLOT(resourceChanged(int,QVariant)));
}
if (d->view->nodeManager()) {
connect(d->view->nodeManager(), SIGNAL(sigLayerActivated(KisLayerSP)),
......
......@@ -200,15 +200,15 @@ LayerModel::LayerModel(QObject* parent)
, d(new Private(this))
{
connect(d->nodeModel, SIGNAL(rowsAboutToBeInserted(QModelIndex, int, int)),
this, SLOT(source_rowsAboutToBeInserted(QModelIndex, int, int)));
connect(d->nodeModel, SIGNAL(rowsInserted(QModelIndex, int, int)),
this, SLOT(source_rowsInserted(QModelIndex, int, int)));
connect(d->nodeModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
this, SLOT(source_rowsAboutToBeRemoved(QModelIndex, int, int)));
connect(d->nodeModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
this, SLOT(source_rowsRemoved(QModelIndex, int, int)));
connect(d->nodeModel, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)),
this, SLOT(source_rowsAboutToBeInserted(QModelIndex,int,int)));
connect(d->nodeModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
this, SLOT(source_rowsInserted(QModelIndex,int,int)));
connect(d->nodeModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
this, SLOT(source_rowsAboutToBeRemoved(QModelIndex,int,int)));
connect(d->nodeModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
this, SLOT(source_rowsRemoved(QModelIndex,int,int)));
connect(d->nodeModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
this, SLOT(source_dataChanged(QModelIndex,QModelIndex)));
......
......@@ -157,8 +157,8 @@ void PresetModel::setView(QObject* newView)
{
d->view = qobject_cast<KisViewManager*>( newView );
if (d->view && d->view->canvasBase()) {
connect(d->view->canvasBase()->resourceManager(), SIGNAL(canvasResourceChanged(int, const QVariant&)),
this, SLOT(resourceChanged(int, const QVariant&)));
connect(d->view->canvasBase()->resourceManager(), SIGNAL(canvasResourceChanged(int,QVariant)),
this, SLOT(resourceChanged(int,QVariant)));
}
emit viewChanged();
}
......
......@@ -239,7 +239,7 @@ KisAutoSaveRecoveryDialog::KisAutoSaveRecoveryDialog(const QStringList &filename
setMainWidget(page);
setAttribute(Qt::WA_DeleteOnClose, false);
connect( this, SIGNAL( user1Clicked() ), this, SLOT( slotDeleteAll() ) );
connect( this, SIGNAL(user1Clicked()), this, SLOT(slotDeleteAll()) );
}
KisAutoSaveRecoveryDialog::~KisAutoSaveRecoveryDialog()
......
......@@ -48,10 +48,10 @@ KisDetailsPane::KisDetailsPane(QWidget* parent, const QString& header)
changePalette();
connect(m_documentList->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)),
this, SLOT(selectionChanged(const QModelIndex&)));
connect(m_documentList, SIGNAL(doubleClicked(const QModelIndex&)),
this, SLOT(openFile(const QModelIndex&)));
connect(m_documentList->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
this, SLOT(selectionChanged(QModelIndex)));
connect(m_documentList, SIGNAL(doubleClicked(QModelIndex)),
this, SLOT(openFile(QModelIndex)));
connect(m_openButton, SIGNAL(clicked()), this, SLOT(openFile()));
}
......
/* This file is part of the Krita project
/* This file is part of the Krita project
*
* Copyright (C) 2014 Boudewijn Rempt <boud@valdyas.org>
*
......@@ -540,7 +540,7 @@ bool KisDocument::exportDocumentImpl(const KritaUtils::ExportFileJob &job, KisPr
bool started =
initiateSavingInBackground(actionName,
this, SLOT(slotCompleteSavingDocument(KritaUtils::ExportFileJob, KisImportExportFilter::ConversionStatus,QString)),
this, SLOT(slotCompleteSavingDocument(KritaUtils::ExportFileJob,KisImportExportFilter::ConversionStatus,QString)),
job, exportConfiguration);
if (!started) {
......@@ -759,9 +759,9 @@ bool KisDocument::initiateSavingInBackground(const QString actionName,
}
connect(d->backgroundSaveDocument.data(),
SIGNAL(sigBackgroundSavingFinished(KisImportExportFilter::ConversionStatus, const QString&)),
SIGNAL(sigBackgroundSavingFinished(KisImportExportFilter::ConversionStatus,QString)),
this,
SLOT(slotChildCompletedSavingInBackground(KisImportExportFilter::ConversionStatus, const QString&)));
SLOT(slotChildCompletedSavingInBackground(KisImportExportFilter::ConversionStatus,QString)));
connect(this, SIGNAL(sigCompleteBackgroundSaving(KritaUtils::ExportFileJob,KisImportExportFilter::ConversionStatus,QString)),
......@@ -824,7 +824,7 @@ void KisDocument::slotAutoSaveImpl(std::unique_ptr<KisDocument> &&optionalCloned
if (d->image->isIdle() || hadClonedDocument) {
started = initiateSavingInBackground(i18n("Autosaving..."),
this, SLOT(slotCompleteAutoSaving(KritaUtils::ExportFileJob, KisImportExportFilter::ConversionStatus, const QString&)),
this, SLOT(slotCompleteAutoSaving(KritaUtils::ExportFileJob,KisImportExportFilter::ConversionStatus,QString)),
KritaUtils::ExportFileJob(autoSaveFileName, nativeFormatMimeType(), KritaUtils::SaveIsExporting | KritaUtils::SaveInAutosaveMode),
0,
std::move(optionalClonedDocument));
......@@ -1744,7 +1744,7 @@ void KisDocument::setReferenceImagesLayer(KisSharedPtr<KisReferenceImagesLayer>
d->referenceImagesLayer = layer;
if (d->referenceImagesLayer) {
connect(d->referenceImagesLayer, SIGNAL(sigUpdateCanvas(const QRectF&)),
connect(d->referenceImagesLayer, SIGNAL(sigUpdateCanvas(QRectF)),
this, SIGNAL(sigReferenceImagesChanged()));
}
}
......
......@@ -358,7 +358,7 @@ KisMainWindow::KisMainWindow(QUuid uuid)
if (d->toolOptionsDocker) {
dockwidgetActions[d->toolOptionsDocker->toggleViewAction()->text()] = d->toolOptionsDocker->toggleViewAction();
}
connect(KoToolManager::instance(), SIGNAL(toolOptionWidgetsChanged(KoCanvasController*, QList<QPointer<QWidget> >)), this, SLOT(newOptionWidgets(KoCanvasController*, QList<QPointer<QWidget> >)));
connect(KoToolManager::instance(), SIGNAL(toolOptionWidgetsChanged(KoCanvasController*,QList<QPointer<QWidget> >)), this, SLOT(newOptionWidgets(KoCanvasController*,QList<QPointer<QWidget> >)));
Q_FOREACH (QString title, dockwidgetActions.keys()) {
d->dockWidgetMenu->addAction(dockwidgetActions[title]);
......@@ -878,7 +878,7 @@ bool KisMainWindow::openDocumentInternal(const QUrl &url, OpenFlags flags)
d->firstTime = true;
connect(newdoc, SIGNAL(completed()), this, SLOT(slotLoadCompleted()));
connect(newdoc, SIGNAL(canceled(const QString &)), this, SLOT(slotLoadCanceled(const QString &)));
connect(newdoc, SIGNAL(canceled(QString)), this, SLOT(slotLoadCanceled(QString)));
KisDocument::OpenFlags openFlags = KisDocument::None;
if (flags & RecoveryFile) {
......@@ -948,7 +948,7 @@ void KisMainWindow::slotLoadCompleted()
addViewAndNotifyLoadingCompleted(newdoc);
disconnect(newdoc, SIGNAL(completed()), this, SLOT(slotLoadCompleted()));
disconnect(newdoc, SIGNAL(canceled(const QString &)), this, SLOT(slotLoadCanceled(const QString &)));
disconnect(newdoc, SIGNAL(canceled(QString)), this, SLOT(slotLoadCanceled(QString)));
emit loadCompleted();
}
......@@ -964,7 +964,7 @@ void KisMainWindow::slotLoadCanceled(const QString & errMsg)
KisDocument* doc = qobject_cast<KisDocument*>(sender());
Q_ASSERT(doc);
disconnect(doc, SIGNAL(completed()), this, SLOT(slotLoadCompleted()));
disconnect(doc, SIGNAL(canceled(const QString &)), this, SLOT(slotLoadCanceled(const QString &)));
disconnect(doc, SIGNAL(canceled(QString)), this, SLOT(slotLoadCanceled(QString)));
}
void KisMainWindow::slotSaveCanceled(const QString &errMsg)
......@@ -981,7 +981,7 @@ void KisMainWindow::slotSaveCompleted()
KisDocument* doc = qobject_cast<KisDocument*>(sender());
Q_ASSERT(doc);
disconnect(doc, SIGNAL(completed()), this, SLOT(slotSaveCompleted()));
disconnect(doc, SIGNAL(canceled(const QString &)), this, SLOT(slotSaveCanceled(const QString &)));
disconnect(doc, SIGNAL(canceled(QString)), this, SLOT(slotSaveCanceled(QString)));
if (d->deferredClosingEvent) {
KXmlGuiWindow::closeEvent(d->deferredClosingEvent);
......@@ -1051,7 +1051,7 @@ bool KisMainWindow::saveDocument(KisDocument *document, bool saveas, bool isExpo
}
connect(document, SIGNAL(completed()), this, SLOT(slotSaveCompleted()));
connect(document, SIGNAL(canceled(const QString &)), this, SLOT(slotSaveCanceled(const QString &)));
connect(document, SIGNAL(canceled(QString)), this, SLOT(slotSaveCanceled(QString)));
QByteArray nativeFormat = document->nativeFormatMimeType();
QByteArray oldMimeFormat = document->mimeType();
......@@ -1462,7 +1462,7 @@ void KisMainWindow::slotFileNew()
// calls deleteLater
connect(startupWidget, SIGNAL(documentSelected(KisDocument*)), KisPart::instance(), SLOT(startCustomDocument(KisDocument*)));
// calls deleteLater
connect(startupWidget, SIGNAL(openTemplate(const QUrl&)), KisPart::instance(), SLOT(openTemplate(const QUrl&)));
connect(startupWidget, SIGNAL(openTemplate(QUrl)), KisPart::instance(), SLOT(openTemplate(QUrl)));
startupWidget->exec();
......
......@@ -130,8 +130,8 @@ void KisNodeView::addPropertyActions(QMenu *menu, const QModelIndex &index)
for (int i = 0, n = list.count(); i < n; ++i) {
if (list.at(i).isMutable) {
PropertyAction *a = new PropertyAction(i, list.at(i), index, menu);
connect(a, SIGNAL(toggled(bool, const QPersistentModelIndex&, int)),
this, SLOT(slotActionToggled(bool, const QPersistentModelIndex&, int)));
connect(a, SIGNAL(toggled(bool,QPersistentModelIndex,int)),
this, SLOT(slotActionToggled(bool,QPersistentModelIndex,int)));
menu->addAction(a);
}
}
......
......@@ -118,9 +118,9 @@ KisOpenPane::KisOpenPane(QWidget *parent, const QStringList& mimeFilter, const Q
connect(d->m_sectionList, SIGNAL(itemSelectionChanged()),
this, SLOT(updateSelectedWidget()));
connect(d->m_sectionList, SIGNAL(itemClicked(QTreeWidgetItem*, int)),
connect(d->m_sectionList, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
this, SLOT(itemClicked(QTreeWidgetItem*)));
connect(d->m_sectionList, SIGNAL(itemActivated(QTreeWidgetItem*, int)),
connect(d->m_sectionList, SIGNAL(itemActivated(QTreeWidgetItem*,int)),
this, SLOT(itemClicked(QTreeWidgetItem*)));
initTemplates(templatesResourcePath);
......@@ -144,8 +144,8 @@ KisOpenPane::KisOpenPane(QWidget *parent, const QStringList& mimeFilter, const Q
if (!sizes.isEmpty())
emit splitterResized(0, sizes);
connect(this, SIGNAL(splitterResized(KisDetailsPane*, const QList<int>&)),
this, SLOT(saveSplitterSizes(KisDetailsPane*, const QList<int>&)));
connect(this, SIGNAL(splitterResized(KisDetailsPane*,QList<int>)),
this, SLOT(saveSplitterSizes(KisDetailsPane*,QList<int>)));
setAcceptDrops(true);
}
......@@ -200,15 +200,15 @@ void KisOpenPane::initTemplates(const QString& templatesResourcePath)
KisTemplatesPane* pane = new KisTemplatesPane(this, group->name(),
group, templateTree.defaultTemplate());
connect(pane, SIGNAL(openUrl(const QUrl&)), this, SIGNAL(openTemplate(const QUrl&)));
connect(pane, SIGNAL(alwaysUseChanged(KisTemplatesPane*, const QString&)),
this, SIGNAL(alwaysUseChanged(KisTemplatesPane*, const QString&)));
connect(this, SIGNAL(alwaysUseChanged(KisTemplatesPane*, const QString&)),
pane, SLOT(changeAlwaysUseTemplate(KisTemplatesPane*, const QString&)));
connect(pane, SIGNAL(splitterResized(KisDetailsPane*, const QList<int>&)),
this, SIGNAL(splitterResized(KisDetailsPane*, const QList<int>&)));
connect(this, SIGNAL(splitterResized(KisDetailsPane*, const QList<int>&)),
pane, SLOT(resizeSplitter(KisDetailsPane*, const QList<int>&)));
connect(pane, SIGNAL(openUrl(QUrl)), this, SIGNAL(openTemplate(QUrl)));
connect(pane, SIGNAL(alwaysUseChanged(KisTemplatesPane*,QString)),
this, SIGNAL(alwaysUseChanged(KisTemplatesPane*,QString)));
connect(this, SIGNAL(alwaysUseChanged(KisTemplatesPane*,QString)),
pane, SLOT(changeAlwaysUseTemplate(KisTemplatesPane*,QString)));
connect(pane, SIGNAL(splitterResized(KisDetailsPane*,QList<int>)),
this, SIGNAL(splitterResized(KisDetailsPane*,QList<int>)));
connect(this, SIGNAL(splitterResized(KisDetailsPane*,QList<int>)),
pane, SLOT(resizeSplitter(KisDetailsPane*,QList<int>)));
QTreeWidgetItem* item = addPane(group->name(), group->templates().first()->loadPicture(),
pane, group->sortingWeight() + templateOffset);
......
......@@ -167,7 +167,7 @@ void KisReferenceImagesDecoration::setReferenceImageLayer(KisSharedPtr<KisRefere
{
d->layer = layer;
connect(
layer.data(), SIGNAL(sigUpdateCanvas(const QRectF&)),
this, SLOT(slotReferenceImagesChanged(const QRectF&))
layer.data(), SIGNAL(sigUpdateCanvas(QRectF)),
this, SLOT(slotReferenceImagesChanged(QRectF))
);
}
......@@ -112,8 +112,8 @@ KisTemplateCreateDia::KisTemplateCreateDia(const QString &templatesResourcePath,
namefield->addWidget(label);
d->m_name=new QLineEdit(mainwidget);
d->m_name->setFocus();
connect(d->m_name, SIGNAL(textChanged(const QString &)),
this, SLOT(slotNameChanged(const QString &)));
connect(d->m_name, SIGNAL(textChanged(QString)),
this, SLOT(slotNameChanged(QString)));
namefield->addWidget(d->m_name);
label=new QLabel(i18n("Group:"), mainwidget);
......
......@@ -220,8 +220,8 @@ KisView::KisView(KisDocument *document, KoCanvasResourceManager *resourceManager
QStatusBar * sb = statusBar();
if (sb) { // No statusbar in e.g. konqueror
connect(d->document, SIGNAL(statusBarMessage(const QString&, int)),
this, SLOT(slotSavingStatusMessage(const QString&, int)));
connect(d->document, SIGNAL(statusBarMessage(QString,int)),
this, SLOT(slotSavingStatusMessage(QString,int)));
connect(d->document, SIGNAL(clearStatusBarMessage()),
this, SLOT(slotClearStatusText()));
}
......@@ -341,7 +341,7 @@ void KisView::setViewManager(KisViewManager *view)
d->viewManager->nodeManager()->nodesUpdated();
}
connect(image(), SIGNAL(sigSizeChanged(const QPointF&, const QPointF&)), this, SLOT(slotImageSizeChanged(const QPointF&, const QPointF&)));
connect(image(), SIGNAL(sigSizeChanged(QPointF,QPointF)), this, SLOT(slotImageSizeChanged(QPointF,QPointF)));
connect(image(), SIGNAL(sigResolutionChanged(double,double)), this, SLOT(slotImageResolutionChanged()));
// executed in a context of an image thread
......@@ -621,8 +621,8 @@ void KisView::setDocument(KisDocument *document)
d->document = document;
QStatusBar *sb = statusBar();
if (sb) { // No statusbar in e.g. konqueror
connect(d->document, SIGNAL(statusBarMessage(const QString&, int)),
this, SLOT(slotSavingStatusMessage(const QString&, int)));
connect(d->document, SIGNAL(statusBarMessage(QString,int)),
this, SLOT(slotSavingStatusMessage(QString,int)));
connect(d->document, SIGNAL(clearStatusBarMessage()),
this, SLOT(slotClearStatusText()));
}
......
......@@ -500,7 +500,7 @@ void KisViewManager::setCurrentView(KisView *view)
d->currentImageView->canvasController()->setFocus();
d->viewConnections.addUniqueConnection(
image(), SIGNAL(sigSizeChanged(const QPointF&, const QPointF&)),
image(), SIGNAL(sigSizeChanged(QPointF,QPointF)),
resourceProvider(), SLOT(slotImageSizeChanged()));
d->viewConnections.addUniqueConnection(
......@@ -726,7 +726,7 @@ void KisViewManager::createActions()
d->zoomOut = actionManager()->createStandardAction(KStandardAction::ZoomOut, 0, "");
d->actionAuthor = new KSelectAction(KisIconUtils::loadIcon("im-user"), i18n("Active Author Profile"), this);
connect(d->actionAuthor, SIGNAL(triggered(const QString &)), this, SLOT(changeAuthorProfile(const QString &)));
connect(d->actionAuthor, SIGNAL(triggered(QString)), this, SLOT(changeAuthorProfile(QString)));
actionCollection()->addAction("settings_active_author", d->actionAuthor);
slotUpdateAuthorProfileActions();
......
......@@ -129,8 +129,8 @@ KisWindowLayoutManager::KisWindowLayoutManager()
d->loadDisplayLayouts();
connect(qobject_cast<KisApplication*>(KisApplication::instance()),
SIGNAL(focusChanged(QWidget*, QWidget*)),
this, SLOT(slotFocusChanged(QWidget*, QWidget*)));
SIGNAL(focusChanged(QWidget*,QWidget*)),
this, SLOT(slotFocusChanged(QWidget*,QWidget*)));
connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(slotScreensChanged()));
connect(QApplication::desktop(), SIGNAL(screenCountChanged(int)), this, SLOT(slotScreensChanged()));
......
......@@ -218,8 +218,8 @@ void KisBrushHud::showEvent(QShowEvent *event)
{
m_d->connections.clear();
m_d->connections.addUniqueConnection(
m_d->provider->resourceManager(), SIGNAL(canvasResourceChanged(int, QVariant)),
this, SLOT(slotCanvasResourceChanged(int, QVariant)));
m_d->provider->resourceManager(), SIGNAL(canvasResourceChanged(int,QVariant)),
this, SLOT(slotCanvasResourceChanged(int,QVariant)));
updateProperties();
......
......@@ -46,11 +46,11 @@ KisUniformPaintOpPropertyWidget::KisUniformPaintOpPropertyWidget(KisUniformPaint
m_d(new Private(property))
{
KisAcyclicSignalConnector *conn = new KisAcyclicSignalConnector(this);
conn->connectForwardVariant(property.data(), SIGNAL(valueChanged(const QVariant&)),
this, SLOT(setValue(const QVariant&)));
conn->connectForwardVariant(property.data(), SIGNAL(valueChanged(QVariant)),
this, SLOT(setValue(QVariant)));
conn->connectBackwardVariant(this, SIGNAL(valueChanged(const QVariant&)),
property.data(), SLOT(setValue(const QVariant&)));
conn->connectBackwardVariant(this, SIGNAL(valueChanged(QVariant)),
property.data(), SLOT(setValue(QVariant)));
}
KisUniformPaintOpPropertyWidget::~KisUniformPaintOpPropertyWidget()
......
......@@ -213,7 +213,7 @@ void KisAnimationPlayer::slotAudioChannelChanged()
m_d->syncedAudio->setVolume(interface->audioVolume());
m_d->syncedAudio->setSoundOffsetTolerance(m_d->audioOffsetTolerance);
connect(m_d->syncedAudio.data(), SIGNAL(error(const QString &, const QString &)), SLOT(slotOnAudioError(const QString &, const QString &)));
connect(m_d->syncedAudio.data(), SIGNAL(error(QString,QString)), SLOT(slotOnAudioError(QString,QString)));
} else {
m_d->syncedAudio.reset();
}
......
......@@ -569,7 +569,7 @@ void KisCanvas2::initializeImage()
connect(image->signalRouter(), SIGNAL(sigRequestLodPlanesSyncBlocked(bool)), SLOT(slotSetLodUpdatesBlocked(bool)), Qt::DirectConnection);
connect(image, SIGNAL(sigProofingConfigChanged()), SLOT(slotChangeProofingConfig()));
connect(image, SIGNAL(sigSizeChanged(const QPointF&, const QPointF&)), SLOT(startResizingImage()), Qt::DirectConnection);
connect(image, SIGNAL(sigSizeChanged(QPointF,QPointF)), SLOT(startResizingImage()), Qt::DirectConnection);
connect(image->undoAdapter(), SIGNAL(selectionChanged()), SLOT(slotTrySwitchShapeManager()));
connectCurrentCanvas();
......
......@@ -164,8 +164,8 @@ KisDisplayColorConverter::KisDisplayColorConverter(KoCanvasResourceManager *reso
m_d(new Private(this, resourceManager))
{
connect(m_d->resourceManager, SIGNAL(canvasResourceChanged(int, const QVariant&)),
SLOT(slotCanvasResourceChanged(int, const QVariant&)));
connect(m_d->resourceManager, SIGNAL(canvasResourceChanged(int,QVariant)),
SLOT(slotCanvasResourceChanged(int,QVariant)));
connect(KisConfigNotifier::instance(), SIGNAL(configChanged()),
SLOT(selectPaintingColorSpace()));
......
......@@ -367,24 +367,24 @@ void KisGuidesManager::setView(QPointer<KisView> view)
setGuidesConfigImpl(m_d->guidesConfig, false);
m_d->viewConnections.addUniqueConnection(
m_d->view->zoomManager()->horizontalRuler(), SIGNAL(guideCreationInProgress(Qt::Orientation, const QPoint&)),
this, SLOT(slotGuideCreationInProgress(Qt::Orientation, const QPoint&)));
m_d->view->zoomManager()->horizontalRuler(), SIGNAL(guideCreationInProgress(Qt::Orientation,QPoint)),
this, SLOT(slotGuideCreationInProgress(Qt::Orientation,QPoint)));
m_d->viewConnections.addUniqueConnection(
m_d->view->zoomManager()->horizontalRuler(), SIGNAL(guideCreationFinished(Qt::Orientation, const QPoint&)),
this, SLOT(slotGuideCreationFinished(Qt::Orientation, const QPoint&)));
m_d->view->zoomManager()->horizontalRuler(), SIGNAL(guideCreationFinished(Qt::Orientation,QPoint)),
this, SLOT(slotGuideCreationFinished(Qt::Orientation,QPoint)));
m_d->viewConnections.addUniqueConnection(
m_d->view->zoomManager()->verticalRuler(), SIGNAL(guideCreationInProgress(Qt::Orientation, const QPoint&)),
this, SLOT(slotGuideCreationInProgress(Qt::Orientation, const QPoint&)));
m_d->view->zoomManager()->verticalRuler(), SIGNAL(guideCreationInProgress(Qt::Orientation,QPoint)),
this, SLOT(slotGuideCreationInProgress(Qt::Orientation,QPoint)));
m_d->viewConnections.addUniqueConnection(
m_d->view->zoomManager()->verticalRuler(), SIGNAL(guideCreationFinished(Qt::Orientation, const QPoint&)),
this, SLOT(slotGuideCreationFinished(Qt::Orientation, const QPoint&)));
m_d->view->zoomManager()->verticalRuler(), SIGNAL(guideCreationFinished(Qt::Orientation,QPoint)),
this, SLOT(slotGuideCreationFinished(Qt::Orientation,QPoint)));
m_d->viewConnections.addUniqueConnection(
m_d->view->document(), SIGNAL(sigGuidesConfigChanged(const KisGuidesConfig &)),
this, SLOT(slotDocumentRequestedConfig(const KisGuidesConfig &)));
m_d->view->document(), SIGNAL(sigGuidesConfigChanged(KisGuidesConfig)),
this, SLOT(slotDocumentRequestedConfig(KisGuidesConfig)));
}
}
......
......@@ -30,8 +30,8 @@ KisPaintopTransformationConnector::KisPaintopTransformationConnector(KisCanvas2
m_canvas(canvas)
{
connect(m_canvas->resourceManager(),
SIGNAL(canvasResourceChanged(int, const QVariant&)),
SLOT(slotCanvasResourceChanged(int, const QVariant&)));
SIGNAL(canvasResourceChanged(int,QVariant)),