diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-13 15:48:44 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-13 22:46:50 +0100 |
commit | 882bf3475c8926abe62ed71e6719458b024caac0 (patch) | |
tree | f227c1c660776da1ece9149b1c9e3ca5b27d8687 /src/gui | |
parent | 81157d23749f6ee1feef35a04fa9cc989ebc01eb (diff) |
expand tabs and related whitespace fixes in *.{cpp,h,qdoc}
the diff -w for this commit is empty.
Started-by: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I77bb84e71c63ce75e0709e5b94bee18e3ce6ab9e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/doc/snippets/image/supportedformat.cpp | 8 | ||||
-rw-r--r-- | src/gui/doc/src/coordsys.qdoc | 2 | ||||
-rw-r--r-- | src/gui/doc/src/paintsystem.qdoc | 4 | ||||
-rw-r--r-- | src/gui/image/qxbmhandler.cpp | 24 | ||||
-rw-r--r-- | src/gui/kernel/qdrag.cpp | 6 | ||||
-rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qshortcutmap.cpp | 2 | ||||
-rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qpainterpath.cpp | 4 |
9 files changed, 28 insertions, 28 deletions
diff --git a/src/gui/doc/snippets/image/supportedformat.cpp b/src/gui/doc/snippets/image/supportedformat.cpp index f4d2606728..0b52156b80 100644 --- a/src/gui/doc/snippets/image/supportedformat.cpp +++ b/src/gui/doc/snippets/image/supportedformat.cpp @@ -43,10 +43,10 @@ int main(int argv, char **args) { //! [0] - QImageWriter writer; - writer.setFormat("png"); - if (writer.supportsOption(QImageIOHandler::Description)) - qDebug() << "Png supports embedded text"; + QImageWriter writer; + writer.setFormat("png"); + if (writer.supportsOption(QImageIOHandler::Description)) + qDebug() << "Png supports embedded text"; //! [0] return 0; } diff --git a/src/gui/doc/src/coordsys.qdoc b/src/gui/doc/src/coordsys.qdoc index e66afcfe55..d9c7c7e3c1 100644 --- a/src/gui/doc/src/coordsys.qdoc +++ b/src/gui/doc/src/coordsys.qdoc @@ -29,7 +29,7 @@ \page coordsys.html \title Coordinate System \ingroup qt-graphics - \ingroup best-practices + \ingroup best-practices \brief Information about the coordinate system used by the paint system. diff --git a/src/gui/doc/src/paintsystem.qdoc b/src/gui/doc/src/paintsystem.qdoc index cd208e9e18..1006d2ef65 100644 --- a/src/gui/doc/src/paintsystem.qdoc +++ b/src/gui/doc/src/paintsystem.qdoc @@ -93,8 +93,8 @@ \page paintsystem-devices.html \title Paint Devices and Backends - \contentspage The Paint System - \nextpage Drawing and Filling + \contentspage The Paint System + \nextpage Drawing and Filling \section1 Creating a Paint Device diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp index aceb6623ea..5311afd745 100644 --- a/src/gui/image/qxbmhandler.cpp +++ b/src/gui/image/qxbmhandler.cpp @@ -103,7 +103,7 @@ static bool read_xbm_header(QIODevice *device, int& w, int& h) // "#define .._height <num>" readBytes = device->readLine(buf, buflen); if (readBytes <= 0) - return false; + return false; buf[readBytes - 1] = '\0'; sbuf = QString::fromLatin1(buf); @@ -183,9 +183,9 @@ static bool read_xbm_image(QIODevice *device, QImage *outImage) static bool write_xbm_image(const QImage &sourceImage, QIODevice *device, const QString &fileName) { QImage image = sourceImage; - int w = image.width(); - int h = image.height(); - int i; + int w = image.width(); + int h = image.height(); + int i; QString s = fileName; // get file base name int msize = s.length() + 100; char *buf = new char[msize]; @@ -203,16 +203,16 @@ static bool write_xbm_image(const QImage &sourceImage, QIODevice *device, const bool invert = qGray(image.color(0)) < qGray(image.color(1)); char hexrep[16]; for (i=0; i<10; i++) - hexrep[i] = '0' + i; + hexrep[i] = '0' + i; for (i=10; i<16; i++) - hexrep[i] = 'a' -10 + i; + hexrep[i] = 'a' -10 + i; if (invert) { - char t; - for (i=0; i<8; i++) { - t = hexrep[15-i]; - hexrep[15-i] = hexrep[i]; - hexrep[i] = t; - } + char t; + for (i=0; i<8; i++) { + t = hexrep[15-i]; + hexrep[15-i] = hexrep[i]; + hexrep[i] = t; + } } int bcnt = 0; char *p = buf; diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp index 91aae94730..465c04cdc8 100644 --- a/src/gui/kernel/qdrag.cpp +++ b/src/gui/kernel/qdrag.cpp @@ -103,7 +103,7 @@ QT_BEGIN_NAMESPACE \sa {Drag and Drop}, QClipboard, QMimeData, QWindowsMime, QMacPasteboardMime, {Draggable Icons Example}, {Draggable Text Example}, {Drop Site Example}, - {Fridge Magnets Example} + {Fridge Magnets Example} */ /*! @@ -253,8 +253,8 @@ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions) loop. Other events are still delivered to the application while the operation is performed. On Windows, the Qt event loop is blocked during the operation. However, QDrag::exec() on - Windows causes processEvents() to be called frequently to keep the GUI responsive. - If any loops or operations are called while a drag operation is active, it will block the drag operation. + Windows causes processEvents() to be called frequently to keep the GUI responsive. + If any loops or operations are called while a drag operation is active, it will block the drag operation. */ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions, Qt::DropAction defaultDropAction) diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 5770b76f1f..4569457a20 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -1567,7 +1567,7 @@ QDataStream &operator<<(QDataStream &s, const QKeySequence &keysequence) */ QDataStream &operator>>(QDataStream &s, QKeySequence &keysequence) { - qAtomicDetach(keysequence.d); + qAtomicDetach(keysequence.d); QList<quint32> list; s >> list; for (int i = 0; i < 4; ++i) diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 513e21937e..c915ed3928 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -359,7 +359,7 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e) resetState(); dispatchEvent(e); default: - break; + break; } // If nextState is QKeySequence::ExactMatch && identicals.count == 0 // we've only found disabled shortcuts diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index d5de8b009a..a1c4cf2a29 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -925,7 +925,7 @@ bool QOpenGLFramebufferObject::isValid() const bool QOpenGLFramebufferObject::bind() { if (!isValid()) - return false; + return false; Q_D(QOpenGLFramebufferObject); QOpenGLContext *current = QOpenGLContext::currentContext(); if (!current) @@ -956,7 +956,7 @@ bool QOpenGLFramebufferObject::bind() bool QOpenGLFramebufferObject::release() { if (!isValid()) - return false; + return false; QOpenGLContext *current = QOpenGLContext::currentContext(); if (!current) diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index b4c42f7060..aa2b9bea54 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -1738,8 +1738,8 @@ QList<QPolygonF> QPainterPath::toFillPolygons(const QMatrix &matrix) const //same as qt_polygon_isect_line in qpolygon.cpp static void qt_painterpath_isect_line(const QPointF &p1, - const QPointF &p2, - const QPointF &pos, + const QPointF &p2, + const QPointF &pos, int *winding) { qreal x1 = p1.x(); |