From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:16:20 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kate/AUTHORS | 2 +- kate/ChangeLog | 10 +++++----- 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 +++--- kate/data/kateui.rc | 2 +- kate/data/kwriteui.rc | 2 +- kate/interfaces/Makefile.am | 2 +- kate/interfaces/plugin.cpp | 2 +- kate/interfaces/plugin.h | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) (limited to 'kate') diff --git a/kate/AUTHORS b/kate/AUTHORS index e8e6716c2..c2e6cb35e 100644 --- a/kate/AUTHORS +++ b/kate/AUTHORS @@ -27,7 +27,7 @@ Kate/KWrite Team: (original author of kwrite in kde 1.x until kde 2.1) - Glen Parker - (undo history, kspell-integration) + (undo history, tdespell-integration) - Michael Koch (port to KParts) diff --git a/kate/ChangeLog b/kate/ChangeLog index e97ab3515..f971110c8 100644 --- a/kate/ChangeLog +++ b/kate/ChangeLog @@ -1,18 +1,18 @@ 2004-04-22 Christoph Cullmann - * kate switched over to katemdi, even smaller replacement for kmdi2 :) + * kate switched over to katemdi, even smaller replacement for tdemdi2 :) 2004-10-06 Christoph Cullmann - * kate switched over to kmdi2, a slim version of old kmdi + * kate switched over to tdemdi2, a slim version of old tdemdi which allows only IDEA mode, but should be much less buggy - beside this, we now allow tabbing thx to the new kmdi stuff + beside this, we now allow tabbing thx to the new tdemdi stuff and therefor should now be really feature complete at least mdi wise, having the features to allow multiple main windows, tabbing, splitters, widget stacks for the views, now only missing thingy - would be to allow non kate view's to be embeded, like a khtml widget for + would be to allow non kate view's to be embeded, like a tdehtml widget for documentation browsing or something like that 2003-08-28 Christoph Cullmann - * jowenn switch kate over to use kmdi, seems to work well + * jowenn switch kate over to use tdemdi, seems to work well for the first port, but still needs some fixes ;) 2002-07-19 Christoph Cullmann 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 -#include +#include #include 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 -#include +#include #include #include 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 -#include +#include -#include +#include #include #include 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 #include #include -#include +#include #include #include #include @@ -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 #include -#include +#include #include 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 +#include -#include +#include #include #include 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 #include #include -#include +#include 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 #include -#include +#include #include #include 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 #include -#include +#include #include #include @@ -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 #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include @@ -108,7 +108,7 @@ KWrite::KWrite (KTextEditor::Document *doc) // install a working kate part popup dialog thingy if (static_cast(m_view->tqt_cast("Kate::View"))) - static_cast(m_view->tqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) ); + static_cast(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 -#include +#include +#include -#include +#include #include diff --git a/kate/data/kateui.rc b/kate/data/kateui.rc index 6e784e92e..5368c26c4 100644 --- a/kate/data/kateui.rc +++ b/kate/data/kateui.rc @@ -135,7 +135,7 @@ - + diff --git a/kate/data/kwriteui.rc b/kate/data/kwriteui.rc index 7272cb4fa..9a41f43d1 100644 --- a/kate/data/kwriteui.rc +++ b/kate/data/kwriteui.rc @@ -88,7 +88,7 @@ - + diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am index a832c7515..96bef52db 100644 --- a/kate/interfaces/Makefile.am +++ b/kate/interfaces/Makefile.am @@ -6,7 +6,7 @@ libkateinterfacesprivate_la_SOURCES = application.cpp mainwindow.cpp documentman pluginmanager.cpp plugin.cpp pluginconfiginterface.cpp pluginconfiginterfaceextension.cpp libkateinterfacesprivate_la_LIBADD = -lkatepartinterfaces -libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkateinterfacesprivate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kateinclude_HEADERS = application.h documentmanager.h mainwindow.h plugin.h viewmanager.h pluginconfiginterface.h pluginconfiginterfaceextension.h toolviewmanager.h pluginmanager.h kateincludedir = $(includedir)/kate diff --git a/kate/interfaces/plugin.cpp b/kate/interfaces/plugin.cpp index b57d4bac0..d68724549 100644 --- a/kate/interfaces/plugin.cpp +++ b/kate/interfaces/plugin.cpp @@ -21,7 +21,7 @@ #include "plugin.h" #include "plugin.moc" -#include +#include namespace Kate { diff --git a/kate/interfaces/plugin.h b/kate/interfaces/plugin.h index 42803db7c..00932c5ff 100644 --- a/kate/interfaces/plugin.h +++ b/kate/interfaces/plugin.h @@ -56,7 +56,7 @@ KDE_EXPORT Plugin *createPlugin ( const char* libname, Application *application /* * view plugin class - * this plugin will be bound to a ktexteditor::view + * this plugin will be bound to a tdetexteditor::view */ class KDE_EXPORT PluginViewInterface { -- cgit v1.2.1