feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: Compiler warnings

Browse Source
This commit is contained in:
Friedemann Kleint
2008-12-02 12:21:14 +01:00
parent 05c35356ab
commit e2fb40c763
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
View File

@@ -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>(); Core::ICore *core = ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>();
QString errorMessage; if (!core->mimeDatabase()->addMimeTypes(QLatin1String(":cmakeproject/CMakeProject.mimetypes.xml"), errorMessage))
core->mimeDatabase()->addMimeTypes(QLatin1String(":cmakeproject/CMakeProject.mimetypes.xml"), &errorMessage); return false;
addAutoReleasedObject(new CMakeManager()); addAutoReleasedObject(new CMakeManager());
return true; return true;
} }

2
src/plugins/projectexplorer/buildstepspage.cpp
View File

@@ -92,7 +92,7 @@ BuildStepsPage::~BuildStepsPage()
delete m_ui; 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); int index = m_pro->buildSteps().indexOf(bs);
m_ui->buildSettingsList->invisibleRootItem()->child(index)->setText(0, bs->displayName()); m_ui->buildSettingsList->invisibleRootItem()->child(index)->setText(0, bs->displayName());

2
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -118,6 +118,8 @@ void RunControl::bringApplicationToForeground(qint64 pid)
m_internalPid = pid; m_internalPid = pid;
m_foregroundCount = 0; m_foregroundCount = 0;
bringApplicationToForegroundInternal(); bringApplicationToForegroundInternal();
#else
Q_UNUSED(pid)
#endif #endif
} }

2
src/plugins/texteditor/fontsettings.cpp
View File

@@ -133,7 +133,7 @@ bool Format::equals(const Format &f) const
m_bold == f.m_bold && m_italic == f.m_italic; m_bold == f.m_bold && m_italic == f.m_italic;
} }
// -- FontSettings // -- FontSettings
FontSettings::FontSettings(const FormatDescriptions &fd) : FontSettings::FontSettings(const FormatDescriptions & /* fd */) :
m_family(defaultFixedFontFamily()), m_family(defaultFixedFontFamily()),
m_fontSize(DEFAULT_FONT_SIZE) m_fontSize(DEFAULT_FONT_SIZE)
{ {