aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Samir <a.samirh78@gmail.com>2020-02-04 20:32:10 +0200
committerAhmad Samir <a.samirh78@gmail.com>2020-04-21 13:53:13 +0200
commitfb29718d3ac64bdc9e1f2a3d15a506f7798e4a76 (patch)
treeb96e213b919eb335f7a2027b7d9cc8524a7db927
parentaa28a2433e55cc909c49ed4dbb7ce5c48baa1b24 (diff)
downloadkconfig-fb29718d3ac64bdc9e1f2a3d15a506f7798e4a76.tar.gz
kconfig-fb29718d3ac64bdc9e1f2a3d15a506f7798e4a76.tar.bz2
Fix some compiler warnings
Summary: - Fix order of member initialisation (compiling with -Wreorder) - Use Q_UNUSED where needed - QAtomicInteger::loadRelaxed() has been available since Qt 5.14 Test Plan: make && ctest Reviewers: #frameworks, dfaure, apol Reviewed By: dfaure Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D27158
-rw-r--r--src/kconfig_compiler/KConfigCodeGeneratorBase.cpp2
-rw-r--r--src/kconfig_compiler/KConfigXmlParser.cpp1
-rw-r--r--src/kconfig_compiler/kconfig_compiler.cpp2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp b/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp
index dcbb30c3..48a24af5 100644
--- a/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp
+++ b/src/kconfig_compiler/KConfigCodeGeneratorBase.cpp
@@ -30,7 +30,7 @@ KConfigCodeGeneratorBase::KConfigCodeGeneratorBase(
const QString &fileName,
const KConfigParameters &parameters,
ParseResult &parseResult)
- : m_inputFile(inputFile), m_baseDir(baseDir), m_fileName(fileName), m_cfg(parameters), parseResult(parseResult)
+ : parseResult(parseResult), m_inputFile(inputFile), m_baseDir(baseDir), m_fileName(fileName), m_cfg(parameters)
{
m_file.setFileName(m_fileName);
if (!m_file.open(QIODevice::WriteOnly)) {
diff --git a/src/kconfig_compiler/KConfigXmlParser.cpp b/src/kconfig_compiler/KConfigXmlParser.cpp
index dcbe869f..46ce0921 100644
--- a/src/kconfig_compiler/KConfigXmlParser.cpp
+++ b/src/kconfig_compiler/KConfigXmlParser.cpp
@@ -166,6 +166,7 @@ void KConfigXmlParser::readParameterFromEntry(CfgEntry &readEntry, const QDomEle
bool KConfigXmlParser::hasDefaultCode(CfgEntry &readEntry, const QDomElement &element)
{
Q_UNUSED(readEntry)
+
for (QDomElement e = element.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
if (e.attribute(QStringLiteral("param")).isEmpty()) {
if (e.attribute(QStringLiteral("code")) == QLatin1String("true")) {
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index 605dd2b5..4f9fa3f2 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -665,6 +665,8 @@ QString indent(QString text, int spaces)
bool hasErrors(KConfigXmlParser &parser, const ParseResult& parseResult, const KConfigParameters &cfg)
{
+ Q_UNUSED(parser)
+
if (cfg.className.isEmpty()) {
std::cerr << "Class name missing" << std::endl;
return true;