Rename a number of libraries and executables to avoid conflicts with KDE4

ChangeLog

@@ -299,7 +299,7 @@ version 1.4 -> 1.5 :
 - added the ability to show the line numbers and to choose the colors for the editor
 
 version 1.32 -> 1.4 :
-- added dvi and postcript embedded viewers (based on kdvi and kghostview kparts)
+- added dvi and postcript embedded viewers (based on kdvi and kghostview tdeparts)
 - spell checking is now possible for the selected paragraphs and not only for all the document
 - overwrite an existing file must now be confirmed
 - the bug about the "report" document class in the "quick document dialog" has been fixed

acinclude.m4

@@ -2095,16 +2095,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2112,13 +2112,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2564,7 +2564,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3508,7 +3508,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 

src/kile.kdevprj

@@ -195,7 +195,7 @@ install_location=
 type=DATA
 
 [kile/Makefile.am]
-files=kile/main.cpp,kile/kile.cpp,kile/kile.h,kile/arraydialog.cpp,kile/arraydialog.h,kile/docpart.cpp,kile/docpart.h,kile/filechooser.cpp,kile/filechooser.h,kile/kile16x16.png,kile/kile32x32.png,kile/kile48x48.png,kile/kileappIface.h,kile/kileappIface_skel.cpp,kile/kileapplication.cpp,kile/kileapplication.h,kile/kile.desktop,kile/kilefileselect.cpp,kile/kilefileselect.h,kile/kileiconview.cpp,kile/kileiconview.h,kile/kileui.rc,kile/kmultiverttabbar.cpp,kile/kmultiverttabbar.h,kile/l2hdialog.cpp,kile/l2hdialog.h,kile/letterdialog.cpp,kile/letterdialog.h,kile/messagewidget.cpp,kile/messagewidget.h,kile/quickdocumentdialog.cpp,kile/quickdocumentdialog.h,kile/structdialog.cpp,kile/structdialog.h,kile/symbolview.cpp,kile/symbolview.h,kile/tabbingdialog.cpp,kile/tabbingdialog.h,kile/tabdialog.cpp,kile/tabdialog.h,kile/texkonsolewidget.cpp,kile/texkonsolewidget.h,kile/toolsoptionsdialog.cpp,kile/toolsoptionsdialog.h,kile/usermenudialog.cpp,kile/usermenudialog.h,kile/addoptiondialog.cpp,kile/addoptiondialog.h,kile/refdialog.cpp,kile/refdialog.h,kile/kile22x22.png,kile/metapostview.cpp,kile/metapostview.h,kile/commandprocess.cpp,kile/commandprocess.h,kile/newfilewizard.cpp,kile/newfilewizard.h,kile/templates.cpp,kile/templates.h,kile/kile,kile/managetemplatesdialog.cpp,kile/managetemplatesdialog.h
+files=kile/main.cpp,kile/kile.cpp,kile/kile.h,kile/arraydialog.cpp,kile/arraydialog.h,kile/docpart.cpp,kile/docpart.h,kile/filechooser.cpp,kile/filechooser.h,kile/kile16x16.png,kile/kile32x32.png,kile/kile48x48.png,kile/kileappIface.h,kile/kileappIface_skel.cpp,kile/kileapplication.cpp,kile/kileapplication.h,kile/kile.desktop,kile/kilefileselect.cpp,kile/kilefileselect.h,kile/kileiconview.cpp,kile/kileiconview.h,kile/kileui.rc,kile/tdemultiverttabbar.cpp,kile/tdemultiverttabbar.h,kile/l2hdialog.cpp,kile/l2hdialog.h,kile/letterdialog.cpp,kile/letterdialog.h,kile/messagewidget.cpp,kile/messagewidget.h,kile/quickdocumentdialog.cpp,kile/quickdocumentdialog.h,kile/structdialog.cpp,kile/structdialog.h,kile/symbolview.cpp,kile/symbolview.h,kile/tabbingdialog.cpp,kile/tabbingdialog.h,kile/tabdialog.cpp,kile/tabdialog.h,kile/texkonsolewidget.cpp,kile/texkonsolewidget.h,kile/toolsoptionsdialog.cpp,kile/toolsoptionsdialog.h,kile/usermenudialog.cpp,kile/usermenudialog.h,kile/addoptiondialog.cpp,kile/addoptiondialog.h,kile/refdialog.cpp,kile/refdialog.h,kile/kile22x22.png,kile/metapostview.cpp,kile/metapostview.h,kile/commandprocess.cpp,kile/commandprocess.h,kile/newfilewizard.cpp,kile/newfilewizard.h,kile/templates.cpp,kile/templates.h,kile/kile,kile/managetemplatesdialog.cpp,kile/managetemplatesdialog.h
 sub_dirs=pics,symbols,gfe,templates
 type=prog_main
 
@@ -968,13 +968,13 @@ install=true
 install_location=$$(kde_datadir)/kile/kileui.rc
 type=DATA
 
-[kile/kmultiverttabbar.cpp]
+[kile/tdemultiverttabbar.cpp]
 dist=true
 install=false
 install_location=
 type=SOURCE
 
-[kile/kmultiverttabbar.h]
+[kile/tdemultiverttabbar.h]
 dist=true
 install=false
 install_location=

src/kile/CMakeLists.txt

@@ -148,7 +148,7 @@ KDE3_ADD_KCFG_FILES(kile_SRCS ${kile_KCFG_SRCS})
 
 KDE3_ADD_EXECUTABLE(kile ${kile_SRCS})
 
-TARGET_LINK_LIBRARIES(kile ${QT_AND_TDECORE_LIBS} kjs tdeprint ktexteditor katepartinterfaces khtml )
+TARGET_LINK_LIBRARIES(kile ${QT_AND_TDECORE_LIBS} kjs tdeprint tdetexteditor katepartinterfaces tdehtml )
 
 INSTALL( TARGETS kile DESTINATION bin )
 

src/kile/Makefile.am

@@ -29,12 +29,12 @@ kile_SOURCES = latexcmd.cpp latexcmddialog.cpp texdocdialog.cpp userhelp.cpp \
 	kileversion.cpp graphicsconfigwidget.ui kilemultitabbar.cpp newdocumentwidget.ui\
 	symbolviewconfig.ui
 
-kile_LDADD   = -lkjs -ltdeprint -lktexteditor -lkatepartinterfaces $(LIB_KSPELL) $(LIB_KHTML) 
+kile_LDADD   = -lkjs -ltdeprint -ltdetexteditor -lkatepartinterfaces $(LIB_KSPELL) $(LIB_KHTML) 
 
 SUBDIRS = icons pics symbols templates syntax complete help encodings test
 
 EXTRA_DIST = main.cpp kile.cpp kile.h \
-	docpart.cpp docpart.h kileappIface.h kileapplication.cpp kileapplication.h kile.desktop kilefileselect.cpp 	kilefileselect.h kileui.rc docpartui.rc kmultiverttabbar.cpp kmultiverttabbar.h letterdialog.cpp letterdialog.h quickdocumentdialog.cpp quickdocumentdialog.h symbolview.cpp symbolview.h tabbingdialog.cpp tabbingdialog.h \
+	docpart.cpp docpart.h kileappIface.h kileapplication.cpp kileapplication.h kile.desktop kilefileselect.cpp 	kilefileselect.h kileui.rc docpartui.rc tdemultiverttabbar.cpp tdemultiverttabbar.h letterdialog.cpp letterdialog.h quickdocumentdialog.cpp quickdocumentdialog.h symbolview.cpp symbolview.h tabbingdialog.cpp tabbingdialog.h \
 	kileconfigdialog.cpp kileconfigdialog.h usermenudialog.cpp \
 	usermenudialog.h kileabbrevview.cpp kileabbrevview.h \
 	newfilewizard.cpp newfilewizard.h templates.cpp templates.h managetemplatesdialog.cpp \
@@ -81,7 +81,7 @@ INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-kile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+kile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
 
 rcdir = $(kde_datadir)/kile
 rc_DATA = kileui.rc docpartui.rc kilestdtools.rc tips

src/kile/codecompletion.cpp

@@ -27,7 +27,7 @@
 #include <kstandarddirs.h>
 #include <kconfig.h>
 #include <kmessagebox.h>
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 #include "kileinfo.h"
 #include "kileviewmanager.h"

src/kile/codecompletion.h

@@ -21,7 +21,7 @@
 
 #include <kate/view.h>
 #include <kate/document.h>
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 #include <kconfig.h>
 
 #include "latexcmd.h"

src/kile/configcodecompletion.cpp

@@ -268,7 +268,7 @@ void ConfigCodeCompletion::writeConfig(void)
 bool ConfigCodeCompletion::kateCompletionPlugin()
 {
 	m_config->setGroup("Kate Document Defaults");
-	return m_config->readBoolEntry("KTextEditor Plugin ktexteditor_docwordcompletion",false);
+	return m_config->readBoolEntry("KTextEditor Plugin tdetexteditor_docwordcompletion",false);
 }
 
 //////////////////// listview ////////////////////

src/kile/docpart.cpp

@@ -24,8 +24,8 @@
 #include <kmimetype.h>
 #include <ktrader.h>
 #include <krun.h>
-#include <khtml_part.h>
-#include <khtml_settings.h>
+#include <tdehtml_part.h>
+#include <tdehtml_settings.h>
 
 DocumentationViewer::DocumentationViewer(TQWidget *parent, const char *name ) : KHTMLPart(parent,name, 0, 0, BrowserViewGUI)
 {
@@ -49,7 +49,7 @@ void DocumentationViewer::urlSelected(const TQString &url, int button, int state
 	TQString mime = KMimeType::findByURL(cURL).data()->name();
 
 	//load this URL in the embedded viewer if KHTML can handle it, or when mimetype detection failed
-	KService::Ptr service = KService::serviceByDesktopName("khtml");
+	KService::Ptr service = KService::serviceByDesktopName("tdehtml");
 	if ( ( mime == KMimeType::defaultMimeType() ) || (service && service->hasServiceType(mime)) )
 	{
 		KHTMLPart::urlSelected(url, button, state, target, args);

src/kile/docpart.h

@@ -16,7 +16,7 @@
 #ifndef DOCPART_H
 #define DOCPART_H
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <tqstringlist.h>
 
 class DocumentationViewer : public KHTMLPart

src/kile/kile.cpp

@@ -35,10 +35,10 @@
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kstandarddirs.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 #include <ktabwidget.h>
 #include <ktip.h>
-#include <ktexteditor/configinterface.h>
+#include <tdetexteditor/configinterface.h>
 #include <dcopclient.h>
 
 #include "kileapplication.h"
@@ -2082,7 +2082,7 @@ void Kile::generalOptions()
 bool Kile::kateCompletionPlugin()
 {
 	m_config->setGroup("Kate Document Defaults");
-	return m_config->readBoolEntry("KTextEditor Plugin ktexteditor_docwordcompletion",false);
+	return m_config->readBoolEntry("KTextEditor Plugin tdetexteditor_docwordcompletion",false);
 }
 
 void Kile::checkKateSettings()

src/kile/kile.h

@@ -20,9 +20,9 @@
 #include <kate/view.h>
 #include <kate/document.h>
 #include <dcopobject.h>
-#include <kparts/mainwindow.h>
-#include <kparts/partmanager.h>
-#include <kparts/part.h>
+#include <tdeparts/mainwindow.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/part.h>
 
 #include <tqsplitter.h>
 #include <tqwidget.h>

src/kile/kileconfigdialog.h

@@ -19,7 +19,7 @@
 #include <kdialogbase.h>
 #include <tdeversion.h>
 
-#include <ktexteditor/configinterfaceextension.h>
+#include <tdetexteditor/configinterfaceextension.h>
 #include <kconfigdialogmanager.h>
 
 #include "configcodecompletion.h"     // code completion (dani)

src/kile/kileedit.cpp

@@ -23,8 +23,8 @@
 
 #include <kate/view.h>
 #include <kate/document.h>
-#include <ktexteditor/searchinterface.h>
-#include <ktexteditor/editinterfaceext.h>
+#include <tdetexteditor/searchinterface.h>
+#include <tdetexteditor/editinterfaceext.h>
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>

src/kile/kilejscript.cpp

@@ -42,7 +42,7 @@
 #include "kileviewmanager.h"
 #include "editorkeysequencemanager.h"
 
-// Modified declaration from <khtml/ecma/kjs_proxy.h>
+// Modified declaration from <tdehtml/ecma/kjs_proxy.h>
 // Acknowledgements go to:
 //  Copyright (C) 1999 Harri Porten (porten@kde.org)
 //  Copyright (C) 2001 Peter Kelly (pmk@post.com)
@@ -58,7 +58,7 @@ private:
   itimerval oldtv;
 };
 
-// Modified implementation originating from <khtml/ecma/kjs_proxy.cpp>
+// Modified implementation originating from <tdehtml/ecma/kjs_proxy.cpp>
 // Acknowledgements go to:
 // Copyright (C) 1999-2001 Harri Porten (porten@kde.org)
 // Copyright (C) 2001,2003 Peter Kelly (pmk@post.com)
@@ -85,7 +85,7 @@ void KJSCPUGuard::alarmHandler(int) {
 
 
 namespace KJS {
-// Taken from <khtml/ecma/kjs_binding.cpp>
+// Taken from <tdehtml/ecma/kjs_binding.cpp>
 // Acknowledgements go to:
 // Copyright (C) 1999-2003 Harri Porten (porten@kde.org)
 // Copyright (C) 2001-2003 David Faure (faure@kde.org)

src/kile/kilekonsolewidget.cpp

@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <klibloader.h>
 #include <kurl.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kate/document.h>
 #include <kate/view.h>
 

src/kile/kilelauncher.cpp

@@ -32,9 +32,9 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/partmanager.h>
 
  namespace KileTool
 {

src/kile/kilemultitabbar_p.h

@@ -27,7 +27,7 @@
 #ifndef KILE_MULTI_TAB_BAR_P_H
 #define KILE_MULTI_TAB_BAR_P_H
 #include <tqscrollview.h>
-#include <kmultitabbar.h>
+#include <tdemultitabbar.h>
 
 class KileMultiTabBarInternal: public TQScrollView
 {

src/kile/kilestructurewidget.cpp

@@ -72,7 +72,7 @@
 #include <kurl.h>
 #include <krun.h>
 #include <kmimetype.h>
-#include <ktexteditor/markinterface.h>
+#include <tdetexteditor/markinterface.h>
 
 #include "kileinfo.h"
 #include "kiledocmanager.h"

src/kile/kiletoolmanager.cpp

@@ -29,7 +29,7 @@
 #include <kconfig.h>
 #include "kiledebug.h"
 #include <klocale.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/partmanager.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <ksimpleconfig.h>

src/kile/kileui.rc

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <kpartgui name="kile" version="30">
-<Menu name="ktexteditor_popup" noMerge="1">
+<Menu name="tdetexteditor_popup" noMerge="1">
 	<DefineGroup name="popup_operations" />
 	<Action name="popup_pasteaslatex"/>
 	<Action name="popup_converttolatex"/>

src/kile/kileviewmanager.cpp

@@ -27,13 +27,13 @@
 #include <kglobal.h>
 #include <kate/view.h>
 #include <kate/document.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <klocale.h>
-#include <ktexteditor/editinterfaceext.h>
+#include <tdetexteditor/editinterfaceext.h>
 #include <kapplication.h>
 #include <kurldrag.h>
 
@@ -153,7 +153,7 @@ Kate::View* Manager::createTextView(KileDocument::TextInfo *info, int index)
 	connect( view, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), m_ki->editorExtension()->complete(),  TQT_SLOT(slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) );
 
 	// install a working kate part popup dialog thingy
-	TQPopupMenu *viewPopupMenu = (TQPopupMenu*)(m_client->factory()->container("ktexteditor_popup", m_client));
+	TQPopupMenu *viewPopupMenu = (TQPopupMenu*)(m_client->factory()->container("tdetexteditor_popup", m_client));
 	if((NULL != view) && (NULL != viewPopupMenu))
 		view->installPopup(viewPopupMenu);
 	if(NULL != viewPopupMenu)
@@ -330,7 +330,7 @@ void Manager::onKatePopupMenuRequest(void)
 	if(NULL == view)
 		return;
 
-	TQPopupMenu *viewPopupMenu = (TQPopupMenu*)(m_client->factory()->container("ktexteditor_popup", m_client));
+	TQPopupMenu *viewPopupMenu = (TQPopupMenu*)(m_client->factory()->container("tdetexteditor_popup", m_client));
 	if(NULL == viewPopupMenu)
 		return;