diff --git a/commands/kpCommandHistoryBase.cpp b/commands/kpCommandHistoryBase.cpp --- a/commands/kpCommandHistoryBase.cpp +++ b/commands/kpCommandHistoryBase.cpp @@ -79,22 +79,23 @@ m_actionUndo = new KToolBarPopupAction(KDE::icon("edit-undo"), undoActionText (), this); ac->addAction (KStandardAction::name (KStandardAction::Undo), m_actionUndo); ac->setDefaultShortcuts (m_actionUndo, KStandardShortcut::shortcut (KStandardShortcut::Undo)); - connect (m_actionUndo, SIGNAL(triggered(bool)), this, SLOT (undo())); + connect (m_actionUndo, &KToolBarPopupAction::triggered, this, &kpCommandHistoryBase::undo); m_actionRedo = new KToolBarPopupAction(KDE::icon("edit-redo"), redoActionText (), this); ac->addAction (KStandardAction::name (KStandardAction::Redo), m_actionRedo); ac->setDefaultShortcuts (m_actionRedo, KStandardShortcut::shortcut (KStandardShortcut::Redo)); - connect (m_actionRedo, SIGNAL(triggered(bool)), this, SLOT (redo())); + connect (m_actionRedo, &KToolBarPopupAction::triggered, this, &kpCommandHistoryBase::redo ); m_actionUndo->setEnabled (false); m_actionRedo->setEnabled (false); - connect (m_actionUndo->menu (), SIGNAL (triggered(QAction*)), - this, SLOT (undoUpToNumber(QAction*))); - connect (m_actionRedo->menu (), SIGNAL (triggered(QAction*)), - this, SLOT (redoUpToNumber(QAction*))); + connect (m_actionUndo->menu(), &QMenu::triggered, + this, &kpCommandHistoryBase::undoUpToNumber); + + connect (m_actionRedo->menu(), &QMenu::triggered, + this, &kpCommandHistoryBase::redoUpToNumber); m_undoMinLimit = 10; diff --git a/commands/tools/selection/kpToolSelectionResizeScaleCommand.h b/commands/tools/selection/kpToolSelectionResizeScaleCommand.h --- a/commands/tools/selection/kpToolSelectionResizeScaleCommand.h +++ b/commands/tools/selection/kpToolSelectionResizeScaleCommand.h @@ -82,10 +82,7 @@ // If , does a fast, low-quality scale and then calls itself // with unset for a smooth scale, a short time later. // If acting on a text box, is ignored. - void resizeScaleAndMove (bool delayed); - -protected slots: - void resizeScaleAndMove (/*delayed = false*/); + void resizeScaleAndMove (bool delayed = false); public: void finalize (); diff --git a/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp b/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp --- a/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp +++ b/commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp @@ -63,8 +63,7 @@ m_newHeight = selection ()->height (); m_smoothScaleTimer->setSingleShot (true); - connect (m_smoothScaleTimer, SIGNAL (timeout()), - this, SLOT (resizeScaleAndMove())); + connect (m_smoothScaleTimer, &QTimer::timeout, this, [this]{resizeScaleAndMove(false);}); } kpToolSelectionResizeScaleCommand::~kpToolSelectionResizeScaleCommand () @@ -207,15 +206,6 @@ delete newSelPtr; } -// protected slots -void kpToolSelectionResizeScaleCommand::resizeScaleAndMove () -{ -#if DEBUG_KP_TOOL_SELECTION - qCDebug(kpLogCommands) << "kpToolSelectionResizeScaleCommand::resizeScaleAndMove()"; -#endif - resizeScaleAndMove (false/*no delay*/); -} - // public void kpToolSelectionResizeScaleCommand::finalize () diff --git a/dialogs/imagelib/effects/kpEffectsDialog.cpp b/dialogs/imagelib/effects/kpEffectsDialog.cpp --- a/dialogs/imagelib/effects/kpEffectsDialog.cpp +++ b/dialogs/imagelib/effects/kpEffectsDialog.cpp @@ -92,8 +92,8 @@ m_delayedUpdateTimer->setSingleShot (true); - connect (m_delayedUpdateTimer, SIGNAL (timeout()), - this, SLOT (slotUpdateWithWaitCursor())); + connect (m_delayedUpdateTimer, &QTimer::timeout, + this, &kpEffectsDialog::slotUpdateWithWaitCursor); QWidget *effectContainer = new QWidget (mainWidget ()); @@ -128,8 +128,10 @@ addCustomWidgetToBack (m_settingsGroupBox); - connect (m_effectsComboBox, SIGNAL (activated(int)), - this, SLOT (selectEffect(int))); + connect (m_effectsComboBox, static_cast(&QComboBox::activated), + this, &kpEffectsDialog::selectEffect); + + selectEffect (defaultSelectedEffect); @@ -293,12 +295,12 @@ #endif m_effectWidget->show (); - connect (m_effectWidget, SIGNAL (settingsChangedNoWaitCursor()), - this, SLOT (slotUpdate())); - connect (m_effectWidget, SIGNAL (settingsChanged()), - this, SLOT (slotUpdateWithWaitCursor())); - connect (m_effectWidget, SIGNAL (settingsChangedDelayed()), - this, SLOT (slotDelayedUpdate())); + connect (m_effectWidget, &kpEffectWidgetBase::settingsChangedNoWaitCursor, + this, &kpEffectsDialog::slotUpdate); + connect (m_effectWidget, &kpEffectWidgetBase::settingsChanged, + this, &kpEffectsDialog::slotUpdateWithWaitCursor); + connect (m_effectWidget, &kpEffectWidgetBase::settingsChangedDelayed, + this, &kpEffectsDialog::slotDelayedUpdate); #if DEBUG_KP_EFFECTS_DIALOG qCDebug(kpLogDialogs) << "about to setUpdatesEnabled()"; diff --git a/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp b/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp --- a/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp +++ b/dialogs/imagelib/kpDocumentMetaInfoDialog.cpp @@ -121,8 +121,9 @@ setWindowTitle (i18nc ("@title:window", "Document Properties")); QDialogButtonBox * buttons = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - connect (buttons, SIGNAL (accepted()), this, SLOT (accept())); - connect (buttons, SIGNAL (rejected()), this, SLOT (reject())); + + connect (buttons, &QDialogButtonBox::accepted, this, &kpDocumentMetaInfoDialog::accept); + connect (buttons, &QDialogButtonBox::rejected, this, &kpDocumentMetaInfoDialog::reject); QWidget *baseWidget = new QWidget (this); @@ -243,26 +244,26 @@ d->fieldsTableWidget = new QTableWidget (fieldsGroupBox); d->fieldsTableWidget->setEditTriggers(QAbstractItemView::AllEditTriggers); - connect (d->fieldsTableWidget, SIGNAL (currentCellChanged(int,int,int,int)), - SLOT (slotFieldsCurrentCellChanged(int,int,int,int))); + connect (d->fieldsTableWidget, &QTableWidget::currentCellChanged, + this, &kpDocumentMetaInfoDialog::slotFieldsCurrentCellChanged); - connect (d->fieldsTableWidget, SIGNAL (itemChanged(QTableWidgetItem*)), - SLOT (slotFieldsItemChanged(QTableWidgetItem*))); + connect (d->fieldsTableWidget, &QTableWidget::itemChanged, + this, &kpDocumentMetaInfoDialog::slotFieldsItemChanged); d->fieldsAddRowButton = new QPushButton (i18n ("&Add Row"), fieldsGroupBox); - connect (d->fieldsAddRowButton, SIGNAL (clicked()), - SLOT (slotFieldsAddRowButtonClicked())); + connect (d->fieldsAddRowButton, &QPushButton::clicked, + this, &kpDocumentMetaInfoDialog::slotFieldsAddRowButtonClicked); d->fieldsDeleteRowButton = new QPushButton (i18n ("&Delete Row"), fieldsGroupBox); - connect (d->fieldsDeleteRowButton, SIGNAL (clicked()), - SLOT (slotFieldsDeleteRowButtonClicked())); + connect (d->fieldsDeleteRowButton, &QPushButton::clicked, + this, &kpDocumentMetaInfoDialog::slotFieldsDeleteRowButtonClicked); d->fieldsResetButton = new QPushButton (i18n ("&Reset"), fieldsGroupBox); - connect (d->fieldsResetButton, SIGNAL (clicked()), - SLOT (setUIToOriginalMetaInfo())); + connect (d->fieldsResetButton, &QPushButton::clicked, + this, &kpDocumentMetaInfoDialog::setUIToOriginalMetaInfo); QHBoxLayout *fieldsButtonsLayout = new QHBoxLayout (); fieldsButtonsLayout->addWidget (d->fieldsAddRowButton); diff --git a/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp b/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp --- a/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp +++ b/dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp @@ -72,8 +72,8 @@ setWindowTitle (caption); QDialogButtonBox *buttons = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - connect (buttons, SIGNAL (accepted()), this, SLOT (accept())); - connect (buttons, SIGNAL (rejected()), this, SLOT (reject())); + connect (buttons, &QDialogButtonBox::accepted, this, &kpTransformPreviewDialog::accept); + connect (buttons, &QDialogButtonBox::rejected, this, &kpTransformPreviewDialog::reject); QWidget *baseWidget = new QWidget (this); m_mainWidget = baseWidget; @@ -173,13 +173,13 @@ m_previewPixmapLabel = new kpResizeSignallingLabel (m_previewGroupBox); m_previewPixmapLabel->setMinimumSize (150, 110); - connect (m_previewPixmapLabel, SIGNAL (resized()), - this, SLOT (updatePreview())); + connect (m_previewPixmapLabel, &kpResizeSignallingLabel::resized, + this, &kpTransformPreviewDialog::updatePreview); QPushButton *updatePushButton = new QPushButton (i18n ("&Update"), m_previewGroupBox); - connect (updatePushButton, SIGNAL (clicked()), - this, SLOT (slotUpdateWithWaitCursor())); + connect (updatePushButton, &QPushButton::clicked, + this, &kpTransformPreviewDialog::slotUpdateWithWaitCursor); QVBoxLayout *previewLayout = new QVBoxLayout (m_previewGroupBox); diff --git a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp --- a/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp +++ b/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp @@ -95,8 +95,8 @@ setWindowTitle (i18nc ("@title:window", "Resize / Scale")); QDialogButtonBox *buttons = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - connect (buttons, SIGNAL (accepted()), this, SLOT (accept())); - connect (buttons, SIGNAL (rejected()), this, SLOT (reject())); + connect (buttons, &QDialogButtonBox::accepted, this, &kpTransformResizeScaleDialog::accept); + connect (buttons, &QDialogButtonBox::rejected, this, &kpTransformResizeScaleDialog::reject); QWidget *baseWidget = new QWidget (this); @@ -191,8 +191,8 @@ lay->addWidget (m_actOnCombo, 1); - connect (m_actOnCombo, SIGNAL (activated(int)), - this, SLOT (slotActOnChanged())); + connect (m_actOnCombo, static_cast(&QComboBox::activated), + this, &kpTransformResizeScaleDialog::slotActOnChanged); return actOnBox; } @@ -264,12 +264,12 @@ operationLayout->addWidget (m_scaleButton, 0, 1, Qt::AlignCenter); operationLayout->addWidget (m_smoothScaleButton, 0, 2, Qt::AlignCenter); - connect (m_resizeButton, SIGNAL (toggled(bool)), - this, SLOT (slotTypeChanged())); - connect (m_scaleButton, SIGNAL (toggled(bool)), - this, SLOT (slotTypeChanged())); - connect (m_smoothScaleButton, SIGNAL (toggled(bool)), - this, SLOT (slotTypeChanged())); + connect (m_resizeButton, &QToolButton::toggled, + this, &kpTransformResizeScaleDialog::slotTypeChanged); + connect (m_scaleButton, &QToolButton::toggled, + this, &kpTransformResizeScaleDialog::slotTypeChanged); + connect (m_smoothScaleButton, &QToolButton::toggled, + this, &kpTransformResizeScaleDialog::slotTypeChanged); return operationGroupBox; } @@ -360,10 +360,12 @@ dimensionsLayout->setRowMinimumHeight (4/*row*/, dimensionsLayout->rowMinimumHeight (4) * 2); - connect (m_newWidthInput, SIGNAL (valueChanged(int)), - this, SLOT (slotWidthChanged(int))); - connect (m_newHeightInput, SIGNAL (valueChanged(int)), - this, SLOT (slotHeightChanged(int))); + + connect (m_newWidthInput, static_cast(&QSpinBox::valueChanged), + this, &kpTransformResizeScaleDialog::slotWidthChanged); + + connect (m_newHeightInput, static_cast(&QSpinBox::valueChanged), + this, &kpTransformResizeScaleDialog::slotHeightChanged); // COMPAT: KDoubleNumInput only fires valueChanged(double) once per // edit. It should either fire: @@ -376,13 +378,16 @@ // 2. Once per keystroke. // // Bug in KDoubleNumInput. - connect (m_percentWidthInput, SIGNAL (valueChanged(double)), - this, SLOT (slotPercentWidthChanged(double))); - connect (m_percentHeightInput, SIGNAL (valueChanged(double)), - this, SLOT (slotPercentHeightChanged(double))); + connect (m_percentWidthInput, + static_cast(&QDoubleSpinBox::valueChanged), + this, &kpTransformResizeScaleDialog::slotPercentWidthChanged); + + connect (m_percentHeightInput, + static_cast(&QDoubleSpinBox::valueChanged), + this, &kpTransformResizeScaleDialog::slotPercentHeightChanged); - connect (m_keepAspectRatioCheckBox, SIGNAL (toggled(bool)), - this, SLOT (setKeepAspectRatio(bool))); + connect (m_keepAspectRatioCheckBox, &QCheckBox::toggled, + this, &kpTransformResizeScaleDialog::setKeepAspectRatio); return dimensionsGroupBox; } diff --git a/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp b/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp --- a/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp +++ b/dialogs/imagelib/transforms/kpTransformRotateDialog.cpp @@ -121,10 +121,11 @@ directionLayout->addWidget (m_clockwiseRadioButton, 1, 1, Qt::AlignCenter); - connect (m_antiClockwiseRadioButton, SIGNAL (toggled(bool)), - this, SLOT (slotUpdate())); - connect (m_clockwiseRadioButton, SIGNAL (toggled(bool)), - this, SLOT (slotUpdate())); + connect (m_antiClockwiseRadioButton, &QRadioButton::toggled, + this, &kpTransformRotateDialog::slotUpdate); + + connect (m_clockwiseRadioButton, &QRadioButton::toggled, + this, &kpTransformRotateDialog::slotUpdate); } // private @@ -162,20 +163,22 @@ angleLayout->setColumnStretch (1, 2); // Stretch Custom Angle Input - connect (m_angle90RadioButton, SIGNAL (toggled(bool)), - this, SLOT (slotUpdate())); - connect (m_angle180RadioButton, SIGNAL (toggled(bool)), - this, SLOT (slotUpdate())); - connect (m_angle270RadioButton, SIGNAL (toggled(bool)), - this, SLOT (slotUpdate())); - connect (m_angleCustomRadioButton, SIGNAL (toggled(bool)), - this, SLOT (slotAngleCustomRadioButtonToggled(bool))); - connect (m_angleCustomRadioButton, SIGNAL (toggled(bool)), - this, SLOT (slotUpdate())); + connect (m_angle90RadioButton, &QRadioButton::toggled, + this, &kpTransformRotateDialog::slotUpdate); + connect (m_angle180RadioButton, &QRadioButton::toggled, + this, &kpTransformRotateDialog::slotUpdate); + connect (m_angle270RadioButton, &QRadioButton::toggled, + this, &kpTransformRotateDialog::slotUpdate); + + connect (m_angleCustomRadioButton, &QRadioButton::toggled, + this, &kpTransformRotateDialog::slotAngleCustomRadioButtonToggled); + connect (m_angleCustomRadioButton, &QRadioButton::toggled, + this, &kpTransformRotateDialog::slotUpdate); - connect (m_angleCustomInput, SIGNAL (valueChanged(int)), - this, SLOT (slotUpdate())); + connect (m_angleCustomInput, + static_cast(&QSpinBox::valueChanged), + this, &kpTransformRotateDialog::slotUpdate); } diff --git a/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp b/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp --- a/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp +++ b/dialogs/imagelib/transforms/kpTransformSkewDialog.cpp @@ -142,10 +142,13 @@ angleLayout->addWidget (verticalSkewDegreesLabel, 1, 3); - connect (m_horizontalSkewInput, SIGNAL (valueChanged(int)), - this, SLOT (slotUpdate())); - connect (m_verticalSkewInput, SIGNAL (valueChanged(int)), - this, SLOT (slotUpdate())); + connect (m_horizontalSkewInput, + static_cast(&QSpinBox::valueChanged), + this, &kpTransformSkewDialog::slotUpdate); + + connect (m_verticalSkewInput, + static_cast(&QSpinBox::valueChanged), + this, &kpTransformSkewDialog::slotUpdate); } diff --git a/dialogs/kpColorSimilarityDialog.cpp b/dialogs/kpColorSimilarityDialog.cpp --- a/dialogs/kpColorSimilarityDialog.cpp +++ b/dialogs/kpColorSimilarityDialog.cpp @@ -47,8 +47,8 @@ setWindowTitle (i18nc ("@title:window", "Color Similarity")); QDialogButtonBox *buttons = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - connect (buttons, SIGNAL (accepted()), this, SLOT (accept())); - connect (buttons, SIGNAL (rejected()), this, SLOT (reject())); + connect (buttons, &QDialogButtonBox::accepted, this, &kpColorSimilarityDialog::accept); + connect (buttons, &QDialogButtonBox::rejected, this, &kpColorSimilarityDialog::reject); QWidget *baseWidget = new QWidget (this); @@ -69,8 +69,8 @@ cubeLayout->addWidget (updatePushButton, 0/*stretch*/, Qt::AlignHCenter); - connect (updatePushButton, SIGNAL (clicked()), - this, SLOT (slotColorSimilarityValueChanged())); + connect (updatePushButton, &QPushButton::clicked, + this, &kpColorSimilarityDialog::slotColorSimilarityValueChanged); QGroupBox *inputGroupBox = new QGroupBox (i18n ("&RGB Color Cube Distance"), @@ -89,8 +89,8 @@ "What is Color Similarity?"), inputGroupBox); m_whatIsLabel->setAlignment (Qt::AlignHCenter); - connect (m_whatIsLabel, SIGNAL (linkActivated(QString)), - SLOT (slotWhatIsLabelClicked())); + connect (m_whatIsLabel, &QLabel::linkActivated, + this, &kpColorSimilarityDialog::slotWhatIsLabelClicked); QVBoxLayout *inputLayout = new QVBoxLayout (inputGroupBox); @@ -101,8 +101,8 @@ // COMPAT: This is not firing properly when the user is typing in a // new value. - connect (m_colorSimilarityInput, SIGNAL (valueChanged(int)), - this, SLOT (slotColorSimilarityValueChanged())); + connect (m_colorSimilarityInput, &kpIntNumInput::valueChanged, + this, &kpColorSimilarityDialog::slotColorSimilarityValueChanged); QVBoxLayout *baseLayout = new QVBoxLayout (baseWidget); diff --git a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp --- a/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp +++ b/dialogs/kpDocumentSaveOptionsPreviewDialog.cpp @@ -80,8 +80,8 @@ lay->setRowStretch (0, 1); - connect (m_filePixmapLabel, SIGNAL (resized()), - this, SLOT (updatePixmapPreview())); + connect (m_filePixmapLabel, &kpResizeSignallingLabel::resized, + this, &kpDocumentSaveOptionsPreviewDialog::updatePixmapPreview); } kpDocumentSaveOptionsPreviewDialog::~kpDocumentSaveOptionsPreviewDialog () diff --git a/document/kpDocument.h b/document/kpDocument.h --- a/document/kpDocument.h +++ b/document/kpDocument.h @@ -311,7 +311,6 @@ public slots: // these will emit signals! void slotContentsChanged (const QRect &rect); - void slotSizeChanged (int newWidth, int newHeight); void slotSizeChanged (const QSize &newSize); signals: diff --git a/document/kpDocument.cpp b/document/kpDocument.cpp --- a/document/kpDocument.cpp +++ b/document/kpDocument.cpp @@ -378,7 +378,7 @@ if (m_oldWidth == width () && m_oldHeight == height ()) slotContentsChanged (image.rect ()); else - slotSizeChanged (width (), height ()); + slotSizeChanged (QSize (width (), height ())); } //--------------------------------------------------------------------- @@ -433,7 +433,7 @@ kpPixmapFX::resize (m_image, w, h, backgroundColor); - slotSizeChanged (width (), height ()); + slotSizeChanged (QSize (width (), height ())); } //--------------------------------------------------------------------- @@ -446,18 +446,11 @@ //--------------------------------------------------------------------- -void kpDocument::slotSizeChanged (int newWidth, int newHeight) -{ - setModified (); - emit sizeChanged (newWidth, newHeight); - emit sizeChanged (QSize (newWidth, newHeight)); -} - -//--------------------------------------------------------------------- - void kpDocument::slotSizeChanged (const QSize &newSize) { - slotSizeChanged (newSize.width (), newSize.height ()); + setModified (); + emit sizeChanged (newSize.width(), newSize.height()); + emit sizeChanged (newSize); } //--------------------------------------------------------------------- diff --git a/document/kpDocument_Selection.cpp b/document/kpDocument_Selection.cpp --- a/document/kpDocument_Selection.cpp +++ b/document/kpDocument_Selection.cpp @@ -100,8 +100,8 @@ // There's no need to uninitialize the old selection // (e.g. call disconnect()) since we delete it later. - connect (m_selection, SIGNAL (changed(QRect)), - this, SLOT (slotContentsChanged(QRect))); + connect (m_selection, &kpAbstractSelection::changed, + this, &kpDocument::slotContentsChanged); // diff --git a/kpThumbnail.cpp b/kpThumbnail.cpp --- a/kpThumbnail.cpp +++ b/kpThumbnail.cpp @@ -93,22 +93,24 @@ if (d->view) { - disconnect (d->view, SIGNAL (destroyed()), - this, SLOT (slotViewDestroyed())); - disconnect (d->view, SIGNAL (zoomLevelChanged(int,int)), - this, SLOT (updateCaption())); + disconnect (d->view, &kpThumbnailView::destroyed, + this, &kpThumbnail::slotViewDestroyed); + + disconnect (d->view, &kpThumbnailView::zoomLevelChanged, + this, &kpThumbnail::updateCaption); d->lay->removeWidget (d->view); } d->view = view; if (d->view) { - connect (d->view, SIGNAL (destroyed()), - this, SLOT (slotViewDestroyed())); - connect (d->view, SIGNAL (zoomLevelChanged(int,int)), - this, SLOT (updateCaption())); + connect (d->view, &kpThumbnailView::destroyed, + this, &kpThumbnail::slotViewDestroyed); + + connect (d->view, &kpThumbnailView::zoomLevelChanged, + this, &kpThumbnail::updateCaption); Q_ASSERT (d->view->parent () == this); d->lay->addWidget (d->view, Qt::AlignCenter); diff --git a/kpViewScrollableContainer.h b/kpViewScrollableContainer.h --- a/kpViewScrollableContainer.h +++ b/kpViewScrollableContainer.h @@ -196,8 +196,7 @@ void slotContentsMoved (); void slotViewDestroyed (); - bool slotDragScroll (bool *didSomething); - bool slotDragScroll (); + bool slotDragScroll (bool *didSomething = nullptr); private: kpView *m_view; diff --git a/kpViewScrollableContainer.cpp b/kpViewScrollableContainer.cpp --- a/kpViewScrollableContainer.cpp +++ b/kpViewScrollableContainer.cpp @@ -401,14 +401,13 @@ connectGripSignals (m_bottomRightGrip); - connect (horizontalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(slotContentsMoved())); + connect (horizontalScrollBar(), &QScrollBar::valueChanged, + this, &kpViewScrollableContainer::slotContentsMoved); - connect (verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(slotContentsMoved())); + connect (verticalScrollBar(), &QScrollBar::valueChanged, + this, &kpViewScrollableContainer::slotContentsMoved); - connect (m_dragScrollTimer, SIGNAL (timeout()), - this, SLOT (slotDragScroll())); + connect (m_dragScrollTimer, &QTimer::timeout, this, [this]{slotDragScroll();}); m_overlay->hide(); } @@ -418,20 +417,23 @@ // protected void kpViewScrollableContainer::connectGripSignals (kpGrip *grip) { - connect (grip, SIGNAL (beganDraw()), - this, SLOT (slotGripBeganDraw())); - connect (grip, SIGNAL (continuedDraw(int,int,bool)), - this, SLOT (slotGripContinuedDraw(int,int,bool))); - connect (grip, SIGNAL (cancelledDraw()), - this, SLOT (slotGripCancelledDraw())); - connect (grip, SIGNAL (endedDraw(int,int)), - this, SLOT (slotGripEndedDraw(int,int))); - - connect (grip, SIGNAL (statusMessageChanged(QString)), - this, SLOT (slotGripStatusMessageChanged(QString))); - - connect (grip, SIGNAL (releasedAllButtons()), - this, SLOT (recalculateStatusMessage())); + connect (grip, &kpGrip::beganDraw, + this, &kpViewScrollableContainer::slotGripBeganDraw); + + connect (grip, &kpGrip::continuedDraw, + this, &kpViewScrollableContainer::slotGripContinuedDraw); + + connect (grip, &kpGrip::cancelledDraw, + this, &kpViewScrollableContainer::slotGripCancelledDraw); + + connect (grip, &kpGrip::endedDraw, + this, &kpViewScrollableContainer::slotGripEndedDraw); + + connect (grip, &kpGrip::statusMessageChanged, + this, &kpViewScrollableContainer::slotGripStatusMessageChanged); + + connect (grip, &kpGrip::releasedAllButtons, + this, &kpViewScrollableContainer::recalculateStatusMessage); } //--------------------------------------------------------------------- @@ -889,21 +891,25 @@ // protected void kpViewScrollableContainer::disconnectViewSignals () { - disconnect (m_view, SIGNAL (sizeChanged(QSize)), - this, SLOT (updateGrips())); - disconnect (m_view, SIGNAL (destroyed()), - this, SLOT (slotViewDestroyed())); + disconnect (m_view, + static_cast(&kpView::sizeChanged), + this, &kpViewScrollableContainer::updateGrips); + + disconnect (m_view, &kpView::destroyed, + this, &kpViewScrollableContainer::slotViewDestroyed); } //--------------------------------------------------------------------- // protected void kpViewScrollableContainer::connectViewSignals () { - connect (m_view, SIGNAL (sizeChanged(QSize)), - this, SLOT (updateGrips())); - connect (m_view, SIGNAL (destroyed()), - this, SLOT (slotViewDestroyed())); + connect (m_view, + static_cast(&kpView::sizeChanged), + this, &kpViewScrollableContainer::updateGrips); + + connect (m_view, &kpView::destroyed, + this, &kpViewScrollableContainer::slotViewDestroyed); } //--------------------------------------------------------------------- @@ -1135,13 +1141,6 @@ return scrolled; } -//--------------------------------------------------------------------- - -// protected slot -bool kpViewScrollableContainer::slotDragScroll () -{ - return slotDragScroll (nullptr/*don't want scrolled notification*/); -} //--------------------------------------------------------------------- diff --git a/lgpl/generic/widgets/kpColorCellsBase.h b/lgpl/generic/widgets/kpColorCellsBase.h --- a/lgpl/generic/widgets/kpColorCellsBase.h +++ b/lgpl/generic/widgets/kpColorCellsBase.h @@ -138,7 +138,7 @@ Added for KolourPaint. */ - void colorSelected( int index , const QColor& color, Qt::MouseButton button ); + void colorSelectedWhitButton( int index , const QColor& color, Qt::MouseButton button ); /** Emitted when a color in the table is double-clicked */ void colorDoubleClicked( int index , const QColor& color ); diff --git a/lgpl/generic/widgets/kpColorCellsBase.cpp b/lgpl/generic/widgets/kpColorCellsBase.cpp --- a/lgpl/generic/widgets/kpColorCellsBase.cpp +++ b/lgpl/generic/widgets/kpColorCellsBase.cpp @@ -549,8 +549,8 @@ d->inMouse = false; if (cell != -1) { - emit colorSelected( cell , color(cell) ); - emit colorSelected( cell , color(cell), e->button() ); + emit colorSelected( cell , color(cell) ); + emit colorSelectedWhitButton( cell , color(cell), e->button() ); } } diff --git a/mainWindow/kpMainWindow.cpp b/mainWindow/kpMainWindow.cpp --- a/mainWindow/kpMainWindow.cpp +++ b/mainWindow/kpMainWindow.cpp @@ -238,20 +238,24 @@ d->scrollView = new kpViewScrollableContainer (this); d->scrollView->setObjectName ( QLatin1String("scrollView" )); - connect (d->scrollView, SIGNAL (beganDocResize()), - this, SLOT (slotBeganDocResize())); - connect (d->scrollView, SIGNAL (continuedDocResize(QSize)), - this, SLOT (slotContinuedDocResize(QSize))); - connect (d->scrollView, SIGNAL (cancelledDocResize()), - this, SLOT (slotCancelledDocResize())); - connect (d->scrollView, SIGNAL (endedDocResize(QSize)), - this, SLOT (slotEndedDocResize(QSize))); - connect (d->scrollView, SIGNAL (statusMessageChanged(QString)), - this, SLOT (slotDocResizeMessageChanged(QString))); + connect (d->scrollView, &kpViewScrollableContainer::beganDocResize, + this, &kpMainWindow::slotBeganDocResize); - connect (d->scrollView, SIGNAL(contentsMoved()), - this, SLOT(slotScrollViewAfterScroll())); + connect (d->scrollView, &kpViewScrollableContainer::continuedDocResize, + this, &kpMainWindow::slotContinuedDocResize); + + connect (d->scrollView, &kpViewScrollableContainer::cancelledDocResize, + this, &kpMainWindow::slotCancelledDocResize); + + connect (d->scrollView, &kpViewScrollableContainer::endedDocResize, + this, &kpMainWindow::slotEndedDocResize); + + connect (d->scrollView, &kpViewScrollableContainer::statusMessageChanged, + this, &kpMainWindow::slotDocResizeMessageChanged); + + connect (d->scrollView, &kpViewScrollableContainer::contentsMoved, + this, &kpMainWindow::slotScrollViewAfterScroll); setCentralWidget (d->scrollView); @@ -676,16 +680,20 @@ #endif // Copy/Cut/Deselect/Delete - connect (d->document, SIGNAL (selectionEnabled(bool)), - d->actionCut, SLOT (setEnabled(bool))); - connect (d->document, SIGNAL (selectionEnabled(bool)), - d->actionCopy, SLOT (setEnabled(bool))); - connect (d->document, SIGNAL (selectionEnabled(bool)), - d->actionDelete, SLOT (setEnabled(bool))); - connect (d->document, SIGNAL (selectionEnabled(bool)), - d->actionDeselect, SLOT (setEnabled(bool))); - connect (d->document, SIGNAL (selectionEnabled(bool)), - d->actionCopyToFile, SLOT (setEnabled(bool))); + connect (d->document, &kpDocument::selectionEnabled, + d->actionCut, &QAction::setEnabled); + + connect (d->document, &kpDocument::selectionEnabled, + d->actionCopy, &QAction::setEnabled); + + connect (d->document, &kpDocument::selectionEnabled, + d->actionDelete, &QAction::setEnabled); + + connect (d->document, &kpDocument::selectionEnabled, + d->actionDeselect, &QAction::setEnabled); + + connect (d->document, &kpDocument::selectionEnabled, + d->actionCopyToFile, &QAction::setEnabled); // this code won't actually enable any actions at this stage // (fresh document) but better safe than sorry @@ -695,45 +703,54 @@ d->actionDelete->setEnabled (d->document->selection ()); d->actionCopyToFile->setEnabled (d->document->selection ()); - connect (d->document, SIGNAL (selectionEnabled(bool)), - this, SLOT (slotImageMenuUpdateDueToSelection())); - connect (d->document, SIGNAL (selectionIsTextChanged(bool)), - this, SLOT (slotImageMenuUpdateDueToSelection())); + connect (d->document, &kpDocument::selectionEnabled, + this, &kpMainWindow::slotImageMenuUpdateDueToSelection); + + connect (d->document, &kpDocument::selectionIsTextChanged, + this, &kpMainWindow::slotImageMenuUpdateDueToSelection); // Status bar - connect (d->document, SIGNAL (documentOpened()), - this, SLOT (recalculateStatusBar())); + connect (d->document, &kpDocument::documentOpened, + this, &kpMainWindow::recalculateStatusBar); connect (d->document, SIGNAL (sizeChanged(QSize)), this, SLOT (setStatusBarDocSize(QSize))); // Caption (url, modified) - connect (d->document, SIGNAL (documentModified()), - this, SLOT (slotUpdateCaption())); - connect (d->document, SIGNAL (documentOpened()), - this, SLOT (slotUpdateCaption())); - connect (d->document, SIGNAL (documentSaved()), - this, SLOT (slotUpdateCaption())); + connect (d->document, &kpDocument::documentModified, + this, &kpMainWindow::slotUpdateCaption); + + connect (d->document, &kpDocument::documentOpened, + this, &kpMainWindow::slotUpdateCaption); + + connect (d->document, &kpDocument::documentSaved, + this, &kpMainWindow::slotUpdateCaption); // File/Reload action only available with non-empty URL - connect (d->document, SIGNAL (documentSaved()), - this, SLOT (slotEnableReload())); + connect (d->document, &kpDocument::documentSaved, + this, &kpMainWindow::slotEnableReload); - connect (d->document, SIGNAL (documentSaved()), - this, SLOT (slotEnableSettingsShowPath())); + connect (d->document, &kpDocument::documentSaved, + this, &kpMainWindow::slotEnableSettingsShowPath); // Command history Q_ASSERT (d->commandHistory); - connect (d->commandHistory, SIGNAL (documentRestored()), - this, SLOT (slotDocumentRestored())); // caption "!modified" - connect (d->document, SIGNAL (documentSaved()), - d->commandHistory, SLOT (documentSaved())); + connect (d->commandHistory, &kpCommandHistory::documentRestored, + this, &kpMainWindow::slotDocumentRestored); // caption "!modified" + + connect (d->document, &kpDocument::documentSaved, + d->commandHistory, &kpCommandHistory::documentSaved); // Sync document -> views - connect (d->document, SIGNAL (contentsChanged(QRect)), - d->viewManager, SLOT (updateViews(QRect))); - connect (d->document, SIGNAL (sizeChanged(int,int)), - d->viewManager, SLOT (adjustViewsToEnvironment())); + connect (d->document, &kpDocument::contentsChanged, + d->viewManager, &kpViewManager::updateViews); + + connect (d->document, static_cast(&kpDocument::sizeChanged), + d->viewManager, &kpViewManager::adjustViewsToEnvironment); + + connect (d->document, + static_cast(&kpDocument::sizeChanged), + d->viewManager, &kpViewManager::adjustViewsToEnvironment); #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tenabling actions"; diff --git a/mainWindow/kpMainWindow_Colors.cpp b/mainWindow/kpMainWindow_Colors.cpp --- a/mainWindow/kpMainWindow_Colors.cpp +++ b/mainWindow/kpMainWindow_Colors.cpp @@ -59,49 +59,48 @@ d->actionColorsDefault = ac->addAction ("colors_default"); d->actionColorsDefault->setText (i18n ("Use KolourPaint Defaults")); - connect (d->actionColorsDefault, SIGNAL (triggered(bool)), - SLOT (slotColorsDefault())); + connect (d->actionColorsDefault, &QAction::triggered, + this, &kpMainWindow::slotColorsDefault); d->actionColorsKDE = ac->add ("colors_kde"); d->actionColorsKDE->setText (i18nc ("@item:inmenu colors", "Use KDE's")); // TODO: Will this slot be called spuriously if there are no colors // installed? - connect (d->actionColorsKDE, SIGNAL (triggered(QAction*)), - SLOT (slotColorsKDE())); + connect (d->actionColorsKDE, + static_cast(&KSelectAction::triggered), + this, &kpMainWindow::slotColorsKDE); + foreach (const QString &colName, ::KDEColorCollectionNames ()) d->actionColorsKDE->addAction (colName); d->actionColorsOpen = ac->addAction ("colors_open"); d->actionColorsOpen->setText (i18nc ("@item:inmenu colors", "&Open...")); - connect (d->actionColorsOpen, SIGNAL (triggered(bool)), - SLOT (slotColorsOpen())); + connect (d->actionColorsOpen, &QAction::triggered, this, &kpMainWindow::slotColorsOpen); d->actionColorsReload = ac->addAction ("colors_reload"); d->actionColorsReload->setText (i18nc ("@item:inmenu colors", "Reloa&d")); - connect (d->actionColorsReload, SIGNAL (triggered(bool)), - SLOT (slotColorsReload())); - + connect (d->actionColorsReload, &QAction::triggered, + this, &kpMainWindow::slotColorsReload); d->actionColorsSave = ac->addAction ("colors_save"); d->actionColorsSave->setText (i18nc ("@item:inmenu colors", "&Save")); - connect (d->actionColorsSave, SIGNAL (triggered(bool)), - SLOT (slotColorsSave())); + connect (d->actionColorsSave, &QAction::triggered, + this, &kpMainWindow::slotColorsSave); d->actionColorsSaveAs = ac->addAction ("colors_save_as"); d->actionColorsSaveAs->setText (i18nc ("@item:inmenu colors", "Save &As...")); - connect (d->actionColorsSaveAs, SIGNAL (triggered(bool)), - SLOT (slotColorsSaveAs())); - + connect (d->actionColorsSaveAs, &QAction::triggered, + this, &kpMainWindow::slotColorsSaveAs); d->actionColorsAppendRow = ac->addAction ("colors_append_row"); d->actionColorsAppendRow->setText (i18nc ("@item:inmenu colors", "Add Row")); - connect (d->actionColorsAppendRow, SIGNAL (triggered(bool)), - SLOT (slotColorsAppendRow())); + connect (d->actionColorsAppendRow, &QAction::triggered, + this, &kpMainWindow::slotColorsAppendRow); d->actionColorsDeleteRow = ac->addAction ("colors_delete_row"); d->actionColorsDeleteRow->setText (i18nc ("@item:inmenu colors", "Delete Last Row")); - connect (d->actionColorsDeleteRow, SIGNAL (triggered(bool)), - SLOT (slotColorsDeleteRow())); + connect (d->actionColorsDeleteRow, &QAction::triggered, + this, &kpMainWindow::slotColorsDeleteRow); enableColorsMenuDocumentActions (false); @@ -117,8 +116,8 @@ // (needed for QMainWindow::saveState()) d->colorToolBar->setObjectName ( QLatin1String("Color Box" )); - connect (colorCells (), SIGNAL (rowCountChanged(int)), - SLOT (slotUpdateColorsDeleteRowActionEnabled())); + connect (colorCells (), &kpColorCells::rowCountChanged, + this, &kpMainWindow::slotUpdateColorsDeleteRowActionEnabled); } //--------------------------------------------------------------------- diff --git a/mainWindow/kpMainWindow_Edit.cpp b/mainWindow/kpMainWindow_Edit.cpp --- a/mainWindow/kpMainWindow_Edit.cpp +++ b/mainWindow/kpMainWindow_Edit.cpp @@ -94,36 +94,36 @@ d->actionPaste = KStandardAction::paste (this, SLOT (slotPaste()), ac); d->actionPasteInNewWindow = ac->addAction ("edit_paste_in_new_window"); d->actionPasteInNewWindow->setText (i18n ("Paste in &New Window")); - connect (d->actionPasteInNewWindow, SIGNAL (triggered(bool)), - SLOT (slotPasteInNewWindow())); + connect (d->actionPasteInNewWindow, &QAction::triggered, + this, &kpMainWindow::slotPasteInNewWindow); ac->setDefaultShortcut (d->actionPasteInNewWindow, Qt::CTRL + Qt::SHIFT + Qt::Key_V); //d->actionDelete = KStandardAction::clear (this, SLOT (slotDelete()), ac); d->actionDelete = ac->addAction ("edit_clear"); d->actionDelete->setText (i18n ("&Delete Selection")); - connect (d->actionDelete, SIGNAL (triggered(bool)), SLOT (slotDelete())); + connect (d->actionDelete, &QAction::triggered, this, &kpMainWindow::slotDelete); d->actionSelectAll = KStandardAction::selectAll (this, SLOT (slotSelectAll()), ac); d->actionDeselect = KStandardAction::deselect (this, SLOT (slotDeselect()), ac); d->actionCopyToFile = ac->addAction ("edit_copy_to_file"); d->actionCopyToFile->setText (i18n ("C&opy to File...")); - connect (d->actionCopyToFile, SIGNAL (triggered(bool)), - SLOT (slotCopyToFile())); + connect (d->actionCopyToFile, &QAction::triggered, this, &kpMainWindow::slotCopyToFile); + d->actionPasteFromFile = ac->addAction ("edit_paste_from_file"); d->actionPasteFromFile->setText (i18n ("Paste &From File...")); - connect (d->actionPasteFromFile, SIGNAL (triggered(bool)), - SLOT (slotPasteFromFile())); + connect (d->actionPasteFromFile, &QAction::triggered, this, &kpMainWindow::slotPasteFromFile); d->editMenuDocumentActionsEnabled = false; enableEditMenuDocumentActions (false); // Paste should always be enabled, as long as there is something to paste // (independent of whether we have a document or not) - connect (QApplication::clipboard (), SIGNAL (dataChanged()), - this, SLOT (slotEnablePaste())); + connect (QApplication::clipboard(), &QClipboard::dataChanged, + this, &kpMainWindow::slotEnablePaste); + slotEnablePaste (); } diff --git a/mainWindow/kpMainWindow_File.cpp b/mainWindow/kpMainWindow_File.cpp --- a/mainWindow/kpMainWindow_File.cpp +++ b/mainWindow/kpMainWindow_File.cpp @@ -107,31 +107,31 @@ d->actionExport = ac->addAction("file_export"); d->actionExport->setText (i18n ("E&xport...")); d->actionExport->setIcon(KDE::icon("document-export")); - connect(d->actionExport, SIGNAL(triggered(bool)), SLOT (slotExport())); + connect (d->actionExport, &QAction::triggered, this, &kpMainWindow::slotExport); d->actionScan = ac->addAction("file_scan"); d->actionScan->setText(i18n ("Scan...")); d->actionScan->setIcon(SmallIcon("scanner")); #if HAVE_KSANE - connect(d->actionScan, SIGNAL(triggered(bool)), SLOT(slotScan())); + connect (d->actionScan, &QAction::triggered, this, &kpMainWindow::slotScan); #else d->actionScan->setEnabled(false); #endif // HAVE_KSANE d->actionScreenshot = ac->addAction("file_screenshot"); d->actionScreenshot->setText(i18n("Acquire Screenshot")); - connect(d->actionScreenshot, SIGNAL(triggered(bool)), SLOT(slotScreenshot())); + connect (d->actionScreenshot, &QAction::triggered, this, &kpMainWindow::slotScreenshot); d->actionProperties = ac->addAction ("file_properties"); d->actionProperties->setText (i18n ("Properties")); d->actionProperties->setIcon(KDE::icon("document-properties")); - connect (d->actionProperties, SIGNAL (triggered(bool)), SLOT (slotProperties())); + connect (d->actionProperties, &QAction::triggered, this, &kpMainWindow::slotProperties); //d->actionRevert = KStandardAction::revert (this, SLOT (slotRevert()), ac); d->actionReload = ac->addAction ("file_revert"); d->actionReload->setText (i18n ("Reloa&d")); d->actionReload->setIcon(KDE::icon("view-refresh")); - connect(d->actionReload, SIGNAL(triggered(bool)), SLOT (slotReload())); + connect (d->actionReload, &QAction::triggered, this, &kpMainWindow::slotReload); ac->setDefaultShortcuts (d->actionReload, KStandardShortcut::reload ()); slotEnableReload (); @@ -556,8 +556,7 @@ #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\tcreated scanDialog=" << d->scanDialog; #endif - connect (d->scanDialog, SIGNAL (finalImage(QImage,int)), - SLOT (slotScanned(QImage,int))); + connect (d->scanDialog, &SaneDialog::finalImage, this, &kpMainWindow::slotScanned); } @@ -664,8 +663,8 @@ QDialog *dialog = new QDialog(this); QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, dialog); - connect (buttons, SIGNAL (accepted()), dialog, SLOT (accept())); - connect (buttons, SIGNAL (rejected()), dialog, SLOT (reject())); + connect (buttons, &QDialogButtonBox::accepted, dialog, &QDialog::accept); + connect (buttons, &QDialogButtonBox::rejected, dialog, &QDialog::reject); QLabel *label = new QLabel(i18n("Snapshot Delay")); KPluralHandlingSpinBox *seconds = new KPluralHandlingSpinBox; @@ -896,8 +895,8 @@ if (localOnly) fd.setMode (KFile::File | KFile::LocalOnly); - connect (&fd, SIGNAL (filterChanged(QString)), - saveOptionsWidget, SLOT (setMimeType(QString))); + connect (&fd, &KFileDialog::filterChanged, + saveOptionsWidget, &kpDocumentSaveOptionsWidget::setMimeType); if ( fd.exec() == QDialog::Accepted ) { diff --git a/mainWindow/kpMainWindow_Image.cpp b/mainWindow/kpMainWindow_Image.cpp --- a/mainWindow/kpMainWindow_Image.cpp +++ b/mainWindow/kpMainWindow_Image.cpp @@ -116,77 +116,79 @@ d->actionResizeScale = ac->addAction ("image_resize_scale"); d->actionResizeScale->setText (i18n ("R&esize / Scale...")); - connect (d->actionResizeScale, SIGNAL (triggered(bool)), SLOT (slotResizeScale())); + connect (d->actionResizeScale, &QAction::triggered, this, &kpMainWindow::slotResizeScale); + ac->setDefaultShortcut (d->actionResizeScale, Qt::CTRL + Qt::Key_E); d->actionCrop = ac->addAction ("image_crop"); d->actionCrop->setText (i18n ("Se&t as Image (Crop)")); - connect (d->actionCrop, SIGNAL (triggered(bool)), SLOT (slotCrop())); + connect (d->actionCrop, &QAction::triggered, this, &kpMainWindow::slotCrop); ac->setDefaultShortcut (d->actionCrop, Qt::CTRL + Qt::Key_T); d->actionAutoCrop = ac->addAction ("image_auto_crop"); d->actionAutoCrop->setText (autoCropText ()); - connect (d->actionAutoCrop, SIGNAL (triggered(bool)), SLOT (slotAutoCrop())); + connect (d->actionAutoCrop, &QAction::triggered, this, &kpMainWindow::slotAutoCrop); ac->setDefaultShortcut (d->actionAutoCrop, Qt::CTRL + Qt::Key_U); d->actionFlip = ac->addAction ("image_flip"); d->actionFlip->setText (i18n ("&Flip (upside down)")); - connect (d->actionFlip, SIGNAL (triggered(bool)), SLOT (slotFlip())); + connect (d->actionFlip, &QAction::triggered, this, &kpMainWindow::slotFlip); ac->setDefaultShortcut (d->actionFlip, Qt::CTRL + Qt::Key_F); d->actionMirror = ac->addAction ("image_mirror"); d->actionMirror->setText (i18n ("Mirror (horizontally)")); - connect (d->actionMirror, SIGNAL (triggered(bool)), SLOT (slotMirror())); + connect (d->actionMirror, &QAction::triggered, this, &kpMainWindow::slotMirror); //ac->setDefaultShortcut (d->actionMirror, Qt::CTRL + Qt::Key_M); d->actionRotate = ac->addAction ("image_rotate"); d->actionRotate->setText (i18n ("&Rotate...")); d->actionRotate->setIcon(KDE::icon("transform-rotate")); - connect (d->actionRotate, SIGNAL (triggered(bool)), SLOT (slotRotate())); + connect (d->actionRotate, &QAction::triggered, this, &kpMainWindow::slotRotate); ac->setDefaultShortcut (d->actionRotate, Qt::CTRL + Qt::Key_R); d->actionRotateLeft = ac->addAction ("image_rotate_270deg"); d->actionRotateLeft->setText (i18n ("Rotate &Left")); d->actionRotateLeft->setIcon(KDE::icon("object-rotate-left")); - connect (d->actionRotateLeft, SIGNAL (triggered(bool)), SLOT (slotRotate270())); + connect (d->actionRotateLeft, &QAction::triggered, this, &kpMainWindow::slotRotate270); ac->setDefaultShortcut (d->actionRotateLeft, Qt::CTRL + Qt::SHIFT + Qt::Key_Left); d->actionRotateRight = ac->addAction ("image_rotate_90deg"); d->actionRotateRight->setText (i18n ("Rotate Righ&t")); d->actionRotateRight->setIcon(KDE::icon("object-rotate-right")); - connect (d->actionRotateRight, SIGNAL (triggered(bool)), SLOT (slotRotate90())); + connect (d->actionRotateRight, &QAction::triggered, this, &kpMainWindow::slotRotate90); ac->setDefaultShortcut (d->actionRotateRight, Qt::CTRL + Qt::SHIFT + Qt::Key_Right); d->actionSkew = ac->addAction ("image_skew"); d->actionSkew->setText (i18n ("S&kew...")); - connect (d->actionSkew, SIGNAL (triggered(bool)), SLOT (slotSkew())); + connect (d->actionSkew, &QAction::triggered, this, &kpMainWindow::slotSkew); ac->setDefaultShortcut (d->actionSkew, Qt::CTRL + Qt::Key_K); d->actionConvertToBlackAndWhite = ac->addAction ("image_convert_to_black_and_white"); d->actionConvertToBlackAndWhite->setText (i18n ("Reduce to Mo&nochrome (Dithered)")); - connect (d->actionConvertToBlackAndWhite, SIGNAL (triggered(bool)), SLOT (slotConvertToBlackAndWhite())); + connect (d->actionConvertToBlackAndWhite, &QAction::triggered, + this, &kpMainWindow::slotConvertToBlackAndWhite); d->actionConvertToGrayscale = ac->addAction ("image_convert_to_grayscale"); d->actionConvertToGrayscale->setText (i18n ("Reduce to &Grayscale")); - connect (d->actionConvertToGrayscale, SIGNAL (triggered(bool)), SLOT (slotConvertToGrayscale())); + connect (d->actionConvertToGrayscale, &QAction::triggered, this, &kpMainWindow::slotConvertToGrayscale); d->actionInvertColors = ac->addAction ("image_invert_colors"); d->actionInvertColors->setText (i18n ("&Invert Colors")); - connect (d->actionInvertColors, SIGNAL (triggered(bool)), SLOT (slotInvertColors())); + connect (d->actionInvertColors, &QAction::triggered, this, &kpMainWindow::slotInvertColors); ac->setDefaultShortcut (d->actionInvertColors, Qt::CTRL + Qt::Key_I); d->actionClear = ac->addAction ("image_clear"); d->actionClear->setText (i18n ("C&lear")); - connect (d->actionClear, SIGNAL (triggered(bool)), SLOT (slotClear())); + connect (d->actionClear, &QAction::triggered, this, &kpMainWindow::slotClear); ac->setDefaultShortcut (d->actionClear, Qt::CTRL + Qt::SHIFT + Qt::Key_N); d->actionBlur = ac->addAction("image_make_confidential"); d->actionBlur->setText(i18n("Make Confidential")); - connect(d->actionBlur, SIGNAL(triggered(bool)), SLOT(slotMakeConfidential())); + connect(d->actionBlur, &QAction::triggered, this, &kpMainWindow::slotMakeConfidential); d->actionMoreEffects = ac->addAction ("image_more_effects"); d->actionMoreEffects->setText (i18n ("&More Effects...")); - connect (d->actionMoreEffects, SIGNAL (triggered(bool)), SLOT (slotMoreEffects())); + connect (d->actionMoreEffects, &QAction::triggered, this, &kpMainWindow::slotMoreEffects); ac->setDefaultShortcut (d->actionMoreEffects, Qt::CTRL + Qt::Key_M); diff --git a/mainWindow/kpMainWindow_Settings.cpp b/mainWindow/kpMainWindow_Settings.cpp --- a/mainWindow/kpMainWindow_Settings.cpp +++ b/mainWindow/kpMainWindow_Settings.cpp @@ -65,13 +65,13 @@ d->actionShowPath = ac->add ("settings_show_path"); d->actionShowPath->setText (i18n ("Show &Path")); - connect(d->actionShowPath, SIGNAL(triggered(bool)), SLOT (slotShowPathToggled())); + connect (d->actionShowPath, &QAction::triggered, this, &kpMainWindow::slotShowPathToggled); slotEnableSettingsShowPath (); KToggleAction *action = ac->add("settings_draw_antialiased"); action->setText(i18n("Draw Anti-Aliased")); action->setChecked(kpToolEnvironment::drawAntiAliased); - connect(action, SIGNAL(triggered(bool)), SLOT(slotDrawAntiAliasedToggled(bool))); + connect (action, &KToggleAction::triggered, this, &kpMainWindow::slotDrawAntiAliasedToggled); d->actionKeyBindings = KStandardAction::keyBindings (this, SLOT (slotKeyBindings()), ac); diff --git a/mainWindow/kpMainWindow_Text.cpp b/mainWindow/kpMainWindow_Text.cpp --- a/mainWindow/kpMainWindow_Text.cpp +++ b/mainWindow/kpMainWindow_Text.cpp @@ -55,37 +55,37 @@ d->actionTextFontFamily = ac->add ("text_font_family"); d->actionTextFontFamily->setText (i18n ("Font Family")); - connect (d->actionTextFontFamily, SIGNAL (triggered(QString)), - this, SLOT (slotTextFontFamilyChanged())); + connect (d->actionTextFontFamily, &QAction::triggered, + this, &kpMainWindow::slotTextFontFamilyChanged); d->actionTextFontSize = ac->add ("text_font_size"); d->actionTextFontSize->setText (i18n ("Font Size")); - connect (d->actionTextFontSize, SIGNAL (fontSizeChanged(int)), - this, SLOT (slotTextFontSizeChanged())); + connect (d->actionTextFontSize, &QAction::triggered, + this, &kpMainWindow::slotTextFontSizeChanged); d->actionTextBold = ac->add ("text_bold"); d->actionTextBold->setIcon(KDE::icon("format-text-bold")); d->actionTextBold->setText (i18n ("Bold")); - connect (d->actionTextBold, SIGNAL (triggered(bool)), - SLOT (slotTextBoldChanged())); + connect (d->actionTextBold, &QAction::triggered, + this, &kpMainWindow::slotTextBoldChanged); d->actionTextItalic = ac->add ("text_italic"); d->actionTextItalic->setIcon (KDE::icon("format-text-italic")); d->actionTextItalic->setText (i18n ("Italic")); - connect (d->actionTextItalic, SIGNAL (triggered(bool)), - SLOT (slotTextItalicChanged())); + connect (d->actionTextItalic, &QAction::triggered, + this, &kpMainWindow::slotTextItalicChanged); d->actionTextUnderline = ac->add ("text_underline"); d->actionTextUnderline->setIcon (KDE::icon("format-text-underline")); d->actionTextUnderline->setText (i18n ("Underline")); - connect (d->actionTextUnderline, SIGNAL (triggered(bool)), - SLOT (slotTextUnderlineChanged())); + connect (d->actionTextUnderline, &QAction::triggered, + this, &kpMainWindow::slotTextUnderlineChanged); d->actionTextStrikeThru = ac->add ("text_strike_thru"); d->actionTextStrikeThru->setIcon(KDE::icon("format-text-strikethrough")); d->actionTextStrikeThru->setText (i18n ("Strike Through")); - connect (d->actionTextStrikeThru, SIGNAL (triggered(bool)), - SLOT (slotTextStrikeThruChanged())); + connect (d->actionTextStrikeThru, &QAction::triggered, + this, &kpMainWindow::slotTextStrikeThruChanged); readAndApplyTextSettings (); diff --git a/mainWindow/kpMainWindow_Tools.cpp b/mainWindow/kpMainWindow_Tools.cpp --- a/mainWindow/kpMainWindow_Tools.cpp +++ b/mainWindow/kpMainWindow_Tools.cpp @@ -133,26 +133,26 @@ d->actionPrevToolOptionGroup1 = ac->addAction ("prev_tool_option_group_1"); d->actionPrevToolOptionGroup1->setText (i18n ("Previous Tool Option (Group #1)")); ac->setDefaultShortcuts (d->actionPrevToolOptionGroup1, kpTool::shortcutForKey (Qt::Key_1)); - connect (d->actionPrevToolOptionGroup1, SIGNAL (triggered(bool)), - SLOT (slotActionPrevToolOptionGroup1())); + connect (d->actionPrevToolOptionGroup1, &QAction::triggered, + this, &kpMainWindow::slotActionPrevToolOptionGroup1); d->actionNextToolOptionGroup1 = ac->addAction ("next_tool_option_group_1"); d->actionNextToolOptionGroup1->setText (i18n ("Next Tool Option (Group #1)")); ac->setDefaultShortcuts (d->actionNextToolOptionGroup1, kpTool::shortcutForKey (Qt::Key_2)); - connect (d->actionNextToolOptionGroup1, SIGNAL (triggered(bool)), - SLOT (slotActionNextToolOptionGroup1())); + connect (d->actionNextToolOptionGroup1, &QAction::triggered, + this, &kpMainWindow::slotActionNextToolOptionGroup1); d->actionPrevToolOptionGroup2 = ac->addAction ("prev_tool_option_group_2"); d->actionPrevToolOptionGroup2->setText (i18n ("Previous Tool Option (Group #2)")); ac->setDefaultShortcuts (d->actionPrevToolOptionGroup2, kpTool::shortcutForKey (Qt::Key_3)); - connect (d->actionPrevToolOptionGroup2, SIGNAL (triggered(bool)), - SLOT (slotActionPrevToolOptionGroup2())); + connect (d->actionPrevToolOptionGroup2, &QAction::triggered, + this, &kpMainWindow::slotActionPrevToolOptionGroup2); d->actionNextToolOptionGroup2 = ac->addAction ("next_tool_option_group_2"); d->actionNextToolOptionGroup2->setText (i18n ("Next Tool Option (Group #2)")); ac->setDefaultShortcuts (d->actionNextToolOptionGroup2, kpTool::shortcutForKey (Qt::Key_4)); - connect (d->actionNextToolOptionGroup2, SIGNAL (triggered(bool)), - SLOT (slotActionNextToolOptionGroup2())); + connect (d->actionNextToolOptionGroup2, &QAction::triggered, + this, &kpMainWindow::slotActionNextToolOptionGroup2); // @@ -162,13 +162,13 @@ d->actionDrawOpaque = ac->add ("image_draw_opaque"); d->actionDrawOpaque->setText (i18n ("&Draw Opaque")); - connect (d->actionDrawOpaque, SIGNAL (triggered(bool)), - SLOT (slotActionDrawOpaqueToggled())); + connect (d->actionDrawOpaque, &QAction::triggered, + this, &kpMainWindow::slotActionDrawOpaqueToggled); d->actionDrawColorSimilarity = ac->addAction ("image_draw_color_similarity"); d->actionDrawColorSimilarity->setText (i18n ("Draw With Color Similarity...")); - connect (d->actionDrawColorSimilarity, SIGNAL (triggered(bool)), - SLOT (slotActionDrawColorSimilarity())); + connect (d->actionDrawColorSimilarity, &QAction::triggered, + this, &kpMainWindow::slotActionDrawColorSimilarity); } //--------------------------------------------------------------------- @@ -179,14 +179,16 @@ d->toolToolBar = new kpToolToolBar(QLatin1String("Tool Box"), 2/*columns/rows*/, this); d->toolToolBar->setWindowTitle(i18n("Tool Box")); - connect (d->toolToolBar, SIGNAL (sigToolSelected(kpTool*)), - this, SLOT (slotToolSelected(kpTool*))); - connect (d->toolToolBar, SIGNAL (toolWidgetOptionSelected()), - this, SLOT (updateToolOptionPrevNextActionsEnabled())); + connect (d->toolToolBar, &kpToolToolBar::sigToolSelected, + this, &kpMainWindow::slotToolSelected); + + connect (d->toolToolBar, &kpToolToolBar::toolWidgetOptionSelected, + this, &kpMainWindow::updateToolOptionPrevNextActionsEnabled); + + connect (d->toolToolBar->toolWidgetOpaqueOrTransparent(), + &kpToolWidgetOpaqueOrTransparent::isOpaqueChanged, + this, &kpMainWindow::updateActionDrawOpaqueChecked); - connect (d->toolToolBar->toolWidgetOpaqueOrTransparent (), - SIGNAL (isOpaqueChanged(bool)), - SLOT (updateActionDrawOpaqueChecked())); updateActionDrawOpaqueChecked (); foreach (kpTool *tool, d->tools) @@ -427,55 +429,73 @@ if (previousTool) { - disconnect (previousTool, SIGNAL (movedAndAboutToDraw(QPoint,QPoint,int,bool*)), - this, SLOT (slotDragScroll(QPoint,QPoint,int,bool*))); - disconnect (previousTool, SIGNAL (endedDraw(QPoint)), - this, SLOT (slotEndDragScroll())); - disconnect (previousTool, SIGNAL (cancelledShape(QPoint)), - this, SLOT (slotEndDragScroll())); - - disconnect (previousTool, SIGNAL (userMessageChanged(QString)), - this, SLOT (recalculateStatusBarMessage())); - disconnect (previousTool, SIGNAL (userShapePointsChanged(QPoint,QPoint)), - this, SLOT (recalculateStatusBarShape())); - disconnect (previousTool, SIGNAL (userShapeSizeChanged(QSize)), - this, SLOT (recalculateStatusBarShape())); - - disconnect (d->colorToolBar, SIGNAL (colorsSwapped(kpColor,kpColor)), - previousTool, SLOT (slotColorsSwappedInternal(kpColor,kpColor))); - disconnect (d->colorToolBar, SIGNAL (foregroundColorChanged(kpColor)), - previousTool, SLOT (slotForegroundColorChangedInternal(kpColor))); - disconnect (d->colorToolBar, SIGNAL (backgroundColorChanged(kpColor)), - previousTool, SLOT (slotBackgroundColorChangedInternal(kpColor))); - disconnect (d->colorToolBar, SIGNAL (colorSimilarityChanged(double,int)), - previousTool, SLOT (slotColorSimilarityChangedInternal(double,int))); + disconnect (previousTool, &kpTool::movedAndAboutToDraw, + this, &kpMainWindow::slotDragScroll); + + disconnect (previousTool, &kpTool::endedDraw, + this, &kpMainWindow::slotEndDragScroll); + + disconnect (previousTool, &kpTool::cancelledShape, + this, &kpMainWindow::slotEndDragScroll); + + disconnect (previousTool, &kpTool::userMessageChanged, + this, &kpMainWindow::recalculateStatusBarMessage); + + disconnect (previousTool, &kpTool::userShapePointsChanged, + this, &kpMainWindow::recalculateStatusBarShape); + + disconnect (previousTool, &kpTool::userShapeSizeChanged, + this, &kpMainWindow::recalculateStatusBarShape); + + + disconnect (d->colorToolBar, &kpColorToolBar::colorsSwapped, + previousTool, &kpTool::slotColorsSwappedInternal); + + disconnect (d->colorToolBar, &kpColorToolBar::foregroundColorChanged, + previousTool, &kpTool::slotForegroundColorChangedInternal); + + disconnect (d->colorToolBar, &kpColorToolBar::backgroundColorChanged, + previousTool, &kpTool::slotBackgroundColorChangedInternal); + + + disconnect (d->colorToolBar, &kpColorToolBar::colorSimilarityChanged, + previousTool, &kpTool::slotColorSimilarityChangedInternal); } if (tool) { - connect (tool, SIGNAL (movedAndAboutToDraw(QPoint,QPoint,int,bool*)), - this, SLOT (slotDragScroll(QPoint,QPoint,int,bool*))); - connect (tool, SIGNAL (endedDraw(QPoint)), - this, SLOT (slotEndDragScroll())); - connect (tool, SIGNAL (cancelledShape(QPoint)), - this, SLOT (slotEndDragScroll())); - - connect (tool, SIGNAL (userMessageChanged(QString)), - this, SLOT (recalculateStatusBarMessage())); - connect (tool, SIGNAL (userShapePointsChanged(QPoint,QPoint)), - this, SLOT (recalculateStatusBarShape())); - connect (tool, SIGNAL (userShapeSizeChanged(QSize)), - this, SLOT (recalculateStatusBarShape())); + connect (tool, &kpTool::movedAndAboutToDraw, + this, &kpMainWindow::slotDragScroll); + + connect (tool, &kpTool::endedDraw, + this, &kpMainWindow::slotEndDragScroll); + + connect (tool, &kpTool::cancelledShape, + this, &kpMainWindow::slotEndDragScroll); + + connect (tool, &kpTool::userMessageChanged, + this, &kpMainWindow::recalculateStatusBarMessage); + + connect (tool, &kpTool::userShapePointsChanged, + this, &kpMainWindow::recalculateStatusBarShape); + + connect (tool, &kpTool::userShapeSizeChanged, + this, &kpMainWindow::recalculateStatusBarShape); + recalculateStatusBar (); - connect (d->colorToolBar, SIGNAL (colorsSwapped(kpColor,kpColor)), - tool, SLOT (slotColorsSwappedInternal(kpColor,kpColor))); - connect (d->colorToolBar, SIGNAL (foregroundColorChanged(kpColor)), - tool, SLOT (slotForegroundColorChangedInternal(kpColor))); - connect (d->colorToolBar, SIGNAL (backgroundColorChanged(kpColor)), - tool, SLOT (slotBackgroundColorChangedInternal(kpColor))); - connect (d->colorToolBar, SIGNAL (colorSimilarityChanged(double,int)), - tool, SLOT (slotColorSimilarityChangedInternal(double,int))); + + connect (d->colorToolBar, &kpColorToolBar::colorsSwapped, + tool, &kpTool::slotColorsSwappedInternal); + + connect (d->colorToolBar, &kpColorToolBar::foregroundColorChanged, + tool, &kpTool::slotForegroundColorChangedInternal); + + connect (d->colorToolBar, &kpColorToolBar::backgroundColorChanged, + tool, &kpTool::slotBackgroundColorChangedInternal); + + connect (d->colorToolBar, &kpColorToolBar::colorSimilarityChanged, + tool, &kpTool::slotColorSimilarityChangedInternal); saveLastTool (); diff --git a/mainWindow/kpMainWindow_View.cpp b/mainWindow/kpMainWindow_View.cpp --- a/mainWindow/kpMainWindow_View.cpp +++ b/mainWindow/kpMainWindow_View.cpp @@ -65,8 +65,8 @@ d->actionShowGrid->setText (i18n ("Show &Grid")); ac->setDefaultShortcut (d->actionShowGrid, Qt::CTRL + Qt::Key_G); //d->actionShowGrid->setCheckedState (KGuiItem(i18n ("Hide &Grid"))); - connect (d->actionShowGrid, SIGNAL (triggered(bool)), - SLOT (slotShowGridToggled())); + connect (d->actionShowGrid, &KToggleAction::triggered, + this, &kpMainWindow::slotShowGridToggled); setupViewMenuThumbnailActions (); diff --git a/mainWindow/kpMainWindow_View_Thumbnail.cpp b/mainWindow/kpMainWindow_View_Thumbnail.cpp --- a/mainWindow/kpMainWindow_View_Thumbnail.cpp +++ b/mainWindow/kpMainWindow_View_Thumbnail.cpp @@ -66,24 +66,24 @@ // The second CTRL+H doesn't close the thumbnail. ac->setDefaultShortcut (d->actionShowThumbnail, Qt::CTRL + Qt::Key_H); //d->actionShowThumbnail->setCheckedState (KGuiItem(i18n ("Hide T&humbnail"))); - connect (d->actionShowThumbnail, SIGNAL (triggered(bool)), - SLOT (slotShowThumbnailToggled())); + connect (d->actionShowThumbnail, &KToggleAction::triggered, + this, &kpMainWindow::slotShowThumbnailToggled); // Please do not use setCheckedState() here - it wouldn't make sense d->actionZoomedThumbnail = ac->add ("view_zoomed_thumbnail"); d->actionZoomedThumbnail->setText (i18n ("Zoo&med Thumbnail Mode")); - connect (d->actionZoomedThumbnail, SIGNAL (triggered(bool)), - SLOT (slotZoomedThumbnailToggled())); + connect (d->actionZoomedThumbnail, &KToggleAction::triggered, + this, &kpMainWindow::slotZoomedThumbnailToggled); // For consistency with the above action, don't use setCheckedState() // // Also, don't use "Show Thumbnail Rectangle" because if entire doc // can be seen in scrollView, checking option won't "Show" anything // since rect _surrounds_ entire doc (hence, won't be rendered). d->actionShowThumbnailRectangle = ac->add ("view_show_thumbnail_rectangle"); d->actionShowThumbnailRectangle->setText (i18n ("Enable Thumbnail &Rectangle")); - connect (d->actionShowThumbnailRectangle, SIGNAL (triggered(bool)), - SLOT (slotThumbnailShowRectangleToggled())); + connect (d->actionShowThumbnailRectangle, &KToggleAction::triggered, + this, &kpMainWindow::slotThumbnailShowRectangleToggled); } // private @@ -139,8 +139,8 @@ { d->thumbnailSaveConfigTimer = new QTimer (this); d->thumbnailSaveConfigTimer->setSingleShot (true); - connect (d->thumbnailSaveConfigTimer, SIGNAL (timeout()), - this, SLOT (slotSaveThumbnailGeometry())); + connect (d->thumbnailSaveConfigTimer, &QTimer::timeout, + this, &kpMainWindow::slotSaveThumbnailGeometry); } // (single shot) @@ -436,8 +436,8 @@ #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tconnecting signal thumbnail::windowClosed to destroy slot"; #endif - connect (d->thumbnail, SIGNAL (windowClosed()), - this, SLOT (slotDestroyThumbnailInitatedByUser())); + connect (d->thumbnail, &kpThumbnail::windowClosed, + this, &kpMainWindow::slotDestroyThumbnailInitatedByUser); #if DEBUG_KP_MAIN_WINDOW qCDebug(kpLogMainWindow) << "\t\tDONE"; #endif @@ -457,8 +457,8 @@ // Must be done before hiding the thumbnail to avoid triggering // this signal - re-entering this code. - disconnect (d->thumbnail, SIGNAL (windowClosed()), - this, SLOT (slotDestroyThumbnailInitatedByUser())); + disconnect (d->thumbnail, &kpThumbnail::windowClosed, + this, &kpMainWindow::slotDestroyThumbnailInitatedByUser); // Avoid change/flicker of caption due to view delete // (destroyThumbnailView()) diff --git a/mainWindow/kpMainWindow_View_Zoom.cpp b/mainWindow/kpMainWindow_View_Zoom.cpp --- a/mainWindow/kpMainWindow_View_Zoom.cpp +++ b/mainWindow/kpMainWindow_View_Zoom.cpp @@ -107,7 +107,9 @@ d->actionZoom = ac->add ("view_zoom_to"); d->actionZoom->setText (i18n ("&Zoom")); - connect (d->actionZoom, SIGNAL (triggered(QAction*)), SLOT (slotZoom())); + connect (d->actionZoom, + static_cast(&KSelectAction::triggered), + this, &kpMainWindow::slotZoom); d->actionZoom->setEditable (true); // create the zoom list for the 1st call to zoomTo() below diff --git a/scan/sanedialog.cpp b/scan/sanedialog.cpp --- a/scan/sanedialog.cpp +++ b/scan/sanedialog.cpp @@ -47,8 +47,8 @@ m_ksanew = new KSaneIface::KSaneWidget(this); addPage(m_ksanew, QString()); - connect(m_ksanew, SIGNAL(imageReady(QByteArray&,int,int,int,int)), - this, SLOT(imageReady(QByteArray&,int,int,int,int))); + connect (m_ksanew, &KSaneIface::KSaneWidget::imageReady, + this, &SaneDialog::imageReady); m_openDev = QString(); } diff --git a/tools/flow/kpToolFlowBase.cpp b/tools/flow/kpToolFlowBase.cpp --- a/tools/flow/kpToolFlowBase.cpp +++ b/tools/flow/kpToolFlowBase.cpp @@ -147,8 +147,8 @@ if (haveSquareBrushes ()) { d->toolWidgetEraserSize = tb->toolWidgetEraserSize (); - connect (d->toolWidgetEraserSize, SIGNAL (eraserSizeChanged(int)), - this, SLOT (updateBrushAndCursor())); + connect (d->toolWidgetEraserSize, &kpToolWidgetEraserSize::eraserSizeChanged, + this, &kpToolFlowBase::updateBrushAndCursor); d->toolWidgetEraserSize->show (); updateBrushAndCursor (); @@ -158,8 +158,8 @@ else if (haveDiverseBrushes ()) { d->toolWidgetBrush = tb->toolWidgetBrush (); - connect (d->toolWidgetBrush, SIGNAL (brushChanged()), - this, SLOT (updateBrushAndCursor())); + connect (d->toolWidgetBrush, &kpToolWidgetBrush::brushChanged, + this, &kpToolFlowBase::updateBrushAndCursor); d->toolWidgetBrush->show (); updateBrushAndCursor (); @@ -177,14 +177,14 @@ { if (d->toolWidgetEraserSize) { - disconnect (d->toolWidgetEraserSize, SIGNAL (eraserSizeChanged(int)), - this, SLOT (updateBrushAndCursor())); + disconnect (d->toolWidgetEraserSize, &kpToolWidgetEraserSize::eraserSizeChanged, + this, &kpToolFlowBase::updateBrushAndCursor); d->toolWidgetEraserSize = nullptr; } else if (d->toolWidgetBrush) { - disconnect (d->toolWidgetBrush, SIGNAL (brushChanged()), - this, SLOT (updateBrushAndCursor())); + disconnect (d->toolWidgetBrush, &kpToolWidgetBrush::brushChanged, + this, &kpToolFlowBase::updateBrushAndCursor); d->toolWidgetBrush = nullptr; } diff --git a/tools/flow/kpToolSpraycan.cpp b/tools/flow/kpToolSpraycan.cpp --- a/tools/flow/kpToolSpraycan.cpp +++ b/tools/flow/kpToolSpraycan.cpp @@ -60,7 +60,7 @@ { m_timer = new QTimer (this); m_timer->setInterval (25/*ms*/); - connect (m_timer, SIGNAL (timeout()), this, SLOT (timeoutDraw())); + connect (m_timer, &QTimer::timeout, this, &kpToolSpraycan::timeoutDraw); } //--------------------------------------------------------------------- @@ -80,8 +80,8 @@ Q_ASSERT (tb); m_toolWidgetSpraycanSize = tb->toolWidgetSpraycanSize (); - connect (m_toolWidgetSpraycanSize, SIGNAL (spraycanSizeChanged(int)), - this, SLOT (slotSpraycanSizeChanged(int))); + connect (m_toolWidgetSpraycanSize, &kpToolWidgetSpraycanSize::spraycanSizeChanged, + this, &kpToolSpraycan::slotSpraycanSizeChanged); m_toolWidgetSpraycanSize->show (); kpToolFlowBase::begin (); @@ -92,8 +92,9 @@ { kpToolFlowBase::end (); - disconnect (m_toolWidgetSpraycanSize, SIGNAL (spraycanSizeChanged(int)), - this, SLOT (slotSpraycanSizeChanged(int))); + disconnect (m_toolWidgetSpraycanSize, &kpToolWidgetSpraycanSize::spraycanSizeChanged, + this, &kpToolSpraycan::slotSpraycanSizeChanged); + m_toolWidgetSpraycanSize = nullptr; } diff --git a/tools/kpTool.h b/tools/kpTool.h --- a/tools/kpTool.h +++ b/tools/kpTool.h @@ -262,7 +262,7 @@ double colorSimilarity () const; int processedColorSimilarity () const; -protected slots: +public slots: void slotColorsSwappedInternal (const kpColor &newForegroundColor, const kpColor &newBackgroundColor); void slotForegroundColorChangedInternal (const kpColor &color); @@ -422,7 +422,6 @@ void userShapePointsChanged (const QPoint &startPoint = KP_INVALID_POINT, const QPoint &endPoint = KP_INVALID_POINT); void userShapeSizeChanged (const QSize &size); - void userShapeSizeChanged (int width, int height); public: diff --git a/tools/kpTool.cpp b/tools/kpTool.cpp --- a/tools/kpTool.cpp +++ b/tools/kpTool.cpp @@ -109,7 +109,7 @@ d->action->setWhatsThis(d->description); - connect(d->action, SIGNAL(changed()), this, SIGNAL (actionToolTipChanged())); + connect (d->action, &kpToolAction::changed, this, &kpTool::actionToolTipChanged); } //--------------------------------------------------------------------- diff --git a/tools/kpToolAction.cpp b/tools/kpToolAction.cpp --- a/tools/kpToolAction.cpp +++ b/tools/kpToolAction.cpp @@ -41,11 +41,12 @@ { ac->setDefaultShortcuts(this, shortcut); + if ( receiver && slot ) - connect(this, SIGNAL(triggered(bool)), receiver, slot); + connect (this, SIGNAL(triggered(bool)), receiver, slot); updateToolTip(); - connect(this, SIGNAL(changed()), this, SLOT(updateToolTip())); + connect (this, &kpToolAction::changed, this, &kpToolAction::updateToolTip); ac->addAction(name, this); } diff --git a/tools/kpTool_UserNotifications.cpp b/tools/kpTool_UserNotifications.cpp --- a/tools/kpTool_UserNotifications.cpp +++ b/tools/kpTool_UserNotifications.cpp @@ -149,8 +149,6 @@ d->userShapeSize = size; emit userShapeSizeChanged (d->userShapeSize); - emit userShapeSizeChanged (d->userShapeSize.width (), - d->userShapeSize.height ()); } //--------------------------------------------------------------------- diff --git a/tools/polygonal/kpToolPolygon.cpp b/tools/polygonal/kpToolPolygon.cpp --- a/tools/polygonal/kpToolPolygon.cpp +++ b/tools/polygonal/kpToolPolygon.cpp @@ -118,22 +118,18 @@ Q_ASSERT (tb); d->toolWidgetFillStyle = tb->toolWidgetFillStyle (); - connect (d->toolWidgetFillStyle, - SIGNAL (fillStyleChanged(kpToolWidgetFillStyle::FillStyle)), - this, - SLOT (updateShape())); + connect (d->toolWidgetFillStyle, &kpToolWidgetFillStyle::fillStyleChanged, + this, &kpToolPolygon::updateShape); d->toolWidgetFillStyle->show (); } // public virtual [base kpToolPolygonalBase] void kpToolPolygon::end () { kpToolPolygonalBase::end (); - disconnect (d->toolWidgetFillStyle, - SIGNAL (fillStyleChanged(kpToolWidgetFillStyle::FillStyle)), - this, - SLOT (updateShape())); + disconnect (d->toolWidgetFillStyle, &kpToolWidgetFillStyle::fillStyleChanged, + this, &kpToolPolygon::updateShape); d->toolWidgetFillStyle = nullptr; } diff --git a/tools/polygonal/kpToolPolygonalBase.cpp b/tools/polygonal/kpToolPolygonalBase.cpp --- a/tools/polygonal/kpToolPolygonalBase.cpp +++ b/tools/polygonal/kpToolPolygonalBase.cpp @@ -113,8 +113,8 @@ #endif d->toolWidgetLineWidth = tb->toolWidgetLineWidth (); - connect (d->toolWidgetLineWidth, SIGNAL (lineWidthChanged(int)), - this, SLOT (updateShape())); + connect (d->toolWidgetLineWidth, &kpToolWidgetLineWidth::lineWidthChanged, + this, &kpToolPolygonalBase::updateShape); d->toolWidgetLineWidth->show (); viewManager ()->setCursor (QCursor (Qt::ArrowCursor)); @@ -132,10 +132,8 @@ // TODO: needed? endShape (); - disconnect (d->toolWidgetLineWidth, - SIGNAL (lineWidthChanged(int)), - this, - SLOT (updateShape())); + disconnect (d->toolWidgetLineWidth, &kpToolWidgetLineWidth::lineWidthChanged, + this, &kpToolPolygonalBase::updateShape); d->toolWidgetLineWidth = nullptr; viewManager ()->unsetCursor (); diff --git a/tools/rectangular/kpToolRectangularBase.cpp b/tools/rectangular/kpToolRectangularBase.cpp --- a/tools/rectangular/kpToolRectangularBase.cpp +++ b/tools/rectangular/kpToolRectangularBase.cpp @@ -134,17 +134,13 @@ #endif d->toolWidgetLineWidth = tb->toolWidgetLineWidth (); - connect (d->toolWidgetLineWidth, - SIGNAL (lineWidthChanged(int)), - this, - SLOT (slotLineWidthChanged())); + connect (d->toolWidgetLineWidth, &kpToolWidgetLineWidth::lineWidthChanged, + this, &kpToolRectangularBase::slotLineWidthChanged); d->toolWidgetLineWidth->show (); d->toolWidgetFillStyle = tb->toolWidgetFillStyle (); - connect (d->toolWidgetFillStyle, - SIGNAL (fillStyleChanged(kpToolWidgetFillStyle::FillStyle)), - this, - SLOT (slotFillStyleChanged())); + connect (d->toolWidgetFillStyle, &kpToolWidgetFillStyle::fillStyleChanged, + this, &kpToolRectangularBase::slotFillStyleChanged); d->toolWidgetFillStyle->show (); viewManager ()->setCursor (QCursor (Qt::ArrowCursor)); @@ -163,19 +159,15 @@ if (d->toolWidgetLineWidth) { - disconnect (d->toolWidgetLineWidth, - SIGNAL (lineWidthChanged(int)), - this, - SLOT (slotLineWidthChanged())); + disconnect (d->toolWidgetLineWidth, &kpToolWidgetLineWidth::lineWidthChanged, + this, &kpToolRectangularBase::slotLineWidthChanged); d->toolWidgetLineWidth = nullptr; } if (d->toolWidgetFillStyle) { - disconnect (d->toolWidgetFillStyle, - SIGNAL (fillStyleChanged(kpToolWidgetFillStyle::FillStyle)), - this, - SLOT (slotFillStyleChanged())); + disconnect (d->toolWidgetFillStyle, &kpToolWidgetFillStyle::fillStyleChanged, + this, &kpToolRectangularBase::slotFillStyleChanged); d->toolWidgetFillStyle = nullptr; } diff --git a/tools/selection/kpAbstractSelectionTool.cpp b/tools/selection/kpAbstractSelectionTool.cpp --- a/tools/selection/kpAbstractSelectionTool.cpp +++ b/tools/selection/kpAbstractSelectionTool.cpp @@ -288,8 +288,9 @@ d->toolWidgetOpaqueOrTransparent = tb->toolWidgetOpaqueOrTransparent (); Q_ASSERT (d->toolWidgetOpaqueOrTransparent); - connect (d->toolWidgetOpaqueOrTransparent, SIGNAL (isOpaqueChanged(bool)), - this, SLOT (slotIsOpaqueChanged(bool))); + connect (d->toolWidgetOpaqueOrTransparent, + &kpToolWidgetOpaqueOrTransparent::isOpaqueChanged, + this, &kpAbstractSelectionTool::slotIsOpaqueChanged); d->toolWidgetOpaqueOrTransparent->show (); /*virtual*/setSelectionBorderForHaventBegunDraw (); @@ -332,8 +333,9 @@ Q_ASSERT (d->toolWidgetOpaqueOrTransparent); - disconnect (d->toolWidgetOpaqueOrTransparent, SIGNAL (isOpaqueChanged(bool)), - this, SLOT (slotIsOpaqueChanged(bool))); + disconnect (d->toolWidgetOpaqueOrTransparent, + &kpToolWidgetOpaqueOrTransparent::isOpaqueChanged, + this, &kpAbstractSelectionTool::slotIsOpaqueChanged); d->toolWidgetOpaqueOrTransparent = nullptr; diff --git a/tools/selection/kpAbstractSelectionTool_Create.cpp b/tools/selection/kpAbstractSelectionTool_Create.cpp --- a/tools/selection/kpAbstractSelectionTool_Create.cpp +++ b/tools/selection/kpAbstractSelectionTool_Create.cpp @@ -62,8 +62,8 @@ { d->createNOPTimer = new QTimer (this); d->createNOPTimer->setSingleShot (true); - connect (d->createNOPTimer, SIGNAL (timeout()), - this, SLOT (delayedDrawCreate())); + connect (d->createNOPTimer, &QTimer::timeout, + this, &kpAbstractSelectionTool::delayedDrawCreate); } // private diff --git a/tools/selection/kpAbstractSelectionTool_Move.cpp b/tools/selection/kpAbstractSelectionTool_Move.cpp --- a/tools/selection/kpAbstractSelectionTool_Move.cpp +++ b/tools/selection/kpAbstractSelectionTool_Move.cpp @@ -66,8 +66,8 @@ d->RMBMoveUpdateGUITimer = new QTimer (this); d->RMBMoveUpdateGUITimer->setSingleShot (true); - connect (d->RMBMoveUpdateGUITimer, SIGNAL (timeout()), - this, SLOT (slotRMBMoveUpdateGUI())); + connect (d->RMBMoveUpdateGUITimer, &QTimer::timeout, + this, &kpAbstractSelectionTool::slotRMBMoveUpdateGUI); } //--------------------------------------------------------------------- diff --git a/views/kpUnzoomedThumbnailView.cpp b/views/kpUnzoomedThumbnailView.cpp --- a/views/kpUnzoomedThumbnailView.cpp +++ b/views/kpUnzoomedThumbnailView.cpp @@ -63,10 +63,8 @@ { if (buddyViewScrollableContainer ()) { - connect (buddyViewScrollableContainer (), - SIGNAL (contentsMoved()), - this, - SLOT (adjustToEnvironment())); + connect (buddyViewScrollableContainer(), &kpViewScrollableContainer::contentsMoved, + this, &kpUnzoomedThumbnailView::adjustToEnvironment); } // Call to virtual function - this is why the class is sealed diff --git a/views/kpView.cpp b/views/kpView.cpp --- a/views/kpView.cpp +++ b/views/kpView.cpp @@ -276,55 +276,65 @@ // Got these connect statements by analysing deps of // updateBuddyViewScrollableContainerRectangle() rect update code. - connect (this, SIGNAL (zoomLevelChanged(int,int)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); - connect (this, SIGNAL (originChanged(QPoint)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); + connect (this, &kpView::zoomLevelChanged, + this, &kpView::updateBuddyViewScrollableContainerRectangle); + + connect (this, &kpView::originChanged, + this, &kpView::updateBuddyViewScrollableContainerRectangle); if (buddyViewScrollableContainer ()) { - connect (buddyViewScrollableContainer (), SIGNAL (contentsMoved()), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); - connect (buddyViewScrollableContainer (), SIGNAL (resized()), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); + connect (buddyViewScrollableContainer (), + &kpViewScrollableContainer::contentsMoved, + this, &kpView::updateBuddyViewScrollableContainerRectangle); + + connect (buddyViewScrollableContainer (), &kpViewScrollableContainer::resized, + this, &kpView::updateBuddyViewScrollableContainerRectangle); } if (buddyView ()) { - connect (buddyView (), SIGNAL (zoomLevelChanged(int,int)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); - connect (buddyView (), SIGNAL (originChanged(QPoint)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); + connect (buddyView (), &kpView::zoomLevelChanged, + this, &kpView::updateBuddyViewScrollableContainerRectangle); + + connect (buddyView (), &kpView::originChanged, + this, &kpView::updateBuddyViewScrollableContainerRectangle); - connect (buddyView (), SIGNAL (sizeChanged(int,int)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); + connect (buddyView (), + static_cast(&kpView::sizeChanged), + this, &kpView::updateBuddyViewScrollableContainerRectangle); } } else { - disconnect (this, SIGNAL (zoomLevelChanged(int,int)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); - disconnect (this, SIGNAL (originChanged(QPoint)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); + disconnect (this, &kpView::zoomLevelChanged, + this, &kpView::updateBuddyViewScrollableContainerRectangle); + + disconnect (this, &kpView::originChanged, + this, &kpView::updateBuddyViewScrollableContainerRectangle); if (buddyViewScrollableContainer ()) { - disconnect (buddyViewScrollableContainer (), SIGNAL (contentsMoved()), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); - disconnect (buddyViewScrollableContainer (), SIGNAL (resized()), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); + disconnect (buddyViewScrollableContainer (), + &kpViewScrollableContainer::contentsMoved, + this, &kpView::updateBuddyViewScrollableContainerRectangle); + + disconnect (buddyViewScrollableContainer (), &kpViewScrollableContainer::resized, + this, &kpView::updateBuddyViewScrollableContainerRectangle); } if (buddyView ()) { - disconnect (buddyView (), SIGNAL (zoomLevelChanged(int,int)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); - disconnect (buddyView (), SIGNAL (originChanged(QPoint)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); + disconnect (buddyView (), &kpView::zoomLevelChanged, + this, &kpView::updateBuddyViewScrollableContainerRectangle); + + disconnect (buddyView (), &kpView::originChanged, + this, &kpView::updateBuddyViewScrollableContainerRectangle); - disconnect (buddyView (), SIGNAL (sizeChanged(int,int)), - this, SLOT (updateBuddyViewScrollableContainerRectangle())); + disconnect (buddyView (), + static_cast(&kpView::sizeChanged), + this, &kpView::updateBuddyViewScrollableContainerRectangle); } } diff --git a/views/manager/kpViewManager.h b/views/manager/kpViewManager.h --- a/views/manager/kpViewManager.h +++ b/views/manager/kpViewManager.h @@ -238,9 +238,8 @@ void updateViewRectangleEdges (kpView *v, const QRect &viewRect); - void updateViews (); void updateViews (const QRect &docRect); - void updateViews (int x, int y, int w, int h); + public slots: void adjustViewsToEnvironment (); diff --git a/views/manager/kpViewManager_TextCursor.cpp b/views/manager/kpViewManager_TextCursor.cpp --- a/views/manager/kpViewManager_TextCursor.cpp +++ b/views/manager/kpViewManager_TextCursor.cpp @@ -92,8 +92,7 @@ { d->textCursorBlinkTimer = new QTimer (this); d->textCursorBlinkTimer->setSingleShot (true); - connect (d->textCursorBlinkTimer, SIGNAL (timeout()), - this, SLOT (slotTextCursorBlink())); + connect (d->textCursorBlinkTimer, &QTimer::timeout, this, &kpViewManager::slotTextCursorBlink); d->textCursorBlinkState = true; slotTextCursorBlink (); diff --git a/views/manager/kpViewManager_ViewUpdates.cpp b/views/manager/kpViewManager_ViewUpdates.cpp --- a/views/manager/kpViewManager_ViewUpdates.cpp +++ b/views/manager/kpViewManager_ViewUpdates.cpp @@ -186,15 +186,6 @@ } } - -// public slot -void kpViewManager::updateViews () -{ - kpDocument *doc = document (); - if (doc) - updateViews (QRect (0, 0, doc->width (), doc->height ())); -} - // public slot void kpViewManager::updateViews (const QRect &docRect) { @@ -238,12 +229,6 @@ } } -// public slot -void kpViewManager::updateViews (int x, int y, int w, int h) -{ - updateViews (QRect (x, y, w, h)); -} - // public slot void kpViewManager::adjustViewsToEnvironment () diff --git a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp --- a/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp +++ b/widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp @@ -60,15 +60,16 @@ setWhatsThis (WhatsThisWithClickInstructions ()); - connect (this, SIGNAL (clicked()), SLOT (openDialog())); + connect (this, &kpColorSimilarityToolBarItem::clicked, + this, &kpColorSimilarityToolBarItem::openDialog); KConfigGroup cfg (KSharedConfig::openConfig (), kpSettingsGroupGeneral); setColorSimilarityInternal (cfg.readEntry (kpSettingColorSimilarity, 0.0), false/*don't write config*/); m_flashTimer->setInterval (100/*ms*/); - connect (m_flashTimer, SIGNAL (timeout()), - SLOT (slotFlashTimerTimeout())); + connect (m_flashTimer, &QTimer::timeout, + this, &kpColorSimilarityToolBarItem::slotFlashTimerTimeout); } //--------------------------------------------------------------------- diff --git a/widgets/imagelib/effects/kpEffectBalanceWidget.cpp b/widgets/imagelib/effects/kpEffectBalanceWidget.cpp --- a/widgets/imagelib/effects/kpEffectBalanceWidget.cpp +++ b/widgets/imagelib/effects/kpEffectBalanceWidget.cpp @@ -127,29 +127,29 @@ // (no need for settingsChangedDelayed() since BCG effect is so fast :)) - connect (m_brightnessInput, SIGNAL (valueChanged (int)), - this, SIGNAL (settingsChangedNoWaitCursor ())); - connect (m_contrastInput, SIGNAL (valueChanged (int)), - this, SIGNAL (settingsChangedNoWaitCursor ())); - - connect (m_gammaInput, SIGNAL (valueChanged (int)), - this, SLOT (recalculateGammaLabel ())); - connect (m_gammaInput, SIGNAL (valueChanged (int)), - this, SIGNAL (settingsChangedNoWaitCursor ())); - - connect (m_channelsComboBox, SIGNAL (activated (int)), - this, SIGNAL (settingsChanged ())); - - connect (brightnessResetPushButton, SIGNAL (clicked ()), - this, SLOT (resetBrightness ())); - connect (contrastResetPushButton, SIGNAL (clicked ()), - this, SLOT (resetContrast ())); - connect (gammaResetPushButton, SIGNAL (clicked ()), - this, SLOT (resetGamma ())); - - connect (resetPushButton, SIGNAL (clicked ()), - this, SLOT (resetAll ())); - + connect (m_brightnessInput, &kpIntNumInput::valueChanged, + this, &kpEffectBalanceWidget::settingsChangedNoWaitCursor); + connect (m_contrastInput, &kpIntNumInput::valueChanged, + this, &kpEffectBalanceWidget::settingsChangedNoWaitCursor); + + connect (m_gammaInput, &kpIntNumInput::valueChanged, + this, &kpEffectBalanceWidget::recalculateGammaLabel); + connect (m_gammaInput, &kpIntNumInput::valueChanged, + this, &kpEffectBalanceWidget::settingsChangedNoWaitCursor); + + connect (m_channelsComboBox, + static_cast(&QComboBox::activated), + this, &kpEffectBalanceWidget::settingsChanged); + + connect (brightnessResetPushButton, &QPushButton::clicked, + this, &kpEffectBalanceWidget::resetBrightness); + connect (contrastResetPushButton, &QPushButton::clicked, + this, &kpEffectBalanceWidget::resetContrast); + connect (gammaResetPushButton, &QPushButton::clicked, + this, &kpEffectBalanceWidget::resetGamma); + + connect (resetPushButton, &QPushButton::clicked, + this, &kpEffectBalanceWidget::resetAll); recalculateGammaLabel (); } diff --git a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp --- a/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp +++ b/widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp @@ -102,11 +102,11 @@ lay->setColumnStretch (1, 1); - connect (m_amountInput, SIGNAL (valueChanged (int)), - this, SIGNAL (settingsChangedDelayed ())); + connect (m_amountInput, &kpIntNumInput::valueChanged, + this, &kpEffectBlurSharpenWidget::settingsChangedDelayed); - connect (m_amountInput, SIGNAL (valueChanged (int)), - this, SLOT (slotUpdateTypeLabel ())); + connect (m_amountInput, &kpIntNumInput::valueChanged, + this, &kpEffectBlurSharpenWidget::slotUpdateTypeLabel); } kpEffectBlurSharpenWidget::~kpEffectBlurSharpenWidget () diff --git a/widgets/imagelib/effects/kpEffectEmbossWidget.cpp b/widgets/imagelib/effects/kpEffectEmbossWidget.cpp --- a/widgets/imagelib/effects/kpEffectEmbossWidget.cpp +++ b/widgets/imagelib/effects/kpEffectEmbossWidget.cpp @@ -66,8 +66,8 @@ lay->setColumnStretch (1, 1); - connect (m_amountInput, SIGNAL (valueChanged(int)), - this, SIGNAL (settingsChanged())); + connect (m_amountInput, &kpIntNumInput::valueChanged, + this, &kpEffectEmbossWidget::settingsChanged); #endif m_enableCheckBox = new QCheckBox (i18n ("E&nable"), this); @@ -79,8 +79,8 @@ // (settingsChangedDelayed() instead of settingsChanged() so that the // user can quickly press OK to apply effect to document directly and // not have to wait for the also slow preview) - connect (m_enableCheckBox, SIGNAL (toggled(bool)), - this, SIGNAL (settingsChangedDelayed())); + connect (m_enableCheckBox, &QCheckBox::toggled, + this, &kpEffectEmbossWidget::settingsChangedDelayed); } kpEffectEmbossWidget::~kpEffectEmbossWidget () diff --git a/widgets/imagelib/effects/kpEffectFlattenWidget.cpp b/widgets/imagelib/effects/kpEffectFlattenWidget.cpp --- a/widgets/imagelib/effects/kpEffectFlattenWidget.cpp +++ b/widgets/imagelib/effects/kpEffectFlattenWidget.cpp @@ -84,13 +84,14 @@ lay->addWidget (m_color2Button); - connect (m_enableCheckBox, SIGNAL (toggled(bool)), - this, SLOT (slotEnableChanged(bool))); + connect (m_enableCheckBox, &QCheckBox::toggled, + this, &kpEffectFlattenWidget::slotEnableChanged); - connect (m_color1Button, SIGNAL (changed(QColor)), - this, SIGNAL (settingsChanged())); - connect (m_color2Button, SIGNAL (changed(QColor)), - this, SIGNAL (settingsChanged())); + connect (m_color1Button, &KColorButton::changed, + this, &kpEffectFlattenWidget::settingsChanged); + + connect (m_color2Button, &KColorButton::changed, + this, &kpEffectFlattenWidget::settingsChanged); } kpEffectFlattenWidget::~kpEffectFlattenWidget () diff --git a/widgets/imagelib/effects/kpEffectHSVWidget.cpp b/widgets/imagelib/effects/kpEffectHSVWidget.cpp --- a/widgets/imagelib/effects/kpEffectHSVWidget.cpp +++ b/widgets/imagelib/effects/kpEffectHSVWidget.cpp @@ -74,14 +74,14 @@ lay->setColumnStretch (1, 1); - connect (m_hueInput, SIGNAL (valueChanged(double)), - this, SIGNAL (settingsChangedDelayed())); + connect (m_hueInput, &kpDoubleNumInput::valueChanged, + this, &kpEffectHSVWidget::settingsChangedDelayed); - connect (m_saturationInput, SIGNAL (valueChanged(double)), - this, SIGNAL (settingsChangedDelayed())); + connect (m_saturationInput, &kpDoubleNumInput::valueChanged, + this, &kpEffectHSVWidget::settingsChangedDelayed); - connect (m_valueInput, SIGNAL (valueChanged(double)), - this, SIGNAL (settingsChangedDelayed())); + connect (m_valueInput, &kpDoubleNumInput::valueChanged, + this, &kpEffectHSVWidget::settingsChangedDelayed); } kpEffectHSVWidget::~kpEffectHSVWidget () diff --git a/widgets/imagelib/effects/kpEffectInvertWidget.cpp b/widgets/imagelib/effects/kpEffectInvertWidget.cpp --- a/widgets/imagelib/effects/kpEffectInvertWidget.cpp +++ b/widgets/imagelib/effects/kpEffectInvertWidget.cpp @@ -86,15 +86,17 @@ m_inSignalHandler = false; - connect (m_redCheckBox, SIGNAL (toggled(bool)), - this, SLOT (slotRGBCheckBoxToggled())); - connect (m_greenCheckBox, SIGNAL (toggled(bool)), - this, SLOT (slotRGBCheckBoxToggled())); - connect (m_blueCheckBox, SIGNAL (toggled(bool)), - this, SLOT (slotRGBCheckBoxToggled())); - - connect (m_allCheckBox, SIGNAL (toggled(bool)), - this, SLOT (slotAllCheckBoxToggled())); + connect (m_redCheckBox, &QCheckBox::toggled, + this, &kpEffectInvertWidget::slotRGBCheckBoxToggled); + + connect (m_greenCheckBox, &QCheckBox::toggled, + this, &kpEffectInvertWidget::slotRGBCheckBoxToggled); + + connect (m_blueCheckBox, &QCheckBox::toggled, + this, &kpEffectInvertWidget::slotRGBCheckBoxToggled); + + connect (m_allCheckBox, &QCheckBox::toggled, + this, &kpEffectInvertWidget::slotAllCheckBoxToggled); } kpEffectInvertWidget::~kpEffectInvertWidget () diff --git a/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp b/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp --- a/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp +++ b/widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp @@ -85,16 +85,20 @@ lay->addWidget (m_8BitDitheredRadioButton); lay->addWidget (m_24BitRadioButton); - connect (m_blackAndWhiteRadioButton, SIGNAL (toggled(bool)), - this, SIGNAL (settingsChanged())); - connect (m_blackAndWhiteDitheredRadioButton, SIGNAL (toggled(bool)), - this, SIGNAL (settingsChanged())); - connect (m_8BitRadioButton, SIGNAL (toggled(bool)), - this, SIGNAL (settingsChanged())); - connect (m_8BitDitheredRadioButton, SIGNAL (toggled(bool)), - this, SIGNAL (settingsChanged())); - connect (m_24BitRadioButton, SIGNAL (toggled(bool)), - this, SIGNAL (settingsChanged())); + connect (m_blackAndWhiteRadioButton, &QRadioButton::toggled, + this, &kpEffectReduceColorsWidget::settingsChanged); + + connect (m_blackAndWhiteDitheredRadioButton, &QRadioButton::toggled, + this, &kpEffectReduceColorsWidget::settingsChanged); + + connect (m_8BitRadioButton, &QRadioButton::toggled, + this, &kpEffectReduceColorsWidget::settingsChanged); + + connect (m_8BitDitheredRadioButton, &QRadioButton::toggled, + this, &kpEffectReduceColorsWidget::settingsChanged); + + connect (m_24BitRadioButton, &QRadioButton::toggled, + this, &kpEffectReduceColorsWidget::settingsChanged); } //--------------------------------------------------------------------- diff --git a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp --- a/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp +++ b/widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp @@ -76,11 +76,11 @@ lay->setColumnStretch (1, 1); - connect (m_granularityInput, SIGNAL (valueChanged(double)), - this, SIGNAL (settingsChangedDelayed())); + connect (m_granularityInput, &kpDoubleNumInput::valueChanged, + this, &kpEffectToneEnhanceWidget::settingsChangedDelayed); - connect (m_amountInput, SIGNAL (valueChanged(double)), - this, SIGNAL (settingsChangedDelayed())); + connect (m_amountInput, &kpDoubleNumInput::valueChanged, + this, &kpEffectToneEnhanceWidget::settingsChangedDelayed); } } diff --git a/widgets/kpColorCells.cpp b/widgets/kpColorCells.cpp --- a/widgets/kpColorCells.cpp +++ b/widgets/kpColorCells.cpp @@ -175,13 +175,14 @@ // containing widgets to get too big. Override it. setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum); + connect (this, &kpColorCells::colorSelectedWhitButton, + this, &kpColorCells::slotColorSelected); - connect (this, SIGNAL (colorSelected(int,QColor,Qt::MouseButton)), - SLOT (slotColorSelected(int,QColor,Qt::MouseButton))); - connect (this, SIGNAL (colorDoubleClicked(int,QColor)), - SLOT (slotColorDoubleClicked(int,QColor))); - connect (this, SIGNAL (colorChanged(int,QColor)), - SLOT (slotColorChanged(int,QColor))); + connect (this, &kpColorCells::colorDoubleClicked, + this, &kpColorCells::slotColorDoubleClicked); + + connect (this, &kpColorCells::colorChanged, + this, &kpColorCells::slotColorChanged); setColorCollection (DefaultColorCollection ()); diff --git a/widgets/kpColorPalette.cpp b/widgets/kpColorPalette.cpp --- a/widgets/kpColorPalette.cpp +++ b/widgets/kpColorPalette.cpp @@ -58,16 +58,18 @@ d->boxLayout = nullptr; d->transparentColorCell = new kpTransparentColorCell (this); - connect (d->transparentColorCell, SIGNAL (foregroundColorChanged(kpColor)), - this, SIGNAL (foregroundColorChanged(kpColor))); - connect (d->transparentColorCell, SIGNAL (backgroundColorChanged(kpColor)), - this, SIGNAL (backgroundColorChanged(kpColor))); + connect (d->transparentColorCell, &kpTransparentColorCell::foregroundColorChanged, + this, &kpColorPalette::foregroundColorChanged); + + connect (d->transparentColorCell, &kpTransparentColorCell::backgroundColorChanged, + this, &kpColorPalette::backgroundColorChanged); d->colorCells = new kpColorCells (this); - connect (d->colorCells, SIGNAL (foregroundColorChanged(kpColor)), - this, SIGNAL (foregroundColorChanged(kpColor))); - connect (d->colorCells, SIGNAL (backgroundColorChanged(kpColor)), - this, SIGNAL (backgroundColorChanged(kpColor))); + connect (d->colorCells, &kpColorCells::foregroundColorChanged, + this, &kpColorPalette::foregroundColorChanged); + + connect (d->colorCells, &kpColorCells::backgroundColorChanged, + this, &kpColorPalette::backgroundColorChanged); setOrientation (o); } diff --git a/widgets/kpDocumentSaveOptionsWidget.cpp b/widgets/kpDocumentSaveOptionsWidget.cpp --- a/widgets/kpDocumentSaveOptionsWidget.cpp +++ b/widgets/kpDocumentSaveOptionsWidget.cpp @@ -122,29 +122,33 @@ lay->addWidget (m_previewButton, 0/*stretch*/, Qt::AlignRight); - connect (m_colorDepthCombo, SIGNAL (activated(int)), - this, SLOT (slotColorDepthSelected())); - connect (m_colorDepthCombo, SIGNAL (activated(int)), - this, SLOT (updatePreview())); + connect (m_colorDepthCombo, + static_cast(&QComboBox::activated), + this, &kpDocumentSaveOptionsWidget::slotColorDepthSelected); - connect (m_qualityInput, SIGNAL (valueChanged(int)), - this, SLOT (updatePreviewDelayed())); + connect (m_colorDepthCombo, + static_cast(&QComboBox::activated), + this, &kpDocumentSaveOptionsWidget::updatePreview); - connect (m_previewButton, SIGNAL (toggled(bool)), - this, SLOT (showPreview(bool))); + connect (m_qualityInput, + static_cast(&QSpinBox::valueChanged), + this, &kpDocumentSaveOptionsWidget::updatePreviewDelayed); + + connect (m_previewButton, &QPushButton::toggled, + this, &kpDocumentSaveOptionsWidget::showPreview); m_updatePreviewDelay = 200/*ms*/; m_updatePreviewTimer = new QTimer (this); m_updatePreviewTimer->setSingleShot (true); - connect (m_updatePreviewTimer, SIGNAL (timeout()), - this, SLOT (updatePreview())); + connect (m_updatePreviewTimer, &QTimer::timeout, + this, &kpDocumentSaveOptionsWidget::updatePreview); m_updatePreviewDialogLastRelativeGeometryTimer = new QTimer (this); - connect (m_updatePreviewDialogLastRelativeGeometryTimer, SIGNAL (timeout()), - this, SLOT (updatePreviewDialogLastRelativeGeometry())); - + connect (m_updatePreviewDialogLastRelativeGeometryTimer, + &QTimer::timeout, + this, &kpDocumentSaveOptionsWidget::updatePreviewDialogLastRelativeGeometry); setMode (None); @@ -533,8 +537,8 @@ m_previewDialog->setObjectName( QLatin1String( "previewSaveDialog" ) ); updatePreview (); - connect (m_previewDialog, SIGNAL (finished()), - this, SLOT (hidePreview())); + connect (m_previewDialog, &kpDocumentSaveOptionsPreviewDialog::finished, + this, &kpDocumentSaveOptionsWidget::hidePreview); KConfigGroup cfg (KSharedConfig::openConfig (), kpSettingsGroupPreviewSave); @@ -627,10 +631,11 @@ updatePreviewDialogLastRelativeGeometry (); - connect (m_previewDialog, SIGNAL (moved()), - this, SLOT (updatePreviewDialogLastRelativeGeometry())); - connect (m_previewDialog, SIGNAL (resized()), - this, SLOT (updatePreviewDialogLastRelativeGeometry())); + connect (m_previewDialog, &kpDocumentSaveOptionsPreviewDialog::moved, + this, &kpDocumentSaveOptionsWidget::updatePreviewDialogLastRelativeGeometry); + + connect (m_previewDialog, &kpDocumentSaveOptionsPreviewDialog::resized, + this, &kpDocumentSaveOptionsWidget::updatePreviewDialogLastRelativeGeometry); m_updatePreviewDialogLastRelativeGeometryTimer->start (200/*ms*/); } diff --git a/widgets/toolbars/kpColorToolBar.cpp b/widgets/toolbars/kpColorToolBar.cpp --- a/widgets/toolbars/kpColorToolBar.cpp +++ b/widgets/toolbars/kpColorToolBar.cpp @@ -66,33 +66,42 @@ // This holds the current global foreground and background colors, for // tools. m_dualColorButton = new kpDualColorButton (base); - connect (m_dualColorButton, SIGNAL (colorsSwapped(kpColor,kpColor)), - this, SIGNAL (colorsSwapped(kpColor,kpColor))); - connect (m_dualColorButton, SIGNAL (foregroundColorChanged(kpColor)), - this, SIGNAL (foregroundColorChanged(kpColor))); - connect (m_dualColorButton, SIGNAL (backgroundColorChanged(kpColor)), - this, SIGNAL (backgroundColorChanged(kpColor))); + connect (m_dualColorButton, &kpDualColorButton::colorsSwapped, + this, &kpColorToolBar::colorsSwapped); + + connect (m_dualColorButton, &kpDualColorButton::foregroundColorChanged, + this, &kpColorToolBar::foregroundColorChanged); + + connect (m_dualColorButton, &kpDualColorButton::backgroundColorChanged, + this, &kpColorToolBar::backgroundColorChanged); + m_boxLayout->addWidget (m_dualColorButton, 0/*stretch*/, Qt::AlignVCenter); m_colorPalette = new kpColorPalette (base); - connect (m_colorPalette, SIGNAL (foregroundColorChanged(kpColor)), - m_dualColorButton, SLOT (setForegroundColor(kpColor))); - connect (m_colorPalette, SIGNAL (backgroundColorChanged(kpColor)), - m_dualColorButton, SLOT (setBackgroundColor(kpColor))); - - connect (m_colorPalette->colorCells (), SIGNAL (isModifiedChanged(bool)), - SLOT (updateNameOrUrlLabel())); - connect (m_colorPalette->colorCells (), SIGNAL (urlChanged(QUrl)), - SLOT (updateNameOrUrlLabel())); - connect (m_colorPalette->colorCells (), SIGNAL (nameChanged(QString)), - SLOT (updateNameOrUrlLabel())); + connect (m_colorPalette, &kpColorPalette::foregroundColorChanged, + m_dualColorButton, &kpDualColorButton::setForegroundColor); + + connect (m_colorPalette, &kpColorPalette::backgroundColorChanged, + m_dualColorButton, &kpDualColorButton::setBackgroundColor); + + connect (m_colorPalette->colorCells (), &kpColorCells::isModifiedChanged, + this, &kpColorToolBar::updateNameOrUrlLabel); + + connect (m_colorPalette->colorCells (), &kpColorCells::urlChanged, + this, &kpColorToolBar::updateNameOrUrlLabel); + + connect (m_colorPalette->colorCells (), &kpColorCells::nameChanged, + this, &kpColorToolBar::updateNameOrUrlLabel); + updateNameOrUrlLabel (); m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/); m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (base); - connect (m_colorSimilarityToolBarItem, SIGNAL (colorSimilarityChanged(double,int)), - this, SIGNAL (colorSimilarityChanged(double,int))); + connect (m_colorSimilarityToolBarItem, + &kpColorSimilarityToolBarItem::colorSimilarityChanged, + this, &kpColorToolBar::colorSimilarityChanged); + m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/); // Pad out all the horizontal space on the right of the Color Tool Bar so that diff --git a/widgets/toolbars/kpToolToolBar.cpp b/widgets/toolbars/kpToolToolBar.cpp --- a/widgets/toolbars/kpToolToolBar.cpp +++ b/widgets/toolbars/kpToolToolBar.cpp @@ -100,26 +100,28 @@ foreach(kpToolWidgetBase *w, m_toolWidgets) { - connect(w, SIGNAL(optionSelected(int,int)), - this, SIGNAL(toolWidgetOptionSelected())); + connect (w, &kpToolWidgetBase::optionSelected, + this, &kpToolToolBar::toolWidgetOptionSelected); } adjustToOrientation(orientation()); - connect(this, SIGNAL(orientationChanged(Qt::Orientation)), - this, SLOT(adjustToOrientation(Qt::Orientation))); + connect (this, &kpToolToolBar::orientationChanged, + this, &kpToolToolBar::adjustToOrientation); m_buttonGroup = new QButtonGroup (this); - connect (m_buttonGroup, SIGNAL (buttonClicked(int)), SLOT (slotToolButtonClicked())); + connect (m_buttonGroup, + static_cast(&QButtonGroup::buttonClicked), + this, &kpToolToolBar::slotToolButtonClicked); hideAllToolWidgets (); addWidget(m_baseWidget); - connect(this, SIGNAL(iconSizeChanged(QSize)), - this, SLOT(slotIconSizeChanged(QSize))); + connect (this, &kpToolToolBar::iconSizeChanged, + this, &kpToolToolBar::slotIconSizeChanged); - connect(this, SIGNAL(toolButtonStyleChanged(Qt::ToolButtonStyle)), - this, SLOT(slotToolButtonStyleChanged(Qt::ToolButtonStyle))); + connect (this, &kpToolToolBar::toolButtonStyleChanged, + this, &kpToolToolBar::slotToolButtonStyleChanged); } //--------------------------------------------------------------------- @@ -157,8 +159,8 @@ m_toolButtons.append(b); - connect (tool, SIGNAL (actionActivated()), - this, SLOT (slotToolActionActivated())); + connect (tool, &kpTool::actionActivated, + this, &kpToolToolBar::slotToolActionActivated); adjustSizeConstraint(); } @@ -173,8 +175,8 @@ if ( m_toolButtons[i]->tool() == tool ) { delete m_toolButtons.takeAt(i); - disconnect(tool, SIGNAL(actionActivated()), - this, SLOT(slotToolActionActivated())); + disconnect (tool, &kpTool::actionActivated, + this, &kpToolToolBar::slotToolActionActivated); return; } }