Clang: Clean up clangcompletion.h

Change-Id: I6f9223680377987126e58b1c5003240ebb6f1020
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>

2 files changed, 46 insertions, 34 deletions

diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index bf9afdbb14..0ef9891c49 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -32,9 +32,6 @@
 #include "clangutils.h"
 #include "pchmanager.h"
 
-#include <coreplugin/icore.h>
-#include <coreplugin/idocument.h>
-
 #include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/ExpressionUnderCursor.h>
 #include <cplusplus/Token.h>
@@ -377,8 +374,6 @@ bool ClangAssistProposalModel::isSortable(const QString &prefix) const
     return true;
 }
 
-} // namespace Internal
-} // namespace ClangCodeModel
 
 bool ClangAssistProposalItem::prematurelyApplies(const QChar &typedChar) const
 {
@@ -533,7 +528,23 @@ bool ClangCompletionAssistInterface::objcEnabled() const
     return m_clangWrapper->objcEnabled();
 }
 
-ClangCompletionAssistInterface::ClangCompletionAssistInterface(ClangCompleter::Ptr clangWrapper,
+const QStringList &ClangCompletionAssistInterface::options() const
+{
+    return m_options;
+}
+
+const QList<ProjectPart::HeaderPath> &ClangCompletionAssistInterface::headerPaths() const
+{
+    return m_headerPaths;
+}
+
+LanguageFeatures ClangCompletionAssistInterface::languageFeatures() const
+{
+    return m_languageFeatures;
+}
+
+ClangCompletionAssistInterface::ClangCompletionAssistInterface(
+        ClangCompleter::Ptr clangWrapper,
         QTextDocument *document,
         int position,
         const QString &fileName,
@@ -555,6 +566,16 @@ ClangCompletionAssistInterface::ClangCompletionAssistInterface(ClangCompleter::P
     m_unsavedFiles = Utils::createUnsavedFiles(mmi->workingCopy());
 }
 
+ClangCompleter::Ptr ClangCompletionAssistInterface::clangWrapper() const
+{
+    return m_clangWrapper;
+}
+
+const UnsavedFiles &ClangCompletionAssistInterface::unsavedFiles() const
+{
+    return m_unsavedFiles;
+}
+
 ClangCompletionAssistProcessor::ClangCompletionAssistProcessor()
     : m_model(new ClangAssistProposalModel)
     , m_completionOperator(T_EOF_SYMBOL)
@@ -1151,3 +1172,7 @@ void ClangCompletionAssistProcessor::addCompletionItem(const QString &text,
     item->keepCompletionOperator(m_completionOperator);
     m_completions.append(item);
 }
+
+
+} // namespace Internal
+} // namespace ClangCodeModel
diff --git a/src/plugins/clangcodemodel/clangcompletion.h b/src/plugins/clangcodemodel/clangcompletion.h
index 0449be0116..33ef3d6fff 100644
--- a/src/plugins/clangcodemodel/clangcompletion.h
+++ b/src/plugins/clangcodemodel/clangcompletion.h
@@ -33,22 +33,20 @@
 
 #include "clangcompleter.h"
 
-#include <cplusplus/Icons.h>
-
 #include <cpptools/cppcompletionassistprocessor.h>
 #include <cpptools/cppcompletionassistprovider.h>
 #include <cpptools/cppmodelmanager.h>
 
+#include <texteditor/codeassist/assistinterface.h>
 #include <texteditor/codeassist/assistproposalitem.h>
 #include <texteditor/codeassist/completionassistprovider.h>
-#include <texteditor/codeassist/assistinterface.h>
 
 #include <QStringList>
 #include <QTextCursor>
 
 namespace ClangCodeModel {
-
 namespace Internal {
+
 class ClangAssistProposalModel;
 
 class ClangCompletionAssistProvider : public CppTools::CppCompletionAssistProvider
@@ -58,19 +56,17 @@ class ClangCompletionAssistProvider : public CppTools::CppCompletionAssistProvid
 public:
     ClangCompletionAssistProvider();
 
-    virtual TextEditor::IAssistProcessor *createProcessor() const;
-    virtual TextEditor::AssistInterface *createAssistInterface(
+    TextEditor::IAssistProcessor *createProcessor() const override;
+    TextEditor::AssistInterface *createAssistInterface(
             const QString &filePath, QTextDocument *document,
             const CPlusPlus::LanguageFeatures &languageFeatures,
-            int position, TextEditor::AssistReason reason) const;
+            int position, TextEditor::AssistReason reason) const override;
 
 private:
     ClangCodeModel::ClangCompleter::Ptr m_clangCompletionWrapper;
 };
 
-} // namespace Internal
-
-class CLANG_EXPORT ClangCompletionAssistInterface: public TextEditor::AssistInterface
+class ClangCompletionAssistInterface: public TextEditor::AssistInterface
 {
 public:
     ClangCompletionAssistInterface(ClangCodeModel::ClangCompleter::Ptr clangWrapper,
@@ -83,22 +79,12 @@ public:
                                    const Internal::PchInfo::Ptr &pchInfo,
                                    const CPlusPlus::LanguageFeatures &features);
 
-    ClangCodeModel::ClangCompleter::Ptr clangWrapper() const
-    { return m_clangWrapper; }
-
-    const ClangCodeModel::Internal::UnsavedFiles &unsavedFiles() const
-    { return m_unsavedFiles; }
-
+    ClangCodeModel::ClangCompleter::Ptr clangWrapper() const;
+    const ClangCodeModel::Internal::UnsavedFiles &unsavedFiles() const;
     bool objcEnabled() const;
-
-    const QStringList &options() const
-    { return m_options; }
-
-    const QList<CppTools::ProjectPart::HeaderPath> &headerPaths() const
-    { return m_headerPaths; }
-
-    CPlusPlus::LanguageFeatures languageFeatures() const
-    { return m_languageFeatures; }
+    const QStringList &options() const;
+    const QList<CppTools::ProjectPart::HeaderPath> &headerPaths() const;
+    CPlusPlus::LanguageFeatures languageFeatures() const;
 
 private:
     ClangCodeModel::ClangCompleter::Ptr m_clangWrapper;
@@ -109,15 +95,15 @@ private:
     CPlusPlus::LanguageFeatures m_languageFeatures;
 };
 
-class CLANG_EXPORT ClangCompletionAssistProcessor : public CppTools::CppCompletionAssistProcessor
+class ClangCompletionAssistProcessor : public CppTools::CppCompletionAssistProcessor
 {
     Q_DECLARE_TR_FUNCTIONS(ClangCodeModel::Internal::ClangCompletionAssistProcessor)
 
 public:
     ClangCompletionAssistProcessor();
-    virtual ~ClangCompletionAssistProcessor();
+    ~ClangCompletionAssistProcessor();
 
-    virtual TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface);
+    TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override;
 
 private:
     int startCompletionHelper();
@@ -144,6 +130,7 @@ private:
     unsigned m_completionOperator;
 };
 
+} // namespace Internal
 } // namespace Clang
 
 #endif // CPPEDITOR_INTERNAL_CLANGCOMPLETION_H