diff options
Diffstat (limited to 'src/gui')
32 files changed, 126 insertions, 126 deletions
diff --git a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp index 443f5407e0..1169254253 100644 --- a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp @@ -87,7 +87,7 @@ MainWindow::MainWindow() int row; QTextTableCell cell; QTextCursor cellCursor; - + QTextCharFormat charFormat; charFormat.setForeground(Qt::black); diff --git a/src/gui/doc/snippets/textdocument-texttable/main.cpp b/src/gui/doc/snippets/textdocument-texttable/main.cpp index 0024d8592b..f82b5235cf 100644 --- a/src/gui/doc/snippets/textdocument-texttable/main.cpp +++ b/src/gui/doc/snippets/textdocument-texttable/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char * argv[]) tableFormat.setCellSpacing(2); QTextTable *table = cursor.insertTable(rows, columns); table->setFormat(tableFormat); - + QTextCharFormat boldFormat; boldFormat.setFontWeight(QFont::Bold); diff --git a/src/gui/doc/src/paintsystem.qdoc b/src/gui/doc/src/paintsystem.qdoc index 7857a160ac..cd208e9e18 100644 --- a/src/gui/doc/src/paintsystem.qdoc +++ b/src/gui/doc/src/paintsystem.qdoc @@ -50,7 +50,7 @@ \ingroup qt-graphics \ingroup frameworks-technologies \ingroup qt-basic-concepts - + Qt's paint system enables painting on screen and print devices using the same API, and is primarily based on the QPainter, @@ -70,7 +70,7 @@ same painting pipeline making it easy to add support for new features and providing default implementations for unsupported ones. - + \section1 Topics \list \li \l{Classes for Painting} @@ -126,7 +126,7 @@ in a platform-independent way. Another benefit is that the painting can be performed in another thread than the current GUI thread. - + \row \li \b Pixmap The QPixmap class is an off-screen image representation which is @@ -175,7 +175,7 @@ actually be able to draw on the device, this paint engine must be a custom paint engine created by deriving from the QPaintEngine class. - + \endtable */ @@ -183,7 +183,7 @@ /*! \page paintsystem-drawing.html \title Drawing and Filling - + \previouspage Paint Devices and Backends \contentspage The Paint System \nextpage Coordinate System diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc index aa44dcfad5..201bb03a14 100644 --- a/src/gui/doc/src/qtgui.qdoc +++ b/src/gui/doc/src/qtgui.qdoc @@ -62,7 +62,7 @@ For application developers writing user interfaces, Qt provides higher level API's, like Qt Quick, that are much more suitable - than the enablers found in the Qt GUI module. + than the enablers found in the Qt GUI module. \section1 Getting started 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; diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index 79da6471b8..f0b1f16ba2 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -226,7 +226,7 @@ QClipboard::~QClipboard() the global clipboard. \value Selection indicates that data should be stored and retrieved from - the global mouse selection. Support for \c Selection is provided only on + the global mouse selection. Support for \c Selection is provided only on systems with a global mouse selection (e.g. X11). \value FindBuffer indicates that data should be stored and retrieved from @@ -344,7 +344,7 @@ void QClipboard::setText(const QString &text, Mode mode) clipboard is used. If \a mode is QClipboard::Clipboard, the image is retrieved from the global clipboard. If \a mode is QClipboard::Selection, the image is retrieved from the global - mouse selection. + mouse selection. \sa setImage(), pixmap(), mimeData(), QImage::isNull() */ @@ -459,7 +459,7 @@ void QClipboard::setPixmap(const QPixmap &pixmap, Mode mode) \sa mimeData() */ -/*! +/*! \fn void QClipboard::clear(Mode mode) Clear the clipboard contents. @@ -467,7 +467,7 @@ void QClipboard::setPixmap(const QPixmap &pixmap, Mode mode) clipboard is used. If \a mode is QClipboard::Clipboard, this function clears the global clipboard contents. If \a mode is QClipboard::Selection, this function clears the global mouse - selection contents. If \a mode is QClipboard::FindBuffer, this + selection contents. If \a mode is QClipboard::FindBuffer, this function clears the search string buffer. \sa QClipboard::Mode, supportsSelection() @@ -521,21 +521,21 @@ bool QClipboard::ownsFindBuffer() const return ownsMode(FindBuffer); } -/*! +/*! \internal \fn bool QClipboard::supportsMode(Mode mode) const; Returns true if the clipboard supports the clipboard mode speacified by \a mode; otherwise returns false. */ -/*! +/*! \internal \fn bool QClipboard::ownsMode(Mode mode) const; Returns true if the clipboard supports the clipboard data speacified by \a mode; otherwise returns false. */ -/*! +/*! \internal Emits the appropriate changed signal for \a mode. */ diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index 016a0ef798..0bf4cc7bf9 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -107,7 +107,7 @@ public: static void setPos(QScreen *screen, int x, int y); inline static void setPos(const QPoint &p) { setPos(p.x(), p.y()); } inline static void setPos(QScreen *screen, const QPoint &p) { setPos(screen, p.x(), p.y()); } - + private: QCursorData *d; }; diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index cc0ecdf388..66eb1d58ed 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -878,7 +878,7 @@ const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate \value SelectPreviousPage Extend selection to previous page. \value SelectPreviousWord Extend selection to previous word. \value SelectStartOfBlock Extend selection to the start of a text block. This shortcut is only used on OS X. - \value SelectStartOfDocument Extend selection to start of document. + \value SelectStartOfDocument Extend selection to start of document. \value SelectStartOfLine Extend selection to start of line. \value Underline Underline text. \value Undo Undo. @@ -892,10 +892,10 @@ const uint QKeySequencePrivate::numberOfKeyBindings = sizeof(QKeySequencePrivate /*! \since 4.2 - Constructs a QKeySequence object for the given \a key. - The result will depend on the currently running platform. + Constructs a QKeySequence object for the given \a key. + The result will depend on the currently running platform. - The resulting object will be based on the first element in the + The resulting object will be based on the first element in the list of key bindings for the \a key. */ QKeySequence::QKeySequence(StandardKey key) @@ -903,7 +903,7 @@ QKeySequence::QKeySequence(StandardKey key) const QList <QKeySequence> bindings = keyBindings(key); //pick only the first/primary shortcut from current bindings if (bindings.size() > 0) { - d = bindings.first().d; + d = bindings.first().d; d->ref.ref(); } else @@ -991,8 +991,8 @@ static inline int maybeSwapShortcut(int shortcut) \since 4.2 Returns a list of key bindings for the given \a key. - The result of calling this function will vary based on the target platform. - The first element of the list indicates the primary shortcut for the given platform. + The result of calling this function will vary based on the target platform. + The first element of the list indicates the primary shortcut for the given platform. If the result contains more than one result, these can be considered alternative shortcuts on the same platform for the given \a key. */ @@ -1509,9 +1509,9 @@ QKeySequence::SequenceMatch QKeySequence::matches(const QKeySequence &seq) const \obsolete - Use toString() instead. - - Returns the key sequence as a QString. This is equivalent to + Use toString() instead. + + Returns the key sequence as a QString. This is equivalent to calling toString(QKeySequence::NativeText). Note that the result is not platform independent. */ diff --git a/src/gui/opengl/qopengl2pexvertexarray_p.h b/src/gui/opengl/qopengl2pexvertexarray_p.h index fa0ad47e7f..03a3ba5d24 100644 --- a/src/gui/opengl/qopengl2pexvertexarray_p.h +++ b/src/gui/opengl/qopengl2pexvertexarray_p.h @@ -104,20 +104,20 @@ public: maxX(-2e10), maxY(-2e10), minX(2e10), minY(2e10), boundingRectDirty(true) { } - + inline void addRect(const QRectF &rect) { qreal top = rect.top(); qreal left = rect.left(); qreal bottom = rect.bottom(); qreal right = rect.right(); - + vertexArray << QOpenGLPoint(left, top) << QOpenGLPoint(right, top) << QOpenGLPoint(right, bottom) << QOpenGLPoint(right, bottom) << QOpenGLPoint(left, bottom) - << QOpenGLPoint(left, top); + << QOpenGLPoint(left, top); } inline void addQuad(const QRectF &rect) diff --git a/src/gui/opengl/qopengles2ext.h b/src/gui/opengl/qopengles2ext.h index be7d6f3290..5926d5bbd5 100644 --- a/src/gui/opengl/qopengles2ext.h +++ b/src/gui/opengl/qopengles2ext.h @@ -100,23 +100,23 @@ typedef void* GLeglImageOES; #endif /* GL_OES_required_internalformat */ -#ifndef GL_OES_required_internalformat +#ifndef GL_OES_required_internalformat #define GL_ALPHA8_OES 0x803C #define GL_DEPTH_COMPONENT16_OES 0x81A5 -/* reuse GL_DEPTH_COMPONENT24_OES */ -/* reuse GL_DEPTH24_STENCIL8_OES */ -/* reuse GL_DEPTH_COMPONENT32_OES */ +/* reuse GL_DEPTH_COMPONENT24_OES */ +/* reuse GL_DEPTH24_STENCIL8_OES */ +/* reuse GL_DEPTH_COMPONENT32_OES */ #define GL_LUMINANCE4_ALPHA4_OES 0x8043 #define GL_LUMINANCE8_ALPHA8_OES 0x8045 #define GL_LUMINANCE8_OES 0x8040 #define GL_RGBA4_OES 0x8056 #define GL_RGB5_A1_OES 0x8057 #define GL_RGB565_OES 0x8D62 -/* reuse GL_RGB8_OES */ -/* reuse GL_RGBA8_OES */ +/* reuse GL_RGB8_OES */ +/* reuse GL_RGBA8_OES */ /* reuse GL_RGB10_EXT */ /* reuse GL_RGB10_A2_EXT */ -#endif +#endif /* GL_OES_rgb8_rgba8 */ #ifndef GL_OES_rgb8_rgba8 @@ -216,9 +216,9 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen #define GL_SHADER 0x82E1 #define GL_PROGRAM 0x82E2 #define GL_QUERY 0x82E3 -/* PROGRAM_PIPELINE only in GL */ +/* PROGRAM_PIPELINE only in GL */ #define GL_SAMPLER 0x82E6 -/* DISPLAY_LIST only in GL */ +/* DISPLAY_LIST only in GL */ #define GL_MAX_LABEL_LENGTH 0x82E8 #define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 #define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 @@ -328,12 +328,12 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen #endif /* GL_ANGLE_instanced_arrays */ -#ifndef GL_ANGLE_instanced_arrays +#ifndef GL_ANGLE_instanced_arrays #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE #endif /* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order +#ifndef GL_ANGLE_pack_reverse_row_order #define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 #endif @@ -343,23 +343,23 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen #endif /* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 +#ifndef GL_ANGLE_texture_compression_dxt3 #define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 #endif /* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 +#ifndef GL_ANGLE_texture_compression_dxt5 #define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 #endif /* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage +#ifndef GL_ANGLE_texture_usage #define GL_TEXTURE_USAGE_ANGLE 0x93A2 #define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 #endif /* GL_ANGLE_translated_shader_source */ -#ifndef GL_ANGLE_translated_shader_source +#ifndef GL_ANGLE_translated_shader_source #define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 #endif @@ -369,7 +369,7 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen /* GL_APPLE_copy_texture_levels */ /* No new tokens introduced by this extension. */ - + /* GL_APPLE_framebuffer_multisample */ #ifndef GL_APPLE_framebuffer_multisample #define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB @@ -394,9 +394,9 @@ typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLen #ifndef __gl3_h_ /* These types are defined with reference to <inttypes.h> * in the Apple extension spec, but here we use the Khronos - * portable types in khrplatform.h, and assume those types + * portable types in khrplatform.h, and assume those types * are always defined. - * If any other extensions using these types are defined, + * If any other extensions using these types are defined, * the typedefs must move out of this block and be shared. */ typedef khronos_int64_t GLint64; @@ -502,7 +502,7 @@ typedef struct __GLsync *GLsync; /* GL_EXT_multisampled_render_to_texture */ #ifndef GL_EXT_multisampled_render_to_texture #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C -/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ +/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ #define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 #define GL_MAX_SAMPLES_EXT 0x8D57 @@ -610,10 +610,10 @@ typedef struct __GLsync *GLsync; /* GL_EXT_texture_storage */ #ifndef GL_EXT_texture_storage #define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F -#define GL_ALPHA8_EXT 0x803C +#define GL_ALPHA8_EXT 0x803C #define GL_LUMINANCE8_EXT 0x8040 #define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_RGBA32F_EXT 0x8814 +#define GL_RGBA32F_EXT 0x8814 #define GL_RGB32F_EXT 0x8815 #define GL_ALPHA32F_EXT 0x8816 #define GL_LUMINANCE32F_EXT 0x8818 @@ -623,12 +623,12 @@ typedef struct __GLsync *GLsync; #define GL_ALPHA16F_EXT 0x881C #define GL_LUMINANCE16F_EXT 0x881E #define GL_LUMINANCE_ALPHA16F_EXT 0x881F -#define GL_RGB10_A2_EXT 0x8059 +#define GL_RGB10_A2_EXT 0x8059 #define GL_RGB10_EXT 0x8052 #define GL_BGRA8_EXT 0x93A1 #define GL_R8_EXT 0x8229 #define GL_RG8_EXT 0x822B -#define GL_R32F_EXT 0x822E +#define GL_R32F_EXT 0x822E #define GL_RG32F_EXT 0x8230 #define GL_R16F_EXT 0x822D #define GL_RG16F_EXT 0x822F @@ -785,7 +785,7 @@ typedef struct __GLsync *GLsync; #ifndef GL_NV_framebuffer_blit #define GL_READ_FRAMEBUFFER_NV 0x8CA8 #define GL_DRAW_FRAMEBUFFER_NV 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_NV 0x8CA6 +#define GL_DRAW_FRAMEBUFFER_BINDING_NV 0x8CA6 #define GL_READ_FRAMEBUFFER_BINDING_NV 0x8CAA #endif @@ -824,10 +824,10 @@ typedef struct __GLsync *GLsync; /* GL_NV_shadow_samplers_array */ #ifndef GL_NV_shadow_samplers_array #define GL_SAMPLER_2D_ARRAY_SHADOW_NV 0x8DC4 -#endif - +#endif + /* GL_NV_shadow_samplers_cube */ -#ifndef GL_NV_shadow_samplers_cube +#ifndef GL_NV_shadow_samplers_cube #define GL_SAMPLER_CUBE_SHADOW_NV 0x8DC5 #endif @@ -1162,7 +1162,7 @@ GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GL GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label); GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params); -#endif +#endif typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); @@ -1256,7 +1256,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); #endif -#ifndef GL_ANGLE_instanced_arrays +#ifndef GL_ANGLE_instanced_arrays #define GL_ANGLE_instanced_arrays 1 #ifdef GL_GLEXT_PROTOTYPES GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount); @@ -1269,7 +1269,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLu #endif /* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order +#ifndef GL_ANGLE_pack_reverse_row_order #define GL_ANGLE_pack_reverse_row_order 1 #endif @@ -1279,21 +1279,21 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLu #endif /* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 +#ifndef GL_ANGLE_texture_compression_dxt3 #define GL_ANGLE_texture_compression_dxt3 1 #endif /* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 +#ifndef GL_ANGLE_texture_compression_dxt5 #define GL_ANGLE_texture_compression_dxt5 1 #endif /* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage +#ifndef GL_ANGLE_texture_usage #define GL_ANGLE_texture_usage 1 #endif -#ifndef GL_ANGLE_translated_shader_source +#ifndef GL_ANGLE_translated_shader_source #define GL_ANGLE_translated_shader_source 1 #ifdef GL_GLEXT_PROTOTYPES GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h index e65578caee..dfdb8249d9 100644 --- a/src/gui/opengl/qopenglext.h +++ b/src/gui/opengl/qopenglext.h @@ -13,7 +13,7 @@ extern "C" { /* ** Copyright (c) 2007-2012 The Khronos Group Inc. -** +** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the ** "Materials"), to deal in the Materials without restriction, including @@ -21,10 +21,10 @@ extern "C" { ** distribute, sublicense, and/or sell copies of the Materials, and to ** permit persons to whom the Materials are furnished to do so, subject to ** the following conditions: -** +** ** The above copyright notice and this permission notice shall be included ** in all copies or substantial portions of the Materials. -** +** ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. diff --git a/src/gui/opengl/qtriangulator.cpp b/src/gui/opengl/qtriangulator.cpp index 83c7c93fdf..d3c80e264f 100644 --- a/src/gui/opengl/qtriangulator.cpp +++ b/src/gui/opengl/qtriangulator.cpp @@ -370,7 +370,7 @@ bool QIntersectionPoint::isOnLine(const QPodPoint &u, const QPodPoint &v) const if (((q.x < 0) == (q.y < 0)) != ((p.x < 0) == (p.y < 0))) return false; // 'p + offset' and 'q' pass through different quadrants. - + // Move all coordinates into the first quadrant. quint64 nx, ny; if (p.x < 0) @@ -991,7 +991,7 @@ void QTriangulator<T>::ComplexToSimple::initEdges() if (first != m_edges.size()) m_edges.last().to = m_edges.at(first).from; for (int i = 0; i < m_edges.size(); ++i) { - m_edges.at(i).originallyPointingUp = m_edges.at(i).pointingUp = + m_edges.at(i).originallyPointingUp = m_edges.at(i).pointingUp = m_parent->m_vertices.at(m_edges.at(i).to) < m_parent->m_vertices.at(m_edges.at(i).from); } } @@ -1646,7 +1646,7 @@ QTriangulator<T>::ComplexToSimple::DebugDialog::DebugDialog(ComplexToSimple *par QDataBuffer<QPodPoint> &vertices = m_parent->m_parent->m_vertices; if (vertices.isEmpty()) return; - + int minX, maxX, minY, maxY; minX = maxX = vertices.at(0).x; minY = maxY = vertices.at(0).y; @@ -1671,7 +1671,7 @@ void QTriangulator<T>::ComplexToSimple::DebugDialog::paintEvent(QPaintEvent *) QDataBuffer<QPodPoint> &vertices = m_parent->m_parent->m_vertices; if (vertices.isEmpty()) return; - + qreal halfPointSize = qMin(m_window.width(), m_window.height()) / 300.0; p.setWindow(m_window.toRect()); @@ -1725,7 +1725,7 @@ void QTriangulator<T>::ComplexToSimple::DebugDialog::paintEvent(QPaintEvent *) } u += q; v += q; - p.drawLine(u.x, u.y, v.x, v.y); + p.drawLine(u.x, u.y, v.x, v.y); } } diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp index 7eec60ed12..12ca84d8d1 100644 --- a/src/gui/painting/qcolor.cpp +++ b/src/gui/painting/qcolor.cpp @@ -1572,7 +1572,7 @@ QColor QColor::toRgb() const // achromatic case color.ct.argb.red = color.ct.argb.green = color.ct.argb.blue = ct.ahsl.lightness; } else if (ct.ahsl.lightness == 0) { - // lightness 0 + // lightness 0 color.ct.argb.red = color.ct.argb.green = color.ct.argb.blue = 0; } else { // chromatic case diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index 5bd879ed63..ef3503e8d8 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -266,10 +266,10 @@ inline QColor::QColor(const QColor &acolor) inline bool QColor::isValid() const { return cspec != Invalid; } -inline QColor QColor::lighter(int f) const +inline QColor QColor::lighter(int f) const { return light(f); } -inline QColor QColor::darker(int f) const +inline QColor QColor::darker(int f) const { return dark(f); } QT_END_NAMESPACE diff --git a/src/gui/painting/qcssutil_p.h b/src/gui/painting/qcssutil_p.h index 38e45ae7c9..7888b9edf1 100644 --- a/src/gui/painting/qcssutil_p.h +++ b/src/gui/painting/qcssutil_p.h @@ -78,7 +78,7 @@ extern void Q_GUI_EXPORT qNormalizeRadii(const QRect &br, const QSize *radii, QSize *tlr, QSize *trr, QSize *blr, QSize *brr); QT_END_NAMESPACE - + #endif //QT_NO_CSSPARSER #endif // QCSSUTIL_P_H diff --git a/src/gui/painting/qemulationpaintengine_p.h b/src/gui/painting/qemulationpaintengine_p.h index 72093a3612..db2d51e53a 100644 --- a/src/gui/painting/qemulationpaintengine_p.h +++ b/src/gui/painting/qemulationpaintengine_p.h @@ -62,10 +62,10 @@ class QEmulationPaintEngine : public QPaintEngineEx { public: QEmulationPaintEngine(QPaintEngineEx *engine); - + virtual bool begin(QPaintDevice *pdev); virtual bool end(); - + virtual Type type() const; virtual QPainterState *createState(QPainterState *orig) const; @@ -78,7 +78,7 @@ public: virtual void drawStaticTextItem(QStaticTextItem *item); virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s); virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, Qt::ImageConversionFlags flags); - + virtual void clipEnabledChanged(); virtual void penChanged(); virtual void brushChanged(); diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp index be446c86eb..bb0c441b40 100644 --- a/src/gui/painting/qpaintbuffer.cpp +++ b/src/gui/painting/qpaintbuffer.cpp @@ -1731,12 +1731,12 @@ void QPainterReplayer::process(const QPaintBufferCommand &cmd) #endif painter->setClipRegion(region, Qt::ClipOperation(cmd.extra)); break; } - + #if !defined(QT_NO_RAWFONT) case QPaintBufferPrivate::Cmd_DrawStaticText: { - + QVariantList variants(d->variants.at(cmd.offset).value<QVariantList>()); - + QFont font = variants.at(0).value<QFont>(); QVector<quint32> glyphIndexes; diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 8769aeaba9..81c9c676ba 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -158,7 +158,7 @@ bool QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const metrics.yoff.toReal(), metrics.x.toReal(), metrics.y.toReal()); -#endif +#endif GlyphAndSubPixelPosition key(glyph, subPixelPosition); int glyph_width = metrics.width.ceil().toInt(); int glyph_height = metrics.height.ceil().toInt(); diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp index eaca605652..b7b8e919ad 100644 --- a/src/gui/text/qabstracttextdocumentlayout.cpp +++ b/src/gui/text/qabstracttextdocumentlayout.cpp @@ -183,7 +183,7 @@ QT_BEGIN_NAMESPACE This signal is emitted when the specified \a block has been updated. Subclasses of QAbstractTextDocumentLayout should emit this signal when - the layout of \a block has changed in order to repaint. + the layout of \a block has changed in order to repaint. */ /*! diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 5f610e3fb7..1264330873 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -537,7 +537,7 @@ QSize ValueExtractor::sizeValue(const Declaration &decl) lengthValueFromData(qvariant_cast<LengthData>(v.at(1)), f)); } - LengthData x[2] = { {0, LengthData::None }, {0, LengthData::None} }; + LengthData x[2] = { {0, LengthData::None }, {0, LengthData::None} }; if (decl.d->values.count() > 0) x[0] = lengthValue(decl.d->values.at(0)); if (decl.d->values.count() > 1) @@ -917,7 +917,7 @@ void ValueExtractor::borderValue(const Declaration &decl, int *width, QCss::Bord if (decl.d->values.isEmpty()) return; - + BorderData data; data.width.number = 0; data.width.unit = LengthData::None; @@ -1465,7 +1465,7 @@ QRect Declaration::rectValue() const { if (d->values.count() != 1) return QRect(); - + if (d->parsed.isValid()) return qvariant_cast<QRect>(d->parsed); @@ -1934,7 +1934,7 @@ QVector<StyleRule> StyleSelector::styleRulesForNode(NodePtr node) return rules; QMap<uint, StyleRule> weightedRules; // (spec, rule) that will be sorted below - + //prune using indexed stylesheet for (int sheetIdx = 0; sheetIdx < styleSheets.count(); ++sheetIdx) { const StyleSheet &styleSheet = styleSheets.at(sheetIdx); diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 2c1683f416..cd88e3bbe4 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -60,8 +60,8 @@ QT_BEGIN_NAMESPACE \mainclass QStaticText provides a way to cache layout data for a block of text so that it can be drawn - more efficiently than by using QPainter::drawText() in which the layout information is - recalculated with every call. + more efficiently than by using QPainter::drawText() in which the layout information is + recalculated with every call. The class primarily provides an optimization for cases where the text, its font and the transformations on the painter are static over several paint events. If the text or its layout @@ -97,8 +97,8 @@ QT_BEGIN_NAMESPACE \endcode The QStaticText class can be used to mimic the behavior of QPainter::drawText() to a specific - point with no boundaries, and also when QPainter::drawText() is called with a bounding - rectangle. + point with no boundaries, and also when QPainter::drawText() is called with a bounding + rectangle. If a bounding rectangle is not required, create a QStaticText object without setting a preferred text width. The text will then occupy a single line. @@ -151,7 +151,7 @@ QT_BEGIN_NAMESPACE /*! Constructs an empty QStaticText */ -QStaticText::QStaticText() +QStaticText::QStaticText() : data(new QStaticTextPrivate) { } @@ -161,7 +161,7 @@ QStaticText::QStaticText() */ QStaticText::QStaticText(const QString &text) : data(new QStaticTextPrivate) -{ +{ data->text = text; data->invalidate(); } @@ -169,7 +169,7 @@ QStaticText::QStaticText(const QString &text) /*! Constructs a QStaticText object which is a copy of \a other. */ -QStaticText::QStaticText(const QStaticText &other) +QStaticText::QStaticText(const QStaticText &other) { data = other.data; } @@ -186,7 +186,7 @@ QStaticText::~QStaticText() \internal */ void QStaticText::detach() -{ +{ if (data->ref.load() != 1) data.detach(); } @@ -219,7 +219,7 @@ void QStaticText::prepare(const QTransform &matrix, const QFont &font) Assigns \a other to this QStaticText. */ QStaticText &QStaticText::operator=(const QStaticText &other) -{ +{ data = other.data; return *this; } @@ -300,7 +300,7 @@ Qt::TextFormat QStaticText::textFormat() const \sa setText() */ -QString QStaticText::text() const +QString QStaticText::text() const { return data->text; } @@ -651,7 +651,7 @@ void QStaticTextPrivate::paintText(const QPointF &topLeftPosition, QPainter *p) .arg(QString::number(color.blue(), 16), 2, QLatin1Char('0'))); #endif document.setDefaultFont(font); - document.setDocumentMargin(0.0); + document.setDocumentMargin(0.0); #ifndef QT_NO_TEXTHTMLPARSER document.setHtml(text); #else diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h index 60fa82712b..e41c475495 100644 --- a/src/gui/text/qstatictext.h +++ b/src/gui/text/qstatictext.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QStaticTextPrivate; class Q_GUI_EXPORT QStaticText -{ +{ public: enum PerformanceHint { ModerateCaching, diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h index 1434c54417..4451f27b27 100644 --- a/src/gui/text/qstatictext_p.h +++ b/src/gui/text/qstatictext_p.h @@ -77,7 +77,7 @@ public: class Q_GUI_EXPORT QStaticTextItem { -public: +public: QStaticTextItem() : chars(0), numChars(0), useBackendOptimizations(false), userDataNeedsUpdate(0), m_fontEngine(0), m_userData(0) {} diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp index e8e1c81dab..784aeb9a71 100644 --- a/src/gui/text/qsyntaxhighlighter.cpp +++ b/src/gui/text/qsyntaxhighlighter.cpp @@ -380,7 +380,7 @@ void QSyntaxHighlighter::rehighlight() \since 4.6 Reapplies the highlighting to the given QTextBlock \a block. - + \sa rehighlight() */ void QSyntaxHighlighter::rehighlightBlock(const QTextBlock &block) diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 34133c5e07..b83af30f7f 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -416,12 +416,12 @@ void QTextDocument::redo(QTextCursor *cursor) } /*! \enum QTextDocument::Stacks - + \value UndoStack The undo stack. \value RedoStack The redo stack. \value UndoAndRedoStacks Both the undo and redo stacks. */ - + /*! \since 4.7 Clears the stacks specified by \a stacksToClear. diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 833e4c5037..50908f9908 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1022,7 +1022,7 @@ static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip) */ #if !defined(QT_NO_RAWFONT) QList<QGlyphRun> QTextLayout::glyphRuns(int from, int length) const -{ +{ if (from < 0) from = 0; if (length < 0) @@ -1651,7 +1651,7 @@ namespace { } inline glyph_t currentGlyph() const - { + { Q_ASSERT(currentPosition > 0); Q_ASSERT(logClusters[currentPosition - 1] < glyphs.numGlyphs); diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 80ed2f023f..8465dcdaad 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -636,7 +636,7 @@ QTextFrame::iterator QTextFrame::begin() const /*! Returns an iterator pointing to the position past the last document element inside the frame. - Please see the document \l{STL-Style Iterators} for more information. + Please see the document \l{STL-Style Iterators} for more information. \sa begin() */ QTextFrame::iterator QTextFrame::end() const diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp index d83dc98e22..1572648d7f 100644 --- a/src/gui/text/qtextodfwriter.cpp +++ b/src/gui/text/qtextodfwriter.cpp @@ -677,13 +677,13 @@ void QTextOdfWriter::writeFrameFormat(QXmlStreamWriter &writer, QTextFrameFormat writer.writeEndElement(); // style // TODO consider putting the following properties in a qt-namespace. -// Position position () const -// qreal border () const -// QBrush borderBrush () const -// BorderStyle borderStyle () const -// qreal padding () const -// QTextLength width () const -// QTextLength height () const +// Position position () const +// qreal border () const +// QBrush borderBrush () const +// BorderStyle borderStyle () const +// qreal padding () const +// QTextLength width () const +// QTextLength height () const // PageBreakFlags pageBreakPolicy () const } diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp index 7b5d20bc5c..c939020457 100644 --- a/src/gui/text/qtextoption.cpp +++ b/src/gui/text/qtextoption.cpp @@ -394,7 +394,7 @@ QList<QTextOption::Tab> QTextOption::tabs() const /*! \fn Tab::Tab(qreal pos, TabType tabType, QChar delim = QChar()) - + Creates a tab with the given position, tab type, and delimiter (\a pos, \a tabType, \a delim). diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp index 0c9ec6203e..a56f8060e0 100644 --- a/src/gui/text/qtexttable.cpp +++ b/src/gui/text/qtexttable.cpp @@ -535,11 +535,11 @@ void QTextTablePrivate::update() const Rows and columns within a QTextTable can be merged and split using the mergeCells() and splitCell() functions. However, only cells that span multiple rows or columns can be split. (Merging or splitting does not increase or decrease - the number of rows and columns.) + the number of rows and columns.) Note that if you have merged multiple columns and rows into one cell, you will not - be able to split the merged cell into new cells spanning over more than one row - or column. To be able to split cells spanning over several rows and columns you + be able to split the merged cell into new cells spanning over more than one row + or column. To be able to split cells spanning over several rows and columns you need to do this over several iterations. \table 80% |