From e2fb40c7631c959bc51e6cf56661bb633951f7cc Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <qtc-committer@nokia.com>
Date: Tue, 2 Dec 2008 12:21:14 +0100
Subject: [PATCH] Fixes: Compiler warnings
---
src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp | 6 +++---
src/plugins/projectexplorer/buildstepspage.cpp | 2 +-
src/plugins/projectexplorer/runconfiguration.cpp | 2 ++
src/plugins/texteditor/fontsettings.cpp | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
index 45c8c5d2132..9a9190568f1 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
@@ -48,11 +48,11 @@ CMakeProjectPlugin::~CMakeProjectPlugin()
{
}
-bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *error_message)
+bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage)
{
Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
- QString errorMessage;
- core->mimeDatabase()->addMimeTypes(QLatin1String(":cmakeproject/CMakeProject.mimetypes.xml"), &errorMessage);
+ if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":cmakeproject/CMakeProject.mimetypes.xml"), errorMessage))
+ return false;
addAutoReleasedObject(new CMakeManager());
return true;
}
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 3777281dcc7..a7b8c9b0ebf 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -92,7 +92,7 @@ BuildStepsPage::~BuildStepsPage()
delete m_ui;
}
-void BuildStepsPage::displayNameChanged(BuildStep *bs, const QString &displayName)
+void BuildStepsPage::displayNameChanged(BuildStep *bs, const QString & /* displayName */)
{
int index = m_pro->buildSteps().indexOf(bs);
m_ui->buildSettingsList->invisibleRootItem()->child(index)->setText(0, bs->displayName());
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 612fc64bc38..a91287b07e5 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -118,6 +118,8 @@ void RunControl::bringApplicationToForeground(qint64 pid)
m_internalPid = pid;
m_foregroundCount = 0;
bringApplicationToForegroundInternal();
+#else
+ Q_UNUSED(pid)
#endif
}
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp
index 1ced2cafd69..82bfcded513 100644
--- a/src/plugins/texteditor/fontsettings.cpp
+++ b/src/plugins/texteditor/fontsettings.cpp
@@ -133,7 +133,7 @@ bool Format::equals(const Format &f) const
m_bold == f.m_bold && m_italic == f.m_italic;
}
// -- FontSettings
-FontSettings::FontSettings(const FormatDescriptions &fd) :
+FontSettings::FontSettings(const FormatDescriptions & /* fd */) :
m_family(defaultFixedFontFamily()),
m_fontSize(DEFAULT_FONT_SIZE)
{
--
GitLab