[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/khotkeys/kcontrol
From:       Stephan Kulow <coolo () kde ! org>
Date:       2005-10-22 10:19:24
Message-ID: 1129976364.775335.23612.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 472973 by coolo:

porting


 M  +2 -2      actions_listview.cpp  
 M  +1 -1      actions_listview.h  
 M  +9 -10     kcmkhotkeys.cpp  
 M  +1 -1      kcmkhotkeys.h  
 M  +2 -1      menuedit.cpp  


--- trunk/KDE/kdebase/khotkeys/kcontrol/actions_listview.cpp #472972:472973
@@ -13,8 +13,8 @@
 
 namespace KHotKeys
 {
-Actions_listview::Actions_listview( QWidget* parent_P, const char* name_P )
-    : KHListView( parent_P, name_P ), _widget( static_cast< Actions_listview_widget* \
>( parent_P->parent())) +Actions_listview::Actions_listview( QWidget* parent_P )
+    : KHListView( parent_P ), _widget( static_cast< Actions_listview_widget* >( \
parent_P->parent()))  {
     // this relies on the way designer creates the .cpp file from .ui (yes, I'm \
                lazy)
     assert( dynamic_cast< Actions_listview_widget_ui* >( parent_P->parent()));
--- trunk/KDE/kdebase/khotkeys/kcontrol/actions_listview.h #472972:472973
@@ -24,7 +24,7 @@
     {
     Q_OBJECT
     public:
-        Actions_listview( QWidget* parent_P = NULL, const char* name_P = NULL );
+        Actions_listview( QWidget* parent_P );
         Actions_listview_widget* widget();
     private:
         Actions_listview_widget* _widget;
--- trunk/KDE/kdebase/khotkeys/kcontrol/kcmkhotkeys.cpp #472972:472973
@@ -10,9 +10,7 @@
 
 #define _KCMKHOTKEYS_CPP_
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "kcmkhotkeys.h"
 
@@ -38,6 +36,7 @@
 #include <ksimpleconfig.h>
 #include <kfiledialog.h>
 #include <dcopref.h>
+#include <ktoolinvocation.h>
 
 #include <input.h>
 #include <triggers.h>
@@ -49,11 +48,11 @@
 
 extern "C"
 {
-    KDE_EXPORT KCModule* create_khotkeys( QWidget* parent_P, const char* name_P )
+    KDE_EXPORT KCModule* create_khotkeys( QWidget* parent_P, const char* name )
     {
 //    sleep( 20 ); // CHECKME DEBUG
-    KGlobal::locale()->insertCatalogue("khotkeys");
-    KHotKeys::Module* ret = new KHotKeys::Module( parent_P, name_P );
+    KInstance *inst = new KInstance( "khotkeys");
+    KHotKeys::Module* ret = new KHotKeys::Module( inst, parent_P );
     ret->load(); // CHECKME
     return ret;
     }
@@ -69,14 +68,14 @@
     // kded modules in such case.
     Q3CString multiHead = getenv("KDE_MULTIHEAD");
     if (multiHead.lower() == "true")
-        kapp->kdeinitExec( "khotkeys" );
+        KToolInvocation::kdeinitExec( "khotkeys" );
     else
         {
         DCOPRef ref( "kded", "kded" );
         if( !ref.call( "loadModule", Q3CString( "khotkeys" )))
             {
             kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl;
-            kapp->kdeinitExec( "khotkeys" );
+            KToolInvocation::kdeinitExec( "khotkeys" );
             }
         }
     }
@@ -85,8 +84,8 @@
 namespace KHotKeys
 {
 
-Module::Module( QWidget* parent_P, const char* )
-    : KCModule( parent_P, "khotkeys" ), _actions_root( NULL ), _current_action_data( \
NULL ), +Module::Module( KInstance *inst, QWidget* parent_P )
+    : KCModule( inst, parent_P ), _actions_root( NULL ), _current_action_data( NULL \
),  listview_is_changed( false ), deleting_action( false )
     {
     setButtons( Help | Cancel | Apply | Ok );
@@ -156,7 +155,7 @@
         if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
             {
             kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-            KApplication::kdeinitExec( "khotkeys" );
+            KToolInvocation::kdeinitExec( "khotkeys" );
             }
         else
             {
--- trunk/KDE/kdebase/khotkeys/kcontrol/kcmkhotkeys.h #472972:472973
@@ -29,7 +29,7 @@
     {
     Q_OBJECT
     public:
-        Module( QWidget *parent_P, const char *name_P );
+        Module( KInstance *inst_P, QWidget *parent_P );
         virtual ~Module();
         virtual void load();
         virtual void save();
--- trunk/KDE/kdebase/khotkeys/kcontrol/menuedit.cpp #472972:472973
@@ -30,6 +30,7 @@
 
 #include <settings.h>
 #include <action_data.h>
+#include <ktoolinvocation.h>
 
 namespace KHotKeys
 {
@@ -194,7 +195,7 @@
     if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" ))
         {
         kdDebug( 1217 ) << "launching new khotkeys daemon" << endl;
-        KApplication::kdeinitExec( "khotkeys" );
+        KToolInvocation::kdeinitExec( "khotkeys" );
         }
     else
         {


[prev in list] [next in list] [prev in thread] [next in thread]