Rename many classes and header files to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent e4b7f05fbc
commit 0889370e30

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

@ -374,7 +374,7 @@
<includehint>kurlrequester.h</includehint> <includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint>
<includehint>kpushbutton.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> <includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -8,7 +8,7 @@ libtorrent_la_LDFLAGS = $(all_libraries)
noinst_HEADERS = advancedchokealgorithm.h announcelist.h authenticate.h \ noinst_HEADERS = advancedchokealgorithm.h announcelist.h authenticate.h \
authenticatebase.h authenticationmonitor.h bdecoder.h bencoder.h bnode.h cache.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 \ 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 \ ipblocklist.h movedatafilesjob.h multifilecache.h newchokealgorithm.h \
oldchokealgorithm.h packet.h packetreader.h packetwriter.h peer.h peerdownloader.h peerid.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 \ 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 \ libtorrent_la_SOURCES = advancedchokealgorithm.cpp announcelist.cpp \
authenticate.cpp authenticatebase.cpp authenticationmonitor.cpp bdecoder.cpp \ authenticate.cpp authenticatebase.cpp authenticationmonitor.cpp bdecoder.cpp \
bencoder.cpp bnode.cpp cache.cpp cachefile.cpp cap.cpp choker.cpp chunk.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 \ downloadcap.cpp downloader.cpp globals.cpp httptracker.cpp ipblocklist.cpp \
movedatafilesjob.cpp multifilecache.cpp newchokealgorithm.cpp packet.cpp packetreader.cpp \ movedatafilesjob.cpp multifilecache.cpp newchokealgorithm.cpp packet.cpp packetreader.cpp \
packetwriter.cpp peer.cpp peerdownloader.cpp peerid.cpp peermanager.cpp \ packetwriter.cpp peer.cpp peerdownloader.cpp peerid.cpp peermanager.cpp \

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save