CppEditor: Move CppEditorOutline to CppTools

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

src/plugins/cppeditor/cppeditor.cpp

@@ -35,7 +35,6 @@
 #include "cppdocumentationcommenthelper.h"
 #include "cppeditorconstants.h"
 #include "cppeditordocument.h"
-#include "cppeditoroutline.h"
 #include "cppeditorplugin.h"
 #include "cppfollowsymbolundercursor.h"
 #include "cpphighlighter.h"
@@ -51,6 +50,7 @@
 #include <cpptools/cppchecksymbols.h>
 #include <cpptools/cppcodeformatter.h>
 #include <cpptools/cppcompletionassistprovider.h>
+#include <cpptools/cppeditoroutline.h>
 #include <cpptools/cppmodelmanager.h>
 #include <cpptools/cppsemanticinfo.h>
 #include <cpptools/cpptoolsconstants.h>
@@ -242,7 +242,7 @@ CppEditorDocument *CppEditorWidget::cppEditorDocument() const
     return d->m_cppEditorDocument;
 }
 
-CppEditorOutline *CppEditorWidget::outline() const
+CppTools::CppEditorOutline *CppEditorWidget::outline() const
 {
     return d->m_cppEditorOutline;
 }

src/plugins/cppeditor/cppeditor.h

@@ -37,13 +37,16 @@
 
 #include <QScopedPointer>
 
-namespace CppTools { class SemanticInfo; }
+namespace CppTools {
+class CppEditorOutline;
+class SemanticInfo;
+}
 
 namespace CppEditor {
 namespace Internal {
 
 class CppEditorDocument;
-class CppEditorOutline;
+
 class CppEditorWidgetPrivate;
 class FollowSymbolUnderCursor;
 class FunctionDeclDefLink;
@@ -65,7 +68,7 @@ public:
     ~CppEditorWidget();
 
     CppEditorDocument *cppEditorDocument() const;
-    CppEditorOutline *outline() const;
+    CppTools::CppEditorOutline *outline() const;
 
     CppTools::SemanticInfo semanticInfo() const;
     bool isSemanticInfoValidExceptLocalUses() const;

src/plugins/cppeditor/cppeditor.pro

@@ -11,7 +11,6 @@ HEADERS += \
     cppeditordocument.h \
     cppeditorconstants.h \
     cppeditorenums.h \
-    cppeditoroutline.h \
     cppeditorplugin.h \
     cppelementevaluator.h \
     cppfollowsymbolundercursor.h \
@@ -42,7 +41,6 @@ SOURCES += \
     cppdocumentationcommenthelper.cpp \
     cppeditor.cpp \
     cppeditordocument.cpp \
-    cppeditoroutline.cpp \
     cppeditorplugin.cpp \
     cppelementevaluator.cpp \
     cppfollowsymbolundercursor.cpp \

src/plugins/cppeditor/cppeditor.qbs

@@ -27,7 +27,6 @@ QtcPlugin {
         "cppeditorconstants.h",
         "cppeditordocument.cpp", "cppeditordocument.h",
         "cppeditorenums.h",
-        "cppeditoroutline.cpp", "cppeditoroutline.h",
         "cppeditorplugin.cpp", "cppeditorplugin.h",
         "cppelementevaluator.cpp", "cppelementevaluator.h",
         "cppfollowsymbolundercursor.cpp", "cppfollowsymbolundercursor.h",

src/plugins/cppeditor/cppeditorplugin.cpp

@@ -35,7 +35,6 @@
 #include "cppeditorconstants.h"
 #include "cppeditor.h"
 #include "cppeditordocument.h"
-#include "cppeditoroutline.h"
 #include "cpphighlighter.h"
 #include "cpphoverhandler.h"
 #include "cppincludehierarchy.h"

src/plugins/cppeditor/cppoutline.cpp

@@ -30,7 +30,7 @@
 
 #include "cppoutline.h"
 
-#include "cppeditoroutline.h"
+#include <cpptools/cppeditoroutline.h>
 
 #include <cplusplus/OverviewModel.h>
 

src/plugins/cpptools/cppeditoroutline.cpp

@@ -30,8 +30,6 @@
 
 #include "cppeditoroutline.h"
 
-#include "cppeditorplugin.h"
-
 #include <cpptools/cppmodelmanager.h>
 #include <cpptools/cpptoolsreuse.h>
 #include <cpptools/cpptoolssettings.h>
@@ -44,12 +42,10 @@
 #include <QTimer>
 
 /*!
-    \class CppEditor::Internal::CppEditorOutline
+    \class CppTools::CppEditorOutline
     \brief A helper class that provides the outline model and widget,
            e.g. for the editor's tool bar.
 
-    \internal
-
     The caller is responsible for deleting the widget returned by widget().
  */
 
@@ -94,8 +90,7 @@ QTimer *newSingleShotTimer(QObject *parent, int msInternal, const QString &objec
 
 } // anonymous namespace
 
-namespace CppEditor {
+namespace CppTools {
-namespace Internal {
 
 CppEditorOutline::CppEditorOutline(TextEditor::TextEditorWidget *editorWidget)
     : QObject(editorWidget)
@@ -286,7 +281,6 @@ QModelIndex CppEditorOutline::indexForPosition(int line, int column,
     return lastIndex;
 }
 
-} // namespace Internal
+} // namespace CppTools
-} // namespace CppEditor
 
 #include <cppeditoroutline.moc>

src/plugins/cpptools/cppeditoroutline.h

@@ -31,6 +31,8 @@
 #ifndef CPPEDITOROUTLINE_H
 #define CPPEDITOROUTLINE_H
 
+#include "cpptools_global.h"
+
 #include <QModelIndex>
 #include <QObject>
 
@@ -44,10 +46,9 @@ namespace CPlusPlus { class OverviewModel; }
 namespace TextEditor { class TextEditorWidget; }
 namespace Utils { class TreeViewComboBox; }
 
-namespace CppEditor {
+namespace CppTools {
-namespace Internal {
 
-class CppEditorOutline : public QObject
+class CPPTOOLS_EXPORT CppEditorOutline : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY(CppEditorOutline)
@@ -94,7 +95,6 @@ private:
     QTimer *m_updateIndexTimer;
 };
 
-} // namespace Internal
+} // namespace CppTools
-} // namespace CppEditor
 
 #endif // CPPEDITOROUTLINE_H

src/plugins/cpptools/cpptools.pro

@@ -25,6 +25,7 @@ HEADERS += \
     cppcompletionassistprocessor.h \
     cppcompletionassistprovider.h \
     cppcurrentdocumentfilter.h \
+    cppeditoroutline.h \
     cppdoxygen.h \
     cppfilesettingspage.h \
     cppfindreferences.h \
@@ -88,6 +89,7 @@ SOURCES += \
     cppcompletionassistprocessor.cpp \
     cppcompletionassistprovider.cpp \
     cppcurrentdocumentfilter.cpp \
+    cppeditoroutline.cpp \
     cppdoxygen.cpp \
     cppfilesettingspage.cpp \
     cppfindreferences.cpp \

src/plugins/cpptools/cpptools.qbs

@@ -44,6 +44,7 @@ QtcPlugin {
         "cppcompletionassistprovider.cpp", "cppcompletionassistprovider.h",
         "cppcurrentdocumentfilter.cpp", "cppcurrentdocumentfilter.h",
         "cppdoxygen.cpp", "cppdoxygen.h",
+        "cppeditoroutline.cpp", "cppeditoroutline.h",
         "cppfilesettingspage.cpp", "cppfilesettingspage.h", "cppfilesettingspage.ui",
         "cppfindreferences.cpp", "cppfindreferences.h",
         "cppfunctionsfilter.cpp", "cppfunctionsfilter.h",