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

3 files changed, 15 insertions, 15 deletions

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('<b>Hello</b>', '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):