'[kbruch] /: Use KDEFrameworkCompilerSettings + modernize + use nullptr'

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

List:       kde-commits
Subject:    [kbruch] /: Use KDEFrameworkCompilerSettings + modernize + use nullptr
From:       Laurent Montel <null () kde ! org>
Date:       2018-09-23 11:50:07
Message-ID: E1g42tr-0007un-4z () code ! kde ! org
[Download RAW message or body]

Git commit 48009ef2e5d49427f2310a9dcdce378f4527711d by Laurent Montel.
Committed on 23/09/2018 at 11:49.
Pushed by mlaurent into branch 'master'.

Use KDEFrameworkCompilerSettings + modernize + use nullptr

M  +6    -11   CMakeLists.txt
M  +1    -1    src/ExerciseBase.h
M  +1    -1    src/ExerciseCompare.h
M  +1    -1    src/ExerciseConvert.h
M  +1    -1    src/ExerciseFactorize.h
M  +1    -1    src/ExerciseMixedNumbers.h
M  +1    -1    src/ExercisePercentage.h
M  +1    -1    src/FractionBaseWidget.h
M  +1    -1    src/FractionPainter.h
M  +2    -2    src/MainQtWidget.cpp
M  +1    -1    src/PrimeFactorsLineEdit.h
M  +1    -1    src/RatioWidget.h
M  +1    -1    src/ResultWidget.h
M  +1    -1    src/StatisticsBarWidget.h
M  +1    -1    src/StatisticsView.h
M  +1    -1    src/TaskView.h
M  +1    -1    src/TaskWidget.h

https://commits.kde.org/kbruch/48009ef2e5d49427f2310a9dcdce378f4527711d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 671175b..bb2207a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,19 @@
 project(kbruch)
 
 cmake_minimum_required(VERSION 2.8.12)
+set(QT_MIN_VERSION "5.9.0")
+set(KF5_VERSION "5.46.0")
 
-find_package(ECM 1.7.0 REQUIRED NO_MODULE)
+find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 include(ECMInstallIcons)
 
-find_package(Qt5 5.2.0 CONFIG REQUIRED
+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
   Core
   Widgets
 )
 
-find_package(KF5 5.15 REQUIRED
+find_package(KF5 ${KF5_VERSION} REQUIRED
   Config
   Crash
   DocTools
@@ -22,21 +24,14 @@ find_package(KF5 5.15 REQUIRED
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 include(ECMAddAppIcon)
 
 # use sane compile flags
 add_definitions(
   -fexceptions
-  -DQT_USE_QSTRINGBUILDER
-  -DQT_NO_CAST_TO_ASCII
-  -DQT_NO_CAST_FROM_ASCII
-  -DQT_STRICT_ITERATORS
   -DQT_NO_URL_CAST_FROM_STRING
-  -DQT_NO_CAST_FROM_BYTEARRAY
-  -DQT_NO_SIGNALS_SLOTS_KEYWORDS
-  -DQT_USE_FAST_OPERATOR_PLUS
 )
 
 add_subdirectory( doc )
diff --git a/src/ExerciseBase.h b/src/ExerciseBase.h
index ae68819..46aec30 100644
--- a/src/ExerciseBase.h
+++ b/src/ExerciseBase.h
@@ -33,7 +33,7 @@ class ExerciseBase : public QWidget
 {
 public:
     /** constructor */
-    explicit ExerciseBase(QWidget * parent = 0);
+    explicit ExerciseBase(QWidget * parent = nullptr);
 
     /** destructor */
     ~ExerciseBase();
diff --git a/src/ExerciseCompare.h b/src/ExerciseCompare.h
index 17ce9d0..2cf40c1 100644
--- a/src/ExerciseCompare.h
+++ b/src/ExerciseCompare.h
@@ -49,7 +49,7 @@ class ExerciseCompare : public ExerciseBase
 
 public:
     /** constructor */
-    explicit ExerciseCompare(QWidget * parent = 0);
+    explicit ExerciseCompare(QWidget * parent = nullptr);
 
     /** destructor */
     ~ExerciseCompare();
diff --git a/src/ExerciseConvert.h b/src/ExerciseConvert.h
index 779ada7..05d95af 100644
--- a/src/ExerciseConvert.h
+++ b/src/ExerciseConvert.h
@@ -48,7 +48,7 @@ class ExerciseConvert : public ExerciseBase
 
 public:
     /** constructor */
-    explicit ExerciseConvert(QWidget * parent = 0);
+    explicit ExerciseConvert(QWidget * parent = nullptr);
 
     /** destructor */
     ~ExerciseConvert();
diff --git a/src/ExerciseFactorize.h b/src/ExerciseFactorize.h
index 9829653..0e31f17 100644
--- a/src/ExerciseFactorize.h
+++ b/src/ExerciseFactorize.h
@@ -57,7 +57,7 @@ class ExerciseFactorize : public ExerciseBase
 
 public:
     /** constructor */
-    explicit ExerciseFactorize(QWidget * parent = 0);
+    explicit ExerciseFactorize(QWidget * parent = nullptr);
 
     /** destructor */
     ~ExerciseFactorize();
diff --git a/src/ExerciseMixedNumbers.h b/src/ExerciseMixedNumbers.h
index d2ef37d..ed1b6fd 100644
--- a/src/ExerciseMixedNumbers.h
+++ b/src/ExerciseMixedNumbers.h
@@ -44,7 +44,7 @@ class ExerciseMixedNumbers: public ExerciseBase
 
 public:
     /** constructor */
-    explicit ExerciseMixedNumbers(QWidget* parent = 0);
+    explicit ExerciseMixedNumbers(QWidget* parent = nullptr);
 
     /** destructor */
     virtual ~ExerciseMixedNumbers();
diff --git a/src/ExercisePercentage.h b/src/ExercisePercentage.h
index 9c2901a..5ef7656 100644
--- a/src/ExercisePercentage.h
+++ b/src/ExercisePercentage.h
@@ -43,7 +43,7 @@ class ExercisePercentage : public ExerciseBase
 
 public:
     /** constructor */
-    explicit ExercisePercentage(QWidget * parent = 0);
+    explicit ExercisePercentage(QWidget * parent = nullptr);
 
     /** destructor */
     ~ExercisePercentage();
diff --git a/src/FractionBaseWidget.h b/src/FractionBaseWidget.h
index 7d02754..b20121d 100644
--- a/src/FractionBaseWidget.h
+++ b/src/FractionBaseWidget.h
@@ -37,7 +37,7 @@ class FractionBaseWidget : public QWidget
 {
 public:
     /** constructor */
-    explicit FractionBaseWidget(QWidget * parent = 0);
+    explicit FractionBaseWidget(QWidget * parent = nullptr);
 
     /** destructor */
     ~FractionBaseWidget();
diff --git a/src/FractionPainter.h b/src/FractionPainter.h
index 47a4436..3ae604d 100644
--- a/src/FractionPainter.h
+++ b/src/FractionPainter.h
@@ -36,7 +36,7 @@ class FractionPainter : public FractionBaseWidget
 {
 public:
     /** constructor */
-    explicit FractionPainter(QWidget * parent = 0);
+    explicit FractionPainter(QWidget * parent = nullptr);
 
     /** destructor */
     ~FractionPainter();
diff --git a/src/MainQtWidget.cpp b/src/MainQtWidget.cpp
index 5a0e4dd..bc2d96e 100644
--- a/src/MainQtWidget.cpp
+++ b/src/MainQtWidget.cpp
@@ -814,10 +814,10 @@ void MainQtWidget::slotPrefs()
     //KConfigDialog didn't find an instance of this dialog, so lets create it :
     KConfigDialog* configDialog = new KConfigDialog(this, \
QStringLiteral("settings"), SettingsClass::self());  
-    TaskColors * taskColors = new TaskColors(0);
+    TaskColors * taskColors = new TaskColors(nullptr);
     configDialog->addPage(taskColors, i18n("Colors"), \
QStringLiteral("preferences-desktop-color"));  
-    TaskFonts * taskFonts = new TaskFonts(0);
+    TaskFonts * taskFonts = new TaskFonts(nullptr);
     configDialog->addPage(taskFonts, i18n("Fonts"), \
QStringLiteral("preferences-desktop-font"));  // User edited the configuration - \
update your local copies of the  // configuration data
diff --git a/src/PrimeFactorsLineEdit.h b/src/PrimeFactorsLineEdit.h
index f31c216..e1aba3f 100644
--- a/src/PrimeFactorsLineEdit.h
+++ b/src/PrimeFactorsLineEdit.h
@@ -38,7 +38,7 @@ class PrimeFactorsLineEdit : public QLineEdit
 
 public:
     /** constructor */
-    explicit PrimeFactorsLineEdit(QWidget* parent = 0);
+    explicit PrimeFactorsLineEdit(QWidget* parent = nullptr);
 
     /** destructor */
     ~PrimeFactorsLineEdit();
diff --git a/src/RatioWidget.h b/src/RatioWidget.h
index 2e2cc5f..ae9f34e 100644
--- a/src/RatioWidget.h
+++ b/src/RatioWidget.h
@@ -35,7 +35,7 @@ class RatioWidget : public FractionBaseWidget
 {
 public:
     /** constructor */
-    explicit RatioWidget(QWidget * parent = 0, const Ratio para_ratio = Ratio());
+    explicit RatioWidget(QWidget * parent = nullptr, const Ratio para_ratio = \
Ratio());  
     /** destructor */
     ~RatioWidget();
diff --git a/src/ResultWidget.h b/src/ResultWidget.h
index 840450c..ffe763a 100644
--- a/src/ResultWidget.h
+++ b/src/ResultWidget.h
@@ -42,7 +42,7 @@ public:
     /** constructors */
     ResultWidget(QWidget * parent, const Ratio para_result);
     ResultWidget(QWidget * parent, const uintList para_factors);
-    explicit ResultWidget(QWidget * parent = 0);
+    explicit ResultWidget(QWidget * parent = nullptr);
 
     /** destructor */
     ~ResultWidget();
diff --git a/src/StatisticsBarWidget.h b/src/StatisticsBarWidget.h
index 128b746..f251974 100644
--- a/src/StatisticsBarWidget.h
+++ b/src/StatisticsBarWidget.h
@@ -32,7 +32,7 @@ class StatisticsBarWidget : public QWidget
 {
 public:
     /** constructor */
-    explicit StatisticsBarWidget(QWidget * parent = 0);
+    explicit StatisticsBarWidget(QWidget * parent = nullptr);
 
     /** destructor */
     ~StatisticsBarWidget();
diff --git a/src/StatisticsView.h b/src/StatisticsView.h
index ab59e2e..fabba3b 100644
--- a/src/StatisticsView.h
+++ b/src/StatisticsView.h
@@ -46,7 +46,7 @@ class StatisticsView : public QFrame
 {
 public:
     /** constructor */
-    explicit StatisticsView(QWidget * parent = 0);
+    explicit StatisticsView(QWidget * parent = nullptr);
 
     /** destructor */
     ~StatisticsView();
diff --git a/src/TaskView.h b/src/TaskView.h
index 26d1f86..49d3bae 100644
--- a/src/TaskView.h
+++ b/src/TaskView.h
@@ -53,7 +53,7 @@ class TaskView : public ExerciseBase
 
 public:
     /** constructor */
-    explicit TaskView(QWidget * parent = 0,
+    explicit TaskView(QWidget * parent = nullptr,
                       bool padd_add = true, bool padd_div = false,
                       bool padd_mult = false, bool padd_sub = false,
                       unsigned int pnr_ratios = 2, unsigned int pmax_md = 10);
diff --git a/src/TaskWidget.h b/src/TaskWidget.h
index bd6687d..f04d1c8 100644
--- a/src/TaskWidget.h
+++ b/src/TaskWidget.h
@@ -45,7 +45,7 @@ class TaskWidget : public FractionBaseWidget
 {
 public:
     /** constructor */
-    explicit TaskWidget(QWidget * parent = 0, const Task para_task = Task());
+    explicit TaskWidget(QWidget * parent = nullptr, const Task para_task = Task());
 
     /** destructor */
     ~TaskWidget();


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic