From a99deb96da2f73578f5533db4c0b7292502c16bc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:09:09 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- ChangeLog | 2 +- acinclude.m4 | 26 +++++++++++++------------- src/kile.kdevprj | 6 +++--- src/kile/CMakeLists.txt | 2 +- src/kile/Makefile.am | 6 +++--- src/kile/codecompletion.cpp | 2 +- src/kile/codecompletion.h | 2 +- src/kile/configcodecompletion.cpp | 2 +- src/kile/docpart.cpp | 6 +++--- src/kile/docpart.h | 2 +- src/kile/kile.cpp | 6 +++--- src/kile/kile.h | 6 +++--- src/kile/kileconfigdialog.h | 2 +- src/kile/kileedit.cpp | 4 ++-- src/kile/kilejscript.cpp | 6 +++--- src/kile/kilekonsolewidget.cpp | 2 +- src/kile/kilelauncher.cpp | 6 +++--- src/kile/kilemultitabbar_p.h | 2 +- src/kile/kilestructurewidget.cpp | 2 +- src/kile/kiletoolmanager.cpp | 2 +- src/kile/kileui.rc | 2 +- src/kile/kileviewmanager.cpp | 8 ++++---- 22 files changed, 52 insertions(+), 52 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc4f8c6..a7e2f52 100644 --- a/ChangeLog +++ b/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 diff --git a/acinclude.m4 b/acinclude.m4 index 88429c2..4196c68 100644 --- a/acinclude.m4 +++ b/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) diff --git a/src/kile.kdevprj b/src/kile.kdevprj index b88255b..60ef08e 100644 --- a/src/kile.kdevprj +++ b/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= diff --git a/src/kile/CMakeLists.txt b/src/kile/CMakeLists.txt index 876bd7b..0a91528 100644 --- a/src/kile/CMakeLists.txt +++ b/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 ) diff --git a/src/kile/Makefile.am b/src/kile/Makefile.am index ed25556..5257fff 100644 --- a/src/kile/Makefile.am +++ b/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 diff --git a/src/kile/codecompletion.cpp b/src/kile/codecompletion.cpp index 9ba197c..77394cb 100644 --- a/src/kile/codecompletion.cpp +++ b/src/kile/codecompletion.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "kileinfo.h" #include "kileviewmanager.h" diff --git a/src/kile/codecompletion.h b/src/kile/codecompletion.h index 6ff53b7..c253af6 100644 --- a/src/kile/codecompletion.h +++ b/src/kile/codecompletion.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "latexcmd.h" diff --git a/src/kile/configcodecompletion.cpp b/src/kile/configcodecompletion.cpp index 4e53699..4aa5969 100644 --- a/src/kile/configcodecompletion.cpp +++ b/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 //////////////////// diff --git a/src/kile/docpart.cpp b/src/kile/docpart.cpp index 3e08376..b95fe23 100644 --- a/src/kile/docpart.cpp +++ b/src/kile/docpart.cpp @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include 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); diff --git a/src/kile/docpart.h b/src/kile/docpart.h index 0a8b0f0..ad0a190 100644 --- a/src/kile/docpart.h +++ b/src/kile/docpart.h @@ -16,7 +16,7 @@ #ifndef DOCPART_H #define DOCPART_H -#include +#include #include class DocumentationViewer : public KHTMLPart diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp index 3221ec0..57394e6 100644 --- a/src/kile/kile.cpp +++ b/src/kile/kile.cpp @@ -35,10 +35,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #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() diff --git a/src/kile/kile.h b/src/kile/kile.h index 8070fd7..69b07de 100644 --- a/src/kile/kile.h +++ b/src/kile/kile.h @@ -20,9 +20,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/kile/kileconfigdialog.h b/src/kile/kileconfigdialog.h index e947686..e09e6c2 100644 --- a/src/kile/kileconfigdialog.h +++ b/src/kile/kileconfigdialog.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "configcodecompletion.h" // code completion (dani) diff --git a/src/kile/kileedit.cpp b/src/kile/kileedit.cpp index e018ec3..b03effd 100644 --- a/src/kile/kileedit.cpp +++ b/src/kile/kileedit.cpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/kile/kilejscript.cpp b/src/kile/kilejscript.cpp index 7f5a78b..d96233a 100644 --- a/src/kile/kilejscript.cpp +++ b/src/kile/kilejscript.cpp @@ -42,7 +42,7 @@ #include "kileviewmanager.h" #include "editorkeysequencemanager.h" -// Modified declaration from +// Modified declaration from // 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 +// Modified implementation originating from // 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 +// Taken from // Acknowledgements go to: // Copyright (C) 1999-2003 Harri Porten (porten@kde.org) // Copyright (C) 2001-2003 David Faure (faure@kde.org) diff --git a/src/kile/kilekonsolewidget.cpp b/src/kile/kilekonsolewidget.cpp index ddf713a..5a5ccee 100644 --- a/src/kile/kilekonsolewidget.cpp +++ b/src/kile/kilekonsolewidget.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/kile/kilelauncher.cpp b/src/kile/kilelauncher.cpp index cb0ca57..eb437cd 100644 --- a/src/kile/kilelauncher.cpp +++ b/src/kile/kilelauncher.cpp @@ -32,9 +32,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include namespace KileTool { diff --git a/src/kile/kilemultitabbar_p.h b/src/kile/kilemultitabbar_p.h index fafe835..4927694 100644 --- a/src/kile/kilemultitabbar_p.h +++ b/src/kile/kilemultitabbar_p.h @@ -27,7 +27,7 @@ #ifndef KILE_MULTI_TAB_BAR_P_H #define KILE_MULTI_TAB_BAR_P_H #include -#include +#include class KileMultiTabBarInternal: public TQScrollView { diff --git a/src/kile/kilestructurewidget.cpp b/src/kile/kilestructurewidget.cpp index 4f923b4..988b002 100644 --- a/src/kile/kilestructurewidget.cpp +++ b/src/kile/kilestructurewidget.cpp @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include "kileinfo.h" #include "kiledocmanager.h" diff --git a/src/kile/kiletoolmanager.cpp b/src/kile/kiletoolmanager.cpp index 7e74818..9eae871 100644 --- a/src/kile/kiletoolmanager.cpp +++ b/src/kile/kiletoolmanager.cpp @@ -29,7 +29,7 @@ #include #include "kiledebug.h" #include -#include +#include #include #include #include diff --git a/src/kile/kileui.rc b/src/kile/kileui.rc index 13a3682..80449ec 100644 --- a/src/kile/kileui.rc +++ b/src/kile/kileui.rc @@ -1,6 +1,6 @@ - + diff --git a/src/kile/kileviewmanager.cpp b/src/kile/kileviewmanager.cpp index fd924fe..98d3219 100644 --- a/src/kile/kileviewmanager.cpp +++ b/src/kile/kileviewmanager.cpp @@ -27,13 +27,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include @@ -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;