various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

src/core/kernel/qtimer.cpp

@@ -222,9 +222,6 @@ void QTimer::start(int msec)
     start();
 }
 
-
-
-
 /*!
     Stops the timer.
 
@@ -239,7 +236,6 @@ void QTimer::stop()
     }
 }
 
-
 /*!
   \reimp
 */
@@ -293,11 +289,6 @@ void QSingleShotTimer::timerEvent(QTimerEvent *)
     delete this;
 }
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include "moc_qtimer.cpp"
-#include "moc_qtimer.h"
-QT_END_INCLUDE_NAMESPACE
-
 /*!
     \reentrant
     This static function calls a slot after a given time interval.
@@ -372,4 +363,7 @@ void QTimer::setInterval(const int msec)
    Use setInterval(msec) or start(msec) instead.
 */
 
+#include "moc_qtimer.cpp"
+#include "moc_qtimer.h"
+
 QT_END_NAMESPACE

src/core/plugin/qlibrary_unix.cpp

@@ -57,14 +57,12 @@
 #define QT_NO_DYNAMIC_LIBRARY
 #endif
 
-QT_BEGIN_NAMESPACE
-
 #if !defined(QT_HPUX_LD) && !defined(QT_NO_DYNAMIC_LIBRARY)
-QT_BEGIN_INCLUDE_NAMESPACE
 #include <dlfcn.h>
-QT_END_INCLUDE_NAMESPACE
 #endif
 
+QT_BEGIN_NAMESPACE
+
 static QString qdlerror()
 {
 #if defined(QT_NO_DYNAMIC_LIBRARY)

src/core/tools/qvsnprintf.cpp

@@ -45,11 +45,12 @@
 #include "qstring.h"
 
 #include "string.h"
+#ifdef QT_VSNPRINTF
+#include <stdio.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_VSNPRINTF
-
 /*!
     \relates QByteArray
 
@@ -74,6 +75,7 @@ QT_BEGIN_NAMESPACE
 
 int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
 {
+#ifndef QT_VSNPRINTF
     if (!str || !fmt)
         return -1;
 
@@ -89,20 +91,10 @@ int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
     }
 
     return ba.length();
-}
-
 #else
-
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <stdio.h>
-QT_END_INCLUDE_NAMESPACE
-
-int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
-{
     return QT_VSNPRINTF(str, n, fmt, ap);
-}
-
 #endif
+}
 
 /*!
     \relates QByteArray

src/gui/dialogs/qinputdialog.cpp

@@ -57,7 +57,7 @@
 #include "qevent.h"
 #include "qdialog_p.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 static const char *signalForMember(const char *member)
 {
@@ -80,8 +80,6 @@ static const char *signalForMember(const char *member)
     return candidateSignals[i];
 }
 
-QT_BEGIN_NAMESPACE
-
 /*
     These internal classes add extra validation to QSpinBox and QDoubleSpinBox by emitting
     textChanged(bool) after events that may potentially change the visible text. Return or
@@ -158,10 +156,6 @@ private:
     }
 };
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include "moc_qinputdialog.cpp"
-QT_END_INCLUDE_NAMESPACE
-
 class QInputDialogPrivate : public QDialogPrivate
 {
     Q_DECLARE_PUBLIC(QInputDialog)
@@ -1433,5 +1427,6 @@ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QStri
 QT_END_NAMESPACE
 
 #include "moc_qinputdialog.h"
+#include "moc_qinputdialog.cpp"
 
 #endif // QT_NO_INPUTDIALOG

src/gui/image/qpixmapcache.cpp

@@ -201,10 +201,6 @@ private:
     bool t;
 };
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include "moc_qpixmapcache.cpp"
-QT_END_INCLUDE_NAMESPACE
-
 uint qHash(const QPixmapCache::Key &k)
 {
     return qHash(QPMCache::get(k)->key);
@@ -664,3 +660,4 @@ QList< QPair<QString,QPixmap> > QPixmapCache::allPixmaps()
 
 QT_END_NAMESPACE
 
+#include "moc_qpixmapcache.cpp"

src/gui/itemviews/qabstractitemview_p.h

@@ -64,6 +64,7 @@
 #include "QtGui/qevent.h"
 #include "QtGui/qpainter.h"
 #include "QtGui/qregion.h"
+#include <qvector.h>
 
 #ifndef QT_NO_ITEMVIEWS
 
@@ -418,10 +419,6 @@ private:
     mutable QBasicTimer fetchMoreTimer;
 };
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <qvector.h>
-QT_END_INCLUDE_NAMESPACE
-
 template <typename T>
 inline int qBinarySearch(const QVector<T> &vec, const T &item, int start, int end)
 {

src/gui/itemviews/qcolumnviewgrip.cpp

@@ -137,7 +137,6 @@ void QColumnViewGrip::paintEvent(QPaintEvent *event)
 */
 void QColumnViewGrip::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    Q_UNUSED(event);
     QWidget *parentWidget = (QWidget*)parent();
     int offset = parentWidget->sizeHint().width() - parentWidget->width();
     if (isRightToLeft())

src/gui/itemviews/qlistwidget.cpp

@@ -56,12 +56,6 @@ public:
     QList<QListWidgetItem*> items;
 };
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include "moc_qlistwidget.h"
-#include "moc_qlistwidget_p.h"
-#include "moc_qlistwidget.cpp"
-QT_END_INCLUDE_NAMESPACE
-
 QListModel::QListModel(QListWidget *parent)
     : QAbstractListModel(parent)
 {
@@ -1912,4 +1906,8 @@ bool QListWidget::event(QEvent *e)
 
 QT_END_NAMESPACE
 
+#include "moc_qlistwidget.h"
+#include "moc_qlistwidget_p.h"
+#include "moc_qlistwidget.cpp"
+
 #endif // QT_NO_LISTWIDGET

src/gui/itemviews/qtreewidget_p.h

@@ -59,6 +59,7 @@
 #include <QtGui/qtreewidget.h>
 #include <qtreeview_p.h>
 #include <QtGui/qheaderview.h>
+#include "qabstractitemmodel_p.h"
 
 #ifndef QT_NO_TREEWIDGET
 
@@ -175,10 +176,6 @@ public:
     friend struct SkipSorting;
 };
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include "qabstractitemmodel_p.h"
-QT_END_INCLUDE_NAMESPACE
-
 class QTreeModelPrivate : public QAbstractItemModelPrivate
 {
     Q_DECLARE_PUBLIC(QTreeModel)
@@ -193,8 +190,8 @@ public:
     void sortChildren(int column, Qt::SortOrder order, bool climb);
     QTreeWidgetItem *q;
     QVariantList display;
-    uint disabled : 1;
-    uint selected : 1;
+    bool disabled;
+    bool selected;
     int rowGuess;
     QTreeWidgetItem::ChildIndicatorPolicy policy;
 };

src/gui/kernel/qaction.h

@@ -42,17 +42,16 @@
 #ifndef QACTION_H
 #define QACTION_H
 
-#include <QtGui/qkeysequence.h>
 #include <QtCore/qstring.h>
-#include <QtGui/qwidget.h>
 #include <QtCore/qvariant.h>
+#include <QtGui/qkeysequence.h>
+#include <QtGui/qwidget.h>
 #include <QtGui/qicon.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
 #ifndef QT_NO_ACTION
 
 class QMenu;
@@ -208,14 +207,12 @@ private:
     friend class QToolButton;
 };
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <QtGui/qactiongroup.h>
-QT_END_INCLUDE_NAMESPACE
-
 #endif // QT_NO_ACTION
 
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
+#include <QtGui/qactiongroup.h>
+
 #endif // QACTION_H

src/gui/kernel/qapplication_x11.cpp

@@ -4190,12 +4190,6 @@ void QSmSocketReceiver::socketActivated(int)
     IceProcessMessages(SmcGetIceConnection(smcConnection), 0, 0);
 }
 
-
-QT_BEGIN_INCLUDE_NAMESPACE
-#include "moc_qapplication_x11.cpp"
-#include "moc_qsessionmanager.h"
-QT_END_INCLUDE_NAMESPACE
-
 QSessionManager::QSessionManager(QApplication * app, QString &id, QString& key)
     : QObject(*new QSessionManagerPrivate(this, id, key), app)
 {
@@ -4625,3 +4619,5 @@ void QApplicationPrivate::cleanupMultitouch_sys()
 
 QT_END_NAMESPACE
 
+#include "moc_qapplication_x11.cpp"
+#include "moc_qsessionmanager.h"

src/gui/kernel/qkeymapper_p.h

@@ -59,6 +59,10 @@
 #include <qlocale.h>
 #include <qevent.h>
 
+#if defined(Q_WS_X11)
+#    include "qt_x11_p.h"
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QKeyMapperPrivate;
@@ -83,15 +87,7 @@ private:
     Q_DISABLE_COPY(QKeyMapper)
 };
 
-
-
 #if defined(Q_WS_X11)
-
-QT_BEGIN_INCLUDE_NAMESPACE
-typedef ulong XID;
-typedef XID KeySym;
-QT_END_INCLUDE_NAMESPACE
-
 struct QXCoreDesc {
     int min_keycode;
     int max_keycode;
@@ -101,7 +97,6 @@ struct QXCoreDesc {
     uchar num_lock;
     KeySym lock_meaning;
 };
-
 #endif
 
 class QKeyEvent;

src/gui/painting/qregion.cpp

@@ -46,7 +46,6 @@
 #include "qdatastream.h"
 #include "qvariant.h"
 #include "qvarlengtharray.h"
-
 #include <qdebug.h>
 
 #if defined(Q_OS_UNIX)
@@ -3838,7 +3837,6 @@ QRegion::QRegion(const QRegion &r)
     d->ref.ref();
 }
 
-
 QRegion::QRegion(const QBitmap &bm)
 {
     if (bm.isNull()) {
@@ -3883,7 +3881,6 @@ QRegion &QRegion::operator=(const QRegion &r)
     return *this;
 }
 
-
 /*!
     \internal
 */
@@ -3911,7 +3908,6 @@ bool QRegion::isEmpty() const
     return d == &shared_empty || d->qt_rgn->numRects == 0;
 }
 
-
 bool QRegion::contains(const QPoint &p) const
 {
     return PointInRegion(d->qt_rgn, p.x(), p.y());
@@ -3922,8 +3918,6 @@ bool QRegion::contains(const QRect &r) const
     return RectInRegion(d->qt_rgn, r.left(), r.top(), r.width(), r.height()) != RectangleOut;
 }
 
-
-
 void QRegion::translate(int dx, int dy)
 {
     if ((dx == 0 && dy == 0) || isEmptyHelper(d->qt_rgn))
@@ -4294,9 +4288,8 @@ bool QRegion::intersects(const QRect &rect) const
             return true;
     return false;
 }
-
-
 #endif
+
 QT_END_NAMESPACE
 
 

src/gui/styles/qstyle.cpp

@@ -48,9 +48,7 @@
 #include "qstyleoption.h"
 #include "qstyle_p.h"
 #include "qpen.h"
-#ifndef QT_NO_DEBUG
 #include "qdebug.h"
-#endif
 
 #ifdef Q_WS_X11
 #include <qx11info_x11.h>
@@ -2256,10 +2254,6 @@ int QStyle::combinedLayoutSpacing(QSizePolicy::ControlTypes controls1,
     return result;
 }
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <QDebug>
-QT_END_INCLUDE_NAMESPACE
-
 #if !defined(QT_NO_DEBUG_STREAM)
 QDebug operator<<(QDebug debug, QStyle::State state)
 {

src/gui/styles/qwindowsstyle.cpp

@@ -67,16 +67,13 @@
 #include "qlistview.h"
 #include "qmath_p.h"
 #include "qmath.h"
+#include "qstylehelper_p.h"
 #include "qguicommon_p.h"
 
-#include "qstylehelper_p.h"
+#include <limits.h>
 
 QT_BEGIN_NAMESPACE
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <limits.h>
-QT_END_INCLUDE_NAMESPACE
-
 enum QSliderDirection { SlUp, SlDown, SlLeft, SlRight };
 
 /*
@@ -2612,7 +2609,6 @@ QSize QWindowsStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
 
 QT_END_NAMESPACE
 
-
 #include "moc_qwindowsstyle.h"
 
 #endif // QT_NO_STYLE_WINDOWS

src/gui/text/qharfbuzz.cpp

@@ -45,7 +45,7 @@
 
 #include "qharfbuzz_p.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 extern "C" {
 
@@ -113,8 +113,6 @@ void *HB_Library_Resolve(const char *library, int version, const char *symbol)
 
 } // extern "C"
 
-QT_BEGIN_NAMESPACE
-
 HB_Bool qShapeItem(HB_ShaperItem *item)
 {
     return HB_ShapeItem(item);

src/gui/text/qtextengine.cpp

@@ -59,6 +59,10 @@
 #endif
 
 #include <stdlib.h>
+#define BIDI_DEBUG 0
+#if (BIDI_DEBUG >= 1)
+#    include <iostream>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -225,14 +229,7 @@ private:
 // The BiDi algorithm
 //
 // ----------------------------------------------------------------------------
-
-#define BIDI_DEBUG 0
 #if (BIDI_DEBUG >= 1)
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <iostream>
-QT_END_INCLUDE_NAMESPACE
-using namespace std;
-
 static const char *directions[] = {
     "DirL", "DirR", "DirEN", "DirES", "DirET", "DirAN", "DirCS", "DirB", "DirS", "DirWS", "DirON",
     "DirLRE", "DirLRO", "DirAL", "DirRLE", "DirRLO", "DirPDF", "DirNSM", "DirBN"

src/network/access/qftp.cpp

@@ -57,6 +57,7 @@
 #include "qhash.h"
 #include "qtcpserver.h"
 #include "qlocale.h"
+#include <qobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -1283,11 +1284,6 @@ void QFtpPI::dtpConnectState(int s)
  * QFtpPrivate
  *
  *********************************************************************/
-
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <qobject_p.h>
-QT_END_INCLUDE_NAMESPACE
-
 class QFtpPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QFtp)

src/network/socket/qabstractsocket.cpp

@@ -368,10 +368,8 @@
 
 #include "qabstractsocket.h"
 #include "qabstractsocket_p.h"
-
 #include "qhostinfo_p.h"
 #include "qnetworksession_p.h"
-
 #include <qabstracteventdispatcher.h>
 #include <qhostaddress.h>
 #include <qhostinfo.h>
@@ -381,9 +379,8 @@
 #include <qelapsedtimer.h>
 #include <qscopedvaluerollback.h>
 #include <qsslsocket.h>
-#include "qnetworkcommon_p.h"
-
 #include <qthread_p.h>
+#include "qnetworkcommon_p.h"
 
 #ifdef QABSTRACTSOCKET_DEBUG
 #include <qdebug.h>