From b11317a64339f5a4bcffc8234ecaf15c7fb416f2 Mon Sep 17 00:00:00 2001 From: Axel Waggershauser Date: Fri, 15 Mar 2013 00:42:15 +0100 Subject: 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 --- src/concurrent/qtconcurrentfilter.cpp | 2 +- src/concurrent/qtconcurrentmap.cpp | 6 +- src/concurrent/qtconcurrentmapkernel.h | 2 +- src/concurrent/qtconcurrentreducekernel.h | 2 +- src/concurrent/qtconcurrentrun.cpp | 52 ++++----- .../animation/qsequentialanimationgroup.cpp | 4 +- src/corelib/animation/qvariantanimation.cpp | 4 +- src/corelib/arch/qatomic_ia64.h | 34 +++--- src/corelib/arch/sparc/arch.pri | 2 +- src/corelib/arch/sparc/qatomic_sparc.cpp | 2 +- src/corelib/codecs/qeuckrcodec.cpp | 4 +- src/corelib/codecs/qiconvcodec.cpp | 2 +- src/corelib/codecs/qjpunicode.cpp | 6 +- .../snippets/code/src_corelib_global_qglobal.cpp | 4 +- .../src_corelib_thread_qwaitcondition_unix.cpp | 2 +- .../snippets/code/src_corelib_tools_qbytearray.cpp | 2 +- src/corelib/doc/snippets/fileinfo/main.cpp | 6 +- src/corelib/doc/snippets/qstring/main.cpp | 2 +- src/corelib/doc/snippets/sharedemployee/employee.h | 10 +- .../doc/snippets/signalmapper/filereader.cpp | 4 +- .../doc/snippets/statemachine/eventtest.cpp | 4 +- src/corelib/doc/snippets/statemachine/main4.cpp | 2 +- src/corelib/doc/snippets/streaming/main.cpp | 4 +- src/corelib/doc/snippets/timers/timers.cpp | 2 +- src/corelib/doc/src/objectmodel/object.qdoc | 4 +- src/corelib/doc/src/objectmodel/properties.qdoc | 6 +- .../doc/src/objectmodel/signalsandslots.qdoc | 4 +- src/corelib/global/qfeatures.h | 2 +- src/corelib/global/qfeatures.txt | 8 +- src/corelib/global/qglobal.h | 2 +- src/corelib/io/qdatastream.cpp | 2 +- src/corelib/io/qfilesystemwatcher_win.cpp | 2 +- src/corelib/io/qiodevice.cpp | 2 +- src/corelib/io/qresource_p.h | 2 +- src/corelib/io/qsettings.cpp | 12 +- src/corelib/io/qsettings_win.cpp | 2 +- src/corelib/kernel/qfunctions_nacl.h | 2 +- src/corelib/kernel/qmath.qdoc | 6 +- src/corelib/kernel/qmetaobject.cpp | 10 +- src/corelib/kernel/qobject.cpp | 8 +- src/corelib/kernel/qsystemerror_p.h | 6 +- src/corelib/kernel/qsystemsemaphore_win.cpp | 2 +- src/corelib/kernel/qvariant_p.h | 2 +- src/corelib/plugin/quuid.cpp | 12 +- src/corelib/statemachine/qstatemachine_p.h | 8 +- src/corelib/thread/qatomic.cpp | 2 +- src/corelib/thread/qexception.cpp | 4 +- src/corelib/thread/qfuture.qdoc | 2 +- src/corelib/thread/qfutureinterface.cpp | 2 +- src/corelib/thread/qfutureinterface.h | 2 +- src/corelib/thread/qfuturesynchronizer.h | 2 +- src/corelib/thread/qreadwritelock.cpp | 2 +- src/corelib/thread/qresultstore.cpp | 8 +- src/corelib/thread/qresultstore.h | 2 +- src/corelib/thread/qrunnable.cpp | 2 +- src/corelib/thread/qthread.cpp | 6 +- src/corelib/thread/qthreadpool.cpp | 14 +-- src/corelib/tools/qalgorithms.qdoc | 20 ++-- src/corelib/tools/qbitarray.cpp | 6 +- src/corelib/tools/qbytearray.cpp | 32 +++--- src/corelib/tools/qcontiguouscache.cpp | 4 +- src/corelib/tools/qcryptographichash.cpp | 4 +- src/corelib/tools/qhash.cpp | 2 +- src/corelib/tools/qiterator.qdoc | 24 ++-- src/corelib/tools/qline.cpp | 6 +- src/corelib/tools/qmargins.cpp | 2 +- src/corelib/tools/qpair.qdoc | 2 +- src/corelib/tools/qregexp.cpp | 2 +- src/corelib/tools/qringbuffer_p.h | 2 +- src/corelib/tools/qset.qdoc | 20 ++-- src/corelib/tools/qshareddata.cpp | 6 +- src/corelib/tools/qtextboundaryfinder.cpp | 2 +- src/corelib/tools/qvector.cpp | 2 +- src/corelib/xml/qxmlutils.cpp | 2 +- src/dbus/qdbusabstractinterface.cpp | 2 +- src/dbus/qdbuserror.cpp | 2 +- src/dbus/qdbusintrospection_p.h | 2 +- src/dbus/qdbusmetaobject.cpp | 18 +-- src/dbus/qdbusmetatype.cpp | 6 +- .../snippets/textdocument-tables/mainwindow.cpp | 2 +- .../doc/snippets/textdocument-texttable/main.cpp | 2 +- src/gui/doc/src/paintsystem.qdoc | 10 +- src/gui/doc/src/qtgui.qdoc | 2 +- src/gui/image/qimageiohandler.cpp | 2 +- src/gui/image/qmovie.cpp | 14 +-- src/gui/image/qxbmhandler.cpp | 2 +- src/gui/kernel/qclipboard.cpp | 14 +-- src/gui/kernel/qcursor.h | 2 +- src/gui/kernel/qkeysequence.cpp | 20 ++-- src/gui/opengl/qopengl2pexvertexarray_p.h | 6 +- src/gui/opengl/qopengles2ext.h | 68 +++++------ src/gui/opengl/qopenglext.h | 6 +- src/gui/opengl/qtriangulator.cpp | 10 +- src/gui/painting/qcolor.cpp | 2 +- src/gui/painting/qcolor.h | 4 +- src/gui/painting/qcssutil_p.h | 2 +- src/gui/painting/qemulationpaintengine_p.h | 6 +- src/gui/painting/qpaintbuffer.cpp | 6 +- src/gui/painting/qtextureglyphcache.cpp | 2 +- src/gui/text/qabstracttextdocumentlayout.cpp | 2 +- src/gui/text/qcssparser.cpp | 8 +- src/gui/text/qstatictext.cpp | 22 ++-- src/gui/text/qstatictext.h | 2 +- src/gui/text/qstatictext_p.h | 2 +- src/gui/text/qsyntaxhighlighter.cpp | 2 +- src/gui/text/qtextdocument.cpp | 4 +- src/gui/text/qtextlayout.cpp | 4 +- src/gui/text/qtextobject.cpp | 2 +- src/gui/text/qtextodfwriter.cpp | 14 +-- src/gui/text/qtextoption.cpp | 2 +- src/gui/text/qtexttable.cpp | 6 +- src/network/access/qhttpnetworkconnection.cpp | 2 +- .../access/qhttpnetworkconnectionchannel_p.h | 2 +- .../access/qnetworkaccessdebugpipebackend.cpp | 2 +- src/network/access/qnetworkaccessmanager.cpp | 18 +-- src/network/bearer/qnetworkconfigmanager.cpp | 2 +- src/network/bearer/qnetworksession.cpp | 108 +++++++++--------- src/network/bearer/qnetworksession_p.h | 2 +- .../code/src_network_socket_qabstractsocket.cpp | 2 +- src/network/doc/snippets/network/tcpwait.cpp | 8 +- src/network/kernel/qauthenticator.h | 2 +- src/network/kernel/qhostaddress.cpp | 2 +- src/network/kernel/qnetworkinterface.h | 2 +- src/network/kernel/qnetworkinterface_unix.cpp | 4 +- src/network/kernel/qnetworkinterface_win.cpp | 2 +- src/network/kernel/qnetworkinterface_win_p.h | 32 +++--- src/network/socket/qnativesocketengine_win.cpp | 2 +- src/network/socket/qtcpsocket.cpp | 2 +- src/network/ssl/qssl.cpp | 2 +- src/network/ssl/qsslcipher.cpp | 2 +- src/network/ssl/qsslerror.cpp | 4 +- src/network/ssl/qsslerror.h | 2 +- src/network/ssl/qsslsocket.cpp | 16 +-- src/opengl/doc/src/qtopengl-examples.qdoc | 2 +- src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h | 6 +- src/plugins/bearer/connman/qconnmanengine.cpp | 2 +- .../bearer/connman/qconnmanservice_linux.cpp | 4 +- .../bearer/connman/qconnmanservice_linux_p.h | 2 +- .../bearer/networkmanager/qnetworkmanagerservice.h | 84 +++++++------- src/plugins/bearer/qnetworksession_impl.h | 2 +- src/plugins/imageformats/ico/qicohandler.cpp | 2 +- src/plugins/imageformats/ico/qicohandler.h | 6 +- .../platforms/cocoa/qcocoaeventdispatcher.mm | 36 +++--- src/plugins/platforms/xcb/qxcbcursor.cpp | 2 +- src/printsupport/doc/snippets/widgetprinting.cpp | 2 +- src/printsupport/doc/src/qtprintsupport-index.qdoc | 4 +- src/sql/doc/snippets/code/doc_src_sql-driver.cpp | 2 +- src/sql/doc/src/qsqldatatype-table.qdoc | 2 +- src/sql/doc/src/sql-driver.qdoc | 4 +- src/sql/doc/src/sql-programming.qdoc | 14 +-- src/sql/drivers/mysql/qsql_mysql.cpp | 10 +- src/sql/drivers/oci/qsql_oci.cpp | 4 +- src/sql/drivers/sqlite/qsql_sqlite.cpp | 2 +- src/sql/drivers/sqlite2/qsql_sqlite2.cpp | 4 +- src/sql/kernel/qsqlquery.cpp | 14 +-- src/sql/models/qsqlquerymodel_p.h | 2 +- src/sql/models/qsqlrelationaltablemodel.cpp | 2 +- src/testlib/qsignalspy.qdoc | 2 +- src/testlib/qtestevent.qdoc | 2 +- src/tools/moc/utils.h | 4 +- src/tools/rcc/main.cpp | 4 +- src/tools/rcc/rcc.h | 4 +- src/tools/uic/cpp/cppwriteincludes.cpp | 6 +- src/tools/uic/driver.cpp | 2 +- src/widgets/accessible/qaccessiblewidget.cpp | 2 +- src/widgets/dialogs/qprogressdialog.cpp | 4 +- src/widgets/dialogs/qwizard_win.cpp | 10 +- .../code/src_gui_itemviews_qdatawidgetmapper.cpp | 2 +- src/widgets/doc/snippets/customviewstyle.cpp | 2 +- src/widgets/doc/snippets/javastyle.cpp | 20 ++-- src/widgets/doc/snippets/layouts/layouts.cpp | 6 +- src/widgets/doc/snippets/mainwindowsnippet.cpp | 8 +- src/widgets/doc/snippets/mdiareasnippets.cpp | 2 +- src/widgets/doc/snippets/myscrollarea.cpp | 2 +- .../doc/snippets/qtablewidget-using/mainwindow.cpp | 2 +- src/widgets/doc/snippets/simplemodel-use/main.cpp | 2 +- src/widgets/doc/snippets/stringlistmodel/model.cpp | 4 +- src/widgets/doc/snippets/timeline/main.cpp | 8 +- src/widgets/doc/src/model-view-programming.qdoc | 2 +- src/widgets/doc/src/widgets-and-layouts/focus.qdoc | 6 +- .../doc/src/widgets-and-layouts/layout.qdoc | 14 +-- .../doc/src/windows-and-dialogs/dialogs.qdoc | 4 +- .../doc/src/windows-and-dialogs/mainwindow.qdoc | 2 +- src/widgets/graphicsview/qgraphicslayout_p.cpp | 2 +- src/widgets/kernel/qboxlayout.cpp | 6 +- src/widgets/kernel/qdesktopwidget.qdoc | 8 +- src/widgets/kernel/qgesture.cpp | 2 +- src/widgets/kernel/qlayout.cpp | 2 +- src/widgets/kernel/qlayoutitem.cpp | 34 +++--- src/widgets/kernel/qwidget.cpp | 4 +- src/widgets/kernel/qwidget_qpa.cpp | 2 +- src/widgets/kernel/qwidgetaction.h | 4 +- src/widgets/kernel/qwidgetaction_p.h | 2 +- src/widgets/statemachine/qguistatemachine.cpp | 2 +- src/widgets/styles/qcommonstyle.cpp | 2 +- src/widgets/styles/qcommonstyle.h | 2 +- src/widgets/styles/qdrawutil.cpp | 4 +- src/widgets/styles/qgtkstyle.cpp | 4 +- src/widgets/styles/qmacstyle.qdoc | 38 +++---- src/widgets/styles/qmacstyle_mac.mm | 12 +- src/widgets/styles/qproxystyle.cpp | 2 +- src/widgets/styles/qstyle.cpp | 2 +- src/widgets/styles/qstyleoption.cpp | 20 ++-- src/widgets/styles/qwindowsmobilestyle.cpp | 124 ++++++++++----------- src/widgets/styles/qwindowsvistastyle.cpp | 28 ++--- src/widgets/util/qcolormap.qdoc | 2 +- src/widgets/util/qcompleter.cpp | 2 +- src/widgets/util/qscroller.cpp | 2 +- src/widgets/util/qscrollerproperties.cpp | 2 +- src/widgets/util/qsystemtrayicon.cpp | 2 +- src/widgets/util/qsystemtrayicon_win.cpp | 4 +- src/widgets/util/qsystemtrayicon_wince.cpp | 2 +- src/widgets/util/qundostack.cpp | 6 +- src/widgets/widgets/qabstractbutton.cpp | 2 +- src/widgets/widgets/qabstractscrollarea.cpp | 2 +- src/widgets/widgets/qabstractslider.cpp | 2 +- src/widgets/widgets/qabstractslider_p.h | 2 +- src/widgets/widgets/qbuttongroup.cpp | 4 +- src/widgets/widgets/qcalendarwidget.cpp | 2 +- src/widgets/widgets/qcombobox_p.h | 4 +- src/widgets/widgets/qdockarealayout.cpp | 2 +- src/widgets/widgets/qeffects.cpp | 4 +- src/widgets/widgets/qgroupbox.cpp | 4 +- src/widgets/widgets/qgroupbox.h | 2 +- src/widgets/widgets/qlineedit.cpp | 6 +- src/widgets/widgets/qlineedit_p.cpp | 2 +- src/widgets/widgets/qmaccocoaviewcontainer_mac.mm | 2 +- src/widgets/widgets/qmenu_wince.cpp | 24 ++-- src/widgets/widgets/qmenu_wince.rc | 32 +++--- src/widgets/widgets/qpushbutton.h | 2 +- src/widgets/widgets/qscrollarea.cpp | 2 +- src/widgets/widgets/qsplashscreen.cpp | 2 +- src/widgets/widgets/qsplitter.cpp | 2 +- src/widgets/widgets/qstatusbar.cpp | 6 +- src/widgets/widgets/qtoolbararealayout.cpp | 4 +- src/widgets/widgets/qtoolbararealayout_p.h | 4 +- src/widgets/widgets/qtoolbarlayout.cpp | 2 +- src/widgets/widgets/widgets.pri | 2 +- src/xml/sax/qxml.cpp | 4 +- 239 files changed, 875 insertions(+), 875 deletions(-) (limited to 'src') diff --git a/src/concurrent/qtconcurrentfilter.cpp b/src/concurrent/qtconcurrentfilter.cpp index 72362b7d8a..ef0229a695 100644 --- a/src/concurrent/qtconcurrentfilter.cpp +++ b/src/concurrent/qtconcurrentfilter.cpp @@ -148,7 +148,7 @@ QtConcurrent::filter(), QtConcurrent::filtered(), and QtConcurrent::filteredReduced() accept function objects, which can be used to - add state to a function call. The result_type typedef must define the + add state to a function call. The result_type typedef must define the result type of the function call operator: \snippet code/src_concurrent_qtconcurrentfilter.cpp 13 diff --git a/src/concurrent/qtconcurrentmap.cpp b/src/concurrent/qtconcurrentmap.cpp index 2dba3779ff..9718baf48f 100644 --- a/src/concurrent/qtconcurrentmap.cpp +++ b/src/concurrent/qtconcurrentmap.cpp @@ -56,7 +56,7 @@ /*! \enum QtConcurrent::ReduceOption - This enum specifies the order of which results from the map or filter + This enum specifies the order of which results from the map or filter function are passed to the reduce function. \value UnorderedReduce Reduction is done in an arbitrary order. @@ -197,7 +197,7 @@ QtConcurrent::map(), QtConcurrent::mapped(), and QtConcurrent::mappedReduced() accept function objects, which can be used to - add state to a function call. The result_type typedef must define the + add state to a function call. The result_type typedef must define the result type of the function call operator: \snippet code/src_concurrent_qtconcurrentmap.cpp 14 @@ -347,7 +347,7 @@ Calls \a function once for each item from \a begin to \a end and returns a container with the results. Specify the type of container as the a template argument, like this: - + \code QList ints = QtConcurrent::blockingMapped >(beginIterator, endIterator, fn); \endcode diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h index b456c42285..6817cd3e29 100644 --- a/src/concurrent/qtconcurrentmapkernel.h +++ b/src/concurrent/qtconcurrentmapkernel.h @@ -80,7 +80,7 @@ public: runIteration(it, i, 0); advance(it, 1); } - + return false; } }; diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h index a4a626d6c9..dcf4b92319 100644 --- a/src/concurrent/qtconcurrentreducekernel.h +++ b/src/concurrent/qtconcurrentreducekernel.h @@ -139,7 +139,7 @@ class ReduceKernel public: ReduceKernel(ReduceOptions _reduceOptions) - : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0), + : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0), threadCount(QThreadPool::globalInstance()->maxThreadCount()) { } diff --git a/src/concurrent/qtconcurrentrun.cpp b/src/concurrent/qtconcurrentrun.cpp index 880441cfc3..4ab1399c0c 100644 --- a/src/concurrent/qtconcurrentrun.cpp +++ b/src/concurrent/qtconcurrentrun.cpp @@ -47,63 +47,63 @@ separate thread. \ingroup thread - + This function is a part of the \l {Concurrent Programming}{Qt Concurrent} framework. The QtConcurrent::run() function runs a function in a separate thread. The return value of the function is made available through the QFuture API. - + \section1 Running a Function in a Separate Thread - + To run a function in another thread, use QtConcurrent::run(): - + \snippet code/src_concurrent_qtconcurrentrun.cpp 0 - + This will run \e aFunction in a separate thread obtained from the default QThreadPool. You can use the QFuture and QFutureWatcher classes to monitor the status of the function. - + \section1 Passing Arguments to the Function Passing arguments to the function is done by adding them to the QtConcurrent::run() call immediately after the function name. For example: - + \snippet code/src_concurrent_qtconcurrentrun.cpp 1 - + A copy of each argument is made at the point where QtConcurrent::run() is called, and these values are passed to the thread when it begins executing the function. Changes made to the arguments after calling QtConcurrent::run() are \e not visible to the thread. - + \section1 Returning Values from the Function - + Any return value from the function is available via QFuture: - + \snippet code/src_concurrent_qtconcurrentrun.cpp 2 - + As documented above, passing arguments is done like this: - + \snippet code/src_concurrent_qtconcurrentrun.cpp 3 - + Note that the QFuture::result() function blocks and waits for the result to become available. Use QFutureWatcher to get notification when the function has finished execution and the result is available. - + \section1 Additional API Features - + \section2 Using Member Functions - + QtConcurrent::run() also accepts pointers to member functions. The first argument must be either a const reference or a pointer to an instance of the class. Passing by const reference is useful when calling const member functions; passing by pointer is useful for calling non-const member functions that modify the instance. - + For example, calling QByteArray::split() (a const member function) in a separate thread is done like this: - + \snippet code/src_concurrent_qtconcurrentrun.cpp 4 - + Calling a non-const member function is done like this: \snippet code/src_concurrent_qtconcurrentrun.cpp 5 @@ -115,17 +115,17 @@ \l{http://www.boost.org/libs/bind/bind.html}{Boost} or \l{http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1836.pdf} {C++ TR1 Library Extensions}. - + You can use boost::bind() or std::tr1::bind() to \e bind a number of arguments to a function when called. There are number of reasons for doing this: - + \list \li To call a function that takes more than 5 arguments. \li To simplify calling a function with constant arguments. \li Changing the order of arguments. \endlist - + See the documentation for the relevant functions for details on how to use the bind API. @@ -137,14 +137,14 @@ /*! \fn QFuture QtConcurrent::run(Function function, ...); \relates - + Runs \a function in a separate thread. The thread is taken from the global QThreadPool. Note that the function may not run immediately; the function will only be run when a thread is available. - + T is the same type as the return value of \a function. Non-void return values can be accessed via the QFuture::result() function. - + Note that the QFuture returned by QtConcurrent::run() does not support canceling, pausing, or progress reporting. The QFuture returned can only be used to query for the running/finished status and the return value of diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp index 2fbb844367..42debea782 100644 --- a/src/corelib/animation/qsequentialanimationgroup.cpp +++ b/src/corelib/animation/qsequentialanimationgroup.cpp @@ -266,8 +266,8 @@ QSequentialAnimationGroup::~QSequentialAnimationGroup() /*! Adds a pause of \a msecs to this animation group. - The pause is considered as a special type of animation, thus - \l{QAnimationGroup::animationCount()}{animationCount} will be + The pause is considered as a special type of animation, thus + \l{QAnimationGroup::animationCount()}{animationCount} will be increased by one. \sa insertPause(), QAnimationGroup::addAnimation() diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index 72a7c7264a..f69d9dd8de 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -222,7 +222,7 @@ void QVariantAnimationPrivate::updateInterpolator() interpolator = getInterpolator(type); else interpolator = 0; - + //we make sure that the interpolator is always set to something if (!interpolator) interpolator = &defaultInterpolator; @@ -252,7 +252,7 @@ void QVariantAnimationPrivate::recalculateCurrentInterval(bool force/*=false*/) qMakePair(progress, QVariant()), animationValueLessThan); if (it == keyValues.constBegin()) { - //the item pointed to by it is the start element in the range + //the item pointed to by it is the start element in the range if (it->first == 0 && keyValues.count() > 1) { currentInterval.start = *it; currentInterval.end = *(it+1); diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index d4b187ffea..ed72036076 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -219,28 +219,28 @@ inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue) inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast(_InterlockedCompareExchange(&_q_value, - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast(_InterlockedCompareExchange(&_q_value, + newValue, + expectedValueCopy)) + == expectedValue); } inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast(_InterlockedCompareExchange_acq(reinterpret_cast(&_q_value), - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast(_InterlockedCompareExchange_acq(reinterpret_cast(&_q_value), + newValue, + expectedValueCopy)) + == expectedValue); } inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast(_InterlockedCompareExchange_rel(reinterpret_cast(&_q_value), - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast(_InterlockedCompareExchange_rel(reinterpret_cast(&_q_value), + newValue, + expectedValueCopy)) + == expectedValue); } inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd) @@ -286,10 +286,10 @@ template Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetRelaxed(T *expectedValue, T *newValue) { register T *expectedValueCopy = expectedValue; - return (_InterlockedCompareExchangePointer(reinterpret_cast(&_q_value), - newValue, - expectedValueCopy) - == expectedValue); + return (_InterlockedCompareExchangePointer(reinterpret_cast(&_q_value), + newValue, + expectedValueCopy) + == expectedValue); } template @@ -301,7 +301,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetAcquire(T *expectedValu }; x = &_q_value; register T *expectedValueCopy = expectedValue; - return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) + return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) == quintptr(expectedValue)); } diff --git a/src/corelib/arch/sparc/arch.pri b/src/corelib/arch/sparc/arch.pri index b3ca399640..a201c83c6a 100644 --- a/src/corelib/arch/sparc/arch.pri +++ b/src/corelib/arch/sparc/arch.pri @@ -3,7 +3,7 @@ # *-64* { SOURCES += $$PWD/qatomic64.s -} +} else { SOURCES += $$PWD/qatomic32.s \ $$PWD/qatomic_sparc.cpp diff --git a/src/corelib/arch/sparc/qatomic_sparc.cpp b/src/corelib/arch/sparc/qatomic_sparc.cpp index d0a9eb8d29..8ea270e90a 100644 --- a/src/corelib/arch/sparc/qatomic_sparc.cpp +++ b/src/corelib/arch/sparc/qatomic_sparc.cpp @@ -60,7 +60,7 @@ Q_CORE_EXPORT int q_atomic_lock_int(volatile int *addr) sched_yield(); returnValue = *addr; } while (returnValue == INT_MIN); - + // try again returnValue = q_atomic_trylock_int(addr); } while (returnValue == INT_MIN); diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp index a6d75666d5..20ba1e85d6 100644 --- a/src/corelib/codecs/qeuckrcodec.cpp +++ b/src/corelib/codecs/qeuckrcodec.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -// Most of the cp949 code was originally written by Joon-Kyu Park, and is included +// Most of the cp949 code was originally written by Joon-Kyu Park, and is included // in Qt with the author's permission and the grateful thanks of the Qt team. /*! \class QEucKrCodec @@ -3405,7 +3405,7 @@ QByteArray QCP949Codec::convertFromUnicode(const QChar *uc, int len, ConverterSt row = internal_code / 178; column = internal_code % 178; } - else { + else { // code between a1-fe internal_code -= 3008; row = internal_code / 84; diff --git a/src/corelib/codecs/qiconvcodec.cpp b/src/corelib/codecs/qiconvcodec.cpp index 01b90fe527..60b13ac4e1 100644 --- a/src/corelib/codecs/qiconvcodec.cpp +++ b/src/corelib/codecs/qiconvcodec.cpp @@ -374,7 +374,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterSt delete temporaryState; return QString(uc, len).toLatin1(); } - + size_t outBytesLeft = len; QByteArray ba(outBytesLeft, Qt::Uninitialized); outBytes = ba.data(); diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp index 95ffe11f75..9513621dfe 100644 --- a/src/corelib/codecs/qjpunicode.cpp +++ b/src/corelib/codecs/qjpunicode.cpp @@ -10537,7 +10537,7 @@ static unsigned short const sjis208ibmvdc_unicode[] = { uint QJpUnicodeConv::sjisibmvdcToUnicode(uint h, uint l) const { - if (((rule & IBM_VDC) || (rule & Microsoft_CP932)) && IsSjisIBMVDCChar1(h)) + if (((rule & IBM_VDC) || (rule & Microsoft_CP932)) && IsSjisIBMVDCChar1(h)) return sjis208ibmvdc_unicode[((h - 0x00fa)*189 + (l-0x0040))]; else return 0; @@ -10632,9 +10632,9 @@ static unsigned short const cp932_ed_ee_unicode[] = { uint QJpUnicodeConv::cp932ToUnicode(uint h, uint l) const { if (rule & Microsoft_CP932) { - if (h == 0x0087 && (l >= 0x0040 && l <= 0x009c)) + if (h == 0x0087 && (l >= 0x0040 && l <= 0x009c)) return cp932_87_unicode[l-0x0040]; - else if ((h == 0x00ed || h == 0x00ee) && (l >= 0x0040 && l <= 0x00fc)) + else if ((h == 0x00ed || h == 0x00ee) && (l >= 0x0040 && l <= 0x00fc)) return cp932_ed_ee_unicode[((h - 0x00ed)*189 + (l-0x0040))]; } return 0; diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp index 7d7d71ac50..59f05592be 100644 --- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp @@ -501,7 +501,7 @@ namespace QT_NAMESPACE { //! [43] class MyClass : public QObject { - + private: Q_DISABLE_COPY(MyClass) }; @@ -511,7 +511,7 @@ class MyClass : public QObject //! [44] class MyClass : public QObject { - + private: MyClass(const MyClass &); MyClass &operator=(const MyClass &); diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp index de1a7cea19..92a6e77866 100644 --- a/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_thread_qwaitcondition_unix.cpp @@ -84,6 +84,6 @@ forever { mutex.lock(); } keyPressed.wakeAll(); - mutex.unlock(); + mutex.unlock(); } //! [3] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp index 7e221cfaab..4f8c4c095e 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp @@ -405,7 +405,7 @@ QString tmp = "test"; QByteArray text = tmp.toLocal8Bit(); char *data = new char[text.size()] strcpy(data, text.data()); -delete [] data; +delete [] data; //! [46] //! [47] diff --git a/src/corelib/doc/snippets/fileinfo/main.cpp b/src/corelib/doc/snippets/fileinfo/main.cpp index 57d7e32cb5..50acdb2550 100644 --- a/src/corelib/doc/snippets/fileinfo/main.cpp +++ b/src/corelib/doc/snippets/fileinfo/main.cpp @@ -54,12 +54,12 @@ int main(int argc, char *argv[]) QFileInfo fileInfo1("~/examples/191697/."); QFileInfo fileInfo2("~/examples/191697/.."); QFileInfo fileInfo3("~/examples/191697/main.cpp"); -//! [0] -//! [1] +//! [0] +//! [1] QFileInfo fileInfo4("."); QFileInfo fileInfo5(".."); QFileInfo fileInfo6("main.cpp"); -//! [1] +//! [1] qDebug() << fileInfo1.fileName(); qDebug() << fileInfo2.fileName(); diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp index 6ee3088138..bf45a31c29 100644 --- a/src/corelib/doc/snippets/qstring/main.cpp +++ b/src/corelib/doc/snippets/qstring/main.cpp @@ -552,7 +552,7 @@ void Widget::replaceFunction() //! [86] QString equis = "xxxxxx"; equis.replace("xx", "x"); - // equis == "xxx" + // equis == "xxx" //! [86] //! [87] diff --git a/src/corelib/doc/snippets/sharedemployee/employee.h b/src/corelib/doc/snippets/sharedemployee/employee.h index 8025015a2e..2df1f71c51 100644 --- a/src/corelib/doc/snippets/sharedemployee/employee.h +++ b/src/corelib/doc/snippets/sharedemployee/employee.h @@ -69,11 +69,11 @@ class Employee setName(name); } //! [2] //! [7] - Employee(const Employee &other) - : d (other.d) - { - } -//! [7] + Employee(const Employee &other) + : d (other.d) + { + } +//! [7] //! [3] void setId(int id) { d->id = id; } //! [3] //! [4] diff --git a/src/corelib/doc/snippets/signalmapper/filereader.cpp b/src/corelib/doc/snippets/signalmapper/filereader.cpp index 42660b9551..cb83ea9362 100644 --- a/src/corelib/doc/snippets/signalmapper/filereader.cpp +++ b/src/corelib/doc/snippets/signalmapper/filereader.cpp @@ -73,7 +73,7 @@ FileReader::FileReader(QWidget *parent) /* //! [2] //slower due to signature normalization at runtime - + connect(signalMapper, SIGNAL(mapped(const QString &)), this, SLOT(readFile(const QString &))); //! [2] @@ -93,7 +93,7 @@ FileReader::FileReader(QWidget *parent) void FileReader::readFile(const QString &filename) { QFile file(filename); - + if (!file.open(QIODevice::ReadOnly)) { QMessageBox::information(this, tr("Unable to open file"), file.errorString()); diff --git a/src/corelib/doc/snippets/statemachine/eventtest.cpp b/src/corelib/doc/snippets/statemachine/eventtest.cpp index c83e92ab77..7454344680 100644 --- a/src/corelib/doc/snippets/statemachine/eventtest.cpp +++ b/src/corelib/doc/snippets/statemachine/eventtest.cpp @@ -55,11 +55,11 @@ protected: if (wrappedEvent->type() == QEvent::KeyPress) { QKeyEvent *keyEvent = static_cast(wrappedEvent); // Do your event test - } + } } return false; } -//![0] +//![0] void onTransition(QEvent *event) { diff --git a/src/corelib/doc/snippets/statemachine/main4.cpp b/src/corelib/doc/snippets/statemachine/main4.cpp index f1ecabd535..19b40a10b4 100644 --- a/src/corelib/doc/snippets/statemachine/main4.cpp +++ b/src/corelib/doc/snippets/statemachine/main4.cpp @@ -69,7 +69,7 @@ protected: StringEvent *se = static_cast(e); return (m_value == se->value); } - + virtual void onTransition(QEvent *) {} private: diff --git a/src/corelib/doc/snippets/streaming/main.cpp b/src/corelib/doc/snippets/streaming/main.cpp index 66808a5a6b..673df075ee 100644 --- a/src/corelib/doc/snippets/streaming/main.cpp +++ b/src/corelib/doc/snippets/streaming/main.cpp @@ -85,12 +85,12 @@ int main(int argc, char *argv[]) QByteArray byteArray; QDataStream stream(&byteArray, QIODevice::WriteOnly); stream << m; - + // display qDebug() << m.id << m.releaseDate << m.title; Movie m2; - + int id2; QString title2; QDate date2; diff --git a/src/corelib/doc/snippets/timers/timers.cpp b/src/corelib/doc/snippets/timers/timers.cpp index 4d74e7cc27..8257bf57a7 100644 --- a/src/corelib/doc/snippets/timers/timers.cpp +++ b/src/corelib/doc/snippets/timers/timers.cpp @@ -74,5 +74,5 @@ Foo::Foo() int main() { - + } diff --git a/src/corelib/doc/src/objectmodel/object.qdoc b/src/corelib/doc/src/objectmodel/object.qdoc index 1d33c14d0f..89a781da39 100644 --- a/src/corelib/doc/src/objectmodel/object.qdoc +++ b/src/corelib/doc/src/objectmodel/object.qdoc @@ -71,7 +71,7 @@ \section1 Important Classes These classes form the basis of the Qt Object Model. - + \annotatedlist objectmodel \target Identity vs Value @@ -108,7 +108,7 @@ at runtime that are not declared in the C++ class. If we copy a Qt Object, should the copy include the properties that were added to the original? - + \endlist For these reasons, Qt Objects should be treated as identities, not diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc index 37f54621a1..721b98c0f7 100644 --- a/src/corelib/doc/src/objectmodel/properties.qdoc +++ b/src/corelib/doc/src/objectmodel/properties.qdoc @@ -62,7 +62,7 @@ A property behaves like a class data member, but it has additional features accessible through the \l {Meta-Object System}. - \list + \list \li A \c READ accessor function is required if no \c MEMBER variable was specified. It is for reading the property value. Ideally, a const function @@ -130,7 +130,7 @@ gets and sets a widget's \c USER property. \li The presence of the \c CONSTANT attibute indicates that the property - value is constant. For a given object instance, the READ method of a + value is constant. For a given object instance, the READ method of a constant property must return the same value every time it is called. This constant value may be different for different instances of the object. A constant property cannot have a WRITE method or a NOTIFY signal. @@ -272,7 +272,7 @@ Q_DECLARE_METATYPE() macro so that their values can be stored in QVariant objects. This makes them suitable for use with both static properties declared using the Q_PROPERTY() macro in class - definitions and dynamic properties created at run-time. + definitions and dynamic properties created at run-time. \sa Q_DECLARE_METATYPE(), QMetaType, QVariant diff --git a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc index d897c4b9a7..4e285f2966 100644 --- a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc +++ b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc @@ -365,7 +365,7 @@ arguments can have default values. Consider QObject::destroyed(): \code - void destroyed(QObject* = 0); + void destroyed(QObject* = 0); \endcode When a QObject is deleted, it emits this QObject::destroyed() @@ -434,7 +434,7 @@ handle each signal differently. Suppose you have three push buttons that determine which file you - will open: "Tax File", "Accounts File", or "Report File". + will open: "Tax File", "Accounts File", or "Report File". In order to open the correct file, you use QSignalMapper::setMapping() to map all the clicked() signals to a QSignalMapper object. Then you connect diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index a751f9af56..daf853b916 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -238,7 +238,7 @@ // QWheelEvent //#define QT_NO_WHEELEVENT -// +// //#define QT_NO_XMLSTREAM // Animation diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index c27463897f..43db585643 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -325,7 +325,7 @@ SeeAlso: ??? Feature: COMBOBOX Description: Supports comboboxes presenting a list of options to the user. Section: Widgets -Requires: LINEEDIT STANDARDITEMMODEL LISTVIEW +Requires: LINEEDIT STANDARDITEMMODEL LISTVIEW Name: QComboBox SeeAlso: ??? @@ -516,7 +516,7 @@ SeeAlso: ??? Feature: WHATSTHIS Description: Supports displaying "What's this" help. Section: Widgets -Requires: TOOLBUTTON +Requires: TOOLBUTTON Name: QWhatsThis SeeAlso: ??? @@ -636,7 +636,7 @@ SeeAlso: ??? Feature: DIRMODEL Description: Supports a data model for the local filesystem. Section: ItemViews -Requires: ITEMVIEWS FILESYSTEMMODEL +Requires: ITEMVIEWS FILESYSTEMMODEL Name: QDirModel SeeAlso: ??? @@ -1030,7 +1030,7 @@ SeeAlso: ??? Feature: SYSTEMTRAYICON Description: Provides an icon for an application in the system tray. Section: Utilities -Requires: +Requires: Name: QSystemTrayIcon SeeAlso: ??? diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 233743f3ce..c45ad12e99 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -470,7 +470,7 @@ typedef qptrdiff qintptr; # else # define QT_ENSURE_STACK_ALIGNED_FOR_SSE # endif -# define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE +# define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE #endif typedef int QNoImplicitBoolCast; diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 8f788ac355..5f5e9a8b72 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -743,7 +743,7 @@ QDataStream &QDataStream::operator>>(bool &i) */ QDataStream &QDataStream::operator>>(float &f) -{ +{ if (version() >= QDataStream::Qt_4_6 && floatingPointPrecision() == QDataStream::DoublePrecision) { double d; diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp index fa0711461c..6ac6a3fbd9 100644 --- a/src/corelib/io/qfilesystemwatcher_win.cpp +++ b/src/corelib/io/qfilesystemwatcher_win.cpp @@ -207,7 +207,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, this, SIGNAL(fileChanged(QString,bool))); connect(thread, SIGNAL(directoryChanged(QString,bool)), this, SIGNAL(directoryChanged(QString,bool))); - + thread->msg = '@'; thread->start(); threads.append(thread); diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 4df9c6b911..c8a3f86137 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -1372,7 +1372,7 @@ qint64 QIODevice::write(const char *data, qint64 maxSize) \since 4.5 \overload - + Writes data from a zero-terminated string of 8-bit characters to the device. Returns the number of bytes that were actually written, or -1 if an error occurred. This is equivalent to diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index 3fdaa41206..d632ac70be 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -109,7 +109,7 @@ public: virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames); virtual Iterator *endEntryList(); - + bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0); bool supportsExtension(Extension extension) const; }; diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index d7b100ba3c..a0904fea24 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -1074,7 +1074,7 @@ static void initDefaultPaths(QMutexLocker *locker) QString systemPath; locker->unlock(); - + /* QLibraryInfo::location() uses QSettings, so in order to avoid a dead-lock, we can't hold the global mutex while @@ -3198,7 +3198,7 @@ bool QSettings::isWritable() const } /*! - + Sets the value of setting \a key to \a value. If the \a key already exists, the previous value is overwritten. @@ -3465,7 +3465,7 @@ void QSettings::setPath(Format format, Scope scope, const QString &path) \typedef QSettings::SettingsMap Typedef for QMap. - + \sa registerFormat() */ @@ -3477,8 +3477,8 @@ void QSettings::setPath(Format format, Scope scope, const QString &path) \snippet code/src_corelib_io_qsettings.cpp 27 \c ReadFunc is used in \c registerFormat() as a pointer to a function - that reads a set of key/value pairs. \c ReadFunc should read all the - options in one pass, and return all the settings in the \c SettingsMap + that reads a set of key/value pairs. \c ReadFunc should read all the + options in one pass, and return all the settings in the \c SettingsMap container, which is initially empty. \sa WriteFunc, registerFormat() @@ -3491,7 +3491,7 @@ void QSettings::setPath(Format format, Scope scope, const QString &path) \snippet code/src_corelib_io_qsettings.cpp 28 - \c WriteFunc is used in \c registerFormat() as a pointer to a function + \c WriteFunc is used in \c registerFormat() as a pointer to a function that writes a set of key/value pairs. \c WriteFunc is only called once, so you need to output the settings in one go. diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp index bd127e621e..9ce14f1851 100644 --- a/src/corelib/io/qsettings_win.cpp +++ b/src/corelib/io/qsettings_win.cpp @@ -569,7 +569,7 @@ QWinSettingsPrivate::~QWinSettingsPrivate() { if (deleteWriteHandleOnExit && writeHandle() != 0) { #if defined(Q_OS_WINCE) - remove(regList.at(0).key()); + remove(regList.at(0).key()); #else QString emptyKey; DWORD res = RegDeleteKey(writeHandle(), reinterpret_cast(emptyKey.utf16())); diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h index bc44a21cb8..f40807a0d9 100644 --- a/src/corelib/kernel/qfunctions_nacl.h +++ b/src/corelib/kernel/qfunctions_nacl.h @@ -67,7 +67,7 @@ int pthread_cancel(pthread_t thread); int pthread_attr_setinheritsched(pthread_attr_t *attr, int inheritsched); -int pthread_attr_getinheritsched(const pthread_attr_t *attr, +int pthread_attr_getinheritsched(const pthread_attr_t *attr, int *inheritsched); // event dispatcher, select diff --git a/src/corelib/kernel/qmath.qdoc b/src/corelib/kernel/qmath.qdoc index 448b167662..06d8db9277 100644 --- a/src/corelib/kernel/qmath.qdoc +++ b/src/corelib/kernel/qmath.qdoc @@ -25,7 +25,7 @@ ** ****************************************************************************/ -/*! +/*! \headerfile \title Math Functions \ingroup funclists @@ -35,11 +35,11 @@ /*! \fn int qCeil(qreal v) - Return the ceiling of the value \a v. + Return the ceiling of the value \a v. The ceiling is the smallest integer that is not less than \a v. For example, if \a v is 41.2, then the ceiling is 42. - + \relates \sa qFloor() */ diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 14d96e96fd..4399349352 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -1001,7 +1001,7 @@ int QMetaObject::indexOfProperty(const char *name) const Q_ASSERT(priv(this->d.data)->revision >= 3); if (priv(this->d.data)->flags & DynamicMetaObject) { - QAbstractDynamicMetaObject *me = + QAbstractDynamicMetaObject *me = const_cast(static_cast(this)); return me->createProperty(name, 0); @@ -2041,8 +2041,8 @@ QMetaMethod QMetaMethod::fromSignalImpl(const QMetaObject *metaObject, void **si \snippet code/src_corelib_kernel_qmetaobject.cpp 8 - QMetaObject::normalizedSignature() is used here to ensure that the format - of the signature is what invoke() expects. E.g. extra whitespace is + QMetaObject::normalizedSignature() is used here to ensure that the format + of the signature is what invoke() expects. E.g. extra whitespace is removed. If the "compute" slot does not take exactly one QString, one int @@ -2970,7 +2970,7 @@ QMetaMethod QMetaProperty::notifySignal() const { int id = notifySignalIndex(); if (id != -1) - return mobj->method(id); + return mobj->method(id); else return QMetaMethod(); } @@ -2978,7 +2978,7 @@ QMetaMethod QMetaProperty::notifySignal() const /*! \since 4.6 - Returns the index of the property change notifying signal if one was + Returns the index of the property change notifying signal if one was specified, otherwise returns -1. \sa hasNotifySignal() diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 3e578b36d7..a60deefe90 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -927,7 +927,7 @@ QObjectPrivate::Connection::~Connection() \relates QObject Returns the given \a object cast to type T if the object is of type - T (or of a subclass); otherwise returns 0. If \a object is 0 then + T (or of a subclass); otherwise returns 0. If \a object is 0 then it will also return 0. The class T must inherit (directly or indirectly) QObject and be @@ -3089,8 +3089,8 @@ bool QMetaObject::disconnect(const QObject *sender, int signal_index, /*! \internal -Disconnect a single signal connection. If QMetaObject::connect() has been called -multiple times for the same sender, signal_index, receiver and method_index only +Disconnect a single signal connection. If QMetaObject::connect() has been called +multiple times for the same sender, signal_index, receiver and method_index only one of these connections will be removed. */ bool QMetaObject::disconnectOne(const QObject *sender, int signal_index, @@ -3368,7 +3368,7 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i return; if (sender->d_func()->declarativeData && QAbstractDeclarativeData::signalEmitted) - QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender, + QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender, signal_index, argv); void *empty_argv[] = { 0 }; diff --git a/src/corelib/kernel/qsystemerror_p.h b/src/corelib/kernel/qsystemerror_p.h index 94bfb5deb4..4b46011129 100644 --- a/src/corelib/kernel/qsystemerror_p.h +++ b/src/corelib/kernel/qsystemerror_p.h @@ -66,14 +66,14 @@ public: StandardLibraryError, NativeError }; - + inline QSystemError(int error, ErrorScope scope); inline QSystemError(); - + QString toString(); inline ErrorScope scope(); inline int error(); - + //data members int errorCode; ErrorScope errorScope; diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp index 6b064c1d52..835a9fde5b 100644 --- a/src/corelib/kernel/qsystemsemaphore_win.cpp +++ b/src/corelib/kernel/qsystemsemaphore_win.cpp @@ -46,7 +46,7 @@ #include QT_BEGIN_NAMESPACE - + #ifndef QT_NO_SYSTEMSEMAPHORE QSystemSemaphorePrivate::QSystemSemaphorePrivate() : diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index e7940e0039..04b9d92f55 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -150,7 +150,7 @@ inline void v_construct(QVariant::Private *x, const T &t) template inline void v_clear(QVariant::Private *d, T* = 0) { - + if (!QVariantIntegrator::CanUseInternalSpace) { //now we need to cast //because QVariant::PrivateShared doesn't have a virtual destructor diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index 4ccf449ae2..4de83c62ee 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -279,7 +279,7 @@ static QUuid createFromName(const QUuid &ns, const QByteArray &baseData, QCrypto The field layouts for the DCE versions listed in the table above are specified in the \l{http://www.ietf.org/rfc/rfc4122.txt} {Network Working Group UUID Specification}. - + Most platforms provide a tool for generating new UUIDs, e.g. \c uuidgen and \c guidgen. You can also use createUuid(). UUIDs generated by createUuid() are of the random type. Their @@ -534,23 +534,23 @@ QUuid QUuid::fromRfc4122(const QByteArray &bytes) \header \li Field # \li Source - + \row \li 1 \li data1 - + \row \li 2 \li data2 - + \row \li 3 \li data3 - + \row \li 4 \li data4[0] .. data4[1] - + \row \li 5 \li data4[2] .. data4[7] diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index dae3cb1988..a661d105cf 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -185,7 +185,7 @@ public: void unregisterTransition(QAbstractTransition *transition); void unregisterAllTransitions(); void handleTransitionSignal(QObject *sender, int signalIndex, - void **args); + void **args); void postInternalEvent(QEvent *e); void postExternalEvent(QEvent *e); @@ -195,7 +195,7 @@ public: bool isExternalEventQueueEmpty(); void processEvents(EventProcessingMode processingMode); void cancelAllDelayedEvents(); - + #ifndef QT_NO_PROPERTIES typedef QPair, QByteArray> RestorableId; QHash > registeredRestorablesForState; @@ -235,7 +235,7 @@ public: bool animated; QPair, QList > - initializeAnimation(QAbstractAnimation *abstractAnimation, + initializeAnimation(QAbstractAnimation *abstractAnimation, const QPropertyAssignment &prop); QHash > animationsForState; @@ -274,7 +274,7 @@ public: QHash delayedEvents; QHash timerIdToDelayedEventId; QMutex delayedEventsMutex; - + typedef QEvent* (*f_cloneEvent)(QEvent*); struct Handler { f_cloneEvent cloneEvent; diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp index 1c83f23df0..11623f80dc 100644 --- a/src/corelib/thread/qatomic.cpp +++ b/src/corelib/thread/qatomic.cpp @@ -49,7 +49,7 @@ For atomic operations on pointers, see the QAtomicPointer class. - An \e atomic operation is a complex operation that completes without interruption. + An \e atomic operation is a complex operation that completes without interruption. The QAtomicInt class provides atomic reference counting, test-and-set, fetch-and-store, and fetch-and-add for integers. diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp index 263f7d19fe..0c17399d33 100644 --- a/src/corelib/thread/qexception.cpp +++ b/src/corelib/thread/qexception.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -/*! +/*! \class QException \inmodule QtCore \brief The QException class provides a base class for exceptions that can transferred across threads. @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE \snippet code/src_corelib_thread_qexception.cpp 3 */ -/*! +/*! \class QUnhandledException \inmodule QtCore diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc index 4ab28e81b2..421e683c4a 100644 --- a/src/corelib/thread/qfuture.qdoc +++ b/src/corelib/thread/qfuture.qdoc @@ -58,7 +58,7 @@ use the isResultReadyAt() function to determine if a result is ready or not. For QFuture objects that report more than one result, the resultCount() function returns the number of continuous results. This - means that it is always safe to iterate through the results from 0 to + means that it is always safe to iterate through the results from 0 to resultCount(). QFuture provides a \l{Java-style iterators}{Java-style iterator} diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index f5590d95f8..0f7d04a7c5 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -288,7 +288,7 @@ void QFutureInterfaceBase::waitForResult(int resultIndex) return; lock.unlock(); - // To avoid deadlocks and reduce the number of threads used, try to + // To avoid deadlocks and reduce the number of threads used, try to // run the runnable in the current thread. QThreadPool::globalInstance()->d_func()->stealRunnable(d->runnable); diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h index d2d58a9332..e0a59697a1 100644 --- a/src/corelib/thread/qfutureinterface.h +++ b/src/corelib/thread/qfutureinterface.h @@ -234,7 +234,7 @@ inline void QFutureInterface::reportResults(const QVector &_results, int b this->reportResultsReady(resultCountBefore, store.count()); } else { const int insertIndex = store.addResults(beginIndex, &_results, count); - this->reportResultsReady(insertIndex, insertIndex + _results.count()); + this->reportResultsReady(insertIndex, insertIndex + _results.count()); } } diff --git a/src/corelib/thread/qfuturesynchronizer.h b/src/corelib/thread/qfuturesynchronizer.h index 426bb42b0d..39dbfc52a8 100644 --- a/src/corelib/thread/qfuturesynchronizer.h +++ b/src/corelib/thread/qfuturesynchronizer.h @@ -80,7 +80,7 @@ public: m_futures[i].cancel(); } } - + for (int i = 0; i < m_futures.count(); ++i) { m_futures[i].waitForFinished(); } diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp index b6bb22b314..0de826fddf 100644 --- a/src/corelib/thread/qreadwritelock.cpp +++ b/src/corelib/thread/qreadwritelock.cpp @@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE \sa QReadLocker, QWriteLocker, QMutex, QSemaphore */ -/*! +/*! \enum QReadWriteLock::RecursionMode \since 4.4 diff --git a/src/corelib/thread/qresultstore.cpp b/src/corelib/thread/qresultstore.cpp index 940fd45027..65c2437064 100644 --- a/src/corelib/thread/qresultstore.cpp +++ b/src/corelib/thread/qresultstore.cpp @@ -97,7 +97,7 @@ bool ResultIteratorBase::canIncrementVectorIndex() const return (m_vectorIndex + 1 < mapIterator.value().m_count); } -ResultStoreBase::ResultStoreBase() +ResultStoreBase::ResultStoreBase() : insertIndex(0), resultCount(0), m_filterMode(false), filteredResults(0) { } void ResultStoreBase::setFilterMode(bool enable) @@ -148,7 +148,7 @@ void ResultStoreBase::syncPendingResults() // check if we can insert any of the pending results: QMap::iterator it = pendingResults.begin(); while (it != pendingResults.end()) { - int index = it.key(); + int index = it.key(); if (index != resultCount + filteredResults) break; @@ -165,7 +165,7 @@ int ResultStoreBase::addResult(int index, const void *result) return insertResultItem(index, resultItem); } -int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount) +int ResultStoreBase::addResults(int index, const void *results, int vectorSize, int totalCount) { if (m_filterMode == false || vectorSize == totalCount) { ResultItem resultItem(results, vectorSize); @@ -218,7 +218,7 @@ ResultIteratorBase ResultStoreBase::resultAt(int index) const } const int vectorIndex = index - it.key(); - + if (vectorIndex >= it.value().count()) return ResultIteratorBase(m_results.end()); else if (it.value().isVector() == false && vectorIndex != 0) diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h index c14146656a..11ce23936d 100644 --- a/src/corelib/thread/qresultstore.h +++ b/src/corelib/thread/qresultstore.h @@ -148,7 +148,7 @@ protected: bool m_filterMode; QMap pendingResults; int filteredResults; - + }; template diff --git a/src/corelib/thread/qrunnable.cpp b/src/corelib/thread/qrunnable.cpp index eed716af37..e271582b9b 100644 --- a/src/corelib/thread/qrunnable.cpp +++ b/src/corelib/thread/qrunnable.cpp @@ -57,7 +57,7 @@ change the auto-deletion flag. QThreadPool supports executing the same QRunnable more than once - by calling QThreadPool::tryStart(this) from within the run() function. + by calling QThreadPool::tryStart(this) from within the run() function. If autoDelete is enabled the QRunnable will be deleted when the last thread exits the run function. Calling QThreadPool::start() multiple times with the same QRunnable when autoDelete is enabled diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 79199c97e0..dd4d4e74ae 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -524,9 +524,9 @@ int QThread::exec() Note that unlike the C library function of the same name, this function \e does return to the caller -- it is event processing - that stops. - - No QEventLoops will be started anymore in this thread until + that stops. + + No QEventLoops will be started anymore in this thread until QThread::exec() has been called again. If the eventloop in QThread::exec() is not running then the next call to QThread::exec() will also return immediately. diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index 2b099706ff..1616fb9fab 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -133,7 +133,7 @@ void QThreadPoolThread::run() // wait for work, exiting after the expiry timeout is reached expired = !manager->runnableReady.wait(locker.mutex(), manager->expiryTimeout); ++manager->activeThreads; - + if (expired) --manager->waitingThreads; } @@ -223,7 +223,7 @@ void QThreadPoolPrivate::enqueueTask(QRunnable *runnable, int priority) int QThreadPoolPrivate::activeThreadCount() const { - // To improve scalability this function is called without holding + // To improve scalability this function is called without holding // the mutex lock -- keep it thread-safe. return (allThreads.count() - expiredThreads.count() @@ -301,7 +301,7 @@ bool QThreadPoolPrivate::waitForDone(int msecs) QElapsedTimer timer; timer.start(); int t; - while (!(queue.isEmpty() && activeThreads == 0) && + while (!(queue.isEmpty() && activeThreads == 0) && ((t = msecs - timer.elapsed()) > 0)) noActiveThreads.wait(locker.mutex(), t); } @@ -367,11 +367,11 @@ void QThreadPoolPrivate::stealRunnable(QRunnable *runnable) \snippet code/src_corelib_concurrent_qthreadpool.cpp 0 - QThreadPool deletes the QRunnable automatically by default. Use + QThreadPool deletes the QRunnable automatically by default. Use QRunnable::setAutoDelete() to change the auto-deletion flag. QThreadPool supports executing the same QRunnable more than once - by calling tryStart(this) from within QRunnable::run(). + by calling tryStart(this) from within QRunnable::run(). If autoDelete is enabled the QRunnable will be deleted when the last thread exits the run function. Calling start() multiple times with the same QRunnable when autoDelete is enabled @@ -595,8 +595,8 @@ void QThreadPool::releaseThread() } /*! - Waits up to \a msecs milliseconds for all threads to exit and removes all - threads from the thread pool. Returns true if all threads were removed; + Waits up to \a msecs milliseconds for all threads to exit and removes all + threads from the thread pool. Returns true if all threads were removed; otherwise it returns false. If \a msecs is -1 (the default), the timeout is ignored (waits for the last thread to exit). */ diff --git a/src/corelib/tools/qalgorithms.qdoc b/src/corelib/tools/qalgorithms.qdoc index b4558722cb..cc544af868 100644 --- a/src/corelib/tools/qalgorithms.qdoc +++ b/src/corelib/tools/qalgorithms.qdoc @@ -70,7 +70,7 @@ \snippet code/doc_src_qalgorithms.cpp 1 Different algorithms can have different requirements for the - iterators they accept. For example, qFill() accepts two + iterators they accept. For example, qFill() accepts two \l {forward iterators}. The iterator types required are specified for each algorithm. If an iterator of the wrong type is passed (for example, if QList::ConstIterator is passed as an \l {output @@ -369,7 +369,7 @@ of \a value in the variable passed as a reference in argument \a n. This is the same as qSort(\a{container}.begin(), \a{container}.end()); */ -/*! +/*! \fn void qStableSort(RandomAccessIterator begin, RandomAccessIterator end) \relates @@ -393,7 +393,7 @@ of \a value in the variable passed as a reference in argument \a n. \sa qSort(), {random access iterators} */ -/*! +/*! \fn void qStableSort(RandomAccessIterator begin, RandomAccessIterator end, LessThan lessThan) \relates @@ -406,7 +406,7 @@ of \a value in the variable passed as a reference in argument \a n. in case-insensitive alphabetical order: \snippet code/doc_src_qalgorithms.cpp 16 - + Note that earlier versions of Qt allowed using a lessThan function that took its arguments by non-const reference. From 4.3 and on this is no longer possible, the arguments has to be passed by const reference or value. @@ -423,7 +423,7 @@ of \a value in the variable passed as a reference in argument \a n. property is often useful when sorting user-visible data. */ -/*! +/*! \fn void qStableSort(Container &container) \relates @@ -470,7 +470,7 @@ of \a value in the variable passed as a reference in argument \a n. specified by the \a lessThan object. */ -/*! +/*! \fn void qLowerBound(const Container &container, const T &value) \relates @@ -520,7 +520,7 @@ of \a value in the variable passed as a reference in argument \a n. specified by the \a lessThan object. */ -/*! +/*! \fn void qUpperBound(const Container &container, const T &value) \relates @@ -568,7 +568,7 @@ of \a value in the variable passed as a reference in argument \a n. specified by the \a lessThan object. */ -/*! +/*! \fn void qBinaryFind(const Container &container, const T &value) \relates @@ -578,7 +578,7 @@ of \a value in the variable passed as a reference in argument \a n. */ -/*! +/*! \fn void qDeleteAll(ForwardIterator begin, ForwardIterator end) \relates @@ -601,7 +601,7 @@ of \a value in the variable passed as a reference in argument \a n. \sa {forward iterators} */ -/*! +/*! \fn void qDeleteAll(const Container &c) \relates diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp index 66ae7d21c2..2b459b2b1b 100644 --- a/src/corelib/tools/qbitarray.cpp +++ b/src/corelib/tools/qbitarray.cpp @@ -173,7 +173,7 @@ int QBitArray::count(bool on) const while (len >= 24) { quint32 v = quint32(bits[0]) | (quint32(bits[1]) << 8) | (quint32(bits[2]) << 16); quint32 c = ((v & 0xfff) * Q_UINT64_C(0x1001001001001) & Q_UINT64_C(0x84210842108421)) % 0x1f; - c += (((v & 0xfff000) >> 12) * Q_UINT64_C(0x1001001001001) & Q_UINT64_C(0x84210842108421)) % 0x1f; + c += (((v & 0xfff000) >> 12) * Q_UINT64_C(0x1001001001001) & Q_UINT64_C(0x84210842108421)) % 0x1f; len -= 24; bits += 3; numBits += int(c); @@ -467,7 +467,7 @@ QBitArray &QBitArray::operator&=(const QBitArray &other) resize(qMax(size(), other.size())); uchar *a1 = reinterpret_cast(d.data()) + 1; const uchar *a2 = reinterpret_cast(other.d.constData()) + 1; - int n = other.d.size() -1 ; + int n = other.d.size() -1 ; int p = d.size() - 1 - n; while (n-- > 0) *a1++ &= *a2++; @@ -496,7 +496,7 @@ QBitArray &QBitArray::operator|=(const QBitArray &other) resize(qMax(size(), other.size())); uchar *a1 = reinterpret_cast(d.data()) + 1; const uchar *a2 = reinterpret_cast(other.d.constData()) + 1; - int n = other.d.size() - 1; + int n = other.d.size() - 1; while (n-- > 0) *a1++ |= *a2++; return *this; diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index 950d291986..dc3f5f3be9 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -397,7 +397,7 @@ static const quint16 crc_tbl[16] = { 0xc60c, 0xd68d, 0xe70e, 0xf78f }; -/*! +/*! \relates QByteArray Returns the CRC-16 checksum of the first \a len bytes of \a data. @@ -422,7 +422,7 @@ quint16 qChecksum(const char *data, uint len) return ~crc & 0xffff; } -/*! +/*! \fn QByteArray qCompress(const QByteArray& data, int compressionLevel) \relates QByteArray @@ -1370,7 +1370,7 @@ QByteArray::QByteArray(int size, char ch) } /*! - \internal + \internal Constructs a byte array of size \a size with uninitialized contents. */ @@ -1904,7 +1904,7 @@ QByteArray &QByteArray::replace(const QByteArray &before, const QByteArray &afte QByteArray aft = after; if (after.d == d) aft.detach(); - + return replace(before.constData(), before.size(), aft.constData(), aft.size()); } @@ -1921,7 +1921,7 @@ QByteArray &QByteArray::replace(const char *c, const QByteArray &after) QByteArray aft = after; if (after.d == d) aft.detach(); - + return replace(c, qstrlen(c), aft.constData(), aft.size()); } @@ -1954,7 +1954,7 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after memcpy(copy, before, bsize); b = copy; } - + QByteArrayMatcher matcher(before, bsize); int index = 0; int len = d->size; @@ -2044,8 +2044,8 @@ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after ::free((char *)a); if (b != before) ::free((char *)b); - - + + return *this; } @@ -2274,7 +2274,7 @@ int QByteArray::indexOf(const char *c, int from) const const int ol = qstrlen(c); if (ol == 1) return indexOf(*c, from); - + const int l = d->size; if (from > d->size || ol + from > l) return -1; @@ -3580,7 +3580,7 @@ QByteArray QByteArray::toBase64() const return tmp; } -/*! +/*! \fn QByteArray &QByteArray::setNum(int n, int base) Sets the byte array to the printed value of \a n in base \a base (10 @@ -3597,21 +3597,21 @@ QByteArray QByteArray::toBase64() const \sa number(), toInt() */ -/*! +/*! \fn QByteArray &QByteArray::setNum(uint n, int base) \overload \sa toUInt() */ -/*! +/*! \fn QByteArray &QByteArray::setNum(short n, int base) \overload \sa toShort() */ -/*! +/*! \fn QByteArray &QByteArray::setNum(ushort n, int base) \overload @@ -3677,7 +3677,7 @@ QByteArray &QByteArray::setNum(qulonglong n, int base) return *this; } -/*! +/*! \overload Sets the byte array to the printed value of \a n, formatted in format @@ -3736,7 +3736,7 @@ QByteArray &QByteArray::setNum(double n, char f, int prec) return *this; } -/*! +/*! \fn QByteArray &QByteArray::setNum(float n, char f, int prec) \overload @@ -3806,7 +3806,7 @@ QByteArray QByteArray::number(qulonglong n, int base) return s; } -/*! +/*! \overload Returns a byte array that contains the printed value of \a n, diff --git a/src/corelib/tools/qcontiguouscache.cpp b/src/corelib/tools/qcontiguouscache.cpp index bfef234ae4..b92c4d3fe9 100644 --- a/src/corelib/tools/qcontiguouscache.cpp +++ b/src/corelib/tools/qcontiguouscache.cpp @@ -313,8 +313,8 @@ MyRecord record(int row) const In most cases it is better to use either at() or insert(). - \note This non-const overload of operator[] requires QContiguousCache - to make a deep copy. Use at() for read-only access to a non-const + \note This non-const overload of operator[] requires QContiguousCache + to make a deep copy. Use at() for read-only access to a non-const QContiguousCache. \sa insert(), at() diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index fdf2d1a620..32f5f0b33a 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -308,7 +308,7 @@ void QCryptographicHash::addData(const char *data, int length) sha3Update(&d->sha3Context, reinterpret_cast(data), length*8); break; #endif - } + } d->result.clear(); } @@ -350,7 +350,7 @@ bool QCryptographicHash::addData(QIODevice* device) */ QByteArray QCryptographicHash::result() const { - if (!d->result.isEmpty()) + if (!d->result.isEmpty()) return d->result; switch (d->method) { diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index b8cd076cb6..ed756cbeb6 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -574,7 +574,7 @@ void QHashData::checkSanity() \fn uint qHash(const QPair &key, uint seed = 0) \since 5.0 \relates QHash - + Returns the hash value for the \a key, using \a seed to seed the calculation. Types \c T1 and \c T2 must be supported by qHash(). diff --git a/src/corelib/tools/qiterator.qdoc b/src/corelib/tools/qiterator.qdoc index 798d25e050..25914967a9 100644 --- a/src/corelib/tools/qiterator.qdoc +++ b/src/corelib/tools/qiterator.qdoc @@ -25,7 +25,7 @@ ** ****************************************************************************/ -/*! +/*! \class QListIterator \inmodule QtCore @@ -78,7 +78,7 @@ \sa QMutableListIterator, QList::const_iterator */ -/*! +/*! \class QLinkedListIterator \inmodule QtCore @@ -126,7 +126,7 @@ \sa QMutableLinkedListIterator, QLinkedList::const_iterator */ -/*! +/*! \class QVectorIterator \inmodule QtCore \brief The QVectorIterator class provides a Java-style const iterator for QVector and QStack. @@ -178,7 +178,7 @@ \sa QMutableVectorIterator, QVector::const_iterator */ -/*! +/*! \class QSetIterator \inmodule QtCore \brief The QSetIterator class provides a Java-style const iterator for QSet. @@ -225,7 +225,7 @@ \sa QMutableSetIterator, QSet::const_iterator */ -/*! +/*! \class QMutableListIterator \inmodule QtCore @@ -291,7 +291,7 @@ \sa QListIterator, QList::iterator */ -/*! +/*! \class QMutableLinkedListIterator \inmodule QtCore @@ -352,7 +352,7 @@ \sa QLinkedListIterator, QLinkedList::iterator */ -/*! +/*! \class QMutableVectorIterator \inmodule QtCore @@ -418,7 +418,7 @@ \sa QVectorIterator, QVector::iterator */ -/*! +/*! \class QMutableSetIterator \inmodule QtCore \since 4.2 @@ -869,7 +869,7 @@ \sa remove(), setValue() */ -/*! +/*! \class QMapIterator \inmodule QtCore @@ -921,7 +921,7 @@ \sa QMutableMapIterator, QMap::const_iterator */ -/*! +/*! \class QHashIterator \inmodule QtCore @@ -973,7 +973,7 @@ \sa QMutableHashIterator, QHash::const_iterator */ -/*! +/*! \class QMutableMapIterator \inmodule QtCore @@ -1038,7 +1038,7 @@ \sa QMapIterator, QMap::iterator */ -/*! +/*! \class QMutableHashIterator \inmodule QtCore diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp index 5d8368e930..3fb958fae6 100644 --- a/src/corelib/tools/qline.cpp +++ b/src/corelib/tools/qline.cpp @@ -374,7 +374,7 @@ QDataStream &operator>>(QDataStream &stream, QLine &line) \value UnboundedIntersection The two lines intersect, but not within the range defined by their lengths. This will be the case - if the lines are not parallel. + if the lines are not parallel. intersect() will also return this value if the intersect point is within the start and end point of only one of the lines. @@ -499,9 +499,9 @@ QDataStream &operator>>(QDataStream &stream, QLine &line) Sets the length of the line to the given \a length. QLineF will move the end point - p2() - of the line to give the line its new length. - + If the line is a null line, the length will remain zero regardless - of the length specified. + of the length specified. \sa length(), isNull() */ diff --git a/src/corelib/tools/qmargins.cpp b/src/corelib/tools/qmargins.cpp index 6e7b541110..2cdc3f3f03 100644 --- a/src/corelib/tools/qmargins.cpp +++ b/src/corelib/tools/qmargins.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \ingroup painting \since 4.6 - \brief The QMargins class defines the four margins of a rectangle. + \brief The QMargins class defines the four margins of a rectangle. QMargin defines a set of four margins; left, top, right and bottom, that describe the size of the borders surrounding a rectangle. diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc index 55353dc258..b0caf1aaf0 100644 --- a/src/corelib/tools/qpair.qdoc +++ b/src/corelib/tools/qpair.qdoc @@ -31,7 +31,7 @@ \brief The QPair class is a template class that stores a pair of items. \ingroup tools - + QPair\ can be used in your application if the STL \c pair type is not available. It stores one value of type T1 and one value of type T2. It can be used as a return value for a diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index cbb3580024..83e87ff637 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -298,7 +298,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from, Square brackets mean match any character contained in the square brackets. The character set abbreviations described above can appear in a character set in square brackets. Except for the - character set abbreviations and the following two exceptions, + character set abbreviations and the following two exceptions, characters do not have special meanings in square brackets. \table diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h index 9c952fea21..b17c6d2f40 100644 --- a/src/corelib/tools/qringbuffer_p.h +++ b/src/corelib/tools/qringbuffer_p.h @@ -375,7 +375,7 @@ public: --tailBuffer; } bufferSize -= qba.length(); - return qba; + return qba; } // append a new buffer to the end diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc index cd90b4949b..c1351943e1 100644 --- a/src/corelib/tools/qset.qdoc +++ b/src/corelib/tools/qset.qdoc @@ -130,7 +130,7 @@ \fn QSet &QSet::operator=(const QSet &other) Assigns the \a other set to this set and returns a reference to - this set. + this set. */ /*! @@ -306,7 +306,7 @@ Returns a non-const iterator positioned at the item \a value in the set. If the set contains no item \a value, the function - returns end(). + returns end(). */ /*! \fn QSet::const_iterator QSet::constFind(const T &value) const @@ -351,7 +351,7 @@ \overload Returns a non-const \l{STL-style iterators}{STL-style iterator} positioned at the first - item in the set. + item in the set. */ /*! \fn QSet::const_iterator QSet::cbegin() const @@ -496,7 +496,7 @@ /*! \fn QSet &QSet::subtract(const QSet &other) - Removes all items from this set that are contained in the + Removes all items from this set that are contained in the \a other set. Returns a reference to this set. \sa operator-=(), unite(), intersect() @@ -506,7 +506,7 @@ \fn bool QSet::empty() const Returns true if the set is empty. This function is provided - for STL compatibility. It is equivalent to isEmpty(). + for STL compatibility. It is equivalent to isEmpty(). */ /*! @@ -529,7 +529,7 @@ /*! \fn QSet &QSet::operator-=(const T &value) - Removes the occurrence of item \a value from the set, if + Removes the occurrence of item \a value from the set, if it is found, and returns a reference to the set. If the \a value is not contained the set, nothing is removed. @@ -559,7 +559,7 @@ \overload Same as intersect(\e{other}), if we consider \e{other} to be a set - that contains the singleton \a value. + that contains the singleton \a value. */ @@ -575,7 +575,7 @@ \fn QSet QSet::operator|(const QSet &other) const \fn QSet QSet::operator+(const QSet &other) const - Returns a new QSet that is the union of this set and the + Returns a new QSet that is the union of this set and the \a other set. \sa unite(), operator|=(), operator&(), operator-() @@ -622,7 +622,7 @@ iterators are slightly faster, and can improve code readability. QSet\::iterator allows you to iterate over a QSet\ and - modify it as you go (using QSet::erase()). However, + modify it as you go (using QSet::erase()). However, The default QSet::iterator constructor creates an uninitialized iterator. You must initialize it using a function like @@ -701,7 +701,7 @@ \sa QSet::begin(), QSet::end() */ -/*! +/*! \fn QSet::iterator::iterator(typename Hash::iterator i) \fn QSet::const_iterator::const_iterator(typename Hash::const_iterator i) diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp index 8205560781..cee0c1d450 100644 --- a/src/corelib/tools/qshareddata.cpp +++ b/src/corelib/tools/qshareddata.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -/*! +/*! \class QSharedData \inmodule QtCore \brief The QSharedData class is a base class for shared data objects. @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE \a other is ignored. */ -/*! +/*! \class QSharedDataPointer \inmodule QtCore \brief The QSharedDataPointer class represents a pointer to an implicitly shared object. @@ -395,7 +395,7 @@ QT_BEGIN_NAMESPACE return the proper polymorphic type. */ -/*! +/*! \class QExplicitlySharedDataPointer \inmodule QtCore \brief The QExplicitlySharedDataPointer class represents a pointer to an explicitly shared object. diff --git a/src/corelib/tools/qtextboundaryfinder.cpp b/src/corelib/tools/qtextboundaryfinder.cpp index 5e8aed579d..eb861b7289 100644 --- a/src/corelib/tools/qtextboundaryfinder.cpp +++ b/src/corelib/tools/qtextboundaryfinder.cpp @@ -84,7 +84,7 @@ static void init(QTextBoundaryFinder::BoundaryType type, const QChar *chars, int QUnicodeTools::initCharAttributes(string, length, scriptItems.data(), scriptItems.count(), attributes, options); } -/*! +/*! \class QTextBoundaryFinder \inmodule QtCore diff --git a/src/corelib/tools/qvector.cpp b/src/corelib/tools/qvector.cpp index e72c1964a2..725cf894c6 100644 --- a/src/corelib/tools/qvector.cpp +++ b/src/corelib/tools/qvector.cpp @@ -435,7 +435,7 @@ Same as at(\a i). */ -/*! +/*! \fn void QVector::append(const T &value) Inserts \a value at the end of the vector. diff --git a/src/corelib/xml/qxmlutils.cpp b/src/corelib/xml/qxmlutils.cpp index 52921919eb..d175d554cc 100644 --- a/src/corelib/xml/qxmlutils.cpp +++ b/src/corelib/xml/qxmlutils.cpp @@ -70,7 +70,7 @@ bool QXmlUtils::rangeContains(RangeIter begin, RangeIter end, const QChar c) // check the first two ranges "manually" as characters in that // range are checked very often and we avoid the binary search below. - + if (cp <= begin->max) return cp >= begin->min; diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 2a8681d1d7..22fe4a5fd8 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -513,7 +513,7 @@ QDBusPendingCall QDBusAbstractInterface::asyncCallWithArgumentList(const QString not indicate that the executed call succeeded. If it fails, the \a errorMethod is called. If the queueing failed, this function returns false and no slot will be called. - + The \a returnMethod must have as its parameters the types returned by the function call. Optionally, it may have a QDBusMessage parameter as its last or only parameter. The \a errorMethod must diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index d578bf7d76..f486c19fdc 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -72,7 +72,7 @@ for ($j = 0; $j < $i; ++$j) { } print "0\n};\n"; ===== PERL SCRIPT ==== - + * The input data is as follows: other org.freedesktop.DBus.Error.Failed diff --git a/src/dbus/qdbusintrospection_p.h b/src/dbus/qdbusintrospection_p.h index a9f3773acc..b892ed95f1 100644 --- a/src/dbus/qdbusintrospection_p.h +++ b/src/dbus/qdbusintrospection_p.h @@ -97,7 +97,7 @@ public: inline bool operator==(const Argument& other) const { return name == other.name && type == other.type; } }; - + struct Method { QString name; diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index f3bd7c28ba..799c66f6f9 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -77,7 +77,7 @@ private: QVarLengthArray outputTypes; int flags; }; - + struct Property { QByteArray typeName; QByteArray signature; @@ -92,14 +92,14 @@ private: QMap signals_; QMap methods; QMap properties; - + const QDBusIntrospection::Interface *data; QString interface; Type findType(const QByteArray &signature, const QDBusIntrospection::Annotations &annotations, const char *direction = "Out", int id = -1); - + void parseMethods(); void parseSignals(); void parseProperties(); @@ -258,7 +258,7 @@ void QDBusMetaObjectGenerator::parseMethods() mm.inputTypes.append(type.id); mm.parameterNames.append(arg.name.toLatin1()); - + prototype.append(type.name); prototype.append(','); } @@ -331,7 +331,7 @@ void QDBusMetaObjectGenerator::parseSignals() mm.inputTypes.append(type.id); mm.parameterNames.append(arg.name.toLatin1()); - + prototype.append(type.name); prototype.append(','); } @@ -361,7 +361,7 @@ void QDBusMetaObjectGenerator::parseProperties() Type type = findType(p.type.toLatin1(), p.annotations); if (type.id == QVariant::Invalid) continue; - + QByteArray name = p.name.toLatin1(); mp.signature = p.type.toLatin1(); mp.type = type.id; @@ -564,7 +564,7 @@ void QDBusMetaObjectGenerator::writeWithoutXml(const QString &interface) char *stringdata = new char[name.length() + 1]; stringdata[name.length()] = '\0'; - + d.data = reinterpret_cast(header); d.relatedMetaObjects = 0; d.static_metacall = 0; @@ -615,7 +615,7 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con if (we) return we; // still nothing? - + if (parsed.isEmpty()) { // object didn't return introspection we = new QDBusMetaObject; @@ -627,7 +627,7 @@ QDBusMetaObject *QDBusMetaObject::createMetaObject(const QString &interface, con // merge all interfaces it = parsed.constBegin(); QDBusIntrospection::Interface merged = *it.value().constData(); - + for (++it; it != end; ++it) { merged.annotations.unite(it.value()->annotations); merged.methods.unite(it.value()->methods); diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp index ff5818d684..804e80699a 100644 --- a/src/dbus/qdbusmetatype.cpp +++ b/src/dbus/qdbusmetatype.cpp @@ -318,10 +318,10 @@ int QDBusMetaType::signatureToType(const char *signature) case DBUS_TYPE_UINT16: return QMetaType::UShort; - + case DBUS_TYPE_INT32: return QVariant::Int; - + case DBUS_TYPE_UINT32: return QVariant::UInt; @@ -375,7 +375,7 @@ int QDBusMetaType::signatureToType(const char *signature) /*! \fn QDBusMetaType::typeToSignature(int type) - \internal + \internal Returns the D-Bus signature equivalent to the supplied meta type id \a type. 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 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 * 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::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::ComplexToSimple::DebugDialog::DebugDialog(ComplexToSimple *par QDataBuffer &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::ComplexToSimple::DebugDialog::paintEvent(QPaintEvent *) QDataBuffer &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::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()); - + QFont font = variants.at(0).value(); QVector 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(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(d->parsed); @@ -1934,7 +1934,7 @@ QVector StyleSelector::styleRulesForNode(NodePtr node) return rules; QMap 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 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::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% diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 509f8b3251..a279990f4c 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -923,7 +923,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest() fillPipeline(channels[i].socket); // If there is not already any connected channels we need to connect a new one. - // We do not pair the channel with the request until we know if it is + // We do not pair the channel with the request until we know if it is // connected or not. This is to reuse connected channels before we connect new once. int queuedRequest = highPriorityQueue.count() + lowPriorityQueue.count(); for (int i = 0; i < channelCount; ++i) { diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index 3577d76df5..c8138b5453 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -146,7 +146,7 @@ public: QHttpNetworkConnectionChannel(); QAbstractSocket::NetworkLayerProtocol networkLayerPreference; - + void setConnection(QHttpNetworkConnection *c); QPointer connection; diff --git a/src/network/access/qnetworkaccessdebugpipebackend.cpp b/src/network/access/qnetworkaccessdebugpipebackend.cpp index d9d3200564..b6c04dddea 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend.cpp +++ b/src/network/access/qnetworkaccessdebugpipebackend.cpp @@ -143,7 +143,7 @@ void QNetworkAccessDebugPipeBackend::pushFromSocketToDownstream() buffer.resize(ReadBufferSize); qint64 haveRead = socket.read(buffer.data(), ReadBufferSize); - + if (haveRead == -1) { hasDownloadFinished = true; // this ensures a good last downloadProgress is emitted diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 123b354131..83cb729589 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -672,8 +672,8 @@ QNetworkReply *QNetworkAccessManager::head(const QNetworkRequest &request) /*! Posts a request to obtain the contents of the target \a request - and returns a new QNetworkReply object opened for reading which emits the - \l{QIODevice::readyRead()}{readyRead()} signal whenever new data + and returns a new QNetworkReply object opened for reading which emits the + \l{QIODevice::readyRead()}{readyRead()} signal whenever new data arrives. The contents as well as associated headers will be downloaded. @@ -687,11 +687,11 @@ QNetworkReply *QNetworkAccessManager::get(const QNetworkRequest &request) /*! Sends an HTTP POST request to the destination specified by \a request - and returns a new QNetworkReply object opened for reading that will - contain the reply sent by the server. The contents of the \a data + and returns a new QNetworkReply object opened for reading that will + contain the reply sent by the server. The contents of the \a data device will be uploaded to the server. - \a data must be open for reading and must remain valid until the + \a data must be open for reading and must remain valid until the finished() signal is emitted for this reply. \note Sending a POST request on protocols other than HTTP and @@ -707,7 +707,7 @@ QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, QIODe /*! \overload - Sends the contents of the \a data byte array to the destination + Sends the contents of the \a data byte array to the destination specified by \a request. */ QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, const QByteArray &data) @@ -770,8 +770,8 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, QHttpM this reply. Whether anything will be available for reading from the returned - object is protocol dependent. For HTTP, the server may send a - small HTML page indicating the upload was successful (or not). + object is protocol dependent. For HTTP, the server may send a + small HTML page indicating the upload was successful (or not). Other protocols will probably have content in their replies. \note For HTTP, this request will send a PUT request, which most servers @@ -807,7 +807,7 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, const Sends a request to delete the resource identified by the URL of \a request. - \note This feature is currently available for HTTP only, performing an + \note This feature is currently available for HTTP only, performing an HTTP DELETE request. \sa get(), post(), put(), sendCustomRequest() diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp index ec8d7894fa..49d6babb10 100644 --- a/src/network/bearer/qnetworkconfigmanager.cpp +++ b/src/network/bearer/qnetworkconfigmanager.cpp @@ -134,7 +134,7 @@ QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate() \sa QNetworkConfiguration */ -/*! +/*! \fn void QNetworkConfigurationManager::configurationAdded(const QNetworkConfiguration &config) This signal is emitted whenever a new network configuration is added to the system. The new diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index f06a2d0df4..cca95fce8c 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -66,37 +66,37 @@ QT_BEGIN_NAMESPACE \ingroup network A QNetworkSession enables control over the system's network interfaces. The session's configuration - parameter are determined via the QNetworkConfiguration object to which it is bound. Depending on the + parameter are determined via the QNetworkConfiguration object to which it is bound. Depending on the type of the session (single access point or service network) a session may be linked to one or more - network interfaces. By means of \l{open()}{opening} and \l{close()}{closing} of network sessions - a developer can start and stop the systems network interfaces. If the configuration represents + network interfaces. By means of \l{open()}{opening} and \l{close()}{closing} of network sessions + a developer can start and stop the systems network interfaces. If the configuration represents multiple access points (see \l QNetworkConfiguration::ServiceNetwork) more advanced features such as roaming may be supported. - QNetworkSession supports session management within the same process and depending on the platform's - capabilities may support out-of-process sessions. If the same + QNetworkSession supports session management within the same process and depending on the platform's + capabilities may support out-of-process sessions. If the same network configuration is used by multiple open sessions the underlying network interface is only terminated once the last session has been closed. \section1 Roaming - Applications may connect to the preferredConfigurationChanged() signal in order to - receive notifications when a more suitable access point becomes available. + Applications may connect to the preferredConfigurationChanged() signal in order to + receive notifications when a more suitable access point becomes available. In response to this signal the application must either initiate the roaming via migrate() - or ignore() the new access point. Once the session has roamed the - newConfigurationActivated() signal is emitted. The application may now test the + or ignore() the new access point. Once the session has roamed the + newConfigurationActivated() signal is emitted. The application may now test the carrier and must either accept() or reject() it. The session will return to the previous access point if the roaming was rejected. The subsequent state diagram depicts the required state transitions. - + \image roaming-states.png - Some platforms may distinguish forced roaming and application level roaming (ALR). - ALR implies that the application controls (via migrate(), ignore(), accept() and reject()) + Some platforms may distinguish forced roaming and application level roaming (ALR). + ALR implies that the application controls (via migrate(), ignore(), accept() and reject()) whether a network session can roam from one access point to the next. Such control is useful if the application maintains stateful socket connections and wants to control the transition from - one interface to the next. Forced roaming implies that the system automatically roams to the next network without + one interface to the next. Forced roaming implies that the system automatically roams to the next network without consulting the application. This has the advantage that the application can make use of roaming features - without actually being aware of it. It is expected that the application detects that the underlying + without actually being aware of it. It is expected that the application detects that the underlying socket is broken and automatically reconnects via the new network link. If the platform supports both modes of roaming, an application indicates its preference @@ -105,7 +105,7 @@ QT_BEGIN_NAMESPACE level roaming. If the client does not connect to the preferredConfigurationChanged(), forced roaming is used. If forced roaming is not supported the network session will not roam by default. - Some applications may want to suppress any form of roaming altogether. Possible use cases may be + Some applications may want to suppress any form of roaming altogether. Possible use cases may be high priority downloads or remote services which cannot handle a roaming enabled client. Clients can suppress roaming by connecting to the preferredConfigurationChanged() signal and answer each signal emission with ignore(). @@ -120,19 +120,19 @@ QT_BEGIN_NAMESPACE single access point configuration the state of the session is the same as the state of the associated network interface. - \value Invalid The session is invalid due to an invalid configuration. This may - happen due to a removed access point or a configuration that was + \value Invalid The session is invalid due to an invalid configuration. This may + happen due to a removed access point or a configuration that was invalid to begin with. \value NotAvailable The session is based on a defined but not yet discovered QNetworkConfiguration (see \l QNetworkConfiguration::StateFlag). \value Connecting The network session is being established. \value Connected The network session is connected. If the current process wishes to use this session - it has to register its interest by calling open(). A network session + it has to register its interest by calling open(). A network session is considered to be ready for socket operations if it isOpen() and connected. \value Closing The network session is in the process of being shut down. \value Disconnected The network session is not connected. The associated QNetworkConfiguration has the state QNetworkConfiguration::Discovered. - \value Roaming The network session is roaming from one access point to another + \value Roaming The network session is roaming from one access point to another access point. */ @@ -194,16 +194,16 @@ QT_BEGIN_NAMESPACE If the roaming process is non-seamless the IP address will change which means that a socket becomes invalid. However seamless mobility can ensure that the local IP address does not change. This is achieved by using a virtual IP address which is bound to the actual - link address. During the roaming process the virtual address is attached to the new link + link address. During the roaming process the virtual address is attached to the new link address. - Some platforms may support the concept of Forced Roaming and Application Level Roaming (ALR). - Forced roaming implies that the platform may simply roam to a new configuration without + Some platforms may support the concept of Forced Roaming and Application Level Roaming (ALR). + Forced roaming implies that the platform may simply roam to a new configuration without consulting applications. It is up to the application to detect the link layer loss and reestablish - its sockets. In contrast ALR provides the opportunity to prevent the system from roaming. + its sockets. In contrast ALR provides the opportunity to prevent the system from roaming. If this session is based on a configuration that supports roaming the application can choose - whether it wants to be consulted (ALR use case) by connecting to this signal. For as long as this signal - connection remains the session remains registered as a roaming stakeholder; otherwise roaming will + whether it wants to be consulted (ALR use case) by connecting to this signal. For as long as this signal + connection remains the session remains registered as a roaming stakeholder; otherwise roaming will be enforced by the platform. \sa migrate(), ignore(), QNetworkConfiguration::isRoamingAvailable() @@ -214,7 +214,7 @@ QT_BEGIN_NAMESPACE This signal is emitted once the session has roamed to the new access point. The application may reopen its socket and test the suitability of the new network link. - Subsequently it must either accept() or reject() the new access point. + Subsequently it must either accept() or reject() the new access point. \sa accept(), reject() */ @@ -222,8 +222,8 @@ QT_BEGIN_NAMESPACE /*! \fn void QNetworkSession::opened() - This signal is emitted when the network session has been opened. - + This signal is emitted when the network session has been opened. + The underlying network interface will not be shut down as long as the session remains open. Note that this feature is dependent on \l{QNetworkConfigurationManager::SystemSessionSupport}{system wide session support}. */ @@ -292,12 +292,12 @@ QNetworkSession::~QNetworkSession() The system will not terminate a network interface until the session reference counter reaches zero. Therefore an open session allows an application to register its use of the interface. - As a result of calling open() the interface will be started if it is not connected/up yet. + As a result of calling open() the interface will be started if it is not connected/up yet. Some platforms may not provide support for out-of-process sessions. On such platforms the session - counter ignores any sessions held by another process. The platform capabilities can be + counter ignores any sessions held by another process. The platform capabilities can be detected via QNetworkConfigurationManager::capabilities(). - Note that this call is asynchronous. Depending on the outcome of this call the results can be enquired + Note that this call is asynchronous. Depending on the outcome of this call the results can be enquired by connecting to the stateChanged(), opened() or error() signals. It is not a requirement to open a session in order to monitor the underlying network interface. @@ -361,10 +361,10 @@ bool QNetworkSession::waitForOpened(int msecs) \l Disconnected if the current session was the last open session. If the platform does not support out-of-process sessions calling this function does not stop the - interface. In this case \l{stop()} has to be used to force a shut down. + interface. In this case \l{stop()} has to be used to force a shut down. The platform capabilities can be detected via QNetworkConfigurationManager::capabilities(). - Note that this call is asynchronous. Depending on the outcome of this call the results can be enquired + Note that this call is asynchronous. Depending on the outcome of this call the results can be enquired by connecting to the stateChanged(), opened() or error() signals. \sa open(), stop(), isOpen() @@ -376,7 +376,7 @@ void QNetworkSession::close() } /*! - Invalidates all open sessions against the network interface and therefore stops the + Invalidates all open sessions against the network interface and therefore stops the underlying network interface. This function always changes the session's state() flag to \l Disconnected. @@ -426,15 +426,15 @@ bool QNetworkSession::isOpen() const } /*! - Returns the state of the session. - - If the session is based on a single access point configuration the state of the + Returns the state of the session. + + If the session is based on a single access point configuration the state of the session is the same as the state of the associated network interface. Therefore - a network session object can be used to monitor network interfaces. + a network session object can be used to monitor network interfaces. A \l QNetworkConfiguration::ServiceNetwork based session summarizes the state of all its children - and therefore returns the \l Connected state if at least one of the service network's - \l {QNetworkConfiguration::children()}{children()} configurations is active. + and therefore returns the \l Connected state if at least one of the service network's + \l {QNetworkConfiguration::children()}{children()} configurations is active. Note that it is not required to hold an open session in order to obtain the network interface state. A connected but closed session may be used to monitor network interfaces whereas an open and connected @@ -458,7 +458,7 @@ QNetworkSession::SessionError QNetworkSession::error() const } /*! - Returns a human-readable description of the last device error that + Returns a human-readable description of the last device error that occurred. \sa error() @@ -485,7 +485,7 @@ QString QNetworkSession::errorString() const QNetworkConfiguration that is used by this session; otherwise an empty string. The main purpose of this key is to determine which Internet access point is used - if the session is based on a \l{QNetworkConfiguration::ServiceNetwork}{ServiceNetwork}. + if the session is based on a \l{QNetworkConfiguration::ServiceNetwork}{ServiceNetwork}. The following code snippet highlights the difference: \code QNetworkConfigurationManager mgr; @@ -512,7 +512,7 @@ QString QNetworkSession::errorString() const this key may return an identifier for either a \l {QNetworkConfiguration::ServiceNetwork}{service network} or a \l {QNetworkConfiguration::InternetAccessPoint}{Internet access points} configurations, - whereas \e ActiveConfiguration always returns identifiers to + whereas \e ActiveConfiguration always returns identifiers to \l {QNetworkConfiguration::InternetAccessPoint}{Internet access points} configurations. \row \li ConnectInBackground @@ -558,7 +558,7 @@ QVariant QNetworkSession::sessionProperty(const QString &key) const /*! Sets the property \a value on the session. The property is identified using - \a key. Removing an already set property can be achieved by passing an + \a key. Removing an already set property can be achieved by passing an invalid QVariant. Note that the \e UserChoiceConfiguration and \e ActiveConfiguration @@ -578,7 +578,7 @@ void QNetworkSession::setSessionProperty(const QString &key, const QVariant &val } /*! - Instructs the session to roam to the new access point. The old access point remains active + Instructs the session to roam to the new access point. The old access point remains active until the application calls accept(). The newConfigurationActivated() signal is emitted once roaming has been completed. @@ -603,11 +603,11 @@ void QNetworkSession::ignore() } /*! - Instructs the session to permanently accept the new access point. Once this function + Instructs the session to permanently accept the new access point. Once this function has been called the session may not return to the old access point. The old access point may be closed in the process if there are no other network sessions for it. - Therefore any open socket that still uses the old access point + Therefore any open socket that still uses the old access point may become unusable and should be closed before completing the migration. */ void QNetworkSession::accept() @@ -617,7 +617,7 @@ void QNetworkSession::accept() } /*! - The new access point is not suitable for the application. By calling this function the + The new access point is not suitable for the application. By calling this function the session returns to the previous access point/configuration. This action may invalidate any socket that has been created via the not desired access point. @@ -633,10 +633,10 @@ void QNetworkSession::reject() /*! Returns the amount of data sent in bytes; otherwise 0. - This field value includes the usage across all open network + This field value includes the usage across all open network sessions which use the same network interface. - If the session is based on a service network configuration the number of + If the session is based on a service network configuration the number of sent bytes across all active member configurations are returned. This function may not always be supported on all platforms and returns 0. @@ -652,10 +652,10 @@ quint64 QNetworkSession::bytesWritten() const /*! Returns the amount of data received in bytes; otherwise 0. - This field value includes the usage across all open network + This field value includes the usage across all open network sessions which use the same network interface. - If the session is based on a service network configuration the number of + If the session is based on a service network configuration the number of sent bytes across all active member configurations are returned. This function may not always be supported on all platforms and returns 0. @@ -699,12 +699,12 @@ void QNetworkSessionPrivate::setUsagePolicies(QNetworkSession &session, QNetwork /*! \internal - This function is required to detect whether the client wants to control + This function is required to detect whether the client wants to control the roaming process. If he connects to preferredConfigurationChanged() signal he intends to influence it. Otherwise QNetworkSession always roams without registering this session as a stakeholder in the roaming process. - For more details check the Forced vs ALR roaming section in the QNetworkSession + For more details check the Forced vs ALR roaming section in the QNetworkSession class description. */ void QNetworkSession::connectNotify(const QMetaMethod &signal) diff --git a/src/network/bearer/qnetworksession_p.h b/src/network/bearer/qnetworksession_p.h index c5af8d8ca0..909cce5e4b 100644 --- a/src/network/bearer/qnetworksession_p.h +++ b/src/network/bearer/qnetworksession_p.h @@ -76,7 +76,7 @@ public: //called by QNetworkSession constructor and ensures //that the state is immediately updated (w/o actually opening - //a session). Also this function should take care of + //a session). Also this function should take care of //notification hooks to discover future state changes. virtual void syncStateWithInterface() = 0; diff --git a/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp b/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp index 01ec19c0ba..af1273dd85 100644 --- a/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp +++ b/src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp @@ -47,7 +47,7 @@ if (socket->waitForConnected(1000)) //! [1] socket->disconnectFromHost(); - if (socket->state() == QAbstractSocket::UnconnectedState || + if (socket->state() == QAbstractSocket::UnconnectedState || socket->waitForDisconnected(1000)) qDebug("Disconnected!"); //! [1] diff --git a/src/network/doc/snippets/network/tcpwait.cpp b/src/network/doc/snippets/network/tcpwait.cpp index 2be8d7c8ea..fb44e2ded9 100644 --- a/src/network/doc/snippets/network/tcpwait.cpp +++ b/src/network/doc/snippets/network/tcpwait.cpp @@ -49,7 +49,7 @@ int main(int argv, char **args) QTcpSocket socket; socket.connectToHost("localhost", 1025); - + //! [0] int numRead = 0, numReadTotal = 0; char buffer[50]; @@ -58,12 +58,12 @@ int main(int argv, char **args) numRead = socket.read(buffer, 50); // do whatever with array - + numReadTotal += numRead; - if (numRead == 0 && !socket.waitForReadyRead()) + if (numRead == 0 && !socket.waitForReadyRead()) break; } //! [0] - + return app.exec(); } diff --git a/src/network/kernel/qauthenticator.h b/src/network/kernel/qauthenticator.h index b784cd7f50..4d96104bc0 100644 --- a/src/network/kernel/qauthenticator.h +++ b/src/network/kernel/qauthenticator.h @@ -62,7 +62,7 @@ public: bool operator==(const QAuthenticator &other) const; inline bool operator!=(const QAuthenticator &other) const { return !operator==(other); } - + QString user() const; void setUser(const QString &user); diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp index f15c49104d..dc67b0d835 100644 --- a/src/network/kernel/qhostaddress.cpp +++ b/src/network/kernel/qhostaddress.cpp @@ -664,7 +664,7 @@ Q_IPV6ADDR QHostAddress::toIPv6Address() const Returns the address as a string. For example, if the address is the IPv4 address 127.0.0.1, the - returned string is "127.0.0.1". For IPv6 the string format will + returned string is "127.0.0.1". For IPv6 the string format will follow the RFC5952 recommendation. For QHostAddress::Any, its IPv4 address will be returned ("0.0.0.0") diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h index f288b8d938..53d5d6e664 100644 --- a/src/network/kernel/qnetworkinterface.h +++ b/src/network/kernel/qnetworkinterface.h @@ -98,7 +98,7 @@ public: CanMulticast = 0x20 }; Q_DECLARE_FLAGS(InterfaceFlags, InterfaceFlag) - + QNetworkInterface(); QNetworkInterface(const QNetworkInterface &other); QNetworkInterface &operator=(const QNetworkInterface &other); diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index 7885d122ea..0ec9554c82 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -328,9 +328,9 @@ static QList createInterfaces(ifaddrs *rawList) } break; } - if ( if_it != interfaces.end() ) + if ( if_it != interfaces.end() ) continue; - + QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate; interfaces << iface; iface->index = ifindex; diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp index 0a2deb8711..02c0801cef 100644 --- a/src/network/kernel/qnetworkinterface_win.cpp +++ b/src/network/kernel/qnetworkinterface_win.cpp @@ -109,7 +109,7 @@ static QHash ipv4Netmasks() IP_ADAPTER_INFO staticBuf[2]; // 2 is arbitrary PIP_ADAPTER_INFO pAdapter = staticBuf; ULONG bufSize = sizeof staticBuf; - QHash ipv4netmasks; + QHash ipv4netmasks; DWORD retval = ptrGetAdaptersInfo(pAdapter, &bufSize); if (retval == ERROR_BUFFER_OVERFLOW) { diff --git a/src/network/kernel/qnetworkinterface_win_p.h b/src/network/kernel/qnetworkinterface_win_p.h index 34f4e18d5e..d6a3366316 100644 --- a/src/network/kernel/qnetworkinterface_win_p.h +++ b/src/network/kernel/qnetworkinterface_win_p.h @@ -112,19 +112,19 @@ typedef struct { // copied from MSDN online help typedef enum { - IpPrefixOriginOther = 0, - IpPrefixOriginManual, - IpPrefixOriginWellKnown, - IpPrefixOriginDhcp, + IpPrefixOriginOther = 0, + IpPrefixOriginManual, + IpPrefixOriginWellKnown, + IpPrefixOriginDhcp, IpPrefixOriginRouterAdvertisement } IP_PREFIX_ORIGIN; typedef enum { - IpSuffixOriginOther = 0, - IpSuffixOriginManual, - IpSuffixOriginWellKnown, - IpSuffixOriginDhcp, - IpSuffixOriginLinkLayerAddress, + IpSuffixOriginOther = 0, + IpSuffixOriginManual, + IpSuffixOriginWellKnown, + IpSuffixOriginDhcp, + IpSuffixOriginLinkLayerAddress, IpSuffixOriginRandom } IP_SUFFIX_ORIGIN; @@ -164,11 +164,11 @@ typedef struct _IP_ADAPTER_UNICAST_ADDRESS { ULONG LeaseLifetime; } IP_ADAPTER_UNICAST_ADDRESS, *PIP_ADAPTER_UNICAST_ADDRESS; -typedef struct _IP_ADAPTER_ANYCAST_ADDRESS +typedef struct _IP_ADAPTER_ANYCAST_ADDRESS IP_ADAPTER_ANYCAST_ADDRESS, *PIP_ADAPTER_ANYCAST_ADDRESS; -typedef struct _IP_ADAPTER_MULTICAST_ADDRESS - IP_ADAPTER_MULTICAST_ADDRESS, +typedef struct _IP_ADAPTER_MULTICAST_ADDRESS + IP_ADAPTER_MULTICAST_ADDRESS, *PIP_ADAPTER_MULTICAST_ADDRESS; typedef struct _IP_ADAPTER_DNS_SERVER_ADDRESS @@ -186,7 +186,7 @@ typedef struct _IP_ADAPTER_PREFIX { struct _IP_ADAPTER_PREFIX* Next; SOCKET_ADDRESS Address; ULONG PrefixLength; -} IP_ADAPTER_PREFIX, +} IP_ADAPTER_PREFIX, *PIP_ADAPTER_PREFIX; typedef struct _IP_ADAPTER_ADDRESSES { @@ -215,7 +215,7 @@ typedef struct _IP_ADAPTER_ADDRESSES { DWORD Ipv6IfIndex; DWORD ZoneIndices[16]; PIP_ADAPTER_PREFIX FirstPrefix; -} IP_ADAPTER_ADDRESSES, +} IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; typedef struct { @@ -227,7 +227,7 @@ typedef struct _IP_ADDR_STRING { IP_ADDRESS_STRING IpAddress; IP_MASK_STRING IpMask; DWORD Context; -} IP_ADDR_STRING, +} IP_ADDR_STRING, *PIP_ADDR_STRING; typedef struct _IP_ADAPTER_INFO { @@ -249,7 +249,7 @@ typedef struct _IP_ADAPTER_INFO { IP_ADDR_STRING SecondaryWinsServer; time_t LeaseObtained; time_t LeaseExpires; -} IP_ADAPTER_INFO, +} IP_ADAPTER_INFO, *PIP_ADAPTER_INFO; typedef struct { diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index a135abd5e3..3027b77161 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -1450,7 +1450,7 @@ int QNativeSocketEnginePrivate::nativeSelect(int timeout, bool selectForRead) co bool readEnabled = selectForRead && readNotifier && readNotifier->isEnabled(); if (readEnabled) readNotifier->setEnabled(false); - + fd_set fds; int ret = 0; diff --git a/src/network/socket/qtcpsocket.cpp b/src/network/socket/qtcpsocket.cpp index fb5d46a9f7..ce37401a89 100644 --- a/src/network/socket/qtcpsocket.cpp +++ b/src/network/socket/qtcpsocket.cpp @@ -41,7 +41,7 @@ //#define QTCPSOCKET_DEBUG -/*! +/*! \class QTcpSocket \brief The QTcpSocket class provides a TCP socket. diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp index 6fcd977759..4e33001d8d 100644 --- a/src/network/ssl/qssl.cpp +++ b/src/network/ssl/qssl.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE \enum QSsl::KeyType Describes the two types of keys QSslKey supports. - + \value PrivateKey A private key. \value PublicKey A public key. */ diff --git a/src/network/ssl/qsslcipher.cpp b/src/network/ssl/qsslcipher.cpp index 46131fc1aa..b045d2eba9 100644 --- a/src/network/ssl/qsslcipher.cpp +++ b/src/network/ssl/qsslcipher.cpp @@ -194,7 +194,7 @@ QString QSslCipher::keyExchangeMethod() const { return d->keyExchangeMethod; } - + /*! Returns the cipher's authentication method as a QString. */ diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp index d151b376d5..bf75d2e610 100644 --- a/src/network/ssl/qsslerror.cpp +++ b/src/network/ssl/qsslerror.cpp @@ -61,7 +61,7 @@ \enum QSslError::SslError Describes all recognized errors that can occur during an SSL handshake. - + \value NoError \value UnableToGetIssuerCertificate \value UnableToDecryptCertificateSignature @@ -108,7 +108,7 @@ public: }; /*! - Constructs a QSslError object with no error and default certificate. + Constructs a QSslError object with no error and default certificate. */ diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index 135ba11ece..73549ce648 100644 --- a/src/network/ssl/qsslerror.h +++ b/src/network/ssl/qsslerror.h @@ -104,7 +104,7 @@ public: SslError error() const; QString errorString() const; QSslCertificate certificate() const; - + private: QScopedPointer d; }; diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index b1cdef7f29..a8bf8f83b8 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -267,7 +267,7 @@ /*! \fn void QSslSocket::sslErrors(const QList &errors); - + QSslSocket emits this signal after the SSL handshake to indicate that one or more errors have occurred while establishing the identity of the peer. The errors are usually an indication that QSslSocket is unable to @@ -281,7 +281,7 @@ \a errors contains one or more errors that prevent QSslSocket from verifying the identity of the peer. - + Note: You cannot use Qt::QueuedConnection when connecting to this signal, or calling QSslSocket::ignoreSslErrors() will have no effect. @@ -436,7 +436,7 @@ void QSslSocket::connectToHostEncrypted(const QString &hostName, quint16 port, O \overload In addition to the original behaviour of connectToHostEncrypted, - this overloaded method enables the usage of a different hostname + this overloaded method enables the usage of a different hostname (\a sslPeerName) for the certificate validation instead of the one used for the TCP connection (\a hostName). @@ -827,7 +827,7 @@ bool QSslSocket::flush() /*! \since 4.4 - Sets the size of QSslSocket's internal read buffer to be \a size bytes. + Sets the size of QSslSocket's internal read buffer to be \a size bytes. */ void QSslSocket::setReadBufferSize(qint64 size) { @@ -960,7 +960,7 @@ void QSslSocket::setLocalCertificate(const QSslCertificate &certificate) \overload Sets the socket's local \l {QSslCertificate} {certificate} to the - first one found in file \a path, which is parsed according to the + first one found in file \a path, which is parsed according to the specified \a format. */ void QSslSocket::setLocalCertificate(const QString &path, @@ -990,7 +990,7 @@ QSslCertificate QSslSocket::localCertificate() const Returns the peer's digital certificate (i.e., the immediate certificate of the host you are connected to), or a null certificate, if the peer has not assigned a certificate. - + The peer certificate is checked automatically during the handshake phase, so this function is normally used to fetch the certificate for display or for connection diagnostic @@ -1102,7 +1102,7 @@ void QSslSocket::setPrivateKey(const QSslKey &key) creating an SSL server socket. If you are creating an SSL client socket, the key and local certificate are required if your client must identify itself to an SSL server. - + \sa privateKey(), setLocalCertificate() */ void QSslSocket::setPrivateKey(const QString &fileName, QSsl::KeyAlgorithm algorithm, @@ -1710,7 +1710,7 @@ void QSslSocket::startClientEncryption() subclass of QTcpServer and reimplement QTcpServer::incomingConnection(). The returned socket descriptor is then passed to QSslSocket::setSocketDescriptor(). - + \sa connectToHostEncrypted(), startClientEncryption() */ void QSslSocket::startServerEncryption() diff --git a/src/opengl/doc/src/qtopengl-examples.qdoc b/src/opengl/doc/src/qtopengl-examples.qdoc index 17fee37b7c..67c6aa3c0d 100644 --- a/src/opengl/doc/src/qtopengl-examples.qdoc +++ b/src/opengl/doc/src/qtopengl-examples.qdoc @@ -35,7 +35,7 @@ These examples describe how to use the Qt OpenGL Module. For new code, please use the OpenGL classes in the \l {Qt GUI Module}. - + Qt provides support for integration with OpenGL implementations on all platforms, giving developers the opportunity to display hardware accelerated diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h index 44a0274da4..f1a664c93d 100644 --- a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h +++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray_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 << QGLPoint(left, top) << QGLPoint(right, top) << QGLPoint(right, bottom) << QGLPoint(right, bottom) << QGLPoint(left, bottom) - << QGLPoint(left, top); + << QGLPoint(left, top); } inline void addQuad(const QRectF &rect) diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp index 589b0e2c24..e85949afb6 100644 --- a/src/plugins/bearer/connman/qconnmanengine.cpp +++ b/src/plugins/bearer/connman/qconnmanengine.cpp @@ -574,7 +574,7 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath) QNetworkConfigurationPrivatePointer ptr(cpPriv); accessPointConfigurations.insert(ptr->id, ptr); foundConfigurations.append(cpPriv); - configInterfaces[cpPriv->id] = serv->getInterface(); + configInterfaces[cpPriv->id] = serv->getInterface(); locker.unlock(); emit configurationAdded(ptr); diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp index 56ae2b6e3c..e78a597433 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp @@ -405,7 +405,7 @@ QVariant QConnmanProfileInterface::getProperty(const QString &property) QVariantMap map = getProperties(); if (map.contains(property)) { var = map.value(property); - } + } return var; } @@ -493,7 +493,7 @@ QVariant QConnmanServiceInterface::getProperty(const QString &property) QVariantMap map = getProperties(); if (map.contains(property)) { var = map.value(property); - } + } return var; } diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h index d1524ca753..a437c6609c 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h +++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h @@ -134,7 +134,7 @@ public: QString requestSession(const QString &bearerName); void releaseSession(); - + // properties QString getState(); QStringList getAvailableTechnologies(); diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h index 7038dde3d9..7febe27ad2 100644 --- a/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h +++ b/src/plugins/bearer/networkmanager/qnetworkmanagerservice.h @@ -139,26 +139,26 @@ class QNetworkManagerInterfacePrivate; class QNetworkManagerInterface : public QObject { Q_OBJECT - + public: - + QNetworkManagerInterface(QObject *parent = 0); ~QNetworkManagerInterface(); - + QList getDevices() const; void activateConnection(const QString &serviceName, QDBusObjectPath connection, QDBusObjectPath device, QDBusObjectPath specificObject); void deactivateConnection(QDBusObjectPath connectionPath) const; - + QDBusObjectPath path() const; QDBusInterface *connectionInterface() const; - + bool wirelessEnabled() const; bool wirelessHardwareEnabled() const; QList activeConnections() const; quint32 state(); bool setConnections(); bool isValid(); - + Q_SIGNALS: void deviceAdded(QDBusObjectPath); void deviceRemoved(QDBusObjectPath); @@ -176,9 +176,9 @@ class QNetworkManagerInterfaceAccessPointPrivate; class QNetworkManagerInterfaceAccessPoint : public QObject { Q_OBJECT - + public: - + enum DeviceState { Unknown = 0, Unmanaged, @@ -191,14 +191,14 @@ public: Activated, Failed }; - + enum ApFlag { ApNone = 0x0, Privacy = 0x1 }; - + Q_DECLARE_FLAGS(ApFlags, ApFlag); - + enum ApSecurityFlag { ApSecurityNone = 0x0, PairWep40 = 0x1, @@ -212,9 +212,9 @@ public: KeyPsk = 0x100, Key8021x = 0x200 }; - + Q_DECLARE_FLAGS(ApSecurityFlags, ApSecurityFlag); - + explicit QNetworkManagerInterfaceAccessPoint(const QString &dbusPathName, QObject *parent = 0); ~QNetworkManagerInterfaceAccessPoint(); @@ -231,7 +231,7 @@ public: quint32 strength() const; bool setConnections(); bool isValid(); - + Q_SIGNALS: void propertiesChanged(QMap ); void propertiesChanged( const QString &, QMap); @@ -245,23 +245,23 @@ class QNetworkManagerInterfaceDevicePrivate; class QNetworkManagerInterfaceDevice : public QObject { Q_OBJECT - + public: - + explicit QNetworkManagerInterfaceDevice(const QString &deviceObjectPath, QObject *parent = 0); ~QNetworkManagerInterfaceDevice(); - + QString udi() const; QString networkInterface() const; QDBusInterface *connectionInterface() const; quint32 ip4Address() const; quint32 state() const; quint32 deviceType() const; - + QDBusObjectPath ip4config() const; bool setConnections(); bool isValid(); - + Q_SIGNALS: void stateChanged(const QString &, quint32); @@ -274,20 +274,20 @@ class QNetworkManagerInterfaceDeviceWiredPrivate; class QNetworkManagerInterfaceDeviceWired : public QObject { Q_OBJECT - + public: - + explicit QNetworkManagerInterfaceDeviceWired(const QString &ifaceDevicePath, QObject *parent = 0); ~QNetworkManagerInterfaceDeviceWired(); - + QDBusInterface *connectionInterface() const; QString hwAddress() const; quint32 speed() const; bool carrier() const; bool setConnections(); bool isValid(); - + Q_SIGNALS: void propertiesChanged( const QString &, QMap); private: @@ -299,9 +299,9 @@ class QNetworkManagerInterfaceDeviceWirelessPrivate; class QNetworkManagerInterfaceDeviceWireless : public QObject { Q_OBJECT - + public: - + enum DeviceCapability { None = 0x0, Wep40 = 0x1, @@ -311,11 +311,11 @@ public: Wpa = 0x10, Rsn = 0x20 }; - + explicit QNetworkManagerInterfaceDeviceWireless(const QString &ifaceDevicePath, QObject *parent = 0); ~QNetworkManagerInterfaceDeviceWireless(); - + QDBusObjectPath path() const; QList getAccessPoints(); QDBusInterface *connectionInterface() const; @@ -327,7 +327,7 @@ public: quint32 wirelessCapabilities() const; bool setConnections(); bool isValid(); - + Q_SIGNALS: void propertiesChanged( const QString &, QMap); void accessPointAdded(const QString &,QDBusObjectPath); @@ -341,12 +341,12 @@ class QNetworkManagerSettingsPrivate; class QNetworkManagerSettings : public QObject { Q_OBJECT - + public: - + explicit QNetworkManagerSettings(const QString &settingsService, QObject *parent = 0); ~QNetworkManagerSettings(); - + QDBusInterface *connectionInterface() const; QList listConnections(); bool setConnections(); @@ -362,12 +362,12 @@ class QNetworkManagerSettingsConnectionPrivate; class QNetworkManagerSettingsConnection : public QObject { Q_OBJECT - + public: - + QNetworkManagerSettingsConnection(const QString &settingsService, const QString &connectionObjectPath, QObject *parent = 0); ~QNetworkManagerSettingsConnection(); - + QDBusInterface *connectionInterface() const; QNmSettingsMap getSettings(); bool setConnections(); @@ -382,7 +382,7 @@ public: bool isValid(); Q_SIGNALS: - + void updated(const QNmSettingsMap &settings); void removed(const QString &path); @@ -395,18 +395,18 @@ class QNetworkManagerConnectionActivePrivate; class QNetworkManagerConnectionActive : public QObject { Q_OBJECT - + public: - + enum ActiveConnectionState { Unknown = 0, Activating = 1, Activated = 2 }; - + explicit QNetworkManagerConnectionActive(const QString &dbusPathName, QObject *parent = 0); ~ QNetworkManagerConnectionActive(); - + QDBusInterface *connectionInterface() const; QString serviceName() const; QDBusObjectPath connection() const; @@ -417,7 +417,7 @@ public: bool setConnections(); bool isValid(); - + Q_SIGNALS: void propertiesChanged(QList); void propertiesChanged( const QString &, QMap); @@ -430,7 +430,7 @@ class QNetworkManagerIp4ConfigPrivate; class QNetworkManagerIp4Config : public QObject { Q_OBJECT - + public: explicit QNetworkManagerIp4Config(const QString &dbusPathName, QObject *parent = 0); ~QNetworkManagerIp4Config(); @@ -439,7 +439,7 @@ public: bool isValid(); private: - QNetworkManagerIp4ConfigPrivate *d; + QNetworkManagerIp4ConfigPrivate *d; }; QT_END_NAMESPACE diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h index 12893108dc..23828c885c 100644 --- a/src/plugins/bearer/qnetworksession_impl.h +++ b/src/plugins/bearer/qnetworksession_impl.h @@ -77,7 +77,7 @@ public: //called by QNetworkSession constructor and ensures //that the state is immediately updated (w/o actually opening - //a session). Also this function should take care of + //a session). Also this function should take care of //notification hooks to discover future state changes. void syncStateWithInterface(); diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index b1ef823068..a45c3875bc 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -/*! +/*! \class QtIcoHandler \since 4.4 \brief The QtIcoHandler class provides support for the ICO image format. diff --git a/src/plugins/imageformats/ico/qicohandler.h b/src/plugins/imageformats/ico/qicohandler.h index c0439b9d11..65c0f5cf59 100644 --- a/src/plugins/imageformats/ico/qicohandler.h +++ b/src/plugins/imageformats/ico/qicohandler.h @@ -57,13 +57,13 @@ public: bool write(const QImage &image); QByteArray name() const; - + int imageCount() const; bool jumpToImage(int imageNumber); bool jumpToNextImage(); - + static bool canRead(QIODevice *device); - + bool supportsOption(ImageOption option) const; QVariant option(ImageOption option) const; diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm index ed4f8cd1fb..5c487b0bdd 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm @@ -299,27 +299,27 @@ bool QCocoaEventDispatcher::hasPendingEvents() static bool IsMouseOrKeyEvent( NSEvent* event ) { bool result = false; - + switch( [event type] ) { - case NSLeftMouseDown: - case NSLeftMouseUp: - case NSRightMouseDown: - case NSRightMouseUp: + case NSLeftMouseDown: + case NSLeftMouseUp: + case NSRightMouseDown: + case NSRightMouseUp: case NSMouseMoved: // ?? - case NSLeftMouseDragged: + case NSLeftMouseDragged: case NSRightMouseDragged: - case NSMouseEntered: - case NSMouseExited: - case NSKeyDown: - case NSKeyUp: + case NSMouseEntered: + case NSMouseExited: + case NSKeyDown: + case NSKeyUp: case NSFlagsChanged: // key modifiers changed? case NSCursorUpdate: // ?? - case NSScrollWheel: - case NSTabletPoint: - case NSTabletProximity: - case NSOtherMouseDown: - case NSOtherMouseUp: + case NSScrollWheel: + case NSTabletPoint: + case NSTabletProximity: + case NSOtherMouseDown: + case NSOtherMouseUp: case NSOtherMouseDragged: #ifndef QT_NO_GESTURES case NSEventTypeGesture: // touch events @@ -639,7 +639,7 @@ static void setChildrenWorksWhenModal(QWindow *window, bool worksWhenModal) Q_UNUSED(worksWhenModal) // For NSPanels (but not NSWindows, sadly), we can set the flag - // worksWhenModal, so that they are active even when they are not modal. + // worksWhenModal, so that they are active even when they are not modal. /* ### not ported QList dialogs = window->findChildren(); @@ -680,7 +680,7 @@ void QCocoaEventDispatcherPrivate::cleanupModalSessions() // this to actually end the sessions for real (rather than at the // point they were marked as stopped), is that ending a session // when no other session runs below it on the stack will make cocoa - // drop some events on the floor. + // drop some events on the floor. QCocoaAutoReleasePool pool; int stackSize = cocoaModalSessionStack.size(); @@ -859,7 +859,7 @@ void QCocoaEventDispatcherPrivate::processPostedEvents() if (currentExecIsNSAppRun) { // The event dispatcher has been interrupted. But since // [NSApplication run] is running the event loop, we - // delayed stopping it until now (to let cocoa process + // delayed stopping it until now (to let cocoa process // pending cocoa events first). if (currentModalSessionCached) temporarilyStopAllModalSessions(); diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp index 1b11ef7f95..ff40c6a9ab 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp @@ -306,7 +306,7 @@ void QXcbCursor::changeCursor(QCursor *cursor, QWindow *widget) else // No X11 cursor control when there is no widget under the cursor return; - + xcb_cursor_t c = XCB_CURSOR_NONE; if (cursor) { if (cursor->shape() == Qt::BitmapCursor) { diff --git a/src/printsupport/doc/snippets/widgetprinting.cpp b/src/printsupport/doc/snippets/widgetprinting.cpp index 0204809988..3abef7a9a3 100644 --- a/src/printsupport/doc/snippets/widgetprinting.cpp +++ b/src/printsupport/doc/snippets/widgetprinting.cpp @@ -57,7 +57,7 @@ public: private slots: void print() { QPrinter printer(QPrinter::HighResolution); - + printer.setOutputFileName("test.pdf"); //! [0] diff --git a/src/printsupport/doc/src/qtprintsupport-index.qdoc b/src/printsupport/doc/src/qtprintsupport-index.qdoc index ea0d89aa34..dac915692e 100644 --- a/src/printsupport/doc/src/qtprintsupport-index.qdoc +++ b/src/printsupport/doc/src/qtprintsupport-index.qdoc @@ -40,12 +40,12 @@ generation facilities. \tableofcontents - + \section1 Classes Supporting Printing The following classes support the selecting and setting up of printers and printing output. - + \annotatedlist printing \section1 Paint Devices and Printing diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp index 48eb324cb8..695e7cdce8 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.cpp +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.cpp @@ -62,7 +62,7 @@ db.setDatabaseName("C:\\test.gdb"); //! [25] -// connect to database using the Latin-1 character set +// connect to database using the Latin-1 character set db.setConnectOptions("ISC_DPB_LC_CTYPE=Latin1"); db.open(); //! [25] diff --git a/src/sql/doc/src/qsqldatatype-table.qdoc b/src/sql/doc/src/qsqldatatype-table.qdoc index b278e045bb..8480b5d412 100644 --- a/src/sql/doc/src/qsqldatatype-table.qdoc +++ b/src/sql/doc/src/qsqldatatype-table.qdoc @@ -29,7 +29,7 @@ \page sql-types.html \title Data Types for Qt-supported Database Systems \brief Recommended data types for database systems - + \ingroup qt-sql \section1 Recommended Data Types for Qt-Supported Database Systems diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index 28db62537f..3de898c344 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -212,7 +212,7 @@ \li Open the DOS prompt, go to \c{C:\MySQL\MySQL51\lib\opt}, and run the following commands: - \list + \list \li \c{reimp -d libmysql.lib} \li \c{dlltool -k -d libmysql.def -l libmysql.a} \endlist @@ -227,7 +227,7 @@ \li Open the DOS prompt, go to \c{C:\Qt\4.6.2\src\plugins\sqldrivers\mysql} and run the - following command: + following command: \list \li \c{qmake "INCLUDEPATH+=C:/MySQL/MySQL51/include" "LIBS+=-L. mysql" mysql.pro} \endlist diff --git a/src/sql/doc/src/sql-programming.qdoc b/src/sql/doc/src/sql-programming.qdoc index d4089c8ab2..9b5e9318e0 100644 --- a/src/sql/doc/src/sql-programming.qdoc +++ b/src/sql/doc/src/sql-programming.qdoc @@ -64,7 +64,7 @@ \li \l{Using the SQL Model Classes} \li \l{Presenting Data in a Table View} \li \l{Creating Data-Aware Forms} - \endlist + \endlist \section1 Database Classes @@ -142,7 +142,7 @@ \l{QSqlDatabase::addDatabase()} {addDatabase()} specifies the type of database driver to use for the connection. The set of database drivers included with Qt are shown in the table of \l{SQL Database - Drivers#Supported Databases} {supported database drivers}. + Drivers#Supported Databases} {supported database drivers}. The connection in the snippet will be the \e{default} connection, because we don't pass the second argument to @@ -176,11 +176,11 @@ \page sql-sqlstatements.html \title Executing SQL Statements \ingroup qt-sql - + \previouspage Connecting to Databases \contentspage SQL Programming \nextpage Using the SQL Model Classes - + The QSqlQuery class provides an interface for executing SQL statements and navigating through the result set of a query. @@ -328,7 +328,7 @@ \page sql-model.html \title Using the SQL Model Classes \ingroup qt-sql - + \previouspage Executing SQL Statements \contentspage SQL Programming \nextpage Presenting Data in a Table View @@ -475,7 +475,7 @@ \page sql-presenting.html \title Presenting Data in a Table View \ingroup qt-sql - + \previouspage Using the SQL Model Classes \contentspage SQL Programming \nextpage Creating Data-Aware Forms @@ -580,7 +580,7 @@ \page sql-forms.html \title Creating Data-Aware Forms \ingroup qt-sql - + \previouspage Presenting Data in a Table View \contentspage SQL Programming diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index 04ba450d46..a529d8c32d 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -166,7 +166,7 @@ class QMYSQLResultPrivate : public QObject { Q_OBJECT public: - QMYSQLResultPrivate(const QMYSQLDriver* dp, const QMYSQLResult* d) : driver(dp), result(0), q(d), + QMYSQLResultPrivate(const QMYSQLDriver* dp, const QMYSQLResult* d) : driver(dp), result(0), q(d), rowsAffected(0), hasBlobs(false) #if MYSQL_VERSION_ID >= 40108 , stmt(0), meta(0), inBinds(0), outBinds(0) @@ -788,7 +788,7 @@ bool QMYSQLResult::nextResult() { if(!d->driver) return false; -#if MYSQL_VERSION_ID >= 40100 +#if MYSQL_VERSION_ID >= 40100 setAt(-1); setActive(false); @@ -796,7 +796,7 @@ bool QMYSQLResult::nextResult() mysql_free_result(d->result); d->result = 0; setSelect(false); - + for (int i = 0; i < d->fields.count(); ++i) delete[] d->fields[i].outField; d->fields.clear(); @@ -1374,14 +1374,14 @@ QStringList QMYSQLDriver::tables(QSql::TableType type) const if(type & QSql::Tables) { QString sql = QLatin1String("select table_name from information_schema.tables where table_schema = '") + QLatin1String(d->mysql->db) + QLatin1String("' and table_type = 'BASE TABLE'"); q.exec(sql); - + while(q.next()) tl.append(q.value(0).toString()); } if(type & QSql::Views) { QString sql = QLatin1String("select table_name from information_schema.tables where table_schema = '") + QLatin1String(d->mysql->db) + QLatin1String("' and table_type = 'VIEW'"); q.exec(sql); - + while(q.next()) tl.append(q.value(0).toString()); } diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index 8a6161d816..b0950110e0 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -100,7 +100,7 @@ enum { QOCIEncoding = 2000 }; // AL16UTF16 // Always set the OCI_ATTR_CHARSET_FORM to SQLCS_NCHAR is safe // because Oracle server will deal with the implicit Conversion // Between CHAR and NCHAR. -// see: http://download.oracle.com/docs/cd/A91202_01/901_doc/appdev.901/a89857/oci05bnd.htm#422705 +// see: http://download.oracle.com/docs/cd/A91202_01/901_doc/appdev.901/a89857/oci05bnd.htm#422705 static const ub1 qOraCharsetForm = SQLCS_NCHAR; #endif @@ -2211,7 +2211,7 @@ bool QOCIDriver::open(const QString & db, // Connect without tnsnames.ora if a hostname is given QString connectionString = db; if (!hostname.isEmpty()) - connectionString = + connectionString = QString::fromLatin1("(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(Host=%1)(Port=%2))" "(CONNECT_DATA=(SID=%3)))").arg(hostname).arg((port > -1 ? port : 1521)).arg(db); diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 483c640b43..1af5d6274e 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -68,7 +68,7 @@ Q_DECLARE_METATYPE(sqlite3_stmt*) QT_BEGIN_NAMESPACE -static QString _q_escapeIdentifier(const QString &identifier) +static QString _q_escapeIdentifier(const QString &identifier) { QString res = identifier; if(!identifier.isEmpty() && identifier.left(1) != QString(QLatin1Char('"')) && identifier.right(1) != QString(QLatin1Char('"')) ) { diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp index a85a120973..1a16b85470 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.cpp +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.cpp @@ -195,7 +195,7 @@ void QSQLite2ResultPrivate::init(const char **cnames, int numCols) for (int i = 0; i < numCols; ++i) { const char* lastDot = strrchr(cnames[i], '.'); const char* fieldName = lastDot ? lastDot + 1 : cnames[i]; - + //remove quotations around the field name if any QString fieldStr = QString::fromLatin1(fieldName); QLatin1Char quote('\"'); @@ -244,7 +244,7 @@ bool QSQLite2ResultPrivate::fetchNext(QSqlCachedResult::ValueCache &values, int firstRow.clear(); firstRow.resize(colNum); } - + switch(res) { case SQLITE_ROW: // check to see if should fill out columns diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp index cac2f1dad4..5b103f1bff 100644 --- a/src/sql/kernel/qsqlquery.cpp +++ b/src/sql/kernel/qsqlquery.cpp @@ -325,7 +325,7 @@ bool QSqlQuery::isNull(int field) const } /*! - + Executes the SQL in \a query. Returns true and sets the query state to \l{isActive()}{active} if the query was successful; otherwise returns false. The \a query string must use syntax appropriate for @@ -579,7 +579,7 @@ bool QSqlQuery::seek(int index, bool relative) } /*! - + Retrieves the next record in the result, if available, and positions the query on the retrieved record. Note that the result must be in the \l{isActive()}{active} state and isSelect() must return true @@ -783,7 +783,7 @@ bool QSqlQuery::isValid() const } /*! - + Returns true if the query is \e{active}. An active QSqlQuery is one that has been \l{QSqlQuery::exec()} {exec()'d} successfully but not yet finished with. When you are finished with an active query, you @@ -1143,7 +1143,7 @@ QString QSqlQuery::executedQuery() const behavior is undefined. For MySQL databases the row's auto-increment field will be returned. - + \note For this function to work in PSQL, the table table must contain OIDs, which may not have been created by default. Check the \c default_with_oids configuration variable to be sure. @@ -1199,7 +1199,7 @@ QSql::NumericalPrecisionPolicy QSqlQuery::numericalPrecisionPolicy() const call this function, but it may be helpful in order to free resources such as locks or cursors if you intend to re-use the query at a later time. - + Sets the query to inactive. Bound values retain their values. \sa prepare(), exec(), isActive() @@ -1216,7 +1216,7 @@ void QSqlQuery::finish() /*! \since 4.4 - + Discards the current result set and navigates to the next if available. Some databases are capable of returning multiple result sets for @@ -1224,7 +1224,7 @@ void QSqlQuery::finish() multiple statements). If multiple result sets are available after executing a query this function can be used to navigate to the next result set(s). - + If a new result set is available this function will return true. The query will be repositioned on an \e invalid record in the new result set and must be navigated to a valid record before data diff --git a/src/sql/models/qsqlquerymodel_p.h b/src/sql/models/qsqlquerymodel_p.h index a79b62cda1..9d7b71faec 100644 --- a/src/sql/models/qsqlquerymodel_p.h +++ b/src/sql/models/qsqlquerymodel_p.h @@ -69,7 +69,7 @@ class QSqlQueryModelPrivate: public QAbstractItemModelPrivate public: QSqlQueryModelPrivate() : atEnd(false), nestedResetLevel(0) {} ~QSqlQueryModelPrivate(); - + void prefetch(int); void initColOffsets(int size); int columnInQuery(int modelColumn) const; diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 7cc7de2347..fb45468d2e 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -241,7 +241,7 @@ bool QRelation::isValid() -QRelatedTableModel::QRelatedTableModel(QRelation *rel, QObject *parent, QSqlDatabase db) : +QRelatedTableModel::QRelatedTableModel(QRelation *rel, QObject *parent, QSqlDatabase db) : QSqlTableModel(parent, db), firstSelect(true), relation(rel) { } diff --git a/src/testlib/qsignalspy.qdoc b/src/testlib/qsignalspy.qdoc index e9f2cac531..77dcd99741 100644 --- a/src/testlib/qsignalspy.qdoc +++ b/src/testlib/qsignalspy.qdoc @@ -25,7 +25,7 @@ ** ****************************************************************************/ -/*! +/*! \class QSignalSpy \inmodule QtTest diff --git a/src/testlib/qtestevent.qdoc b/src/testlib/qtestevent.qdoc index bef4d1553a..0e7a7e7ac2 100644 --- a/src/testlib/qtestevent.qdoc +++ b/src/testlib/qtestevent.qdoc @@ -25,7 +25,7 @@ ** ****************************************************************************/ -/*! +/*! \class QTestEventList \inmodule QtTest diff --git a/src/tools/moc/utils.h b/src/tools/moc/utils.h index a2c65e4b2a..0dfd0999f4 100644 --- a/src/tools/moc/utils.h +++ b/src/tools/moc/utils.h @@ -112,10 +112,10 @@ inline const char *skipQuote(const char *data) } ++data; } - + if (*data) //Skip last quote ++data; - return data; + return data; } QT_END_NAMESPACE diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index b6d5965dae..c0ed7401bc 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -216,7 +216,7 @@ int runRcc(int argc, char *argv[]) } QFile errorDevice; errorDevice.open(stderr, QIODevice::WriteOnly|QIODevice::Text); - + if (library.verbose()) errorDevice.write("Qt resource compiler\n"); @@ -251,7 +251,7 @@ int runRcc(int argc, char *argv[]) out.write("\n"); } return 0; - } + } return library.output(out, errorDevice) ? 0 : 1; } diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h index cd9828fc35..7e16fe038d 100644 --- a/src/tools/rcc/rcc.h +++ b/src/tools/rcc/rcc.h @@ -95,10 +95,10 @@ public: void setResourceRoot(const QString &root) { m_resourceRoot = root; } QString resourceRoot() const { return m_resourceRoot; } - + void setUseNameSpace(bool v) { m_useNameSpace = v; } bool useNameSpace() const { return m_useNameSpace; } - + QStringList failedResources() const { return m_failedResources; } private: diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index 44049409de..c473566e3a 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -88,8 +88,8 @@ WriteIncludes::WriteIncludes(Uic *uic) // and create a re-mapping of the old header "qclass.h" to it. Do not do this // for the "Phonon::Someclass" classes, however. const QString namespaceDelimiter = QLatin1String("::"); - const ClassInfoEntry *classLibEnd = qclass_lib_map + sizeof(qclass_lib_map)/sizeof(ClassInfoEntry); - for(const ClassInfoEntry *it = qclass_lib_map; it < classLibEnd; ++it) { + const ClassInfoEntry *classLibEnd = qclass_lib_map + sizeof(qclass_lib_map)/sizeof(ClassInfoEntry); + for (const ClassInfoEntry *it = qclass_lib_map; it < classLibEnd; ++it) { const QString klass = QLatin1String(it->klass); const QString module = QLatin1String(it->module); QLatin1String header = QLatin1String(it->header); @@ -173,7 +173,7 @@ void WriteIncludes::insertIncludeForClass(const QString &className, QString head if (!header.isEmpty()) break; - // Known class + // Known class const StringMap::const_iterator it = m_classToHeader.constFind(className); if (it != m_classToHeader.constEnd()) { header = it.value(); diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp index 9fc1a649ef..5c99ffb208 100644 --- a/src/tools/uic/driver.cpp +++ b/src/tools/uic/driver.cpp @@ -304,7 +304,7 @@ bool Driver::uic(const QString &fileName, QTextStream *out) m_output = out; } else { #ifdef Q_OS_WIN - // As one might also redirect the output to a file on win, + // As one might also redirect the output to a file on win, // we should not create the textstream with QFile::Text flag. // The redirected file is opened in TextMode and this will // result in broken line endings as writing will replace \n again. diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index d748e5482f..d5353c26d5 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -64,7 +64,7 @@ static QList childWidgets(const QWidget *widget) QList widgets; for (int i = 0; i < list.size(); ++i) { QWidget *w = qobject_cast(list.at(i)); - if (w && !w->isWindow() + if (w && !w->isWindow() && !qobject_cast(w) #if !defined(QT_NO_MENU) && !qobject_cast(w) diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp index de86e2ed7c..b563066053 100644 --- a/src/widgets/dialogs/qprogressdialog.cpp +++ b/src/widgets/dialogs/qprogressdialog.cpp @@ -297,7 +297,7 @@ QProgressDialog::QProgressDialog(QWidget *parent, Qt::WindowFlags f) The \a labelText is the text used to remind the user what is progressing. - The \a cancelButtonText is the text to display on the cancel button. If + The \a cancelButtonText is the text to display on the cancel button. If QString() is passed then no cancel button is shown. The \a minimum and \a maximum is the number of steps in the operation for @@ -438,7 +438,7 @@ void QProgressDialog::setCancelButton(QPushButton *cancelButton) /*! Sets the cancel button's text to \a cancelButtonText. If the text - is set to QString() then it will cause the cancel button to be + is set to QString() then it will cause the cancel button to be hidden and deleted. \sa setCancelButton() diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index c90cf732d0..95bbe1ee55 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -74,7 +74,7 @@ Q_DECLARE_METATYPE(QMargins) QT_BEGIN_NAMESPACE //DWM related -typedef struct { //MARGINS +typedef struct { //MARGINS int cxLeftWidth; // width of left border that retains its size int cxRightWidth; // width of right border that retains its size int cyTopHeight; // height of top border that retains its size @@ -695,14 +695,14 @@ bool QVistaHelper::drawTitleText(QPainter *painter, const QString &text, const Q dib.bmiHeader.biPlanes = 1; dib.bmiHeader.biBitCount = 32; dib.bmiHeader.biCompression = BI_RGB; - + bmp = CreateDIBSection(hdc, &dib, DIB_RGB_COLORS, NULL, NULL, 0); // Set up the DC HFONT hCaptionFont = getCaptionFont(hTheme); HBITMAP hOldBmp = (HBITMAP)SelectObject(dcMem, (HGDIOBJ) bmp); HFONT hOldFont = (HFONT)SelectObject(dcMem, (HGDIOBJ) hCaptionFont); - + // Draw the text! WIZ_DTTOPTS dto; dto.dwSize = sizeof(WIZ_DTTOPTS); @@ -711,7 +711,7 @@ bool QVistaHelper::drawTitleText(QPainter *painter, const QString &text, const Q dto.dwFlags = WIZ_DTT_COMPOSITED|WIZ_DTT_GLOWSIZE; dto.iGlowSize = glowSize(); - + pDrawThemeTextEx(hTheme, dcMem, 0, 0, (LPCWSTR)text.utf16(), -1, uFormat, &rctext, &dto ); BitBlt(hdc, rect.left(), rect.top(), rect.width(), rect.height(), dcMem, 0, 0, SRCCOPY); SelectObject(dcMem, (HGDIOBJ) hOldBmp); @@ -743,7 +743,7 @@ bool QVistaHelper::drawBlackRect(const QRect &rect, HDC hdc) dib.bmiHeader.biPlanes = 1; dib.bmiHeader.biBitCount = 32; dib.bmiHeader.biCompression = BI_RGB; - + bmp = CreateDIBSection(hdc, &dib, DIB_RGB_COLORS, NULL, NULL, 0); HBITMAP hOldBmp = (HBITMAP)SelectObject(dcMem, (HGDIOBJ) bmp); diff --git a/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp index b5d9708f99..0b6ae83ffb 100644 --- a/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp +++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp @@ -57,7 +57,7 @@ mapper->addMapping(ageSpinBox, 1); //! [2] -QDataWidgetMapper *mapper = new QDataWidgetMapper(); +QDataWidgetMapper *mapper = new QDataWidgetMapper(); connect(myTableView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), mapper, SLOT(setCurrentModelIndex(QModelIndex))); //! [2] diff --git a/src/widgets/doc/snippets/customviewstyle.cpp b/src/widgets/doc/snippets/customviewstyle.cpp index 6bb022574d..cdb4ed1d77 100644 --- a/src/widgets/doc/snippets/customviewstyle.cpp +++ b/src/widgets/doc/snippets/customviewstyle.cpp @@ -61,7 +61,7 @@ void CustomViewStyle::drawPrimitive(PrimitiveElement element, const QStyleOption painter->restore(); break; - } + } default: QProxyStyle::drawPrimitive(element, option, painter, widget); } diff --git a/src/widgets/doc/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp index 15cc53ce2d..37f02c7f13 100644 --- a/src/widgets/doc/snippets/javastyle.cpp +++ b/src/widgets/doc/snippets/javastyle.cpp @@ -103,7 +103,7 @@ QPalette JavaStyle::standardPalette() const palette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(184, 207, 229)); palette.setBrush(QPalette::Inactive, QPalette::HighlightedText, Qt::black); - + palette.setBrush(QPalette::Disabled, QPalette::Button, QColor(238, 238, 238)); palette.setBrush(QPalette::Disabled, QPalette::WindowText, @@ -968,7 +968,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option, painter->setBrush(QColor(200, 221, 242)); painter->drawPath(outerPath); painter->setPen(QColor(200, 221, 242)); - painter->drawRect(QRect(bottomLeft + adjustTabPoint( + painter->drawRect(QRect(bottomLeft + adjustTabPoint( QPoint(2, -3), tab->shape), bottomRight + adjustTabPoint( QPoint(-2, 0), tab->shape))); @@ -976,7 +976,7 @@ void JavaStyle::drawControl(ControlElement control, const QStyleOption *option, painter->setBrush(Qt::NoBrush); painter->drawPath(whitePath); - if (option->state & State_HasFocus) { + if (option->state & State_HasFocus) { painter->setPen(option->palette.color(QPalette::Mid)); painter->drawPath(innerPath); } @@ -1699,7 +1699,7 @@ void JavaStyle::drawComplexControl(ComplexControl control, menuOption.rect = menuRect; QStyleOptionToolButton label = *button; - int fw = 5; + int fw = 5; drawControl(CE_ToolButtonLabel, &label, painter, widget); if (button->subControls & SC_ToolButtonMenu) { @@ -1713,7 +1713,7 @@ void JavaStyle::drawComplexControl(ComplexControl control, drawPrimitive(PE_FrameFocusRect, &focusOption, painter, widget); } - + break; } case CC_ComboBox: { @@ -2113,7 +2113,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element, painter->drawLine(center, QPoint(center.x(), option->rect.bottom())); } - + if (option->state & State_Children) if (option->state & State_Open) painter->drawPixmap(pixmapRect.topLeft(), closedPixmap); @@ -2198,7 +2198,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element, painter->drawPoint(center.x() + 1 + add, center.y() + 1 + add); break; } - case PE_FrameDockWidget: { + case PE_FrameDockWidget: { drawPrimitive(PE_FrameWindow, option, painter, widget); break; } @@ -2226,7 +2226,7 @@ void JavaStyle::drawPrimitive(PrimitiveElement element, painter->drawPoint(offset + xySwitch(QPoint(add + 8, i), horizontal)); } - + break; } case PE_IndicatorToolBarSeparator: { @@ -2591,7 +2591,7 @@ int JavaStyle::styleHint(StyleHint hint, const QStyleOption *option, break; } case QStyle::SH_Menu_Scrollable: - ret = 1; + ret = 1; break; default: ret = QCommonStyle::styleHint(hint, option, widget, returnData); @@ -2719,7 +2719,7 @@ QSize JavaStyle::sizeFromContents(ContentsType type, int height = 0; if (!menuItem->icon.isNull()) { - width += 20; + width += 20; height += 20; } if (!menuItem->text.isEmpty()) { diff --git a/src/widgets/doc/snippets/layouts/layouts.cpp b/src/widgets/doc/snippets/layouts/layouts.cpp index c41f370070..9ec2349615 100644 --- a/src/widgets/doc/snippets/layouts/layouts.cpp +++ b/src/widgets/doc/snippets/layouts/layouts.cpp @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) window->show(); //! [5] } - + { //! [6] QWidget *window = new QWidget; @@ -101,7 +101,7 @@ int main(int argc, char *argv[]) window->show(); //! [11] } - + { //! [12] QWidget *window = new QWidget; @@ -158,7 +158,7 @@ int main(int argc, char *argv[]) window->setWindowTitle("QFormLayout"); //! [23] window->show(); -//! [23] +//! [23] } { diff --git a/src/widgets/doc/snippets/mainwindowsnippet.cpp b/src/widgets/doc/snippets/mainwindowsnippet.cpp index 1ba58ca0e7..a9a9012d46 100644 --- a/src/widgets/doc/snippets/mainwindowsnippet.cpp +++ b/src/widgets/doc/snippets/mainwindowsnippet.cpp @@ -55,10 +55,10 @@ void MainWindow::createMenus() //setMenuWidget(new QPushButton("Hello")); QMenu *menu = new QMenu("File"); menu->addAction("Save &As"); - + QMenuBar *bar = new QMenuBar; bar->addMenu(menu); - + setMenuWidget(new QWidget()); } @@ -84,9 +84,9 @@ void MainWindow::createDockWidgets() //! [0] QDockWidget *dockWidget = new QDockWidget(tr("Dock Widget"), this); - dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | + dockWidget->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); dockWidget->setWidget(dockWidgetContents); - addDockWidget(Qt::LeftDockWidgetArea, dockWidget); + addDockWidget(Qt::LeftDockWidgetArea, dockWidget); //! [0] } diff --git a/src/widgets/doc/snippets/mdiareasnippets.cpp b/src/widgets/doc/snippets/mdiareasnippets.cpp index 51555f8984..42902b4cd7 100644 --- a/src/widgets/doc/snippets/mdiareasnippets.cpp +++ b/src/widgets/doc/snippets/mdiareasnippets.cpp @@ -57,7 +57,7 @@ void addingSubWindowsExample() { QWidget *internalWidget1 = new QWidget; QWidget *internalWidget2 = new QWidget; - + //! [1] QMdiArea mdiArea; QMdiSubWindow *subWindow1 = new QMdiSubWindow; diff --git a/src/widgets/doc/snippets/myscrollarea.cpp b/src/widgets/doc/snippets/myscrollarea.cpp index 48434952c3..675acf89ef 100644 --- a/src/widgets/doc/snippets/myscrollarea.cpp +++ b/src/widgets/doc/snippets/myscrollarea.cpp @@ -121,7 +121,7 @@ int main(int argv, char **args) MyScrollArea area(&label); area.resize(300, 300); area.show(); - + area.setWidget(&label); return app.exec(); diff --git a/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp index d9f9853d9c..85b5baf56e 100644 --- a/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp +++ b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp @@ -117,7 +117,7 @@ void MainWindow::averageItems() foreach (item, selected) { bool ok; double value = item->text().toDouble(&ok); - + if (ok && !item->text().isEmpty()) { total += value; number++; diff --git a/src/widgets/doc/snippets/simplemodel-use/main.cpp b/src/widgets/doc/snippets/simplemodel-use/main.cpp index ed435f9897..d291a02b6b 100644 --- a/src/widgets/doc/snippets/simplemodel-use/main.cpp +++ b/src/widgets/doc/snippets/simplemodel-use/main.cpp @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) title->setBackgroundRole(QPalette::Base); title->setMargin(8); layout->addWidget(title); - + //! [0] QFileSystemModel *model = new QFileSystemModel; QModelIndex parentIndex = model->index(QDir::currentPath()); diff --git a/src/widgets/doc/snippets/stringlistmodel/model.cpp b/src/widgets/doc/snippets/stringlistmodel/model.cpp index 3bf91ec326..b1fa2abdf0 100644 --- a/src/widgets/doc/snippets/stringlistmodel/model.cpp +++ b/src/widgets/doc/snippets/stringlistmodel/model.cpp @@ -60,7 +60,7 @@ int StringListModel::rowCount(const QModelIndex &parent) const #ifdef 0 -// This represents a read-only version of data(), an early stage in the +// This represents a read-only version of data(), an early stage in the // development of the example leading to an editable StringListModel. /*! @@ -103,7 +103,7 @@ QVariant StringListModel::data(const QModelIndex &index, int role) const if (index.row() >= stringList.size()) return QVariant(); - + if (role == Qt::DisplayRole || role == Qt::EditRole) return stringList.at(index.row()); else diff --git a/src/widgets/doc/snippets/timeline/main.cpp b/src/widgets/doc/snippets/timeline/main.cpp index eb2e8a2c70..9e4d218a88 100644 --- a/src/widgets/doc/snippets/timeline/main.cpp +++ b/src/widgets/doc/snippets/timeline/main.cpp @@ -47,17 +47,17 @@ int main(int argv, char *args[]) //! [0] QGraphicsItem *ball = new QGraphicsEllipseItem(0, 0, 20, 20); - + QTimeLine *timer = new QTimeLine(5000); timer->setFrameRange(0, 100); - + QGraphicsItemAnimation *animation = new QGraphicsItemAnimation; animation->setItem(ball); animation->setTimeLine(timer); - for (int i = 0; i < 200; ++i) + for (int i = 0; i < 200; ++i) animation->setPosAt(i / 200.0, QPointF(i, i)); - + QGraphicsScene *scene = new QGraphicsScene(); scene->setSceneRect(0, 0, 250, 250); scene->addItem(ball); diff --git a/src/widgets/doc/src/model-view-programming.qdoc b/src/widgets/doc/src/model-view-programming.qdoc index a1c6a29066..6bcd0943a1 100644 --- a/src/widgets/doc/src/model-view-programming.qdoc +++ b/src/widgets/doc/src/model-view-programming.qdoc @@ -280,7 +280,7 @@ In the above example, we neglected to mention how to handle selections of items. This subject is covered in more detail in the section about - \l{Handling Selections in Item Views}. + \l{Handling Selections in Item Views}. \section1 Model classes diff --git a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc index 5cb7775c32..427d5a24d6 100644 --- a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc @@ -34,7 +34,7 @@ \keyword keyboard focus Qt's widgets handle keyboard focus in the ways that have become - customary in GUIs. + customary in GUIs. The basic issue is that the user's key strokes can be directed at any of several windows on the screen, and any of several widgets inside @@ -47,7 +47,7 @@ \section1 Focus Motion The customs which have evolved for directing keyboard focus to a - particular widget are these: + particular widget are these: \list 1 @@ -89,7 +89,7 @@ For example, in a data entry dialog, there might be a field that is only necessary in one per cent of all cases. In such a dialog, \uicontrol Tab could skip this field, and the dialog could use one of - these mechanisms: + these mechanisms: \list 1 diff --git a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc index b658fc809c..f74da2fa0a 100644 --- a/src/widgets/doc/src/widgets-and-layouts/layout.qdoc +++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc @@ -70,7 +70,7 @@ \endlist \section1 Qt's Layout Classes - + Qt's layout classes were designed for hand-written C++ code, allowing measurements to be specified in pixels for simplicity, so they are easy to understand and use. The code generated for forms created using Qt Designer also @@ -136,11 +136,11 @@ the fifth argument to QGridLayout::addWidget(). QFormLayout will add two widgets on a row, commonly a QLabel and a QLineEdit - to create forms. Adding a QLabel and a QLineEdit on the same row will set - the QLineEdit as the QLabel's buddy. The following code will use the + to create forms. Adding a QLabel and a QLineEdit on the same row will set + the QLineEdit as the QLabel's buddy. The following code will use the QFormLayout to place three \l{QPushButton}{QPushButtons} and a corresponding - QLineEdit on a row. - + QLineEdit on a row. + \snippet layouts/layouts.cpp 18 \snippet layouts/layouts.cpp 19 \snippet layouts/layouts.cpp 20 @@ -327,7 +327,7 @@ Then we define two functions that iterate over the layout: \c{itemAt()} and \c{takeAt()}. These functions are used internally by the layout system to handle deletion of widgets. They are also available for application - programmers. + programmers. \c{itemAt()} returns the item at the given index. \c{takeAt()} removes the item at the given index, and returns it. In this case we use the list index @@ -348,7 +348,7 @@ \snippet code/doc_src_layout.cpp 4 The layout takes over responsibility of the items added. Since QLayoutItem - does not inherit QObject, we must delete the items manually. In the + does not inherit QObject, we must delete the items manually. In the destructor, we remove each item from the list using \c{takeAt()}, and then delete it. diff --git a/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc b/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc index 5aae7fb02b..1f1d8154da 100644 --- a/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/src/widgets/doc/src/windows-and-dialogs/dialogs.qdoc @@ -29,7 +29,7 @@ \group standard-dialogs \ingroup qt-gui-concepts \title Standard Dialogs - \brief A list of Qt classes for implementing standard dialogs. + \brief A list of Qt classes for implementing standard dialogs. */ /*! @@ -37,7 +37,7 @@ \title Dialog Windows \ingroup qt-gui-concepts \brief An overview over dialog windows. - + \previouspage Application Main Window \contentspage Application Windows and Dialogs \nextpage Desktop Integration diff --git a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc index 1d7d9d1b4c..9315acb85f 100644 --- a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc +++ b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc @@ -49,7 +49,7 @@ be listed in the desktop's task bar. This is usually only wanted for one window in the application, the \e{primary window}. - In addition, a QWidget that has a parent can become a window by setting the + In addition, a QWidget that has a parent can become a window by setting the Qt::Window flag. Depending on the window management system such \e{secondary windows} are usually stacked on top of their respective parent window, and not have a task bar entry of their own. diff --git a/src/widgets/graphicsview/qgraphicslayout_p.cpp b/src/widgets/graphicsview/qgraphicslayout_p.cpp index 8e3d4a62f8..b8955aa23f 100644 --- a/src/widgets/graphicsview/qgraphicslayout_p.cpp +++ b/src/widgets/graphicsview/qgraphicslayout_p.cpp @@ -187,7 +187,7 @@ void QGraphicsLayoutPrivate::activateRecursive(QGraphicsLayoutItem *item) layout->invalidate(); // ### LOOKS SUSPICIOUSLY WRONG!!??? } } - + for (int i = layout->count() - 1; i >= 0; --i) { QGraphicsLayoutItem *childItem = layout->itemAt(i); if (childItem) diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index c3661f5c50..3fed14cd4f 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -248,7 +248,7 @@ void QBoxLayoutPrivate::effectiveMargins(int *left, int *top, int *right, int *b if (right) r = qMax(r, wr.right() - lir.right()); } - } + } } #endif if (left) @@ -509,7 +509,7 @@ void QBoxLayoutPrivate::calcHfw(int w) \list \li setContentsMargins() sets the width of the outer border on - each side of the widget. This is the width of the reserved space + each side of the widget. This is the width of the reserved space along each of the QBoxLayout's four sides. \li setSpacing() sets the width between neighboring boxes. (You can use addSpacing() to get more space at a particular spot.) @@ -595,7 +595,7 @@ int QBoxLayout::spacing() const /*! Reimplements QLayout::setSpacing(). Sets the spacing - property to \a spacing. + property to \a spacing. \sa QLayout::setSpacing(), spacing() */ diff --git a/src/widgets/kernel/qdesktopwidget.qdoc b/src/widgets/kernel/qdesktopwidget.qdoc index 15ddd3b32f..789a812afb 100644 --- a/src/widgets/kernel/qdesktopwidget.qdoc +++ b/src/widgets/kernel/qdesktopwidget.qdoc @@ -120,9 +120,9 @@ /*! \fn int QDesktopWidget::numScreens() const - + Returns the number of available screens. - + \obsolete This function is deprecated. Use screenCount instead. @@ -239,7 +239,7 @@ \brief the number of screens currently available on the system. \since 4.6 - + \sa screenCountChanged() */ @@ -265,6 +265,6 @@ \since 4.6 This signal is emitted when the number of screens changes to \a newCount. - + \sa screenCount */ diff --git a/src/widgets/kernel/qgesture.cpp b/src/widgets/kernel/qgesture.cpp index 24ae437b48..2767bd9924 100644 --- a/src/widgets/kernel/qgesture.cpp +++ b/src/widgets/kernel/qgesture.cpp @@ -367,7 +367,7 @@ void QPanGesture::setAcceleration(qreal value) /*! \enum QPinchGesture::ChangeFlag - + This enum describes the changes that can occur to the properties of the gesture object. diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp index 493a04d2ba..c32eddd148 100644 --- a/src/widgets/kernel/qlayout.cpp +++ b/src/widgets/kernel/qlayout.cpp @@ -1270,7 +1270,7 @@ QRect QLayout::alignmentRect(const QRect &r) const Removes the widget \a widget from the layout. After this call, it is the caller's responsibility to give the widget a reasonable geometry or to put the widget back into a layout. - + \b{Note:} The ownership of \a widget remains the same as when it was added. diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp index 31276d015d..6524d8f2b8 100644 --- a/src/widgets/kernel/qlayoutitem.cpp +++ b/src/widgets/kernel/qlayoutitem.cpp @@ -150,7 +150,7 @@ QSizePolicy::operator QVariant() const \brief The QWidgetItem class is a layout item that represents a widget. \inmodule QtWidgets - + Normally, you don't need to use this class directly. Qt's built-in layout managers provide the following functions for manipulating widgets in layouts: @@ -446,20 +446,20 @@ void QWidgetItem::setGeometry(const QRect &rect) QRect r = !wid->testAttribute(Qt::WA_LayoutUsesWidgetRect) ? fromLayoutItemRect(wid->d_func(), rect) : rect; - const QSize widgetRectSurplus = r.size() - rect.size(); - - /* - For historical reasons, this code is done using widget rect - coordinates, not layout item rect coordinates. However, - QWidgetItem's sizeHint(), maximumSize(), and heightForWidth() - all work in terms of layout item rect coordinates, so we have to - add or subtract widgetRectSurplus here and there. The code could - be much simpler if we did everything using layout item rect - coordinates and did the conversion right before the call to - QWidget::setGeometry(). - */ - - QSize s = r.size().boundedTo(maximumSize() + widgetRectSurplus); + const QSize widgetRectSurplus = r.size() - rect.size(); + + /* + For historical reasons, this code is done using widget rect + coordinates, not layout item rect coordinates. However, + QWidgetItem's sizeHint(), maximumSize(), and heightForWidth() + all work in terms of layout item rect coordinates, so we have to + add or subtract widgetRectSurplus here and there. The code could + be much simpler if we did everything using layout item rect + coordinates and did the conversion right before the call to + QWidget::setGeometry(). + */ + + QSize s = r.size().boundedTo(maximumSize() + widgetRectSurplus); int x = r.x(); int y = r.y(); if (align & (Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask)) { @@ -474,8 +474,8 @@ void QWidgetItem::setGeometry(const QRect &rect) s.setWidth(qMin(s.width(), pref.width())); if (align & Qt::AlignVertical_Mask) { if (hasHeightForWidth()) - s.setHeight(qMin(s.height(), - heightForWidth(s.width() - widgetRectSurplus.width()) + s.setHeight(qMin(s.height(), + heightForWidth(s.width() - widgetRectSurplus.width()) + widgetRectSurplus.height())); else s.setHeight(qMin(s.height(), pref.height())); diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 7840cddd5d..39cbe1da3f 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -678,7 +678,7 @@ void QWidget::setAutoFillBackground(bool enabled) (to move the keyboard focus), and passes on most of the other events to one of the more specialized handlers above. - Events and the mechanism used to deliver them are covered in + Events and the mechanism used to deliver them are covered in \l{The Event System}. \section1 Groups of Functions and Properties @@ -9284,7 +9284,7 @@ int QWidget::heightForWidth(int w) const \since 5.0 Returns true if the widget's preferred height depends on its width; otherwise returns false. -*/ +*/ bool QWidget::hasHeightForWidth() const { Q_D(const QWidget); diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index b65ce29b84..43a49e52f9 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -1033,6 +1033,6 @@ void qt_qpa_set_cursor(QWidget *w, bool force) unsetCursor(nativeParent); } } -#endif //QT_NO_CURSOR +#endif //QT_NO_CURSOR QT_END_NAMESPACE diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index 3956445bc8..93c0898197 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -59,13 +59,13 @@ class Q_WIDGETS_EXPORT QWidgetAction : public QAction public: explicit QWidgetAction(QObject *parent); virtual ~QWidgetAction(); - + void setDefaultWidget(QWidget *w); QWidget *defaultWidget() const; QWidget *requestWidget(QWidget *parent); void releaseWidget(QWidget *widget); - + protected: virtual bool event(QEvent *); virtual bool eventFilter(QObject *, QEvent *); diff --git a/src/widgets/kernel/qwidgetaction_p.h b/src/widgets/kernel/qwidgetaction_p.h index a95fe07534..2fc5dcd86c 100644 --- a/src/widgets/kernel/qwidgetaction_p.h +++ b/src/widgets/kernel/qwidgetaction_p.h @@ -66,7 +66,7 @@ public: QList createdWidgets; uint defaultWidgetInUse : 1; uint autoCreated : 1; // created by QToolBar::addWidget and the like - + inline void _q_widgetDestroyed(QObject *o) { createdWidgets.removeAll(static_cast(o)); } diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp index e574dd7406..1c2a4b373e 100644 --- a/src/widgets/statemachine/qguistatemachine.cpp +++ b/src/widgets/statemachine/qguistatemachine.cpp @@ -138,7 +138,7 @@ static QEvent *cloneEvent(QEvent *e) return new QEvent(*e); case QEvent::DeferredDelete: return new QEvent(*e); -#ifndef QT_NO_DRAGANDDROP +#ifndef QT_NO_DRAGANDDROP case QEvent::DragEnter: return new QDragEnterEvent(*static_cast(e)); case QEvent::DragMove: diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 269b887909..e2c5bab47f 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -3003,7 +3003,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, case SE_ToolBarHandle: if (const QStyleOptionToolBar *tbopt = qstyleoption_cast(opt)) { if (tbopt->features & QStyleOptionToolBar::Movable) { - ///we need to access the widget here because the style option doesn't + ///we need to access the widget here because the style option doesn't //have all the information we need (ie. the layout's margin) const QToolBar *tb = qobject_cast(widget); const int margin = tb && tb->layout() ? tb->layout()->margin() : 2; diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h index d11f57dac0..01eca4664f 100644 --- a/src/widgets/styles/qcommonstyle.h +++ b/src/widgets/styles/qcommonstyle.h @@ -51,7 +51,7 @@ class QCommonStylePrivate; class Q_WIDGETS_EXPORT QCommonStyle: public QStyle { Q_OBJECT - + public: QCommonStyle(); ~QCommonStyle(); diff --git a/src/widgets/styles/qdrawutil.cpp b/src/widgets/styles/qdrawutil.cpp index 0f73a16bcb..1c154650c8 100644 --- a/src/widgets/styles/qdrawutil.cpp +++ b/src/widgets/styles/qdrawutil.cpp @@ -748,10 +748,10 @@ void qDrawPlainRect(QPainter *p, const QRect &r, const QColor &c, \since 4.6 \inmodule QtWidgets - + \brief The QTileRules class provides the rules used to draw a pixmap or image split into nine segments. - + Spliiting is similar to \l{http://www.w3.org/TR/css3-background/}{CSS3 border-images}. \sa Qt::TileRule, QMargins diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index 9ebab8d52d..8c9fc93288 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -2121,7 +2121,7 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom label.state = bflags; GtkWidget *gtkButton = d->gtkWidget("GtkToolButton.GtkButton"); QPalette pal = toolbutton->palette; - if (option->state & State_Enabled && + if (option->state & State_Enabled && option->state & State_MouseOver && !(widget && widget->testAttribute(Qt::WA_SetPalette))) { GdkColor gdkText = d->gtk_widget_get_style(gtkButton)->fg[GTK_STATE_PRELIGHT]; QColor textColor = QColor(gdkText.red>>8, gdkText.green>>8, gdkText.blue>>8); @@ -2971,7 +2971,7 @@ void QGtkStyle::drawControl(ControlElement element, if (option->state & State_Sunken) shadow = GTK_SHADOW_IN; - + gtkPainter->paintBox(gtkTreeHeader, "button", option->rect.adjusted(-1, 0, 0, 0), state, shadow, d->gtk_widget_get_style(gtkTreeHeader)); } diff --git a/src/widgets/styles/qmacstyle.qdoc b/src/widgets/styles/qmacstyle.qdoc index 9f5299032f..9ee464667a 100644 --- a/src/widgets/styles/qmacstyle.qdoc +++ b/src/widgets/styles/qmacstyle.qdoc @@ -104,43 +104,43 @@ */ /*! \fn void QMacStyle::polish(QPalette &pal) - \reimp + \reimp */ /*! \fn void QMacStyle::polish(QApplication *) - \reimp + \reimp */ /*! \fn void QMacStyle::unpolish(QApplication *) - \reimp + \reimp */ /*! \fn void QMacStyle::polish(QWidget* w) - \reimp + \reimp */ /*! \fn void QMacStyle::unpolish(QWidget* w) - \reimp + \reimp */ /*! \fn int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QWidget *widget) const - \reimp + \reimp */ /*! \fn QPalette QMacStyle::standardPalette() const - \reimp + \reimp */ /*! \fn int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w, QStyleHintReturn *hret) const - \reimp + \reimp */ /*! \fn QPixmap QMacStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const - \reimp + \reimp */ /*! \fn QPixmap QMacStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const - \reimp + \reimp */ /*! @@ -199,41 +199,41 @@ /*! \fn void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const - \reimp + \reimp */ /*! \fn void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter *p, const QWidget *w) const - \reimp + \reimp */ /*! \fn QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt, const QWidget *widget) const - \reimp + \reimp */ /*! \fn void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const - \reimp + \reimp */ /*! \fn QStyle::SubControl QMacStyle::hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, const QPoint &pt, const QWidget *widget) const - \reimp + \reimp */ /*! \fn QRect QMacStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const - \reimp + \reimp */ /*! \fn QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &csz, const QWidget *widget) const - \reimp + \reimp */ /*! \fn void QMacStyle::drawItemText(QPainter *p, const QRect &r, int flags, const QPalette &pal, bool enabled, const QString &text, QPalette::ColorRole textRole) const - \reimp + \reimp */ /*! \fn bool QMacStyle::event(QEvent *e) - \reimp + \reimp */ /*! \fn QIcon QMacStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opt, const QWidget *widget) const diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 9a8d768e2a..18eb5e6c44 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -41,7 +41,7 @@ /* Note: The qdoc comments for QMacStyle are contained in - .../doc/src/qstyles.qdoc. + .../doc/src/qstyles.qdoc. */ #include @@ -3402,7 +3402,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter } else { pr.setHeight(pixmap.size().height() + 6); cr.adjust(0, pr.bottom(), 0, -3); - } + } alignment |= Qt::AlignCenter; } else { pr.setWidth(pixmap.width() + 8); @@ -5292,7 +5292,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex else x += br.width() / 2 - p->fontMetrics().width(titlebar->text) / 2; if (iw) - p->drawPixmap(x - iw, y, + p->drawPixmap(x - iw, y, titlebar->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize), QIcon::Normal)); drawItemText(p, br, Qt::AlignCenter, opt->palette, tds == kThemeStateActive, titlebar->text, QPalette::Text); @@ -6002,12 +6002,12 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, ------------------------------ <- top of stack widget - To summarize: - * 2 is the distance between the pane and the contentsRect + To summarize: + * 2 is the distance between the pane and the contentsRect * The 14 and the 1's are the distance from the contentsRect to the stack widget. (same value as used in SE_TabWidgetTabContents) * overlap is how much the pane should overlap the tab bar - */ + */ // then add the size between the stackwidget and the "contentsRect" if (const QStyleOptionTabWidgetFrame *twf diff --git a/src/widgets/styles/qproxystyle.cpp b/src/widgets/styles/qproxystyle.cpp index 911223cae2..d89390cb01 100644 --- a/src/widgets/styles/qproxystyle.cpp +++ b/src/widgets/styles/qproxystyle.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE \since 4.6 \inmodule QtWidgets - + A QProxyStyle wraps a QStyle (usually the default system style) for the purpose of dynamically overriding painting or other specific style behavior. diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 1d4e4bd570..c3f22994ca 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -137,7 +137,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C state. \endtable - + For more information about widget styling and appearance, see the \l{Styles and Style Aware Widgets}. */ diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index eff6837c5a..6eb81e8fb8 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -374,7 +374,7 @@ QStyleOption &QStyleOption::operator=(const QStyleOption &other) parameters for drawing a focus rectangle with QStyle. \inmodule QtWidgets - + For performance reasons, the access to the member variables is direct (i.e., using the \c . or \c -> operator). This low-level feel makes the structures straightforward to use and emphasizes that @@ -458,7 +458,7 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version) parameters for drawing a frame. \inmodule QtWidgets - + QStyleOptionFrame is used for drawing several built-in Qt widgets, including QFrame, QGroupBox, QLineEdit, and QMenu. @@ -738,7 +738,7 @@ QStyleOptionGroupBox::QStyleOptionGroupBox(int version) parameters for drawing a header. \inmodule QtWidgets - + QStyleOptionHeader contains all the information that QStyle functions need to draw the item views' header pane, header sort arrow, and header label. @@ -925,7 +925,7 @@ QStyleOptionHeader::QStyleOptionHeader(int version) parameters for drawing buttons. \inmodule QtWidgets - + QStyleOptionButton contains all the information that QStyle functions need to draw graphical elements like QPushButton, QCheckBox, and QRadioButton. @@ -1237,7 +1237,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version) parameters for drawing a tab bar. \inmodule QtWidgets - + The QStyleOptionTab class is used for drawing several built-in Qt widgets including \l QTabBar and the panel for \l QTabWidget. @@ -1662,7 +1662,7 @@ QStyleOptionProgressBar::QStyleOptionProgressBar(int version) parameter necessary for drawing a menu item. \inmodule QtWidgets - + QStyleOptionMenuItem contains all the information that QStyle functions need to draw the menu items from \l QMenu. It is also used for drawing other menu-related widgets. @@ -1862,7 +1862,7 @@ QStyleOptionMenuItem::QStyleOptionMenuItem(int version) common to all complex controls. \inmodule QtWidgets - + This class is not used on its own. Instead it is used to derive other complex control options, for example QStyleOptionSlider and QStyleOptionSpinBox. @@ -1953,7 +1953,7 @@ QStyleOptionComplex::QStyleOptionComplex(int version, int type) parameters needed for drawing a slider. \inmodule QtWidgets - + QStyleOptionSlider contains all the information that QStyle functions need to draw QSlider and QScrollBar. @@ -2152,7 +2152,7 @@ QStyleOptionSlider::QStyleOptionSlider(int version) parameters necessary for drawing a spin box. \inmodule QtWidgets - + QStyleOptionSpinBox contains all the information that QStyle functions need to draw QSpinBox and QDateTimeEdit. @@ -2257,7 +2257,7 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version) parameters for drawing a dock widget. \inmodule QtWidgets - + QStyleOptionDockWidget contains all the information that QStyle functions need to draw graphical elements like QDockWidget. diff --git a/src/widgets/styles/qwindowsmobilestyle.cpp b/src/widgets/styles/qwindowsmobilestyle.cpp index 2b30bf5a2d..55c9495b1a 100644 --- a/src/widgets/styles/qwindowsmobilestyle.cpp +++ b/src/widgets/styles/qwindowsmobilestyle.cpp @@ -90,7 +90,7 @@ static const int windowsMobileExclusiveIndicatorSize = 14; static const int windowsMobileSliderThickness = 6; static const int windowsMobileIconSize = 16; static const int PE_IndicatorArrowUpBig = 0xf000101; -static const int PE_IndicatorArrowDownBig = 0xf000102; +static const int PE_IndicatorArrowDownBig = 0xf000102; static const int PE_IndicatorArrowLeftBig = 0xf000103; static const int PE_IndicatorArrowRightBig = 0xf000104; @@ -241,7 +241,7 @@ static const char *const radiochecked_xpm[] = { static const char * const radiochecked_low_xpm[] = { "9 9 2 1", " c None", - ". c #000000", + ". c #000000", " ... ", " ....... ", " ....... ", @@ -3904,39 +3904,39 @@ QColor fromHsl(QColor c) qreal ca[3] = {0, 0, 0}; if (s == 0 || h == 1) { - // achromatic case + // achromatic case ca[0] = ca[1] = ca[2] = l; - } else { - // chromatic case - qreal temp2; - if (l < qreal(0.5)) - temp2 = l * (qreal(1.0) + s); - else - temp2 = l + s - (l * s); - - const qreal temp1 = (qreal(2.0) * l) - temp2; - qreal temp3[3] = { h + (qreal(1.0) / qreal(3.0)), - h, - h - (qreal(1.0) / qreal(3.0)) }; - - for (int i = 0; i != 3; ++i) { - if (temp3[i] < qreal(0.0)) - temp3[i] += qreal(1.0); - else if (temp3[i] > qreal(1.0)) + } else { + // chromatic case + qreal temp2; + if (l < qreal(0.5)) + temp2 = l * (qreal(1.0) + s); + else + temp2 = l + s - (l * s); + + const qreal temp1 = (qreal(2.0) * l) - temp2; + qreal temp3[3] = { h + (qreal(1.0) / qreal(3.0)), + h, + h - (qreal(1.0) / qreal(3.0)) }; + + for (int i = 0; i != 3; ++i) { + if (temp3[i] < qreal(0.0)) + temp3[i] += qreal(1.0); + else if (temp3[i] > qreal(1.0)) temp3[i] -= qreal(1.0); const qreal sixtemp3 = temp3[i] * qreal(6.0); - if (sixtemp3 < qreal(1.0)) - ca[i] = ((temp1 + (temp2 - temp1) * sixtemp3)); - else if ((temp3[i] * qreal(2.0)) < qreal(1.0)) - ca[i] = (temp2); - else if ((temp3[i] * qreal(3.0)) < qreal(2.0)) + if (sixtemp3 < qreal(1.0)) + ca[i] = ((temp1 + (temp2 - temp1) * sixtemp3)); + else if ((temp3[i] * qreal(2.0)) < qreal(1.0)) + ca[i] = (temp2); + else if ((temp3[i] * qreal(3.0)) < qreal(2.0)) ca[i] = temp1 + (temp2 -temp1) * (qreal(2.0) /qreal(3.0) - temp3[i]) * qreal(6.0); else ca[i] = temp1; } } - + return QColor::fromRgbF(ca[0], ca[1], ca[2]); } @@ -3945,7 +3945,7 @@ QColor fromHsl(QColor c) QColor toHsl(QColor c) { - QColor color; + QColor color; qreal h; qreal s; qreal l; @@ -3953,36 +3953,36 @@ QColor toHsl(QColor c) const qreal r = c.redF(); const qreal g = c.greenF(); const qreal b = c.blueF(); - const qreal max = Q_MAX_3(r, g, b); - const qreal min = Q_MIN_3(r, g, b); - const qreal delta = max - min; - const qreal delta2 = max + min; - const qreal lightness = qreal(0.5) * delta2; + const qreal max = Q_MAX_3(r, g, b); + const qreal min = Q_MIN_3(r, g, b); + const qreal delta = max - min; + const qreal delta2 = max + min; + const qreal lightness = qreal(0.5) * delta2; l = (lightness); - if (qFuzzyIsNull(delta)) { - // achromatic case, hue is undefined + if (qFuzzyIsNull(delta)) { + // achromatic case, hue is undefined h = 0; - s = 0; + s = 0; } else { - // chromatic case - qreal hue = 0; - if (lightness < qreal(0.5)) - s = ((delta / delta2)); - else - s = ((delta / (qreal(2.0) - delta2))); - if (qFuzzyCompare(r, max)) { - hue = ((g - b) /delta); - } else if (qFuzzyCompare(g, max)) { - hue = (2.0 + (b - r) / delta); - } else if (qFuzzyCompare(b, max)) { - hue = (4.0 + (r - g) / delta); - } else { - Q_ASSERT_X(false, "QColor::toHsv", "internal error"); + // chromatic case + qreal hue = 0; + if (lightness < qreal(0.5)) + s = ((delta / delta2)); + else + s = ((delta / (qreal(2.0) - delta2))); + if (qFuzzyCompare(r, max)) { + hue = ((g - b) /delta); + } else if (qFuzzyCompare(g, max)) { + hue = (2.0 + (b - r) / delta); + } else if (qFuzzyCompare(b, max)) { + hue = (4.0 + (r - g) / delta); + } else { + Q_ASSERT_X(false, "QColor::toHsv", "internal error"); } - hue *= 60.0; - if (hue < 0.0) - hue += 360.0; - h = (hue * 100); + hue *= 60.0; + if (hue < 0.0) + hue += 360.0; + h = (hue * 100); } h = h / 36000; @@ -4083,7 +4083,7 @@ void QWindowsMobileStylePrivate::tintListViewHighlight(QColor color) imageListViewHighlightMiddle = QImage(listviewhighmiddle_xpm); tintImage(&imageListViewHighlightMiddle, color, qreal(0.0)); - + int height = imageListViewHighlightMiddle.height(); if (!doubleControls) { height = height / 2; @@ -4218,7 +4218,7 @@ void QWindowsMobileStylePrivate::drawPanelItemViewSelected(QPainter *painter, co QRect r; if (rect.isValid()) r = rect; - else + else r = option->rect; tintImagesHigh(option->palette.highlight().color()); @@ -4892,7 +4892,7 @@ void QWindowsMobileStyle::drawPrimitive(PrimitiveElement element, const QStyleOp } else { QRect r = QRect(option->rect.x(), option->rect.y(), windowsMobileitemViewCheckBoxSize, windowsMobileitemViewCheckBoxSize); qDrawPlainRect(painter, r, option->palette.shadow().color(), 1); - } + } if (option->state & State_Enabled) d->imageChecked.setColor(1, option->palette.shadow().color().rgba()); else @@ -5129,7 +5129,7 @@ void QWindowsMobileStyle::drawPrimitive(PrimitiveElement element, const QStyleOp image.setColor(1, color.rgba()); painter->drawImage(option->rect.x() + xoffset, option->rect.y() + yoffset, image); } - else { + else { QPoint points[7]; switch (element) { case PE_IndicatorArrowUp: @@ -5194,7 +5194,7 @@ void QWindowsMobileStyle::drawPrimitive(PrimitiveElement element, const QStyleOp painter->drawLine(points[2], points[3]); painter->drawLine(points[4], points[5]); painter->drawPoint(points[6]); - } + } } painter->restore(); break; } @@ -5432,7 +5432,7 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption QWindowsMobileStylePrivate *d = const_cast(d_func()); - + painter->setClipping(false); switch (element) { case CE_MenuBarEmptyArea: @@ -5527,7 +5527,7 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption break; case CE_TabBarTabShape: if (const QStyleOptionTab *tab = qstyleoption_cast(option)) { - + if (tab->shape == QTabBar::RoundedNorth || tab->shape == QTabBar::RoundedEast || tab->shape == QTabBar::RoundedSouth || tab->shape == QTabBar::RoundedWest) { d->drawTabBarTab(painter, tab); @@ -5564,7 +5564,7 @@ void QWindowsMobileStyle::drawControl(ControlElement element, const QStyleOption proxy()->drawControl(CE_HeaderSection, header, painter, widget); QStyleOptionHeader subopt = *header; subopt.rect = proxy()->subElementRect(SE_HeaderLabel, header, widget); - if (header->state & State_Sunken) + if (header->state & State_Sunken) subopt.palette.setColor(QPalette::ButtonText, header->palette.brightText().color()); subopt.state |= QStyle::State_On; if (subopt.rect.isValid()) @@ -7079,7 +7079,7 @@ int QWindowsMobileStyle::pixelMetric(PixelMetric pm, const QStyleOption *opt, co } break; case PM_ScrollBarExtent: { - + if (d->smartphone) ret = 9; else diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp index e9bc17f78f..0102bc2b7d 100644 --- a/src/widgets/styles/qwindowsvistastyle.cpp +++ b/src/widgets/styles/qwindowsvistastyle.cpp @@ -273,15 +273,15 @@ void QWindowsVistaAnimation::paint(QPainter *painter, const QStyleOption *option /*! \internal - + Animations are used for some state transitions on specific widgets. - + Only one running animation can exist for a widget at any specific time. Animations can be added through QWindowsVistaStylePrivate::startAnimation(Animation *) and any existing animation on a widget can be retrieved with QWindowsVistaStylePrivate::widgetAnimation(Widget *). - + Once an animation has been started, QWindowsVistaStylePrivate::timerEvent(QTimerEvent *) will continuously call update() on the widget until it is stopped, @@ -798,17 +798,17 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt || vopt->viewItemPosition == QStyleOptionViewItem::Invalid) painter->drawPixmap(pixmapRect.topLeft(), pixmap); else if (reverse ? rightSection : leftSection){ - painter->drawPixmap(QRect(pixmapRect.topLeft(), - QSize(frame, pixmapRect.height())), pixmap, + painter->drawPixmap(QRect(pixmapRect.topLeft(), + QSize(frame, pixmapRect.height())), pixmap, QRect(QPoint(0, 0), QSize(frame, pixmapRect.height()))); - painter->drawPixmap(pixmapRect.adjusted(frame, 0, 0, 0), + painter->drawPixmap(pixmapRect.adjusted(frame, 0, 0, 0), pixmap, srcRect.adjusted(frame, 0, -frame, 0)); } else if (reverse ? leftSection : rightSection) { - painter->drawPixmap(QRect(pixmapRect.topRight() - QPoint(frame - 1, 0), - QSize(frame, pixmapRect.height())), pixmap, - QRect(QPoint(pixmapRect.width() - frame, 0), + painter->drawPixmap(QRect(pixmapRect.topRight() - QPoint(frame - 1, 0), + QSize(frame, pixmapRect.height())), pixmap, + QRect(QPoint(pixmapRect.width() - frame, 0), QSize(frame, pixmapRect.height()))); - painter->drawPixmap(pixmapRect.adjusted(0, 0, -frame, 0), + painter->drawPixmap(pixmapRect.adjusted(0, 0, -frame, 0), pixmap, srcRect.adjusted(frame, 0, -frame, 0)); } else if (vopt->viewItemPosition == QStyleOptionViewItem::Middle) painter->drawPixmap(pixmapRect, pixmap, @@ -1110,7 +1110,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption } else { animRect = QRect(rect.left() - glowSize + animOffset, rect.top(), glowSize, rect.height()); - animRect = QStyle::visualRect(reverse ? Qt::RightToLeft : Qt::LeftToRight, + animRect = QStyle::visualRect(reverse ? Qt::RightToLeft : Qt::LeftToRight, option->rect, animRect); pixmapSize.setWidth(animRect.width()); } @@ -1156,7 +1156,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption double vc6_workaround = ((progress - qint64(bar->minimum)) / qMax(double(1.0), double(qint64(bar->maximum) - qint64(bar->minimum))) * maxWidth); int width = isIndeterminate ? maxWidth : qMax(int(vc6_workaround), minWidth); theme.rect.setWidth(width); - theme.rect = QStyle::visualRect(reverse ? Qt::RightToLeft : Qt::LeftToRight, + theme.rect = QStyle::visualRect(reverse ? Qt::RightToLeft : Qt::LeftToRight, option->rect, theme.rect); } d->drawBackground(theme); @@ -1522,7 +1522,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption QStyleOptionViewItem adjustedOption = *vopt; adjustedOption.palette = palette; // We hide the focusrect in singleselection as it is not required - if ((view->selectionMode() == QAbstractItemView::SingleSelection) + if ((view->selectionMode() == QAbstractItemView::SingleSelection) && !(vopt->state & State_KeyboardFocusChange)) adjustedOption.state &= ~State_HasFocus; QWindowsXPStyle::drawControl(element, &adjustedOption, painter, widget); @@ -1944,7 +1944,7 @@ QSize QWindowsVistaStyle::sizeFromContents(ContentsType type, const QStyleOption minimumHeight = qMax(size.cy + margins.cyBottomHeight+ margins.cyTopHeight, sz.height()); sz.rwidth() += size.cx + margins.cxLeftWidth + margins.cxRightWidth; } - + if (const QStyleOptionMenuItem *menuitem = qstyleoption_cast(option)) { if (menuitem->menuItemType != QStyleOptionMenuItem::Separator) sz.setHeight(minimumHeight); diff --git a/src/widgets/util/qcolormap.qdoc b/src/widgets/util/qcolormap.qdoc index 48fe1c7eec..ae337b511c 100644 --- a/src/widgets/util/qcolormap.qdoc +++ b/src/widgets/util/qcolormap.qdoc @@ -67,7 +67,7 @@ /*! \fn QColormap::~QColormap() - + Destroys the colormap. */ diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index d8186d795d..59ec6eb10d 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -45,7 +45,7 @@ \since 4.2 \inmodule QtWidgets - + You can use QCompleter to provide auto completions in any Qt widget, such as QLineEdit and QComboBox. When the user starts typing a word, QCompleter suggests possible ways of diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index 1670d0ab57..add372c583 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.cpp @@ -237,7 +237,7 @@ private: \since 5.0 \inmodule QtWidgets - + With kinetic scrolling, the user can push the widget in a given direction and it will continue to scroll in this direction until it is stopped either by the user or by friction. Aspects of inertia, friction diff --git a/src/widgets/util/qscrollerproperties.cpp b/src/widgets/util/qscrollerproperties.cpp index ed593ea2cb..d0d9c23b68 100644 --- a/src/widgets/util/qscrollerproperties.cpp +++ b/src/widgets/util/qscrollerproperties.cpp @@ -94,7 +94,7 @@ QScrollerPropertiesPrivate *QScrollerPropertiesPrivate::defaults() \since 4.8 \inmodule QtWidgets - + The QScrollerProperties class stores the parameters used by QScroller. The default settings are platform dependent so that Qt emulates the diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp index 48bba9701c..4cae15893c 100644 --- a/src/widgets/util/qsystemtrayicon.cpp +++ b/src/widgets/util/qsystemtrayicon.cpp @@ -379,7 +379,7 @@ bool QSystemTrayIcon::supportsMessages() On Mac OS X, the Growl notification system must be installed for this function to display messages. - + \sa show(), supportsMessages() */ void QSystemTrayIcon::showMessage(const QString& title, const QString& msg, diff --git a/src/widgets/util/qsystemtrayicon_win.cpp b/src/widgets/util/qsystemtrayicon_win.cpp index 936e1a1bc1..2184a52af7 100644 --- a/src/widgets/util/qsystemtrayicon_win.cpp +++ b/src/widgets/util/qsystemtrayicon_win.cpp @@ -345,12 +345,12 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result ) case NIN_KEYSELECT: if (ignoreNextMouseRelease) ignoreNextMouseRelease = false; - else + else emit q->activated(QSystemTrayIcon::Trigger); break; case WM_LBUTTONDBLCLK: - ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse + ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse // release we must ignore it emit q->activated(QSystemTrayIcon::DoubleClick); break; diff --git a/src/widgets/util/qsystemtrayicon_wince.cpp b/src/widgets/util/qsystemtrayicon_wince.cpp index b6937aee2f..a0c278b1a3 100644 --- a/src/widgets/util/qsystemtrayicon_wince.cpp +++ b/src/widgets/util/qsystemtrayicon_wince.cpp @@ -166,7 +166,7 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result ) break; case WM_LBUTTONDBLCLK: - ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse + ignoreNextMouseRelease = true; // Since DBLCLICK Generates a second mouse // release we must ignore it emit q->activated(QSystemTrayIcon::DoubleClick); break; diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp index 77726adf27..eff12a7c4d 100644 --- a/src/widgets/util/qundostack.cpp +++ b/src/widgets/util/qundostack.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \since 4.2 \inmodule QtWidgets - + For an overview of Qt's Undo Framework, see the \l{Overview of Qt's Undo Framework}{overview document}. @@ -324,7 +324,7 @@ const QUndoCommand *QUndoCommand::child(int index) const \since 4.2 \inmodule QtWidgets - + For an overview of Qt's Undo Framework, see the \l{Overview of Qt's Undo Framework}{overview document}. @@ -1009,7 +1009,7 @@ void QUndoStack::endMacro() This function returns a const pointer, because modifying a command, once it has been pushed onto the stack and executed, almost always - causes corruption of the state of the document, if the command is + causes corruption of the state of the document, if the command is later undone or redone. \sa QUndoCommand::child() diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 5e9d100214..c96f77cbf2 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -380,7 +380,7 @@ void QAbstractButtonPrivate::moveFocus(int key) QAbstractButton *fb = qobject_cast(f); if (!fb || !buttonList.contains(fb)) return; - + QAbstractButton *candidate = 0; int bestScore = -1; QRect target = f->rect().translated(f->mapToGlobal(QPoint(0,0))); diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 391a06917c..b27bc2fff8 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -452,7 +452,7 @@ void QAbstractScrollAreaPrivate::layoutChildren() // no corner widget. Also, on the Mac we paint if there is a native // (transparent) sizegrip in the area where a corner widget would be. if ((needv && needh && hasCornerWidget == false && scrollOverlap == 0) - || ((needv || needh) + || ((needv || needh) #ifdef Q_WS_MAC && hasMacSizeGrip #endif diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp index 5932e1be9b..5372b21430 100644 --- a/src/widgets/widgets/qabstractslider.cpp +++ b/src/widgets/widgets/qabstractslider.cpp @@ -724,7 +724,7 @@ bool QAbstractSliderPrivate::scrollByDelta(Qt::Orientation orientation, Qt::Keyb #else // Native UI-elements on Mac can scroll hundreds of lines at a time as // a result of acceleration. So keep the same behaviour in Qt, and - // don't restrict stepsToScroll to certain maximum (pageStep): + // don't restrict stepsToScroll to certain maximum (pageStep): stepsToScroll = int(offset_accumulated); #endif offset_accumulated -= int(offset_accumulated); diff --git a/src/widgets/widgets/qabstractslider_p.h b/src/widgets/widgets/qabstractslider_p.h index 42f25501b1..7b07aa3be9 100644 --- a/src/widgets/widgets/qabstractslider_p.h +++ b/src/widgets/widgets/qabstractslider_p.h @@ -87,7 +87,7 @@ public: QBasicTimer repeatActionTimer; int repeatActionTime; QAbstractSlider::SliderAction repeatAction; - + #ifdef QT_KEYPAD_NAVIGATION int origValue; diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp index 3da81f8360..2bd67d19e1 100644 --- a/src/widgets/widgets/qbuttongroup.cpp +++ b/src/widgets/widgets/qbuttongroup.cpp @@ -139,7 +139,7 @@ \fn void QButtonGroup::buttonPressed(QAbstractButton *button) \since 4.2 - This signal is emitted when the given \a button is pressed down. + This signal is emitted when the given \a button is pressed down. \sa QAbstractButton::pressed() */ @@ -158,7 +158,7 @@ \fn void QButtonGroup::buttonReleased(QAbstractButton *button) \since 4.2 - This signal is emitted when the given \a button is released. + This signal is emitted when the given \a button is released. \sa QAbstractButton::released() */ diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 0fdf039bc3..d61ae023ef 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -2591,7 +2591,7 @@ QCalendarWidget::HorizontalHeaderFormat QCalendarWidget::horizontalHeaderFormat( } -/*! +/*! \enum QCalendarWidget::VerticalHeaderFormat This enum type defines the various formats the vertical header can display. diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index 0004e3d5ab..4676668610 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -282,8 +282,8 @@ private: QComboBox *mCombo; }; -// Note that this class is intentionally not using QStyledItemDelegate -// Vista does not use the new theme for combo boxes and there might +// Note that this class is intentionally not using QStyledItemDelegate +// Vista does not use the new theme for combo boxes and there might // be other side effects from using the new class class QComboBoxDelegate : public QItemDelegate { Q_OBJECT diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp index 7631014905..6c15e9016f 100644 --- a/src/widgets/widgets/qdockarealayout.cpp +++ b/src/widgets/widgets/qdockarealayout.cpp @@ -2004,7 +2004,7 @@ bool QDockAreaLayoutInfo::restoreState(QDataStream &stream, QList //we need to make sure the element is in the list so the dock widget can eventually be docked correctly if (!testing) item_list.append(item); - + //here we need to make sure we change the item in the item_list QDockAreaLayoutItem &lastItem = testing ? item : item_list.last(); diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp index 8cd944e133..c43ed9848b 100644 --- a/src/widgets/widgets/qeffects.cpp +++ b/src/widgets/widgets/qeffects.cpp @@ -276,7 +276,7 @@ void QAlphaWidget::render() #endif // Q_OS_WIN widget->hide(); } else { - //Since we are faking the visibility of the widget + //Since we are faking the visibility of the widget //we need to unset the hidden state on it before calling show widget->setAttribute(Qt::WA_WState_Hidden, true); widget->show(); @@ -541,7 +541,7 @@ void QRollEffect::scroll() #endif widget->hide(); } else { - //Since we are faking the visibility of the widget + //Since we are faking the visibility of the widget //we need to unset the hidden state on it before calling show widget->setAttribute(Qt::WA_WState_Hidden, true); widget->show(); diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 6c8da10b8e..a491b3218b 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -121,7 +121,7 @@ void QGroupBox::initStyleOption(QStyleOptionGroupBox *option) const option->state |= QStyle::State_Sunken; } - if (!option->palette.isBrushSet(isEnabled() ? QPalette::Active : + if (!option->palette.isBrushSet(isEnabled() ? QPalette::Active : QPalette::Disabled, QPalette::WindowText)) option->textColor = QColor(style()->styleHint(QStyle::SH_GroupBox_TextLabelColor, option, this)); @@ -229,7 +229,7 @@ void QGroupBoxPrivate::init() overCheckBox = false; pressedControl = QStyle::SC_None; calculateFrame(); - q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, + q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, QSizePolicy::GroupBox)); } diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index cfe32df3cc..cdef4c4548 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -95,7 +95,7 @@ protected: void changeEvent(QEvent *event); void mousePressEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); void initStyleOption(QStyleOptionGroupBox *option) const; diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 5187968ddf..5155df8e23 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -139,9 +139,9 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const The length of the text can be constrained to maxLength(). The text can be arbitrarily constrained using a validator() or an - inputMask(), or both. When switching between a validator and an input mask - on the same line edit, it is best to clear the validator or input mask to - prevent undefined behavior. + inputMask(), or both. When switching between a validator and an input mask + on the same line edit, it is best to clear the validator or input mask to + prevent undefined behavior. A related class is QTextEdit which allows multi-line, rich text diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 7f800d831f..10329293b3 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -180,7 +180,7 @@ void QLineEditPrivate::init(const QString& txt) #endif QObject::connect(control, SIGNAL(cursorPositionChanged(int,int)), q, SLOT(updateMicroFocus())); - + QObject::connect(control, SIGNAL(textChanged(QString)), q, SLOT(updateMicroFocus())); diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm index 1eadb62d5c..7077772be4 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm @@ -112,7 +112,7 @@ QMacCocoaViewContainerPrivate::~QMacCocoaViewContainerPrivate() /*! \fn QMacCocoaViewContainer::QMacCocoaViewContainer(void *cocoaViewToWrap, QWidget *parent) - + Create a new QMacCocoaViewContainer using the NSView pointer in \a cocoaViewToWrap with parent, \a parent. QMacCocoaViewContainer will retain \a cocoaViewToWrap. diff --git a/src/widgets/widgets/qmenu_wince.cpp b/src/widgets/widgets/qmenu_wince.cpp index 68a2022e97..ec1560f5e2 100644 --- a/src/widgets/widgets/qmenu_wince.cpp +++ b/src/widgets/widgets/qmenu_wince.cpp @@ -116,14 +116,14 @@ static void resolveAygLibs() } } -static void qt_wce_enable_soft_key(HWND handle, uint command) +static void qt_wce_enable_soft_key(HWND handle, uint command) { resolveAygLibs(); if (ptrEnableSoftKey) ptrEnableSoftKey(handle, command, false, true); } -static void qt_wce_disable_soft_key(HWND handle, uint command) +static void qt_wce_disable_soft_key(HWND handle, uint command) { resolveAygLibs(); if (ptrEnableSoftKey) @@ -148,7 +148,7 @@ static QAction* qt_wce_get_quit_action(QList actionItems) QAction *action = actionItems.at(i); if (action->menuRole() == QAction::QuitRole) returnAction = action; - else + else if (action->menu()) returnAction = qt_wce_get_quit_action(action->menu()->actions()); if (returnAction) @@ -252,7 +252,7 @@ static void qt_wce_insert_action(HMENU menu, QWceMenuAction *action) if (action->action->isCheckable()) if (action->action->isChecked()) CheckMenuItem(menu, action->command, MF_BYCOMMAND | MF_CHECKED); - else + else CheckMenuItem(menu, action->command, MF_BYCOMMAND | MF_UNCHECKED); } } @@ -264,8 +264,8 @@ static void qt_wce_clear_menu(HMENU hMenu) } /*! - \internal - + \internal + This function refreshes the native Windows CE menu. */ @@ -281,8 +281,8 @@ void QMenuBarPrivate::wceRefresh() } /*! - \internal - + \internal + This function sends native Windows CE commands to Qt menus. */ @@ -293,8 +293,8 @@ QAction* QMenu::wceCommands(uint command) } /*! - \internal - + \internal + This function sends native Windows CE commands to Qt menu bars and all their child menus. */ @@ -457,7 +457,7 @@ void QMenuPrivate::QWceMenuPrivate::addAction(QWceMenuAction *action, QWceMenuAc /*! \internal - + This function will return the HMENU used to create the native Windows CE menu bar bindings. */ @@ -642,7 +642,7 @@ void QMenuBarPrivate::QWceMenuBarPrivate::rebuild() qt_wce_rename_menu_item(menubarHandle, leftButtonCommand, leftButtonAction->text()); qt_wce_enable_soft_key(menubarHandle, leftButtonCommand); } else { - qt_wce_rename_menu_item(menubarHandle, leftButtonCommand, QLatin1String("")); + qt_wce_rename_menu_item(menubarHandle, leftButtonCommand, QLatin1String("")); qt_wce_disable_soft_key(menubarHandle, leftButtonCommand); } } else { diff --git a/src/widgets/widgets/qmenu_wince.rc b/src/widgets/widgets/qmenu_wince.rc index 631cd9d47a..0bcd32c7e5 100644 --- a/src/widgets/widgets/qmenu_wince.rc +++ b/src/widgets/widgets/qmenu_wince.rc @@ -14,19 +14,19 @@ #define I_IMAGENONE (-2) #define NOMENU 0xFFFF -IDR_MAIN_MENU MENU DISCARDABLE +IDR_MAIN_MENU MENU DISCARDABLE BEGIN POPUP "Menu" BEGIN - MENUITEM "About", IDM_ABOUT + MENUITEM "About", IDM_ABOUT END END -IDR_MAIN_MENU2 MENU DISCARDABLE +IDR_MAIN_MENU2 MENU DISCARDABLE BEGIN POPUP "Menu" BEGIN - MENUITEM "About", IDM_ABOUT + MENUITEM "About", IDM_ABOUT END POPUP "Display" BEGIN @@ -35,7 +35,7 @@ BEGIN END -IDR_MAIN_MENU3 MENU DISCARDABLE +IDR_MAIN_MENU3 MENU DISCARDABLE BEGIN POPUP "Menu1" BEGIN @@ -55,7 +55,7 @@ BEGIN END END -IDR_MAIN_MENU4 MENU DISCARDABLE +IDR_MAIN_MENU4 MENU DISCARDABLE BEGIN POPUP "Menu1" BEGIN @@ -83,7 +83,7 @@ BEGIN END END -IDR_MAIN_MENU5 MENU DISCARDABLE +IDR_MAIN_MENU5 MENU DISCARDABLE BEGIN POPUP "Menu1" BEGIN @@ -119,8 +119,8 @@ BEGIN END END -STRINGTABLE -BEGIN +STRINGTABLE +BEGIN IDS_EXIT "Exit" IDS_MENU "Menu" IDS_LEFTMENU "Display" @@ -136,31 +136,31 @@ END IDR_MAIN_MENU SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU, + IDR_MAIN_MENU, 2, I_IMAGENONE, IDM_EXIT, TBSTATE_ENABLED, TBSTYLE_BUTTON | TBSTYLE_AUTOSIZE, IDS_EXIT, 0, NOMENU, - + I_IMAGENONE, IDM_MENU, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_MENU, 0, 0, END IDR_MAIN_MENU2 SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU2, + IDR_MAIN_MENU2, 2, I_IMAGENONE, IDM_LEFTMENU, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_LEFTMENU, 0, 1, - + I_IMAGENONE, IDM_MENU, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_MENU, 0, 0, END IDR_MAIN_MENU3 SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU3, + IDR_MAIN_MENU3, 4, I_IMAGENONE, IDM_MENU1, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, @@ -178,7 +178,7 @@ END IDR_MAIN_MENU4 SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU4, + IDR_MAIN_MENU4, 6, I_IMAGENONE, IDM_MENU1, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, @@ -202,7 +202,7 @@ END IDR_MAIN_MENU5 SHMENUBAR DISCARDABLE BEGIN - IDR_MAIN_MENU5, + IDR_MAIN_MENU5, 8, I_IMAGENONE, IDM_MENU1, TBSTATE_ENABLED, TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index 1638123e0e..3154c0dedb 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -103,7 +103,7 @@ public: private: Q_DISABLE_COPY(QPushButton) Q_DECLARE_PRIVATE(QPushButton) -#ifndef QT_NO_MENU +#ifndef QT_NO_MENU Q_PRIVATE_SLOT(d_func(), void _q_popupPressed()) #endif }; diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp index 590225e850..0de63a5a47 100644 --- a/src/widgets/widgets/qscrollarea.cpp +++ b/src/widgets/widgets/qscrollarea.cpp @@ -240,7 +240,7 @@ QWidget *QScrollArea::widget() const The \a widget becomes a child of the scroll area, and will be destroyed when the scroll area is deleted or when a new widget is set. - + The widget's \l{QWidget::setAutoFillBackground()}{autoFillBackground} property will be set to \c{true}. diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp index 3711b2f43e..4b24c9dfef 100644 --- a/src/widgets/widgets/qsplashscreen.cpp +++ b/src/widgets/widgets/qsplashscreen.cpp @@ -80,7 +80,7 @@ public: be shown during application startup. \inmodule QtWidgets - + A splash screen is a widget that is usually displayed when an application is being started. Splash screens are often used for applications that have long start up times (e.g. database or diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index a8399ed8d5..e39b79c67a 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -1665,7 +1665,7 @@ bool QSplitter::restoreState(const QByteArray &state) have a stretch factor of \a stretch. \a stretch is not the effective stretch factor; the effective - stretch factor is calculated by taking the initial size of the + stretch factor is calculated by taking the initial size of the widget and multiplying it with \a stretch. This function is provided for convenience. It is equivalent to diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp index 880ddfaf35..4c9be611bb 100644 --- a/src/widgets/widgets/qstatusbar.cpp +++ b/src/widgets/widgets/qstatusbar.cpp @@ -534,7 +534,7 @@ void QStatusBar::reformat() } /*! - + Hides the normal status indications and displays the given \a message for the specified number of milli-seconds (\a{timeout}). If \a{timeout} is 0 (default), the \a {message} remains displayed until @@ -744,7 +744,7 @@ bool QStatusBar::event(QEvent *e) } } } - + // On Mac OS X Leopard it is possible to drag the window by clicking // on the tool bar on most applications. #ifndef Q_WS_MAC @@ -755,7 +755,7 @@ bool QStatusBar::event(QEvent *e) // Enable drag-click only if the status bar is the status bar for a // QMainWindow with a unifed toolbar. - if (parent() == 0 || qobject_cast(parent()) == 0 || + if (parent() == 0 || qobject_cast(parent()) == 0 || qobject_cast(parent())->unifiedTitleAndToolBarOnMac() == false ) return QWidget::event(e); diff --git a/src/widgets/widgets/qtoolbararealayout.cpp b/src/widgets/widgets/qtoolbararealayout.cpp index 02279ad014..969bb8a7fd 100644 --- a/src/widgets/widgets/qtoolbararealayout.cpp +++ b/src/widgets/widgets/qtoolbararealayout.cpp @@ -810,7 +810,7 @@ QLayoutItem *QToolBarAreaLayout::insertToolBar(QToolBar *before, QToolBar *toolB QInternal::DockPosition pos = findToolBar(before); if (pos == QInternal::DockCount) return 0; - + return docks[pos].insertToolBar(before, toolBar); } @@ -869,7 +869,7 @@ void QToolBarAreaLayout::insertItem(QToolBar *before, QLayoutItem *item) QInternal::DockPosition pos = findToolBar(before); if (pos == QInternal::DockCount) return; - + docks[pos].insertItem(before, item); } diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h index 5cbb4a4756..e052a71044 100644 --- a/src/widgets/widgets/qtoolbararealayout_p.h +++ b/src/widgets/widgets/qtoolbararealayout_p.h @@ -169,7 +169,7 @@ public: void removeToolBar(QToolBar *toolBar); void insertToolBarBreak(QToolBar *before); void removeToolBarBreak(QToolBar *before); - void moveToolBar(QToolBar *toolbar, int pos); + void moveToolBar(QToolBar *toolbar, int pos); QList gapIndex(const QPoint &pos, int *maxDistance) const; bool insertGap(const QList &path, QLayoutItem *item); @@ -215,7 +215,7 @@ public: void insertToolBarBreak(QToolBar *before); void removeToolBarBreak(QToolBar *before); void addToolBarBreak(QInternal::DockPosition pos); - void moveToolBar(QToolBar *toolbar, int pos); + void moveToolBar(QToolBar *toolbar, int pos); void insertItem(QInternal::DockPosition pos, QLayoutItem *item); void insertItem(QToolBar *before, QLayoutItem *item); diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp index 1dde9c0a1d..7a4f3b17d0 100644 --- a/src/widgets/widgets/qtoolbarlayout.cpp +++ b/src/widgets/widgets/qtoolbarlayout.cpp @@ -409,7 +409,7 @@ void QToolBarLayout::setGeometry(const QRect &rect) } } #endif - + } bool QToolBarLayout::layoutActions(const QSize &size) diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 797f3e9b76..9780d3c24c 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -145,7 +145,7 @@ SOURCES += \ false:mac { HEADERS += widgets/qmacnativewidget_mac.h \ widgets/qmaccocoaviewcontainer_mac.h - OBJECTIVE_HEADERS += widgets/qcocoatoolbardelegate_mac_p.h \ + OBJECTIVE_HEADERS += widgets/qcocoatoolbardelegate_mac_p.h \ widgets/qcocoamenu_mac_p.h OBJECTIVE_SOURCES += widgets/qmaccocoaviewcontainer_mac.mm \ widgets/qcocoatoolbardelegate_mac.mm \ diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 689c75774e..47e137976b 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -3037,10 +3037,10 @@ void QXmlSimpleReaderPrivate::initIncrementalParsing() A common way to perform incremental parsing is to connect the \c readyRead() signal of a \l{QNetworkReply} {network reply} a slot, and handle the incoming data there. See QNetworkAccessManager. - + Aspects of the parsing behavior can be adapted using setFeature() and setProperty(). - + \snippet code/src_xml_sax_qxml.cpp 0 QXmlSimpleReader is not reentrant. If you want to use the class -- cgit v1.2.3