generic: namespaced Qt4/Katie build fixes

most of the changes were done trought Katie's namefsck script which
convertes forward class declarations to include directives, however
other fixes here and there were needed as well as some questionable
changes to Q_DECLARE_TYPEINFO() macro calls because they most likely
have to do the namespacing themselfs (QT_BEGIN/END_NAMESPACE, and
probably will be in Katie) meaning that some of the changes may be
temporary and reverted later.

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

dnssd/avahi-servicebrowser_p.h

@@ -32,7 +32,7 @@ namespace DNSSD
 
 class ServiceBrowserPrivate : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 public:
 	ServiceBrowserPrivate(ServiceBrowser* parent) : QObject(), m_running(false), m_browser(0), m_parent(parent)
 	{}

dnssd/avahi-servicetypebrowser_p.h

@@ -31,7 +31,7 @@ namespace DNSSD
 
 class ServiceTypeBrowserPrivate : public QObject 
 {   
-Q_OBJECT
+    Q_OBJECT
 public: 
     ServiceTypeBrowserPrivate(ServiceTypeBrowser* parent) : m_browser(0), m_parent(parent),m_started(false) {}
     ~ServiceTypeBrowserPrivate() {  if (m_browser) m_browser->Free(); }

dnssd/domainbrowser.h

@@ -22,9 +22,9 @@
 #define DNSSDDOMAINBROWSER_H
 
 #include <QtCore/QObject>
+#include <QtCore/QStringList>
 #include <dnssd/remoteservice.h>
 
-class QStringList;
 namespace DNSSD
 {
 class DomainBrowserPrivate;

dnssd/mdnsd-domainbrowser_p.h

@@ -21,9 +21,9 @@
 #ifndef MDNSD_DOMAINBROWSER_P_H
 #define MDNSD_DOMAINBROWSER_P_H
 
+#include <QtCore/QStringList>
 #include "mdnsd-responder.h"
 #include "domainbrowser.h"
-#include <QtCore/QStringList>
 
 namespace DNSSD
 {

dnssd/publicservice.h

@@ -22,8 +22,8 @@
 #define DNSSDPUBLICSERVICE_H
 
 #include <QtCore/QObject>
-#include <dnssd/servicebase.h>
 #include <QtCore/QStringList>
+#include <dnssd/servicebase.h>
 
 namespace DNSSD
 {

dnssd/servicetypebrowser.h

@@ -22,9 +22,9 @@
 #define DNSSDSERVICETYPEBROWSER_H
 
 #include <QtCore/QObject>
+#include <QtCore/QStringList>
 #include <dnssd/remoteservice.h>
 
-class QStringList;
 namespace DNSSD
 {
 class ServiceTypeBrowserPrivate;

interfaces/ktexteditor/annotationinterface.h

@@ -24,8 +24,7 @@
 #include <ktexteditor/ktexteditor_export.h>
 
 #include <QtCore/QObject>
-
-class QMenu;
+#include <QtGui/QMenu>
 
 namespace KTextEditor
 {

interfaces/ktexteditor/codecompletionmodelcontrollerinterface.h

@@ -25,7 +25,7 @@
 #include <ktexteditor/cursor.h>
 #include "codecompletionmodel.h"
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace KTextEditor {
 class View;

interfaces/ktexteditor/commandinterface.h

@@ -25,8 +25,8 @@
 #include <ktexteditor/ktexteditor_export.h>
 #include <ktexteditor/range.h>
 #include <QtCore/QObject>
+#include <QtCore/QStringList>
 
-class QStringList;
 class KCompletion;
 
 namespace KTextEditor

interfaces/ktexteditor/editorchooser.h

@@ -23,10 +23,10 @@
 #include <ktexteditor/document.h>
 #include <ktexteditor/editor.h>
 
+#include <QtCore/QString>
 #include <QtGui/QWidget>
 
 class KConfig;
-class QString;
 
 namespace KTextEditor
 {

interfaces/ktexteditor/markinterface.h

@@ -25,10 +25,9 @@
 
 #include <QtCore/QHash>
 #include <QtCore/QObject>
-
-class QPixmap;
-class QPoint;
-class QMenu;
+#include <QtCore/QPoint>
+#include <QtGui/QPixmap>
+#include <QtGui/QMenu>
 
 namespace KTextEditor
 {

interfaces/ktexteditor/searchinterface.h

@@ -24,7 +24,7 @@
 #include <ktexteditor/ktexteditor_export.h>
 #include <ktexteditor/range.h>
 
-class QString;
+#include <QString>
 
 namespace KTextEditor
 {

interfaces/ktexteditor/smartinterface.h

@@ -23,7 +23,7 @@
 #include <ktexteditor/ktexteditor_export.h>
 #include <ktexteditor/smartrange.h>
 
-class QMutex;
+#include <QMutex>
 
 namespace KTextEditor
 {

interfaces/ktexteditor/smartrange.h

@@ -28,7 +28,7 @@
 #include <QtCore/QList>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-template <class T> class QStack;
+#include <QStack>
 #endif
 
 class KAction;

interfaces/ktexteditor/variableinterface.h

@@ -26,7 +26,7 @@
 
 #include <QtCore/QObject>
 
-class QString;
+#include <QString>
 
 namespace KTextEditor {
 

interfaces/ktexteditor/view.h

@@ -29,7 +29,7 @@
 // widget
 #include <QtGui/QWidget>
 
-class QMenu;
+#include <QMenu>
 
 namespace KTextEditor
 {

interfaces/terminal/kde_terminal_interface.h

@@ -21,7 +21,7 @@
 
 #include <QtCore/QObject>
 
-class QStringList;
+#include <QStringList>
 
 /**
  * TerminalInterface is an interface implemented by KonsolePart to

kcddb/libkcddb/cdinfodialog.h

@@ -26,8 +26,8 @@
 
 #include <kdialog.h>
 
-class QStandardItemModel;
-class QModelIndex;
+#include <QStandardItemModel>
+#include <QModelIndex>
 
 namespace KCDDB
 {

kdeclarative/bindings/i18n_p.h

@@ -21,8 +21,8 @@
 
 #include <QtScript/QScriptValue>
 
-class QScriptContext;
-class QScriptEngine;
+#include <QScriptContext>
+#include <QScriptEngine>
 
 QScriptValue jsi18n(QScriptContext *context, QScriptEngine *engine);
 QScriptValue jsi18nc(QScriptContext *context, QScriptEngine *engine);

kdeclarative/kdeclarative.h

@@ -24,8 +24,8 @@
 
 #include <QStringList>
 
-class QDeclarativeEngine;
-class QScriptEngine;
+#include <QDeclarativeEngine>
+#include <QScriptEngine>
 
 class KDeclarativePrivate;
 

kdecore/date/kcalendarsystemprivate_p.h

@@ -20,9 +20,9 @@
 #ifndef KCALENDARSYSTEMPRIVATE_H
 #define KCALENDARSYSTEMPRIVATE_H
 
-class QChar;
-class QString;
-class QDate;
+#include <QChar>
+#include <QString>
+#include <QDate>
 
 class KCalendarSystem;
 class KCalendarEra;

kdecore/date/kdatetime.cpp

@@ -242,6 +242,7 @@ bool KDateTime::Spec::equivalentTo(const Spec &other) const
     }
 }
 
+QT_BEGIN_NAMESPACE
 QDataStream & operator<<(QDataStream &s, const KDateTime::Spec &spec)
 {
     // The specification type is encoded in order to insulate from changes
@@ -303,6 +304,7 @@ QDataStream & operator>>(QDataStream &s, KDateTime::Spec &spec)
     }
     return s;
 }
+QT_END_NAMESPACE
 
 
 /*----------------------------------------------------------------------------*/
@@ -2434,6 +2436,7 @@ KDateTime KDateTime::realCurrentLocalDateTime()
 #endif
 }
 
+QT_BEGIN_NAMESPACE
 QDataStream & operator<<(QDataStream &s, const KDateTime &dt)
 {
     s << dt.date() << dt.time() << dt.timeSpec() << quint8(dt.isDateOnly() ? 0x01 : 0x00);
@@ -2453,6 +2456,7 @@ QDataStream & operator>>(QDataStream &s, KDateTime &kdt)
         kdt = KDateTime(d, t, spec);
     return s;
 }
+QT_END_NAMESPACE
 
 
 /*

kdecore/date/kdatetime.h

@@ -28,9 +28,9 @@
 
 #include <ktimezone.h>
 
-#include <QtCore/qmetatype.h>
+#include <QMetaType>
+#include <QDataStream>
 
-class QDataStream;
 class KDateTimePrivate;
 class KDateTimeSpecPrivate;
 
@@ -1626,6 +1626,7 @@ class KDECORE_EXPORT KDateTime //krazy:exclude=dpointer (implicitly shared)
 Q_DECLARE_METATYPE(KDateTime)
 Q_DECLARE_METATYPE(KDateTime::Spec)
 
+QT_BEGIN_NAMESPACE
 /** Write @p spec to the datastream @p out, in binary format. */
 QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime::Spec &spec);
 /** Read a KDateTime::Spec object into @p spec from @p in, in binary format. */
@@ -1635,5 +1636,6 @@ QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTime::Spec &spec);
 QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime &dateTime);
 /** Read a KDateTime object into @p dateTime from @p in, in binary format. */
 QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTime &dateTime);
+QT_END_NAMESPACE
 
 #endif

kdecore/date/kdatetimeformatter_p.h

@@ -23,10 +23,10 @@
 #include "klocale.h"
 #include "kglobal.h"
 
-class QChar;
-class QString;
-class QDate;
-class QTime;
+#include <QChar>
+#include <QString>
+#include <QDate>
+#include <QTime>
 
 class KDateTime;
 class KCalendarSystem;

kdecore/date/kdatetimeparser_p.h

@@ -23,10 +23,10 @@
 #include "klocale.h"
 #include "kglobal.h"
 
-class QChar;
-class QString;
-class QDate;
-class QTime;
+#include <QChar>
+#include <QString>
+#include <QDate>
+#include <QTime>
 
 class KDateTime;
 class KCalendarSystem;

kdecore/date/kdayperiod_p.h

@@ -25,9 +25,9 @@
 #include "klocale.h"
 #include <kdecore_export.h>
 
-class QDate;
-class QString;
-class QTime;
+#include <QDate>
+#include <QString>
+#include <QTime>
 
 class KDayPeriodPrivate;
 

kdecore/date/klocalizeddate.cpp

@@ -587,6 +587,7 @@ bool KLocalizedDate::operator>=(const QDate &rhs) const
     return (date() >= rhs);
 }
 
+QT_BEGIN_NAMESPACE
 QDataStream &operator<<(QDataStream &out, const KLocalizedDate &date)
 {
     return out << (quint32)(date.toJulianDay()) << date.calendar()->calendarSystem();
@@ -614,3 +615,4 @@ QDebug operator<<(QDebug dbg, const KLocalizedDate &date)
     }
     return dbg.space();
 }
+QT_END_NAMESPACE

kdecore/date/klocalizeddate.h

@@ -1157,6 +1157,7 @@ private:
 
 Q_DECLARE_METATYPE(KLocalizedDate)
 
+QT_BEGIN_NAMESPACE
 /**
  * Data stream output operator
  *
@@ -1180,5 +1181,6 @@ QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date);
  * @param date the date to write to the stream
  */
 QDebug KDECORE_EXPORT operator<<(QDebug debug, const KLocalizedDate &date);
+QT_END_NAMESPACE
 
 #endif // KLOCALIZEDDATE_H

kdecore/io/kdebug.h

@@ -192,7 +192,7 @@ KDECORE_EXPORT QDebug perror(QDebug, KDebugTag);
 // operators for KDE types
 class KUrl;
 class KDateTime;
-class QObject;
+#include <QObject>
 KDECORE_EXPORT QDebug operator<<(QDebug s, const KUrl &url);
 KDECORE_EXPORT QDebug operator<<(QDebug s, const KDateTime &time);
 

kdecore/io/kdirwatch_p.h

@@ -34,6 +34,7 @@
 #include <QtCore/qmap.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qtimer.h>
+#include <QtCore/qsocketnotifier.h>
 
 #ifdef HAVE_FAM
 #include <limits.h>

kdecore/jobs/kjob_p.h

@@ -26,8 +26,8 @@
 #include <QtCore/qmap.h>
 
 class KJobUiDelegate;
-class QTimer;
-class QEventLoop;
+#include <QTimer>
+#include <QEventLoop>
 
 // This is a private class, but it's exported for
 // KIO::Job's usage. Other Job classes in kdelibs may

kdecore/kernel/kauthorized.h

@@ -24,8 +24,8 @@
 #include <kdecore_export.h>
 
 class KUrl;
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 /**
 * Extracted from kapplication (3.x). Kiosk authorization framework

kdecore/localization/kcatalog.cpp

@@ -31,37 +31,13 @@
 #include <locale.h>
 #include "gettext.h"
 
-
-static bool s_localeSet = false;
-
-// Initialize the locale very early during application startup
-// This is necessary for e.g. toLocal8Bit() to work, even before
-// a Q[Core]Application exists (David)
-int kInitializeLocale()
-{
-    setlocale(LC_ALL, "");
-    extern Q_CORE_EXPORT bool qt_locale_initialized; // in Qt since 4.5.0
-    qt_locale_initialized = true; // as recommended by Thiago
-    s_localeSet = true;
-    return 1;
-}
-Q_CONSTRUCTOR_FUNCTION(kInitializeLocale)
-
 // not defined on win32 :(
 
 static char *langenv = 0;
 static const int langenvMaxlen = 42;
 // = "LANGUAGE=" + 32 chars for language code + terminating zero
 
-class KCatalogStaticData
-{
-public:
-    KCatalogStaticData() {}
-
-    QMutex mutex;
-};
-
-K_GLOBAL_STATIC(KCatalogStaticData, catalogStaticData)
+Q_GLOBAL_STATIC(QMutex, catalogLock)
 
 class KCatalogPrivate
 {
@@ -93,10 +69,7 @@ QByteArray KCatalogPrivate::currentLanguage;
 KCatalog::KCatalog(const QString & name, const QString & language )
   : d( new KCatalogPrivate )
 {
-    // Set locales if the static initializer didn't work
-    if (!s_localeSet) {
-        kInitializeLocale();
-    }
+  setlocale(LC_ALL, "");
 
   // Find locale directory for this catalog.
   QString localeDir = catalogLocaleDir( name, language );
@@ -203,7 +176,7 @@ void KCatalogPrivate::resetSystemLanguage ()
 
 QString KCatalog::translate(const char * msgid) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dgettext(d->name, msgid);
   d->resetSystemLanguage();
@@ -212,7 +185,7 @@ QString KCatalog::translate(const char * msgid) const
 
 QString KCatalog::translate(const char * msgctxt, const char * msgid) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dpgettext_expr(d->name, msgctxt, msgid);
   d->resetSystemLanguage();
@@ -222,7 +195,7 @@ QString KCatalog::translate(const char * msgctxt, const char * msgid) const
 QString KCatalog::translate(const char * msgid, const char * msgid_plural,
                             unsigned long n) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dngettext(d->name, msgid, msgid_plural, n);
   d->resetSystemLanguage();
@@ -232,7 +205,7 @@ QString KCatalog::translate(const char * msgid, const char * msgid_plural,
 QString KCatalog::translate(const char * msgctxt, const char * msgid,
                             const char * msgid_plural, unsigned long n) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dnpgettext_expr(d->name, msgctxt, msgid, msgid_plural, n);
   d->resetSystemLanguage();
@@ -241,7 +214,7 @@ QString KCatalog::translate(const char * msgctxt, const char * msgid,
 
 QString KCatalog::translateStrict(const char * msgid) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dgettext(d->name, msgid);
   d->resetSystemLanguage();
@@ -250,7 +223,7 @@ QString KCatalog::translateStrict(const char * msgid) const
 
 QString KCatalog::translateStrict(const char * msgctxt, const char * msgid) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dpgettext_expr(d->name, msgctxt, msgid);
   d->resetSystemLanguage();
@@ -260,7 +233,7 @@ QString KCatalog::translateStrict(const char * msgctxt, const char * msgid) cons
 QString KCatalog::translateStrict(const char * msgid, const char * msgid_plural,
                                   unsigned long n) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dngettext(d->name, msgid, msgid_plural, n);
   d->resetSystemLanguage();
@@ -270,7 +243,7 @@ QString KCatalog::translateStrict(const char * msgid, const char * msgid_plural,
 QString KCatalog::translateStrict(const char * msgctxt, const char * msgid,
                                   const char * msgid_plural, unsigned long n) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dnpgettext_expr(d->name, msgctxt, msgid, msgid_plural, n);
   d->resetSystemLanguage();

kdecore/localization/kcharsets.h

@@ -25,10 +25,10 @@
 class KCharsets;
 class KCharsetsPrivate;
 
-class QChar;
-class QString;
-class QStringList;
-class QTextCodec;
+#include <QChar>
+#include <QString>
+#include <QStringList>
+#include <QTextCodec>
 
 namespace KGlobal
 {

kdecore/localization/kcurrencycode.h

@@ -25,9 +25,9 @@
 #include <QtCore/qshareddata.h>
 #include <QtCore/qdatetime.h>
 
-class QDate;
-class QStringList;
-class QFileInfo;
+#include <QDate>
+#include <QStringList>
+#include <QFileInfo>
 
 class KCurrencyCodePrivate;
 

kdecore/localization/kencodingdetector.h

@@ -26,8 +26,8 @@
 #include <kdecore_export.h>
 #include <QtCore/qstring.h>
 
-class QTextCodec;
-class QTextDecoder;
+#include <QTextCodec>
+#include <QTextDecoder>
 class KEncodingDetectorPrivate;
 
 /**

kdecore/localization/klocale_p.h

@@ -24,7 +24,7 @@
 #include "klocale.h"
 #include "kdayperiod_p.h"
 
-class QMutex;
+#include <QMutex>
 
 class KCatalog;
 

kdecore/network/klocalsocket_p.h

@@ -24,7 +24,7 @@
 #include "klocalsocket.h"
 #define MIN_SOCKADDR_UN_LEN	(sizeof(quint16) + sizeof(char))
 
-class QSocketNotifier;
+#include <QSocketNotifier>
 
 class KLocalSocketPrivate
 {

kdecore/network/ksocketfactory.h

@@ -26,10 +26,10 @@
 #include <QtNetwork/QNetworkProxy>
 #include <QtNetwork/QHostAddress>
 
-class QTcpSocket;
-class QTcpServer;
-class QUdpSocket;
-class QUrl;
+#include <QTcpSocket>
+#include <QTcpServer>
+#include <QUdpSocket>
+#include <QUrl>
 
 /**
  * @namespace KSocketFactory

kdecore/network/ksslcertificatemanager.h

@@ -27,7 +27,7 @@
 #include <QtNetwork/QSslError>
 #include <QtCore/qdatetime.h>
 
-class QSslCertificate;
+#include <QSslCertificate>
 class KSslCertificateRulePrivate;
 class KSslCertificateManagerPrivate;
 

kdecore/network/kssld/kssld.h

@@ -28,8 +28,8 @@
 
 class KSSLDPrivate;
 class KSslCertificateRule;
-class QSslCertificate;
-class QString;
+#include <QSslCertificate>
+#include <QString>
 
 class KSSLD : public KDEDModule
 {

kdecore/network/kssld/kssld_dbusmetatypes.h

@@ -31,6 +31,7 @@ Q_DECLARE_METATYPE(QList<QSslCertificate>)
 Q_DECLARE_METATYPE(KSslError::Error)
 Q_DECLARE_METATYPE(QList<KSslError::Error>)
 
+QT_BEGIN_NAMESPACE
 
 QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert)
 {
@@ -102,6 +103,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, KSslError::Error
     return argument;
 }
 
+QT_END_NAMESPACE
 
 static void registerMetaTypesForKSSLD()
 {

kdecore/network/ktcpsocket.h

@@ -138,7 +138,7 @@ private:
 //TODO protocol (or maybe even application?) dependent automatic proxy choice
 
 class KTcpSocketPrivate;
-class QHostAddress;
+#include <QHostAddress>
 class KUrl;
 
 class KDECORE_EXPORT KTcpSocket: public QIODevice

kdecore/services/kmimeglobsfileparser_p.h

@@ -23,8 +23,8 @@
 #include <kdebug.h>
 #include <QtCore/QHash>
 
-class QIODevice;
-class QString;
+#include <QIODevice>
+#include <QString>
 
 /**
  * @internal

kdecore/services/kmimemagicrule_p.h

@@ -23,7 +23,7 @@
 #include <QList>
 #include <QString>
 
-class QIODevice;
+#include <QIODevice>
 
 /**
  * @internal

kdecore/services/kservice.h

@@ -27,10 +27,11 @@
 #include <ksycocaentry.h>
 #include <klocale.h>
 
+#include <QDataStream>
+#include <QWidget>
+
 class KServiceType;
-class QDataStream;
 class KDesktopFile;
-class QWidget;
 
 class KServicePrivate;
 

kdecore/services/kserviceaction.h

@@ -21,10 +21,11 @@
 #define KSERVICEACTION_H
 
 #include <kdecore_export.h>
+
 #include <QtCore/qshareddata.h>
 #include <QtCore/qdatastream.h>
+#include <QtCore/qvariant.h>
 
-class QVariant;
 class KServiceActionPrivate;
 
 /**
@@ -115,6 +116,7 @@ private:
     friend KDECORE_EXPORT QDataStream& operator<<( QDataStream& str, const KServiceAction& act );
 };
 
+// FIXME: namespace the operators via QT_BEGIN_NAMEPSACE/QT_END_NAMESPACE
 KDECORE_EXPORT QDataStream& operator>>( QDataStream& str, KServiceAction& act );
 KDECORE_EXPORT QDataStream& operator<<( QDataStream& str, const KServiceAction& act );
 

kdecore/services/kservicetype.cpp

@@ -31,9 +31,6 @@
 
 extern int servicesDebugArea();
 
-template QDataStream& operator>> <QString, QVariant>(QDataStream&, QMap<QString, QVariant>&);
-template QDataStream& operator<< <QString, QVariant>(QDataStream&, const QMap<QString, QVariant>&);
-
 KServiceType::KServiceType( KServiceTypePrivate &dd, const QString& _name,
                             const QString& _comment )
     : KSycocaEntry(dd)

kdecore/services/kservicetype.h

@@ -178,7 +178,9 @@ private:
     Q_DECLARE_PRIVATE(KServiceType)
 };
 
+//QT_BEGIN_NAMESPACE
 //QDataStream& operator>>( QDataStream& _str, KServiceType& s );
 //QDataStream& operator<<( QDataStream& _str, KServiceType& s );
+//QT_END_NAMESPACE
 
 #endif

kdecore/sycoca/kprotocolinfo.cpp

@@ -473,6 +473,7 @@ bool KProtocolInfo::isKnownProtocol( const QString &protocol )
   return prot || isHelperProtocol(protocol);
 }
 
+QT_BEGIN_NAMESPACE
 QDataStream& operator>>( QDataStream& s, KProtocolInfo::ExtraField& field )  {
   s >> field.name;
   int type;
@@ -486,3 +487,4 @@ QDataStream& operator<<( QDataStream& s, const KProtocolInfo::ExtraField& field
   s << static_cast<int>( field.type );
   return s;
 }
+QT_END_NAMESPACE

kdecore/sycoca/kprotocolinfo.h

@@ -23,7 +23,7 @@
 #include <ksycocaentry.h>
 #include <kservice.h>
 
-class QDataStream;
+#include <QDataStream>
 class KProtocolInfoPrivate;
 
 /**
@@ -370,7 +370,9 @@ private:
 
 };
 
+QT_BEGIN_NAMESPACE
 KDECORE_EXPORT QDataStream& operator>>( QDataStream& s, KProtocolInfo::ExtraField& field );
 KDECORE_EXPORT QDataStream& operator<<( QDataStream& s, const KProtocolInfo::ExtraField& field );
+QT_END_NAMESPACE
 
 #endif

kdecore/sycoca/ksycoca.h

@@ -26,7 +26,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 
-class QDataStream;
+#include <QDataStream>
 class KSycocaFactory;
 class KSycocaFactoryList;
 class KSycocaPrivate;

kdecore/sycoca/ksycocadict_p.h

@@ -24,8 +24,8 @@
 
 #include <QList>
 
-class QString;
-class QDataStream;
+#include <QString>
+#include <QDataStream>
 
 /**
  * @internal

kdecore/sycoca/ksycocafactory.h

@@ -21,11 +21,11 @@
 
 #include <ksycocaentry.h>
 
-class QString;
+#include <QString>
 class KSycocaDict;
 class KSycocaResourceList;
-template <typename T> class QList;
-template <typename KT, typename VT> class QHash;
+#include <QList>
+#include <QHash>
 
 typedef QHash<QString, KSycocaEntry::Ptr> KSycocaEntryDict;
 

kdecore/tests/kcalendartest.h

@@ -25,8 +25,8 @@
 
 #include "klocale.h"
 
-class QString;
-class QDate;
+#include <QString>
+#include <QDate>
 
 class KCalendarSystem;
 

kdecore/tests/kdatetimeformattertest.h

@@ -24,8 +24,8 @@
 
 #include "kdatetimeformatter_p.h"
 
-class QString;
-class QDate;
+#include <QString>
+#include <QDate>
 
 class KCalendarSystem;
 

kdecore/tests/kdirwatchtest_gui.h

@@ -22,7 +22,7 @@
 
 #include <QtGui/QDialog>
 
-class QTextBrowser;
+#include <QTextBrowser>
 
 class KDirWatchTest_GUI : public QWidget
 {

kdecore/tests/ktcpsockettest.h

@@ -47,8 +47,8 @@ public Q_SLOTS: //auxiliary slots to check signal emission from the socket
 };
 
 
-class QTcpServer;
-class QTcpSocket;
+#include <QTcpServer>
+#include <QTcpSocket>
 
 class Server : public QObject
 {

kdecore/util/kautostart.h

@@ -24,7 +24,7 @@
 
 #include <QtCore/QObject>
 
-class QStringList;
+#include <QStringList>
 
 /**
  * KAutostart provides a programmatic means to control the state of

kdecore/util/kdedmodule.h

@@ -30,7 +30,7 @@
 class KDEDModulePrivate;
 class Kded;
 
-class QDBusObjectPath;
+#include <QDBusObjectPath>
 
 /**
  * \class KDEDModule kdedmodule.h <KDEDModule>

kdecore/util/kmacroexpander.h

@@ -25,9 +25,9 @@
 #include <kdecore_export.h>
 #include <QtCore/QChar>
 
-class QString;
-class QStringList;
-template <typename KT, typename VT> class QHash;
+#include <QString>
+#include <QStringList>
+#include <QHash>
 class KMacroExpanderBasePrivate;
 
 /**

kdecore/util/kshell.h

@@ -24,8 +24,8 @@
 #include <kdecore_export.h>
 #include <qglobal.h>
 
-class QStringList;
-class QString;
+#include <QStringList>
+#include <QString>
 
 /**
  * \namespace KShell

kdecore/util/kshell_p.h

@@ -22,7 +22,7 @@
 #ifndef KSHELL_P_H
 #define KSHELL_P_H
 
-class QString;
+#include <QString>
 
 namespace KShell {
 

kdecore/util/kuser.h

@@ -28,9 +28,9 @@
 #include <QtCore/QVariant>
 
 class KUserGroup;
-class QString;
-class QStringList;
-template <class T> class QList;
+#include <QString>
+#include <QStringList>
+#include <QList>
 
 #include <sys/types.h>
 typedef uid_t K_UID;

kdecore/util/qtest_kde.cpp

@@ -54,10 +54,14 @@ private:
 
 // Unit test for this code: tests/kglobaltest.cpp
 
+QT_BEGIN_NAMESPACE
+
 bool QTest::kWaitForSignal(QObject *obj, const char *signal, int timeout )
 {
     KDESignalSpy spy(obj, signal, timeout);
     return spy.signalEmitted();
 }
 
+QT_END_NAMESPACE
+
 #include "qtest_kde.moc"

kdecore/util/qtest_kde.h

@@ -35,6 +35,8 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qtextstream.h>
 
+QT_BEGIN_NAMESPACE
+
 namespace QTest
 {
     /**
@@ -49,6 +51,8 @@ namespace QTest
     KDECORE_EXPORT bool kWaitForSignal(QObject *obj, const char *signal, int timeout = 0);
 } // namespace QTest
 
+QT_END_NAMESPACE
+
 // By default, unit tests get no gui.
 // Pass GUI if you use any GUI classes
 enum KDEMainFlag { NoGUI = 0, GUI = 1 }; // bitfield, next item is 2!

kded/kbuildsycoca.h

@@ -33,7 +33,7 @@
 
 #include "vfolder_menu.h"
 
-class QDataStream;
+#include <QDataStream>
 
 // No need for this in libkio - apps only get readonly access
 class KBuildSycoca : public KSycoca, public KBuildSycocaInterface

kded/kded.cpp

@@ -65,11 +65,13 @@ static bool bCheckSycoca;
 static bool bCheckUpdates;
 static bool bCheckHostname;
 
+QT_BEGIN_NAMESPACE
 #ifdef Q_DBUS_EXPORT
 extern Q_DBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&));
 #else
 extern QDBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&));
 #endif
+QT_END_NAMESPACE
 
 static void runBuildSycoca(QObject *callBackObj=0, const char *callBackSlot=0, const char *callBackErrorSlot=0)
 {

kded/kded.h

@@ -34,7 +34,7 @@
 #include <kdedmodule.h>
 #include <kservice.h>
 
-class QDBusServiceWatcher;
+#include <QDBusServiceWatcher>
 class KDirWatch;
 
 // No need for this in libkio - apps only get readonly access

kdeui/actions/kactioncategory.h

@@ -32,7 +32,7 @@
 class KAction;
 struct KActionCategoryPrivate;
 
-class QAction;
+#include <QAction>
 
 
 

kdeui/actions/kactioncollection.h

@@ -32,11 +32,11 @@
 
 #include <QtCore/QObject>
 
-class QAction;
+#include <QAction>
 class KXMLGUIClient;
 
-class QActionGroup;
-class QString;
+#include <QActionGroup>
+#include <QString>
 
 /**
  * \short A container for a set of QAction objects.

kdeui/actions/kstandardaction.h

@@ -23,9 +23,9 @@
 #include <kstandardshortcut.h>
 #include <QtCore/QList>
 
-class QObject;
-class QStringList;
-class QWidget;
+#include <QObject>
+#include <QStringList>
+#include <QWidget>
 class KAction;
 class KRecentFilesAction;
 class KDualAction;

kdeui/colors/kcolorchoosermode_p.h

@@ -24,7 +24,7 @@
 
 #include <QtCore/qglobal.h>
 
-class QColor;
+#include <QColor>
 
 namespace KDEPrivate {
 

kdeui/colors/kcolorhelpers_p.h

@@ -30,9 +30,9 @@ static inline qreal normalize(qreal a)
     return (a < 1.0 ? (a > 0.0 ? a : 0.0) : 1.0);
 }
 
-class QPainter;
-class QRect;
-class QBrush;
+#include <QPainter>
+#include <QRect>
+#include <QBrush>
 
 namespace KDEPrivate {
 

kdeui/colors/kcolormimedata.h

@@ -23,10 +23,10 @@
 
 #include <kdeui_export.h>
 
-class QColor;
-class QDrag;
-class QMimeData;
-class QWidget;
+#include <QColor>
+#include <QDrag>
+#include <QMimeData>
+#include <QWidget>
 
 /**
  * Drag-and-drop and clipboard mimedata manipulation for QColor objects. The according MIME type

kdeui/colors/kcolorscheme.h

@@ -25,8 +25,8 @@
 
 #include <QtGui/QPalette>
 
-class QColor;
-class QBrush;
+#include <QColor>
+#include <QBrush>
 
 class KColorSchemePrivate;
 

kdeui/colors/kcolorutils.h

@@ -25,7 +25,7 @@
 #include <kdeui_export.h>
 #include <QtGui/QPainter>
 
-class QColor;
+#include <QColor>
 
 /**
  * A set of methods used to work with colors.

kdeui/dialogs/kconfigdialogmanager.h

@@ -29,7 +29,7 @@
 class KCoreConfigSkeleton;
 class KConfigSkeleton;
 class KConfigSkeletonItem;
-class QWidget;
+#include <QWidget>
 
 /**
  * @short Provides a means of automatically retrieving,

kdeui/dialogs/kcupsoptionsjobwidget_p.h

@@ -26,8 +26,8 @@
 #include "kcupsoptionswidget_p.h"
 #include "ui_kcupsoptionsjobwidget.h"
 
-class QString;
-class QTime;
+#include <QString>
+#include <QTime>
 
 /**
  * A widget to add to QPrintDialog to enable extra CUPS options

kdeui/dialogs/kcupsoptionswidget_p.h

@@ -23,10 +23,10 @@
 
 #include <qwidget.h>
 
-class QString;
-class QStringList;
-class QPrinter;
-class QPrintDialog;
+#include <QString>
+#include <QStringList>
+#include <QPrinter>
+#include <QPrintDialog>
 
 /**
  * A widget to add to QPrintDialog to enable extra CUPS options

kdeui/dialogs/kdeprintdialog.h

@@ -25,9 +25,9 @@
 
 #include <QtCore/QList>
 
-class QPrintDialog;
-class QPrinter;
-class QWidget;
+#include <QPrintDialog>
+#include <QPrinter>
+#include <QWidget>
 
 /**
  * Namespace for the KDE printing system

kdeui/dialogs/kdialog.h

@@ -25,7 +25,7 @@
 #define KDIALOG_H
 
 class KPushButton;
-class QMenu;
+#include <QMenu>
 class KDialogPrivate;
 
 #include <kdeui_export.h>

kdeui/dialogs/kdialog_p.h

@@ -26,11 +26,11 @@
 #include <QtCore/QSize>
 #include <QtCore/QHash>
 
-class QBoxLayout;
+#include <QBoxLayout>
 class KPushButton;
 class KUrlLabel;
 class KSeparator;
-class QDialogButtonBox;
+#include <QDialogButtonBox>
 
 class KDialogPrivate
 {

kdeui/dialogs/kedittoolbar_p.h

@@ -24,7 +24,7 @@
 #include <QListWidget>
 
 class KLineEdit;
-class QCheckBox;
+#include <QCheckBox>
 
 namespace KDEPrivate {
 

kdeui/dialogs/kinputdialog.h

@@ -27,7 +27,7 @@
 #include <limits.h>
 #include <float.h>
 
-class QValidator;
+#include <QValidator>
 
 /**
  * The KInputDialog namespace provides simple dialogs to get a single value

kdeui/dialogs/kinputdialog_p.h

@@ -20,11 +20,11 @@
 #ifndef KINPUTDIALOG_P_H
 #define KINPUTDIALOG_P_H
 
-class QLabel;
-class QValidator;
+#include <QLabel>
+#include <QValidator>
 
 class KComboBox;
-class QDoubleSpinBox;
+#include <QDoubleSpinBox>
 class KIntSpinBox;
 class KLineEdit;
 class KListWidget;

kdeui/dialogs/klinkdialog.h

@@ -27,7 +27,7 @@
 #include <kdialog.h>
 
 class KLinkDialogPrivate;
-class QString;
+#include <QString>
 
 /**
     @short Dialog to allow user to configure a hyperlink.

kdeui/dialogs/kmessagebox.h

@@ -27,8 +27,8 @@
 #include <kguiitem.h>
 #include <kstandardguiitem.h>
 
-class QWidget;
-class QStringList;
+#include <QWidget>
+#include <QStringList>
 class KConfig;
 class KDialog;
 

kdeui/dialogs/kmessageboxmessagehandler.h

@@ -24,7 +24,7 @@
 
 #include <QtCore/QObject>
 
-class QWidget;
+#include <QWidget>
 class KMessageBoxMessageHandlerPrivate;
 /**
  * @brief This is a convience KMessageHandler that use KMessageBox.

kdeui/dialogs/knewpassworddialog.h

@@ -27,7 +27,7 @@
 
 #include <kdialog.h>
 
-class QWidget;
+#include <QWidget>
 
 
 /**

kdeui/dialogs/kpixmapregionselectordialog.h

@@ -24,7 +24,7 @@
 
 class KPixmapRegionSelectorWidget;
 
-class QImage;
+#include <QImage>
 
 /**
  * A dialog that uses a KPixmapRegionSelectorWidget to allow the user

kdeui/dialogs/kshortcutsdialog_p.h

@@ -35,10 +35,10 @@
 #include <QtCore/QList>
 #include <QGroupBox>
 
-class QLabel;
-class QTreeWidget;
-class QTreeWidgetItem;
-class QRadioButton;
+#include <QLabel>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QRadioButton>
 class KAction;
 class KActionCollection;
 class KPushButton;

kdeui/dialogs/ksplashscreen.h

@@ -24,7 +24,7 @@
 
 #include <QtGui/QSplashScreen>
 
-class QPixmap;
+#include <QPixmap>
 
 /**
  *  @short %KDE splash screen

kdeui/findreplace/kfinddialog_p.h

@@ -28,11 +28,11 @@
 
 class KHistoryComboBox;
 
-class QCheckBox;
-class QGridLayout;
-class QGroupBox;
-class QMenu;
-class QPushButton;
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QMenu>
+#include <QPushButton>
 
 class KFindDialog::KFindDialogPrivate
 {

kdeui/fonts/kfontchooser.h

@@ -27,8 +27,8 @@
 #include <kdeui_export.h>
 #include <QtGui/QWidget>
 
-class QFont;
-class QStringList;
+#include <QFont>
+#include <QStringList>
 
 /**
  * @short A font selection widget.

kdeui/fonts/kfontdialog.h

@@ -27,8 +27,8 @@
 #include <kdialog.h>
 #include <kfontchooser.h>
 
-class QFont;
-class QStringList;
+#include <QFont>
+#include <QStringList>
 
 /**
  * @short A font selection dialog.

kdeui/fonts/kfontrequester.h

@@ -26,8 +26,8 @@
 
 #include <kdeui_export.h>
 
-class QLabel;
-class QPushButton;
+#include <QLabel>
+#include <QPushButton>
 
 /**
  * This class provides a widget with a lineedit and a button, which invokes

kdeui/fonts/kfontutils.h

@@ -26,9 +26,9 @@
 #include "kdeui_export.h"
 #include <qglobal.h>
 
-class QPainter;
-class QSizeF;
-class QString;
+#include <QPainter>
+#include <QSizeF>
+#include <QString>
 
 namespace KFontUtils
 {

kdeui/icons/kicon.h

@@ -24,7 +24,7 @@
 #include <QtGui/QIcon>
 
 class KIconLoader;
-class QStringList;
+#include <QStringList>
 
 /**
  * \short A wrapper around QIcon that provides KDE icon features

kdeui/icons/kiconloader.h

@@ -28,9 +28,9 @@
 #include <kglobal.h>
 #include <kdeui_export.h>
 
-class QIcon;
-class QMovie;
-class QPixmap;
+#include <QIcon>
+#include <QMovie>
+#include <QPixmap>
 
 class KComponentData;
 class KIconLoaderPrivate;