generic: adjust to KApplication changes

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

diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 9d56dc7..448175d 100644 (file)
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -95,8 +95,8 @@ static ModifierKey modifierKeys[] = {
 /********************************************************************/
 
 
-KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled)
-  : KUniqueApplication(allowStyles, GUIenabled),
+KAccessApp::KAccessApp(bool allowStyles)
+  : KUniqueApplication(allowStyles),
   overlay(0), _player(0)
 {
   _activeWindow = KWindowSystem::activeWindow();

diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h
index dc5891d..a55a756 100644 (file)
--- a/kcontrol/access/kaccess.h
+++ b/kcontrol/access/kaccess.h
@@ -26,7 +26,7 @@ class KAccessApp : public KUniqueApplication
 
 public:
 
-  explicit KAccessApp(bool allowStyles=true, bool GUIenabled=true);
+  explicit KAccessApp(bool allowStyles=true);
 
   bool x11EventFilter(XEvent *event);
 

diff --git a/kde-menu/CMakeLists.txt b/kde-menu/CMakeLists.txt
index eff41ef..f0db6f4 100644 (file)
--- a/kde-menu/CMakeLists.txt
+++ b/kde-menu/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_executable(kde4-menu kde-menu.cpp)
 
-target_link_libraries(kde4-menu ${KDE4_KIO_LIBS})
+target_link_libraries(kde4-menu ${KDE4_KDECORE_LIBS})
 
 install(
     TARGETS kde4-menu

diff --git a/kde-menu/kde-menu.cpp b/kde-menu/kde-menu.cpp
index bb692a3..bea4988 100644 (file)
--- a/kde-menu/kde-menu.cpp
+++ b/kde-menu/kde-menu.cpp
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 
 #include <QtCore/QFile>
+#include <QtCore/QCoreApplication>
 #include <QtDBus/QtDBus>
 
 #include <kaboutdata.h>
@@ -124,9 +125,7 @@ int main(int argc, char **argv)
    options.add("+<application-id>", ki18n("The id of the menu entry to locate"));
    KCmdLineArgs::addCmdLineOptions(options);
 
-//   KApplication k(false, false);
-   KApplication k(false);
-   k.disableSessionManagement();
+   QCoreApplication app(argc, argv);
 
    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
    if (args->count() != 1)

diff --git a/kfile/fileprops.cpp b/kfile/fileprops.cpp
index d787cab..e18c0a6 100644 (file)
--- a/kfile/fileprops.cpp
+++ b/kfile/fileprops.cpp
@@ -264,9 +264,6 @@ int main( int argc, char **argv )
     KCmdLineArgs::addCmdLineOptions( options );
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-    bool useGUI = args->isSet( "dialog" );
-
-    KApplication app( useGUI );
 
     QList<FileProps *> m_props;
 
@@ -278,6 +275,7 @@ int main( int argc, char **argv )
     }
 
     if ( args->isSet( "dialog" ) ) {
+        KApplication app;
         showPropertiesDialog( args );
         return 0;
     }

diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index 4506bd1..bed023a 100644 (file)
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -122,7 +122,7 @@ int kdemain(int argc, char **argv)
     KAboutData about("kio_thumbnail", 0, ki18n("kio_thumbmail"), "KDE 4.x.x");
     KCmdLineArgs::init(&about);
 
-    KApplication app( true);
+    KApplication app;
 #endif
 
 

diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp
index 973b42b..0a88d56 100644 (file)
--- a/ksmserver/main.cpp
+++ b/ksmserver/main.cpp
@@ -260,7 +260,7 @@ int main( int argc, char* argv[] )
     if( dpy != NULL && DefaultDepth(dpy, DefaultScreen(dpy)) >= 24) // 16bpp breaks the software logout effect for some reason???
         a = new KApplication(dpy, visual ? Qt::HANDLE(visual) : 0, colormap ? Qt::HANDLE(colormap) : 0);
     else
-        a = new KApplication(true);
+        a = new KApplication();
     fcntl(ConnectionNumber(QX11Info::display()), F_SETFD, 1);
 
     a->setQuitOnLastWindowClosed(false); // #169486

diff --git a/ktraderclient/CMakeLists.txt b/ktraderclient/CMakeLists.txt
index 8e724eb..80a6712 100644 (file)
--- a/ktraderclient/CMakeLists.txt
+++ b/ktraderclient/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_executable(ktraderclient ktraderclient.cpp)
 
-target_link_libraries(ktraderclient ${KDE4_KIO_LIBS})
+target_link_libraries(ktraderclient ${KDE4_KDECORE_LIBS})
 
 install(TARGETS ktraderclient ${INSTALL_TARGETS_DEFAULT_ARGS} )

diff --git a/ktraderclient/ktraderclient.cpp b/ktraderclient/ktraderclient.cpp
index 698b273..ef9d74e 100644 (file)
--- a/ktraderclient/ktraderclient.cpp
+++ b/ktraderclient/ktraderclient.cpp
@@ -19,9 +19,9 @@
 #include <kcmdlineargs.h>
 #include <kmimetypetrader.h>
 #include <kmimetype.h>
-#include <kapplication.h>
 #include <klocale.h>
 #include <kservicetypetrader.h>
+#include <QCoreApplication>
 
 #include <stdio.h>
 
@@ -40,7 +40,7 @@ int main( int argc, char **argv )
 
   KCmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app( false ); // no GUI
+  QCoreApplication app( argc, argv ); // no GUI
 
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 

diff --git a/solid-actions-kcm/DesktopFileGenerator.cpp b/solid-actions-kcm/DesktopFileGenerator.cpp
index a9f82c4..98e83bd 100644 (file)
--- a/solid-actions-kcm/DesktopFileGenerator.cpp
+++ b/solid-actions-kcm/DesktopFileGenerator.cpp
@@ -24,6 +24,7 @@
 #include <KDesktopFile>
 #include <KDebug>
 #include <KConfigGroup>
+#include <QCoreApplication>
 
 #include "SolidActionData.h"
 
@@ -38,7 +39,7 @@ int main( int argc, char *argv[] )
     aboutData.addAuthor(ki18n("Ben Cooksley"), ki18n("Maintainer"), "ben@eclipse.endoftheinternet.org");
     KCmdLineArgs::init(argc, argv, &aboutData);
 
-    KApplication application(false);
+    QCoreApplication application(argc, argv);
     SolidActionData * availActions = SolidActionData::instance();
     foreach( Solid::DeviceInterface::Type internalType, availActions->interfaceTypeList() ) {
         QString typeName = Solid::DeviceInterface::typeToString( internalType );