From 93e82d731e573bf7f2bf52ad7e683350e4fb9d78 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 23 Jan 2015 15:14:36 +0100 Subject: [PATCH] CppEditor: Move CppEditorOutline to CppTools Change-Id: I75768f548f8f914e76fbdeaf3c318c207782fe1b Reviewed-by: Marco Bubke --- src/plugins/cppeditor/cppeditor.cpp | 4 ++-- src/plugins/cppeditor/cppeditor.h | 9 ++++++--- src/plugins/cppeditor/cppeditor.pro | 2 -- src/plugins/cppeditor/cppeditor.qbs | 1 - src/plugins/cppeditor/cppeditorplugin.cpp | 1 - src/plugins/cppeditor/cppoutline.cpp | 2 +- .../{cppeditor => cpptools}/cppeditoroutline.cpp | 12 +++--------- .../{cppeditor => cpptools}/cppeditoroutline.h | 10 +++++----- src/plugins/cpptools/cpptools.pro | 2 ++ src/plugins/cpptools/cpptools.qbs | 1 + 10 files changed, 20 insertions(+), 24 deletions(-) rename src/plugins/{cppeditor => cpptools}/cppeditoroutline.cpp (98%) rename src/plugins/{cppeditor => cpptools}/cppeditoroutline.h (95%) diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 26ea2038b1..3b4c568d71 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/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 #include #include +#include #include #include #include @@ -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; } diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index 96fa9f27d9..2a4d19ede0 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -37,13 +37,16 @@ #include -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; diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index a4c0bf2a5e..52dddae171 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/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 \ diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index bceb436e57..e6f6769fd9 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/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", diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index f3b37cdc98..1ae3c96499 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/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" diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp index 70cd6fbc40..55e044bc19 100644 --- a/src/plugins/cppeditor/cppoutline.cpp +++ b/src/plugins/cppeditor/cppoutline.cpp @@ -30,7 +30,7 @@ #include "cppoutline.h" -#include "cppeditoroutline.h" +#include #include diff --git a/src/plugins/cppeditor/cppeditoroutline.cpp b/src/plugins/cpptools/cppeditoroutline.cpp similarity index 98% rename from src/plugins/cppeditor/cppeditoroutline.cpp rename to src/plugins/cpptools/cppeditoroutline.cpp index 829f4f84aa..9c17e016f8 100644 --- a/src/plugins/cppeditor/cppeditoroutline.cpp +++ b/src/plugins/cpptools/cppeditoroutline.cpp @@ -30,8 +30,6 @@ #include "cppeditoroutline.h" -#include "cppeditorplugin.h" - #include #include #include @@ -44,12 +42,10 @@ #include /*! - \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 Internal { +namespace CppTools { CppEditorOutline::CppEditorOutline(TextEditor::TextEditorWidget *editorWidget) : QObject(editorWidget) @@ -286,7 +281,6 @@ QModelIndex CppEditorOutline::indexForPosition(int line, int column, return lastIndex; } -} // namespace Internal -} // namespace CppEditor +} // namespace CppTools #include diff --git a/src/plugins/cppeditor/cppeditoroutline.h b/src/plugins/cpptools/cppeditoroutline.h similarity index 95% rename from src/plugins/cppeditor/cppeditoroutline.h rename to src/plugins/cpptools/cppeditoroutline.h index 19b268305f..b1721fab8a 100644 --- a/src/plugins/cppeditor/cppeditoroutline.h +++ b/src/plugins/cpptools/cppeditoroutline.h @@ -31,6 +31,8 @@ #ifndef CPPEDITOROUTLINE_H #define CPPEDITOROUTLINE_H +#include "cpptools_global.h" + #include #include @@ -44,10 +46,9 @@ namespace CPlusPlus { class OverviewModel; } namespace TextEditor { class TextEditorWidget; } namespace Utils { class TreeViewComboBox; } -namespace CppEditor { -namespace Internal { +namespace CppTools { -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 CppEditor +} // namespace CppTools #endif // CPPEDITOROUTLINE_H diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index 318f059345..a97e249907 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/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 \ diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index 4ab9206500..9d8e6c7d85 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/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", -- GitLab