diff options
Diffstat (limited to 'src/plugins/texteditor/textdocument.h')
-rw-r--r-- | src/plugins/texteditor/textdocument.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/texteditor/textdocument.h b/src/plugins/texteditor/textdocument.h index 447edd0e50..d91390869c 100644 --- a/src/plugins/texteditor/textdocument.h +++ b/src/plugins/texteditor/textdocument.h @@ -29,8 +29,9 @@ #include "formatter.h" #include "indenter.h" -#include <coreplugin/id.h> #include <coreplugin/textdocument.h> + +#include <utils/id.h> #include <utils/link.h> #include <QList> @@ -65,7 +66,7 @@ class TEXTEDITOR_EXPORT TextDocument : public Core::BaseTextDocument Q_OBJECT public: - explicit TextDocument(Core::Id id = Core::Id()); + explicit TextDocument(Utils::Id id = Utils::Id()); ~TextDocument() override; static QMap<QString, QString> openedTextDocumentContents(); @@ -169,7 +170,7 @@ protected: private: OpenResult openImpl(QString *errorString, const QString &fileName, const QString &realFileName, bool reload); - void cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument); + void cleanWhitespace(QTextCursor &cursor, const StorageSettings &storageSettings); void ensureFinalNewLine(QTextCursor &cursor); void modificationChanged(bool modified); void updateLayout() const; |