From d6fbb1b5730eac0b06ee6bfcbae71075ab6e57bd Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <qtc-committer@nokia.com>
Date: Fri, 19 Dec 2008 10:49:29 +0100
Subject: [PATCH] Fixes: gcc 4.3.2 compile warnings

---
 src/app/main.cpp                                    | 4 ++--
 src/plugins/cmakeprojectmanager/cmakestep.cpp       | 6 +++---
 src/plugins/cmakeprojectmanager/makestep.cpp        | 6 +++---
 src/plugins/coreplugin/inavigationwidgetfactory.cpp | 4 ++--
 src/plugins/git/gitclient.cpp                       | 2 +-
 src/plugins/perforce/perforceeditor.cpp             | 2 +-
 src/plugins/qt4projectmanager/directorywatcher.cpp  | 3 ++-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index f11e81764d1..2efc04f1451 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -98,12 +98,12 @@ static void displayError(const QString &t) // No console on Windows.
 
 static void displayHelpText(const QString &t)
 {
-    qWarning(t.toUtf8().constData());
+    qWarning("%s", qPrintable(t));
 }
 
 static void displayError(const QString &t)
 {
-    qCritical(t.toUtf8().constData());
+    qCritical("%s", qPrintable(t));
 }
 
 #endif
diff --git a/src/plugins/cmakeprojectmanager/cmakestep.cpp b/src/plugins/cmakeprojectmanager/cmakestep.cpp
index 88572968040..13963273287 100644
--- a/src/plugins/cmakeprojectmanager/cmakestep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakestep.cpp
@@ -99,7 +99,7 @@ QString CMakeBuildStepConfigWidget::displayName() const
     return "CMake";
 }
 
-void CMakeBuildStepConfigWidget::init(const QString &buildConfiguration)
+void CMakeBuildStepConfigWidget::init(const QString & /*buildConfiguration */)
 {
     // TODO
 }
@@ -121,12 +121,12 @@ ProjectExplorer::BuildStep *CMakeBuildStepFactory::create(ProjectExplorer::Proje
     return new CMakeStep(pro);
 }
 
-QStringList CMakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project *pro) const
+QStringList CMakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project * /* pro */) const
 {
     return QStringList();
 }
 
-QString CMakeBuildStepFactory::displayNameForName(const QString &name) const
+QString CMakeBuildStepFactory::displayNameForName(const QString & /* name */) const
 {
     return "CMake";
 }
diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp
index 1c7e7f055f5..abd77cd10aa 100644
--- a/src/plugins/cmakeprojectmanager/makestep.cpp
+++ b/src/plugins/cmakeprojectmanager/makestep.cpp
@@ -93,7 +93,7 @@ QString MakeBuildStepConfigWidget::displayName() const
     return "Make";
 }
 
-void MakeBuildStepConfigWidget::init(const QString &buildConfiguration)
+void MakeBuildStepConfigWidget::init(const QString & /* buildConfiguration */)
 {
     // TODO
 }
@@ -115,12 +115,12 @@ ProjectExplorer::BuildStep *MakeBuildStepFactory::create(ProjectExplorer::Projec
     return new MakeStep(pro);
 }
 
-QStringList MakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project *pro) const
+QStringList MakeBuildStepFactory::canCreateForProject(ProjectExplorer::Project * /* pro */) const
 {
     return QStringList();
 }
 
-QString MakeBuildStepFactory::displayNameForName(const QString &name) const
+QString MakeBuildStepFactory::displayNameForName(const QString & /* name */) const
 {
     return "Make";
 }
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
index 885277434d7..f2ac6d8d539 100644
--- a/src/plugins/coreplugin/inavigationwidgetfactory.cpp
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
@@ -49,12 +49,12 @@ QKeySequence INavigationWidgetFactory::activationSequence()
 }
 
 
-void INavigationWidgetFactory::saveSettings(int position, QWidget *widget)
+void INavigationWidgetFactory::saveSettings(int /* position */, QWidget * /* widget */)
 {
 
 }
 
-void INavigationWidgetFactory::restoreSettings(int position, QWidget *widget)
+void INavigationWidgetFactory::restoreSettings(int /* position */, QWidget * /* widget */)
 {
 
 }
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 3113ebf3f86..f4a0feb33e7 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -476,7 +476,7 @@ static inline QString trimFileSpecification(QString fileSpec)
         // Collapse the sequence of spaces
         const int filePos = colonIndex + 2;
         int nonBlankPos = filePos;
-        for ( ; fileSpec.at(nonBlankPos).isSpace(); nonBlankPos++);
+        for ( ; fileSpec.at(nonBlankPos).isSpace(); nonBlankPos++) ;
         if (nonBlankPos > filePos)
             fileSpec.remove(filePos, nonBlankPos - filePos);
     }
diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp
index 5a0b1d2340e..d54ce10de5f 100644
--- a/src/plugins/perforce/perforceeditor.cpp
+++ b/src/plugins/perforce/perforceeditor.cpp
@@ -151,7 +151,7 @@ QString PerforceEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock)
             // Ask plugin to map back
             const QString fileName = m_plugin->fileNameFromPerforceName(diffFileName.trimmed(), &errorMessage);
             if (fileName.isEmpty())
-                qWarning(errorMessage.toUtf8().constData());
+                qWarning("%s", qPrintable(errorMessage));
             return fileName;
         }
     }
diff --git a/src/plugins/qt4projectmanager/directorywatcher.cpp b/src/plugins/qt4projectmanager/directorywatcher.cpp
index 3434b0284d4..e2e0828219f 100644
--- a/src/plugins/qt4projectmanager/directorywatcher.cpp
+++ b/src/plugins/qt4projectmanager/directorywatcher.cpp
@@ -207,7 +207,8 @@ int FileWatcher::m_objectCount = 0;
 QHash<QString,int> FileWatcher::m_fileCount;
 QFileSystemWatcher *FileWatcher::m_watcher = 0;
 
-FileWatcher::FileWatcher(QObject *parent)
+FileWatcher::FileWatcher(QObject *parent) :
+    QObject(parent)
 {
     if (!m_watcher)
         m_watcher = new QFileSystemWatcher();
-- 
GitLab