aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/mesonprojectmanager
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2020-06-12 11:18:04 +0300
committerOrgad Shaneh <orgads@gmail.com>2020-06-12 09:42:02 +0000
commit60dab96d3953de1ba64ae2174138ba3a4ec5dc03 (patch)
treecbf21961b20c4d844ef926d7b7c19c91d015acae /src/plugins/mesonprojectmanager
parentbdb4e3d7935eb3ae8315f196e82eb64551f5f455 (diff)
Meson: Fix issues reported by Coverity
Mostly uninitialized members, and one use-after-free. Change-Id: Idfc9b0f39733e87e22a97d741cb261e1b09a8815 Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/mesonprojectmanager')
-rw-r--r--src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h4
-rw-r--r--src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h2
-rw-r--r--src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp1
-rw-r--r--src/plugins/mesonprojectmanager/project/mesonprojectparser.h4
-rw-r--r--src/plugins/mesonprojectmanager/project/ninjabuildstep.h2
-rw-r--r--src/plugins/mesonprojectmanager/settings/general/settings.cpp2
-rw-r--r--src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp3
7 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h
index c196571cc3..283af738ce 100644
--- a/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h
+++ b/src/plugins/mesonprojectmanager/project/buildoptions/optionsmodel/buildoptionsmodel.h
@@ -163,9 +163,7 @@ public:
QTC_ASSERT(column >= 0 && column < 2, return Qt::NoItemFlags);
if (column == 0)
return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
- if (column == 1)
- return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
- return Qt::NoItemFlags;
+ return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable;
}
BuildOption::Type type() const { return m_option->type(); }
QString toolTip() const { return m_option->description(); }
diff --git a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
index 0e82e23b26..8afd949a4f 100644
--- a/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
+++ b/src/plugins/mesonprojectmanager/project/mesonbuildconfiguration.h
@@ -117,7 +117,7 @@ private:
bool fromMap(const QVariantMap &map) override;
MesonBuildType m_buildType;
ProjectExplorer::NamedWidget *createConfigWidget() final;
- MesonBuildSystem *m_buildSystem;
+ MesonBuildSystem *m_buildSystem = nullptr;
};
class MesonBuildConfigurationFactory final : public ProjectExplorer::BuildConfigurationFactory
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
index 3c841ae37a..56d9c0bceb 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
@@ -110,7 +110,6 @@ MesonProjectParser::MesonProjectParser(const Core::Id &meson,
ProjectExplorer::Project *project)
: m_env{env}
, m_meson{meson}
- , m_configuring{false}
, m_projectName{project->displayName()}
{
connect(&m_process, &MesonProcess::finished, this, &MesonProjectParser::processFinished);
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
index 8db55d82b5..867af8135b 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.h
@@ -116,11 +116,11 @@ private:
Utils::FilePath m_buildDir;
Utils::FilePath m_srcDir;
QFuture<ParserData *> m_parserFutureResult;
- bool m_configuring;
+ bool m_configuring = false;
IntroDataType m_introType;
MesonInfoParser::Result m_parserResult;
QStringList m_targetsNames;
- Utils::QtVersion m_qtVersion;
+ Utils::QtVersion m_qtVersion = Utils::QtVersion::Unknown;
std::unique_ptr<MesonProjectNode> m_rootNode; // <- project tree root node
QString m_projectName;
// maybe moving meson to build step could make this class simpler
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h b/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
index 59aa78ea40..12dc9c2b5a 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
+++ b/src/plugins/mesonprojectmanager/project/ninjabuildstep.h
@@ -56,7 +56,7 @@ private:
QString defaultBuildTarget() const;
QString m_commandArgs;
QString m_targetName;
- NinjaParser *m_ninjaParser;
+ NinjaParser *m_ninjaParser = nullptr;
};
class MesonBuildStepFactory final : public ProjectExplorer::BuildStepFactory
diff --git a/src/plugins/mesonprojectmanager/settings/general/settings.cpp b/src/plugins/mesonprojectmanager/settings/general/settings.cpp
index 1193a0d8c0..7be0c1c017 100644
--- a/src/plugins/mesonprojectmanager/settings/general/settings.cpp
+++ b/src/plugins/mesonprojectmanager/settings/general/settings.cpp
@@ -28,6 +28,8 @@ namespace MesonProjectManager {
namespace Internal {
Settings::Settings(QObject *parent)
: QObject(parent)
+ , m_autorunMeson(true)
+ , m_verboseNinja(true)
{}
} // namespace Internal
} // namespace MesonProjectManager
diff --git a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
index fc3d750a03..de13515a5a 100644
--- a/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
+++ b/src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
@@ -62,8 +62,9 @@ void ToolsModel::addMesonTool()
void ToolsModel::removeMesonTool(ToolTreeItem *item)
{
QTC_ASSERT(item, return );
+ const Core::Id id = item->id();
destroyItem(item);
- m_itemsToRemove.enqueue(item->id());
+ m_itemsToRemove.enqueue(id);
}
ToolTreeItem *ToolsModel::cloneMesonTool(ToolTreeItem *item)