From 644df1f513a0e2c813d72fb028d4d058c3b9a9ba Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Fri, 5 Mar 2021 09:05:16 +0200 Subject: Cppcheck: Move member initialization from constructor body to initialization list Change-Id: I5bb8c8f81a391abc5cdfdf5a0c7a68bb5edcec89 Reviewed-by: Arttu Tarkiainen --- src/libs/ifwtools/rcc/rcc.cpp | 22 +++++++++++----------- src/libs/installer/qsettingswrapper.cpp | 4 ++-- src/libs/kdtools/selfrestarter.cpp | 15 ++++++++------- 3 files changed, 21 insertions(+), 20 deletions(-) (limited to 'src/libs') diff --git a/src/libs/ifwtools/rcc/rcc.cpp b/src/libs/ifwtools/rcc/rcc.cpp index 10b7cbc4f..12f399937 100644 --- a/src/libs/ifwtools/rcc/rcc.cpp +++ b/src/libs/ifwtools/rcc/rcc.cpp @@ -120,18 +120,18 @@ public: RCCFileInfo::RCCFileInfo(const QString &name, const QFileInfo &fileInfo, QLocale::Language language, QLocale::Country country, uint flags, int compressLevel, int compressThreshold) + : m_flags(flags) + , m_name(name) + , m_language(language) + , m_country(country) + , m_fileInfo(fileInfo) + , m_parent(nullptr) + , m_compressLevel(compressLevel) + , m_compressThreshold(compressThreshold) + , m_nameOffset(0) + , m_dataOffset(0) + , m_childOffset(0) { - m_name = name; - m_fileInfo = fileInfo; - m_language = language; - m_country = country; - m_flags = flags; - m_parent = nullptr; - m_nameOffset = 0; - m_dataOffset = 0; - m_childOffset = 0; - m_compressLevel = compressLevel; - m_compressThreshold = compressThreshold; } RCCFileInfo::~RCCFileInfo() diff --git a/src/libs/installer/qsettingswrapper.cpp b/src/libs/installer/qsettingswrapper.cpp index 56db28d78..f57750bc1 100644 --- a/src/libs/installer/qsettingswrapper.cpp +++ b/src/libs/installer/qsettingswrapper.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -74,9 +74,9 @@ public: Private(const QString &fileName, QSettings::Format format) : m_filename(fileName) + , m_format(format) , settings(fileName, format) { - m_format = format; m_scope = settings.scope(); m_application = settings.applicationName(); m_organization = settings.organizationName(); diff --git a/src/libs/kdtools/selfrestarter.cpp b/src/libs/kdtools/selfrestarter.cpp index 7326ac070..7771fafac 100644 --- a/src/libs/kdtools/selfrestarter.cpp +++ b/src/libs/kdtools/selfrestarter.cpp @@ -36,20 +36,21 @@ class SelfRestarter::Private { public: Private(int argc, char *argv[]) - : restartOnQuit(false) + : executable(QString::fromLocal8Bit(argv[0])) + , restartOnQuit(false) + , workingPath(QDir::currentPath()) { - executable = QString::fromLocal8Bit(argv[0]); - workingPath = QDir::currentPath(); + for (int i = 1; i < argc; ++i) args << QString::fromLocal8Bit(argv[i]); } Private() - : restartOnQuit(false) + : executable(qApp->applicationFilePath()) + , args(qApp->arguments().mid(1)) + , restartOnQuit(false) + , workingPath(QDir::currentPath()) { - executable = qApp->applicationFilePath(); - workingPath = QDir::currentPath(); - args = qApp->arguments().mid(1); } ~Private() -- cgit v1.2.3