From 1552a711beb6286efbd43434d79a7f87b157d883 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:55:09 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- acinclude.m4 | 8 ++++---- konversation/src/Makefile.am | 2 +- konversation/src/alias_preferences.cpp | 2 +- konversation/src/autoreplace_preferences.cpp | 2 +- konversation/src/channellistpanel.cpp | 2 +- konversation/src/config/konversation.kcfg | 4 ++-- konversation/src/config/preferences.cpp | 2 +- konversation/src/config/preferences.h | 2 +- konversation/src/dcctransfer.h | 2 +- konversation/src/dcctransferpanelitem.cpp | 4 ++-- konversation/src/dcctransferpanelitem.h | 2 +- konversation/src/dcctransferrecv.cpp | 8 ++++---- konversation/src/dcctransfersend.cpp | 4 ++-- konversation/src/highlight_preferences.cpp | 2 +- konversation/src/ignore_preferences.cpp | 2 +- konversation/src/ircview.cpp | 4 ++-- konversation/src/konversationapplication.cpp | 2 +- konversation/src/konviconfigdialog.cpp | 4 ++-- konversation/src/linkaddressbook/linkaddressbookui.cpp | 2 +- konversation/src/logfilereader.cpp | 4 ++-- konversation/src/logfilereader.h | 2 +- konversation/src/osd_preferences.cpp | 2 +- konversation/src/outputfilter.cpp | 4 ++-- konversation/src/outputfilter.h | 2 +- konversation/src/quickbuttons_preferences.cpp | 2 +- konversation/src/server.cpp | 2 +- konversation/src/theme_preferences.cpp | 8 ++++---- konversation/src/theme_preferences.h | 2 +- konversation/src/urlcatcher.cpp | 2 +- konversation/src/warnings_preferences.cpp | 2 +- konversation/src/watchednicknames_preferences.cpp | 2 +- 31 files changed, 47 insertions(+), 47 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index f7ddb78..13a4e01 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1803,7 +1803,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2109,7 +2109,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2119,7 +2119,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/konversation/src/Makefile.am b/konversation/src/Makefile.am index aab2be9..c9a0736 100644 --- a/konversation/src/Makefile.am +++ b/konversation/src/Makefile.am @@ -49,7 +49,7 @@ rc_DATA = konversationui.rc eventsrc kdelnk_DATA = konvirc.protocol konvirc6.protocol kdelnkdir = $(kde_servicesdir) -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = konversation.upd update_SCRIPTS = konversation-0.19-colors.pl konversation-0.19-sortorder.pl konversation-0.19-appearance.pl \ konversation-0.19-tabplacement.pl konversation-0.19-custombrowser.pl \ diff --git a/konversation/src/alias_preferences.cpp b/konversation/src/alias_preferences.cpp index e51bb63..3f6289d 100644 --- a/konversation/src/alias_preferences.cpp +++ b/konversation/src/alias_preferences.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/konversation/src/autoreplace_preferences.cpp b/konversation/src/autoreplace_preferences.cpp index 2c870d4..88ed31c 100644 --- a/konversation/src/autoreplace_preferences.cpp +++ b/konversation/src/autoreplace_preferences.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/konversation/src/channellistpanel.cpp b/konversation/src/channellistpanel.cpp index 165a177..1e19f01 100644 --- a/konversation/src/channellistpanel.cpp +++ b/konversation/src/channellistpanel.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/konversation/src/config/konversation.kcfg b/konversation/src/config/konversation.kcfg index 61f171a..03ce962 100644 --- a/konversation/src/config/konversation.kcfg +++ b/konversation/src/config/konversation.kcfg @@ -964,7 +964,7 @@ - + TQValueList< TQValueList<int> > defaultRate; TQValueList< TQValueList<int> >::iterator defaultRateInitIter; @@ -983,7 +983,7 @@ (*defaultRateInitIter).append( 1 ); (*defaultRateInitIter).append( 0 ); - if (0) //kconfig_compiler generates invalid code for int lists + if (0) //tdeconfig_compiler generates invalid code for int lists defaultRate[0] defaultRate[1] diff --git a/konversation/src/config/preferences.cpp b/konversation/src/config/preferences.cpp index 8a2a942..06d1fd8 100644 --- a/konversation/src/config/preferences.cpp +++ b/konversation/src/config/preferences.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/konversation/src/config/preferences.h b/konversation/src/config/preferences.h index b7ae8ed..267c73d 100644 --- a/konversation/src/config/preferences.h +++ b/konversation/src/config/preferences.h @@ -74,7 +74,7 @@ class Preferences : public TQObject, public PreferencesBase /** Returns a list of alias set up by default. This is a set of aliases for the scripts found. */ static TQStringList defaultAliasList(); - //notifylist is in kconfigxt - FIXME + //notifylist is in tdeconfigxt - FIXME static const TQMap notifyList(); static const TQStringList notifyListByGroupName(const TQString& groupName); static const TQString notifyStringByGroupName(const TQString& groupName); diff --git a/konversation/src/dcctransfer.h b/konversation/src/dcctransfer.h index 3da2a55..25385bc 100644 --- a/konversation/src/dcctransfer.h +++ b/konversation/src/dcctransfer.h @@ -23,7 +23,7 @@ #include #include -#include +#include typedef double transferspeed_t; diff --git a/konversation/src/dcctransferpanelitem.cpp b/konversation/src/dcctransferpanelitem.cpp index 9e24fb2..6c2a4b4 100644 --- a/konversation/src/dcctransferpanelitem.cpp +++ b/konversation/src/dcctransferpanelitem.cpp @@ -24,10 +24,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/konversation/src/dcctransferpanelitem.h b/konversation/src/dcctransferpanelitem.h index 7ca27ad..e6a0a63 100644 --- a/konversation/src/dcctransferpanelitem.h +++ b/konversation/src/dcctransferpanelitem.h @@ -22,7 +22,7 @@ #include #include -#include +#include class TQStringList; diff --git a/konversation/src/dcctransferrecv.cpp b/konversation/src/dcctransferrecv.cpp index 8b83de0..d11b0a2 100644 --- a/konversation/src/dcctransferrecv.cpp +++ b/konversation/src/dcctransferrecv.cpp @@ -23,7 +23,7 @@ #include "server.h" #include -#include +#include #include #include #include @@ -33,9 +33,9 @@ #include #include -#include -#include -#include +#include +#include +#include class DccResumeDialog; diff --git a/konversation/src/dcctransfersend.cpp b/konversation/src/dcctransfersend.cpp index 2e4b417..15b45fd 100644 --- a/konversation/src/dcctransfersend.cpp +++ b/konversation/src/dcctransfersend.cpp @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include // TODO: remove the dependence #include diff --git a/konversation/src/highlight_preferences.cpp b/konversation/src/highlight_preferences.cpp index 936ff2d..99a8df8 100644 --- a/konversation/src/highlight_preferences.cpp +++ b/konversation/src/highlight_preferences.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/konversation/src/ignore_preferences.cpp b/konversation/src/ignore_preferences.cpp index 26a5a0a..8c705bc 100644 --- a/konversation/src/ignore_preferences.cpp +++ b/konversation/src/ignore_preferences.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/konversation/src/ircview.cpp b/konversation/src/ircview.cpp index d7b71da..6c010ca 100644 --- a/konversation/src/ircview.cpp +++ b/konversation/src/ircview.cpp @@ -62,8 +62,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/konversation/src/konversationapplication.cpp b/konversation/src/konversationapplication.cpp index 69c7f70..e2529c8 100644 --- a/konversation/src/konversationapplication.cpp +++ b/konversation/src/konversationapplication.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/konversation/src/konviconfigdialog.cpp b/konversation/src/konviconfigdialog.cpp index 4610144..5fee076 100644 --- a/konversation/src/konviconfigdialog.cpp +++ b/konversation/src/konviconfigdialog.cpp @@ -38,8 +38,8 @@ #include "konviconfigdialog.h" -#include -#include +#include +#include #include #include #include diff --git a/konversation/src/linkaddressbook/linkaddressbookui.cpp b/konversation/src/linkaddressbook/linkaddressbookui.cpp index e6fe29e..1a452a9 100644 --- a/konversation/src/linkaddressbook/linkaddressbookui.cpp +++ b/konversation/src/linkaddressbook/linkaddressbookui.cpp @@ -33,7 +33,7 @@ Kopete (c) 2002-2004 by the Kopete developers #include #include -#include +#include #include #include #include diff --git a/konversation/src/logfilereader.cpp b/konversation/src/logfilereader.cpp index 2196e5f..53cc3a0 100644 --- a/konversation/src/logfilereader.cpp +++ b/konversation/src/logfilereader.cpp @@ -31,10 +31,10 @@ #include #include #include -#include +#include #include #include -#include +#include LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow(parent) diff --git a/konversation/src/logfilereader.h b/konversation/src/logfilereader.h index 5b5ffd8..46bc7a5 100644 --- a/konversation/src/logfilereader.h +++ b/konversation/src/logfilereader.h @@ -17,7 +17,7 @@ #include "chatwindow.h" -#include +#include class KToolBar; diff --git a/konversation/src/osd_preferences.cpp b/konversation/src/osd_preferences.cpp index 7f22e23..838c2b8 100644 --- a/konversation/src/osd_preferences.cpp +++ b/konversation/src/osd_preferences.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include OSD_Config::OSD_Config( TQWidget* parent, const char* name, WFlags fl ) diff --git a/konversation/src/outputfilter.cpp b/konversation/src/outputfilter.cpp index aec4e7c..3d0a864 100644 --- a/konversation/src/outputfilter.cpp +++ b/konversation/src/outputfilter.cpp @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/konversation/src/outputfilter.h b/konversation/src/outputfilter.h index 63729d6..faabec1 100644 --- a/konversation/src/outputfilter.h +++ b/konversation/src/outputfilter.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include class Server; diff --git a/konversation/src/quickbuttons_preferences.cpp b/konversation/src/quickbuttons_preferences.cpp index 98f5c39..b309feb 100644 --- a/konversation/src/quickbuttons_preferences.cpp +++ b/konversation/src/quickbuttons_preferences.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp index 02e5955..236992c 100644 --- a/konversation/src/server.cpp +++ b/konversation/src/server.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/konversation/src/theme_preferences.cpp b/konversation/src/theme_preferences.cpp index b4099b0..c01d1d0 100644 --- a/konversation/src/theme_preferences.cpp +++ b/konversation/src/theme_preferences.cpp @@ -35,12 +35,12 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include // unlink() diff --git a/konversation/src/theme_preferences.h b/konversation/src/theme_preferences.h index e28a018..80e210a 100644 --- a/konversation/src/theme_preferences.h +++ b/konversation/src/theme_preferences.h @@ -18,7 +18,7 @@ #include "theme_preferencesui.h" #include "konvisettingspage.h" -#include +#include class TQStringList; diff --git a/konversation/src/urlcatcher.cpp b/konversation/src/urlcatcher.cpp index f1ec356..b91e0a4 100644 --- a/konversation/src/urlcatcher.cpp +++ b/konversation/src/urlcatcher.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/konversation/src/warnings_preferences.cpp b/konversation/src/warnings_preferences.cpp index 70f5428..ddb443e 100644 --- a/konversation/src/warnings_preferences.cpp +++ b/konversation/src/warnings_preferences.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/konversation/src/watchednicknames_preferences.cpp b/konversation/src/watchednicknames_preferences.cpp index 2471037..a39b029 100644 --- a/konversation/src/watchednicknames_preferences.cpp +++ b/konversation/src/watchednicknames_preferences.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.1