feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Rename BaseTextEditorPrivate to BaseTextEditorWidgetPrivate

Browse Source 
As it is the private class of BaseTextEditorWidget.

Change-Id: I49c9b4e85cffbca3d0a61dd82e93596e7bf29376
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Daniel Teske
2012-02-16 13:50:02 +01:00
committed by hjk
parent 1f6b88c4c2
commit bb4f25b748
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -218,7 +218,7 @@ static const char kVerticalTextBlockMimeType[] = "application/vnd.nokia.qtcreato
BaseTextEditorWidget::BaseTextEditorWidget(QWidget *parent) BaseTextEditorWidget::BaseTextEditorWidget(QWidget *parent)
: QPlainTextEdit(parent) : QPlainTextEdit(parent)
{ {
d = new BaseTextEditorPrivate; d = new BaseTextEditorWidgetPrivate;
d->q = this; d->q = this;
d->m_extraArea = new TextEditExtraArea(this); d->m_extraArea = new TextEditExtraArea(this);
d->m_extraArea->setMouseTracking(true); d->m_extraArea->setMouseTracking(true);
@@ -358,7 +358,7 @@ static void printPage(int index, QPainter *painter, const QTextDocument *doc,
painter->restore(); painter->restore();
} }
void BaseTextEditorPrivate::print(QPrinter *printer) void BaseTextEditorWidgetPrivate::print(QPrinter *printer)
{ {
QTextDocument *doc = q->document(); QTextDocument *doc = q->document();
@@ -495,7 +495,7 @@ UserCanceled:
} }
int BaseTextEditorPrivate::visualIndent(const QTextBlock &block) const int BaseTextEditorWidgetPrivate::visualIndent(const QTextBlock &block) const
{ {
if (!block.isValid()) if (!block.isValid())
return 0; return 0;
@@ -600,7 +600,7 @@ bool BaseTextEditorWidget::open(QString *errorString, const QString &fileName, c
/* /*
Collapses the first comment in a file, if there is only whitespace above Collapses the first comment in a file, if there is only whitespace above
*/ */
void BaseTextEditorPrivate::foldLicenseHeader() void BaseTextEditorWidgetPrivate::foldLicenseHeader()
{ {
QTextDocument *doc = q->document(); QTextDocument *doc = q->document();
BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout());
@@ -2458,7 +2458,7 @@ AutoCompleter *BaseTextEditorWidget::autoCompleter() const
//--------- BaseTextEditorPrivate ----------- //--------- BaseTextEditorPrivate -----------
BaseTextEditorPrivate::BaseTextEditorPrivate() BaseTextEditorWidgetPrivate::BaseTextEditorWidgetPrivate()
: :
m_lastScrollPos(-1), m_lastScrollPos(-1),
m_lineNumber(-1), m_lineNumber(-1),
@@ -2510,11 +2510,11 @@ BaseTextEditorPrivate::BaseTextEditorPrivate()
{ {
} }
BaseTextEditorPrivate::~BaseTextEditorPrivate() BaseTextEditorWidgetPrivate::~BaseTextEditorWidgetPrivate()
{ {
} }
void BaseTextEditorPrivate::setupDocumentSignals(BaseTextDocument *document) void BaseTextEditorWidgetPrivate::setupDocumentSignals(BaseTextDocument *document)
{ {
BaseTextDocument *oldDocument = q->baseTextDocument(); BaseTextDocument *oldDocument = q->baseTextDocument();
if (oldDocument) { if (oldDocument) {
@@ -2551,7 +2551,7 @@ void BaseTextEditorPrivate::setupDocumentSignals(BaseTextDocument *document)
} }
bool BaseTextEditorPrivate::snippetCheckCursor(const QTextCursor &cursor) bool BaseTextEditorWidgetPrivate::snippetCheckCursor(const QTextCursor &cursor)
{ {
if (!m_snippetOverlay->isVisible() || m_snippetOverlay->isEmpty()) if (!m_snippetOverlay->isVisible() || m_snippetOverlay->isEmpty())
return false; return false;
@@ -2570,7 +2570,7 @@ bool BaseTextEditorPrivate::snippetCheckCursor(const QTextCursor &cursor)
return true; return true;
} }
void BaseTextEditorPrivate::snippetTabOrBacktab(bool forward) void BaseTextEditorWidgetPrivate::snippetTabOrBacktab(bool forward)
{ {
if (!m_snippetOverlay->isVisible() || m_snippetOverlay->isEmpty()) if (!m_snippetOverlay->isVisible() || m_snippetOverlay->isEmpty())
return; return;
@@ -2735,7 +2735,7 @@ QTextBlock BaseTextEditorWidget::foldedBlockAt(const QPoint &pos, QRect *box) co
return QTextBlock(); return QTextBlock();
} }
void BaseTextEditorPrivate::highlightSearchResults(const QTextBlock &block, void BaseTextEditorWidgetPrivate::highlightSearchResults(const QTextBlock &block,
TextEditorOverlay *overlay) TextEditorOverlay *overlay)
{ {
if (m_searchExpr.isEmpty()) if (m_searchExpr.isEmpty())
@@ -2788,7 +2788,7 @@ namespace TextEditor {
} }
} }
void BaseTextEditorPrivate::clearBlockSelection() void BaseTextEditorWidgetPrivate::clearBlockSelection()
{ {
if (m_inBlockSelectionMode) { if (m_inBlockSelectionMode) {
m_inBlockSelectionMode = false; m_inBlockSelectionMode = false;
@@ -2799,7 +2799,7 @@ void BaseTextEditorPrivate::clearBlockSelection()
} }
} }
QString BaseTextEditorPrivate::copyBlockSelection() QString BaseTextEditorWidgetPrivate::copyBlockSelection()
{ {
QString selection; QString selection;
QTextCursor cursor = q->textCursor(); QTextCursor cursor = q->textCursor();
@@ -2837,7 +2837,7 @@ QString BaseTextEditorPrivate::copyBlockSelection()
return selection; return selection;
} }
void BaseTextEditorPrivate::removeBlockSelection(const QString &text) void BaseTextEditorWidgetPrivate::removeBlockSelection(const QString &text)
{ {
QTextCursor cursor = q->textCursor(); QTextCursor cursor = q->textCursor();
if (!cursor.hasSelection() || !m_inBlockSelectionMode) if (!cursor.hasSelection() || !m_inBlockSelectionMode)
@@ -2878,7 +2878,7 @@ void BaseTextEditorPrivate::removeBlockSelection(const QString &text)
q->setTextCursor(cursor); q->setTextCursor(cursor);
} }
void BaseTextEditorPrivate::moveCursorVisible(bool ensureVisible) void BaseTextEditorWidgetPrivate::moveCursorVisible(bool ensureVisible)
{ {
QTextCursor cursor = q->textCursor(); QTextCursor cursor = q->textCursor();
if (!cursor.block().isVisible()) { if (!cursor.block().isVisible()) {
@@ -4137,7 +4137,7 @@ void BaseTextEditorWidget::timerEvent(QTimerEvent *e)
} }
void BaseTextEditorPrivate::clearVisibleFoldedBlock() void BaseTextEditorWidgetPrivate::clearVisibleFoldedBlock()
{ {
if (suggestedVisibleFoldedBlockNumber) { if (suggestedVisibleFoldedBlockNumber) {
suggestedVisibleFoldedBlockNumber = -1; suggestedVisibleFoldedBlockNumber = -1;

6
src/plugins/texteditor/basetexteditor.h
View File

@@ -62,7 +62,7 @@ class IAssistProvider;
class ICodeStylePreferences; class ICodeStylePreferences;
namespace Internal { namespace Internal {
class BaseTextEditorPrivate; class BaseTextEditorWidgetPrivate;
class TextEditorOverlay; class TextEditorOverlay;
typedef QList<RefactorMarker> RefactorMarkers; typedef QList<RefactorMarker> RefactorMarkers;
typedef QString (QString::*TransformationMethod)() const; typedef QString (QString::*TransformationMethod)() const;
@@ -375,8 +375,8 @@ private slots:
void onCodeStylePreferencesDestroyed(); void onCodeStylePreferencesDestroyed();
private: private:
Internal::BaseTextEditorPrivate *d; Internal::BaseTextEditorWidgetPrivate *d;
friend class Internal::BaseTextEditorPrivate; friend class Internal::BaseTextEditorWidgetPrivate;
friend class Internal::TextEditorOverlay; friend class Internal::TextEditorOverlay;
friend class RefactorOverlay; friend class RefactorOverlay;