diff options
author | David Faure <faure@kde.org> | 2009-06-04 23:55:22 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-04 23:55:22 (GMT) |
commit | ef0d1c839aed75201da10f8db7e515d9fb55bb16 (patch) | |
tree | 5f00de5b8913379f9bb28df91782840c7efe6a2d /src/gui/widgets/qplaintextedit.cpp | |
parent | 58c5df4109acf44982c3a2a7b2318da52606232d (diff) | |
download | Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.zip Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.gz Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.bz2 |
All of Qt's own code compiles with -pedantic now (but pcre and webkit don't seem fixable easily)
Merge-request: 594
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/gui/widgets/qplaintextedit.cpp')
-rw-r--r-- | src/gui/widgets/qplaintextedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index f317742..af11aa7 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -444,7 +444,7 @@ QPlainTextEditControl::QPlainTextEditControl(QPlainTextEdit *parent) void QPlainTextEditPrivate::_q_cursorPositionChanged() { pageUpDownLastCursorYIsValid = false; -}; +} void QPlainTextEditPrivate::_q_verticalScrollbarActionTriggered(int action) { if (action == QAbstractSlider::SliderPageStepAdd) { @@ -1756,7 +1756,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e) QTextBlock block = firstVisibleBlock(); qreal maximumWidth = document()->documentLayout()->documentSize().width(); - + // keep right margin clean from full-width selection int maxX = offset.x() + qMax((qreal)viewportRect.width(), maximumWidth) - document()->documentMargin(); |