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

8 files changed, 13 insertions, 13 deletions

diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp
index 6bbb81d4..849863d7 100644
--- a/kolourpaint/kpdocumentsaveoptions.cpp
+++ b/kolourpaint/kpdocumentsaveoptions.cpp
@@ -371,7 +371,7 @@ static TQStringList mimeTypesSupportingProperty (const TQString &property,
 {
     TQStringList mimeTypeList;
 
-    KConfigGroupSaver cfgGroupSaver (KGlobal::config (),
+    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
                                      kpSettingsGroupMimeTypeProperties);
     KConfigBase *cfg = cfgGroupSaver.config ();
 
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index 219d65ca..b602494f 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -157,7 +157,7 @@ void kpDocumentSaveOptionsPreviewDialog::setFilePixmapAndSize (const TQPixmap &p
     const TQString alternateText6 = i18n ("%1B (%2%)");
     const TQString alternateText7 = i18n ("%1B (approx. %2%)");
     m_fileSizeLabel->setText (i18n ("%1 bytes (approx. %2%)")
-                                   .arg (KGlobal::locale ()->formatLong (m_fileSize))
+                                   .arg (TDEGlobal::locale ()->formatLong (m_fileSize))
                                    .arg (percent));
 }
 
@@ -742,7 +742,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
                  this, TQT_SLOT (hidePreview ()));
 
 
-        KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
+        KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
         KConfigBase *cfg = cfgGroupSaver.config ();
 
         if (cfg->hasKey (kpSettingPreviewSaveUpdateDelay))
@@ -769,7 +769,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
         #if DEBUG_KP_DOCUMENT_SAVE_OPTIONS_WIDGET
             kdDebug () << "\tread cfg preview dialog last rel geometry" << endl;
         #endif
-            KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
+            KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
             KConfigBase *cfg = cfgGroupSaver.config ();
 
             m_previewDialogLastRelativeGeometry = cfg->readRectEntry (
@@ -845,7 +845,7 @@ void kpDocumentSaveOptionsWidget::showPreview (bool yes)
     {
         m_updatePreviewDialogLastRelativeGeometryTimer->stop ();
 
-        KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupPreviewSave);
+        KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupPreviewSave);
         KConfigBase *cfg = cfgGroupSaver.config ();
 
         cfg->writeEntry (kpSettingPreviewSaveGeometry, m_previewDialogLastRelativeGeometry);
diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp
index d7e77f1c..5c6897c2 100644
--- a/kolourpaint/kpmainwindow_file.cpp
+++ b/kolourpaint/kpmainwindow_file.cpp
@@ -997,7 +997,7 @@ static bool shouldPrintImageCenteredOnPage ()
 #endif
     bool ret;
 
-    KConfigGroupSaver cfgGroupSaver (KGlobal::config (),
+    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
                                      kpSettingsGroupGeneral);
     KConfigBase *cfg = cfgGroupSaver.config ();
 
diff --git a/kolourpaint/kpmainwindow_help.cpp b/kolourpaint/kpmainwindow_help.cpp
index 830ed6e8..ecb17e13 100644
--- a/kolourpaint/kpmainwindow_help.cpp
+++ b/kolourpaint/kpmainwindow_help.cpp
@@ -73,7 +73,7 @@ void kpMainWindow::enableHelpMenuDocumentActions (bool /*enable*/)
 // SYNC: tdebase/twin/twinbindings.cpp
 static TQString printScreenShortcutString ()
 {
-    KConfigGroupSaver cfgGroupSaver (KGlobal::config (), "Global Shortcuts");
+    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), "Global Shortcuts");
     KConfigBase *cfg = cfgGroupSaver.config ();
 
     // TODO: i18n() entry name?  twinbindings.cpp seems to but it doesn't
diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp
index 1768aa96..471a3293 100644
--- a/kolourpaint/pixmapfx/kpeffectflatten.cpp
+++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp
@@ -137,7 +137,7 @@ kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection,
 {
     if (!s_lastColor1.isValid () || !s_lastColor2.isValid ())
     {
-        KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupFlattenEffect);
+        KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
         KConfigBase *cfg = cfgGroupSaver.config ();
 
         s_lastColor1 = cfg->readColorEntry (kpSettingFlattenEffectColor1);
@@ -183,7 +183,7 @@ kpEffectFlattenWidget::~kpEffectFlattenWidget ()
     s_lastColor2 = color2 ();
 
 
-    KConfigGroupSaver cfgGroupSaver (KGlobal::config (), kpSettingsGroupFlattenEffect);
+    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (), kpSettingsGroupFlattenEffect);
     KConfigBase *cfg = cfgGroupSaver.config ();
 
     cfg->writeEntry (kpSettingFlattenEffectColor1, s_lastColor1);
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index 2543f962..6525854a 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -492,7 +492,7 @@ TQPixmap kpPixmapFX::convertToPixmapAsLosslessAsPossible (const TQImage &image,
 
         int configDitherIfNumColorsGreaterThan = 323;
 
-        KConfigGroupSaver cfgGroupSaver (KGlobal::config (),
+        KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
                                          kpSettingsGroupGeneral);
         KConfigBase *cfg = cfgGroupSaver.config ();
 
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 80962c77..58c17abd 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -604,7 +604,7 @@ static TQIconSet toolButtonIconSet (const TQString &iconName)
     // No "disabled" pixmap is generated by UserIconSet() so generate it
     // ourselves:
 
-    TQPixmap disabledIcon = KGlobal::iconLoader ()->iconEffect ()->apply (
+    TQPixmap disabledIcon = TDEGlobal::iconLoader ()->iconEffect ()->apply (
         UserIcon (iconName),
         KIcon::Toolbar, KIcon::DisabledState);
 
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index 4982d7ef..56dde564 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -175,7 +175,7 @@ int kpToolToolBar::defaultIconSize ()
 #endif
 
 
-    KConfigGroupSaver cfgGroupSaver (KGlobal::config (),
+    KConfigGroupSaver cfgGroupSaver (TDEGlobal::config (),
                                      kpSettingsGroupTools);
     KConfigBase *cfg = cfgGroupSaver.config ();
 
@@ -200,7 +200,7 @@ int kpToolToolBar::defaultIconSize ()
     if (m_defaultIconSize <= 0)
     {
         // Adapt according to screen geometry
-        const TQRect desktopSize = KGlobalSettings::desktopGeometry (this);
+        const TQRect desktopSize = TDEGlobalSettings::desktopGeometry (this);
     #if DEBUG_KP_TOOL_TOOL_BAR
         kdDebug () << "\tadapting to screen size=" << desktopSize << endl;
     #endif