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

Rename many classes and header files to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent e4b7f05fbc
commit 0889370e30
43 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
apps/ktorrent/fileselectdlg.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
#include <klocale.h>
#include <kmessagebox.h>
#include <klistview.h>
#include <tdelistview.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
#include <kurlrequester.h>

2
apps/ktorrent/fileselectdlgbase.ui
Unescape View File

@ -374,7 +374,7 @@
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

2
apps/ktorrent/filterbar.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <kdialog.h>
#include <klocale.h>
#include <kpushbutton.h>
#include <ktoolbarbutton.h>
#include <tdetoolbarbutton.h>
#include <klineedit.h>
#include <kiconloader.h>
#include <tdeconfig.h>

6
apps/ktorrent/groups/groupview.cpp
Unescape View File

@ -20,12 +20,12 @@
#include <klocale.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <kaction.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <kmessagebox.h>
#include <kinputdialog.h>
#include <kstandarddirs.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqheader.h>
#include <util/log.h>
#include <interfaces/torrentinterface.h>

2
apps/ktorrent/groups/groupview.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KTGROUPVIEW_H
#define KTGROUPVIEW_H
#include <klistview.h>
#include <tdelistview.h>
#include <util/ptrmap.h>
class TDEPopupMenu;

2
apps/ktorrent/ipfilterwidget.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tqregexp.h>
#include <tqvalidator.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klineedit.h>
#include <tdesocketaddress.h>
#include <tdefiledialog.h>

2
apps/ktorrent/ipfilterwidgetbase.ui
Unescape View File

@ -355,7 +355,7 @@
</Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

8
apps/ktorrent/ktorrent.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <kmenubar.h>
#include <kstatusbar.h>
#include <kkeydialog.h>
#include <kaccel.h>
#include <tdeaccel.h>
#include <kstandarddirs.h>
#include <tdeio/netaccess.h>
#include <tdefiledialog.h>
@ -44,14 +44,14 @@
#include <kurl.h>
#include <kurldrag.h>
#include <kprogress.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <ktabwidget.h>
#include <kedittoolbar.h>
#include <ksqueezedtextlabel.h>
#include <kpushbutton.h>
#include <kstdaccel.h>
#include <kaction.h>
#include <tdestdaccel.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <interfaces/torrentinterface.h>

2
apps/ktorrent/ktorrentview.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <klocale.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <krun.h>
#include <kurl.h>
#include <kurldrag.h>

2
apps/ktorrent/ktorrentview.h
Unescape View File

@ -23,7 +23,7 @@
#ifndef _KTORRENTVIEW_H_
#define _KTORRENTVIEW_H_
#include <klistview.h>
#include <tdelistview.h>
typedef TQValueList<TQCString> QCStringList;

2
apps/ktorrent/ktorrentviewitem.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KTORRENTVIEWITEM_H
#define KTORRENTVIEWITEM_H
#include <klistview.h>
#include <tdelistview.h>
#include <dcopclient.h>
#include <util/constants.h>

2
apps/ktorrent/ktorrentviewmenu.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KTORRENTVIEWMENU_H
#define KTORRENTVIEWMENU_H
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
class KTorrentView;

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

@ -28,8 +28,8 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kxmlguiclient.h>
#include <kaction.h>
#include <kpopupmenu.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
#include <kinputdialog.h>
#include <klocale.h>
#include <kapplication.h>

2
apps/ktorrent/torrentcreatordlg.cpp
Unescape View File

@ -21,7 +21,7 @@
#include <kpushbutton.h>
#include <tdefiledialog.h>
#include <kprogress.h>
#include <klistview.h>
#include <tdelistview.h>
#include <knuminput.h>
#include "torrentcreatordlg.h"
#include "ktorrentcore.h"

2
apps/ktorrent/torrentcreatordlgbase.ui
Unescape View File

@ -531,6 +531,6 @@
<includehint>klineedit.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

2
apps/ktorrent/trayicon.cpp
Unescape View File

@ -18,7 +18,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <klocale.h>
#include <kapplication.h>
#include "ktorrent.h"

2
apps/ktorrent/trayicon.h
Unescape View File

@ -23,7 +23,7 @@
#include <ksystemtray.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqpainter.h>
#include "ktorrentcore.h"

2
apps/ktupnptest/upnptestapp.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef UPNPTESTAPP_H
#define UPNPTESTAPP_H
#include <kmainwindow.h>
#include <tdemainwindow.h>
#include <libktorrent/util/log.h>
#include <libktorrent/torrent/globals.h>
#include <plugins/upnp/upnprouter.h>

2
libktorrent/interfaces/filetreediritem.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KTFILETREEDIRITEM_H
#define KTFILETREEDIRITEM_H
#include <klistview.h>
#include <tdelistview.h>
#include <util/constants.h>
#include <util/ptrmap.h>

2
libktorrent/interfaces/filetreeitem.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KTFILETREEITEM_H
#define KTFILETREEITEM_H
#include <klistview.h>
#include <tdelistview.h>
#include <util/constants.h>
using namespace bt;

2
libktorrent/pluginmanagerprefpage.cpp
Unescape View File

@ -19,7 +19,7 @@
***************************************************************************/
#include <klocale.h>
#include <kpushbutton.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqheader.h>
#include <kglobal.h>
#include <kiconloader.h>

4
libktorrent/torrent/Makefile.am
Unescape View File

@ -8,7 +8,7 @@ libtorrent_la_LDFLAGS = $(all_libraries)
noinst_HEADERS = advancedchokealgorithm.h announcelist.h authenticate.h \
authenticatebase.h authenticationmonitor.h bdecoder.h bencoder.h bnode.h cache.h \
cachefile.h cap.h choker.h chunk.h chunkcounter.h chunkdownload.h chunkmanager.h \
chunkselector.h dndfile.h downloadcap.h downloader.h globals.h httptracker.h \
chuntdeselector.h dndfile.h downloadcap.h downloader.h globals.h httptracker.h \
ipblocklist.h movedatafilesjob.h multifilecache.h newchokealgorithm.h \
oldchokealgorithm.h packet.h packetreader.h packetwriter.h peer.h peerdownloader.h peerid.h \
peermanager.h peersourcemanager.h peeruploader.h piece.h preallocationthread.h \
@ -20,7 +20,7 @@ noinst_HEADERS = advancedchokealgorithm.h announcelist.h authenticate.h \
libtorrent_la_SOURCES = advancedchokealgorithm.cpp announcelist.cpp \
authenticate.cpp authenticatebase.cpp authenticationmonitor.cpp bdecoder.cpp \
bencoder.cpp bnode.cpp cache.cpp cachefile.cpp cap.cpp choker.cpp chunk.cpp \
chunkcounter.cpp chunkdownload.cpp chunkmanager.cpp chunkselector.cpp dndfile.cpp \
chunkcounter.cpp chunkdownload.cpp chunkmanager.cpp chuntdeselector.cpp dndfile.cpp \
downloadcap.cpp downloader.cpp globals.cpp httptracker.cpp ipblocklist.cpp \
movedatafilesjob.cpp multifilecache.cpp newchokealgorithm.cpp packet.cpp packetreader.cpp \
packetwriter.cpp peer.cpp peerdownloader.cpp peerid.cpp peermanager.cpp \

4
libktorrent/torrent/chuntdeselector.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <util/log.h>
#include <util/bitset.h>
#include "chunkcounter.h"
#include "chunkselector.h"
#include "chuntdeselector.h"
#include "chunkmanager.h"
#include "downloader.h"
#include "peerdownloader.h"
@ -158,7 +158,7 @@ namespace bt
// lets do a safety check first
if (from >= cman.getNumChunks() || to >= cman.getNumChunks())
{
Out(SYS_DIO|LOG_NOTICE) << "Internal error in chunkselector" << endl;
Out(SYS_DIO|LOG_NOTICE) << "Internal error in chuntdeselector" << endl;
return;
}

2
libktorrent/torrent/downloader.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <interfaces/functions.h>
#include <interfaces/monitorinterface.h>
#include "packetwriter.h"
#include "chunkselector.h"
#include "chuntdeselector.h"
#include "ipblocklist.h"
#include "ktversion.h"

0
libktorrent/torrent/ipbloctdelist.cpp → libktorrent/torrent/ipblocklist.cpp
Unescape View File

0
libktorrent/torrent/ipbloctdelist.h → libktorrent/torrent/ipblocklist.h
Unescape View File

2
plugins/infowidget/chunkdownloadview.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef BTCHUNKDOWNLOADVIEW_H
#define BTCHUNKDOWNLOADVIEW_H
#include <klistview.h>
#include <tdelistview.h>
#include <tqmap.h>
#include "chunkdownloadviewbase.h"

2
plugins/infowidget/chunkdownloadviewbase.ui
Unescape View File

@ -340,6 +340,6 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

2
plugins/infowidget/fileview.cpp
Unescape View File

@ -20,7 +20,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kglobal.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <krun.h>
#include <kmessagebox.h>
#include <kmimetype.h>

2
plugins/infowidget/fileview.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef KTFILEVIEW_H
#define KTFILEVIEW_H
#include <klistview.h>
#include <tdelistview.h>
#include <util/constants.h>
#include <tqtimer.h>

2
plugins/infowidget/peerview.cpp
Unescape View File

@ -29,7 +29,7 @@
#include <tdesocketaddress.h>
#include <tqpoint.h>
#include <tqlistview.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <interfaces/peerinterface.h>
#include <interfaces/functions.h>
#include <torrent/ipblocklist.h>

4
plugins/infowidget/peerview.h
Unescape View File

@ -21,9 +21,9 @@
#define PEERVIEW_H
#include <tqmap.h>
#include <klistview.h>
#include <tdelistview.h>
#include <tqlistview.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tqpoint.h>
#include <util/constants.h>

2
plugins/infowidget/trackerview.cpp
Unescape View File

@ -36,7 +36,7 @@
#include <ksqueezedtextlabel.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <klistview.h>
#include <tdelistview.h>
#include <torrent/globals.h>
#include <util/log.h>

2
plugins/infowidget/trackerviewbase.ui
Unescape View File

@ -315,6 +315,6 @@
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
</includehints>
</UI>

2
plugins/partfileimport/partfileimportplugin.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kstdaction.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <interfaces/guiinterface.h>
#include <interfaces/coreinterface.h>
#include "partfileimportplugin.h"

2
plugins/search/searchplugin.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <kstdaction.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <kapplication.h>
#include <kstandarddirs.h>
#include <krun.h>

2
plugins/search/searchprefpage.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kactivelabel.h>
#include <kpushbutton.h>
#include <klistview.h>
#include <tdelistview.h>
#include <klineedit.h>
#include <kmessagebox.h>
#include <tdeio/netaccess.h>

2
plugins/search/searchtab.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef SEARCHTAB_H
#define SEARCHTAB_H
#include <ktoolbar.h>
#include <tdetoolbar.h>
class KComboBox;
class KPushButton;

2
plugins/search/searchwidget.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kcombobox.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <tdeparts/partmanager.h>
#include <tdeio/job.h>
#include <kmessagebox.h>

2
plugins/upnp/upnpplugin.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <kpopupmenu.h>
#include <tdepopupmenu.h>
#include <interfaces/guiinterface.h>
#include <util/fileops.h>
#include "upnpplugin.h"

2
plugins/upnp/upnpprefwidget.cpp
Unescape View File

@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include <klistview.h>
#include <tdelistview.h>
#include <kmessagebox.h>
#include <kpushbutton.h>
#include <torrent/udptrackersocket.h>

2
plugins/upnp/upnpwidget.ui
Unescape View File

@ -132,7 +132,7 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>

4
translations/sv/messages/ktorrent.po
Unescape View File

@ -4813,7 +4813,7 @@ msgstr ""
"Använd din webbläsare för att söka efter strängen %1 (stora bokstäver) med "
"söktjänsten du vill lägga till. "
"<br>Kopiera därefter webbadressen i adressraden när sökningen är färdig, och "
"klistra in den här."
"tdelistra in den här."
"<br>"
"<br>Att till exempel söka efter %1 på Google, ger resultatet "
"http://www.google.com/search?q=FOOBAR&ie=UTF-8&oe=UTF-8. "
@ -4843,7 +4843,7 @@ msgid ""
"the exact URL here."
msgstr ""
"Felaktig webbadress. Du måste söka efter FOOBAR med din webbläsare och "
"kopiera/klistra in exakt webbadress här."
"kopiera/tdelistra in exakt webbadress här."
#: plugins/search/searchprefpage.cpp:247
msgid ""

Write Preview
Loading…
Cancel
Save