[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [spectacle] /: Use KDEFrameworkCompilerSettings
From: Laurent Montel <null () kde ! org>
Date: 2018-09-21 19:22:01
Message-ID: E1g3R05-0004rh-U1 () code ! kde ! org
[Download RAW message or body]
Git commit 998ecd3d2dde8395d304e953ec1213ccf7b027ee by Laurent Montel.
Committed on 21/09/2018 at 19:21.
Pushed by mlaurent into branch 'master'.
Use KDEFrameworkCompilerSettings
M +1 -4 CMakeLists.txt
M +2 -2 src/ExportManager.h
M +2 -2 src/Gui/ExportMenu.h
M +1 -1 src/Gui/KSImageWidget.h
M +3 -3 src/Gui/KSMainWindow.h
M +3 -3 src/Gui/KSWidget.h
M +2 -2 src/Gui/SettingsDialog/GeneralOptionsPage.h
M +2 -2 src/Gui/SettingsDialog/SaveOptionsPage.h
M +2 -2 src/Gui/SettingsDialog/SettingsDialog.h
M +1 -1 src/Gui/SettingsDialog/SettingsPage.h
M +1 -1 src/Gui/SmartSpinBox.h
M +8 -8 src/KipiInterface/KSGKipiImageCollectionShared.h
M +5 -5 src/KipiInterface/KSGKipiInfoShared.h
M +2 -2 src/PlatformBackends/ImageGrabber.h
M +2 -2 src/PlatformBackends/X11ImageGrabber.h
M +2 -2 src/QuickEditor/QuickEditor.h
M +1 -1 src/SpectacleConfig.h
M +2 -2 src/SpectacleCore.h
M +2 -2 src/SpectacleDBusAdapter.h
https://commits.kde.org/spectacle/998ecd3d2dde8395d304e953ec1213ccf7b027ee
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e73f5de..a325896 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ set(
include(KDEInstallDirs)
include(KDECMakeSettings)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMInstallIcons)
include(ECMSetupVersion)
include(FeatureSummary)
@@ -60,9 +60,6 @@ find_package(
)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-add_definitions(-DQT_USE_QSTRINGBUILDER)
-add_definitions(-DQT_NO_CAST_FROM_ASCII)
-add_definitions(-DQT_NO_CAST_TO_ASCII)
add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
# optional components
diff --git a/src/ExportManager.h b/src/ExportManager.h
index 74b7468..afae6b6 100644
--- a/src/ExportManager.h
+++ b/src/ExportManager.h
@@ -70,7 +70,7 @@ class ExportManager : public QObject
ImageGrabber::GrabMode grabMode() const;
void setGrabMode(const ImageGrabber::GrabMode &grabMode);
- signals:
+ Q_SIGNALS:
void errorMessage(const QString &str);
void saveLocationChanged(const QString &location);
@@ -78,7 +78,7 @@ class ExportManager : public QObject
void imageSaved(const QUrl &savedAt);
void forceNotify(const QUrl &savedAt);
- public slots:
+ public Q_SLOTS:
QUrl getAutosaveFilename();
QUrl tempSave(const QString &mimetype = QStringLiteral("png"));
diff --git a/src/Gui/ExportMenu.h b/src/Gui/ExportMenu.h
index d51c3d2..c3543b4 100644
--- a/src/Gui/ExportMenu.h
+++ b/src/Gui/ExportMenu.h
@@ -43,11 +43,11 @@ class ExportMenu : public QMenu
explicit ExportMenu(QWidget *parent = nullptr);
void imageUpdated();
- private slots:
+ private Q_SLOTS:
void populateMenu();
- signals:
+ Q_SIGNALS:
void imageShared(bool error, const QString &message);
diff --git a/src/Gui/KSImageWidget.h b/src/Gui/KSImageWidget.h
index 0a4c1c2..bc1b48e 100644
--- a/src/Gui/KSImageWidget.h
+++ b/src/Gui/KSImageWidget.h
@@ -45,7 +45,7 @@ class KSImageWidget : public QLabel
explicit KSImageWidget(QWidget *parent = nullptr);
void setScreenshot(const QPixmap &pixmap);
- signals:
+ Q_SIGNALS:
void dragInitiated();
diff --git a/src/Gui/KSMainWindow.h b/src/Gui/KSMainWindow.h
index eb21e60..3285cd9 100644
--- a/src/Gui/KSMainWindow.h
+++ b/src/Gui/KSMainWindow.h
@@ -60,7 +60,7 @@ class KSMainWindow : public QDialog
const KMessageWidget::MessageType messageType,
const MessageDuration messageDuration = MessageDuration::AutoHide);
- private slots:
+ private Q_SLOTS:
void captureScreenshot(ImageGrabber::GrabMode mode, int timeout, bool includePointer, bool \
includeDecorations); void showPrintDialog();
@@ -74,12 +74,12 @@ class KSMainWindow : public QDialog
void saveAs();
int windowWidth(const QPixmap &pixmap) const;
- public slots:
+ public Q_SLOTS:
void setScreenshotAndShow(const QPixmap &pixmap);
void setScreenshotWindowTitle(QUrl location);
- signals:
+ Q_SIGNALS:
void newScreenshotRequest(ImageGrabber::GrabMode mode, int timeout, bool includePointer, bool \
includeDecorations); void dragAndDropRequest();
diff --git a/src/Gui/KSWidget.h b/src/Gui/KSWidget.h
index dba041d..91f1509 100644
--- a/src/Gui/KSWidget.h
+++ b/src/Gui/KSWidget.h
@@ -47,17 +47,17 @@ class KSWidget : public QWidget
int imagePaddingWidth() const;
- signals:
+ Q_SIGNALS:
void dragInitiated();
void newScreenshotRequest(ImageGrabber::GrabMode mode, int captureDelay, bool capturePointer, bool \
captureDecorations);
- public slots:
+ public Q_SLOTS:
void setScreenshotPixmap(const QPixmap &pixmap);
void disableOnClick();
- private slots:
+ private Q_SLOTS:
void newScreenshotClicked();
void onClickStateChanged(int state);
diff --git a/src/Gui/SettingsDialog/GeneralOptionsPage.h b/src/Gui/SettingsDialog/GeneralOptionsPage.h
index 3be20f5..6b09a77 100644
--- a/src/Gui/SettingsDialog/GeneralOptionsPage.h
+++ b/src/Gui/SettingsDialog/GeneralOptionsPage.h
@@ -32,12 +32,12 @@ class GeneralOptionsPage : public SettingsPage
explicit GeneralOptionsPage(QWidget *parent = nullptr);
- public slots:
+ public Q_SLOTS:
void saveChanges() Q_DECL_OVERRIDE;
void resetChanges() Q_DECL_OVERRIDE;
- private slots:
+ private Q_SLOTS:
void markDirty();
diff --git a/src/Gui/SettingsDialog/SaveOptionsPage.h b/src/Gui/SettingsDialog/SaveOptionsPage.h
index a0f6f7e..f8f6b69 100644
--- a/src/Gui/SettingsDialog/SaveOptionsPage.h
+++ b/src/Gui/SettingsDialog/SaveOptionsPage.h
@@ -36,12 +36,12 @@ class SaveOptionsPage : public SettingsPage
explicit SaveOptionsPage(QWidget *parent = nullptr);
- public slots:
+ public Q_SLOTS:
void saveChanges() Q_DECL_OVERRIDE;
void resetChanges() Q_DECL_OVERRIDE;
- private slots:
+ private Q_SLOTS:
void markDirty();
diff --git a/src/Gui/SettingsDialog/SettingsDialog.h b/src/Gui/SettingsDialog/SettingsDialog.h
index cabaf11..61ee8a4 100644
--- a/src/Gui/SettingsDialog/SettingsDialog.h
+++ b/src/Gui/SettingsDialog/SettingsDialog.h
@@ -33,11 +33,11 @@ class SettingsDialog : public KPageDialog
explicit SettingsDialog(QWidget *parent = nullptr);
- public slots:
+ public Q_SLOTS:
void accept() Q_DECL_OVERRIDE;
- private slots:
+ private Q_SLOTS:
void initPages();
void onPageChanged(KPageWidgetItem *current, KPageWidgetItem *before);
diff --git a/src/Gui/SettingsDialog/SettingsPage.h b/src/Gui/SettingsDialog/SettingsPage.h
index 3b0f770..61ac9f8 100644
--- a/src/Gui/SettingsDialog/SettingsPage.h
+++ b/src/Gui/SettingsDialog/SettingsPage.h
@@ -31,7 +31,7 @@ class SettingsPage : public QWidget
explicit SettingsPage(QWidget *parent = nullptr);
virtual ~SettingsPage();
- public slots:
+ public Q_SLOTS:
virtual void saveChanges() = 0;
virtual void resetChanges() = 0;
diff --git a/src/Gui/SmartSpinBox.h b/src/Gui/SmartSpinBox.h
index 7c82044..f8749dc 100644
--- a/src/Gui/SmartSpinBox.h
+++ b/src/Gui/SmartSpinBox.h
@@ -31,7 +31,7 @@ class SmartSpinBox : public QDoubleSpinBox
explicit SmartSpinBox(QWidget *parent = nullptr);
QString textFromValue(double val) const Q_DECL_OVERRIDE;
- private slots:
+ private Q_SLOTS:
void suffixChangeHandler(double val);
};
diff --git a/src/KipiInterface/KSGKipiImageCollectionShared.h \
b/src/KipiInterface/KSGKipiImageCollectionShared.h index d9fc44d..4a6bed4 100644
--- a/src/KipiInterface/KSGKipiImageCollectionShared.h
+++ b/src/KipiInterface/KSGKipiImageCollectionShared.h
@@ -35,14 +35,14 @@ class KSGKipiImageCollectionShared : public KIPI::ImageCollectionShared
public:
explicit KSGKipiImageCollectionShared();
- ~KSGKipiImageCollectionShared();
-
- QString name();
- QString comment();
- QList<QUrl> images();
- QUrl uploadRoot();
- QString uploadRootName();
- bool isDirectory();
+ ~KSGKipiImageCollectionShared() override;
+
+ QString name() override;
+ QString comment() override;
+ QList<QUrl> images() override;
+ virtual QUrl uploadRoot();
+ QString uploadRootName() override;
+ bool isDirectory() override;
private:
diff --git a/src/KipiInterface/KSGKipiInfoShared.h b/src/KipiInterface/KSGKipiInfoShared.h
index 9c5f8b2..88db31c 100644
--- a/src/KipiInterface/KSGKipiInfoShared.h
+++ b/src/KipiInterface/KSGKipiInfoShared.h
@@ -34,12 +34,12 @@ class KSGKipiInfoShared : public KIPI::ImageInfoShared
public:
explicit KSGKipiInfoShared(KIPI::Interface *interface, const QUrl &url);
- ~KSGKipiInfoShared();
+ ~KSGKipiInfoShared() override;
- virtual void addAttributes(const QMap< QString, QVariant > &);
- virtual void delAttributes(const QStringList &);
- virtual void clearAttributes();
- virtual QMap< QString, QVariant > attributes();
+ void addAttributes(const QMap< QString, QVariant > &) override;
+ void delAttributes(const QStringList &) override;
+ void clearAttributes() override;
+ QMap< QString, QVariant > attributes() override;
virtual void setDescription(const QString &);
virtual QString description();
};
diff --git a/src/PlatformBackends/ImageGrabber.h b/src/PlatformBackends/ImageGrabber.h
index 9142e15..bacf0cb 100644
--- a/src/PlatformBackends/ImageGrabber.h
+++ b/src/PlatformBackends/ImageGrabber.h
@@ -66,7 +66,7 @@ class ImageGrabber : public QObject
void setCaptureDecorations(const bool newCaptureDecorations);
void setGrabMode(const GrabMode newGrabMode);
- signals:
+ Q_SIGNALS:
void pixmapChanged(const QPixmap &pixmap);
void windowTitleChanged(const QString &windowTitle);
@@ -75,7 +75,7 @@ class ImageGrabber : public QObject
void captureDecorationsChanged(bool captureDecorations);
void grabModeChanged(GrabMode grabMode);
- public slots:
+ public Q_SLOTS:
virtual void doImageGrab();
virtual void doOnClickGrab();
diff --git a/src/PlatformBackends/X11ImageGrabber.h b/src/PlatformBackends/X11ImageGrabber.h
index 8c5efc2..b4b036a 100644
--- a/src/PlatformBackends/X11ImageGrabber.h
+++ b/src/PlatformBackends/X11ImageGrabber.h
@@ -62,13 +62,13 @@ class X11ImageGrabber : public ImageGrabber
void grabTransientWithParent() Q_DECL_OVERRIDE;
QPixmap blendCursorImage(const QPixmap &pixmap, int x, int y, int width, int height) \
Q_DECL_OVERRIDE;
- private slots:
+ private Q_SLOTS:
void KWinDBusScreenshotHelper(quint64 window);
void rectangleSelectionConfirmed(const QPixmap &pixmap, const QRect ®ion);
void rectangleSelectionCancelled();
- public slots:
+ public Q_SLOTS:
void doOnClickGrab() Q_DECL_OVERRIDE;
diff --git a/src/QuickEditor/QuickEditor.h b/src/QuickEditor/QuickEditor.h
index 9544b8e..bd8ac79 100644
--- a/src/QuickEditor/QuickEditor.h
+++ b/src/QuickEditor/QuickEditor.h
@@ -31,12 +31,12 @@ class QuickEditor : public QObject
explicit QuickEditor(const QPixmap &pixmap, QObject *parent = nullptr);
virtual ~QuickEditor();
- signals:
+ Q_SIGNALS:
void grabDone(const QPixmap &pixmap, const QRect &cropRegion);
void grabCancelled();
- private slots:
+ private Q_SLOTS:
void acceptImageHandler(int x, int y, int width, int height);
diff --git a/src/SpectacleConfig.h b/src/SpectacleConfig.h
index fa585c3..c79fce7 100644
--- a/src/SpectacleConfig.h
+++ b/src/SpectacleConfig.h
@@ -55,7 +55,7 @@ class SpectacleConfig : public QObject
// everything else
- public slots:
+ public Q_SLOTS:
QUrl lastSaveAsLocation() const;
void setLastSaveAsLocation(const QUrl &location);
diff --git a/src/SpectacleCore.h b/src/SpectacleCore.h
index 3063f99..646ff06 100644
--- a/src/SpectacleCore.h
+++ b/src/SpectacleCore.h
@@ -50,7 +50,7 @@ class SpectacleCore : public QObject
ImageGrabber::GrabMode grabMode() const;
void setGrabMode(const ImageGrabber::GrabMode &grabMode);
- signals:
+ Q_SIGNALS:
void errorMessage(const QString errString);
void allDone();
@@ -58,7 +58,7 @@ class SpectacleCore : public QObject
void grabModeChanged(ImageGrabber::GrabMode mode);
void grabFailed();
- public slots:
+ public Q_SLOTS:
void takeNewScreenshot(const ImageGrabber::GrabMode &mode, const int &timeout, const bool \
&includePointer, const bool &includeDecorations); void showErrorMessage(const QString &errString);
diff --git a/src/SpectacleDBusAdapter.h b/src/SpectacleDBusAdapter.h
index edf9101..0d5ad39 100644
--- a/src/SpectacleDBusAdapter.h
+++ b/src/SpectacleDBusAdapter.h
@@ -64,7 +64,7 @@ class SpectacleDBusAdapter: public QDBusAbstractAdaptor
inline SpectacleCore *parent() const;
- public slots:
+ public Q_SLOTS:
Q_NOREPLY void StartAgent();
Q_NOREPLY void FullScreen(bool includeMousePointer);
@@ -73,7 +73,7 @@ class SpectacleDBusAdapter: public QDBusAbstractAdaptor
Q_NOREPLY void WindowUnderCursor(bool includeWindowDecorations, bool includeMousePointer);
Q_NOREPLY void RectangularRegion(bool includeMousePointer);
- signals:
+ Q_SIGNALS:
void ScreenshotTaken(const QString &fileName);
void ScreenshotFailed();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic