Whitespaces & indentation cleanup in qobject

Reviewed-by: trustme

2 files changed, 27 insertions, 26 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 8abe28e..e080bd6 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -291,7 +291,7 @@ bool QObjectPrivate::isSender(const QObject *receiver, const char *signal) const
     QMutexLocker locker(signalSlotLock(q));
     if (connectionLists) {
         if (signal_index < connectionLists->count()) {
-            const QObjectPrivate::Connection *c = 
+            const QObjectPrivate::Connection *c =
                 connectionLists->at(signal_index).first;
 
             while (c) {
@@ -360,7 +360,7 @@ void QObjectPrivate::cleanConnectionLists()
     if (connectionLists->dirty && !connectionLists->inUse) {
         // remove broken connections
         for (int signal = -1; signal < connectionLists->count(); ++signal) {
-            QObjectPrivate::ConnectionList &connectionList = 
+            QObjectPrivate::ConnectionList &connectionList =
                 (*connectionLists)[signal];
 
             // Set to the last entry in the connection list that was *not*
@@ -383,8 +383,8 @@ void QObjectPrivate::cleanConnectionLists()
                 }
             }
 
-            // Correct the connection list's last pointer.  As 
-            // conectionList.last could equal last, this could be a noop
+            // Correct the connection list's last pointer.
+            // As conectionList.last could equal last, this could be a noop
             connectionList.last = last;
         }
         connectionLists->dirty = false;
@@ -906,7 +906,7 @@ QObject::~QObject()
         if (d->connectionLists) {
             ++d->connectionLists->inUse;
             for (int signal = -1; signal < d->connectionLists->count(); ++signal) {
-                QObjectPrivate::ConnectionList &connectionList = 
+                QObjectPrivate::ConnectionList &connectionList =
                     (*d->connectionLists)[signal];
 
                 while (QObjectPrivate::Connection *c = connectionList.first) {
@@ -1171,7 +1171,7 @@ static QObject *qChildHelper(const char *objName, const char *inheritsClass,
     more than one, the first one found is returned.
 */
 QObject* QObject::child(const char *objName, const char *inheritsClass,
-                         bool recursiveSearch) const
+                        bool recursiveSearch) const
 {
     Q_D(const QObject);
     return qChildHelper(objName, inheritsClass, recursiveSearch, d->children);
@@ -1390,7 +1390,7 @@ bool QObject::eventFilter(QObject * /* watched */, QEvent * /* event */)
 /*!
     If \a block is true, signals emitted by this object are blocked
     (i.e., emitting a signal will not invoke anything connected to it).
-	If \a block is false, no such blocking will occur.
+    If \a block is false, no such blocking will occur.
 
     The return value is the previous value of signalsBlocked().
 
@@ -1682,12 +1682,12 @@ void QObject::killTimer(int id)
 
 #ifdef QT3_SUPPORT
 static void objSearch(QObjectList &result,
-                       const QObjectList &list,
-                       const char  *inheritsClass,
-                       bool onlyWidgets,
-                       const char  *objName,
-                       QRegExp           *rx,
-                       bool            recurse)
+                      const QObjectList &list,
+                      const char *inheritsClass,
+                      bool onlyWidgets,
+                      const char *objName,
+                      QRegExp *rx,
+                      bool recurse)
 {
     for (int i = 0; i < list.size(); ++i) {
         QObject *obj = list.at(i);
@@ -1757,9 +1757,9 @@ static void objSearch(QObjectList &result,
 */
 
 QObjectList QObject::queryList(const char *inheritsClass,
-                                const char *objName,
-                                bool regexpMatch,
-                                bool recursiveSearch) const
+                               const char *objName,
+                               bool regexpMatch,
+                               bool recursiveSearch) const
 {
     Q_D(const QObject);
     QObjectList list;
@@ -1911,7 +1911,7 @@ QObjectList QObject::queryList(const char *inheritsClass,
     \internal
 */
 void qt_qFindChildren_helper(const QObject *parent, const QString &name, const QRegExp *re,
-                         const QMetaObject &mo, QList<void*> *list)
+                             const QMetaObject &mo, QList<void*> *list)
 {
     if (!parent || !list)
         return;
@@ -2519,7 +2519,7 @@ int QObject::receivers(const char *signal) const
         QMutexLocker locker(signalSlotLock(this));
         if (d->connectionLists) {
             if (signal_index < d->connectionLists->count()) {
-                const QObjectPrivate::Connection *c = 
+                const QObjectPrivate::Connection *c =
                     d->connectionLists->at(signal_index).first;
                 while (c) {
                     receivers += c->receiver ? 1 : 0;
@@ -3011,7 +3011,7 @@ bool QMetaObjectPrivate::connect(const QObject *sender, int signal_index,
     if (type & Qt::UniqueConnection) {
         QObjectConnectionListVector *connectionLists = QObjectPrivate::get(s)->connectionLists;
         if (connectionLists && connectionLists->count() > signal_index) {
-            const QObjectPrivate::Connection *c2 = 
+            const QObjectPrivate::Connection *c2 =
                 (*connectionLists)[signal_index].first;
 
             while (c2) {
@@ -3082,7 +3082,7 @@ bool QMetaObject::disconnect(const QObject *sender, int signal_index,
     Same as the QMetaObject::disconnect, but \a signal_index must be the result of QObjectPrivate::signalIndex
  */
 bool QMetaObjectPrivate::disconnect(const QObject *sender, int signal_index,
-                             const QObject *receiver, int method_index)
+                                    const QObject *receiver, int method_index)
 {
     if (!sender)
         return false;
@@ -3105,7 +3105,7 @@ bool QMetaObjectPrivate::disconnect(const QObject *sender, int signal_index,
     if (signal_index < 0) {
         // remove from all connection lists
         for (signal_index = -1; signal_index < connectionLists->count(); ++signal_index) {
-            QObjectPrivate::Connection *c = 
+            QObjectPrivate::Connection *c =
                 (*connectionLists)[signal_index].first;
             while (c) {
                 if (c->receiver
@@ -3134,7 +3134,7 @@ bool QMetaObjectPrivate::disconnect(const QObject *sender, int signal_index,
             }
         }
     } else if (signal_index < connectionLists->count()) {
-        QObjectPrivate::Connection *c = 
+        QObjectPrivate::Connection *c =
             (*connectionLists)[signal_index].first;
         while (c) {
             if (c->receiver
@@ -3491,7 +3491,8 @@ int QObjectPrivate::signalIndex(const char *signalName) const
 
   \a signal_index must be the index returned by QObjectPrivate::signalIndex;
 */
-bool QObjectPrivate::isSignalConnected(int signal_index) const {
+bool QObjectPrivate::isSignalConnected(int signal_index) const
+{
     if (signal_index < (int)sizeof(connectedSignals) * 8
         && !qt_signal_spy_callback_set.signal_begin_callback
         && !qt_signal_spy_callback_set.signal_end_callback) {
@@ -3721,7 +3722,7 @@ void QObject::dumpObjectInfo()
             qDebug("        signal: %s", signal.signature());
 
             // receivers
-            const QObjectPrivate::Connection *c = 
+            const QObjectPrivate::Connection *c =
                 d->connectionLists->at(signal_index).first;
             while (c) {
                 if (!c->receiver) {
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index aa538bc..d85faee 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -381,7 +381,7 @@ inline QList<T> qFindChildren(const QObject *o, const QRegExp &re)
 #endif // Q_MOC_RUN
 
 
-template <class T> inline const char * qobject_interface_iid() 
+template <class T> inline const char * qobject_interface_iid()
 { return 0; }
 
 template <class T> inline T qobject_cast_helper(QObject *object, T)
@@ -465,7 +465,7 @@ inline T qobject_cast(const QObject *object)
 }
 
 
-template <class T> inline const char * qobject_interface_iid() 
+template <class T> inline const char * qobject_interface_iid()
 { return 0; }
 
 #ifndef Q_MOC_RUN