diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.cpp b/src/plugins/coreplugin/inavigationwidgetfactory.cpp index c28b6111a021182e875176758e46d8570920fddc..65e6ba1ba33420cbf00a6a1c1e25fa01ff797e6f 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 2850bcd92d545ffca8cd41873ca21854226ed950..106b160e5e4246f10e8f4f4e3d816f1a2fcbafca 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 d05c922b5e036f1c7ec63ba538ae5907e31ec14a..f7aecb22ff489c000470f5a352c8911bbdb5000f 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 dbb200896e670f607e5117770b7197f228ea56c0..41115548d7159aeaa2e3b0f4ab409a8eb4e4c36d 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 0cc1918e645839ffda1cd52d3d63c216aca415d8..a6b597bb2405f42f5d82341fe225d76f2611934c 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;