Krazy fixes (spelling, single char strings, char constants).

11 files changed, 22 insertions, 20 deletions

diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index e9377b423a..fd12c80bc1 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -559,7 +559,7 @@ QList<Abi> Abi::abisOfBinary(const QString &path)
                     && tmp.at(0).binaryFormat() != Abi::MachOFormat)
                 break;
 
-            offset += (offset % 2); // ar is 2 byte alligned
+            offset += (offset % 2); // ar is 2 byte aligned
             f.seek(offset);
             data = f.read(1024);
         }
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
index 5303f07317..871f07d56e 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
@@ -44,7 +44,7 @@
 
     \brief Base class for project wizards.
 
-    Presents the introductory page and takes care of setting the folder choosen
+    Presents the introductory page and takes care of setting the folder chosen
     as default projects' folder should the user wish to do that.
 */
 
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 0bda4a0c6c..d729439ad6 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -366,7 +366,8 @@ void BuildManager::progressChanged()
     int range = d->m_watcher.progressMaximum() - d->m_watcher.progressMinimum();
     if (range != 0) {
         int percent = (d->m_watcher.progressValue() - d->m_watcher.progressMinimum()) * 100 / range;
-        d->m_progressFutureInterface->setProgressValueAndText(d->m_progress * 100 + percent, msgProgress(d->m_progress, d->m_maxProgress) + "\n" + d->m_watcher.progressText());
+        d->m_progressFutureInterface->setProgressValueAndText(d->m_progress * 100 + percent, msgProgress(d->m_progress, d->m_maxProgress)
+                                                              + QLatin1Char('\n') + d->m_watcher.progressText());
     }
 }
 
@@ -376,7 +377,8 @@ void BuildManager::progressTextChanged()
     int percent = 0;
     if (range != 0)
         percent = (d->m_watcher.progressValue() - d->m_watcher.progressMinimum()) * 100 / range;
-    d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100 + percent, msgProgress(d->m_progress, d->m_maxProgress) + "\n" + d->m_watcher.progressText());
+    d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100 + percent, msgProgress(d->m_progress, d->m_maxProgress) +
+                                                          QLatin1Char('\n') + d->m_watcher.progressText());
 }
 
 void BuildManager::nextStep()
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index e4ec01a835..7d0a77d4a5 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -382,7 +382,7 @@ static QString listWizards()
     QString rc;
     QTextStream str(&rc);
     CategoryWizardMap categoryWizardMap;
-    foreach(const  Core::IWizard *w, Core::IWizard::allWizards())
+    foreach (const Core::IWizard *w, Core::IWizard::allWizards())
         categoryWizardMap.insert(w->category(), w);
     str << "### Registered wizards (" << categoryWizardMap.size() << ")\n";
     // Format
diff --git a/src/plugins/projectexplorer/doubletabwidget.cpp b/src/plugins/projectexplorer/doubletabwidget.cpp
index 13b79e4f79..c32f950b3d 100644
--- a/src/plugins/projectexplorer/doubletabwidget.cpp
+++ b/src/plugins/projectexplorer/doubletabwidget.cpp
@@ -316,7 +316,7 @@ void DoubleTabWidget::mousePressEvent(QMouseEvent *event)
             m_tabs[m_currentIndex].currentSubTab = hit.second;
             update();
             // todo next two lines were outside the if leading to
-            // unecessary (?) signal emissions?
+            // unnecessary (?) signal emissions?
             event->accept();
             emit currentIndexChanged(m_currentIndex, m_tabs.at(m_currentIndex).currentSubTab);
             return;
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index 0aa344baeb..69bd2687ab 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -447,7 +447,7 @@ void MiniProjectTargetSelector::mousePressEvent(QMouseEvent *e)
 
 QString MiniProjectTargetSelector::fullName(ProjectExplorer::Project *project)
 {
-    return project->displayName() + " (" + project->file()->fileName() + ")";
+    return project->displayName() + " (" + project->file()->fileName() + QLatin1Char(')');
 }
 
 void MiniProjectTargetSelector::addProject(ProjectExplorer::Project *project)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index d477e38c3b..e18139dfd7 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -152,8 +152,8 @@ namespace {
 bool debug = false;
 }
 
-static const char * const kCurrentProjectPath = "CurrentProject:Path";
-static const char * const kCurrentProjectFilePath = "CurrentProject:FilePath";
+static const char kCurrentProjectPath[] = "CurrentProject:Path";
+static const char kCurrentProjectFilePath[] = "CurrentProject:FilePath";
 
 namespace ProjectExplorer {
 
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index a8f9375fd8..fee4502948 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -250,7 +250,7 @@ static int findMatchingProject(const QList<ProjectEntry> &projects,
 
 static QString generatedProjectFilePath(const QList<Core::GeneratedFile> &files)
 {
-    foreach (const Core::GeneratedFile file, files)
+    foreach (const Core::GeneratedFile &file, files)
         if (file.attributes() & Core::GeneratedFile::OpenProjectAttribute)
             return file.path();
     return QString();
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 5979f62fa1..d0a2754a58 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -39,8 +39,8 @@
 
 #include <QtCore/QCoreApplication>
 
-static const char *const ID_KEY = "ProjectExplorer.ToolChain.Id";
-static const char *const DISPLAY_NAME_KEY = "ProjectExplorer.ToolChain.DisplayName";
+static const char ID_KEY[] = "ProjectExplorer.ToolChain.Id";
+static const char DISPLAY_NAME_KEY[] = "ProjectExplorer.ToolChain.DisplayName";
 
 namespace ProjectExplorer {
 namespace Internal {
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index cb774883eb..7c3cb85ee0 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -44,13 +44,13 @@
 #include <QtCore/QSettings>
 #include <QtGui/QMainWindow>
 
-static const char *const TOOLCHAIN_DATA_KEY = "ToolChain.";
-static const char *const TOOLCHAIN_COUNT_KEY = "ToolChain.Count";
-static const char *const TOOLCHAIN_FILE_VERSION_KEY = "Version";
-static const char *const DEFAULT_DEBUGGER_COUNT_KEY = "DefaultDebugger.Count";
-static const char *const DEFAULT_DEBUGGER_ABI_KEY = "DefaultDebugger.Abi.";
-static const char *const DEFAULT_DEBUGGER_PATH_KEY = "DefaultDebugger.Path.";
-static const char *const TOOLCHAIN_FILENAME = "/toolChains.xml";
+static const char TOOLCHAIN_DATA_KEY[] = "ToolChain.";
+static const char TOOLCHAIN_COUNT_KEY[] = "ToolChain.Count";
+static const char TOOLCHAIN_FILE_VERSION_KEY[] = "Version";
+static const char DEFAULT_DEBUGGER_COUNT_KEY[] = "DefaultDebugger.Count";
+static const char DEFAULT_DEBUGGER_ABI_KEY[] = "DefaultDebugger.Abi.";
+static const char DEFAULT_DEBUGGER_PATH_KEY[] = "DefaultDebugger.Path.";
+static const char TOOLCHAIN_FILENAME[] = "/toolChains.xml";
 
 static QString settingsFileName()
 {
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index 51fa4a19dd..8f07cec4a7 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -1842,7 +1842,7 @@ static QVariant version8VarNodeTransform(const QVariant &var)
     };
     static QSet<QString> map;
     if (map.isEmpty())
-        for (unsigned i = 0; i < sizeof(vars)/sizeof(vars[0]); i++)
+        for (unsigned i = 0; i < sizeof(vars)/sizeof(vars[0]); ++i)
             map.insert(QLatin1String("CURRENT_DOCUMENT:") + QLatin1String(vars[i]));
 
     QString str = var.toString();