From f5e7fb9cbb7f3faa573bebc3b8016db93ccec1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Fri, 12 Jun 2009 13:55:08 +0200
Subject: [PATCH] Corrected name of .config editor
---
src/plugins/coreplugin/inavigationwidgetfactory.cpp | 3 ---
src/plugins/cppeditor/cpphoverhandler.cpp | 2 +-
src/plugins/genericprojectmanager/genericprojectconstants.h | 2 +-
src/plugins/projectexplorer/buildconfiguration.h | 6 ++++--
src/plugins/texteditor/completionsupport.cpp | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/src/plugins/coreplugin/inavigationwidgetfactory.cpp
index c28b6111a02..65e6ba1ba33 100644
--- 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 2850bcd92d5..106b160e5e4 100644
--- 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 d05c922b5e0..f7aecb22ff4 100644
--- 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 dbb200896e6..41115548d71 100644
--- 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 0cc1918e645..a6b597bb240 100644
--- 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;
--
GitLab