summaryrefslogtreecommitdiffstats
path: root/sip
diff options
context:
space:
mode:
Diffstat (limited to 'sip')
-rw-r--r--sip/kfile/knotifydialog.sip8
-rw-r--r--sip/kio/krun.sip16
-rw-r--r--sip/kio/ksycoca.sip2
-rw-r--r--sip/kspell/kspell.sip4
-rw-r--r--sip/tdecore/kaccel.sip8
-rw-r--r--sip/tdecore/kclipboard.sip10
-rw-r--r--sip/tdecore/kcompletion.sip8
-rw-r--r--sip/tdecore/kconfigskeleton.sip4
-rw-r--r--sip/tdecore/kglobal.sip4
-rw-r--r--sip/tdecore/kglobalaccel.sip6
-rw-r--r--sip/tdecore/kglobalsettings.sip8
-rw-r--r--sip/tdecore/kiconloader.sip22
-rw-r--r--sip/tdecore/klibloader.sip2
-rw-r--r--sip/tdecore/kmimesourcefactory.sip2
-rw-r--r--sip/tdecore/kprocctrl.sip18
-rw-r--r--sip/tdecore/kprocess.sip36
-rw-r--r--sip/tdecore/kprocio.sip6
-rw-r--r--sip/tdecore/kshortcutlist.sip2
-rw-r--r--sip/tdecore/kstddirs.sip4
-rw-r--r--sip/tdeui/kcombobox.sip2
-rw-r--r--sip/tdeui/kguiitem.sip2
-rw-r--r--sip/tdeui/kkeydialog.sip12
-rw-r--r--sip/tdeui/klineedit.sip4
-rw-r--r--sip/tdeui/ksystemtray.sip2
-rw-r--r--sip/tdeui/ktoolbar.sip4
-rw-r--r--sip/tdeui/ktoolbarbutton.sip2
26 files changed, 99 insertions, 99 deletions
diff --git a/sip/kfile/knotifydialog.sip b/sip/kfile/knotifydialog.sip
index 5787bb2..ad16340 100644
--- a/sip/kfile/knotifydialog.sip
+++ b/sip/kfile/knotifydialog.sip
@@ -38,7 +38,7 @@ public:
%MethodCode
//takes parent | (TQWidget = 0) | name | (char = 0) | modal | (bool = 1) | aboutData | (TDEAboutData = see note)
//doc
-// The default value for aboutData in C++ is KGlobal::instance()->aboutData()
+// The default value for aboutData in C++ is TDEGlobal::instance()->aboutData()
// which sip is unable to parse. Since it's the last arg in the list, it has
// to have a default value, and since the C++ code will fail if the default
// value really is zero, the sip code silently substitutes the real default
@@ -46,7 +46,7 @@ public:
//end
if (a3 == 0)
- a3 = (TDEAboutData *)KGlobal::instance ()->aboutData ();
+ a3 = (TDEAboutData *)TDEGlobal::instance ()->aboutData ();
Py_BEGIN_ALLOW_THREADS
sipCpp = new sipKNotifyDialog (a0, a1, a2, a3);
@@ -58,7 +58,7 @@ public:
//returns (int)
//takes parent | (TQWidget = 0) | name | (a Python string = "") | aboutData | (TDEAboutData = see note)
//doc
-// The default value for aboutData in C++ is KGlobal::instance()->aboutData()
+// The default value for aboutData in C++ is TDEGlobal::instance()->aboutData()
// which sip is unable to parse. Since it's the last arg in the list, it has
// to have a default value, and since the C++ code will fail if the default
// value really is zero, the sip code silently substitutes the real default
@@ -66,7 +66,7 @@ public:
//end
if (a2 == 0)
- a2 = (TDEAboutData *)KGlobal::instance ()->aboutData ();
+ a2 = (TDEAboutData *)TDEGlobal::instance ()->aboutData ();
Py_BEGIN_ALLOW_THREADS
sipRes = KNotifyDialog::configure (a0, a1, a2);
diff --git a/sip/kio/krun.sip b/sip/kio/krun.sip
index 5a0457f..e180301 100644
--- a/sip/kio/krun.sip
+++ b/sip/kio/krun.sip
@@ -174,7 +174,7 @@ public:
}; // class KOpenWithHandler
-class KProcessRunner : TQObject
+class TDEProcessRunner : TQObject
{
%TypeHeaderCode
#include <krun.h>
@@ -182,25 +182,25 @@ class KProcessRunner : TQObject
public:
- static pid_t run (KProcess*, const TQString&);
+ static pid_t run (TDEProcess*, const TQString&);
%If ( KDE_3_1_4 - )
- static pid_t run (KProcess*, const TQString&, const KStartupInfoId&);
+ static pid_t run (TDEProcess*, const TQString&, const KStartupInfoId&);
%End
pid_t pid () const;
protected slots:
- void slotProcessExited (KProcess*);
+ void slotProcessExited (TDEProcess*);
private:
- KProcessRunner (KProcess*, const TQString&);
+ TDEProcessRunner (TDEProcess*, const TQString&);
%If ( KDE_3_1_4 - )
- KProcessRunner (KProcess*, const TQString&, const KStartupInfoId&);
+ TDEProcessRunner (TDEProcess*, const TQString&, const KStartupInfoId&);
%End
- KProcessRunner ();
+ TDEProcessRunner ();
-}; // class KProcessRunner
+}; // class TDEProcessRunner
diff --git a/sip/kio/ksycoca.sip b/sip/kio/ksycoca.sip
index 615002f..823868b 100644
--- a/sip/kio/ksycoca.sip
+++ b/sip/kio/ksycoca.sip
@@ -130,7 +130,7 @@ protected:
{sipName_KFilterBase, &sipClass_KFilterBase},
{sipName_KOCRDialog, &sipClass_KOCRDialog},
{sipName_KOCRDialogFactory, &sipClass_KOCRDialogFactory},
- {sipName_KProcessRunner, &sipClass_KProcessRunner},
+ {sipName_TDEProcessRunner, &sipClass_TDEProcessRunner},
{sipName_KRun, &sipClass_KRun},
{sipName_KScanDialog, &sipClass_KScanDialog},
{sipName_KScanDialogFactory, &sipClass_KScanDialogFactory},
diff --git a/sip/kspell/kspell.sip b/sip/kspell/kspell.sip
index 62c1058..ce45612 100644
--- a/sip/kspell/kspell.sip
+++ b/sip/kspell/kspell.sip
@@ -125,9 +125,9 @@ protected slots:
%End
void slotStopCancel (int);
- void ispellExit (KProcess*);
+ void ispellExit (TDEProcess*);
void emitDeath ();
- void ispellErrors (KProcess*, char*, int);
+ void ispellErrors (TDEProcess*, char*, int);
%If ( KDE_3_2_0 - )
void checkNext ();
diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip
index 23f7f75..f054ef1 100644
--- a/sip/tdecore/kaccel.sip
+++ b/sip/tdecore/kaccel.sip
@@ -123,21 +123,21 @@ public:
{sipName_KAudioPlayer, &sipClass_KAudioPlayer},
{sipName_KBufferedIO, &sipClass_KBufferedIO},
#if TDE_VERSION >= 0x030100
- {sipName_KClipboardSynchronizer, &sipClass_KClipboardSynchronizer},
+ {sipName_TDEClipboardSynchronizer, &sipClass_TDEClipboardSynchronizer},
#endif
{sipName_KCompletion, &sipClass_KCompletion},
{sipName_KConfig, &sipClass_KConfig},
{sipName_KConfigBase, &sipClass_KConfigBase},
{sipName_KConfigGroup, &sipClass_KConfigGroup},
{sipName_KDesktopFile, &sipClass_KDesktopFile},
- {sipName_KGlobalAccel, &sipClass_KGlobalAccel},
+ {sipName_TDEGlobalAccel, &sipClass_TDEGlobalAccel},
{sipName_KLibFactory, &sipClass_KLibFactory},
{sipName_KLibLoader, &sipClass_KLibLoader},
{sipName_KLibrary, &sipClass_KLibrary},
{sipName_KMultipleDrag, &sipClass_KMultipleDrag},
{sipName_KProcIO, &sipClass_KProcIO},
- {sipName_KProcess, &sipClass_KProcess},
- {sipName_KProcessController, &sipClass_KProcessController},
+ {sipName_TDEProcess, &sipClass_TDEProcess},
+ {sipName_TDEProcessController, &sipClass_TDEProcessController},
{sipName_KServerSocket, &sipClass_KServerSocket},
{sipName_KShellProcess, &sipClass_KShellProcess},
{sipName_KSimpleConfig, &sipClass_KSimpleConfig},
diff --git a/sip/tdecore/kclipboard.sip b/sip/tdecore/kclipboard.sip
index 895cc90..178d748 100644
--- a/sip/tdecore/kclipboard.sip
+++ b/sip/tdecore/kclipboard.sip
@@ -26,7 +26,7 @@
%If ( KDE_3_1_0 - )
-class KClipboardSynchronizer : TQObject
+class TDEClipboardSynchronizer : TQObject
{
%TypeHeaderCode
#include <kclipboard.h>
@@ -34,19 +34,19 @@ class KClipboardSynchronizer : TQObject
public:
- static KClipboardSynchronizer* self ();
+ static TDEClipboardSynchronizer* self ();
static void setSynchronizing (bool);
static bool isSynchronizing ();
static void setReverseSynchronizing (bool);
static bool isReverseSynchronizing ();
protected:
- ~KClipboardSynchronizer ();
+ ~TDEClipboardSynchronizer ();
private:
- KClipboardSynchronizer (TQObject* /TransferThis/ = 0, const char* = 0);
+ TDEClipboardSynchronizer (TQObject* /TransferThis/ = 0, const char* = 0);
-}; // class KClipboardSynchronizer
+}; // class TDEClipboardSynchronizer
%End
diff --git a/sip/tdecore/kcompletion.sip b/sip/tdecore/kcompletion.sip
index 4967a6d..8a67700 100644
--- a/sip/tdecore/kcompletion.sip
+++ b/sip/tdecore/kcompletion.sip
@@ -52,8 +52,8 @@ public:
bool isEmpty () const;
%End
- virtual void setCompletionMode (KGlobalSettings::Completion);
- KGlobalSettings::Completion completionMode () const;
+ virtual void setCompletionMode (TDEGlobalSettings::Completion);
+ TDEGlobalSettings::Completion completionMode () const;
virtual void setOrder (KCompletion::CompOrder);
CompOrder order () const;
virtual void setIgnoreCase (bool);
@@ -125,8 +125,8 @@ public:
void setEnableSignals (bool);
bool handleSignals () const;
bool emitSignals () const;
- virtual void setCompletionMode (KGlobalSettings::Completion);
- KGlobalSettings::Completion completionMode () const;
+ virtual void setCompletionMode (TDEGlobalSettings::Completion);
+ TDEGlobalSettings::Completion completionMode () const;
bool setKeyBinding (KCompletionBase::KeyBindingType, const KShortcut&);
const KShortcut& getKeyBinding (KCompletionBase::KeyBindingType) const;
void useGlobalKeyBindings ();
diff --git a/sip/tdecore/kconfigskeleton.sip b/sip/tdecore/kconfigskeleton.sip
index 467ebb2..4def51c 100644
--- a/sip/tdecore/kconfigskeleton.sip
+++ b/sip/tdecore/kconfigskeleton.sip
@@ -379,7 +379,7 @@ public:
%End
ItemColor* addItemColor (const TQString&, TQColor&, const TQColor& = TQColor (128 ,128 ,128 ), const TQString& = TQString ::null );
- ItemFont* addItemFont (const TQString&, TQFont&, const TQFont& = KGlobalSettings ::generalFont (), const TQString& = TQString ::null );
+ ItemFont* addItemFont (const TQString&, TQFont&, const TQFont& = TDEGlobalSettings ::generalFont (), const TQString& = TQString ::null );
ItemRect* addItemRect (const TQString&, TQRect&, const TQRect& = TQRect (), const TQString& = TQString ::null );
ItemPoint* addItemPoint (const TQString&, TQPoint&, const TQPoint& = TQPoint (), const TQString& = TQString ::null );
ItemSize* addItemSize (const TQString&, TQSize&, const TQSize& = TQSize (), const TQString& = TQString ::null );
@@ -901,7 +901,7 @@ public:
{
public:
- ItemFont (const TQString&, const TQString&, TQFont&, const TQFont& = KGlobalSettings ::generalFont ());
+ ItemFont (const TQString&, const TQString&, TQFont&, const TQFont& = TDEGlobalSettings ::generalFont ());
void setValue (const TQFont&);
TQFont& value ();
virtual void setDefaultValue (const TQFont&);
diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip
index 7a03345..fdfd5ba 100644
--- a/sip/tdecore/kglobal.sip
+++ b/sip/tdecore/kglobal.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KGlobal
+class TDEGlobal
{
%TypeHeaderCode
#include <kglobal.h>
@@ -57,7 +57,7 @@ public:
static TDEInstance* activeInstance ();
//ig TDEInstance* _activeInstance;
-}; // class KGlobal
+}; // class TDEGlobal
%If ( KDE_3_4_0 - )
diff --git a/sip/tdecore/kglobalaccel.sip b/sip/tdecore/kglobalaccel.sip
index e90fa50..e23a332 100644
--- a/sip/tdecore/kglobalaccel.sip
+++ b/sip/tdecore/kglobalaccel.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KGlobalAccel : TQObject
+class TDEGlobalAccel : TQObject
{
%TypeHeaderCode
#include <kglobalaccel.h>
@@ -32,7 +32,7 @@ class KGlobalAccel : TQObject
public:
- KGlobalAccel (TQObject*, const char* = 0);
+ TDEGlobalAccel (TQObject*, const char* = 0);
bool isEnabled ();
void setEnabled (bool);
KAccelAction* insert (const TQString&, const TQString&, const TQString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
@@ -83,5 +83,5 @@ public:
%End
-}; // class KGlobalAccel
+}; // class TDEGlobalAccel
diff --git a/sip/tdecore/kglobalsettings.sip b/sip/tdecore/kglobalsettings.sip
index 58380d7..8140043 100644
--- a/sip/tdecore/kglobalsettings.sip
+++ b/sip/tdecore/kglobalsettings.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KGlobalSettings
+class TDEGlobalSettings
{
%TypeHeaderCode
#include <kglobalsettings.h>
@@ -44,7 +44,7 @@ public:
Enable
};
- static KGlobalSettings::TearOffHandle insertTearOffHandle ();
+ static TDEGlobalSettings::TearOffHandle insertTearOffHandle ();
%End
static bool changeCursorOverIcon ();
@@ -83,7 +83,7 @@ public:
public:
- static KGlobalSettings::KMouseSettings& mouseSettings ();
+ static TDEGlobalSettings::KMouseSettings& mouseSettings ();
static TQString desktopPath ();
static TQString autostartPath ();
static TQString trashPath ();
@@ -153,5 +153,5 @@ public:
%End
-}; // class KGlobalSettings
+}; // class TDEGlobalSettings
diff --git a/sip/tdecore/kiconloader.sip b/sip/tdecore/kiconloader.sip
index bf62f2e..5cc9a18 100644
--- a/sip/tdecore/kiconloader.sip
+++ b/sip/tdecore/kiconloader.sip
@@ -79,19 +79,19 @@ public:
#include <kiconloader.h>
%End
-TQPixmap DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
TQPixmap DesktopIcon (const TQString&, TDEInstance*);
-TQIconSet DesktopIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
-TQPixmap BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQIconSet DesktopIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ());
+TQPixmap BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
TQPixmap BarIcon (const TQString&, TDEInstance*);
-TQIconSet BarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
-TQPixmap SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQIconSet BarIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ());
+TQPixmap SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
TQPixmap SmallIcon (const TQString&, TDEInstance*);
-TQIconSet SmallIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
-TQPixmap MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQIconSet SmallIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ());
+TQPixmap MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
TQPixmap MainBarIcon (const TQString&, TDEInstance*);
-TQIconSet MainBarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
-TQPixmap UserIcon (const TQString&, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQIconSet MainBarIconSet (const TQString&, int = 0, TDEInstance* = TDEGlobal ::instance ());
+TQPixmap UserIcon (const TQString&, int = KIcon ::DefaultState , TDEInstance* = TDEGlobal ::instance ());
TQPixmap UserIcon (const TQString&, TDEInstance*);
-TQIconSet UserIconSet (const TQString&, TDEInstance* = KGlobal ::instance ());
-int IconSize (KIcon::Group, TDEInstance* = KGlobal ::instance ());
+TQIconSet UserIconSet (const TQString&, TDEInstance* = TDEGlobal ::instance ());
+int IconSize (KIcon::Group, TDEInstance* = TDEGlobal ::instance ());
diff --git a/sip/tdecore/klibloader.sip b/sip/tdecore/klibloader.sip
index d068558..e8f1b45 100644
--- a/sip/tdecore/klibloader.sip
+++ b/sip/tdecore/klibloader.sip
@@ -68,7 +68,7 @@ public:
virtual void unloadLibrary (const char*);
static KLibLoader* self ();
static void cleanUp ();
- static TQString findLibrary (const char*, const TDEInstance* = KGlobal ::instance ());
+ static TQString findLibrary (const char*, const TDEInstance* = TDEGlobal ::instance ());
protected:
KLibLoader (TQObject* /TransferThis/ = 0, const char* = 0);
diff --git a/sip/tdecore/kmimesourcefactory.sip b/sip/tdecore/kmimesourcefactory.sip
index 77ff521..44da6f9 100644
--- a/sip/tdecore/kmimesourcefactory.sip
+++ b/sip/tdecore/kmimesourcefactory.sip
@@ -32,7 +32,7 @@ class KMimeSourceFactory : TQMimeSourceFactory
public:
- KMimeSourceFactory (KIconLoader* = KGlobal ::iconLoader ());
+ KMimeSourceFactory (KIconLoader* = TDEGlobal ::iconLoader ());
virtual TQString makeAbsolute (const TQString&, const TQString&) const;
protected:
diff --git a/sip/tdecore/kprocctrl.sip b/sip/tdecore/kprocctrl.sip
index 11605ce..a4a73c2 100644
--- a/sip/tdecore/kprocctrl.sip
+++ b/sip/tdecore/kprocctrl.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KProcessController : TQObject
+class TDEProcessController : TQObject
{
%TypeHeaderCode
#include <kprocctrl.h>
@@ -38,7 +38,7 @@ public:
static void deref ();
%End
- KProcessController* theKProcessController;
+ TDEProcessController* theTDEProcessController;
static void theSigCHLDHandler (int);
%If ( KDE_3_0_3 - )
@@ -52,8 +52,8 @@ public:
%End
- void addKProcess (KProcess*);
- void removeKProcess (KProcess*);
+ void addTDEProcess (TDEProcess*);
+ void removeTDEProcess (TDEProcess*);
%If ( KDE_3_2_0 - )
void addProcess (int);
@@ -63,16 +63,16 @@ public:
%If ( KDE_3_1_0 - )
private:
- KProcessController ();
+ TDEProcessController ();
%End
- ~KProcessController ();
- KProcessController (KProcessController&);
+ ~TDEProcessController ();
+ TDEProcessController (TDEProcessController&);
public:
%If ( - KDE_3_1_0 )
- KProcessController ();
+ TDEProcessController ();
%End
@@ -91,5 +91,5 @@ public slots:
%End
-}; // class KProcessController
+}; // class TDEProcessController
diff --git a/sip/tdecore/kprocess.sip b/sip/tdecore/kprocess.sip
index c701423..e60abd4 100644
--- a/sip/tdecore/kprocess.sip
+++ b/sip/tdecore/kprocess.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KProcess : TQObject
+class TDEProcess : TQObject
{
%TypeHeaderCode
#include <kprocess.h>
@@ -61,21 +61,21 @@ public:
OwnGroup
};
- KProcess (TQObject* /TransferThis/, const char* = 0);
+ TDEProcess (TQObject* /TransferThis/, const char* = 0);
%End
- KProcess ();
+ TDEProcess ();
bool setExecutable (const TQString&);
%If ( KDE_3_1_4 - )
- KProcess& operator << (const TQString&);
- KProcess& operator << (const char*);
- KProcess& operator << (const TQCString&);
- KProcess& operator << (const TQStringList&);
+ TDEProcess& operator << (const TQString&);
+ TDEProcess& operator << (const char*);
+ TDEProcess& operator << (const TQCString&);
+ TDEProcess& operator << (const TQStringList&);
%End
void clearArguments ();
- virtual bool start (KProcess::RunMode = NotifyOnExit , KProcess::Communication = NoCommunication );
+ virtual bool start (TDEProcess::RunMode = NotifyOnExit , TDEProcess::Communication = NoCommunication );
virtual bool kill (int = SIGTERM );
bool isRunning () const;
pid_t pid () const;
@@ -141,11 +141,11 @@ public:
signals:
- void processExited (KProcess*);
- void receivedStdout (KProcess*, char*, int);
+ void processExited (TDEProcess*);
+ void receivedStdout (TDEProcess*, char*, int);
//ig void receivedStdout (int, int&);
- void receivedStderr (KProcess*, char*, int);
- void wroteStdin (KProcess*);
+ void receivedStderr (TDEProcess*, char*, int);
+ void wroteStdin (TDEProcess*);
protected slots:
void slotChildOutput (int);
@@ -154,7 +154,7 @@ protected slots:
protected:
void setupEnvironment ();
- virtual int setupCommunication (KProcess::Communication);
+ virtual int setupCommunication (TDEProcess::Communication);
virtual int commSetupDoneP ();
virtual int commSetupDoneC ();
virtual void processHasExited (int);
@@ -191,7 +191,7 @@ public:
public:
%If ( KDE_3_2_0 - KDE_3_4_0 )
- void setUsePty (KProcess::Communication, bool);
+ void setUsePty (TDEProcess::Communication, bool);
KPty* pty () const;
%End
@@ -213,7 +213,7 @@ public:
%If ( - KDE_3_2_0 )
private:
- KProcess (const KProcess&);
+ TDEProcess (const TDEProcess&);
%End
@@ -224,7 +224,7 @@ public:
//takes arglist | (a Python list of strings)
//doc
// setArguments is the PyKDE equivalent of the stream operator methods (<<)
-// in KDE's KProcess class - provide with a list of strings representing
+// in KDE's TDEProcess class - provide with a list of strings representing
// the arguments to the executable program set with setExecutable (PyKDE
// will continue to provide setExecutable even though it's deprecated in
// KDE (to also be replaced with stream operators)
@@ -243,10 +243,10 @@ public:
//end
-}; // class KProcess
+}; // class TDEProcess
-class KShellProcess : KProcess
+class KShellProcess : TDEProcess
{
%TypeHeaderCode
#include <kprocess.h>
diff --git a/sip/tdecore/kprocio.sip b/sip/tdecore/kprocio.sip
index 1c15c2a..bf920a0 100644
--- a/sip/tdecore/kprocio.sip
+++ b/sip/tdecore/kprocio.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KProcIO : KProcess
+class KProcIO : TDEProcess
{
%TypeHeaderCode
#include <kprocio.h>
@@ -57,8 +57,8 @@ protected:
void controlledEmission ();
protected slots:
- void received (KProcess*, char*, int);
- void sent (KProcess*);
+ void received (TDEProcess*, char*, int);
+ void sent (TDEProcess*);
protected:
//igx virtual void virtual_hook (int, void*);
diff --git a/sip/tdecore/kshortcutlist.sip b/sip/tdecore/kshortcutlist.sip
index 8c44662..cf8f3a5 100644
--- a/sip/tdecore/kshortcutlist.sip
+++ b/sip/tdecore/kshortcutlist.sip
@@ -76,7 +76,7 @@ class KAccelShortcutList : KShortcutList
public:
KAccelShortcutList (KAccel*);
- KAccelShortcutList (KGlobalAccel*);
+ KAccelShortcutList (TDEGlobalAccel*);
KAccelShortcutList (KAccelActions&, bool);
virtual uint count () const;
virtual TQString name (uint) const;
diff --git a/sip/tdecore/kstddirs.sip b/sip/tdecore/kstddirs.sip
index 7922a4e..22204e2 100644
--- a/sip/tdecore/kstddirs.sip
+++ b/sip/tdecore/kstddirs.sip
@@ -65,5 +65,5 @@ private:
#include <kstddirs.h>
%End
-TQString locate (const char*, const TQString&, const TDEInstance* = KGlobal::instance());
-TQString locateLocal (const char*, const TQString&, const TDEInstance* = KGlobal::instance());
+TQString locate (const char*, const TQString&, const TDEInstance* = TDEGlobal::instance());
+TQString locateLocal (const char*, const TQString&, const TDEInstance* = TDEGlobal::instance());
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&);