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

6 files changed, 15 insertions, 15 deletions

diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp
index 9fdf6ee5..ee0c05f5 100644
--- a/kget/droptarget.cpp
+++ b/kget/droptarget.cpp
@@ -55,7 +55,7 @@ DropTarget::DropTarget(KMainWindow * mainWin):TQWidget()
     int x = ksettings.dropPosition.x();
     int y = ksettings.dropPosition.y();
     
-    TQRect desk = KGlobalSettings::desktopGeometry(this);
+    TQRect desk = TDEGlobalSettings::desktopGeometry(this);
     TQPixmap bgnd = UserIcon( "target" );
 
     if (x != -1 &&
diff --git a/kget/kfileio.cpp b/kget/kfileio.cpp
index 59f26af6..ac8b0f70 100644
--- a/kget/kfileio.cpp
+++ b/kget/kfileio.cpp
@@ -82,8 +82,8 @@ TQString kFileToString(const TQString & aFileName, bool aEnsureNL, bool aVerbose
     result[len] = '\0';
 
     if (readLen < len) {
-        TQString msg = i18n("Could only read %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(readLen,
-                      0)).arg(KGlobal::locale()->formatNumber(len, 0));
+        TQString msg = i18n("Could only read %1 bytes of %2.").arg(TDEGlobal::locale()->formatNumber(readLen,
+                      0)).arg(TDEGlobal::locale()->formatNumber(len, 0));
 
         KMessageBox::error(tqApp->mainWidget(), msg);
         return TQString();
@@ -152,8 +152,8 @@ static bool kBytesToFile(const char *aBuffer, int len, const TQString & aFileNam
         KMessageBox::error(tqApp->mainWidget(), i18n("Could not write to file:\n%1").arg(aFileName));
         return FALSE;
     } else if (writeLen < len) {
-        TQString msg = i18n("Could only write %1 bytes of %2.").arg(KGlobal::locale()->formatNumber(writeLen,
-                      0)).arg(KGlobal::locale()->formatNumber(len,
+        TQString msg = i18n("Could only write %1 bytes of %2.").arg(TDEGlobal::locale()->formatNumber(writeLen,
+                      0)).arg(TDEGlobal::locale()->formatNumber(len,
                                                               0));
 
         KMessageBox::error(tqApp->mainWidget(), msg);
diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp
index 65ca3c99..3631873d 100644
--- a/kget/kget_plug_in/kget_plug_in.cpp
+++ b/kget/kget_plug_in/kget_plug_in.cpp
@@ -47,7 +47,7 @@
 KGet_plug_in::KGet_plug_in( TQObject* parent, const char* name )
     : Plugin( parent, name )
 {
-    TQPixmap pix = KGlobal::iconLoader()->loadIcon("kget",
+    TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("kget",
                                                   KIcon::MainToolbar);
     KActionMenu *menu = new KActionMenu( i18n("Download Manager"), pix,
                                          actionCollection(), "kget_menu" );
@@ -178,7 +178,7 @@ extern "C"
 {
     KDE_EXPORT void* init_khtml_kget()
     {
-        KGlobal::locale()->insertCatalogue("kget");
+        TDEGlobal::locale()->insertCatalogue("kget");
         return new KPluginFactory;
     }
 
diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp
index e6bfa2c7..b80625c6 100644
--- a/kget/kmainwidget.cpp
+++ b/kget/kmainwidget.cpp
@@ -101,7 +101,7 @@ struct KURLPair
 
 KMainWidget *kmain = 0L;
 
-#define LOAD_ICON(X) KGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar)
+#define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar)
 
 DropTarget *kdrop = 0L;
 
@@ -405,7 +405,7 @@ void KMainWidget::setupGUI()
         m_paKonquerorIntegration->setText(i18n("Disable &KGet as Konqueror Download Manager"));
     }
 
-    menuHelp = new KHelpMenu(this, KGlobal::instance()->aboutData());
+    menuHelp = new KHelpMenu(this, TDEGlobal::instance()->aboutData());
     KStdAction::whatsThis(menuHelp, TQT_SLOT(contextHelpActivated()), coll, "whats_this");
 
     createGUI("kgetui.rc");
@@ -508,7 +508,7 @@ void KMainWidget::slotConfigureToolbars()
     sDebugIn << endl;
 #endif
 
-    saveMainWindowSettings( KGlobal::config(), "MainWindow" );
+    saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
     KEditToolbar edit(factory());
     connect(&edit, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
     edit.exec();
@@ -526,7 +526,7 @@ void KMainWidget::slotNewToolbarConfig()
 #endif
 
     createGUI("kgetui.rc");
-    applyMainWindowSettings( KGlobal::config(), "MainWindow" );
+    applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
 
 #ifdef _DEBUG
     sDebugOut << endl;
diff --git a/kget/settings.cpp b/kget/settings.cpp
index 9e6adc4d..4186784e 100644
--- a/kget/settings.cpp
+++ b/kget/settings.cpp
@@ -171,7 +171,7 @@ Settings::load()
     // read misc settings
     config->setGroup("Misc");
 
-    TQFont font = KGlobalSettings::generalFont();
+    TQFont font = TDEGlobalSettings::generalFont();
 
     listViewFont = config->readFontEntry("Font", &font);
 
diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp
index bf54cb87..62384f07 100644
--- a/kget/transferlist.cpp
+++ b/kget/transferlist.cpp
@@ -76,7 +76,7 @@ TransferList::TransferList(TQWidget * parent, const char *name)
     jobid=1;
 
     // initial layout
-    KConfig *config = KGlobal::config();
+    KConfig *config = TDEGlobal::config();
     config->setGroup("ListView");
     if ( config->readListEntry("ColumnWidths").isEmpty() )
     {
@@ -84,7 +84,7 @@ TransferList::TransferList(TQWidget * parent, const char *name)
             setColumnWidth(i, defaultColumnWidth[i]);
     }
     else
-        restoreLayout( KGlobal::config(), "ListView" );
+        restoreLayout( TDEGlobal::config(), "ListView" );
 
     TQString connectPath = "pics/connect%2.png";
     TQString tryPath = "pics/try%2.png";
@@ -120,7 +120,7 @@ TransferList::TransferList(TQWidget * parent, const char *name)
 
 TransferList::~TransferList()
 {
-    saveLayout( KGlobal::config(), "ListView" );
+    saveLayout( TDEGlobal::config(), "ListView" );
 }