generic: adjust to Katie changes

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

about-distro/src/Module.cpp

@@ -58,7 +58,7 @@ static qlonglong calculateTotalRam()
 
 Module::Module(QWidget *parent, const QVariantList &args) :
     KCModule(KcmAboutDistroFactory::componentData(), parent, args),
-    ui(new Ui::Module)
+    ui(new Ui_Module)
 {
     KAboutData *about = new KAboutData("kcm-about-distro", 0,
                                        ki18n("About Distribution"),

about-distro/src/Module.h

@@ -23,9 +23,9 @@
 
 #include <KCModule>
 
-namespace Ui {
-    class Module;
-}
+QT_BEGIN_NAMESPACE
+class Ui_Module;
+QT_END_NAMESPACE
 
 class Module : public KCModule
 {
@@ -63,7 +63,7 @@ private:
     /**
      * UI
      */
-    Ui::Module *ui;
+    Ui_Module *ui;
 };
 
 #endif // MODULE_H

bluedevil/src/kcmodule/bluedeviltransfer.cpp

@@ -62,7 +62,7 @@ KCMBlueDevilTransfer::KCMBlueDevilTransfer(QWidget *parent, const QVariantList&)
     m_systemCheck->createWarnings(layout);
 
     QWidget *transfer = new QWidget(this);
-    m_uiTransfer = new Ui::Transfer();
+    m_uiTransfer = new Ui_Transfer();
     m_uiTransfer->setupUi(transfer);
     layout->addWidget(transfer);
     setLayout(layout);

bluedevil/src/kcmodule/bluedeviltransfer.h

@@ -23,10 +23,11 @@
 
 #include <kcmodule.h>
 
+QT_BEGIN_NAMESPACE
+class Ui_Transfer;
+QT_END_NAMESPACE
+
 class SystemCheck;
-namespace Ui {
-    class Transfer;
-}
 namespace BlueDevil {
     class Adapter;
 }
@@ -51,7 +52,7 @@ private Q_SLOTS:
 
 private:
     SystemCheck *m_systemCheck;
-    Ui::Transfer *m_uiTransfer;
+    Ui_Transfer *m_uiTransfer;
     bool m_restartNeeded;
 };
 

bluedevil/src/kio/obexftp/kio_obexftp.h

@@ -27,6 +27,7 @@
 #include <QtCore/QObject>
 #include <QtDBus/qdbusextratypes.h>
 #include <QEventLoop>
+#include <QTimer>
 
 #include <kio/slavebase.h>
 

kdeplasma-addons/applets/kolourpicker/kolourpicker.h

@@ -64,10 +64,12 @@ class Kolourpicker : public Plasma::Applet
         QString m_color_format;
 };
 
+QT_BEGIN_NAMESPACE
 inline uint qHash(const QColor &color)
 {
     return qHash(color.name());
 }
+QT_END_NAMESPACE
 
 K_EXPORT_PLASMA_APPLET(kolourpicker, Kolourpicker)
 

kdeplasma-addons/applets/lancelot/application/LancelotWindow.h

@@ -49,7 +49,7 @@ namespace Plasma
     class LineEdit;
 }
 
-class LancelotWindow: public QGraphicsView, public Ui::LancelotWindowBase
+class LancelotWindow: public QGraphicsView, public Ui_LancelotWindowBase
 {
     Q_OBJECT
 public:

kdeplasma-addons/applets/life/life.h

@@ -26,10 +26,9 @@
 
 #include "ui_lifeConfig.h"
 
-namespace Ui
-{
-    class lifeConfig;
-}
+QT_BEGIN_NAMESPACE
+class Ui_lifeConfig;
+QT_END_NAMESPACE
 
 class Life : public Plasma::Applet
 {
@@ -75,7 +74,7 @@ class Life : public Plasma::Applet
         bool m_reflectVertical;
         bool m_reflectHorizontal;
 
-        Ui::lifeConfig ui;
+        Ui_lifeConfig ui;
         QTimer timer;
 };
 

kdeplasma-addons/applets/microblog/microblog.h

@@ -22,6 +22,7 @@
 #define MICROBLOG_H
 
 #include <QMap>
+#include <QTimer>
 
 #include <KTimeZone>
 

kget/core/kget.h

@@ -35,6 +35,7 @@
 
 #include <QDomElement>
 #include <QAbstractItemView>
+#include <QTimer>
 
 class KComboBox;
 

kget/mainwindow.h

@@ -23,6 +23,8 @@
 #include "core/transfer.h"
 #include "core/transfergroup.h"
 
+#include <QTimer>
+
 class ViewsContainer;
 class DropTarget;
 class DBusKgetWrapper;

kget/ui/newtransferdialog.h

@@ -16,6 +16,7 @@
 
 #include <KDialog>
 #include <KUrl>
+#include <QTimer>
 
 #include "ui_newtransferwidget.h"
 

libktorrent/src/utp/remotewindow.cpp

@@ -23,6 +23,7 @@
 #include "connection.h"
 #include <util/log.h>
 #include <util/functions.h>
+#include <qmath.h>
 
 using namespace bt;