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

pull/1/head
Timothy Pearson 11 years ago
parent 201c908ba1
commit 59d3d7e9bd

@ -387,7 +387,7 @@ Version 2.5
2.6-rc1 (Release Date: 06.04.2003): 2.6-rc1 (Release Date: 06.04.2003):
Added icon to service menu entry Added icon to service menu entry
Fixed gcc 3.x compiler warnings Fixed gcc 3.x compiler warnings
Fixed kfile plugins returning spaces at the end Fixed tdefile plugins returning spaces at the end
Greatly improved startup time Greatly improved startup time
2.6-rc2 (Release Date: 11.04.2003): 2.6-rc2 (Release Date: 11.04.2003):
History size can be configured now History size can be configured now

@ -161,7 +161,7 @@ Of course a drop-down combo "memory" would help.
I hope my "annoyance" is helpful, Phoenix I hope my "annoyance" is helpful, Phoenix
=================================================================== ===================================================================
[23:32:12] <Keimix> BTW is there a possibility to load just one of the kfile-plugins at krename startup, because loading all slows krename down alot? [23:32:12] <Keimix> BTW is there a possibility to load just one of the tdefile-plugins at krename startup, because loading all slows krename down alot?
[23:35:49] <domseichter> No, not yet. But it's a good idea. Strange that I did not have it and nobody asked me for this feature! [23:35:49] <domseichter> No, not yet. But it's a good idea. Strange that I did not have it and nobody asked me for this feature!
=================================================================== ===================================================================
"Squashing weird characters" sollte auf die ToDO liste "Squashing weird characters" sollte auf die ToDO liste

@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity2ornewer"; then 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)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$trinity3ornewer"; then if test -n "$trinity3ornewer"; then
@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
@ -2104,7 +2104,7 @@ else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(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)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])

@ -38,8 +38,8 @@
// KDE includes // KDE includes
#include <kapplication.h> #include <kapplication.h>
#include <kio/job.h> #include <tdeio/job.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klocale.h> #include <klocale.h>
// Own includes // Own includes

@ -24,7 +24,7 @@
// KDE includes // KDE includes
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <klineedit.h> #include <klineedit.h>

@ -20,8 +20,8 @@
#include <tqdatetime.h> #include <tqdatetime.h>
// KDE includes // KDE includes
#include <kfileitem.h> #include <tdefileitem.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <klocale.h> #include <klocale.h>
DatePlugin::DatePlugin() DatePlugin::DatePlugin()

@ -18,7 +18,7 @@
#ifndef DSDIRSELECTDIALOG_H #ifndef DSDIRSELECTDIALOG_H
#define DSDIRSELECTDIALOG_H #define DSDIRSELECTDIALOG_H
#include <kfiledialog.h> #include <tdefiledialog.h>
class TQCheckBox; class TQCheckBox;
class TQLabel; class TQLabel;

@ -18,8 +18,8 @@
// KDE includes // KDE includes
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <kio/job.h> #include <tdeio/job.h>
// QT includes // QT includes
#include <tqeventloop.h> #include <tqeventloop.h>

@ -19,7 +19,7 @@
#define FILEOPERATION_H #define FILEOPERATION_H
#include <tqobject.h> #include <tqobject.h>
#include <kio/jobclasses.h> #include <tdeio/jobclasses.h>
#include <kurl.h> #include <kurl.h>
class TQString; class TQString;

@ -25,7 +25,7 @@
// KDE includes // KDE includes
#include <kapplication.h> #include <kapplication.h>
#include <kfilemetainfo.h> #include <tdefilemetainfo.h>
#include <klineedit.h> #include <klineedit.h>
#include <klistbox.h> #include <klistbox.h>
#include <klocale.h> #include <klocale.h>

@ -22,7 +22,7 @@
#include "kmyhistorycombo.h" #include "kmyhistorycombo.h"
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <tqpopupmenu.h> #include <tqpopupmenu.h>

@ -28,8 +28,8 @@
#include <kdirlister.h> #include <kdirlister.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kio/previewjob.h> #include <tdeio/previewjob.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kurllabel.h> #include <kurllabel.h>

@ -21,7 +21,7 @@
// KDE includes // KDE includes
#include <klistbox.h> #include <klistbox.h>
#include <kurl.h> #include <kurl.h>
#include <kfileitem.h> #include <tdefileitem.h>
// TQt includes // TQt includes
#include <tqmutex.h> #include <tqmutex.h>

@ -21,7 +21,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <tqobject.h> #include <tqobject.h>
#include <kdirlister.h> #include <kdirlister.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <tqguardedptr.h> #include <tqguardedptr.h>
/**A convienience class that recursively lists a directory /**A convienience class that recursively lists a directory

@ -43,8 +43,8 @@
#include <kaction.h> #include <kaction.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kdirselectdialog.h> #include <kdirselectdialog.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kfileitem.h> #include <tdefileitem.h>
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kmessagebox.h> #include <kmessagebox.h>
@ -53,7 +53,7 @@
#include <kurlrequester.h> #include <kurlrequester.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <klocale.h> #include <klocale.h>
#include <kio/netaccess.h> #include <tdeio/netaccess.h>
// QT includes // QT includes
#include <tqbuttongroup.h> #include <tqbuttongroup.h>

@ -23,7 +23,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kaboutapplication.h> #include <kaboutapplication.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kimageio.h> #include <kimageio.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>

@ -21,7 +21,7 @@
// KDE includes // KDE includes
#include <kapplication.h> #include <kapplication.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
// QT includes // QT includes

@ -25,7 +25,7 @@
// KDE includes // KDE includes
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>

@ -166,12 +166,12 @@ void PluginLoader::loadFilePlugins()
for( unsigned int i = 0; i < list.count(); i++ ) { for( unsigned int i = 0; i < list.count(); i++ ) {
KService* s = (KService*)list[i]; KService* s = (KService*)list[i];
if( !s->terminal() && s->type() == "Service" && s->hasServiceType( "KFilePlugin" ) ) { if( !s->terminal() && s->type() == "Service" && s->hasServiceType( "KFilePlugin" ) ) {
FilePlugin* kfileplugin = new FilePlugin( s ); FilePlugin* tdefileplugin = new FilePlugin( s );
if( kfileplugin->isValid() ) { if( tdefileplugin->isValid() ) {
addPlugin( kfileplugin ); addPlugin( tdefileplugin );
kapp->processEvents(); kapp->processEvents();
} else } else
delete kfileplugin; delete tdefileplugin;
} }
} }

@ -23,7 +23,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <klistbox.h> #include <klistbox.h>

@ -27,7 +27,7 @@
// KDE includes // KDE includes
#include <kapplication.h> #include <kapplication.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <klocale.h> #include <klocale.h>
#include <klistview.h> #include <klistview.h>
#include <kmessagebox.h> #include <kmessagebox.h>

File diff suppressed because one or more lines are too long

@ -22,7 +22,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <tqthread.h> #include <tqthread.h>
#include <kfileitem.h> #include <tdefileitem.h>
class KDirLister; class KDirLister;
class KRecursiveLister; class KRecursiveLister;

@ -22,7 +22,7 @@
#include <tqlayout.h> #include <tqlayout.h>
// KDE includes // KDE includes
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprocess.h> #include <kprocess.h>

Loading…
Cancel
Save