From 82072ef281de2d5948a42fb69ae800d47e0800be Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:18:40 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 quanta/src/CMakeLists.txt  |  4 ++--
 quanta/src/Makefile.am     |  2 +-
 quanta/src/document.cpp    | 28 ++++++++++++++--------------
 quanta/src/document.h      |  2 +-
 quanta/src/quanta.cpp      | 32 ++++++++++++++++----------------
 quanta/src/quanta.h        |  6 +++---
 quanta/src/quanta_init.cpp |  8 ++++----
 quanta/src/quanta_init.h   |  2 +-
 quanta/src/quantadoc.cpp   | 30 +++++++++++++++---------------
 quanta/src/quantaview.cpp  | 14 +++++++-------
 quanta/src/quantaview.h    |  2 +-
 quanta/src/viewmanager.cpp | 14 +++++++-------
 12 files changed, 72 insertions(+), 72 deletions(-)

(limited to 'quanta/src')

diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt
index c639bbc5..86d93f09 100644
--- a/quanta/src/CMakeLists.txt
+++ b/quanta/src/CMakeLists.txt
@@ -71,8 +71,8 @@ tde_add_executable( quanta AUTOMOC
     framewizard-static csseditor-static
     tableeditor-static preview-static
     utility-static quantamodule-static
-    kafkalibrary-static kmdi-shared khtml-shared
-    knewstuff-shared kabc-shared ktexteditor-shared
+    kafkalibrary-static tdemdi-shared tdehtml-shared
+    knewstuff-shared kabc-shared tdetexteditor-shared
     ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/quanta/src/Makefile.am b/quanta/src/Makefile.am
index ec40ded9..8227e35e 100644
--- a/quanta/src/Makefile.am
+++ b/quanta/src/Makefile.am
@@ -64,7 +64,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \
 quanta_METASOURCES = AUTO
 
 # the library search path.
-quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lX11
+quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lX11
 
 # this is where the kdelnk file will go
 xdg_apps_DATA = quanta.desktop
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 2cec0c03..f6531e68 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -48,20 +48,20 @@
 #include <kio/netaccess.h>
 #include <kstandarddirs.h>
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/cursorinterface.h>
-#include <ktexteditor/clipboardinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/configinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/editinterfaceext.h>
-#include <ktexteditor/encodinginterface.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/selectioninterfaceext.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/wordwrapinterface.h>
-#include <ktexteditor/markinterfaceextension.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/cursorinterface.h>
+#include <tdetexteditor/clipboardinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/configinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/editinterfaceext.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/selectioninterfaceext.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/wordwrapinterface.h>
+#include <tdetexteditor/markinterfaceextension.h>
 
 #include <kate/view.h>
 
diff --git a/quanta/src/document.h b/quanta/src/document.h
index 99511907..9d8de77d 100644
--- a/quanta/src/document.h
+++ b/quanta/src/document.h
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 
 #include <kurl.h>
-#include <ktexteditor/markinterfaceextension.h>
+#include <tdetexteditor/markinterfaceextension.h>
 
 //own includes
 #include "qtag.h"
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index cbcbfd50..f604bc43 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -62,7 +62,7 @@
 #include <kmenubar.h>
 #include <klocale.h>
 #include <kconfig.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kdialogbase.h>
 #include <tdeversion.h>
 #include <kkeydialog.h>
@@ -87,25 +87,25 @@
 #include <ktabwidget.h>
 #include <ktip.h>
 #include <kmimetype.h>
-#include <kparts/partmanager.h>
-#include <kparts/part.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/part.h>
 #include <kstringhandler.h>
 #include <kstdguiitem.h>
 #include <kurldrag.h>
 
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/encodinginterface.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/printinterface.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/dynwordwrapinterface.h>
-#include <ktexteditor/encodinginterface.h>
-#include <ktexteditor/undointerface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/clipboardinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/printinterface.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/dynwordwrapinterface.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdetexteditor/undointerface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/clipboardinterface.h>
 
 #include <kio/netaccess.h>
 
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index 7140b51a..abba6444 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -40,10 +40,10 @@
 // include files for KDE
 #include <tdeversion.h>
 #include <kdockwidget.h>
-#include <kparts/browserextension.h>
-#include <kparts/dockmainwindow.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/dockmainwindow.h>
 
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 
 //app includes
 #include "dcopwindowmanagerif.h"
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 974dbc92..77883967 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -45,7 +45,7 @@
 #include <kmenubar.h>
 #include <klocale.h>
 #include <kconfig.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kaction.h>
@@ -56,8 +56,8 @@
 #include <ktip.h>
 #include <kio/netaccess.h>
 #include <ktabwidget.h>
-#include <kmultitabbar.h>
-#include <ktexteditor/view.h>
+#include <tdemultitabbar.h>
+#include <tdetexteditor/view.h>
 
 #include "wkafkapart.h"
 #include "kafkacommon.h"
@@ -248,7 +248,7 @@ void QuantaInit::initQuanta()
           break;
        }
   }
-  KActionMenu *toolviewMenu = (KActionMenu*)(m_quanta->actionCollection()->action("kmdi_toolview_menu"));
+  KActionMenu *toolviewMenu = (KActionMenu*)(m_quanta->actionCollection()->action("tdemdi_toolview_menu"));
   if (toolviewMenu)
      toolviewMenu->plug(m_quanta->windowMenu());
 
diff --git a/quanta/src/quanta_init.h b/quanta/src/quanta_init.h
index 5ca93826..06e4cf07 100644
--- a/quanta/src/quanta_init.h
+++ b/quanta/src/quanta_init.h
@@ -23,7 +23,7 @@
 #include <tqobject.h>
 
 // include files for KDE
-#include <kparts/dockmainwindow.h>
+#include <tdeparts/dockmainwindow.h>
 
 //app includes
 
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index a0f9e177..6a05a444 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -37,21 +37,21 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-#include <ktexteditor/view.h>
-#include <ktexteditor/configinterface.h>
-#include <ktexteditor/highlightinginterface.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/undointerface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/clipboardinterface.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/encodinginterface.h>
-#include <ktexteditor/dynwordwrapinterface.h>
-#include <ktexteditor/editorchooser.h>
-#include <ktexteditor/editinterface.h>
-
-#include <kparts/componentfactory.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/configinterface.h>
+#include <tdetexteditor/highlightinginterface.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/undointerface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/clipboardinterface.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdetexteditor/dynwordwrapinterface.h>
+#include <tdetexteditor/editorchooser.h>
+#include <tdetexteditor/editinterface.h>
+
+#include <tdeparts/componentfactory.h>
 
 #include <klibloader.h>
 #include <ktrader.h>
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index d6f771bf..5e939222 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -35,7 +35,7 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kmenubar.h>
@@ -43,18 +43,18 @@
 #include <kmessagebox.h>
 #include <kurldrag.h>
 #include <tdeversion.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 #include <kstatusbar.h>
 
 #include "undoredo.h"
 #include "kafkacommon.h"
 #include "wkafkapart.h"
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/selectioninterfaceext.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/selectioninterfaceext.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 // application specific includes
 #include "document.h"
diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h
index ebca2705..1f59de19 100644
--- a/quanta/src/quantaview.h
+++ b/quanta/src/quantaview.h
@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 
 //kde includes
-#include <kmdichildview.h>
+#include <tdemdichildview.h>
 
 #include <dom/dom_node.h>
 
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 9446daf6..644e50a7 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -19,15 +19,15 @@
 #include <kdirwatch.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 #include <kurl.h>
 #include <kpopupmenu.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/encodinginterface.h>
-#include <ktexteditor/highlightinginterface.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/editorchooser.h>
-#include <ktexteditor/markinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdetexteditor/highlightinginterface.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/editorchooser.h>
+#include <tdetexteditor/markinterface.h>
 #include <kio/netaccess.h>
 
 
-- 
cgit v1.2.3