diff options
Diffstat (limited to 'src/plugins/texteditor')
19 files changed, 39 insertions, 28 deletions
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index 47619264cd..5c12527f9a 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -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; diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h index de6e1c0b3a..8e864ee48a 100644 --- a/src/plugins/texteditor/basefilefind.h +++ b/src/plugins/texteditor/basefilefind.h @@ -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; diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index b9a93ee844..cdd564aadd 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -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> diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h index e8bb1ef235..e93f99cc84 100644 --- a/src/plugins/texteditor/basetexteditor.h +++ b/src/plugins/texteditor/basetexteditor.h @@ -37,7 +37,6 @@ #include "codeassist/assistenums.h" #include <find/ifindsupport.h> - #include <coreplugin/editormanager/editormanager.h> #include <QtGui/QPlainTextEdit> diff --git a/src/plugins/texteditor/basetexteditor_p.h b/src/plugins/texteditor/basetexteditor_p.h index d8619e24da..acba1ff08b 100644 --- a/src/plugins/texteditor/basetexteditor_p.h +++ b/src/plugins/texteditor/basetexteditor_p.h @@ -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 { diff --git a/src/plugins/texteditor/basetextmark.h b/src/plugins/texteditor/basetextmark.h index 31b9613bad..a2dfc31beb 100644 --- a/src/plugins/texteditor/basetextmark.h +++ b/src/plugins/texteditor/basetextmark.h @@ -37,7 +37,6 @@ #include "itexteditor.h" #include <QtCore/QPointer> -#include <QtGui/QIcon> QT_BEGIN_NAMESPACE class QTextBlock; diff --git a/src/plugins/texteditor/behaviorsettings.h b/src/plugins/texteditor/behaviorsettings.h index 1cc80da52f..0b401367fc 100644 --- a/src/plugins/texteditor/behaviorsettings.h +++ b/src/plugins/texteditor/behaviorsettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QVariant> +#include <QtCore/QVariantMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/codestylepreferencesmanager.cpp b/src/plugins/texteditor/codestylepreferencesmanager.cpp index 93b0200abc..dccbe56d11 100644 --- a/src/plugins/texteditor/codestylepreferencesmanager.cpp +++ b/src/plugins/texteditor/codestylepreferencesmanager.cpp @@ -33,6 +33,8 @@ #include "codestylepreferencesmanager.h" #include "icodestylepreferencesfactory.h" +#include <QtCore/QMap> + using namespace TextEditor; CodeStylePreferencesManager *CodeStylePreferencesManager::m_instance = 0; diff --git a/src/plugins/texteditor/codestylepreferencesmanager.h b/src/plugins/texteditor/codestylepreferencesmanager.h index a17cf6a274..0f8fd4c740 100644 --- a/src/plugins/texteditor/codestylepreferencesmanager.h +++ b/src/plugins/texteditor/codestylepreferencesmanager.h @@ -36,7 +36,6 @@ #include "texteditor_global.h" #include <QtCore/QObject> -#include <QtCore/QVariant> namespace TextEditor { diff --git a/src/plugins/texteditor/convenience.cpp b/src/plugins/texteditor/convenience.cpp index 3facb9ef63..61734639df 100644 --- a/src/plugins/texteditor/convenience.cpp +++ b/src/plugins/texteditor/convenience.cpp @@ -34,6 +34,7 @@ #include <QtGui/QTextDocument> #include <QtGui/QTextBlock> +#include <QtGui/QTextCursor> namespace TextEditor { namespace Convenience { diff --git a/src/plugins/texteditor/convenience.h b/src/plugins/texteditor/convenience.h index e7ae14f57b..a2760720c9 100644 --- a/src/plugins/texteditor/convenience.h +++ b/src/plugins/texteditor/convenience.h @@ -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 { diff --git a/src/plugins/texteditor/extraencodingsettings.h b/src/plugins/texteditor/extraencodingsettings.h index ef02ddb3b3..a1c56db4f5 100644 --- a/src/plugins/texteditor/extraencodingsettings.h +++ b/src/plugins/texteditor/extraencodingsettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QVariant> +#include <QtCore/QVariantMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/fallbackselectorwidget.h b/src/plugins/texteditor/fallbackselectorwidget.h index dca776d080..870209dfb1 100644 --- a/src/plugins/texteditor/fallbackselectorwidget.h +++ b/src/plugins/texteditor/fallbackselectorwidget.h @@ -36,7 +36,6 @@ #include "texteditor_global.h" #include <QtGui/QWidget> -#include <QtCore/QMap> QT_BEGIN_NAMESPACE class QHBoxLayout; diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h index 2fb3185d87..a886b1616b 100644 --- a/src/plugins/texteditor/plaintexteditor.h +++ b/src/plugins/texteditor/plaintexteditor.h @@ -37,9 +37,6 @@ #include <utils/uncommentselection.h> -#include <QtCore/QList> -#include <QtCore/QScopedPointer> - namespace Core { class MimeType; } diff --git a/src/plugins/texteditor/storagesettings.h b/src/plugins/texteditor/storagesettings.h index 667ddbd0b4..42d964924f 100644 --- a/src/plugins/texteditor/storagesettings.h +++ b/src/plugins/texteditor/storagesettings.h @@ -35,7 +35,7 @@ #include "texteditor_global.h" -#include <QtCore/QVariant> +#include <QtCore/QVariantMap> QT_BEGIN_NAMESPACE class QSettings; diff --git a/src/plugins/texteditor/tabpreferenceswidget.h b/src/plugins/texteditor/tabpreferenceswidget.h index a11f6ccad8..b2a558a6aa 100644 --- a/src/plugins/texteditor/tabpreferenceswidget.h +++ b/src/plugins/texteditor/tabpreferenceswidget.h @@ -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 diff --git a/src/plugins/texteditor/tabsettingswidget.h b/src/plugins/texteditor/tabsettingswidget.h index db4818e6f4..afb9e6e01c 100644 --- a/src/plugins/texteditor/tabsettingswidget.h +++ b/src/plugins/texteditor/tabsettingswidget.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 diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index d083fdfef4..bfaa13bb16 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -106,6 +106,10 @@ TextEditorActionHandler::TextEditorActionHandler(const char *context, this, SLOT(updateCurrentEditor(Core::IEditor*))); } +TextEditorActionHandler::~TextEditorActionHandler() +{ +} + void TextEditorActionHandler::setupActions(BaseTextEditorWidget *editor) { initializeActions(); diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h index 8f197676d0..96f7164159 100644 --- a/src/plugins/texteditor/texteditoractionhandler.h +++ b/src/plugins/texteditor/texteditoractionhandler.h @@ -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(); |