diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:14 -0600 |
commit | 77343a1b8c1a5cb91a57039c4e595de33853a2d9 (patch) | |
tree | ec168097bf95daefb0add7e401d151cf6a0b5948 | |
parent | a1d4239c832b3bb1c8289f27831ef43b0a2eb941 (diff) | |
download | piklab-77343a1b8c1a5cb91a57039c4e595de33853a2d9.tar.gz piklab-77343a1b8c1a5cb91a57039c4e595de33853a2d9.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r-- | Changelog | 2 | ||||
-rw-r--r-- | acinclude.m4 | 8 | ||||
-rw-r--r-- | src/common/global/generic_config.cpp | 2 | ||||
-rw-r--r-- | src/common/global/global.h | 2 | ||||
-rw-r--r-- | src/common/global/purl.cpp | 6 | ||||
-rw-r--r-- | src/common/gui/pfile_ext.cpp | 2 | ||||
-rw-r--r-- | src/common/gui/purl_ext.cpp | 6 | ||||
-rw-r--r-- | src/common/gui/purl_gui.cpp | 2 | ||||
-rw-r--r-- | src/common/nokde/win32_utils.h | 2 | ||||
-rw-r--r-- | src/libgui/global_config.cpp | 2 | ||||
-rw-r--r-- | src/libgui/likeback.cpp | 6 | ||||
-rw-r--r-- | src/libgui/project_wizard.cpp | 2 | ||||
-rw-r--r-- | src/libgui/text_editor.cpp | 2 | ||||
-rw-r--r-- | src/libgui/toplevel.cpp | 4 | ||||
-rw-r--r-- | src/progs/pickit2/gui/pickit2_group_ui.cpp | 2 |
15 files changed, 25 insertions, 25 deletions
@@ -225,7 +225,7 @@ * fixed select all/find in editor [bug reported by gduprey] 0.11.3 (7 September 2006) - * fixed crashes due to dependence on libkio for piklab-prog + * fixed crashes due to dependence on libtdeio for piklab-prog 0.11.2 (6 September 2006) * fixed compilation by detecting libncurses under Suse diff --git a/acinclude.m4 b/acinclude.m4 index ad0f12a..74491ad 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 @@ -1788,7 +1788,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 @@ -2094,7 +2094,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") @@ -2104,7 +2104,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/src/common/global/generic_config.cpp b/src/common/global/generic_config.cpp index 9d951aa..48c705b 100644 --- a/src/common/global/generic_config.cpp +++ b/src/common/global/generic_config.cpp @@ -20,7 +20,7 @@ public: }; #else # include <kapplication.h> -# include <kconfig.h> +# include <tdeconfig.h> class GenericConfigPrivate { public: diff --git a/src/common/global/global.h b/src/common/global/global.h index 9eb8979..0bc0b58 100644 --- a/src/common/global/global.h +++ b/src/common/global/global.h @@ -35,7 +35,7 @@ # include <kaboutdata.h> # include <kcmdlineargs.h> # include <ktempfile.h> -# include <kconfigbackend.h> +# include <tdeconfigbackend.h> #endif #if defined(Q_OS_WIN) diff --git a/src/common/global/purl.cpp b/src/common/global/purl.cpp index 29da212..c47fa7b 100644 --- a/src/common/global/purl.cpp +++ b/src/common/global/purl.cpp @@ -19,9 +19,9 @@ #include "process.h" #if !defined(NO_KDE) -# include <kio/netaccess.h> -# include <kfileitem.h> -# include <kconfigbackend.h> +# include <tdeio/netaccess.h> +# include <tdefileitem.h> +# include <tdeconfigbackend.h> #endif //----------------------------------------------------------------------------- diff --git a/src/common/gui/pfile_ext.cpp b/src/common/gui/pfile_ext.cpp index f15baf8..b210643 100644 --- a/src/common/gui/pfile_ext.cpp +++ b/src/common/gui/pfile_ext.cpp @@ -9,7 +9,7 @@ #include "pfile_ext.h" #include <tqfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <ktempfile.h> #include "common/gui/misc_gui.h" diff --git a/src/common/gui/purl_ext.cpp b/src/common/gui/purl_ext.cpp index 8e4a255..82348b5 100644 --- a/src/common/gui/purl_ext.cpp +++ b/src/common/gui/purl_ext.cpp @@ -10,10 +10,10 @@ #include <tqfile.h> #include <tqapplication.h> -#include <kio/netaccess.h> -#include <kfileitem.h> +#include <tdeio/netaccess.h> +#include <tdefileitem.h> #include <ktempfile.h> -#include <kconfigbackend.h> +#include <tdeconfigbackend.h> #include "common/global/pfile.h" diff --git a/src/common/gui/purl_gui.cpp b/src/common/gui/purl_gui.cpp index 7515b99..614ef76 100644 --- a/src/common/gui/purl_gui.cpp +++ b/src/common/gui/purl_gui.cpp @@ -12,7 +12,7 @@ #include <kiconloader.h> #include <kpushbutton.h> #include <krun.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdirselectdialog.h> #include "misc_gui.h" diff --git a/src/common/nokde/win32_utils.h b/src/common/nokde/win32_utils.h index 7b50f96..d234ad2 100644 --- a/src/common/nokde/win32_utils.h +++ b/src/common/nokde/win32_utils.h @@ -82,7 +82,7 @@ bool showWin32FilePropertyDialog(const TQString& fileName); /** \return two-letter locale name (like "en" or "pl") taken from MS Windows native registry. Useful when we don't want to rely on KSyCoCa. - Used e.g. by kbuildsycoca application. + Used e.g. by tdebuildsycoca application. */ KDEWIN32_EXPORT TQCString getWin32LocaleName(); diff --git a/src/libgui/global_config.cpp b/src/libgui/global_config.cpp index e8fa5ca..085f799 100644 --- a/src/libgui/global_config.cpp +++ b/src/libgui/global_config.cpp @@ -10,7 +10,7 @@ #include "global_config.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include "progs/list/prog_list.h" diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index db22241..0983080 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -20,7 +20,7 @@ #include <kapplication.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kaboutdata.h> #include <klocale.h> @@ -452,10 +452,10 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons) if (m_process) return; m_process = new TDEProcess(); - *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); + *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount"); connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(endFetchingEmailFrom()) ); if (!m_process->start()) { - kdDebug() << "Couldn't start kcmshell.." << endl; + kdDebug() << "Couldn't start tdecmshell.." << endl; delete m_process; m_process = 0; return; diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp index ac622fe..4bd5a51 100644 --- a/src/libgui/project_wizard.cpp +++ b/src/libgui/project_wizard.cpp @@ -12,7 +12,7 @@ #include <tqvbuttongroup.h> #include <tqradiobutton.h> #include <tqstyle.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include "common/gui/purl_gui.h" diff --git a/src/libgui/text_editor.cpp b/src/libgui/text_editor.cpp index 077b8d8..45d340c 100644 --- a/src/libgui/text_editor.cpp +++ b/src/libgui/text_editor.cpp @@ -16,7 +16,7 @@ #include <klibloader.h> #include <kpopupmenu.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kapplication.h> #include <tdetexteditor/markinterface.h> diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp index c9c64da..55eac3f 100644 --- a/src/libgui/toplevel.cpp +++ b/src/libgui/toplevel.cpp @@ -24,10 +24,10 @@ #include <klocale.h> #include <kedittoolbar.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kcmdlineargs.h> -#include <kio/observer.h> +#include <tdeio/observer.h> #include <kiconloader.h> #include <kpopupmenu.h> #include <khelpmenu.h> diff --git a/src/progs/pickit2/gui/pickit2_group_ui.cpp b/src/progs/pickit2/gui/pickit2_group_ui.cpp index 66f9b67..a44c5cb 100644 --- a/src/progs/pickit2/gui/pickit2_group_ui.cpp +++ b/src/progs/pickit2/gui/pickit2_group_ui.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "pickit2_group_ui.h" -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "common/global/purl.h" #include "common/gui/misc_gui.h" |