From 1244eb7c0136985569a71f525ef5bcee08a431c4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:31:20 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- ChangeLog | 4 +- ChangeLog.2001-4 | 2 +- Changelog | 4 +- doc/classref/allclasses.html | 16 +++---- doc/classref/kfile/KNotifyDialog.html | 4 +- doc/classref/kio/KProcessRunner.html | 28 +++++------ doc/classref/kio/index.html | 2 +- doc/classref/kparts/konsolePart.html | 2 +- doc/classref/kspell/KSpell.html | 4 +- doc/classref/tdecore/KAccelShortcutList.html | 2 +- .../tdecore/KClipboardSynchronizer.html | 14 +++--- doc/classref/tdecore/KCompletion.html | 4 +- doc/classref/tdecore/KCompletionBase.html | 4 +- .../tdecore/KConfigSkeleton.ItemFont.html | 4 +- doc/classref/tdecore/KConfigSkeleton.html | 4 +- doc/classref/tdecore/KGlobal.html | 6 +-- doc/classref/tdecore/KGlobalAccel.html | 10 ++-- .../KGlobalSettings.KMouseSettings.html | 6 +-- doc/classref/tdecore/KGlobalSettings.html | 10 ++-- doc/classref/tdecore/KLibLoader.html | 4 +- doc/classref/tdecore/KMimeSourceFactory.html | 4 +- doc/classref/tdecore/KProcIO.html | 6 +-- doc/classref/tdecore/KProcess.html | 46 +++++++++---------- doc/classref/tdecore/KProcessController.html | 32 ++++++------- doc/classref/tdecore/KShellProcess.html | 2 +- doc/classref/tdecore/index.html | 16 +++---- doc/classref/tdecore/tdecore-globals.html | 44 +++++++++--------- doc/classref/tdeui/KComboBox.html | 2 +- doc/classref/tdeui/KGuiItem.html | 4 +- doc/classref/tdeui/KKeyChooser.html | 6 +-- doc/classref/tdeui/KKeyDialog.html | 6 +-- doc/classref/tdeui/KLineEdit.html | 4 +- doc/classref/tdeui/KSystemTray.html | 4 +- doc/classref/tdeui/KToolBar.html | 8 ++-- doc/classref/tdeui/KToolBarButton.html | 4 +- examples/pytde-sampler/misc/passivepop.py | 4 +- examples/pytde-sampler/qt_widgets/CONTRIB | 14 +++--- examples/pytde-sampler/sampler.py | 12 ++--- examples/uikmdi.py | 4 +- examples/uiqxembed.py | 6 +-- examples/xmlmenudemo.py | 2 +- extra/kde300/kaccelbase.h | 2 +- extra/kde300/ktoolbarbutton.h | 2 +- extra/kde301/kaccelbase.h | 2 +- extra/kde301/ktoolbarbutton.h | 2 +- extra/kde303/kaccelbase.h | 2 +- extra/kde303/ktoolbarbutton.h | 2 +- extra/kde310/kaccelaction.h | 2 +- extra/kde310/kaccelbase.h | 2 +- extra/kde310/ktoolbarbutton.h | 2 +- extra/kde311/kaccelaction.h | 2 +- extra/kde311/kaccelbase.h | 2 +- extra/kde311/ktoolbarbutton.h | 2 +- extra/kde312/kaccelaction.h | 2 +- extra/kde312/kaccelbase.h | 2 +- extra/kde312/ktoolbarbutton.h | 2 +- extra/kde313/kaccelaction.h | 2 +- extra/kde313/kaccelbase.h | 2 +- extra/kde313/ktoolbarbutton.h | 2 +- extra/kde314/kaccelaction.h | 2 +- extra/kde314/kaccelbase.h | 2 +- extra/kde314/ktoolbarbutton.h | 2 +- extra/kde315/kaccelaction.h | 2 +- extra/kde315/kaccelbase.h | 2 +- extra/kde315/ktoolbarbutton.h | 2 +- extra/kde320/kaccelaction.h | 2 +- extra/kde320/kaccelbase.h | 2 +- extra/kde320/ktoolbarbutton.h | 2 +- extra/kde321/kaccelaction.h | 2 +- extra/kde321/kaccelbase.h | 2 +- extra/kde321/ktoolbarbutton.h | 2 +- extra/kde322/kaccelaction.h | 2 +- extra/kde322/kaccelbase.h | 2 +- extra/kde322/ktoolbarbutton.h | 2 +- extra/kde323/kaccelaction.h | 2 +- extra/kde323/kaccelbase.h | 2 +- extra/kde323/ktoolbarbutton.h | 2 +- extra/kde330/kaccelaction.h | 2 +- extra/kde330/kaccelbase.h | 2 +- extra/kde330/ktoolbarbutton.h | 2 +- extra/kde331/kaccelaction.h | 2 +- extra/kde331/kaccelbase.h | 2 +- extra/kde331/ktoolbarbutton.h | 2 +- extra/kde332/kaccelaction.h | 2 +- extra/kde332/kaccelbase.h | 2 +- extra/kde332/ktoolbarbutton.h | 2 +- extra/kde340/kaccelaction.h | 2 +- extra/kde340/kaccelbase.h | 2 +- extra/kde340/ktoolbarbutton.h | 2 +- extra/kde341/kaccelaction.h | 2 +- extra/kde341/kaccelbase.h | 2 +- extra/kde341/ktoolbarbutton.h | 2 +- extra/kde342/kaccelaction.h | 2 +- extra/kde342/kaccelbase.h | 2 +- extra/kde342/ktoolbarbutton.h | 2 +- extra/kde343/kaccelaction.h | 2 +- extra/kde343/kaccelbase.h | 2 +- extra/kde343/ktoolbarbutton.h | 2 +- extra/kde350/kaccelaction.h | 2 +- extra/kde350/kaccelbase.h | 2 +- extra/kde350/konsole_part.h | 2 +- extra/kde350/ktoolbarbutton.h | 2 +- extra/kde351/kaccelaction.h | 2 +- extra/kde351/kaccelbase.h | 2 +- extra/kde351/konsole_part.h | 2 +- extra/kde351/ktoolbarbutton.h | 2 +- extra/kde352/kaccelaction.h | 2 +- extra/kde352/kaccelbase.h | 2 +- extra/kde352/konsole_part.h | 2 +- extra/kde352/ktoolbarbutton.h | 2 +- extra/kde353/kaccelaction.h | 2 +- extra/kde353/kaccelbase.h | 2 +- extra/kde353/konsole_part.h | 2 +- extra/kde353/ktoolbarbutton.h | 2 +- sip/kfile/knotifydialog.sip | 8 ++-- sip/kio/krun.sip | 16 +++---- sip/kio/ksycoca.sip | 2 +- sip/kspell/kspell.sip | 4 +- sip/tdecore/kaccel.sip | 8 ++-- sip/tdecore/kclipboard.sip | 10 ++-- sip/tdecore/kcompletion.sip | 8 ++-- sip/tdecore/kconfigskeleton.sip | 4 +- sip/tdecore/kglobal.sip | 4 +- sip/tdecore/kglobalaccel.sip | 6 +-- sip/tdecore/kglobalsettings.sip | 8 ++-- sip/tdecore/kiconloader.sip | 22 ++++----- sip/tdecore/klibloader.sip | 2 +- sip/tdecore/kmimesourcefactory.sip | 2 +- sip/tdecore/kprocctrl.sip | 18 ++++---- sip/tdecore/kprocess.sip | 36 +++++++-------- sip/tdecore/kprocio.sip | 6 +-- sip/tdecore/kshortcutlist.sip | 2 +- sip/tdecore/kstddirs.sip | 4 +- sip/tdeui/kcombobox.sip | 2 +- sip/tdeui/kguiitem.sip | 2 +- sip/tdeui/kkeydialog.sip | 12 ++--- sip/tdeui/klineedit.sip | 4 +- sip/tdeui/ksystemtray.sip | 2 +- sip/tdeui/ktoolbar.sip | 4 +- sip/tdeui/ktoolbarbutton.sip | 2 +- 140 files changed, 354 insertions(+), 354 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2b7e44..9859072 100644 --- a/ChangeLog +++ b/ChangeLog @@ -414,7 +414,7 @@ Changed pid_t type from int to long; enabled KParts::URLArgs::metaData () ------------------------------------------------------------------------ r39 | (jim) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines -KFileMetaInfo typedefs removed; KProcessController versioning +KFileMetaInfo typedefs removed; TDEProcessController versioning corrected; KRecentDirs (and extra/ hfiles) added; pytde332.prj added @@ -516,7 +516,7 @@ docs for final release ------------------------------------------------------------------------ r18 | (jim) | 2004-08-20 18:50:22 -0700 (Fri, 20 Aug 2004) | 2 lines -Fixed access specifier for copy ctor on KProcessController +Fixed access specifier for copy ctor on TDEProcessController ------------------------------------------------------------------------ r17 | (jim) | 2004-08-20 10:00:27 -0700 (Fri, 20 Aug 2004) | 2 lines diff --git a/ChangeLog.2001-4 b/ChangeLog.2001-4 index 1053177..69d8d14 100644 --- a/ChangeLog.2001-4 +++ b/ChangeLog.2001-4 @@ -151,7 +151,7 @@ virtual code; general cleanup 2002/2/13 09:15:00 jim 3.0alpha6: versioning to KDE2.2.2; repaired SLOT assignment code in KStdAction, KAction,K*Action, -KAccelMenu, KToolBar, and KGlobalAccel with +KAccelMenu, KToolBar, and TDEGlobalAccel with "SIP_RXOBJ_CON, SIP_SLOT_CON(...)"; diff --git a/Changelog b/Changelog index aa05f82..31a7ec8 100644 --- a/Changelog +++ b/Changelog @@ -591,7 +591,7 @@ Changed pid_t type from int to long; enabled KParts::URLArgs::metaData () ------------------------------------------------------------------------ r39 | (no author) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines -KFileMetaInfo typedefs removed; KProcessController versioning +KFileMetaInfo typedefs removed; TDEProcessController versioning corrected; KRecentDirs (and extra/ hfiles) added; pytde332.prj added @@ -693,7 +693,7 @@ docs for final release ------------------------------------------------------------------------ r18 | (no author) | 2004-08-20 18:50:22 -0700 (Fri, 20 Aug 2004) | 2 lines -Fixed access specifier for copy ctor on KProcessController +Fixed access specifier for copy ctor on TDEProcessController ------------------------------------------------------------------------ r17 | (no author) | 2004-08-20 10:00:27 -0700 (Fri, 20 Aug 2004) | 2 lines diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html index fcc5ac6..91c1a02 100644 --- a/doc/classref/allclasses.html +++ b/doc/classref/allclasses.html @@ -261,7 +261,7 @@ KCharSelect KCharSelectTable KCharsets -KClipboardSynchronizer +TDEClipboardSynchronizer TDECmdLineArgs KCmdLineOptions KCodecs @@ -417,10 +417,10 @@ KFontDialog KFontRequester KFontSizeAction -KGlobal -KGlobalAccel -KGlobalSettings.KMouseSettings -KGlobalSettings +TDEGlobal +TDEGlobalAccel +TDEGlobalSettings.KMouseSettings +TDEGlobalSettings KGradientSelector KGuiItem KHSSelector @@ -629,9 +629,9 @@ KPrintDialogPage KPrinter KProcIO -KProcess -KProcessController -KProcessRunner +TDEProcess +TDEProcessController +TDEProcessRunner KProgress KProgressDialog KPropertiesDialog diff --git a/doc/classref/kfile/KNotifyDialog.html b/doc/classref/kfile/KNotifyDialog.html index dde017f..c235121 100644 --- a/doc/classref/kfile/KNotifyDialog.html +++ b/doc/classref/kfile/KNotifyDialog.html @@ -44,7 +44,7 @@ modalbool1 aboutDataTDEAboutDatasee note -
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 @@ -77,7 +77,7 @@ value for a default value of 0 supplied from Python.
namea Python string""
aboutDataTDEAboutDatasee note
-
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 diff --git a/doc/classref/kio/KProcessRunner.html b/doc/classref/kio/KProcessRunner.html index 7c18d7e..08a80c0 100644 --- a/doc/classref/kio/KProcessRunner.html +++ b/doc/classref/kio/KProcessRunner.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KProcessRunner + class TDEProcessRunner @@ -12,7 +12,7 @@
-

class KProcessRunner

+

class TDEProcessRunner

 @@ -28,31 +28,31 @@ - +
kio
ClassKProcessRunnerTDEProcessRunner
Inherits TQObject

methods

    -
  • KProcessRunner (a0, binName) -
    +
  • TDEProcessRunner (a0, binName) +
    • returns a KProcessRunner instance
    returns a TDEProcessRunner instance
    - +
    ArgumentTypeDefault
    a0KProcess
    a0TDEProcess
    binNameTQString
    -
  • KProcessRunner (a0, binName, id) -
    +
  • TDEProcessRunner (a0, binName, id) +
    • returns a KProcessRunner instance
    returns a TDEProcessRunner instance
    In versions KDE 3.1.4 and above only
    - +
    ArgumentTypeDefault
    a0KProcess
    a0TDEProcess
    binNameTQString
    idKStartupInfoId
    -
  • KProcessRunner () - - + diff --git a/doc/classref/kparts/konsolePart.html b/doc/classref/kparts/konsolePart.html index e5c99f7..8832e60 100644 --- a/doc/classref/kparts/konsolePart.html +++ b/doc/classref/kparts/konsolePart.html @@ -121,7 +121,7 @@
    +
  • TDEProcessRunner () +
    • returns a KProcessRunner instance
    returns a TDEProcessRunner instance
  • pid ()
    @@ -61,7 +61,7 @@
    returns (pid_t)
    returns (pid_t)
    static
    - +
    ArgumentTypeDefault
    a0KProcess
    a0TDEProcess
    binNameTQString
    @@ -70,7 +70,7 @@
    In versions KDE 3.1.4 and above only
    static
    - +
    ArgumentTypeDefault
    a0KProcess
    a0TDEProcess
    binNameTQString
    idKStartupInfoId
    @@ -78,7 +78,7 @@
  • slotProcessExited (a0)
    returns nothing
    - +
    ArgumentTypeDefault
    a0KProcess
    a0TDEProcess
    • diff --git a/doc/classref/kio/index.html b/doc/classref/kio/index.html index e573f53..3a24090 100644 --- a/doc/classref/kio/index.html +++ b/doc/classref/kio/index.html @@ -110,7 +110,7 @@
    KOCRDialog
    KOCRDialogFactory
    KOpenWithHandler
    KProcessRunner
    TDEProcessRunner
    KProtocolInfo
    KProtocolInfo.ExtraField
    KProtocolManager
    returns nothing
    In versions KDE 3.5.0 and above only
    - +
    ArgumentTypeDefault
    a0KProcess
    a0TDEProcess
  • processExited () diff --git a/doc/classref/kspell/KSpell.html b/doc/classref/kspell/KSpell.html index 7c7c361..3eb99e8 100644 --- a/doc/classref/kspell/KSpell.html +++ b/doc/classref/kspell/KSpell.html @@ -266,7 +266,7 @@
  • ispellErrors (a0, a1, a2)
    returns nothing
    - +
    ArgumentTypeDefault
    a0KProcess
    a0TDEProcess
    a1char
    a2int
    @@ -274,7 +274,7 @@
  • ispellExit (a0)
    returns nothing
    - +
    ArgumentTypeDefault
    a0KProcess
    a0TDEProcess
  • ksConfig () diff --git a/doc/classref/tdecore/KAccelShortcutList.html b/doc/classref/tdecore/KAccelShortcutList.html index 3a36b03..5acb8d1 100644 --- a/doc/classref/tdecore/KAccelShortcutList.html +++ b/doc/classref/tdecore/KAccelShortcutList.html @@ -44,7 +44,7 @@
  • KAccelShortcutList (accel)
    returns a KAccelShortcutList instance
    - +
    ArgumentTypeDefault
    accelKGlobalAccel
    accelTDEGlobalAccel
  • KAccelShortcutList (actions, bGlobal) diff --git a/doc/classref/tdecore/KClipboardSynchronizer.html b/doc/classref/tdecore/KClipboardSynchronizer.html index af7853e..17f9559 100644 --- a/doc/classref/tdecore/KClipboardSynchronizer.html +++ b/doc/classref/tdecore/KClipboardSynchronizer.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KClipboardSynchronizer + class TDEClipboardSynchronizer @@ -12,7 +12,7 @@
    -

    class KClipboardSynchronizer

    +

    class TDEClipboardSynchronizer

    		 @@ -28,15 +28,15 @@ - +
    tdecore
    ClassKClipboardSynchronizerTDEClipboardSynchronizer
    Inherits TQObject

    methods

      -
    • KClipboardSynchronizer (parent = 0, name = 0) -
      +
    • TDEClipboardSynchronizer (parent = 0, name = 0) +
      • returns a KClipboardSynchronizer instance
      returns a TDEClipboardSynchronizer instance
      In versions KDE 3.1.0 and above only
      @@ -54,7 +54,7 @@
      ArgumentTypeDefault
      parentTQObject0
      static
    • self () -
      +
      returns (KClipboardSynchronizer)
      returns (TDEClipboardSynchronizer)
      In versions KDE 3.1.0 and above only
      static
      @@ -74,7 +74,7 @@
      syncbool
      • -
    • ~KClipboardSynchronizer () +
    • ~TDEClipboardSynchronizer ()
      returns nothing
      In versions KDE 3.1.0 and above only
      • diff --git a/doc/classref/tdecore/KCompletion.html b/doc/classref/tdecore/KCompletion.html index 788240b..c80af71 100644 --- a/doc/classref/tdecore/KCompletion.html +++ b/doc/classref/tdecore/KCompletion.html @@ -73,7 +73,7 @@
      returns nothing
    • completionMode () -
      +
      returns (KGlobalSettings.Completion)
      returns (TDEGlobalSettings.Completion)
    • disableSounds ()
      @@ -160,7 +160,7 @@
    • setCompletionMode (mode)
      • returns nothing
      returns nothing
      - +
      ArgumentTypeDefault
      modeKGlobalSettings.Completion
      modeTDEGlobalSettings.Completion
    • setEnableSounds (enable) diff --git a/doc/classref/tdecore/KCompletionBase.html b/doc/classref/tdecore/KCompletionBase.html index bf6a2ef..7539f2e 100644 --- a/doc/classref/tdecore/KCompletionBase.html +++ b/doc/classref/tdecore/KCompletionBase.html @@ -45,7 +45,7 @@
      returns (KCompletion)
    • completionMode () -
      +
      returns (KGlobalSettings.Completion)
      returns (TDEGlobalSettings.Completion)
    • completionObject (hsig = 1)
      @@ -97,7 +97,7 @@
    • setCompletionMode (mode)
      • returns (KCompletion)
      returns nothing
      - +
      ArgumentTypeDefault
      modeKGlobalSettings.Completion
      modeTDEGlobalSettings.Completion
    • setCompletionObject (compObj, hsig = 1) diff --git a/doc/classref/tdecore/KConfigSkeleton.ItemFont.html b/doc/classref/tdecore/KConfigSkeleton.ItemFont.html index bf81edf..080378d 100644 --- a/doc/classref/tdecore/KConfigSkeleton.ItemFont.html +++ b/doc/classref/tdecore/KConfigSkeleton.ItemFont.html @@ -35,14 +35,14 @@

      • methods

        -
      • ItemFont (a0, a1, a2, a3 = KGlobalSettings .generalFont ()) +
      • ItemFont (a0, a1, a2, a3 = TDEGlobalSettings .generalFont ())
        returns a ItemFont instance
        In versions KDE 3.2.0 and above only
        - +
        ArgumentTypeDefault
        a0TQString
        a1TQString
        a2TQFont
        a3TQFontKGlobalSettings .generalFont ()
        a3TQFontTDEGlobalSettings .generalFont ()
      • property () diff --git a/doc/classref/tdecore/KConfigSkeleton.html b/doc/classref/tdecore/KConfigSkeleton.html index d8a03b3..410b9b1 100644 --- a/doc/classref/tdecore/KConfigSkeleton.html +++ b/doc/classref/tdecore/KConfigSkeleton.html @@ -97,13 +97,13 @@
      • keyTQStringTQString.null
      • -
    • addItemFont (name, reference, defaultValue = KGlobalSettings .generalFont (), key = TQString .null) +
    • addItemFont (name, reference, defaultValue = TDEGlobalSettings .generalFont (), key = TQString .null)
      returns (ItemFont)
      In versions KDE 3.2.0 and above only
      - +
      ArgumentTypeDefault
      nameTQString
      referenceTQFont
      defaultValueTQFontKGlobalSettings .generalFont ()
      defaultValueTQFontTDEGlobalSettings .generalFont ()
      keyTQStringTQString .null
      • diff --git a/doc/classref/tdecore/KGlobal.html b/doc/classref/tdecore/KGlobal.html index 767cc3f..aa88271 100644 --- a/doc/classref/tdecore/KGlobal.html +++ b/doc/classref/tdecore/KGlobal.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KGlobal + class TDEGlobal @@ -12,7 +12,7 @@
      -

      class KGlobal

      +

      class TDEGlobal

      		 @@ -28,7 +28,7 @@ - + diff --git a/doc/classref/tdecore/KGlobalAccel.html b/doc/classref/tdecore/KGlobalAccel.html index abf3d9c..9ebf1a1 100644 --- a/doc/classref/tdecore/KGlobalAccel.html +++ b/doc/classref/tdecore/KGlobalAccel.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KGlobalAccel + class TDEGlobalAccel @@ -12,7 +12,7 @@
      tdecore
      ClassKGlobalTDEGlobal
      Inherits
      - +
      -

      class KGlobalAccel

      +

      class TDEGlobalAccel

      		 @@ -28,15 +28,15 @@ - +
      tdecore
      ClassKGlobalAccelTDEGlobalAccel
      Inherits TQObject

      methods

        -
      • KGlobalAccel (pParent, psName = 0) -
        +
      • TDEGlobalAccel (pParent, psName = 0) +
        • returns a KGlobalAccel instance
        returns a TDEGlobalAccel instance
        diff --git a/doc/classref/tdecore/KGlobalSettings.KMouseSettings.html b/doc/classref/tdecore/KGlobalSettings.KMouseSettings.html index 0447ba8..8d92dc8 100644 --- a/doc/classref/tdecore/KGlobalSettings.KMouseSettings.html +++ b/doc/classref/tdecore/KGlobalSettings.KMouseSettings.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KGlobalSettings.KMouseSettings + class TDEGlobalSettings.KMouseSettings @@ -12,7 +12,7 @@
        ArgumentTypeDefault
        pParentTQObject
        psNamechar0
        -

        class KGlobalSettings.KMouseSettings

        +

        class TDEGlobalSettings.KMouseSettings

        		 @@ -28,7 +28,7 @@ - + diff --git a/doc/classref/tdecore/KGlobalSettings.html b/doc/classref/tdecore/KGlobalSettings.html index 5c6815b..8620ebb 100644 --- a/doc/classref/tdecore/KGlobalSettings.html +++ b/doc/classref/tdecore/KGlobalSettings.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KGlobalSettings + class TDEGlobalSettings @@ -12,7 +12,7 @@
        tdecore
        ClassKGlobalSettings.KMouseSettingsTDEGlobalSettings.KMouseSettings
        Inherits
        -

        class KGlobalSettings

        +

        class TDEGlobalSettings

        		 @@ -28,7 +28,7 @@ - + @@ -154,7 +154,7 @@
        tdecore
        ClassKGlobalSettingsTDEGlobalSettings
        Inherits
        static
      • insertTearOffHandle () -
        +
        returns (KGlobalSettings.TearOffHandle)
        returns (TDEGlobalSettings.TearOffHandle)
        In versions KDE 3.1.0 and above only
        static
        @@ -184,7 +184,7 @@
        static
      • mouseSettings () -
        +
        returns (KGlobalSettings.KMouseSettings)
        returns (TDEGlobalSettings.KMouseSettings)
        static
      • opaqueResize () diff --git a/doc/classref/tdecore/KLibLoader.html b/doc/classref/tdecore/KLibLoader.html index 1430c33..a0c6910 100644 --- a/doc/classref/tdecore/KLibLoader.html +++ b/doc/classref/tdecore/KLibLoader.html @@ -52,12 +52,12 @@
        • libnamechar
        • -
      • findLibrary (name, instance = KGlobal .instance ()) +
      • findLibrary (name, instance = TDEGlobal .instance ())
        returns (TQString)
        static
        - +
        ArgumentTypeDefault
        namechar
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
      • globalLibrary (name) diff --git a/doc/classref/tdecore/KMimeSourceFactory.html b/doc/classref/tdecore/KMimeSourceFactory.html index ed71298..1630ecc 100644 --- a/doc/classref/tdecore/KMimeSourceFactory.html +++ b/doc/classref/tdecore/KMimeSourceFactory.html @@ -35,10 +35,10 @@

        • methods

          -
        • KMimeSourceFactory (loader = KGlobal .iconLoader ()) +
        • KMimeSourceFactory (loader = TDEGlobal .iconLoader ())
          returns a KMimeSourceFactory instance
          - +
          ArgumentTypeDefault
          loaderKIconLoaderKGlobal .iconLoader ()
          loaderKIconLoaderTDEGlobal .iconLoader ()
        • makeAbsolute (abs_or_rel_name, context) diff --git a/doc/classref/tdecore/KProcIO.html b/doc/classref/tdecore/KProcIO.html index 3cf83b7..1ec0750 100644 --- a/doc/classref/tdecore/KProcIO.html +++ b/doc/classref/tdecore/KProcIO.html @@ -31,7 +31,7 @@
      		KProcIO
      InheritsKProcess TDEProcess

      methods

        @@ -85,7 +85,7 @@
      • received (proc, buffer, buflen)
        returns nothing
        - +
        ArgumentTypeDefault
        procKProcess
        procTDEProcess
        bufferchar
        buflenint
        @@ -96,7 +96,7 @@
      • sent (a0)
        returns nothing
        - +
        ArgumentTypeDefault
        a0KProcess
        a0TDEProcess
      • setComm (comm) diff --git a/doc/classref/tdecore/KProcess.html b/doc/classref/tdecore/KProcess.html index bfe3da4..433dcf1 100644 --- a/doc/classref/tdecore/KProcess.html +++ b/doc/classref/tdecore/KProcess.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KProcess + class TDEProcess @@ -12,7 +12,7 @@
        -

        class KProcess

        +

        class TDEProcess

        		 @@ -28,7 +28,7 @@ - + @@ -42,22 +42,22 @@ }
      • RunMode = {DontCare, NotifyOnExit, Block }

        methods

          -
        • KProcess (parent, name = 0) -
        • tdecore
        ClassKProcessTDEProcess
        Inherits TQObject
        +
      • TDEProcess (parent, name = 0) +
        • returns a KProcess instance
        returns a TDEProcess instance
        In versions KDE 3.2.0 and above only
        ArgumentTypeDefault
        parentTQObject
        namechar0
        -
      • KProcess () -
        +
      • TDEProcess () +
        • returns a KProcess instance
        returns a TDEProcess instance
        -
      • KProcess (a0) -
        +
      • TDEProcess (a0) +
        • returns a KProcess instance
        returns a TDEProcess instance
        In versions less than KDE 3.2.0 only
        - +
        ArgumentTypeDefault
        a0KProcess
        a0TDEProcess
      • args () @@ -139,7 +139,7 @@
      • processExited (proc)
        returns nothing
        - +
        ArgumentTypeDefault
        procKProcess
        procTDEProcess
      • processHasExited (state) @@ -163,7 +163,7 @@
      • receivedStderr (proc, buffer, buflen)
        returns nothing
        - +
        ArgumentTypeDefault
        procKProcess
        procTDEProcess
        bufferchar
        buflenint
        @@ -171,7 +171,7 @@
      • receivedStdout (proc, buffer, buflen)
        returns nothing
        - +
        ArgumentTypeDefault
        procKProcess
        procTDEProcess
        bufferchar
        buflenint
        @@ -191,7 +191,7 @@
        arglista Python list of strings
        • 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) @@ -233,7 +233,7 @@ KDE (to also be replaced with stream operators)
        returns nothing
        In versions KDE 3.2.0 and above, but less than KDE 3.4.0
        - +
        ArgumentTypeDefault
        a0KProcess.Communication
        a0TDEProcess.Communication
        a1bool
        @@ -254,7 +254,7 @@ KDE (to also be replaced with stream operators)
      • setupCommunication (comm)
        returns (int)
        - +
        ArgumentTypeDefault
        commKProcess.Communication
        commTDEProcess.Communication
      • setupEnvironment () @@ -285,8 +285,8 @@ KDE (to also be replaced with stream operators)
      • start (runmode = NotifyOnExit, comm = NoCommunication)
        returns (bool)
        - - + +
        ArgumentTypeDefault
        runmodeKProcess.RunModeNotifyOnExit
        commKProcess.CommunicationNoCommunication
        runmodeTDEProcess.RunModeNotifyOnExit
        commTDEProcess.CommunicationNoCommunication
      • suspend () @@ -309,34 +309,34 @@ KDE (to also be replaced with stream operators)
      • wroteStdin (proc)
        returns nothing
        - +
        ArgumentTypeDefault
        procKProcess
        procTDEProcess

        • operators

        • operator << (a0) -
          +
          returns (KProcess)
          returns (TDEProcess)
          In versions KDE 3.1.4 and above only
          ArgumentTypeDefault
          a0TQString
        • operator << (a0) -
          +
          returns (KProcess)
          returns (TDEProcess)
          In versions KDE 3.1.4 and above only
          ArgumentTypeDefault
          a0char
        • operator << (a0) -
          +
          returns (KProcess)
          returns (TDEProcess)
          In versions KDE 3.1.4 and above only
          ArgumentTypeDefault
          a0TQCString
        • operator << (a0) - - + @@ -89,10 +89,10 @@ - - - - + + + + @@ -126,9 +126,9 @@
          +
          returns (KProcess)
          - +
          returns (TDEProcess)
          In versions KDE 3.1.4 and above only
          diff --git a/doc/classref/tdecore/KProcessController.html b/doc/classref/tdecore/KProcessController.html index 3d6cb29..9134e55 100644 --- a/doc/classref/tdecore/KProcessController.html +++ b/doc/classref/tdecore/KProcessController.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KProcessController + class TDEProcessController @@ -12,7 +12,7 @@
          ArgumentTypeDefault
          a0TQStringList
          -

          class KProcessController

          +

          class TDEProcessController

          		 @@ -28,31 +28,31 @@ - +
          tdecore
          ClassKProcessControllerTDEProcessController
          Inherits TQObject

          methods

            -
          • KProcessController () -
            +
          • TDEProcessController () +
            • returns a KProcessController instance
            returns a TDEProcessController instance
            In versions KDE 3.1.0 and above only
            -
          • KProcessController (a0) -
            +
          • TDEProcessController (a0) +
            • returns a KProcessController instance
            returns a TDEProcessController instance
            - +
            ArgumentTypeDefault
            a0KProcessController
            a0TDEProcessController
            -
          • KProcessController () -
            +
          • TDEProcessController () +
            • returns a KProcessController instance
            returns a TDEProcessController instance
            In versions less than KDE 3.1.0 only
            -
          • addKProcess (a0) +
          • addTDEProcess (a0)
            returns nothing
            - +
            ArgumentTypeDefault
            a0KProcess
            a0TDEProcess
          • addProcess (pid) @@ -76,10 +76,10 @@
            • In versions KDE 3.2.0 and above only
            static
            • -
          • removeKProcess (a0) +
          • removeTDEProcess (a0)
            returns nothing
            - +
            ArgumentTypeDefault
            a0KProcess
            a0TDEProcess
          • rescheduleCheck () @@ -121,13 +121,13 @@
            • timeoutint
          -
        • ~KProcessController () +
        • ~TDEProcessController ()
          returns nothing

          • variables

          • variables - +
            VariableType
            theKProcessControllerKProcessController*
            theTDEProcessControllerTDEProcessController*
          diff --git a/doc/classref/tdecore/KShellProcess.html b/doc/classref/tdecore/KShellProcess.html index c1d69de..1e4015e 100644 --- a/doc/classref/tdecore/KShellProcess.html +++ b/doc/classref/tdecore/KShellProcess.html @@ -31,7 +31,7 @@           		KShellProcess
          InheritsKProcess TDEProcess

          methods

            diff --git a/doc/classref/tdecore/index.html b/doc/classref/tdecore/index.html index dd04421..7c9c1fd 100644 --- a/doc/classref/tdecore/index.html +++ b/doc/classref/tdecore/index.html @@ -43,7 +43,7 @@
          KCatalogue
          KCharMacroExpander
          KCharsets
          KClipboardSynchronizer
          TDEClipboardSynchronizer
          TDECmdLineArgs
          KCmdLineOptions
          KCodecs
          KDesktopFile
          KEntry
          KEntryKey
          KGlobal
          KGlobalAccel
          KGlobalSettings
          KGlobalSettings.KMouseSettings
          TDEGlobal
          TDEGlobalAccel
          TDEGlobalSettings
          TDEGlobalSettings.KMouseSettings
          KIDNA
          KIPC
          KIcon
          KPixmapProvider
          KProcIO
          		•  - - - + + + diff --git a/doc/classref/tdecore/tdecore-globals.html b/doc/classref/tdecore/tdecore-globals.html index c1038a7..7e50d41 100644 --- a/doc/classref/tdecore/tdecore-globals.html +++ b/doc/classref/tdecore/tdecore-globals.html @@ -24,13 +24,13 @@
          KProcess - NETWinInfo
          KProcess
          KProcessController
          TDEProcess - NETWinInfo
          TDEProcess
          TDEProcessController
          KRFCDate
          KRandomSequence
          KRegExp

          global methods

            -
          • BarIcon (name, size = 0, state = KIcon .DefaultState, instance = KGlobal .instance ()) +
          • BarIcon (name, size = 0, state = KIcon .DefaultState, instance = TDEGlobal .instance ())
            returns (TQPixmap)
            - +
            ArgumentTypeDefault
            nameTQString
            sizeint0
            stateintKIcon .DefaultState
            instanceTDEInstanceKGlobal .instance ()
            instanceTDEInstanceTDEGlobal .instance ()
          • BarIcon (name, instance) @@ -40,21 +40,21 @@
          instanceTDEInstance
          • -
        • BarIconSet (name, size = 0, instance = KGlobal .instance ()) +
        • BarIconSet (name, size = 0, instance = TDEGlobal .instance ())
          returns (TQIconSet)
          - +
          ArgumentTypeDefault
          nameTQString
          sizeint0
          instanceTDEInstanceKGlobal .instance ()
          instanceTDEInstanceTDEGlobal .instance ()
          • -
        • DesktopIcon (name, size = 0, state = KIcon .DefaultState, instance = KGlobal .instance ()) +
        • DesktopIcon (name, size = 0, state = KIcon .DefaultState, instance = TDEGlobal .instance ())
          returns (TQPixmap)
          - +
          ArgumentTypeDefault
          nameTQString
          sizeint0
          stateintKIcon .DefaultState
          instanceTDEInstanceKGlobal .instance ()
          instanceTDEInstanceTDEGlobal .instance ()
        • DesktopIcon (name, instance) @@ -64,28 +64,28 @@
          • instanceTDEInstance
        -
      • DesktopIconSet (name, size = 0, instance = KGlobal .instance ()) +
      • DesktopIconSet (name, size = 0, instance = TDEGlobal .instance ())
        returns (TQIconSet)
        - +
        ArgumentTypeDefault
        nameTQString
        sizeint0
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
        • -
      • IconSize (group, instance = KGlobal .instance ()) +
      • IconSize (group, instance = TDEGlobal .instance ())
        returns (int)
        - +
        ArgumentTypeDefault
        groupKIcon.Group
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
        • -
      • MainBarIcon (name, size = 0, state = KIcon .DefaultState, instance = KGlobal .instance ()) +
      • MainBarIcon (name, size = 0, state = KIcon .DefaultState, instance = TDEGlobal .instance ())
        returns (TQPixmap)
        - +
        ArgumentTypeDefault
        nameTQString
        sizeint0
        stateintKIcon .DefaultState
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
      • MainBarIcon (name, instance) @@ -95,21 +95,21 @@
        • instanceTDEInstance
        • -
      • MainBarIconSet (name, size = 0, instance = KGlobal .instance ()) +
      • MainBarIconSet (name, size = 0, instance = TDEGlobal .instance ())
        returns (TQIconSet)
        - +
        ArgumentTypeDefault
        nameTQString
        sizeint0
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
        • -
      • SmallIcon (name, size = 0, state = KIcon .DefaultState, instance = KGlobal .instance ()) +
      • SmallIcon (name, size = 0, state = KIcon .DefaultState, instance = TDEGlobal .instance ())
        returns (TQPixmap)
        - +
        ArgumentTypeDefault
        nameTQString
        sizeint0
        stateintKIcon .DefaultState
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
      • SmallIcon (name, instance) @@ -119,20 +119,20 @@
        • instanceTDEInstance
        • -
      • SmallIconSet (name, size = 0, instance = KGlobal .instance ()) +
      • SmallIconSet (name, size = 0, instance = TDEGlobal .instance ())
        returns (TQIconSet)
        - +
        ArgumentTypeDefault
        nameTQString
        sizeint0
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
        • -
      • UserIcon (name, state = KIcon .DefaultState, instance = KGlobal .instance ()) +
      • UserIcon (name, state = KIcon .DefaultState, instance = TDEGlobal .instance ())
        returns (TQPixmap)
        - +
        ArgumentTypeDefault
        nameTQString
        stateintKIcon .DefaultState
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
      • UserIcon (name, instance) @@ -142,11 +142,11 @@
        • instanceTDEInstance
        • -
      • UserIconSet (name, instance = KGlobal .instance ()) +
      • UserIconSet (name, instance = TDEGlobal .instance ())
        returns (TQIconSet)
        - +
        ArgumentTypeDefault
        nameTQString
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
      • checkAccess (pathname, mode) diff --git a/doc/classref/tdeui/KComboBox.html b/doc/classref/tdeui/KComboBox.html index 1ac5a4e..a4ec91d 100644 --- a/doc/classref/tdeui/KComboBox.html +++ b/doc/classref/tdeui/KComboBox.html @@ -89,7 +89,7 @@
      • completionModeChanged (a0)
        returns nothing
        - +
        ArgumentTypeDefault
        a0KGlobalSettings.Completion
        a0TDEGlobalSettings.Completion
      • contains (text) diff --git a/doc/classref/tdeui/KGuiItem.html b/doc/classref/tdeui/KGuiItem.html index 3997b42..0684647 100644 --- a/doc/classref/tdeui/KGuiItem.html +++ b/doc/classref/tdeui/KGuiItem.html @@ -71,12 +71,12 @@
      • iconName ()
        returns (TQString)
        • -
      • iconSet (a0, size = 0, instance = KGlobal .instance ()) +
      • iconSet (a0, size = 0, instance = TDEGlobal .instance ())
        returns (TQIconSet)
        - +
        ArgumentTypeDefault
        a0KIcon.Group
        sizeint0
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
      • iconSet () diff --git a/doc/classref/tdeui/KKeyChooser.html b/doc/classref/tdeui/KKeyChooser.html index 9acf790..832eb61 100644 --- a/doc/classref/tdeui/KKeyChooser.html +++ b/doc/classref/tdeui/KKeyChooser.html @@ -65,7 +65,7 @@
      • KKeyChooser (actions, parent)
        returns a KKeyChooser instance
        - +
        ArgumentTypeDefault
        actionsKGlobalAccel
        actionsTDEGlobalAccel
        parentTQWidget
        • @@ -91,7 +91,7 @@
      • KKeyChooser (actions, parent, bCheckAgainstStdKeys, bAllowLetterShortcuts, bAllowWinKey = 0)
        returns a KKeyChooser instance
        - + @@ -189,7 +189,7 @@
      • insert (a0)
        • ArgumentTypeDefault
        actionsKGlobalAccel
        actionsTDEGlobalAccel
        parentTQWidget
        bCheckAgainstStdKeysbool
        bAllowLetterShortcutsbool
        returns (bool)
        - +
        ArgumentTypeDefault
        a0KGlobalAccel
        a0TDEGlobalAccel
      • insert (a0) diff --git a/doc/classref/tdeui/KKeyDialog.html b/doc/classref/tdeui/KKeyDialog.html index 8a66597..ac238f8 100644 --- a/doc/classref/tdeui/KKeyDialog.html +++ b/doc/classref/tdeui/KKeyDialog.html @@ -84,7 +84,7 @@
        returns (int)
        static
        - +
        ArgumentTypeDefault
        keysKGlobalAccel
        keysTDEGlobalAccel
        parentTQWidget0
        bSaveSettingsbool1
        @@ -116,7 +116,7 @@
        In versions KDE 3.1.0 and above only
        static
        - + @@ -135,7 +135,7 @@
        ArgumentTypeDefault
        keysKGlobalAccel
        keysTDEGlobalAccel
        bAllowLetterShortcutsbool
        parentTQWidget0
        bSaveSettingsbool1
        returns (int)
        static
        - +
        ArgumentTypeDefault
        keysKGlobalAccel
        keysTDEGlobalAccel
        save_settingsbool1
        parentTQWidget0
        diff --git a/doc/classref/tdeui/KLineEdit.html b/doc/classref/tdeui/KLineEdit.html index 6ed1409..44cc764 100644 --- a/doc/classref/tdeui/KLineEdit.html +++ b/doc/classref/tdeui/KLineEdit.html @@ -85,7 +85,7 @@
      • completionModeChanged (a0)
        returns nothing
        - +
        ArgumentTypeDefault
        a0KGlobalSettings.Completion
        a0TDEGlobalSettings.Completion
      • contextMenuEvent (a0) @@ -227,7 +227,7 @@
      • setCompletionMode (mode)
        returns nothing
        - +
        ArgumentTypeDefault
        modeKGlobalSettings.Completion
        modeTDEGlobalSettings.Completion
      • setCompletionObject (a0, hsig = 1) diff --git a/doc/classref/tdeui/KSystemTray.html b/doc/classref/tdeui/KSystemTray.html index 32f483a..76ed683 100644 --- a/doc/classref/tdeui/KSystemTray.html +++ b/doc/classref/tdeui/KSystemTray.html @@ -66,13 +66,13 @@
        • a0TQEvent
        • -
      • loadIcon (icon, instance = KGlobal .instance ()) +
      • loadIcon (icon, instance = TDEGlobal .instance ())
        returns (TQPixmap)
        In versions KDE 3.2.0 and above only
        static
        - +
        ArgumentTypeDefault
        iconTQString
        instanceTDEInstanceKGlobal .instance ()
        instanceTDEInstanceTDEGlobal .instance ()
      • mousePressEvent (a0) diff --git a/doc/classref/tdeui/KToolBar.html b/doc/classref/tdeui/KToolBar.html index f2274ba..726d9ea 100644 --- a/doc/classref/tdeui/KToolBar.html +++ b/doc/classref/tdeui/KToolBar.html @@ -283,7 +283,7 @@
      indexint-1
      • -
    • insertButton (icon, id, enabled = 1, text = TQString .null, index = -1, _instance = KGlobal .instance ()) +
    • insertButton (icon, id, enabled = 1, text = TQString .null, index = -1, _instance = TDEGlobal .instance ())
      returns (int)
      @@ -291,10 +291,10 @@ - +
      ArgumentTypeDefault
      iconTQString
      enabledbool1
      textTQStringTQString .null
      indexint-1
      _instanceTDEInstanceKGlobal .instance ()
      _instanceTDEInstanceTDEGlobal .instance ()
      • -
    • insertButton (icon, id, signal, slot, enabled = 1, text = TQString .null, index = -1, _instance = KGlobal .instance ()) +
    • insertButton (icon, id, signal, slot, enabled = 1, text = TQString .null, index = -1, _instance = TDEGlobal .instance ())
      returns (int)
      @@ -304,7 +304,7 @@ - +
      ArgumentTypeDefault
      iconTQString
      enabledbool1
      textTQStringTQString .null
      indexint-1
      _instanceTDEInstanceKGlobal .instance ()
      _instanceTDEInstanceTDEGlobal .instance ()
    • insertButton (pixmap, id, enabled = 1, text = TQString .null, index = -1) diff --git a/doc/classref/tdeui/KToolBarButton.html b/doc/classref/tdeui/KToolBarButton.html index 1fb533f..647516f 100644 --- a/doc/classref/tdeui/KToolBarButton.html +++ b/doc/classref/tdeui/KToolBarButton.html @@ -35,7 +35,7 @@

    methods

      -
    • KToolBarButton (icon, id, parent, name = 0, txt = TQString .null, _instance = KGlobal .instance ()) +
    • KToolBarButton (icon, id, parent, name = 0, txt = TQString .null, _instance = TDEGlobal .instance ())
      returns a KToolBarButton instance
      @@ -43,7 +43,7 @@ - +
      ArgumentTypeDefault
      iconTQString
      parentTQWidget
      namechar0
      txtTQStringTQString .null
      _instanceTDEInstanceKGlobal .instance ()
      _instanceTDEInstanceTDEGlobal .instance ()
    • KToolBarButton (pixmap, id, parent, name = 0, txt = TQString .null) diff --git a/examples/pytde-sampler/misc/passivepop.py b/examples/pytde-sampler/misc/passivepop.py index 8a2b2e8..fc37573 100644 --- a/examples/pytde-sampler/misc/passivepop.py +++ b/examples/pytde-sampler/misc/passivepop.py @@ -1,6 +1,6 @@ from qt import TQt, TQFrame, TQHBoxLayout, TQVBoxLayout, TQLabel, SIGNAL from tdeui import KPassivePopup, KTextEdit, KPushButton -from tdecore import KGlobal, KIcon +from tdecore import TDEGlobal, KIcon iconName = 'popup' labelText = 'KPassivePopup' @@ -35,7 +35,7 @@ class MainFrame(TQFrame): pos = pop.pos() pos.setY(pos.y() + pop.height() + 10) - ico = KGlobal.instance().iconLoader().loadIcon('help', KIcon.NoGroup, + ico = TDEGlobal.instance().iconLoader().loadIcon('help', KIcon.NoGroup, KIcon.SizeSmall) pop = KPassivePopup.message('Hello', 'With Icons', ico, self) pop.setTimeout(3000) diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB index 4a37f4f..0f73273 100644 --- a/examples/pytde-sampler/qt_widgets/CONTRIB +++ b/examples/pytde-sampler/qt_widgets/CONTRIB @@ -27,7 +27,7 @@ tdecore,KCalendarSystem,,, tdecore,KCalendarSystemFactory,,, tdecore,KCatalogue,,, tdecore,KCharsets,,, -tdecore,KClipboardSynchronizer,,, +tdecore,TDEClipboardSynchronizer,,, tdecore,TDECmdLineArgs,,, tdecore,KCmdLineOptions,,, tdecore,KCodecs,,, @@ -48,9 +48,9 @@ tdecore,KDE,,, tdecore,KDesktopFile,,, tdecore,KEntry,,, tdecore,KEntryKey,,, -tdecore,KGlobal,,, -tdecore,KGlobalAccel,,, -tdecore,KGlobalSettings,,, +tdecore,TDEGlobal,,, +tdecore,TDEGlobalAccel,,, +tdecore,TDEGlobalSettings,,, tdecore,KIDNA,,, tdecore,KIPC,,, tdecore,KIcon,,, @@ -76,8 +76,8 @@ tdecore,KNotifyClient,,, tdecore,KPalette,,, tdecore,KPixmapProvider,,, tdecore,KProcIO,,, -tdecore,KProcess,,, -tdecore,KProcessController,,, +tdecore,TDEProcess,,, +tdecore,TDEProcessController,,, tdecore,KPty,,, tdecore,KRFCDate,,, tdecore,KRandomSequence,,, @@ -434,7 +434,7 @@ kio,KMimeType,,, kio,KOCRDialog,,, kio,KOCRDialogFactory,,, kio,KOpenWithHandler,,, -kio,KProcessRunner,,, +kio,TDEProcessRunner,,, kio,KProtocolInfo,,, kio,KProtocolManager,,, kio,KRun,,, diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py index f8048f8..80d1576 100755 --- a/examples/pytde-sampler/sampler.py +++ b/examples/pytde-sampler/sampler.py @@ -14,8 +14,8 @@ from qt import SIGNAL, SLOT, PYSIGNAL, TQt from qt import TQVBoxLayout, TQLabel, TQPixmap, TQSplitter, TQFrame, TQDialog from qt import TQSizePolicy, TQHBoxLayout, TQSpacerItem, TQPushButton -from tdecore import i18n, TDEAboutData, TDEApplication, TDECmdLineArgs, KGlobal -from tdecore import KGlobalSettings, KWin, KWinModule, KURL, KIcon +from tdecore import i18n, TDEAboutData, TDEApplication, TDECmdLineArgs, TDEGlobal +from tdecore import TDEGlobalSettings, KWin, KWinModule, KURL, KIcon from tdeui import KComboBox, KListView, KListViewItem, KTabWidget, KTextEdit from tdeui import KMainWindow, KPushButton, KSplashScreen, KStdAction @@ -46,7 +46,7 @@ def appConfig(group=None): """ appConfig(group=None) -> returns the application KConfig """ - config = KGlobal.instance().config() + config = TDEGlobal.instance().config() if group is not None: config.setGroup(group) return config @@ -56,14 +56,14 @@ def getIcon(name, group=KIcon.NoGroup, size=KIcon.SizeSmall): """ returns a kde icon by name """ - return KGlobal.instance().iconLoader().loadIcon(name, group, size) + return TDEGlobal.instance().iconLoader().loadIcon(name, group, size) def getIconSet(name, group=KIcon.NoGroup, size=KIcon.SizeSmall): """ returns a kde icon set by name """ - return KGlobal.instance().iconLoader().loadIconSet(name, group, size) + return TDEGlobal.instance().iconLoader().loadIconSet(name, group, size) def buildPart(parent, query, constraint, writable=False): @@ -182,7 +182,7 @@ class OutputFrame(KTextEdit): KTextEdit.__init__(self, parent) self.filehandle = filehandle self.setReadOnly(True) - self.setFont(KGlobalSettings.fixedFont()) + self.setFont(TDEGlobalSettings.fixedFont()) def write(self, text): diff --git a/examples/uikmdi.py b/examples/uikmdi.py index 2b26dde..6c9cc21 100644 --- a/examples/uikmdi.py +++ b/examples/uikmdi.py @@ -29,7 +29,7 @@ import os import sys from qt import SIGNAL, TQVBoxLayout, TQLabel -from tdecore import i18n, TDEAboutData, TDEApplication, KGlobal, KIcon, TDECmdLineArgs +from tdecore import i18n, TDEAboutData, TDEApplication, TDEGlobal, KIcon, TDECmdLineArgs from tdeui import KDockWidget, KListBox, KStdAction try: @@ -48,7 +48,7 @@ def getIcon(name, group=KIcon.NoGroup, size=KIcon.SizeSmall): """ returns a kde icon by name """ - return KGlobal.instance().iconLoader().loadIcon(name, group, size) + return TDEGlobal.instance().iconLoader().loadIcon(name, group, size) class KmdiExample(KMdiMainFrm): diff --git a/examples/uiqxembed.py b/examples/uiqxembed.py index 969f23a..0ed9258 100644 --- a/examples/uiqxembed.py +++ b/examples/uiqxembed.py @@ -6,7 +6,7 @@ import sys from qt import TQIconSet, TQProcess, TQTimer, SIGNAL, SLOT -from tdecore import TDEAboutData, TDEApplication, TDECmdLineArgs, KGlobal, KIcon +from tdecore import TDEAboutData, TDEApplication, TDECmdLineArgs, TDEGlobal, KIcon from tdecore import KWin, KWinModule from tdeui import KComboBox, KMainWindow, KPushButton, QXEmbed @@ -23,13 +23,13 @@ def getIcon(name, group=KIcon.NoGroup, size=KIcon.SizeSmall): """ returns a kde icon by name """ - return KGlobal.instance().iconLoader().loadIcon(name, group, size) + return TDEGlobal.instance().iconLoader().loadIcon(name, group, size) def getIconSet(name, group=KIcon.NoGroup, size=KIcon.SizeSmall): """ returns a kde icon set by name """ - return KGlobal.instance().iconLoader().loadIconSet(name, group, size) + return TDEGlobal.instance().iconLoader().loadIconSet(name, group, size) def getWindow(pid): diff --git a/examples/xmlmenudemo.py b/examples/xmlmenudemo.py index 5279896..ce372ca 100644 --- a/examples/xmlmenudemo.py +++ b/examples/xmlmenudemo.py @@ -43,7 +43,7 @@ import sys, os from qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet -from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KIcon, KIconLoader, KShortcut, KGlobal +from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData, i18n, KIcon, KIconLoader, KShortcut, TDEGlobal from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KToggleAction, KFontSizeAction, KFontAction, KRadioAction,\ KActionSeparator, KActionMenu, KWindowListMenu, KXMLGUIClient, KActionCollection diff --git a/extra/kde300/kaccelbase.h b/extra/kde300/kaccelbase.h index 23e9396..e485433 100644 --- a/extra/kde300/kaccelbase.h +++ b/extra/kde300/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * @ref KGlobal::config(). + * @ref TDEGlobal::config(). * * The group in which the configuration is stored can be * set with @ref setConfigGroup(). diff --git a/extra/kde300/ktoolbarbutton.h b/extra/kde300/ktoolbarbutton.h index 49a457f..19f243b 100644 --- a/extra/kde300/ktoolbarbutton.h +++ b/extra/kde300/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde301/kaccelbase.h b/extra/kde301/kaccelbase.h index 23e9396..e485433 100644 --- a/extra/kde301/kaccelbase.h +++ b/extra/kde301/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * @ref KGlobal::config(). + * @ref TDEGlobal::config(). * * The group in which the configuration is stored can be * set with @ref setConfigGroup(). diff --git a/extra/kde301/ktoolbarbutton.h b/extra/kde301/ktoolbarbutton.h index 7147029..8a7c277 100644 --- a/extra/kde301/ktoolbarbutton.h +++ b/extra/kde301/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde303/kaccelbase.h b/extra/kde303/kaccelbase.h index 23e9396..e485433 100644 --- a/extra/kde303/kaccelbase.h +++ b/extra/kde303/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * @ref KGlobal::config(). + * @ref TDEGlobal::config(). * * The group in which the configuration is stored can be * set with @ref setConfigGroup(). diff --git a/extra/kde303/ktoolbarbutton.h b/extra/kde303/ktoolbarbutton.h index 6763dea..e7c2015 100644 --- a/extra/kde303/ktoolbarbutton.h +++ b/extra/kde303/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde310/kaccelaction.h b/extra/kde310/kaccelaction.h index 8e42250..b339517 100644 --- a/extra/kde310/kaccelaction.h +++ b/extra/kde310/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde310/kaccelbase.h b/extra/kde310/kaccelbase.h index def607f..efa075a 100644 --- a/extra/kde310/kaccelbase.h +++ b/extra/kde310/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * @ref KGlobal::config(). + * @ref TDEGlobal::config(). * * The group in which the configuration is stored can be * set with @ref setConfigGroup(). diff --git a/extra/kde310/ktoolbarbutton.h b/extra/kde310/ktoolbarbutton.h index 50d08ae..d0230ab 100644 --- a/extra/kde310/ktoolbarbutton.h +++ b/extra/kde310/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde311/kaccelaction.h b/extra/kde311/kaccelaction.h index 8e42250..b339517 100644 --- a/extra/kde311/kaccelaction.h +++ b/extra/kde311/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde311/kaccelbase.h b/extra/kde311/kaccelbase.h index def607f..efa075a 100644 --- a/extra/kde311/kaccelbase.h +++ b/extra/kde311/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * @ref KGlobal::config(). + * @ref TDEGlobal::config(). * * The group in which the configuration is stored can be * set with @ref setConfigGroup(). diff --git a/extra/kde311/ktoolbarbutton.h b/extra/kde311/ktoolbarbutton.h index 50d08ae..d0230ab 100644 --- a/extra/kde311/ktoolbarbutton.h +++ b/extra/kde311/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde312/kaccelaction.h b/extra/kde312/kaccelaction.h index 8e42250..b339517 100644 --- a/extra/kde312/kaccelaction.h +++ b/extra/kde312/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde312/kaccelbase.h b/extra/kde312/kaccelbase.h index def607f..efa075a 100644 --- a/extra/kde312/kaccelbase.h +++ b/extra/kde312/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * @ref KGlobal::config(). + * @ref TDEGlobal::config(). * * The group in which the configuration is stored can be * set with @ref setConfigGroup(). diff --git a/extra/kde312/ktoolbarbutton.h b/extra/kde312/ktoolbarbutton.h index 50d08ae..d0230ab 100644 --- a/extra/kde312/ktoolbarbutton.h +++ b/extra/kde312/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde313/kaccelaction.h b/extra/kde313/kaccelaction.h index 8e42250..b339517 100644 --- a/extra/kde313/kaccelaction.h +++ b/extra/kde313/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde313/kaccelbase.h b/extra/kde313/kaccelbase.h index def607f..efa075a 100644 --- a/extra/kde313/kaccelbase.h +++ b/extra/kde313/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * @ref KGlobal::config(). + * @ref TDEGlobal::config(). * * The group in which the configuration is stored can be * set with @ref setConfigGroup(). diff --git a/extra/kde313/ktoolbarbutton.h b/extra/kde313/ktoolbarbutton.h index 50d08ae..d0230ab 100644 --- a/extra/kde313/ktoolbarbutton.h +++ b/extra/kde313/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde314/kaccelaction.h b/extra/kde314/kaccelaction.h index 8e42250..b339517 100644 --- a/extra/kde314/kaccelaction.h +++ b/extra/kde314/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde314/kaccelbase.h b/extra/kde314/kaccelbase.h index def607f..efa075a 100644 --- a/extra/kde314/kaccelbase.h +++ b/extra/kde314/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * @ref KGlobal::config(). + * @ref TDEGlobal::config(). * * The group in which the configuration is stored can be * set with @ref setConfigGroup(). diff --git a/extra/kde314/ktoolbarbutton.h b/extra/kde314/ktoolbarbutton.h index 50d08ae..d0230ab 100644 --- a/extra/kde314/ktoolbarbutton.h +++ b/extra/kde314/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde315/kaccelaction.h b/extra/kde315/kaccelaction.h index 8e42250..b339517 100644 --- a/extra/kde315/kaccelaction.h +++ b/extra/kde315/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde315/kaccelbase.h b/extra/kde315/kaccelbase.h index def607f..efa075a 100644 --- a/extra/kde315/kaccelbase.h +++ b/extra/kde315/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * @ref KGlobal::config(). + * @ref TDEGlobal::config(). * * The group in which the configuration is stored can be * set with @ref setConfigGroup(). diff --git a/extra/kde315/ktoolbarbutton.h b/extra/kde315/ktoolbarbutton.h index 50d08ae..d0230ab 100644 --- a/extra/kde315/ktoolbarbutton.h +++ b/extra/kde315/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde320/kaccelaction.h b/extra/kde320/kaccelaction.h index 0418297..024292d 100644 --- a/extra/kde320/kaccelaction.h +++ b/extra/kde320/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde320/kaccelbase.h b/extra/kde320/kaccelbase.h index 7c83b44..2ecb048 100644 --- a/extra/kde320/kaccelbase.h +++ b/extra/kde320/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde320/ktoolbarbutton.h b/extra/kde320/ktoolbarbutton.h index 4e7c478..1d94500 100644 --- a/extra/kde320/ktoolbarbutton.h +++ b/extra/kde320/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde321/kaccelaction.h b/extra/kde321/kaccelaction.h index 0418297..024292d 100644 --- a/extra/kde321/kaccelaction.h +++ b/extra/kde321/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde321/kaccelbase.h b/extra/kde321/kaccelbase.h index 7c83b44..2ecb048 100644 --- a/extra/kde321/kaccelbase.h +++ b/extra/kde321/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde321/ktoolbarbutton.h b/extra/kde321/ktoolbarbutton.h index 4e7c478..1d94500 100644 --- a/extra/kde321/ktoolbarbutton.h +++ b/extra/kde321/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde322/kaccelaction.h b/extra/kde322/kaccelaction.h index 0418297..024292d 100644 --- a/extra/kde322/kaccelaction.h +++ b/extra/kde322/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde322/kaccelbase.h b/extra/kde322/kaccelbase.h index 7c83b44..2ecb048 100644 --- a/extra/kde322/kaccelbase.h +++ b/extra/kde322/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde322/ktoolbarbutton.h b/extra/kde322/ktoolbarbutton.h index 4e7c478..1d94500 100644 --- a/extra/kde322/ktoolbarbutton.h +++ b/extra/kde322/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde323/kaccelaction.h b/extra/kde323/kaccelaction.h index 0418297..024292d 100644 --- a/extra/kde323/kaccelaction.h +++ b/extra/kde323/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde323/kaccelbase.h b/extra/kde323/kaccelbase.h index 7c83b44..2ecb048 100644 --- a/extra/kde323/kaccelbase.h +++ b/extra/kde323/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde323/ktoolbarbutton.h b/extra/kde323/ktoolbarbutton.h index 4e7c478..1d94500 100644 --- a/extra/kde323/ktoolbarbutton.h +++ b/extra/kde323/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde330/kaccelaction.h b/extra/kde330/kaccelaction.h index 0418297..024292d 100644 --- a/extra/kde330/kaccelaction.h +++ b/extra/kde330/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde330/kaccelbase.h b/extra/kde330/kaccelbase.h index 7c83b44..2ecb048 100644 --- a/extra/kde330/kaccelbase.h +++ b/extra/kde330/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde330/ktoolbarbutton.h b/extra/kde330/ktoolbarbutton.h index e59050a..20ab5db 100644 --- a/extra/kde330/ktoolbarbutton.h +++ b/extra/kde330/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde331/kaccelaction.h b/extra/kde331/kaccelaction.h index 0418297..024292d 100644 --- a/extra/kde331/kaccelaction.h +++ b/extra/kde331/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde331/kaccelbase.h b/extra/kde331/kaccelbase.h index 7c83b44..2ecb048 100644 --- a/extra/kde331/kaccelbase.h +++ b/extra/kde331/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde331/ktoolbarbutton.h b/extra/kde331/ktoolbarbutton.h index e59050a..20ab5db 100644 --- a/extra/kde331/ktoolbarbutton.h +++ b/extra/kde331/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde332/kaccelaction.h b/extra/kde332/kaccelaction.h index 0418297..024292d 100644 --- a/extra/kde332/kaccelaction.h +++ b/extra/kde332/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde332/kaccelbase.h b/extra/kde332/kaccelbase.h index 7c83b44..2ecb048 100644 --- a/extra/kde332/kaccelbase.h +++ b/extra/kde332/kaccelbase.h @@ -167,7 +167,7 @@ class KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde332/ktoolbarbutton.h b/extra/kde332/ktoolbarbutton.h index e59050a..20ab5db 100644 --- a/extra/kde332/ktoolbarbutton.h +++ b/extra/kde332/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde340/kaccelaction.h b/extra/kde340/kaccelaction.h index 6515034..6d34b4f 100644 --- a/extra/kde340/kaccelaction.h +++ b/extra/kde340/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde340/kaccelbase.h b/extra/kde340/kaccelbase.h index b66e566..d9038d5 100644 --- a/extra/kde340/kaccelbase.h +++ b/extra/kde340/kaccelbase.h @@ -166,7 +166,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde340/ktoolbarbutton.h b/extra/kde340/ktoolbarbutton.h index 2febc9b..ac6789a 100644 --- a/extra/kde340/ktoolbarbutton.h +++ b/extra/kde340/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde341/kaccelaction.h b/extra/kde341/kaccelaction.h index 6515034..6d34b4f 100644 --- a/extra/kde341/kaccelaction.h +++ b/extra/kde341/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde341/kaccelbase.h b/extra/kde341/kaccelbase.h index b66e566..d9038d5 100644 --- a/extra/kde341/kaccelbase.h +++ b/extra/kde341/kaccelbase.h @@ -166,7 +166,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde341/ktoolbarbutton.h b/extra/kde341/ktoolbarbutton.h index 2febc9b..ac6789a 100644 --- a/extra/kde341/ktoolbarbutton.h +++ b/extra/kde341/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde342/kaccelaction.h b/extra/kde342/kaccelaction.h index 6515034..6d34b4f 100644 --- a/extra/kde342/kaccelaction.h +++ b/extra/kde342/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde342/kaccelbase.h b/extra/kde342/kaccelbase.h index b66e566..d9038d5 100644 --- a/extra/kde342/kaccelbase.h +++ b/extra/kde342/kaccelbase.h @@ -166,7 +166,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde342/ktoolbarbutton.h b/extra/kde342/ktoolbarbutton.h index 98f8476..2508411 100644 --- a/extra/kde342/ktoolbarbutton.h +++ b/extra/kde342/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde343/kaccelaction.h b/extra/kde343/kaccelaction.h index 6515034..6d34b4f 100644 --- a/extra/kde343/kaccelaction.h +++ b/extra/kde343/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde343/kaccelbase.h b/extra/kde343/kaccelbase.h index b66e566..d9038d5 100644 --- a/extra/kde343/kaccelbase.h +++ b/extra/kde343/kaccelbase.h @@ -166,7 +166,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde343/ktoolbarbutton.h b/extra/kde343/ktoolbarbutton.h index 98f8476..2508411 100644 --- a/extra/kde343/ktoolbarbutton.h +++ b/extra/kde343/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde350/kaccelaction.h b/extra/kde350/kaccelaction.h index 470c705..4c7ac18 100644 --- a/extra/kde350/kaccelaction.h +++ b/extra/kde350/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde350/kaccelbase.h b/extra/kde350/kaccelbase.h index 8f22253..a217846 100644 --- a/extra/kde350/kaccelbase.h +++ b/extra/kde350/kaccelbase.h @@ -196,7 +196,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde350/konsole_part.h b/extra/kde350/konsole_part.h index 5e4262f..44b7588 100644 --- a/extra/kde350/konsole_part.h +++ b/extra/kde350/konsole_part.h @@ -74,7 +74,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public virtual ~konsolePart(); signals: - void processExited( KProcess * ); + void processExited( TDEProcess * ); void receivedData( const TQString& s ); void forkedChild(); protected: diff --git a/extra/kde350/ktoolbarbutton.h b/extra/kde350/ktoolbarbutton.h index bc5a606..1473111 100644 --- a/extra/kde350/ktoolbarbutton.h +++ b/extra/kde350/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde351/kaccelaction.h b/extra/kde351/kaccelaction.h index 470c705..4c7ac18 100644 --- a/extra/kde351/kaccelaction.h +++ b/extra/kde351/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde351/kaccelbase.h b/extra/kde351/kaccelbase.h index 8f22253..a217846 100644 --- a/extra/kde351/kaccelbase.h +++ b/extra/kde351/kaccelbase.h @@ -196,7 +196,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde351/konsole_part.h b/extra/kde351/konsole_part.h index 5e4262f..44b7588 100644 --- a/extra/kde351/konsole_part.h +++ b/extra/kde351/konsole_part.h @@ -74,7 +74,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public virtual ~konsolePart(); signals: - void processExited( KProcess * ); + void processExited( TDEProcess * ); void receivedData( const TQString& s ); void forkedChild(); protected: diff --git a/extra/kde351/ktoolbarbutton.h b/extra/kde351/ktoolbarbutton.h index bc5a606..1473111 100644 --- a/extra/kde351/ktoolbarbutton.h +++ b/extra/kde351/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde352/kaccelaction.h b/extra/kde352/kaccelaction.h index 470c705..4c7ac18 100644 --- a/extra/kde352/kaccelaction.h +++ b/extra/kde352/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde352/kaccelbase.h b/extra/kde352/kaccelbase.h index 8f22253..a217846 100644 --- a/extra/kde352/kaccelbase.h +++ b/extra/kde352/kaccelbase.h @@ -196,7 +196,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde352/konsole_part.h b/extra/kde352/konsole_part.h index 5e4262f..44b7588 100644 --- a/extra/kde352/konsole_part.h +++ b/extra/kde352/konsole_part.h @@ -74,7 +74,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public virtual ~konsolePart(); signals: - void processExited( KProcess * ); + void processExited( TDEProcess * ); void receivedData( const TQString& s ); void forkedChild(); protected: diff --git a/extra/kde352/ktoolbarbutton.h b/extra/kde352/ktoolbarbutton.h index bc5a606..1473111 100644 --- a/extra/kde352/ktoolbarbutton.h +++ b/extra/kde352/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not diff --git a/extra/kde353/kaccelaction.h b/extra/kde353/kaccelaction.h index 470c705..4c7ac18 100644 --- a/extra/kde353/kaccelaction.h +++ b/extra/kde353/kaccelaction.h @@ -65,7 +65,7 @@ class KConfigBase; * \endcode * @short An accelerator action * @see KAccel - * @see KGlobalAccel + * @see TDEGlobalAccel * @see KKeyChooser * @see KKeyDialog */ diff --git a/extra/kde353/kaccelbase.h b/extra/kde353/kaccelbase.h index 8f22253..a217846 100644 --- a/extra/kde353/kaccelbase.h +++ b/extra/kde353/kaccelbase.h @@ -196,7 +196,7 @@ class TDECORE_EXPORT KAccelBase /** * Read all key associations from @p config, or (if @p config * is zero) from the application's configuration file - * KGlobal::config(). + * TDEGlobal::config(). * * The group in which the configuration is stored can be * set with setConfigGroup(). diff --git a/extra/kde353/konsole_part.h b/extra/kde353/konsole_part.h index 5e4262f..44b7588 100644 --- a/extra/kde353/konsole_part.h +++ b/extra/kde353/konsole_part.h @@ -74,7 +74,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public virtual ~konsolePart(); signals: - void processExited( KProcess * ); + void processExited( TDEProcess * ); void receivedData( const TQString& s ); void forkedChild(); protected: diff --git a/extra/kde353/ktoolbarbutton.h b/extra/kde353/ktoolbarbutton.h index bc5a606..1473111 100644 --- a/extra/kde353/ktoolbarbutton.h +++ b/extra/kde353/ktoolbarbutton.h @@ -60,7 +60,7 @@ public: */ KToolBarButton(const TQString& icon, int id, TQWidget *parent, const char *name=0L, const TQString &txt=TQString::null, - TDEInstance *_instance = KGlobal::instance()); + TDEInstance *_instance = TDEGlobal::instance()); /** * Construct a button with an existing pixmap. It is not 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 %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 @@ -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 @@ -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 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 @@ -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 %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&);