Skip to content
Snippets Groups Projects
Commit 492652e8 authored by hjk's avatar hjk Committed by hjk
Browse files

basetextfind: style

Change-Id: If3f3cf07b615a48c98a3193328746c22b3cd818b
Reviewed-on: http://codereview.qt.nokia.com/1300


Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent 69cca88d
No related branches found
No related tags found
No related merge requests found
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
namespace Find { namespace Find {
struct BaseTextFindPrivate { struct BaseTextFindPrivate
{
explicit BaseTextFindPrivate(QPlainTextEdit *editor); explicit BaseTextFindPrivate(QPlainTextEdit *editor);
explicit BaseTextFindPrivate(QTextEdit *editor); explicit BaseTextFindPrivate(QTextEdit *editor);
...@@ -91,16 +92,16 @@ BaseTextFind::BaseTextFind(QPlainTextEdit *editor) ...@@ -91,16 +92,16 @@ BaseTextFind::BaseTextFind(QPlainTextEdit *editor)
BaseTextFind::~BaseTextFind() BaseTextFind::~BaseTextFind()
{ {
delete d;
} }
QTextCursor BaseTextFind::textCursor() const QTextCursor BaseTextFind::textCursor() const
{ {
QTC_ASSERT(d->m_editor || d->m_plaineditor, return QTextCursor()); QTC_ASSERT(d->m_editor || d->m_plaineditor, return QTextCursor());
return d->m_editor ? d->m_editor->textCursor() : d->m_plaineditor->textCursor(); 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); QTC_ASSERT(d->m_editor || d->m_plaineditor, return);
d->m_editor ? d->m_editor->setTextCursor(cursor) : d->m_plaineditor->setTextCursor(cursor); 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, ...@@ -272,9 +273,8 @@ int BaseTextFind::replaceAll(const QString &before, const QString &after,
return count; return count;
} }
bool BaseTextFind::find(const QString &txt, bool BaseTextFind::find(const QString &txt, Find::FindFlags findFlags,
Find::FindFlags findFlags, QTextCursor start, bool *wrapped)
QTextCursor start, bool *wrapped)
{ {
if (txt.isEmpty()) { if (txt.isEmpty()) {
setTextCursor(start); setTextCursor(start);
......
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
#include "find_global.h" #include "find_global.h"
#include "ifindsupport.h" #include "ifindsupport.h"
#include <QtCore/QScopedPointer>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QPlainTextEdit; class QPlainTextEdit;
class QTextEdit; class QTextEdit;
...@@ -96,7 +94,7 @@ private: ...@@ -96,7 +94,7 @@ private:
bool inScope(int startPosition, int endPosition) const; bool inScope(int startPosition, int endPosition) const;
QTextCursor findOne(const QRegExp &expr, const QTextCursor &from, QTextDocument::FindFlags options) const; QTextCursor findOne(const QRegExp &expr, const QTextCursor &from, QTextDocument::FindFlags options) const;
QScopedPointer<BaseTextFindPrivate> d; BaseTextFindPrivate *d;
}; };
} // namespace Find } // namespace Find
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment