Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

5 files changed, 10 insertions, 10 deletions

diff --git a/scripts/README b/scripts/README
index 6bbc0d80..fe31583f 100644
--- a/scripts/README
+++ b/scripts/README
@@ -51,8 +51,8 @@ kde-spellcheck.pl A script to check source code for misspelings and optionally
 
 === MODERNIZATION SCRIPTS
 
-rc2kcfgxt.pl	Reads an existing KConfig rc file and creates a best-guess
-		version of a KConfigXT XML file.
+rc2kcfgxt.pl	Reads an existing TDEConfig rc file and creates a best-guess
+		version of a TDEConfigXT XML file.
 
 kdelnk2desktop.py Converts old-style .kdelnk files to their modern .desktop
 		equivalents.
diff --git a/scripts/fixheaders b/scripts/fixheaders
index b5724785..b5a5e902 100644
--- a/scripts/fixheaders
+++ b/scripts/fixheaders
@@ -28,21 +28,21 @@ $lastdir = '.';
  '`QTextStream\' undeclared \(first use this function\)' => "qtextstream",
  '`QTextStream\' was not declared in this scope' => "qtextstream",
  'incomplete type `QSocketNotifier\'' => "qsocketnotifier",
- 'no matching function for call to `KConfig' => "kconfig",
- 'variable `class KConfig \S*\' has initializer but incomplete type' => "kconfig",
+ 'no matching function for call to `TDEConfig' => "kconfig",
+ 'variable `class TDEConfig \S*\' has initializer but incomplete type' => "kconfig",
  'implicit declaration of function `int kdDebug' => "kdebug",
  'implicit declaration of function `int kdWarning' => "kdebug",
  '`QFile\' undeclared \(first use this function' => "qfile",
  'variable `QFile \S*\' has initializer but incomplete type' => "qfile",
- 'type `KConfigBase\' is not a base type for type `KConfig' => "kconfig",
+ 'type `TDEConfigBase\' is not a base type for type `TDEConfig' => "kconfig",
  'invalid use of undefined type `class QAccel' => "qaccel",
  'invalid use of undefined type `class TDEAboutData' => "kaboutdata",
  'incomplete type `TDEAboutData\'' => "kaboutdata",
  'incomplete type `QGrid\'' => "qgrid",
  'invalid use of undefined type `class QGrid\'' => "qgrid",
- 'aggregate `class KConfig \S*\' has incomplete type' => "kconfig",
+ 'aggregate `class TDEConfig \S*\' has incomplete type' => "kconfig",
  '`stderr\' undeclared \(first use this function' => "stdio",
- 'invalid use of undefined type `class KConfig' => "kconfig",
+ 'invalid use of undefined type `class TDEConfig' => "kconfig",
  'implicit declaration of function `int f?printf' => "stdio",
  'no method `TDEGlobal::' => "kglobal",
  '`TDEGlobal\' undeclared \(first use this function\)' => "kglobal",
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index a002e8fc..141434ef 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -234,7 +234,7 @@ function! MapIdentHeader( ident )
     " KDE stuff
     elseif a:ident == 'K\(Double\|Int\)\(NumInput\|SpinBox\)'
         return '<knuminput.h>'
-    elseif a:ident == 'KConfigGroup'
+    elseif a:ident == 'TDEConfigGroup'
         return '<kconfigbase.h>'
     elseif a:ident == 'KListViewItem'
         return '<klistview.h>'
diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el
index ef0c6bf9..5ebc5a4a 100644
--- a/scripts/kde-emacs/klaralv.el
+++ b/scripts/kde-emacs/klaralv.el
@@ -121,7 +121,7 @@
 
     ; KDE
     (kdebug.h kdDebug kdWarning kdError kdFatal kdBacktrace)
-    (kconfig.h KConfigGroup)
+    (kconfig.h TDEConfigGroup)
     (kiconloader.h BarIcon SmallIcon DesktopIcon KIcon)
     (kicondialog.h KIconCanvas KIconButton)
     (knuminput.h KDoubleNumInput KIntNumInput)
diff --git a/scripts/rc2kcfgxt.pl b/scripts/rc2kcfgxt.pl
index 4b015dee..ecd1ae27 100644
--- a/scripts/rc2kcfgxt.pl
+++ b/scripts/rc2kcfgxt.pl
@@ -8,7 +8,7 @@
 #
 # Usage: rc2kcfgtxt.pl < rcfile > xmlfile
 #
-# Reads an rcfile (say, kmailrc) and writes out an KConfigXT XML
+# Reads an rcfile (say, kmailrc) and writes out an TDEConfigXT XML
 # file that represents a reasonable guess for representing the
 # rc file. No guarantees about well-formedness of the XML are made.
 #