[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwalletmanager] /: Use KDEFrameworkCompilerSettings.
From:       Laurent Montel <null () kde ! org>
Date:       2018-09-20 12:03:15
Message-ID: E1g2xfv-0006FK-Jy () code ! kde ! org
[Download RAW message or body]

Git commit 36056c0f8443b2f0c55abc539e60c64dd8466563 by Laurent Montel.
Committed on 20/09/2018 at 12:03.
Pushed by mlaurent into branch 'master'.

Use KDEFrameworkCompilerSettings.

M  +1    -5    CMakeLists.txt
M  +1    -1    src/konfigurator/konfigurator.h
M  +1    -1    src/konfigurator/savehelper.h
M  +2    -2    src/manager/kbetterthankdialogbase.h
M  +3    -3    src/manager/kwalleteditor.h
M  +2    -2    src/manager/kwalletmanager.h
M  +2    -2    src/manager/kwalletpopup.h
M  +3    -3    src/manager/kwmapeditor.h

https://commits.kde.org/kwalletmanager/36056c0f8443b2f0c55abc539e60c64dd8466563

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2050cbc..2caaf1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Gui Widgets \
DBus)  
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
@@ -52,10 +52,6 @@ find_package(KF5 ${KF5_VERSION} REQUIRED
     Crash
 )
 
-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)
 
 add_subdirectory( doc )
diff --git a/src/konfigurator/konfigurator.h b/src/konfigurator/konfigurator.h
index 76c7e1e..c635642 100644
--- a/src/konfigurator/konfigurator.h
+++ b/src/konfigurator/konfigurator.h
@@ -45,7 +45,7 @@ public:
 
     QString quickHelp() const override;
 
-public slots:
+public Q_SLOTS:
     void configChanged();
     void launchManager();
     void newLocalWallet();
diff --git a/src/konfigurator/savehelper.h b/src/konfigurator/savehelper.h
index 29db296..e39de1c 100644
--- a/src/konfigurator/savehelper.h
+++ b/src/konfigurator/savehelper.h
@@ -27,7 +27,7 @@ using namespace KAuth;
 class SaveHelper : public QObject
 {
     Q_OBJECT
-public slots:
+public Q_SLOTS:
     ActionReply save(const QVariantMap &args);
 };
 
diff --git a/src/manager/kbetterthankdialogbase.h \
b/src/manager/kbetterthankdialogbase.h index 91255c1..50e34b1 100644
--- a/src/manager/kbetterthankdialogbase.h
+++ b/src/manager/kbetterthankdialogbase.h
@@ -30,12 +30,12 @@ class KBetterThanKDialogBase : public QDialog, private \
Ui_KBetterThanKDialogBase  public:
     explicit KBetterThanKDialogBase(QWidget *parent = nullptr);
 
-public slots:
+public Q_SLOTS:
     virtual void setLabel(const QString &label);
     void accept() override;
     void reject() override;
 
-private slots:
+private Q_SLOTS:
     virtual void clicked();
 };
 
diff --git a/src/manager/kwalleteditor.h b/src/manager/kwalleteditor.h
index 9ad0e6c..1caa59e 100644
--- a/src/manager/kwalleteditor.h
+++ b/src/manager/kwalleteditor.h
@@ -54,12 +54,12 @@ protected:
     void hideEvent(QHideEvent *) override;
     void showEvent(QShowEvent *) override;
 
-public slots:
+public Q_SLOTS:
     void walletClosed();
     void createFolder();
     void deleteFolder();
 
-private slots:
+private Q_SLOTS:
     void updateFolderList(bool checkEntries = false);
     void entrySelectionChanged(QTreeWidgetItem *item);
     void listItemChanged(QTreeWidgetItem *, int column);
@@ -90,7 +90,7 @@ private slots:
     void onAlwaysShowContents(bool);
     void onAlwaysHideContents(bool);
 
-signals:
+Q_SIGNALS:
     void enableWalletActions(bool enable);
     void enableFolderActions(bool enable);
     void enableContextFolderActions(bool enable);
diff --git a/src/manager/kwalletmanager.h b/src/manager/kwalletmanager.h
index 6e74818..18ec57d 100644
--- a/src/manager/kwalletmanager.h
+++ b/src/manager/kwalletmanager.h
@@ -42,7 +42,7 @@ public:
     bool hasUnsavedChanges(const QString& name = QString()) const;
     bool canIgnoreUnsavedChanges();
 
-public slots:
+public Q_SLOTS:
     void createWallet();
     void deleteWallet();
     void closeWallet(const QString &walletName);
@@ -62,7 +62,7 @@ public Q_SLOTS: //dbus
     Q_SCRIPTABLE void updateWalletDisplay();
     Q_SCRIPTABLE void aWalletWasOpened();
 
-private slots:
+private Q_SLOTS:
     void shuttingDown();
     void possiblyQuit();
     void editorClosed(KXmlGuiWindow *e);
diff --git a/src/manager/kwalletpopup.h b/src/manager/kwalletpopup.h
index acc95e6..c59fcda 100644
--- a/src/manager/kwalletpopup.h
+++ b/src/manager/kwalletpopup.h
@@ -31,7 +31,7 @@ public:
     explicit KWalletPopup(const QString &wallet, QWidget *parent = nullptr, const \
QString &name = QString());  virtual ~KWalletPopup();
 
-public slots:
+public Q_SLOTS:
     void openWallet();
     void deleteWallet();
     void closeWallet();
@@ -39,7 +39,7 @@ public slots:
     void changeWalletPassword();
     void disconnectApp();
 
-signals:
+Q_SIGNALS:
     void walletOpened(const QString &walletName);
     void walletClosed(const QString &walletName);
     void walletDeleted(const QString &walletName);
diff --git a/src/manager/kwmapeditor.h b/src/manager/kwmapeditor.h
index 280b5e7..d697356 100644
--- a/src/manager/kwmapeditor.h
+++ b/src/manager/kwmapeditor.h
@@ -34,7 +34,7 @@ public:
     explicit KWMapEditor(QMap<QString, QString> &map, QWidget *parent = nullptr);
     virtual ~KWMapEditor();
 
-public slots:
+public Q_SLOTS:
     void reload();
     void saveMap();
     void erase();
@@ -42,10 +42,10 @@ public slots:
     void addEntry();
     void emitDirty();
 
-private slots:
+private Q_SLOTS:
     void copy();
 
-signals:
+Q_SIGNALS:
     void dirty();
 
 private:


[prev in list] [next in list] [prev in thread] [next in thread]