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

---
 quanta/src/document.cpp    |  2 +-
 quanta/src/dtds.cpp        |  4 ++--
 quanta/src/kqapp.cpp       |  2 +-
 quanta/src/quanta.cpp      |  8 ++++----
 quanta/src/quanta_init.cpp | 10 +++++-----
 quanta/src/quantadoc.cpp   |  2 +-
 quanta/src/viewmanager.cpp |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'quanta/src')

diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index f6531e68..dee83bca 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -45,7 +45,7 @@
 #include <kdirwatch.h>
 #include <kdebug.h>
 #include <kprogress.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 
 #include <tdetexteditor/document.h>
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 9a91f304..642c3da7 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -28,7 +28,7 @@
 // include files for KDE
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <kurlrequester.h>
@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 
 // application specific includes
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 33a68e91..53b73ea2 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -18,7 +18,7 @@
 
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <kcmdlineargs.h>
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index f604bc43..d0e862ff 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -58,10 +58,10 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kencodingfiledialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kdialogbase.h>
 #include <tdeversion.h>
@@ -107,7 +107,7 @@
 #include <tdetexteditor/view.h>
 #include <tdetexteditor/clipboardinterface.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #ifdef ENABLE_CVSSERVICE
 #include "cvsservice.h"
@@ -195,7 +195,7 @@ extern int NN;
 
 const TQString resourceDir = TQString(QUANTA_PACKAGE) + "/";
 
-// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
+// from tdefiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
 static void silenceTQToolBar(TQtMsgType, const char *){}
 
 QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( 0, "Quanta", (KMdi::MdiMode) mdiMode)
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 77883967..48f106b0 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -40,11 +40,11 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kmenubar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
@@ -54,7 +54,7 @@
 #include <kprocess.h>
 #include <kprogress.h>
 #include <ktip.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktabwidget.h>
 #include <tdemultitabbar.h>
 #include <tdetexteditor/view.h>
@@ -1412,7 +1412,7 @@ void QuantaInit::checkRuntimeDependencies()
 
 
   dependency.name = i18n("Control Center (tdebase)");
-  dependency.execName = "kcmshell";
+  dependency.execName = "tdecmshell";
   dependency.url = "http://www.kde.org";
   dependency.description = i18n("preview browser configuration");
   dependency.type = Dependency::Executable;
@@ -1427,7 +1427,7 @@ void QuantaInit::checkRuntimeDependencies()
 
   dependency.name = "KFileReplace";
   dependency.execName = "KFileReplace";
-  dependency.url = "http://kfilereplace.tdewebdev.org";
+  dependency.url = "http://tdefilereplace.tdewebdev.org";
   dependency.description = i18n("search and replace in files");
   dependency.type = Dependency::Plugin;
   dependencies.append(dependency);
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 6a05a444..eb463cf6 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -29,7 +29,7 @@
 // include files for KDE
 #include <klocale.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kmessagebox.h>
 #include <kdirwatch.h>
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 644e50a7..7cf9a1ed 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -28,7 +28,7 @@
 #include <tdetexteditor/popupmenuinterface.h>
 #include <tdetexteditor/editorchooser.h>
 #include <tdetexteditor/markinterface.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 
 //app includes
-- 
cgit v1.2.3