Commit 610f77ed authored by Friedemann Kleint's avatar Friedemann Kleint

Header cleanup in TextEditor.

Change-Id: I832d255a4d8f291426d54ad0353641db515a511a
Reviewed-on: http://codereview.qt.nokia.com/3182Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@nokia.com>
parent 2a3684fb
......@@ -72,6 +72,10 @@ BaseFileFind::BaseFileFind(SearchResultWindow *resultWindow)
connect(&m_watcher, SIGNAL(finished()), this, SLOT(searchFinished()));
}
BaseFileFind::~BaseFileFind()
{
}
bool BaseFileFind::isEnabled() const
{
return !m_isSearching;
......
......@@ -36,23 +36,26 @@
#include "texteditor_global.h"
#include <find/ifindfilter.h>
#include <find/ifindsupport.h>
#include <find/searchresultwindow.h>
#include <utils/filesearch.h>
#include <QtGui/QStringListModel>
#include <QtCore/QFutureWatcher>
#include <QtCore/QPointer>
#include <QtGui/QStringListModel>
QT_BEGIN_NAMESPACE
class QLabel;
class QComboBox;
QT_END_NAMESPACE
namespace Utils {
class FileIterator;
}
namespace Find {
class SearchResultWindow;
struct SearchResultItem;
class IFindSupport;
}
namespace TextEditor {
......@@ -63,6 +66,7 @@ class TEXTEDITOR_EXPORT BaseFileFind : public Find::IFindFilter
public:
explicit BaseFileFind(Find::SearchResultWindow *resultWindow);
~BaseFileFind();
bool isEnabled() const;
bool canCancel() const;
......
......@@ -52,6 +52,7 @@
#include "defaultassistinterface.h"
#include "convenience.h"
#include "texteditorsettings.h"
#include "texteditoroverlay.h"
#include <aggregation/aggregate.h>
#include <coreplugin/actionmanager/actionmanager.h>
......
......@@ -37,7 +37,6 @@
#include "codeassist/assistenums.h"
#include <find/ifindsupport.h>
#include <coreplugin/editormanager/editormanager.h>
#include <QtGui/QPlainTextEdit>
......
......@@ -36,7 +36,6 @@
#include "basetexteditor.h"
#include "behaviorsettings.h"
#include "displaysettings.h"
#include "texteditoroverlay.h"
#include "fontsettings.h"
#include "refactoroverlay.h"
......@@ -47,9 +46,6 @@
#include <QtCore/QPointer>
#include <QtCore/QScopedPointer>
#include <QtGui/QPixmap>
#include <QtGui/QTextEdit>
namespace TextEditor {
class BaseTextDocument;
......@@ -57,6 +53,7 @@ class TextEditorActionHandler;
class CodeAssistant;
namespace Internal {
class TextEditorOverlay;
class TEXTEDITOR_EXPORT BaseTextBlockSelection
{
......
......@@ -37,7 +37,6 @@
#include "itexteditor.h"
#include <QtCore/QPointer>
#include <QtGui/QIcon>
QT_BEGIN_NAMESPACE
class QTextBlock;
......
......@@ -35,7 +35,7 @@
#include "texteditor_global.h"
#include <QtCore/QVariant>
#include <QtCore/QVariantMap>
QT_BEGIN_NAMESPACE
class QSettings;
......
......@@ -33,6 +33,8 @@
#include "codestylepreferencesmanager.h"
#include "icodestylepreferencesfactory.h"
#include <QtCore/QMap>
using namespace TextEditor;
CodeStylePreferencesManager *CodeStylePreferencesManager::m_instance = 0;
......
......@@ -36,7 +36,6 @@
#include "texteditor_global.h"
#include <QtCore/QObject>
#include <QtCore/QVariant>
namespace TextEditor {
......
......@@ -34,6 +34,7 @@
#include <QtGui/QTextDocument>
#include <QtGui/QTextBlock>
#include <QtGui/QTextCursor>
namespace TextEditor {
namespace Convenience {
......
......@@ -35,13 +35,13 @@
#include "texteditor_global.h"
#include <QtCore/QString>
QT_BEGIN_NAMESPACE
class QTextDocument;
class QTextCursor;
QT_END_NAMESPACE
#include <QtCore/QString>
#include <QtGui/QTextCursor>
namespace TextEditor {
namespace Convenience {
......
......@@ -35,7 +35,7 @@
#include "texteditor_global.h"
#include <QtCore/QVariant>
#include <QtCore/QVariantMap>
QT_BEGIN_NAMESPACE
class QSettings;
......
......@@ -36,7 +36,6 @@
#include "texteditor_global.h"
#include <QtGui/QWidget>
#include <QtCore/QMap>
QT_BEGIN_NAMESPACE
class QHBoxLayout;
......
......@@ -37,9 +37,6 @@
#include <utils/uncommentselection.h>
#include <QtCore/QList>
#include <QtCore/QScopedPointer>
namespace Core {
class MimeType;
}
......
......@@ -35,7 +35,7 @@
#include "texteditor_global.h"
#include <QtCore/QVariant>
#include <QtCore/QVariantMap>
QT_BEGIN_NAMESPACE
class QSettings;
......
......@@ -36,8 +36,6 @@
#include "texteditor_global.h"
#include <QtGui/QWidget>
#include <QtCore/QMap>
namespace TextEditor {
......@@ -75,6 +73,5 @@ private:
TabPreferences *m_tabPreferences;
};
} // namespace TextEditor
#endif // TABPREFERENCESWIDGET_H
......@@ -34,7 +34,8 @@
#define TEXTEDITOR_TABSETTINGSWIDGET_H
#include "texteditor_global.h"
#include <QWidget>
#include <QtGui/QWidget>
namespace TextEditor {
......@@ -74,6 +75,5 @@ private:
Ui::TabSettingsWidget *ui;
};
} // namespace TextEditor
#endif // TEXTEDITOR_TABSETTINGSWIDGET_H
......@@ -106,6 +106,10 @@ TextEditorActionHandler::TextEditorActionHandler(const char *context,
this, SLOT(updateCurrentEditor(Core::IEditor*)));
}
TextEditorActionHandler::~TextEditorActionHandler()
{
}
void TextEditorActionHandler::setupActions(BaseTextEditorWidget *editor)
{
initializeActions();
......
......@@ -34,16 +34,22 @@
#define TEXTEDITORACTIONHANDLER_H
#include "texteditor_global.h"
#include "basetexteditor.h"
#include "coreplugin/icontext.h"
#include <coreplugin/icontext.h>
#include <QtCore/QList>
#include <QtCore/QObject>
#include <QtCore/QPointer>
#include <QtCore/QList>
QT_FORWARD_DECLARE_CLASS(QAction)
namespace Core {
class ICore;
class IEditor;
}
namespace TextEditor {
class BaseTextEditorWidget;
// Redirects slots from global actions to the respective editor.
......@@ -60,6 +66,8 @@ public:
};
explicit TextEditorActionHandler(const char *context, uint optionalActions = None);
~TextEditorActionHandler();
void setupActions(BaseTextEditorWidget *editor);
void initializeActions();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment