From ff94d46e423398804d2ae63faeb114c2cf604fc4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:39 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 scripts/completions/zsh/_kcmshell   | 16 ----------------
 scripts/completions/zsh/_tdecmshell | 16 ++++++++++++++++
 scripts/fixheaders                  | 10 +++++-----
 scripts/kde-devel-vim.vim           |  2 +-
 scripts/kde-emacs/klaralv.el        |  2 +-
 scripts/tdesvn-build                |  2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 scripts/completions/zsh/_kcmshell
 create mode 100644 scripts/completions/zsh/_tdecmshell

(limited to 'scripts')

diff --git a/scripts/completions/zsh/_kcmshell b/scripts/completions/zsh/_kcmshell
deleted file mode 100644
index 4bc964c7..00000000
--- a/scripts/completions/zsh/_kcmshell
+++ /dev/null
@@ -1,16 +0,0 @@
-#compdef kcmshell=kcmshell appletproxy=appletproxy
-
-local i resource tmp dir flags
-if [ "$service" = "kcmshell" ]; then
-	resource="apps";
-	dir="/Settings";
-	flags=":t:r";
-else
-	resource="data";
-	dir="/kicker/applets";
-	flags=":t"
-fi
-for i in `tde-config --path $resource| sed -e 's/:/ /g'`; do
-	tmp=($i/$dir/**/*.desktop($flags))
-	compadd -a tmp
-done
diff --git a/scripts/completions/zsh/_tdecmshell b/scripts/completions/zsh/_tdecmshell
new file mode 100644
index 00000000..f9c62814
--- /dev/null
+++ b/scripts/completions/zsh/_tdecmshell
@@ -0,0 +1,16 @@
+#compdef tdecmshell=tdecmshell appletproxy=appletproxy
+
+local i resource tmp dir flags
+if [ "$service" = "tdecmshell" ]; then
+	resource="apps";
+	dir="/Settings";
+	flags=":t:r";
+else
+	resource="data";
+	dir="/kicker/applets";
+	flags=":t"
+fi
+for i in `tde-config --path $resource| sed -e 's/:/ /g'`; do
+	tmp=($i/$dir/**/*.desktop($flags))
+	compadd -a tmp
+done
diff --git a/scripts/fixheaders b/scripts/fixheaders
index b5a5e902..a5debd94 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 `TDEConfig' => "kconfig",
- 'variable `class TDEConfig \S*\' has initializer but incomplete type' => "kconfig",
+ 'no matching function for call to `TDEConfig' => "tdeconfig",
+ 'variable `class TDEConfig \S*\' has initializer but incomplete type' => "tdeconfig",
  '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 `TDEConfigBase\' is not a base type for type `TDEConfig' => "kconfig",
+ 'type `TDEConfigBase\' is not a base type for type `TDEConfig' => "tdeconfig",
  '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 TDEConfig \S*\' has incomplete type' => "kconfig",
+ 'aggregate `class TDEConfig \S*\' has incomplete type' => "tdeconfig",
  '`stderr\' undeclared \(first use this function' => "stdio",
- 'invalid use of undefined type `class TDEConfig' => "kconfig",
+ 'invalid use of undefined type `class TDEConfig' => "tdeconfig",
  '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 141434ef..c57122b6 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -235,7 +235,7 @@ function! MapIdentHeader( ident )
     elseif a:ident == 'K\(Double\|Int\)\(NumInput\|SpinBox\)'
         return '<knuminput.h>'
     elseif a:ident == 'TDEConfigGroup'
-        return '<kconfigbase.h>'
+        return '<tdeconfigbase.h>'
     elseif a:ident == 'KListViewItem'
         return '<klistview.h>'
     elseif a:ident =~ 'kd\(Debug\|Warning\|Error\|Fatal\|Backtrace\)'
diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el
index 5ebc5a4a..a0a1e848 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 TDEConfigGroup)
+    (tdeconfig.h TDEConfigGroup)
     (kiconloader.h BarIcon SmallIcon DesktopIcon KIcon)
     (kicondialog.h KIconCanvas KIconButton)
     (knuminput.h KDoubleNumInput KIntNumInput)
diff --git a/scripts/tdesvn-build b/scripts/tdesvn-build
index 05c1b655..657b0390 100755
--- a/scripts/tdesvn-build
+++ b/scripts/tdesvn-build
@@ -231,7 +231,7 @@ reporting bugs.
 
 You can find additional information at B<tdesvn-build> home page,
 F<http://tdesvn-build.kde.org/>, or using tdesvn-build
-docbook documentation, using the help kioslave, F<help:/tdesvn-build>.
+docbook documentation, using the help tdeioslave, F<help:/tdesvn-build>.
 
 =head1 AUTHOR
 
-- 
cgit v1.2.3