Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

7 files changed, 14 insertions, 14 deletions

diff --git a/sip/tdeui/kcombobox.sip b/sip/tdeui/kcombobox.sip
index 0873a04..acc5988 100644
--- a/sip/tdeui/kcombobox.sip
+++ b/sip/tdeui/kcombobox.sip
@@ -59,7 +59,7 @@ signals:
     void                 completion (const TQString&);
     void                 substringCompletion (const TQString&);
     void                 textRotation (KCompletionBase::KeyBindingType);
-    void                 completionModeChanged (KGlobalSettings::Completion);
+    void                 completionModeChanged (TDEGlobalSettings::Completion);
     void                 aboutToShowContextMenu (TQPopupMenu*);
 
 public slots:
diff --git a/sip/tdeui/kguiitem.sip b/sip/tdeui/kguiitem.sip
index 18ead43..23b4f16 100644
--- a/sip/tdeui/kguiitem.sip
+++ b/sip/tdeui/kguiitem.sip
@@ -38,7 +38,7 @@ public:
                          KGuiItem (const KGuiItem&);
     TQString              text () const;
     TQString              plainText () const;
-    TQIconSet             iconSet (KIcon::Group, int = 0, TDEInstance* = KGlobal ::instance ()) const;
+    TQIconSet             iconSet (KIcon::Group, int = 0, TDEInstance* = TDEGlobal ::instance ()) const;
     TQIconSet             iconSet () const;
     TQString              iconName () const;
     TQString              toolTip () const;
diff --git a/sip/tdeui/kkeydialog.sip b/sip/tdeui/kkeydialog.sip
index d925ca9..6e0297c 100644
--- a/sip/tdeui/kkeydialog.sip
+++ b/sip/tdeui/kkeydialog.sip
@@ -44,7 +44,7 @@ public:
                          KKeyChooser (TQWidget* /TransferThis/, KKeyChooser::ActionType = Application , bool = 1);
                          KKeyChooser (KActionCollection*, TQWidget* /TransferThis/, bool = 1);
                          KKeyChooser (KAccel*, TQWidget* /TransferThis/, bool = 1);
-                         KKeyChooser (KGlobalAccel*, TQWidget* /TransferThis/);
+                         KKeyChooser (TDEGlobalAccel*, TQWidget* /TransferThis/);
                          KKeyChooser (KShortcutList*, TQWidget* /TransferThis/, KKeyChooser::ActionType = Application , bool = 1);
     bool                 insert (KActionCollection*);
 
@@ -72,7 +72,7 @@ public slots:
 protected:
     void                 initGUI (KKeyChooser::ActionType, bool);
     bool                 insert (KAccel*);
-    bool                 insert (KGlobalAccel*);
+    bool                 insert (TDEGlobalAccel*);
     bool                 insert (KShortcutList*);
 
 %If ( KDE_3_1_0 -  )
@@ -112,7 +112,7 @@ protected:
 
 public:
                          KKeyChooser (KAccel*, TQWidget* /TransferThis/, bool, bool, bool = 0);
-                         KKeyChooser (KGlobalAccel*, TQWidget* /TransferThis/, bool, bool, bool = 0);
+                         KKeyChooser (TDEGlobalAccel*, TQWidget* /TransferThis/, bool, bool, bool = 0);
 
 public slots:
     void                 listSync ();
@@ -149,16 +149,16 @@ public:
     void                 commitChanges ();
     static int           configure (KActionCollection*, TQWidget* /Transfer/ = 0, bool = 1);
     static int           configure (KAccel*, TQWidget* /Transfer/ = 0, bool = 1);
-    static int           configure (KGlobalAccel*, TQWidget* /Transfer/ = 0, bool = 1);
+    static int           configure (TDEGlobalAccel*, TQWidget* /Transfer/ = 0, bool = 1);
 
 %If ( KDE_3_1_0 -  )
     static int           configure (KActionCollection*, bool, TQWidget* /Transfer/ = 0, bool = 1);
     static int           configure (KAccel*, bool, TQWidget* /Transfer/ = 0, bool = 1);
-    static int           configure (KGlobalAccel*, bool, TQWidget* /Transfer/ = 0, bool = 1);
+    static int           configure (TDEGlobalAccel*, bool, TQWidget* /Transfer/ = 0, bool = 1);
 %End
 
     static int           configureKeys (KAccel*, bool = 1, TQWidget* /Transfer/ = 0);
-    static int           configureKeys (KGlobalAccel*, bool = 1, TQWidget* /Transfer/ = 0);
+    static int           configureKeys (TDEGlobalAccel*, bool = 1, TQWidget* /Transfer/ = 0);
     static int           configureKeys (KActionCollection*, const TQString&, bool = 1, TQWidget* /Transfer/ = 0);
 
 %If ( KDE_3_1_0 -  )
diff --git a/sip/tdeui/klineedit.sip b/sip/tdeui/klineedit.sip
index 469bec4..a2b05ca 100644
--- a/sip/tdeui/klineedit.sip
+++ b/sip/tdeui/klineedit.sip
@@ -36,7 +36,7 @@ public:
                          KLineEdit (TQWidget* /TransferThis/ = 0, const char* = 0);
     void                 setURL (const KURL&);
     void                 cursorAtEnd ();
-    virtual void         setCompletionMode (KGlobalSettings::Completion);
+    virtual void         setCompletionMode (TDEGlobalSettings::Completion);
     virtual void         setContextMenuEnabled (bool);
     bool                 isContextMenuEnabled () const;
     void                 setURLDropsEnabled (bool);
@@ -74,7 +74,7 @@ signals:
     void                 completion (const TQString&);
     void                 substringCompletion (const TQString&);
     void                 textRotation (KCompletionBase::KeyBindingType);
-    void                 completionModeChanged (KGlobalSettings::Completion);
+    void                 completionModeChanged (TDEGlobalSettings::Completion);
     void                 aboutToShowContextMenu (TQPopupMenu*);
 
 public slots:
diff --git a/sip/tdeui/ksystemtray.sip b/sip/tdeui/ksystemtray.sip
index 5af6040..a4ac3de 100644
--- a/sip/tdeui/ksystemtray.sip
+++ b/sip/tdeui/ksystemtray.sip
@@ -43,7 +43,7 @@ public:
     virtual void         setCaption (const TQString&);
 %End
 
-    static TQPixmap       loadIcon (const TQString&, TDEInstance* = KGlobal ::instance ());
+    static TQPixmap       loadIcon (const TQString&, TDEInstance* = TDEGlobal ::instance ());
 %End
 
 
diff --git a/sip/tdeui/ktoolbar.sip b/sip/tdeui/ktoolbar.sip
index 5221988..6bd7d34 100644
--- a/sip/tdeui/ktoolbar.sip
+++ b/sip/tdeui/ktoolbar.sip
@@ -92,8 +92,8 @@ public:
                          KToolBar (TQWidget* /TransferThis/, const char* = 0, bool = 0, bool = 1);
 //ig                          KToolBar (TQMainWindow*, TQMainWindow::ToolBarDock, bool = 0, const char* = 0, bool = 0, bool = 1);
                          KToolBar (TQMainWindow*, TQWidget*, bool = 0, const char* = 0, bool = 0, bool = 1);
-    int                  insertButton (const TQString&, int, bool = 1, const TQString& = TQString ::null , int = -1, TDEInstance* = KGlobal ::instance ());
-    int                  insertButton (const TQString&, int, const char*, SIP_RXOBJ_CON, SIP_SLOT_CON (int), bool = 1, const TQString& = TQString ::null , int = -1, TDEInstance* = KGlobal ::instance ());
+    int                  insertButton (const TQString&, int, bool = 1, const TQString& = TQString ::null , int = -1, TDEInstance* = TDEGlobal ::instance ());
+    int                  insertButton (const TQString&, int, const char*, SIP_RXOBJ_CON, SIP_SLOT_CON (int), bool = 1, const TQString& = TQString ::null , int = -1, TDEInstance* = TDEGlobal ::instance ());
     int                  insertButton (const TQPixmap&, int, bool = 1, const TQString& = TQString ::null , int = -1);
     int                  insertButton (const TQPixmap&, int, const char*, SIP_RXOBJ_CON, SIP_SLOT_CON (int), bool = 1, const TQString& = TQString ::null , int = -1);
     int                  insertButton (const TQString&, int, TQPopupMenu*, bool, const TQString&, int = -1);
diff --git a/sip/tdeui/ktoolbarbutton.sip b/sip/tdeui/ktoolbarbutton.sip
index 902ee11..0ec8366 100644
--- a/sip/tdeui/ktoolbarbutton.sip
+++ b/sip/tdeui/ktoolbarbutton.sip
@@ -32,7 +32,7 @@ class KToolBarButton : TQToolButton
 
 
 public:
-                         KToolBarButton (const TQString&, int, TQWidget* /TransferThis/, const char* = 0, const TQString& = TQString ::null , TDEInstance* = KGlobal ::instance ());
+                         KToolBarButton (const TQString&, int, TQWidget* /TransferThis/, const char* = 0, const TQString& = TQString ::null , TDEInstance* = TDEGlobal ::instance ());
                          KToolBarButton (const TQPixmap&, int, TQWidget* /TransferThis/, const char* = 0, const TQString& = TQString ::null );
                          KToolBarButton (TQWidget* /TransferThis/ = 0, const char* = 0);
     virtual void         setPixmap (const TQPixmap&);