summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorAxel Waggershauser <awagger@gmail.com>2013-03-15 00:42:15 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-16 20:22:50 +0100
commitb11317a64339f5a4bcffc8234ecaf15c7fb416f2 (patch)
treef81e40ee49f5109b4100048d131d5bb922b448aa /src/gui/image
parent72367a94a750355eb748793ce8c365373a332c9c (diff)
Whitespace cleanup: remove trailing whitespace
Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qimageiohandler.cpp2
-rw-r--r--src/gui/image/qmovie.cpp14
-rw-r--r--src/gui/image/qxbmhandler.cpp2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index f770458127..055ace9985 100644
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -433,7 +433,7 @@ bool QImageIOHandler::supportsOption(ImageOption option) const
the sequence number of the current image in the animation. If
this function is called before any image is read(), -1 is
returned. The number of the first image in the sequence is 0.
-
+
If the image format does not support animation, 0 is returned.
\sa read()
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index e137af2231..ae526f5ba7 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-/*!
+/*!
\class QMovie
\inmodule QtGui
@@ -150,7 +150,7 @@
copy of the frame.
*/
-/*!
+/*!
\fn void QMovie::stateChanged(QMovie::MovieState state)
This signal is emitted every time the state of the movie changes. The new
@@ -203,23 +203,23 @@ public:
inline QFrameInfo(bool endMark)
: pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(endMark)
{ }
-
+
inline QFrameInfo()
: pixmap(QPixmap()), delay(QMOVIE_INVALID_DELAY), endMark(false)
{ }
-
+
inline QFrameInfo(const QPixmap &pixmap, int delay)
: pixmap(pixmap), delay(delay), endMark(false)
{ }
-
+
inline bool isValid()
{
return endMark || !(pixmap.isNull() && (delay == QMOVIE_INVALID_DELAY));
}
-
+
inline bool isEndMarker()
{ return endMark; }
-
+
static inline QFrameInfo endMarker()
{ return QFrameInfo(true); }
};
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
index 0e1ecfa299..498f6ce767 100644
--- a/src/gui/image/qxbmhandler.cpp
+++ b/src/gui/image/qxbmhandler.cpp
@@ -302,7 +302,7 @@ bool QXbmHandler::read(QImage *image)
{
if (state == Error)
return false;
-
+
if (state == Ready && !readHeader()) {
state = Error;
return false;