Port away from KLocale and kdemacros

framebuffers/qt/qtframebufferplugin.h

@@ -23,8 +23,6 @@
 
 #include "framebufferplugin.h"
 
-#include <kdemacros.h>
-
 #include <QWidget>
 
 class FrameBuffer;

framebuffers/x11/x11framebuffer.cpp

@@ -16,7 +16,6 @@
 #include <QApplication>
 #include <QDesktopWidget>
 
-#include <KApplication>
 #include <QDebug>
 
 #include <X11/Xlib.h>
@@ -103,7 +102,7 @@ X11FrameBuffer::X11FrameBuffer(WId id, QObject *parent)
     fb = d->framebufferImage->data;
 #ifdef HAVE_XDAMAGE
     d->ev = new EvWidget(this);
-    kapp->installX11EventFilter(d->ev);
+    qApp->installX11EventFilter(d->ev);
 #endif
 }
 
@@ -112,7 +111,7 @@ X11FrameBuffer::~X11FrameBuffer()
 {
     XDestroyImage(d->framebufferImage);
 #ifdef HAVE_XDAMAGE
-    kapp->removeX11EventFilter(d->ev);
+    qApp->removeX11EventFilter(d->ev);
 #endif
 #ifdef HAVE_XSHM
     XShmDetach(QX11Info::display(), &d->shminfo);
@@ -275,7 +274,7 @@ QList< QRect > X11FrameBuffer::modifiedTiles()
         return ret;
     }
 
-    kapp->processEvents(); // try to make sure every damage event goes trough;
+    qApp->processEvents(); // try to make sure every damage event goes trough;
     cleanupRects();
     QRect gl;
 

framebuffers/x11/x11framebufferplugin.h

@@ -23,8 +23,6 @@
 
 #include "framebufferplugin.h"
 
-#include <kdemacros.h>
-
 #include <QWidget>
 
 class FrameBuffer;

krfb/connectiondialog.cpp

@@ -21,11 +21,11 @@
 
 #include "connectiondialog.h"
 
-#include <QIcon>
-#include <KLocale>
-#include <KStandardGuiItem>
-
 #include <QCheckBox>
+#include <QIcon>
+
+#include <KLocalizedString>
+#include <KStandardGuiItem>
 
 template <typename UI>
 ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)

krfb/events.cpp

@@ -27,7 +27,7 @@
 #include <QApplication>
 #include <QX11Info>
 #include <QDesktopWidget>
-#include <KGlobal>
+#include <QGlobalStatic>
 
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
@@ -60,7 +60,7 @@ private:
     void init();
 };
 
-K_GLOBAL_STATIC(EventData, data)
+Q_GLOBAL_STATIC(EventData, data)
 
 EventData::EventData()
 {

krfb/framebuffermanager.cpp

@@ -24,7 +24,8 @@
 #include "krfbconfig.h"
 
 #include <QDebug>
-#include <KGlobal>
+#include <QGlobalStatic>
+
 #include <KServiceTypeTrader>
 
 #include <QtCore/QSharedPointer>
@@ -35,7 +36,7 @@ public:
     FrameBufferManager instance;
 };
 
-K_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
+Q_GLOBAL_STATIC(FrameBufferManagerStatic, frameBufferManagerStatic)
 
 FrameBufferManager::FrameBufferManager()
 {

krfb/invitationsrfbclient.cpp

@@ -24,10 +24,11 @@
 #include "krfbconfig.h"
 #include "sockethelpers.h"
 #include "connectiondialog.h"
-#include <KNotification>
-#include <KLocale>
-#include <QDebug>
 
+#include <KNotification>
+#include <KLocalizedString>
+
+#include <QDebug>
 #include <QtCore/QSocketNotifier>
 #include <poll.h>
 

krfb/invitationsrfbserver.cpp

@@ -27,12 +27,11 @@
 #include <QtNetwork/QHostInfo>
 #include <QDebug>
 
-#include <KLocale>
+#include <KLocalizedString>
 #include <KUser>
 #include <KRandom>
 #include <KStringHandler>
 #include <KWallet/Wallet>
-#include <KGlobal>
 
 #include <dnssd/publicservice.h>
 using KWallet::Wallet;
@@ -113,8 +112,7 @@ InvitationsRfbServer::InvitationsRfbServer()
 {
     m_desktopPassword = readableRandomString(4)+"-"+readableRandomString(3);
     m_unattendedPassword = readableRandomString(4)+"-"+readableRandomString(3);
-    KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup krfbConfig(config,"Security");
+    KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
     m_allowUnattendedAccess = krfbConfig.readEntry(
             "allowUnattendedAccess", QVariant(false)).toBool();
 }
@@ -122,8 +120,7 @@ InvitationsRfbServer::InvitationsRfbServer()
 InvitationsRfbServer::~InvitationsRfbServer()
 {
     stop();
-    KSharedConfigPtr config = KGlobal::config();
-    KConfigGroup krfbConfig(config,"Security");
+    KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
     krfbConfig.writeEntry("allowUnattendedAccess",m_allowUnattendedAccess);
     if(m_wallet && m_wallet->isOpen()) {
 
@@ -173,8 +170,7 @@ void InvitationsRfbServer::walletOpened(bool opened)
     } else {
 
         qDebug() << "Could not open KWallet, Falling back to config file";
-        KSharedConfigPtr config = KGlobal::config();
-        KConfigGroup krfbConfig(config,"Security");
+        KConfigGroup krfbConfig(KSharedConfig::openConfig(),"Security");
 
         desktopPassword = KStringHandler::obscure(krfbConfig.readEntry(
                 "desktopPassword", QString()));

krfb/main.cpp

@@ -23,7 +23,7 @@
 #include <KUniqueApplication>
 #include <KCmdLineArgs>
 #include <QDebug>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageBox>
 
 #include <QPixmap>

krfb/mainwindow.cpp

@@ -15,14 +15,14 @@
 #include "ui_configsecurity.h"
 
 #include <KConfigDialog>
-#include <QIcon>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageBox>
 #include <KStandardAction>
 #include <KActionCollection>
 #include <KLineEdit>
 #include <KNewPasswordDialog>
 
+#include <QIcon>
 #include <QWidget>
 #include <QSizePolicy>
 #include <QtNetwork/QNetworkInterface>

krfb/rfbservermanager.cpp

@@ -27,10 +27,11 @@
 #include <QtCore/QTimer>
 #include <QApplication>
 #include <QDesktopWidget>
+#include <QGlobalStatic>
 #include <QtNetwork/QHostInfo>
-#include <KGlobal>
 #include <QDebug>
-#include <KLocale>
+
+#include <KLocalizedString>
 #include <KUser>
 #include <KNotification>
 
@@ -82,7 +83,7 @@ struct RfbServerManagerStatic
     RfbServerManager server;
 };
 
-K_GLOBAL_STATIC(RfbServerManagerStatic, s_instance)
+Q_GLOBAL_STATIC(RfbServerManagerStatic, s_instance)
 
 RfbServerManager* RfbServerManager::instance()
 {

krfb/trayicon.cpp

@@ -22,13 +22,13 @@
 #include "rfbservermanager.h"
 #include "rfbclient.h"
 
+#include <QIcon>
+#include <QMenu>
+
 #include <KAboutApplicationDialog>
 #include <KActionCollection>
 #include <KDialog>
-#include <KGlobal>
-#include <QIcon>
-#include <KLocale>
-#include <QMenu>
+#include <KLocalizedString>
 #include <KStandardAction>
 #include <KToggleAction>
 

krfb/tubesrfbclient.cpp

@@ -20,7 +20,7 @@
 #include "krfbconfig.h"
 #include "connectiondialog.h"
 #include <KNotification>
-#include <KLocale>
+#include <KLocalizedString>
 
 QString TubesRfbClient::name() const
 {