4 files changed, 9 insertions, 9 deletions
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
index 02fa72d..1d518cc 100755
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -72,7 +72,7 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
 
    m_pParentWidget = pPopupmenu->parentWidget();
 
-   KGlobal::locale()->insertCatalogue("kdiff3_plugin");
+   TDEGlobal::locale()->insertCatalogue("kdiff3_plugin");
 
    // remember currently selected files (copy to a TQStringList)
    KFileItemList itemList = pPopupmenu->fileItemList();
diff --git a/src/kdiff3_shell.cpp b/src/kdiff3_shell.cpp
index 226b6c3..a8a2a84 100644
--- a/src/kdiff3_shell.cpp
+++ b/src/kdiff3_shell.cpp
@@ -154,12 +154,12 @@ void KDiff3Shell::optionsConfigureToolbars()
 {
 #if defined(TDE_MAKE_VERSION)
 # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
-    saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 # else
-    saveMainWindowSettings(KGlobal::config() );
+    saveMainWindowSettings(TDEGlobal::config() );
 # endif
 #else
-    saveMainWindowSettings(KGlobal::config() );
+    saveMainWindowSettings(TDEGlobal::config() );
 #endif
 
     // use the standard toolbar editor
@@ -173,12 +173,12 @@ void KDiff3Shell::applyNewToolbarConfig()
 {
 #if defined(TDE_MAKE_VERSION)
 # if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
-    applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 # else
-    applyMainWindowSettings(KGlobal::config());
+    applyMainWindowSettings(TDEGlobal::config());
 # endif
 #else
-    applyMainWindowSettings(KGlobal::config());
+    applyMainWindowSettings(TDEGlobal::config());
 #endif
 }
 
diff --git a/src/kreplacements/kreplacements.h b/src/kreplacements/kreplacements.h
index ca172c6..bebe96c 100644
--- a/src/kreplacements/kreplacements.h
+++ b/src/kreplacements/kreplacements.h
@@ -410,7 +410,7 @@ public:
    KEditToolbar( int ){}
 };
 
-class KGlobal
+class TDEGlobal
 {
 public:
    static KConfig* config() { return 0; }
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index 8b15dc8..7c70004 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -518,7 +518,7 @@ void OptionDialog::setupFontPage( void )
 #elif defined( KREPLACEMENTS_H )
       TQFont("Courier", 10 );
 #else
-      KGlobalSettings::fixedFont();
+      TDEGlobalSettings::fixedFont();
 #endif
 
    OptionFontChooser* pFontChooser = new OptionFontChooser( defaultFont, "Font", &m_font, page, this );