Remove internal class BaseTextMarkRegistry from exported header.

Change-Id: Ieeffe65be2d7c8f07f41f7211853d616a6aceb85
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

src/plugins/autotoolsprojectmanager/autotoolsproject.cpp

@@ -51,6 +51,7 @@
 #include <extensionsystem/pluginmanager.h>
 #include <cpptools/ModelManagerInterface.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/icontext.h>
 #include <utils/qtcassert.h>
 #include <utils/filesystemwatcher.h>
 

src/plugins/debugger/breakhandler.cpp

@@ -43,6 +43,7 @@
 #include "modeltest.h"
 #endif
 
+#include <QTimerEvent>
 #include <QDir>
 #include <QDebug>
 

src/plugins/debugger/cdb/cdbengine.cpp

@@ -53,6 +53,7 @@
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/taskhub.h>
+#include <texteditor/itexteditor.h>
 
 #include <utils/synchronousprocess.h>
 #include <utils/qtcprocess.h>

src/plugins/debugger/debuggerengine.cpp

@@ -49,12 +49,15 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/taskhub.h>
 
+#include <texteditor/itexteditor.h>
+
 #include <utils/savedaction.h>
 #include <utils/qtcassert.h>
 #include <utils/fileinprojectfinder.h>

src/plugins/debugger/gdb/gdbengine.cpp

@@ -65,6 +65,7 @@
 #include <coreplugin/icore.h>
 #include <projectexplorer/taskhub.h>
 #include <projectexplorer/itaskhandler.h>
+#include <texteditor/itexteditor.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>

src/plugins/debugger/memoryagent.cpp

@@ -37,6 +37,7 @@
 #include "debuggerinternalconstants.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/editormanager/editormanager.h>
 
 #include <utils/qtcassert.h>

src/plugins/debugger/qml/qmlcppengine.cpp

@@ -35,6 +35,7 @@
 #include "watchhandler.h"
 
 #include <utils/qtcassert.h>
+#include <texteditor/itexteditor.h>
 #include <qmljseditor/qmljseditorconstants.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <qmljs/consolemanagerinterface.h>

src/plugins/debugger/qml/qmlengine.cpp

@@ -53,6 +53,7 @@
 
 #include <utils/qtcassert.h>
 
+#include <texteditor/itexteditor.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/icore.h>

src/plugins/projectexplorer/projectexplorer.cpp

@@ -92,6 +92,7 @@
 
 #include <extensionsystem/pluginspec.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/id.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/documentmanager.h>

src/plugins/projectexplorer/runconfiguration.cpp

@@ -42,6 +42,7 @@
 #include <utils/checkablemessagebox.h>
 
 #include <coreplugin/icore.h>
+#include <coreplugin/icontext.h>
 
 #include <QTimer>
 #include <QPushButton>

src/plugins/qmlprofiler/qmlprofilertool.cpp

@@ -53,6 +53,7 @@
 #include <projectexplorer/target.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/localapplicationrunconfiguration.h>
+#include <texteditor/itexteditor.h>
 
 #include <remotelinux/remotelinuxrunconfiguration.h>
 #include <remotelinux/linuxdevice.h>

src/plugins/texteditor/basetextmark.cpp

@@ -27,6 +27,7 @@
 **
 ****************************************************************************/
 
+#include "basetextmarkregistry.h"
 #include "basetextmark.h"
 #include "itexteditor.h"
 #include "basetextdocument.h"

src/plugins/texteditor/basetextmark.h

@@ -31,18 +31,7 @@
 #define BASETEXTMARK_H
 
 #include "texteditor_global.h"
-#include "itexteditor.h"
-
-#include <utils/fileutils.h>
-
-#include <QWeakPointer>
-#include <QHash>
-#include <QSet>
-
-QT_BEGIN_NAMESPACE
-class QTextBlock;
-class QPainter;
-QT_END_NAMESPACE
+#include "itextmark.h"
 
 namespace TextEditor {
 namespace Internal {
@@ -70,24 +59,6 @@ private:
     QString m_fileName;
 };
 
-namespace Internal {
-class BaseTextMarkRegistry : public QObject
-{
-    Q_OBJECT
-public:
-    BaseTextMarkRegistry(QObject *parent);
-
-    void add(BaseTextMark *mark);
-    bool remove(BaseTextMark *mark);
-private slots:
-    void editorOpened(Core::IEditor *editor);
-    void documentRenamed(Core::IDocument *document, const QString &oldName, const QString &newName);
-    void allDocumentsRenamed(const QString &oldName, const QString &newName);
-private:
-    QHash<Utils::FileName, QSet<BaseTextMark *> > m_marks;
-};
-}
-
 } // namespace TextEditor
 
 #endif // BASETEXTMARK_H

src/plugins/texteditor/basetextmarkregistry.h

@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef BASETEXTMARKREGISTRY_H
+#define BASETEXTMARKREGISTRY_H
+
+#include <utils/fileutils.h>
+
+#include <QObject>
+#include <QHash>
+#include <QSet>
+
+namespace Core {
+class IEditor;
+class IDocument;
+}
+
+namespace TextEditor {
+class BaseTextMark;
+namespace Internal {
+
+class BaseTextMarkRegistry : public QObject
+{
+    Q_OBJECT
+public:
+    BaseTextMarkRegistry(QObject *parent);
+
+    void add(BaseTextMark *mark);
+    bool remove(BaseTextMark *mark);
+private slots:
+    void editorOpened(Core::IEditor *editor);
+    void documentRenamed(Core::IDocument *document, const QString &oldName, const QString &newName);
+    void allDocumentsRenamed(const QString &oldName, const QString &newName);
+private:
+    QHash<Utils::FileName, QSet<BaseTextMark *> > m_marks;
+};
+
+} // namespace Internal
+} // namespace TextEditor
+
+#endif // BASETEXTMARKREGISTRY_H

src/plugins/texteditor/texteditor.pro

@@ -226,7 +226,8 @@ HEADERS += texteditorplugin.h \
     circularclipboard.h \
     circularclipboardassist.h \
     itextmark.h \
-    codeassist/keywordscompletionassist.h
+    codeassist/keywordscompletionassist.h \
+    basetextmarkregistry.h
 
 FORMS += \
     displaysettingspage.ui \

src/plugins/texteditor/texteditorplugin.cpp

@@ -44,6 +44,7 @@
 #include "snippets/plaintextsnippetprovider.h"
 #include "codeassist/assistenums.h"
 #include "basetextmark.h"
+#include "basetextmarkregistry.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>