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

List:       kde-commits
Subject:    [kcharselect] /: Compile with KDEFrameworkCompilerSettings module
From:       Laurent Montel <null () kde ! org>
Date:       2018-09-18 11:58:52
Message-ID: E1g2Eea-0001MA-R8 () code ! kde ! org
[Download RAW message or body]

Git commit 8923265170485d0d802d08fe6bd8b2938ff05fe0 by Laurent Montel.
Committed on 18/09/2018 at 11:58.
Pushed by mlaurent into branch 'master'.

Compile with KDEFrameworkCompilerSettings module

M  +1    -2    CMakeLists.txt
M  +1    -1    kcharselectdia.h
M  +12   -12   main.cc

https://commits.kde.org/kcharselect/8923265170485d0d802d08fe6bd8b2938ff05fe0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 355be84..921b7ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (ECM ${ECM_VERSION} REQUIRED NO_MODULE)
 set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 =

 include(KDEInstallDirs)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
 =

 find_package (Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
@@ -34,7 +34,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     XmlGui
 )
 =

-add_definitions(-DQT_USE_QSTRINGBUILDER)
 =

 configure_file(config-kcharselect.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/conf=
ig-kcharselect.h)
 =

diff --git a/kcharselectdia.h b/kcharselectdia.h
index b262fdc..2f84df2 100644
--- a/kcharselectdia.h
+++ b/kcharselectdia.h
@@ -49,7 +49,7 @@ protected:
   QFont vFont;
   bool _rtl;
 =

-protected slots:
+protected Q_SLOTS:
   void charChanged(uint _chr);
   void fontSelected(const QFont &_font);
   void add()
diff --git a/main.cc b/main.cc
index 8dea69b..072ed58 100644
--- a/main.cc
+++ b/main.cc
@@ -42,24 +42,24 @@ int main(int argc, char **argv)
   migrate.setUiFiles(QStringList() << QLatin1String("kcharselectui.rc"));
   migrate.migrate();
 =

-  KAboutData aboutData( "kcharselect", i18n("KCharSelect"),
-    KCHARSELECT_VERSION, i18n("KDE character selection utility"), KAboutLi=
cense::GPL,
-    QString(), i18n("A wrapper around the KCharSelect widget."), "http://u=
tils.kde.org/projects/kcharselect" );
+  KAboutData aboutData( QStringLiteral("kcharselect"), i18n("KCharSelect"),
+    QLatin1String(KCHARSELECT_VERSION), i18n("KDE character selection util=
ity"), KAboutLicense::GPL,
+    QString(), i18n("A wrapper around the KCharSelect widget."), QStringLi=
teral("http://utils.kde.org/projects/kcharselect") );
 =

-  aboutData.addAuthor(i18n("Christoph Feck"), i18n("KF5 port and current m=
aintainer"), "cfeck@kde.org");
-  aboutData.addAuthor(i18n("Daniel Laidig"), i18n("Author and previous mai=
ntainer"), "d.laidig@gmx.de" );
-  aboutData.addAuthor(i18n("Reginald Stadlbauer"), i18n("Author"), "reggie=
@kde.org");
+  aboutData.addAuthor(i18n("Christoph Feck"), i18n("KF5 port and current m=
aintainer"), QStringLiteral("cfeck@kde.org"));
+  aboutData.addAuthor(i18n("Daniel Laidig"), i18n("Author and previous mai=
ntainer"), QStringLiteral("d.laidig@gmx.de") );
+  aboutData.addAuthor(i18n("Reginald Stadlbauer"), i18n("Author"), QString=
Literal("reggie@kde.org"));
 =

   aboutData.addCredit( i18n("Daniel Laidig"), i18n("New GUI, Unicode infor=
mation, incremental search,"
-        " and general improvements"), "d.laidig@gmx.de" );
-  aboutData.addCredit( i18n("Laurent Montel"), i18n("Porting help"), "mont=
el@kde.org" );
-  aboutData.addCredit( i18n("Constantin Berzan"), i18n("Previous maintaine=
r"), "exit3219@gmail.com" );
+        " and general improvements"), QStringLiteral("d.laidig@gmx.de") );
+  aboutData.addCredit( i18n("Laurent Montel"), i18n("Porting help"), QStri=
ngLiteral("montel@kde.org") );
+  aboutData.addCredit( i18n("Constantin Berzan"), i18n("Previous maintaine=
r"), QStringLiteral("exit3219@gmail.com") );
   aboutData.addCredit( i18n("Nadeem Hasan"), i18n( "GUI cleanup and fixes"=
 ),
-        "nhasan@kde.org" );
+        QStringLiteral("nhasan@kde.org") );
   aboutData.addCredit( i18n("Ryan Cumming"), i18n( "GUI cleanup and fixes"=
 ),
-        "bodnar42@phalynx.dhs.org" );
+        QStringLiteral("bodnar42@phalynx.dhs.org") );
   aboutData.addCredit( i18n("Benjamin C. Meyer"), i18n("XMLUI conversion"),
-        "ben+kcharselect@meyerhome.net" );
+        QStringLiteral("ben+kcharselect@meyerhome.net" ));
   aboutData.addCredit( i18n("Bryce Nesbitt"), i18n("RTL support") );
 =

   KAboutData::setApplicationData( aboutData );
[prev in list] [next in list] [prev in thread] [next in thread]