generic: adjust to recent KApplication changes

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

diff --git a/kdeplasma-addons/applets/lancelot/application/LancelotApplication.cpp b/kdeplasma-addons/applets/lancelot/application/LancelotApplication.cpp
index 72dd8a1..5396828 100644 (file)
--- a/kdeplasma-addons/applets/lancelot/application/LancelotApplication.cpp
+++ b/kdeplasma-addons/applets/lancelot/application/LancelotApplication.cpp
@@ -41,8 +41,8 @@
 
 LancelotApplication * LancelotApplication::m_application = NULL;
 
-LancelotApplication::LancelotApplication(int argc, char **argv)
-    : KUniqueApplication(argc, argv), window(0),
+LancelotApplication::LancelotApplication(bool configUnique)
+    : KUniqueApplication(configUnique), window(0),
     m_clientsNumber(0), m_lastID(-1)
 {
     init();
@@ -107,7 +107,7 @@ int LancelotApplication::main(int argc, char **argv)
                 dpy->colormap());
 #else
     LancelotApplication::m_application =
-        new LancelotApplication(argc, argv);
+        new LancelotApplication();
 #endif // LANCELOT_HAVE_COMPOSITING
 
     return LancelotApplication::m_application->exec();

diff --git a/kdeplasma-addons/applets/lancelot/application/LancelotApplication.h b/kdeplasma-addons/applets/lancelot/application/LancelotApplication.h
index 552a27a..9cbe46c 100644 (file)
--- a/kdeplasma-addons/applets/lancelot/application/LancelotApplication.h
+++ b/kdeplasma-addons/applets/lancelot/application/LancelotApplication.h
@@ -72,7 +72,7 @@ protected:
 private:
     static LancelotApplication * m_application;
 
-    LancelotApplication(int argc, char **argv);
+    LancelotApplication(bool configUnique = false);
     LancelotApplication(Display * display,
         Qt::HANDLE visual = 0,
         Qt::HANDLE colormap = 0,

diff --git a/kmix/apps/kmixctrl.cpp b/kmix/apps/kmixctrl.cpp
index 2559802..4bda349 100644 (file)
--- a/kmix/apps/kmixctrl.cpp
+++ b/kmix/apps/kmixctrl.cpp
@@ -54,7 +54,7 @@ int main(int argc, char *argv[])
    options.add("restore", ki18n("Restore default volumes"));
    KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-   KApplication app( false );
+   QCoreApplication app (argc, argv);
 
    GlobalConfig::init();
 

diff --git a/okular/core/fileprinter.cpp b/okular/core/fileprinter.cpp
index 6400b27..cab773e 100644 (file)
--- a/okular/core/fileprinter.cpp
+++ b/okular/core/fileprinter.cpp
@@ -24,7 +24,6 @@
 
 #include <KProcess>
 #include <KShell>
-#include <klocalsocket.h>
 #include <kstandarddirs.h>
 #include <ktempdir.h>
 #include <kdebug.h>

diff --git a/okular/generators/fax/faxinit.cpp b/okular/generators/fax/faxinit.cpp
index 6615c56..07593a2 100644 (file)
--- a/okular/generators/fax/faxinit.cpp
+++ b/okular/generators/fax/faxinit.cpp
@@ -317,11 +317,11 @@ FillTable(struct tabent *T, int Size, const struct proto *P, int State)
 void
 fax_init_tables(void)
 {
-    static bool already_initialized = 0;
+    static bool already_initialized = false;
     if (already_initialized)
-       return;
+        return;
 
-    ++already_initialized;
+    already_initialized = true;
 
     FillTable(MainTable, 7, Pass, S_Pass);
     FillTable(MainTable, 7, Horiz, S_Horiz);