diff --git a/src/plugins/find/basetextfind.cpp b/src/plugins/find/basetextfind.cpp index 680497316c1c7fff251d74f070cb519ea62a5d99..d688f606313e80f64952b44b07298e8dca2d3048 100644 --- a/src/plugins/find/basetextfind.cpp +++ b/src/plugins/find/basetextfind.cpp @@ -43,7 +43,8 @@ namespace Find { -struct BaseTextFindPrivate { +struct BaseTextFindPrivate +{ explicit BaseTextFindPrivate(QPlainTextEdit *editor); explicit BaseTextFindPrivate(QTextEdit *editor); @@ -91,16 +92,16 @@ BaseTextFind::BaseTextFind(QPlainTextEdit *editor) BaseTextFind::~BaseTextFind() { + delete d; } QTextCursor BaseTextFind::textCursor() const { QTC_ASSERT(d->m_editor || d->m_plaineditor, return QTextCursor()); return d->m_editor ? d->m_editor->textCursor() : d->m_plaineditor->textCursor(); - } -void BaseTextFind::setTextCursor(const QTextCursor& cursor) +void BaseTextFind::setTextCursor(const QTextCursor &cursor) { QTC_ASSERT(d->m_editor || d->m_plaineditor, return); d->m_editor ? d->m_editor->setTextCursor(cursor) : d->m_plaineditor->setTextCursor(cursor); @@ -272,9 +273,8 @@ int BaseTextFind::replaceAll(const QString &before, const QString &after, return count; } -bool BaseTextFind::find(const QString &txt, - Find::FindFlags findFlags, - QTextCursor start, bool *wrapped) +bool BaseTextFind::find(const QString &txt, Find::FindFlags findFlags, + QTextCursor start, bool *wrapped) { if (txt.isEmpty()) { setTextCursor(start); diff --git a/src/plugins/find/basetextfind.h b/src/plugins/find/basetextfind.h index 44ca7f6b3f50aa1c95be011fac17367856439454..5b0053e77284da08ded2edbd384cf5e5fe8055ec 100644 --- a/src/plugins/find/basetextfind.h +++ b/src/plugins/find/basetextfind.h @@ -36,8 +36,6 @@ #include "find_global.h" #include "ifindsupport.h" -#include <QtCore/QScopedPointer> - QT_BEGIN_NAMESPACE class QPlainTextEdit; class QTextEdit; @@ -96,7 +94,7 @@ private: bool inScope(int startPosition, int endPosition) const; QTextCursor findOne(const QRegExp &expr, const QTextCursor &from, QTextDocument::FindFlags options) const; - QScopedPointer<BaseTextFindPrivate> d; + BaseTextFindPrivate *d; }; } // namespace Find