[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kalzium] /: Use KDEFrameworkCompilerSettings + use nullptr
From: Laurent Montel <null () kde ! org>
Date: 2018-09-23 11:56:11
Message-ID: E1g42zj-0001Qf-0O () code ! kde ! org
[Download RAW message or body]
Git commit 0fed5ecba3430c480891943befccf76763d2da81 by Laurent Montel.
Committed on 23/09/2018 at 11:55.
Pushed by mlaurent into branch 'master'.
Use KDEFrameworkCompilerSettings + use nullptr
M +8 -6 CMakeLists.txt
M +2 -2 libscience/elementparser.cpp
M +1 -1 src/calculator/calculator.h
M +1 -1 src/calculator/concCalculator.h
M +1 -1 src/calculator/gasCalculator.h
M +1 -1 src/calculator/nuclearCalculator.h
M +1 -1 src/calculator/titrationCalculator.h
M +1 -1 src/detailinfodlg.h
M +1 -1 src/elementdataviewer.h
M +1 -1 src/gradientwidget_impl.h
M +1 -1 src/isotopetable/isotopeguideview.h
M +1 -1 src/isotopetable/isotopescene.h
M +1 -1 src/isotopetable/isotopeview.h
M +2 -2 src/kalziumunitcombobox.h
M +3 -3 src/kdeeduglossary.cpp
M +1 -1 src/kdeeduglossary.h
M +1 -1 src/legendwidget.h
M +1 -1 src/molcalcwidget.h
M +1 -1 src/orbitswidget.h
M +1 -1 src/psetable/periodictableview.h
M +1 -1 src/searchwidget.h
M +1 -1 src/tablesdialog.h
https://commits.kde.org/kalzium/0fed5ecba3430c480891943befccf76763d2da81
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ad9acd1..0371e0f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,15 @@
project(kalzium)
cmake_minimum_required(VERSION 2.8.12)
-find_package(ECM 5.7.0 REQUIRED NO_MODULE)
+
+set(QT_MIN_VERSION "5.9.0")
+set(KF5_VERSION "5.46.0")
+
+find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${kalzium_SOURCE_DIR}/cmake/modules)
include(KDEInstallDirs)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
include(FeatureSummary)
include(ECMInstallIcons)
@@ -37,7 +41,7 @@ configure_file(
include_directories(${AvogadroLibs_INCLUDE_DIRS})
-find_package(Qt5 REQUIRED COMPONENTS
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
Widgets
Script
Core
@@ -46,7 +50,7 @@ find_package(Qt5 REQUIRED COMPONENTS
Svg
)
-find_package(KF5 REQUIRED COMPONENTS
+find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS
Archive
Config
CoreAddons
@@ -80,8 +84,6 @@ endif(WIN32)
add_definitions(
-DQT_NO_URL_CAST_FROM_STRING
- -DQT_USE_FAST_CONCATENATION
- -DQT_USE_FAST_OPERATOR_PLUS
)
#include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} \
${KDE4_INCLUDES} libscience) if(MSVC)
diff --git a/libscience/elementparser.cpp b/libscience/elementparser.cpp
index 6d1d4c49..c872f443 100644
--- a/libscience/elementparser.cpp
+++ b/libscience/elementparser.cpp
@@ -194,7 +194,7 @@ bool ElementSaxParser::startElement(const QString&, const QString \
&localName, co } else if (attrs.value(i) == "bo:name") {
for (int i = 0; i < attrs.length(); ++i) {
if (attrs.localName(i) == "value") {
- d->currentDataObject.setData(i18n(attrs.value(i).toUtf8()));
+ \
d->currentDataObject.setData(i18n(attrs.value(i).toUtf8().constData()));
d->currentDataObject.setType(ChemicalDataObject::name);
if (d->currentElement) {
@@ -276,7 +276,7 @@ bool ElementSaxParser::characters(const QString &ch)
type = ChemicalDataObject::periodTableBlock;
d->inPeriodTableBlock = false;
} else if (d->inNameOrigin) {
- value = i18n(ch.toUtf8());
+ value = i18n(ch.toUtf8().constData());
type = ChemicalDataObject::nameOrigin;
d->inNameOrigin = false;
} else if (d->inDiscoveryDate) {
diff --git a/src/calculator/calculator.h b/src/calculator/calculator.h
index cda195d1..e2cdf538 100644
--- a/src/calculator/calculator.h
+++ b/src/calculator/calculator.h
@@ -48,7 +48,7 @@ public:
/*
* The clas constructor and destructor, takes in a Widget as parent
*/
- calculator(QWidget *parent = 0); // constructor
+ calculator(QWidget *parent = nullptr); // constructor
~ calculator(); // destructor
private:
diff --git a/src/calculator/concCalculator.h b/src/calculator/concCalculator.h
index ffee63b8..2c7aac81 100644
--- a/src/calculator/concCalculator.h
+++ b/src/calculator/concCalculator.h
@@ -76,7 +76,7 @@ public:
/*
* The constructor and destructor for the class
*/
- concCalculator(QWidget * parent = 0);
+ concCalculator(QWidget * parent = nullptr);
~concCalculator();
public slots:
diff --git a/src/calculator/gasCalculator.h b/src/calculator/gasCalculator.h
index 38ddbc91..463f9724 100644
--- a/src/calculator/gasCalculator.h
+++ b/src/calculator/gasCalculator.h
@@ -69,7 +69,7 @@ class gasCalculator : public QWidget
Q_OBJECT
public:
- gasCalculator(QWidget * parent = 0);
+ gasCalculator(QWidget * parent = nullptr);
~gasCalculator();
public slots:
diff --git a/src/calculator/nuclearCalculator.h b/src/calculator/nuclearCalculator.h
index 3c6f895f..49af05c0 100644
--- a/src/calculator/nuclearCalculator.h
+++ b/src/calculator/nuclearCalculator.h
@@ -60,7 +60,7 @@ class nuclearCalculator : public QFrame
Q_OBJECT
public:
- nuclearCalculator(QWidget * parent = 0);
+ nuclearCalculator(QWidget * parent = nullptr);
~nuclearCalculator();
public slots:
diff --git a/src/calculator/titrationCalculator.h \
b/src/calculator/titrationCalculator.h index 36adfe16..c2bb5267 100644
--- a/src/calculator/titrationCalculator.h
+++ b/src/calculator/titrationCalculator.h
@@ -44,7 +44,7 @@ class titrationCalculator : public QWidget
Q_OBJECT
public:
- titrationCalculator(QWidget * parent = 0);
+ titrationCalculator(QWidget * parent = nullptr);
~titrationCalculator();
public slots:
diff --git a/src/detailinfodlg.h b/src/detailinfodlg.h
index c0054932..63fe6ad5 100644
--- a/src/detailinfodlg.h
+++ b/src/detailinfodlg.h
@@ -41,7 +41,7 @@ class DetailedInfoDlg : public KPageDialog
Q_OBJECT
public:
- explicit DetailedInfoDlg(int el, QWidget *parent = 0);
+ explicit DetailedInfoDlg(int el, QWidget *parent = nullptr);
~DetailedInfoDlg();
void setElement(int el);
diff --git a/src/elementdataviewer.h b/src/elementdataviewer.h
index dba156e7..3618212f 100644
--- a/src/elementdataviewer.h
+++ b/src/elementdataviewer.h
@@ -89,7 +89,7 @@ class ElementDataViewer : public KDialog
Q_OBJECT
public:
- ElementDataViewer(QWidget *parent = 0);
+ ElementDataViewer(QWidget *parent = nullptr);
~ElementDataViewer();
diff --git a/src/gradientwidget_impl.h b/src/gradientwidget_impl.h
index 05217651..1fff182b 100644
--- a/src/gradientwidget_impl.h
+++ b/src/gradientwidget_impl.h
@@ -45,7 +45,7 @@ public:
* @param elementProperty The elementProperty class
* @param parent The parent of this widget
*/
- GradientWidgetImpl(QWidget *parent = 0);
+ GradientWidgetImpl(QWidget *parent = nullptr);
virtual ~GradientWidgetImpl();
Q_SIGNALS:
diff --git a/src/isotopetable/isotopeguideview.h \
b/src/isotopetable/isotopeguideview.h index 560f3ba3..13180816 100644
--- a/src/isotopetable/isotopeguideview.h
+++ b/src/isotopetable/isotopeguideview.h
@@ -31,7 +31,7 @@ class IsotopeGuideView : public QGraphicsView
Q_OBJECT
public:
- IsotopeGuideView(QWidget *parent = 0);
+ IsotopeGuideView(QWidget *parent = nullptr);
void setGuidedView(IsotopeView *guidedView);
protected:
diff --git a/src/isotopetable/isotopescene.h b/src/isotopetable/isotopescene.h
index 3531efd6..c12c478b 100644
--- a/src/isotopetable/isotopescene.h
+++ b/src/isotopetable/isotopescene.h
@@ -29,7 +29,7 @@ class IsotopeScene : public QGraphicsScene
Q_OBJECT
public:
- IsotopeScene(QObject * parent = 0);
+ IsotopeScene(QObject * parent = nullptr);
virtual ~IsotopeScene();
void updateContextHelp(IsotopeItem * item);
diff --git a/src/isotopetable/isotopeview.h b/src/isotopetable/isotopeview.h
index 54d3d978..81104036 100644
--- a/src/isotopetable/isotopeview.h
+++ b/src/isotopetable/isotopeview.h
@@ -31,7 +31,7 @@ class IsotopeView : public QGraphicsView
Q_OBJECT
public:
- IsotopeView(QWidget *parent = 0);
+ IsotopeView(QWidget *parent = nullptr);
virtual ~IsotopeView();
private:
diff --git a/src/kalziumunitcombobox.h b/src/kalziumunitcombobox.h
index 717be9e4..974751fa 100644
--- a/src/kalziumunitcombobox.h
+++ b/src/kalziumunitcombobox.h
@@ -24,8 +24,8 @@ class KalziumUnitCombobox : public QComboBox
{
public:
- KalziumUnitCombobox(QWidget *parent = 0);
- KalziumUnitCombobox(const QList< int > &unitList, QWidget *parent = 0);
+ KalziumUnitCombobox(QWidget *parent = nullptr);
+ KalziumUnitCombobox(const QList< int > &unitList, QWidget *parent = nullptr);
void setUnitList(const QList< int > &unitList);
int getCurrentUnitId() const;
diff --git a/src/kdeeduglossary.cpp b/src/kdeeduglossary.cpp
index ed12fa1c..048d5bc3 100644
--- a/src/kdeeduglossary.cpp
+++ b/src/kdeeduglossary.cpp
@@ -246,12 +246,12 @@ QList<GlossaryItem*> Glossary::readItems(QDomDocument \
&itemDocument)
QString picName = itemElement.namedItem("picture").toElement().text();
QDomElement refNode = (const QDomElement&) \
itemElement.namedItem("references").toElement();
- QString desc = i18n(descNode.toElement().text().toUtf8());
+ QString desc = i18n(descNode.toElement().text().toUtf8().constData());
if (!picName.isEmpty()) {
desc.prepend("[img]" + picName + "[/img][brclear][br]");
}
- item->setName(i18n(nameNode.toElement().text().toUtf8()));
+ item->setName(i18n(nameNode.toElement().text().toUtf8().constData()));
desc = desc.replace("[b]", "<b>");
desc = desc.replace("[/b]", "</b>");
@@ -268,7 +268,7 @@ QList<GlossaryItem*> Glossary::readItems(QDomDocument \
&itemDocument) refNodeList = refNode.elementsByTagName("refitem");
for (int it = 0; it < refNodeList.count(); ++it)
{
- reflist << i18n(refNodeList.item(it).toElement().text().toUtf8());
+ reflist << \
i18n(refNodeList.item(it).toElement().text().toUtf8().constData()); }
item->setRef(reflist);
diff --git a/src/kdeeduglossary.h b/src/kdeeduglossary.h
index da6dd344..9183b090 100644
--- a/src/kdeeduglossary.h
+++ b/src/kdeeduglossary.h
@@ -213,7 +213,7 @@ public:
*
* @param parent the parent of the new dialog
*/
- explicit GlossaryDialog(QWidget *parent = 0);
+ explicit GlossaryDialog(QWidget *parent = nullptr);
virtual ~GlossaryDialog();
diff --git a/src/legendwidget.h b/src/legendwidget.h
index 2a723edb..b3bd8136 100644
--- a/src/legendwidget.h
+++ b/src/legendwidget.h
@@ -82,7 +82,7 @@ class LegendItem : public QLabel
Q_OBJECT
public:
- LegendItem(const QPair<QString, QColor>& pair, QWidget * parent = 0);
+ LegendItem(const QPair<QString, QColor>& pair, QWidget * parent = nullptr);
~LegendItem() {}
Q_SIGNALS:
diff --git a/src/molcalcwidget.h b/src/molcalcwidget.h
index a0581a06..a760b910 100644
--- a/src/molcalcwidget.h
+++ b/src/molcalcwidget.h
@@ -44,7 +44,7 @@ public:
* Constructor
* @param parent parent widget
*/
- MolcalcWidget(QWidget *parent = 0);
+ MolcalcWidget(QWidget *parent = nullptr);
void hideExtra();
virtual ~MolcalcWidget();
diff --git a/src/orbitswidget.h b/src/orbitswidget.h
index 17fac9cb..23f23689 100644
--- a/src/orbitswidget.h
+++ b/src/orbitswidget.h
@@ -30,7 +30,7 @@ class OrbitsWidget : public QWidget
Q_OBJECT
public:
- OrbitsWidget(QWidget *parent = 0);
+ OrbitsWidget(QWidget *parent = nullptr);
void setElementNumber(int num);
diff --git a/src/psetable/periodictableview.h b/src/psetable/periodictableview.h
index 7c198038..890a58af 100644
--- a/src/psetable/periodictableview.h
+++ b/src/psetable/periodictableview.h
@@ -51,7 +51,7 @@ class PeriodicTableView : public QGraphicsView
{
Q_OBJECT
public:
- PeriodicTableView(QWidget *parent = 0);
+ PeriodicTableView(QWidget *parent = nullptr);
~PeriodicTableView();
/**
diff --git a/src/searchwidget.h b/src/searchwidget.h
index 66613aeb..d5b94896 100644
--- a/src/searchwidget.h
+++ b/src/searchwidget.h
@@ -38,7 +38,7 @@ public:
/**
* Construct a new empty search.
*/
- SearchWidget(QWidget *parent = 0);
+ SearchWidget(QWidget *parent = nullptr);
~SearchWidget();
diff --git a/src/tablesdialog.h b/src/tablesdialog.h
index a04f4adb..07ac59e2 100644
--- a/src/tablesdialog.h
+++ b/src/tablesdialog.h
@@ -29,7 +29,7 @@ class TablesDialog : public KPageDialog
Q_OBJECT
public:
- TablesDialog(QWidget *parent = 0);
+ TablesDialog(QWidget *parent = nullptr);
virtual ~TablesDialog();
void createNumbersTable();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic