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

---
 kompare/CMakeLists.txt                           | 2 +-
 kompare/ChangeLog                                | 2 +-
 kompare/TODO                                     | 2 +-
 kompare/kompare_shell.cpp                        | 2 +-
 kompare/komparepart/kompare_part.cpp             | 6 +++---
 kompare/komparepart/komparesaveoptionswidget.cpp | 2 +-
 kompare/libdialogpages/diffsettings.cpp          | 2 +-
 kompare/libdialogpages/filespage.cpp             | 2 +-
 kompare/libdialogpages/filessettings.cpp         | 2 +-
 kompare/libdialogpages/pagebase.h                | 2 +-
 kompare/libdialogpages/viewsettings.cpp          | 2 +-
 kompare/libdiff2/komparemodellist.cpp            | 2 +-
 kompare/main.cpp                                 | 2 +-
 kompare/tests/subversion/contextm.diff           | 2 +-
 kompare/tests/subversion/normalm.diff            | 2 +-
 kompare/tests/subversion/unifiedm.diff           | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'kompare')

diff --git a/kompare/CMakeLists.txt b/kompare/CMakeLists.txt
index 2f35d2a6..4977eb71 100644
--- a/kompare/CMakeLists.txt
+++ b/kompare/CMakeLists.txt
@@ -49,7 +49,7 @@ tde_add_executable( kompare AUTOMOC
   SOURCES
     main.cpp kompare_shell.cpp kompareurldialog.cpp
   LINK
-    dialogpages-static kompareinterface-shared kio-shared
+    dialogpages-static kompareinterface-shared tdeio-shared
     tdeparts-shared tdetexteditor-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kompare/ChangeLog b/kompare/ChangeLog
index d7f82d98..2781e875 100644
--- a/kompare/ChangeLog
+++ b/kompare/ChangeLog
@@ -197,7 +197,7 @@ Jun    29, 2003 : Otto Bruggeman
           different enum value, so i hope i did it the right way, session
           management may be broken now when the session was stored with 3.1.2
           and restarted with 3.1.3. But that is unfortunately unfixable with a
-          kconf_update script.
+          tdeconf_update script.
 
 Jun    29, 2003 : Otto Bruggeman
 	* Removed a lot of commented code since it is no longer used and will
diff --git a/kompare/TODO b/kompare/TODO
index e87a574f..3fa2d6d3 100644
--- a/kompare/TODO
+++ b/kompare/TODO
@@ -1,5 +1,5 @@
 !!! Must do before a merge back into HEAD !!!
-* Write a kconfupdate script to convert the kconfigfile
+* Write a tdeconfupdate script to convert the tdeconfigfile
   * the diff options now have their own group
   * the view options now have their own group
   * the Recent Files group has been renamed to Recent Compare Files
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 5e6522cf..a903f6d4 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -344,7 +344,7 @@ void KompareShell::readProperties(TDEConfig* config)
 	else
 	{ // just in case something weird has happened, dont restore the diff then
 	  // Bruggie: or when some idiot like me changes the possible values for mode
-	  // IOW, a nice candidate for a kconf_update thingy :)
+	  // IOW, a nice candidate for a tdeconf_update thingy :)
 		m_viewPart->readProperties( config );
 	}
 }
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 52de1f5f..097eb5db 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -27,8 +27,8 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kfiletreeview.h>
-#include <kfiledialog.h>
+#include <tdefiletreeview.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>
@@ -37,7 +37,7 @@
 #include <tdeparts/genericfactory.h>
 //#include <ktempdir.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "diffmodel.h"
 #include "komparelistview.h"
diff --git a/kompare/komparepart/komparesaveoptionswidget.cpp b/kompare/komparepart/komparesaveoptionswidget.cpp
index 723093ac..95a641cb 100644
--- a/kompare/komparepart/komparesaveoptionswidget.cpp
+++ b/kompare/komparepart/komparesaveoptionswidget.cpp
@@ -24,7 +24,7 @@
 #include <tqspinbox.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurlrequester.h>
 
 #include "diffsettings.h"
diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp
index 26239d78..582fb106 100644
--- a/kompare/libdialogpages/diffsettings.cpp
+++ b/kompare/libdialogpages/diffsettings.cpp
@@ -15,7 +15,7 @@
 **
 ****************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "diffsettings.h"
 
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index 9fa58a35..f1981c9a 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -21,7 +21,7 @@
 
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp
index 966d5fcd..3808edb0 100644
--- a/kompare/libdialogpages/filessettings.cpp
+++ b/kompare/libdialogpages/filessettings.cpp
@@ -17,7 +17,7 @@
 ****************************************************************************/
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "filessettings.h"
 
diff --git a/kompare/libdialogpages/pagebase.h b/kompare/libdialogpages/pagebase.h
index 1521db96..564e2f90 100644
--- a/kompare/libdialogpages/pagebase.h
+++ b/kompare/libdialogpages/pagebase.h
@@ -23,7 +23,7 @@
 #include <tqsize.h>
 #include <tqwidget.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktabctl.h>
 
 #include "kompare.h"
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 8bbd8895..902f4091 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -19,7 +19,7 @@
 
 #include <tqfont.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 
 #include "viewsettings.h"
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 20d7e551..c6cf587c 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -29,7 +29,7 @@
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmimetype.h>
 #include <ktempfile.h>
diff --git a/kompare/main.cpp b/kompare/main.cpp
index 84a21fab..5f3cb223 100644
--- a/kompare/main.cpp
+++ b/kompare/main.cpp
@@ -21,7 +21,7 @@
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kompare/tests/subversion/contextm.diff b/kompare/tests/subversion/contextm.diff
index 6d63c9fe..481dc794 100644
--- a/kompare/tests/subversion/contextm.diff
+++ b/kompare/tests/subversion/contextm.diff
@@ -71,7 +71,7 @@ Index: README
 ! ln -s vimwidgetrc share/config/vimwidgetrc
 ! 
 ! 8. Update the desktop mimetype database:
-! kbuildsycoca
+! tdebuildsycoca
 ! 
 ! To test it, run VimPartShell. Or run konqueror from this dir and click on a
 ! text file.
diff --git a/kompare/tests/subversion/normalm.diff b/kompare/tests/subversion/normalm.diff
index 6ea65004..4fdb55bf 100644
--- a/kompare/tests/subversion/normalm.diff
+++ b/kompare/tests/subversion/normalm.diff
@@ -65,7 +65,7 @@ Index: README
 < ln -s vimwidgetrc share/config/vimwidgetrc
 < 
 < 8. Update the desktop mimetype database:
-< kbuildsycoca
+< tdebuildsycoca
 < 
 < To test it, run VimPartShell. Or run konqueror from this dir and click on a
 < text file.
diff --git a/kompare/tests/subversion/unifiedm.diff b/kompare/tests/subversion/unifiedm.diff
index 1c5c873c..875adc4d 100644
--- a/kompare/tests/subversion/unifiedm.diff
+++ b/kompare/tests/subversion/unifiedm.diff
@@ -68,7 +68,7 @@ Index: README
 -ln -s vimwidgetrc share/config/vimwidgetrc
 -
 -8. Update the desktop mimetype database:
--kbuildsycoca
+-tdebuildsycoca
 -
 -To test it, run VimPartShell. Or run konqueror from this dir and click on a
 -text file.
-- 
cgit v1.2.1