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

---
 kate/app/CMakeLists.txt             |  2 +-
 kate/app/kateconfigdialog.h         |  2 +-
 kate/app/kateconsole.cpp            |  2 +-
 kate/app/katedocmanager.cpp         |  4 ++--
 kate/app/katemainwindow.cpp         |  4 ++--
 kate/app/katemainwindow.h           |  2 +-
 kate/app/katemdi.h                  |  4 ++--
 kate/app/katesavemodifieddialog.cpp |  2 +-
 kate/app/kateviewmanager.cpp        |  2 +-
 kate/app/kateviewspacecontainer.cpp |  4 ++--
 kate/app/kwritemain.cpp             | 18 +++++++++---------
 kate/app/kwritemain.h               |  6 +++---
 12 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'kate/app')

diff --git a/kate/app/CMakeLists.txt b/kate/app/CMakeLists.txt
index 8c2d1515f..7adea8ea3 100644
--- a/kate/app/CMakeLists.txt
+++ b/kate/app/CMakeLists.txt
@@ -46,7 +46,7 @@ tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
   EMBED kateinterfacesprivate-static
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/kate/app/kateconfigdialog.h b/kate/app/kateconfigdialog.h
index b80be2354..8704753ab 100644
--- a/kate/app/kateconfigdialog.h
+++ b/kate/app/kateconfigdialog.h
@@ -27,7 +27,7 @@
 #include "../interfaces/pluginconfiginterfaceextension.h"
 
 #include <kate/document.h>
-#include <ktexteditor/configinterfaceextension.h>
+#include <tdetexteditor/configinterfaceextension.h>
 
 #include <kdialogbase.h>
 
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index 6ff64dc93..26627181a 100644
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@@ -31,7 +31,7 @@
 
 #include <kde_terminal_interface.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <kurl.h>
 #include <klibloader.h>
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index 8e895e019..9b9a223d0 100644
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@@ -28,9 +28,9 @@
 
 #include <kate/view.h>
 
-#include <ktexteditor/encodinginterface.h>
+#include <tdetexteditor/encodinginterface.h>
 
-#include <kparts/factory.h>
+#include <tdeparts/factory.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index e0967695e..953a5f313 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -73,7 +73,7 @@
 #include <kurldrag.h>
 #include <kdesktopfile.h>
 #include <khelpmenu.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 #include <ktip.h>
 #include <kmenubar.h>
 #include <kstringhandler.h>
@@ -209,7 +209,7 @@ void KateMainWindow::setupMainWindow ()
 
   m_viewManager = new KateViewManager (this);
 
-  KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("kmultiple"), i18n("Documents"));
+  KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("tdemultiple"), i18n("Documents"));
   filelist = new KateFileList (this, m_viewManager, ft, "filelist");
   filelist->readConfig(KateApp::self()->config(), "Filelist");
 
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index f6b20dfa5..ac31671db 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -27,7 +27,7 @@
 #include <kate/view.h>
 #include <kate/document.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <kaction.h>
 
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index e4649e7f4..148d57ea9 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -21,9 +21,9 @@
 #ifndef __KATE_MDI_H__
 #define __KATE_MDI_H__
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 #include <kxmlguiclient.h>
 #include <kaction.h>
 
diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp
index 8d1c49753..2f0fe3aa5 100644
--- a/kate/app/katesavemodifieddialog.cpp
+++ b/kate/app/katesavemodifieddialog.cpp
@@ -32,7 +32,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kencodingfiledialog.h>
-#include <ktexteditor/encodinginterface.h>
+#include <tdetexteditor/encodinginterface.h>
 
 class AbstractKateSaveModifiedDialogCheckListItem:public TQCheckListItem {
 public:
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 296c083b2..0e7e15cb5 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -45,7 +45,7 @@
 #include <kglobalsettings.h>
 #include <kstdaccel.h>
 
-#include <ktexteditor/encodinginterface.h>
+#include <tdetexteditor/encodinginterface.h>
 
 #include <tqobjectlist.h>
 #include <tqstringlist.h>
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index d68c42724..059178746 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -46,7 +46,7 @@
 #include <kglobalsettings.h>
 #include <kstringhandler.h>
 
-#include <ktexteditor/encodinginterface.h>
+#include <tdetexteditor/encodinginterface.h>
 
 #include <tqlayout.h>
 #include <tqobjectlist.h>
@@ -120,7 +120,7 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc )
   view->actionCollection()->remove (view->actionCollection()->action( "set_confdlg" ));
 
   // popup menu
-  view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("ktexteditor_popup", mainWindow())) );
+  view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("tdetexteditor_popup", mainWindow())) );
 
   connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg()));
   connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg()));
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 114cfb6a4..6fca303bb 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -24,13 +24,13 @@
 #include <kate/document.h>
 #include <kate/view.h>
 
-#include <ktexteditor/configinterface.h>
-#include <ktexteditor/sessionconfiginterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/printinterface.h>
-#include <ktexteditor/encodinginterface.h>
-#include <ktexteditor/editorchooser.h>
-#include <ktexteditor/popupmenuinterface.h>
+#include <tdetexteditor/configinterface.h>
+#include <tdetexteditor/sessionconfiginterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/printinterface.h>
+#include <tdetexteditor/encodinginterface.h>
+#include <tdetexteditor/editorchooser.h>
+#include <tdetexteditor/popupmenuinterface.h>
 
 #include <kio/netaccess.h>
 
@@ -54,7 +54,7 @@
 #include <kmessagebox.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
-#include <kparts/event.h>
+#include <tdeparts/event.h>
 #include <kmenubar.h>
 
 #include <tqdropsite.h>
@@ -108,7 +108,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
 
   // install a working kate part popup dialog thingy
   if (static_cast<Kate::View*>(m_view->tqt_cast("Kate::View")))
-    static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
+    static_cast<Kate::View*>(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("tdetexteditor_popup", this)) );
 
   // init with more usefull size, stolen from konq :)
   if (!initialGeometrySet())
diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h
index 0d0ee79f0..52e34c568 100644
--- a/kate/app/kwritemain.h
+++ b/kate/app/kwritemain.h
@@ -21,10 +21,10 @@
 #ifndef __KWRITE_MAIN_H__
 #define __KWRITE_MAIN_H__
 
-#include <ktexteditor/view.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/document.h>
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 #include <kdialogbase.h>
 
-- 
cgit v1.2.1