TDE
/
ktorrent
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktorrent
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 65ff20b666
commit 1073dcc9a1
58 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File

8
acinclude.m4
Unescape View File

@ -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
@ -1812,7 +1812,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
@ -2118,7 +2118,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")
@ -2128,7 +2128,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
])

8
aclocal.m4 vendored
Unescape View File

@ -614,7 +614,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi
if test -n "$kde32ornewer"; 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 "$kde33ornewer"; then
@ -1824,7 +1824,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libkdecore.la"
else
kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la"
kde_check_lib="libtdeio.la"
fi
if test -z "$1"; then
@ -2130,7 +2130,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")
@ -2140,7 +2140,7 @@ else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
fi
])

2
apps/ktorrent/README
Unescape View File

@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html
them more maintainable.
For more details, consult :
http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
* With KParts, you can embed other kde components in your program, or make your program
embeddable in other apps. For example, the kmplayer kpart can be called to play videos

2
apps/ktorrent/filterbar.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <ktoolbarbutton.h>
#include <klineedit.h>
#include <kiconloader.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <interfaces/torrentinterface.h>

2
apps/ktorrent/ipfilterwidget.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <klistview.h>
#include <klineedit.h>
#include <tdesocketaddress.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>

6
apps/ktorrent/ktorrent.cpp
Unescape View File

@ -38,9 +38,9 @@
#include <kkeydialog.h>
#include <kaccel.h>
#include <kstandarddirs.h>
#include <kio/netaccess.h>
#include <kfiledialog.h>
#include <kconfig.h>
#include <tdeio/netaccess.h>
#include <tdefiledialog.h>
#include <tdeconfig.h>
#include <kurl.h>
#include <kurldrag.h>
#include <kprogress.h>

6
apps/ktorrent/ktorrentcore.cpp
Unescape View File

@ -22,13 +22,13 @@
#include <tqdir.h>
#include <klocale.h>
#include <kglobal.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kprogress.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kapplication.h>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <tqregexp.h>
#include <util/log.h>

2
apps/ktorrent/ktorrentview.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <kurldrag.h>
#include <kmessagebox.h>
#include <kstdguiitem.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <interfaces/torrentinterface.h>
#include <torrent/globals.h>

2
apps/ktorrent/newui/button.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <kinputdialog.h>
#include <klocale.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include "buttonbar.h"

2
apps/ktorrent/newui/buttonbar.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstringhandler.h>
#include <klocale.h>

2
apps/ktorrent/newui/ddockwindow.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <kdebug.h>
#include <kglobal.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kcombobox.h>
#include <klocale.h>
#include <kiconloader.h>

2
apps/ktorrent/newui/dmainwindow.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <kdebug.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <tqtoolbutton.h>

2
apps/ktorrent/newui/dtabwidget.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tqtoolbutton.h>
#include <tqtabbar.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <kapplication.h>

2
apps/ktorrent/pref.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <knuminput.h>
#include <kurlrequester.h>
#include <kurl.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <klineedit.h>
#include <tqlistview.h>

2
apps/ktorrent/torrentcreatordlg.cpp
Unescape View File

@ -19,7 +19,7 @@
#include <kurlrequester.h>
#include <keditlistbox.h>
#include <kpushbutton.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kprogress.h>
#include <klistview.h>
#include <knuminput.h>

2
apps/ktorrent/viewmanager.cpp
Unescape View File

@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <ktabwidget.h>
#include <interfaces/torrentinterface.h>

2
libktorrent/interfaces/exitoperation.h
Unescape View File

@ -21,7 +21,7 @@
#define KTEXITOPERATION_H
#include <tqobject.h>
#include <kio/job.h>
#include <tdeio/job.h>
namespace kt
{

2
libktorrent/settings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktorrent.kcfg
ClassName=Settings
Singleton=true

2
libktorrent/torrent/cache.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef BTCACHE_H
#define BTCACHE_H
#include <kio/job.h>
#include <tdeio/job.h>
class TQStringList;

4
libktorrent/torrent/cachefile.cpp
Unescape View File

@ -29,9 +29,9 @@
#include <unistd.h>
#include <errno.h>
#include <tqfile.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <kfileitem.h>
#include <tdefileitem.h>
#include <util/array.h>
#include <util/fileops.h>
#include <torrent/globals.h>

6
libktorrent/torrent/httptracker.cpp
Unescape View File

@ -27,9 +27,9 @@
#include <util/error.h>
#include <util/waitjob.h>
#include <interfaces/exitoperation.h>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <kio/scheduler.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/scheduler.h>
#include "bnode.h"
#include "httptracker.h"
#include "torrentcontrol.h"

2
libktorrent/torrent/movedatafilesjob.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef BTMOVEDATAFILESJOB_H
#define BTMOVEDATAFILESJOB_H
#include <kio/job.h>
#include <tdeio/job.h>
namespace bt
{

2
libktorrent/torrent/multifilecache.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tqstringlist.h>
#include <tqfileinfo.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <util/file.h>
#include <util/fileops.h>
#include <util/functions.h>

2
libktorrent/torrent/torrentcontrol.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <tqfile.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <tqtextstream.h>
#include <util/log.h>
#include <util/error.h>

2
libktorrent/util/autorotatelogjob.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef BTAUTOROTATELOGJOB_H
#define BTAUTOROTATELOGJOB_H
#include <kio/job.h>
#include <tdeio/job.h>
#include <cstdlib>
namespace bt

2
libktorrent/util/fileops.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <unistd.h>
#include <errno.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>

2
libktorrent/util/functions.cpp
Unescape View File

@ -28,7 +28,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <kmimetype.h>
#include <kglobal.h>

4
libktorrent/util/mmapfile.cpp
Unescape View File

@ -30,8 +30,8 @@
#include <sys/stat.h>
#include <errno.h>
#include <tqfile.h>
#include <kfileitem.h>
#include <kio/netaccess.h>
#include <tdefileitem.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <util/error.h>
#include <util/log.h>

2
libktorrent/util/waitjob.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <torrent/globals.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include "waitjob.h"
#include "log.h"

2
libktorrent/util/waitjob.h
Unescape View File

@ -21,7 +21,7 @@
#define BTWAITJOB_H
#include <tqtimer.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <tqvaluelist.h>
#include <interfaces/exitoperation.h>
#include "constants.h"

2
plugins/infowidget/infowidgetpluginsettings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktinfowidgetplugin.kcfg
ClassName=InfoWidgetPluginSettings
Namespace=kt

2
plugins/ipfilter/convertdialog.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <klocale.h>
#include <kurl.h>
#include <kmessagebox.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kprogress.h>
#include <kmimetype.h>

2
plugins/ipfilter/ipblockingprefpage.cpp
Unescape View File

@ -32,7 +32,7 @@
#include <kurlrequester.h>
#include <kurl.h>
#include <kmessagebox.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kprogress.h>
#include <kmimetype.h>

2
plugins/ipfilter/ipfilterpluginsettings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktipfilterplugin.kcfg
ClassName=IPBlockingPluginSettings
Namespace=kt

2
plugins/logviewer/logviewer.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kglobal.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <tqapplication.h>
#include "logviewer.h"
#include "logflags.h"

2
plugins/logviewer/logviewerpluginsettings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktlogviewerplugin.kcfg
ClassName=LogViewerPluginSettings
Namespace=kt

4
plugins/partfileimport/importdialog.cpp
Unescape View File

@ -23,8 +23,8 @@
#include <kurlrequester.h>
#include <kpushbutton.h>
#include <kmessagebox.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <util/log.h>
#include <util/error.h>
#include <util/file.h>

2
plugins/rssfeed/rss/image.cpp
Unescape View File

@ -11,7 +11,7 @@
#include "image.h"
#include "tools_p.h"
#include <kio/job.h>
#include <tdeio/job.h>
#include <kurl.h>
#include <tqbuffer.h>

2
plugins/rssfeed/rss/loader.cpp
Unescape View File

@ -11,7 +11,7 @@
#include "loader.h"
#include "document.h"
#include <kio/job.h>
#include <tdeio/job.h>
#include <kprocess.h>
#include <kurl.h>
#include <kdebug.h>

2
plugins/rssfeed/rss/loader.h
Unescape View File

@ -114,7 +114,7 @@ namespace RSS
/**
* @return The error code for the last process of retrieving data.
* The returned numbers correspond directly to the error codes
* <a href="http://developer.kde.org/documentation/library/cvs-api/classref/kio/KIO.html#Error">as
* <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
* defined by KIO</a>.
*/
virtual int errorCode() const;

2
plugins/rssfeed/rssfeed.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <kglobal.h>
#include <kstandarddirs.h>
#include <krfcdate.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <tqfile.h>
#include <tqapplication.h>
#include <tqdir.h>

4
plugins/rssfeed/rssfeedmanager.cpp
Unescape View File

@ -20,9 +20,9 @@
#include "rssfeedmanager.h"
#include <kdirlister.h>
#include <kfileitem.h>
#include <tdefileitem.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kstandarddirs.h>
#include <keditlistbox.h>
// #include <kmimetype.h>

2
plugins/rssfeed/rssfeedmanager.h
Unescape View File

@ -21,7 +21,7 @@
#define RSSFEEDMANAGER_H
#include <kdirlister.h>
#include <kfileitem.h>
#include <tdefileitem.h>
#include <tqstring.h>
#include <tqobject.h>
#include <tqdir.h>

2
plugins/rssfeed/rsslinkdownloader.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef RSSLINKDOWNLOADER_H
#define RSSLINKDOWNLOADER_H
#include <kio/job.h>
#include <tdeio/job.h>
#include <ktempfile.h>
#include <interfaces/coreinterface.h>

4
plugins/scanfolder/scanfolder.cpp
Unescape View File

@ -20,9 +20,9 @@
#include "scanfolder.h"
#include <kdirlister.h>
#include <kfileitem.h>
#include <tdefileitem.h>
#include <klocale.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <tqstring.h>
#include <tqobject.h>

2
plugins/scanfolder/scanfolder.h
Unescape View File

@ -21,7 +21,7 @@
#define SCANFOLDER_H
#include <kdirlister.h>
#include <kfileitem.h>
#include <tdefileitem.h>
#include <tqstring.h>
#include <tqobject.h>
#include <tqdir.h>

2
plugins/scanfolder/scanfolderpluginsettings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktscanfolderplugin.kcfg
ClassName=ScanFolderPluginSettings
Namespace=kt

2
plugins/scheduler/bwsprefpagewidget.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <klocale.h>
#include <kglobal.h>
#include <kstandarddirs.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <kstdguiitem.h>

2
plugins/scheduler/schedulerpluginsettings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktschedulerplugin.kcfg
ClassName=SchedulerPluginSettings
Namespace=kt

8
plugins/search/htmlpart.cpp
Unescape View File

@ -18,14 +18,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kmessagebox.h>
#include <kio/job.h>
#include <kio/jobclasses.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
//#include <tqfile.h>
#include <tqclipboard.h>
#include <tqapplication.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <tdeparts/browserextension.h>
#include <util/constants.h>
#include <tdehtmlview.h>

2
plugins/search/searchpluginsettings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktsearchplugin.kcfg
ClassName=SearchPluginSettings
Namespace=kt

2
plugins/search/searchprefpage.cpp
Unescape View File

@ -30,7 +30,7 @@
#include <klistview.h>
#include <klineedit.h>
#include <kmessagebox.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <klineedit.h>
#include <tqlabel.h>

4
plugins/search/searchwidget.cpp
Unescape View File

@ -35,9 +35,9 @@
#include <kcombobox.h>
#include <kpopupmenu.h>
#include <tdeparts/partmanager.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kprogress.h>
#include <util/log.h>
#include <torrent/globals.h>

2
plugins/stats/statspluginsettings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktstatsplugin.kcfg
ClassName=StatsPluginSettings
Namespace=kt

2
plugins/upnp/upnppluginsettings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktupnpplugin.kcfg
ClassName=UPnPPluginSettings
Namespace=kt

4
plugins/upnp/upnprouter.cpp
Unescape View File

@ -22,8 +22,8 @@
#include <kglobal.h>
#include <kstandarddirs.h>
#include <tqstringlist.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <torrent/globals.h>
#include <util/log.h>
#include <util/array.h>

2
plugins/webinterface/php_interface.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kio/global.h>
#include <tdeio/global.h>
#include <kglobal.h>
#include <klocale.h>

2
plugins/webinterface/webinterfacepluginsettings.kcfgc
Unescape View File

@ -1,4 +1,4 @@
# Code generation options for kconfig_compiler
# Code generation options for tdeconfig_compiler
File=ktwebinterfaceplugin.kcfg
ClassName=WebInterfacePluginSettings
Namespace=kt

Write Preview
Loading…
Cancel
Save