Corrected name of .config editor

diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
index c28b611..65e6ba1 100644 (file)
--- a/src/plugins/coreplugin/inavigationwidgetfactory.cpp
+++ b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
@@ -46,13 +46,10 @@ QKeySequence INavigationWidgetFactory::activationSequence()
     return QKeySequence();
 }
 
-
 void INavigationWidgetFactory::saveSettings(int /* position */, QWidget * /* widget */)
 {
-
 }
 
 void INavigationWidgetFactory::restoreSettings(int /* position */, QWidget * /* widget */)
 {
-
 }

diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index 2850bcd..106b160 100644 (file)
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -269,7 +269,7 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
     const Snapshot documents = m_modelManager->snapshot();
     const QString fileName = editor->file()->fileName();
     Document::Ptr doc = documents.value(fileName);
-    if (! doc)
+    if (!doc)
         return; // nothing to do
 
     QTextCursor tc(edit->document());

diff --git a/src/plugins/genericprojectmanager/genericprojectconstants.h b/src/plugins/genericprojectmanager/genericprojectconstants.h
index d05c922..f7aecb2 100644 (file)
--- a/src/plugins/genericprojectmanager/genericprojectconstants.h
+++ b/src/plugins/genericprojectmanager/genericprojectconstants.h
@@ -49,7 +49,7 @@ const char *const FILES_MIMETYPE     = "application/vnd.nokia.qt.generic.files";
 const char *const INCLUDES_EDITOR    = ".includes Editor";
 const char *const INCLUDES_MIMETYPE  = "application/vnd.nokia.qt.generic.includes";
 
-const char *const CONFIG_EDITOR      = ".includes Editor";
+const char *const CONFIG_EDITOR      = ".config Editor";
 const char *const CONFIG_MIMETYPE    = "application/vnd.nokia.qt.generic.config";
 
 } // namespace Constants

diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index dbb2008..4111554 100644 (file)
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -36,14 +36,15 @@
 
 namespace ProjectExplorer {
 namespace Internal {
+
 class BuildConfiguration
 {
 public:
     BuildConfiguration(const QString &name);
     BuildConfiguration(const QString &name, BuildConfiguration *source);
     QString name() const;
-    QVariant getValue(const QString & key) const;
-    void setValue(const QString & key, QVariant value);
+    QVariant getValue(const QString &key) const;
+    void setValue(const QString &key, QVariant value);
 
     QString displayName();
     void setDisplayName(const QString &name);
@@ -55,6 +56,7 @@ private:
     QHash<QString, QVariant> m_values;
     QString m_name;
 };
+
 }
 } // namespace ProjectExplorer
 

diff --git a/src/plugins/texteditor/completionsupport.cpp b/src/plugins/texteditor/completionsupport.cpp
index 0cc1918..a6b597b 100644 (file)
--- a/src/plugins/texteditor/completionsupport.cpp
+++ b/src/plugins/texteditor/completionsupport.cpp
@@ -192,7 +192,7 @@ QList<CompletionItem> CompletionSupport::getCompletions() const
     QString lastKey;
     QList<CompletionItem> uniquelist;
 
-    foreach (const CompletionItem item, completionItems) {
+    foreach (const CompletionItem &item, completionItems) {
         if (item.m_text != lastKey) {
             uniquelist.append(item);
             lastKey = item.m_text;