summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-08-17 11:59:43 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-08-17 12:13:57 (GMT)
commit38f41726cf3a76a57ca15f7cc82e56a5aa2c5a1c (patch)
tree5c63dcc03caf4cc3817a4282cf200afecf62583b /src/gui/text
parentb80312254e61986e6848d1608dcac54e0b3f191a (diff)
downloadQt-38f41726cf3a76a57ca15f7cc82e56a5aa2c5a1c.zip
Qt-38f41726cf3a76a57ca15f7cc82e56a5aa2c5a1c.tar.gz
Qt-38f41726cf3a76a57ca15f7cc82e56a5aa2c5a1c.tar.bz2
QTextControl::print: fix coverity warning
the test was wrong on the QPrinter pointer In addition, priv is never null
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qtextcontrol.cpp2
-rw-r--r--src/gui/text/qtextcursor.cpp5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 58f8a06..1c14d20 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -2262,7 +2262,7 @@ void QTextControl::print(QPrinter *printer) const
{
#ifndef QT_NO_PRINTER
Q_D(const QTextControl);
- if (printer && !printer->isValid())
+ if (!printer || !printer->isValid())
return;
QTextDocument *tempDoc = 0;
const QTextDocument *doc = d->doc;
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 6ab89dc..f97146d 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -84,8 +84,7 @@ QTextCursorPrivate::QTextCursorPrivate(const QTextCursorPrivate &rhs)
QTextCursorPrivate::~QTextCursorPrivate()
{
- if (priv)
- priv->removeCursor(this);
+ priv->removeCursor(this);
}
QTextCursorPrivate::AdjustResult QTextCursorPrivate::adjustPosition(int positionOfChange, int charsAddedOrRemoved, QTextUndoCommand::Operation op)
@@ -125,7 +124,7 @@ QTextCursorPrivate::AdjustResult QTextCursorPrivate::adjustPosition(int position
void QTextCursorPrivate::setX()
{
- if (priv && priv->isInEditBlock()) {
+ if (priv->isInEditBlock()) {
x = -1; // mark dirty
return;
}