diff options
Diffstat (limited to 'src')
71 files changed, 80 insertions, 1232 deletions
diff --git a/src/CMakeL10n.txt b/src/CMakeL10n.txt index a44265c..02343e1 100644 --- a/src/CMakeL10n.txt +++ b/src/CMakeL10n.txt @@ -1,3 +1,8 @@ ##### create translation templates ############## tde_l10n_create_template( "messages/ktorrent" ) + +tde_l10n_create_template( + CATALOG "desktop_files/ktorrent-desktops" + SOURCES *.desktop +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a380326..8987cae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,3 +17,4 @@ add_subdirectory( libktorrent ) add_subdirectory( plugins ) add_subdirectory( apps ) add_subdirectory( scripts ) +add_subdirectory( utests ) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index c697655..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = libktorrent plugins apps scripts diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am deleted file mode 100644 index 09a6602..0000000 --- a/src/apps/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = ktorrent ktcachecheck kttorinfo ktupnptest diff --git a/src/apps/ktcachecheck/Makefile.am b/src/apps/ktcachecheck/Makefile.am deleted file mode 100644 index a9f5d3e..0000000 --- a/src/apps/ktcachecheck/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -bin_PROGRAMS = ktcachecheck - -ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \ - multicachechecker.cpp -ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ktcachecheck_LDADD = $(LIB_TDEPARTS) ../../libktorrent/libktorrent.la \ - $(LIB_TDEFILE) $(LIB_TDEIO) -noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/apps/ktorrent/Makefile.am b/src/apps/ktorrent/Makefile.am deleted file mode 100644 index 4df281b..0000000 --- a/src/apps/ktorrent/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -## Makefile.am for ktorrent -SUBDIRS = groups newui -# this is the program that gets installed. it's name is used for all -# of the other Makefile.am variables -bin_PROGRAMS = ktorrent - - - -# set the include path for X, qt and KDE -INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes) - -# the library search path. -ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor - -# the libraries to link against. -ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_TDEFILE) \ - $(LIB_TDEIO) $(LIB_TDEPARTS) ../../apps/ktorrent/groups/libgroups.la \ - ../../libktorrent/libktorrent.la - -# which sources should be compiled for ktorrent -ktorrent_SOURCES = addpeerwidget.cpp addpeerwidget.h addpeerwidgetbase.ui \ - advancedpref.ui dcopinterface.skel downloadpref.ui fileselectdlg.cpp \ - fileselectdlgbase.ui generalpref.ui ipfilterwidget.cpp ipfilterwidgetbase.ui ktorrent.cpp \ - ktorrentapp.cpp ktorrentcore.cpp ktorrentdcop.cpp ktorrentview.cpp ktorrentviewitem.cpp \ - ktorrentviewmenu.cpp leaktrace.cpp main.cpp pastedialog.cpp pastedlgbase.ui pref.cpp \ - queuedialog.cpp queuedialog.h queuedlg.ui scandialog.cpp scandlgbase.ui \ - speedlimitsdlg.cpp speedlimitsdlgbase.ui torrentcreatordlg.cpp torrentcreatordlg.h \ - torrentcreatordlgbase.ui trayhoverpopup.cpp trayicon.cpp viewmanager.cpp filterbar.cpp - -xdg_apps_DATA = ktorrent.desktop - - -# these are the headers for your project -noinst_HEADERS = dcopinterface.h fileselectdlg.h ipfilterwidget.h ktorrent.h \ - ktorrentcore.h ktorrentdcop.h ktorrentview.h ktorrentviewitem.h ktorrentviewmenu.h \ - pastedialog.h pref.h scandialog.h speedlimitsdlg.h trayhoverpopup.h trayicon.h \ - viewmanager.h - -# client stuff - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/ktorrent.pot - -# this is where the XML-GUI resource file goes -rcdir = $(kde_datadir)/ktorrent -rc_DATA = ktorrentui.rc - -KDE_ICON= torrent ktorrent - -appicondir = $(kde_datadir)/ktorrent/icons -appicon_ICON = ktencrypted ktremove ktstart_all ktstart ktstop_all ktstop ktplugins ktinfowidget ktqueuemanager ktupnp ktprefdownloads - -kde_servicetypes_DATA = ktorrentplugin.desktop -EXTRA_DIST = ktorrentplugin.desktop - -if ENABLE_TORRENT_MIMETYPE -mimedir = $(kde_mimedir)/application -mime_DATA = x-bittorrent.desktop -endif - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/apps/ktorrent/groups/Makefile.am b/src/apps/ktorrent/groups/Makefile.am deleted file mode 100644 index c1c3308..0000000 --- a/src/apps/ktorrent/groups/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = -I$(srcdir)/../../../libktorrent $(all_includes) -METASOURCES = AUTO -libgroups_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libgroups.la -noinst_HEADERS = activedownloadsgroup.h activegroup.h activeuploadsgroup.h \ - allgroup.h downloadgroup.h group.h groupmanager.h groupview.h \ - inactivedownloadsgroup.h inactivegroup.h inactiveuploadsgroup.h queueddownloadsgroup.h \ - queueduploadsgroup.h torrentdrag.h torrentgroup.h uploadgroup.h userdownloadsgroup.h \ - useruploadsgroup.h -libgroups_la_SOURCES = activedownloadsgroup.cpp activegroup.cpp \ - activeuploadsgroup.cpp allgroup.cpp downloadgroup.cpp group.cpp groupmanager.cpp groupview.cpp \ - inactivedownloadsgroup.cpp inactivegroup.cpp inactiveuploadsgroup.cpp queueddownloadsgroup.cpp \ - queueduploadsgroup.cpp torrentdrag.cpp torrentgroup.cpp uploadgroup.cpp userdownloadsgroup.cpp \ - useruploadsgroup.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/apps/ktorrent/ktorrent.desktop b/src/apps/ktorrent/ktorrent.desktop index 3e9bdaa..923b8cd 100644 --- a/src/apps/ktorrent/ktorrent.desktop +++ b/src/apps/ktorrent/ktorrent.desktop @@ -1,85 +1,15 @@ [Desktop Entry] -Encoding=UTF-8 Name=KTorrent -Name[sv]=Ktorrent -Name[xx]=xxKTorrentxx + GenericName=BitTorrent Client -GenericName[ar]=زبون BitTorrent -GenericName[bg]=Бит Торент клиент -GenericName[br]=Kliant BitTorrent -GenericName[ca]=Client de BitTorrent -GenericName[cs]=BitTorrent klient -GenericName[da]=BitTorrent klient -GenericName[de]=BitTorrent-Programm -GenericName[el]=Πελάτης BitTorrent -GenericName[es]=Cliente de BitTorrent -GenericName[et]=BitTorrenti klient -GenericName[fa]=کارخواه BitTorrent -GenericName[fr]=Client BitTorrent -GenericName[gl]=Cliente BitTorrent -GenericName[it]=Client BitTorrent -GenericName[ja]=BitTorrent クライアント -GenericName[ka]=BitTorrent-ის კლიენტი -GenericName[lt]=BitTorrent klientas -GenericName[ms]=Klien BitTorrent -GenericName[nb]=BitTorrent-klient -GenericName[nds]=Bittorrent-Programm -GenericName[nl]=BitTorrent-cliënt -GenericName[pa]=BitTorrent ਕਲਾਂਇਟ -GenericName[pl]=Klient BitTorrenta -GenericName[pt]=Cliente de BitTorrent -GenericName[pt_BR]=Cliente BitTorrent -GenericName[ru]=Клиент BitTorrent -GenericName[sk]=BitTorrent Klient -GenericName[sr]=BitTorrent клијент -GenericName[sr@Latn]=BitTorrent klijent -GenericName[sv]=BitTorrent-klient -GenericName[tr]=BitTorrent İstemcisi -GenericName[uk]=Клієнт BitTorrent -GenericName[xx]=xxBitTorrent Clientxx -GenericName[zh_CN]=BitTorrent 客户端 -GenericName[zh_TW]=BitTorrent 客戶端程式 + +Comment=A BitTorrent program for TDE + +Type=Application Exec=ktorrent %i %m -caption "%c" %u Icon=ktorrent -Type=Application -X-DocPath=ktorrent/index.html MimeType=application/x-bittorrent;application/x-torrent; -X-DCOP-ServiceType=Unique -Comment=A BitTorrent program for TDE -Comment[ar]=برنامِج BitTorrent لِــ TDE -Comment[bg]=Бит Торент клиент за TDE -Comment[br]=Ur programm BitTorrent evit TDE -Comment[ca]=Un programa de BitTorrent per TDE -Comment[cs]=BitTorrent pro TDE -Comment[da]=Et BitTorrent program for TDE -Comment[de]=Ein BitTorrent-Programm für TDE -Comment[el]=Μία εφαρμογή BitTorrent για το TDE -Comment[es]=Un programa de BitTorrent para TDE -Comment[et]=TDE BitTorrenti rakendus -Comment[fa]=یک برنامۀ BitTorrent برای TDE -Comment[fr]=Un programme BitTorrent pour TDE -Comment[gl]=Programa de BitTorrent para TDE -Comment[it]=Un programma BitTorrent per TDE -Comment[ja]=TDE のための BitTorrent プログラム -Comment[ka]=BitTorrent-ის პროგრამა TDE-თვის -Comment[lt]=BitTorrent programa skirta TDE aplinkai -Comment[ms]=Program BitTorrent untuk TDE -Comment[nb]=Et BitTorrent-program for TDE -Comment[nds]=En Bittorrent-Programm för TDE -Comment[nl]=Een BitTorrent-programma voor TDE -Comment[pa]=TDE ਲਈ BitTorrent ਕਾਰਜ -Comment[pl]=Program BitTorrent dla TDE -Comment[pt]=Um programa de BitTorrent para o TDE -Comment[pt_BR]=Um programa BitTorrent para o TDE -Comment[ru]=Клиент BitTorrent для TDE -Comment[sk]=BitTorrent klient pre TDE -Comment[sr]=BitTorrent програм за TDE -Comment[sr@Latn]=BitTorrent program za TDE -Comment[sv]=Ett BitTorrent-program för TDE -Comment[tr]=TDE için BitTorrent uygulaması -Comment[uk]=Програма BitTorrent для TDE -Comment[xx]=xxA BitTorrent program for TDExx -Comment[zh_CN]=一个 TDE 的 BitTorrent 程序 -Comment[zh_TW]=TDE 的 BitTorrent 程式 Terminal=false +X-DCOP-ServiceType=Unique +X-DocPath=ktorrent/index.html Categories=Qt;TDE;Network;FileTransfer; diff --git a/src/apps/ktorrent/ktorrentplugin.desktop b/src/apps/ktorrent/ktorrentplugin.desktop index 29436c8..298abb0 100644 --- a/src/apps/ktorrent/ktorrentplugin.desktop +++ b/src/apps/ktorrent/ktorrentplugin.desktop @@ -1,33 +1,5 @@ [Desktop Entry] +Name=KTorrent Plugin + Type=ServiceType X-TDE-ServiceType=KTorrent/Plugin -Name=KTorrent Plugin -Name[ar]=قابس KTorrent -Name[bg]=Приставка за KTorrent -Name[br]=Lugent KTorrent -Name[ca]=Connector KTorrent -Name[cs]=KTorrent modul -Name[da]=KTorrent-plugin -Name[de]=KTorrent-Modul -Name[el]=Πρόσθετο KTorrent -Name[es]=Complemento de KTorrent -Name[et]=KTorrenti plugin -Name[fa]=وصلۀ KTorrent -Name[gl]=Plugin KTorrent -Name[it]=Plugin KTorrent -Name[ja]=KTorrent プラグイン -Name[ka]=KTorrent-ის მოდული -Name[nb]=KTorrent-modul -Name[nds]=KTorrent-Moduul -Name[nl]=KTorrent-plugin -Name[pl]=Wtyczka KTorrent -Name[pt]='Plugin' do KTorrent -Name[pt_BR]=Plugin KTorrent -Name[sr]=KTorrent прикључак -Name[sr@Latn]=KTorrent priključak -Name[sv]=Ktorrent-insticksprogram -Name[tr]=KTorrent Eklentisi -Name[uk]=Втулок KTorrent -Name[xx]=xxKTorrent Pluginxx -Name[zh_CN]=KTorrent 插件 -Name[zh_TW]=KTorrent 外掛程式 diff --git a/src/apps/ktorrent/newui/Makefile.am b/src/apps/ktorrent/newui/Makefile.am deleted file mode 100644 index 871fbb1..0000000 --- a/src/apps/ktorrent/newui/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent/ $(all_includes) - -METASOURCES = AUTO -noinst_LTLIBRARIES = libnewui.la -libnewui_la_LDFLAGS = $(all_libraries) -libnewui_la_SOURCES = button.cpp button.h buttonbar.cpp buttonbar.h comdefs.h \ - ddockwindow.cpp ddockwindow.h dmainwindow.cpp dmainwindow.h docksplitter.cpp \ - docksplitter.h dtabwidget.cpp dtabwidget.h diff --git a/src/apps/ktorrent/x-bittorrent.desktop b/src/apps/ktorrent/x-bittorrent.desktop index 7fba36f..5180adf 100644 --- a/src/apps/ktorrent/x-bittorrent.desktop +++ b/src/apps/ktorrent/x-bittorrent.desktop @@ -1,39 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Comment=BitTorrent Download -Comment[ar]=تنزيل BitTorrent -Comment[bg]=Сваляне на Бит Торент -Comment[ca]=Una baixada BitTorrent -Comment[cs]=Stažení BitTorrent -Comment[cy]=Lawrlwythiad BitTorrent -Comment[da]=BitTorrent-download -Comment[de]=BitTorrent-Herunterladevorgang -Comment[el]=Λήψη BitTorrent -Comment[es]=Descarga de BitTorrent -Comment[et]=BitTorrenti allalaadimine -Comment[fa]=بارگیری BitTorrent -Comment[gl]=Descarga de BitTorrent -Comment[it]=Scaricamento BitTorrent -Comment[ja]=BitTorrent ダウンロード -Comment[ka]=BitTorrent-ით ჩამოტვირვა -Comment[nb]=BitTorrent-nedlasting -Comment[nds]=Bittorrent-Daalladen -Comment[nl]=BitTorrent-download -Comment[pl]=Pobieranie plików BitTorrent -Comment[pt]=Transferência do BitTorrent -Comment[pt_BR]=Um programa BitTorrent para download -Comment[sk]=Sťahovanie BitTorrent -Comment[sr]=BitTorrent преузимање -Comment[sr@Latn]=BitTorrent preuzimanje -Comment[sv]=BitTorrent-nerladdning -Comment[tr]=BitTorrent İndirme -Comment[uk]=Звантаження BitTorrent -Comment[xx]=xxBitTorrent Downloadxx -Comment[zh_CN]=BitTorrent 下载 -Comment[zh_TW]=BitTorrent 下載 + +Type=MimeType Hidden=false -MimeType=application/x-bittorrent Icon=torrent -Type=MimeType +MimeType=application/x-bittorrent Patterns=*.torrent;*.tor X-TDE-AutoEmbed=false diff --git a/src/apps/kttorinfo/Makefile.am b/src/apps/kttorinfo/Makefile.am deleted file mode 100644 index 0736208..0000000 --- a/src/apps/kttorinfo/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -bin_PROGRAMS = kttorinfo -kttorinfo_SOURCES = main.cpp -kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_TDEPARTS) $(LIB_TDEFILE) \ - $(LIB_TDEIO) - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/apps/ktupnptest/Makefile.am b/src/apps/ktupnptest/Makefile.am deleted file mode 100644 index 9920c54..0000000 --- a/src/apps/ktupnptest/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent -I$(srcdir)/../.. $(all_includes) -METASOURCES = AUTO -bin_PROGRAMS = ktupnptest - -ktupnptest_SOURCES = main.cpp upnptestapp.cpp mainwidget.ui -ktupnptest_LDADD = ../../plugins/upnp/libktupnp.la \ - ../../libktorrent/libktorrent.la $(LIB_TDEIO) -ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -noinst_HEADERS = upnptestapp.h -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/libktorrent/Makefile.am b/src/libktorrent/Makefile.am deleted file mode 100644 index 6238869..0000000 --- a/src/libktorrent/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -INCLUDES = -I$(srcdir)/. $(all_includes) -SUBDIRS = util torrent kademlia interfaces migrate mse datachecker net -METASOURCES = AUTO - -lib_LTLIBRARIES = libktorrent.la -libktorrent_la_LDFLAGS = ${KDE_RPATH} $(all_libraries) -release $(VERSION) - -kde_kcfg_DATA = ktorrent.kcfg - -# make sure settings.h is built before anything else -BUILT_SOURCES=settings.h - -noinst_HEADERS = expandablewidget.h functions.h ktversion.h labelview.h \ - pluginmanager.h pluginmanagerprefpage.h libktorrent_export.h -libktorrent_la_SOURCES = expandablewidget.cpp functions.cpp labelview.cpp \ - labelviewitembase.ui pluginmanager.cpp pluginmanagerprefpage.cpp pluginmanagerwidget.ui \ - settings.kcfgc -libktorrent_la_LIBADD = ../libktorrent/net/libnet.la \ - ../libktorrent/datachecker/libdatachecker.la ../libktorrent/mse/libmse.la ../libktorrent/migrate/libmigrate.la \ - ../libktorrent/util/libutil.la ../libktorrent/torrent/libtorrent.la \ - ../libktorrent/kademlia/libkademlia.la ../libktorrent/interfaces/libinterfaces.la $(LIB_TDEPARTS) $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TQT) $(LIB_TDEUI) -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/libktorrent/datachecker/Makefile.am b/src/libktorrent/datachecker/Makefile.am deleted file mode 100644 index b5e9ee0..0000000 --- a/src/libktorrent/datachecker/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I$(srcdir)/.. -I$(srcdir)/. $(all_includes) -METASOURCES = AUTO -libdatachecker_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libdatachecker.la -libdatachecker_la_SOURCES = datachecker.cpp multidatachecker.cpp \ - singledatachecker.cpp datacheckerlistener.cpp datacheckerthread.cpp -noinst_HEADERS = datacheckerlistener.h datacheckerthread.h -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/libktorrent/interfaces/Makefile.am b/src/libktorrent/interfaces/Makefile.am deleted file mode 100644 index dca1a4a..0000000 --- a/src/libktorrent/interfaces/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -libinterfaces_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libinterfaces.la -noinst_HEADERS = plugin.h coreinterface.h guiinterface.h torrentinterface.h \ - monitorinterface.h chunkdownloadinterface.h peerinterface.h torrentfileinterface.h \ - filetreeitem.h filetreediritem.h logmonitorinterface.h ipblockinginterface.h \ - trackerslist.h peersource.h exitoperation.h -libinterfaces_la_SOURCES = plugin.cpp coreinterface.cpp guiinterface.cpp \ - prefpageinterface.cpp torrentinterface.cpp monitorinterface.cpp chunkdownloadinterface.cpp \ - peerinterface.cpp torrentfileinterface.cpp filetreeitem.cpp filetreediritem.cpp \ - functions.cpp logmonitorinterface.cpp ipblockinginterface.cpp trackerslist.cpp \ - peersource.cpp exitoperation.cpp - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/libktorrent/kademlia/Makefile.am b/src/libktorrent/kademlia/Makefile.am deleted file mode 100644 index 1b567b2..0000000 --- a/src/libktorrent/kademlia/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES = -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -libkademlia_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libkademlia.la -noinst_HEADERS = key.h node.h kbucket.h rpccall.h rpcserver.h database.h dht.h \ - rpcmsg.h kclosestnodessearch.h nodelookup.h task.h pack.h \ - taskmanager.h announcetask.h dhttrackerbackend.h dhtbase.h -libkademlia_la_SOURCES = key.cpp node.cpp kbucket.cpp rpccall.cpp rpcserver.cpp \ - database.cpp dht.cpp rpcmsg.cpp kclosestnodessearch.cpp nodelookup.cpp task.cpp \ - pack.cpp taskmanager.cpp announcetask.cpp \ - dhttrackerbackend.cpp dhtbase.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/libktorrent/kademlia/rpcmsg.h b/src/libktorrent/kademlia/rpcmsg.h index acdae14..be8f418 100644 --- a/src/libktorrent/kademlia/rpcmsg.h +++ b/src/libktorrent/kademlia/rpcmsg.h @@ -24,6 +24,7 @@ #include <util/constants.h> #include "key.h" #include "database.h" +#include <libktorrent_export.h> namespace bt { @@ -128,7 +129,7 @@ namespace dht */ MsgBase* MakeRPCMsg(bt::BDictNode* dict,RPCServer* srv); - MsgBase* MakeRPCMsgTest(bt::BDictNode* dict,dht::Method req_method); + LIBKTORRENT_EXPORT MsgBase* MakeRPCMsgTest(bt::BDictNode* dict,dht::Method req_method); class ErrMsg : public MsgBase { diff --git a/src/libktorrent/migrate/Makefile.am b/src/libktorrent/migrate/Makefile.am deleted file mode 100644 index 9bb5528..0000000 --- a/src/libktorrent/migrate/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDES = -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -libmigrate_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libmigrate.la -noinst_HEADERS = migrate.h ccmigrate.h cachemigrate.h -libmigrate_la_SOURCES = migrate.cpp ccmigrate.cpp cachemigrate.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/libktorrent/mse/Makefile.am b/src/libktorrent/mse/Makefile.am deleted file mode 100644 index d6a8ac5..0000000 --- a/src/libktorrent/mse/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -libmse_la_LDFLAGS = -lgmp $(all_libraries) -noinst_LTLIBRARIES = libmse.la -noinst_HEADERS = bigint.h rc4encryptor.h streamsocket.h encryptedauthenticate.h \ - encryptedserverauthenticate.h functions.h -libmse_la_SOURCES = bigint.cpp rc4encryptor.cpp streamsocket.cpp \ - encryptedauthenticate.cpp encryptedserverauthenticate.cpp functions.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/libktorrent/mse/bigint.h b/src/libktorrent/mse/bigint.h index 39bb865..5cd1940 100644 --- a/src/libktorrent/mse/bigint.h +++ b/src/libktorrent/mse/bigint.h @@ -24,6 +24,7 @@ #include <util/constants.h> #include <stdio.h> #include <gmp.h> +#include <libktorrent_export.h> using bt::Uint8; using bt::Uint16; @@ -39,7 +40,7 @@ namespace mse * Class which can hold an arbitrary large integer. This will be a very important part of our * MSE implementation. */ - class BigInt + class LIBKTORRENT_EXPORT BigInt { public: /** diff --git a/src/libktorrent/mse/functions.h b/src/libktorrent/mse/functions.h index 95e8e5d..a5e7cab 100644 --- a/src/libktorrent/mse/functions.h +++ b/src/libktorrent/mse/functions.h @@ -20,6 +20,8 @@ #ifndef MSEFUNCTIONS_H #define MSEFUNCTIONS_H +#include <libktorrent_export.h> + namespace bt { class SHA1Hash; @@ -29,11 +31,11 @@ namespace mse { class BigInt; - void GeneratePublicPrivateKey(BigInt & pub,BigInt & priv); - BigInt DHSecret(const BigInt & our_priv,const BigInt & peer_pub); - bt::SHA1Hash EncryptionKey(bool a,const BigInt & s,const bt::SHA1Hash & skey); + LIBKTORRENT_EXPORT void GeneratePublicPrivateKey(BigInt & pub,BigInt & priv); + LIBKTORRENT_EXPORT BigInt DHSecret(const BigInt & our_priv,const BigInt & peer_pub); + LIBKTORRENT_EXPORT bt::SHA1Hash EncryptionKey(bool a,const BigInt & s,const bt::SHA1Hash & skey); - void DumpBigInt(const TQString & name,const BigInt & bi); + LIBKTORRENT_EXPORT void DumpBigInt(const TQString & name,const BigInt & bi); } #endif diff --git a/src/libktorrent/mse/rc4encryptor.h b/src/libktorrent/mse/rc4encryptor.h index 650b54e..c36b9c6 100644 --- a/src/libktorrent/mse/rc4encryptor.h +++ b/src/libktorrent/mse/rc4encryptor.h @@ -22,6 +22,7 @@ #include <util/sha1hash.h> #include <util/constants.h> +#include <libktorrent_export.h> using bt::Uint8; using bt::Uint32; @@ -31,7 +32,7 @@ namespace mse /** * Helper class to do the actual encryption / decryption */ - class RC4 + class LIBKTORRENT_EXPORT RC4 { Uint8 i,j; Uint8 s[256]; @@ -50,7 +51,7 @@ namespace mse * This class has a static encryption buffer, which makes it not thread safe * because the buffer is not protected by mutexes. */ - class RC4Encryptor + class LIBKTORRENT_EXPORT RC4Encryptor { RC4 enc,dec; public: diff --git a/src/libktorrent/net/Makefile.am b/src/libktorrent/net/Makefile.am deleted file mode 100644 index e67354c..0000000 --- a/src/libktorrent/net/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = -I$(srcdir)/.. -I$(srcdir)/. $(all_includes) -METASOURCES = AUTO -libnet_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libnet.la -noinst_HEADERS = address.h bufferedsocket.h circularbuffer.h downloadthread.h \ - networkthread.h portlist.h socket.h socketmonitor.h speed.h uploadthread.h -libnet_la_SOURCES = address.cpp bufferedsocket.cpp circularbuffer.cpp \ - downloadthread.cpp networkthread.cpp portlist.cpp socket.cpp socketgroup.cpp \ - socketmonitor.cpp speed.cpp uploadthread.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/libktorrent/torrent/Makefile.am b/src/libktorrent/torrent/Makefile.am deleted file mode 100644 index 2f7ba68..0000000 --- a/src/libktorrent/torrent/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libtorrent.la -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 \ - 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 \ - queuemanager.h request.h server.h serverauthenticate.h singlefilecache.h \ - speedestimater.h statsfile.h timeestimator.h torrent.h torrentcontrol.h torrentcreator.h \ - torrentfile.h tracker.h udptracker.h udptrackersocket.h uploadcap.h uploader.h \ - upspeedestimater.h utpex.h value.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 \ - 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 \ - peersourcemanager.cpp peeruploader.cpp piece.cpp preallocationthread.cpp queuemanager.cpp \ - request.cpp server.cpp serverauthenticate.cpp singlefilecache.cpp \ - speedestimater.cpp statsfile.cpp timeestimator.cpp torrent.cpp torrentcontrol.cpp \ - torrentcreator.cpp torrentfile.cpp tracker.cpp udptracker.cpp udptrackersocket.cpp \ - uploadcap.cpp uploader.cpp upspeedestimater.cpp utpex.cpp value.cpp - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/libktorrent/util/Makefile.am b/src/libktorrent/util/Makefile.am deleted file mode 100644 index c7f46ae..0000000 --- a/src/libktorrent/util/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libutil.la -libutil_la_LDFLAGS = $(all_libraries) - - -libutil_la_SOURCES = array.cpp autorotatelogjob.cpp bitset.cpp error.cpp \ - file.cpp fileops.cpp functions.cpp httprequest.cpp log.cpp mmapfile.cpp \ - profiler.cpp ptrmap.cpp sha1hash.cpp sha1hashgen.cpp timer.cpp urlencoder.cpp \ - waitjob.cpp - - - - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) -noinst_HEADERS = autorotatelogjob.h profiler.h diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am deleted file mode 100644 index ad2e28c..0000000 --- a/src/plugins/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -INCLUDES = -METASOURCES = AUTO -SUBDIRS = search infowidget ipfilter logviewer upnp partfileimport scheduler \ - scanfolder rssfeed webinterface zeroconf stats diff --git a/src/plugins/infowidget/Makefile.am b/src/plugins/infowidget/Makefile.am deleted file mode 100644 index ace5e0d..0000000 --- a/src/plugins/infowidget/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -if USE_SYSTEM_GEOIP -libgeoip_system = -lGeoIP -else -libgeoip_builtin = libgeoip_builtin.la -endif - -noinst_LTLIBRARIES = $(libgeoip_builtin) - -kde_module_LTLIBRARIES = ktinfowidgetplugin.la -noinst_HEADERS = infowidgetplugin.h infowidgetprefpage.h trackerview.h GeoIP.h \ - statustab.h fileview.h -ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \ - chunkbar.cpp chunkdownloadview.cpp downloadedchunkbar.cpp flagdb.cpp peerview.cpp \ - ktorrentmonitor.cpp iwfiletreediritem.cpp iwfiletreeitem.cpp infowidgetprefpage.cpp \ - infowidgetpluginsettings.kcfgc iwpref.ui trackerviewbase.ui trackerview.cpp floatspinbox.cpp \ - localefloatvalidator.cpp chunkdownloadviewbase.ui statustabbase.ui statustab.cpp fileview.cpp - -libgeoip_builtin_la_SOURCES = GeoIP.c - -# Libs needed by the plugin -ktinfowidgetplugin_la_LIBADD = ../../libktorrent/libktorrent.la \ - $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - $(libgeoip_builtin) - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktinfowidgetplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(libgeoip_system) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktinfowidgetplugin.desktop - -kde_kcfg_DATA = ktinfowidgetplugin.kcfg - -ktdatadir = $(kde_datadir)/ktorrent/geoip - -SUBDIRS = geoip -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/infowidget/geoip/Makefile.am b/src/plugins/infowidget/geoip/Makefile.am deleted file mode 100644 index 1a7d6c4..0000000 --- a/src/plugins/infowidget/geoip/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/geoip - -if ENABLE_GEOIP -GEOIP_FILES = geoip.dat GeoIP-LICENSE.txt -else -GEOIP_FILES = -endif - -if ENABLE_BUILTIN_COUNTRY_FLAGS -FLAG_FILES = ad.png ae.png af.png ag.png ai.png al.png am.png an.png ao.png \ - aq.png ar.png as.png at.png au.png aw.png az.png ba.png bb.png bd.png be.png \ - bf.png bg.png bh.png bi.png bj.png bm.png bn.png bo.png br.png bs.png bt.png \ - bv.png bw.png by.png bz.png ca.png cc.png cd.png cf.png cg.png ch.png ci.png \ - ck.png cl.png cm.png cn.png co.png cr.png cs.png cu.png cv.png cx.png cy.png \ - cz.png de.png dj.png dk.png dm.png do.png dz.png ec.png ee.png eg.png eh.png \ - er.png es.png et.png eu.png fi.png fj.png fk.png fm.png fo.png fr.png ga.png \ - gb.png gd.png ge.png gf.png gh.png gi.png gl.png gm.png gn.png gp.png gq.png \ - gr.png gs.png gt.png gu.png gw.png gy.png hk.png hm.png hn.png hr.png ht.png \ - hu.png id.png ie.png il.png in.png io.png iq.png ir.png is.png it.png jm.png \ - jo.png jp.png ke.png kg.png kh.png ki.png km.png kn.png kp.png kr.png kw.png \ - ky.png kz.png la.png lb.png lc.png li.png lk.png lr.png ls.png lt.png lu.png \ - lv.png ly.png ma.png mc.png md.png mg.png mh.png mk.png ml.png mm.png mn.png \ - mo.png mp.png mq.png mr.png ms.png mt.png mu.png mv.png mw.png mx.png my.png \ - mz.png na.png nc.png ne.png nf.png ng.png ni.png nl.png no.png np.png nr.png \ - nu.png nz.png om.png pa.png pe.png pf.png pg.png ph.png pk.png pl.png pm.png \ - pn.png pr.png ps.png pt.png pw.png py.png qa.png re.png ro.png ru.png rw.png \ - sa.png sb.png sc.png sd.png se.png sg.png sh.png si.png sj.png sk.png sl.png \ - sm.png sn.png so.png sr.png st.png sv.png sy.png sz.png tc.png td.png tf.png \ - tg.png th.png tj.png tk.png tl.png tm.png tn.png to.png tp.png tr.png tt.png \ - tv.png tw.png tz.png ua.png ug.png um.png us.png uy.png uz.png va.png vc.png \ - ve.png vg.png vi.png vn.png vu.png wf.png ws.png ye.png yt.png yu.png za.png \ - zm.png zw.png FLAGS_LICENCE -else -FLAG_FILES = -endif - -ktdata_DATA = $(FLAG_FILES) $(GEOIP_FILES) - diff --git a/src/plugins/infowidget/ktinfowidgetplugin.desktop b/src/plugins/infowidget/ktinfowidgetplugin.desktop index 8ea5368..097b081 100644 --- a/src/plugins/infowidget/ktinfowidgetplugin.desktop +++ b/src/plugins/infowidget/ktinfowidgetplugin.desktop @@ -1,29 +1,6 @@ [Desktop Entry] -Name=SearchPlugin -Name[bg]=Приставка за търсене -Name[br]=Lugent klask -Name[da]=SøgePlugin -Name[de]=Suche-Modul -Name[el]=Πρόσθετο αναζήτησης -Name[es]=Complemento de búsqueda -Name[et]=Otsimisplugin -Name[fa]=وصلۀ جستجو -Name[it]=Plugin di ricerca -Name[nb]=Søkemodul -Name[nds]=Söök-Moduul -Name[nl]=Zoekplugin -Name[pl]=Wtyczka wyszukiwania -Name[pt]='Plugin' de Procura -Name[pt_BR]=Plugin de Busca -Name[sk]=Vyhľadávací Plugin -Name[sr]=Прикључак претраге -Name[sr@Latn]=Priključak pretrage -Name[sv]=Sökinsticksprogram -Name[tr]=Arama Eklentisi -Name[uk]=Втулок пошуку -Name[xx]=xxSearchPluginxx -Name[zh_CN]=搜索插件 -Name[zh_TW]=搜尋外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin +Name=InfoWidgetPlugin + Type=Service X-TDE-Library=ktinfowidgetplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/ipfilter/Makefile.am b/src/plugins/ipfilter/Makefile.am deleted file mode 100644 index c2395b0..0000000 --- a/src/plugins/ipfilter/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktipfilterplugin.la -noinst_HEADERS = ipfilterplugin.h ipblockingprefpage.h antip2p.h \ - convertdialog.h -ktipfilterplugin_la_SOURCES = ipfilterplugin.cpp ipblockingpref.ui \ - ipblockingprefpage.cpp ipfilterpluginsettings.kcfgc antip2p.cpp convert_dlg.ui \ - convertdialog.cpp - -# Libs needed by the plugin -ktipfilterplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \ - ../../libktorrent/libktorrent.la $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktipfilterplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktipfilterplugin.desktop - -kde_kcfg_DATA = ktipfilterplugin.kcfg - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/ipfilter/ktipfilterplugin.desktop b/src/plugins/ipfilter/ktipfilterplugin.desktop index 4435c28..5f34e2b 100644 --- a/src/plugins/ipfilter/ktipfilterplugin.desktop +++ b/src/plugins/ipfilter/ktipfilterplugin.desktop @@ -1,56 +1,8 @@ [Desktop Entry] Name=IPFilterPlugin -Name[bg]=Приставка за IP-филтриране -Name[br]=Lugent Sil IP -Name[de]=IP-Filter-Modul -Name[el]=Πρόσθετο φίλτρου IP -Name[es]=Filtro de IP -Name[et]=IP-filtri plugin -Name[it]=Plugin filtro ip -Name[nb]=IP-filtermodul -Name[nds]="IP-Filter"-Moduul -Name[nl]=IPFilter-plugin -Name[pl]=Wtyczka filtru IP -Name[pt]=Filtro de IPs -Name[pt_BR]=Plugin de Filtro de IP -Name[sk]=IPFilter Plugin -Name[sr]=Прикључак IP филтера -Name[sr@Latn]=Priključak IP filtera -Name[sv]=IP-filterinsticksprogram -Name[tr]=IP Filtre Eklentisi -Name[xx]=xxIPFilterPluginxx -Name[zh_CN]=IP 过滤器插件 -Name[zh_TW]=IPFilter外掛程式 + Comment=IP filter plugin for KTorrent -Comment[ar]=قابس مرشح IP لِــ KTorrent -Comment[bg]=Приставка за IP-филтриране (KTorrent) -Comment[br]=Lugent sil IP evit KTorrentt -Comment[ca]=Connector de filtres d'IP per a Ktorrent -Comment[cs]=IP filtr modul pro KTorrent -Comment[de]=IP-Filter-Modul für KTorrent -Comment[el]=Πρόσθετο φίλτρου IP για το KTorrent -Comment[es]=Complemento de filtro de IP de KTorrent -Comment[et]=KTorrenti IP-filtri plugin -Comment[fa]=وصلۀ پالایۀ IP برای KTorrent -Comment[gl]=Plugin de filtrado de IPs para KTorrent -Comment[it]=Plugin filtro ip per KTorrent -Comment[ja]=KTorrent のための IP フィルタプラグイン -Comment[ka]=KTorrent-ის IP ფილტრაციის მოდული -Comment[nb]=IP-filtermodul for KTorrent -Comment[nds]="IP-Filter"-Moduul för KTorrent -Comment[nl]=Plugin om op IP-adressen te filteren in KTorrent -Comment[pl]=Wtyczka filtru IP dla KTorrent -Comment[pt]='Plugin' de filtragem de IPs do KTorrent -Comment[pt_BR]=Plugin de Filtro de IP para o KTorrent -Comment[sk]=IP filter plugin pre KTorrent -Comment[sr]=Прикључак IP филтера за KTorrent -Comment[sr@Latn]=Priključak IP filtera za KTorrent -Comment[sv]=IP-filterinsticksprogram för Ktorrent -Comment[tr]=KTorrent için IP filtre eklentisi -Comment[uk]=Втулок фільтрування IP для KTorrent -Comment[xx]=xxIP filter plugin for KTorrentxx -Comment[zh_CN]=KTorrent 的 IP 过滤器插件 -Comment[zh_TW]=KTorrent IP 過濾器外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktipfilterplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/logviewer/Makefile.am b/src/plugins/logviewer/Makefile.am deleted file mode 100644 index e11e126..0000000 --- a/src/plugins/logviewer/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) - -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktlogviewerplugin.la - - -# Libs needed by the plugin -ktlogviewerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \ - ../../libktorrent/libktorrent.la $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktlogviewerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktlogviewerplugin.desktop - -kde_kcfg_DATA = ktlogviewerplugin.kcfg - -noinst_HEADERS = logviewerplugin.h logviewer.h logprefpage.h logprefwidget.h \ - logflags.h -ktlogviewerplugin_la_SOURCES = logviewerplugin.cpp logviewer.cpp \ - logprefpage.cpp logprefwidgetbase.ui logprefwidget.cpp logviewerpluginsettings.kcfgc \ - logflags.cpp -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/logviewer/ktlogviewerplugin.desktop b/src/plugins/logviewer/ktlogviewerplugin.desktop index 4d7c9ad..8b09332 100644 --- a/src/plugins/logviewer/ktlogviewerplugin.desktop +++ b/src/plugins/logviewer/ktlogviewerplugin.desktop @@ -1,26 +1,6 @@ [Desktop Entry] Name=LogViewerPlugin -Name[bg]=Приставка за преглед на журнални файлове -Name[de]=Modul zur Anzeige von Protokolldateien -Name[el]=Πρόσθετο προβολής καταγραφής -Name[es]=Visualizador del registro -Name[et]=Loginäitaja plugin -Name[it]=Plugin visore registro -Name[nb]=Logvisningsmodul -Name[nds]=Logbookkieker-Moduul -Name[nl]=Logweergaveplugin -Name[pl]=Wtyczka wyświetlania dziennika -Name[pt]=Visualizador do Registo -Name[pt_BR]=Plugin de Vizualização de Log -Name[sk]=LogViewer Plugin -Name[sr]=Прикључак приказа дневника -Name[sr@Latn]=Priključak prikaza dnevnika -Name[sv]=Loggvisningsinsticksprogram -Name[tr]=Kayıt Görüntü Eklentisi -Name[uk]=Втулок перегляду журналу -Name[xx]=xxLogViewerPluginxx -Name[zh_CN]=日志查看器插件 -Name[zh_TW]=紀錄檢視器外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktlogviewerplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/partfileimport/Makefile.am b/src/plugins/partfileimport/Makefile.am deleted file mode 100644 index 45fb6ba..0000000 --- a/src/plugins/partfileimport/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktpartfileimportplugin.la -noinst_HEADERS = partfileimportplugin.h importdialog.h -ktpartfileimportplugin_la_SOURCES = partfileimportplugin.cpp importdlgbase.ui importdialog.cpp - -# Libs needed by the plugin -ktpartfileimportplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \ - ../../libktorrent/libktorrent.la \ - $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktpartfileimportplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -rcdir = $(kde_datadir)/ktorrent -rc_DATA = ktpartfileimportpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktpartfileimportplugin.desktop - -# kde_kcfg_DATA = ktpartfileimportplugin.kcfg - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/partfileimport/ktpartfileimportplugin.desktop b/src/plugins/partfileimport/ktpartfileimportplugin.desktop index e84cbaf..cd4276c 100644 --- a/src/plugins/partfileimport/ktpartfileimportplugin.desktop +++ b/src/plugins/partfileimport/ktpartfileimportplugin.desktop @@ -1,25 +1,6 @@ [Desktop Entry] Name=PartialFileImportPlugin -Name[bg]=Приставка за частично импортиране на файлове -Name[de]=Teildatei-Import-Modul -Name[el]=Πρόσθετο εισαγωγής μερικής λήψης -Name[es]=Importación de ficheros parciales -Name[et]=Osalise faili impordi plugin -Name[it]=Plugin importazione file parziali -Name[nb]=Filimportmodul -Name[nds]=Importmoduul för Deeldateien -Name[nl]=Import gedeeltelijke bestanden -Name[pl]=Wtyczka importu części plików -Name[pt]=Importação de Ficheiros Parciais -Name[pt_BR]=Plugin de Importação Parcial de Arquivo -Name[sk]=PartialFileImport Plugin -Name[sr]=Прикључак за увоз недовршених фајлова -Name[sr@Latn]=Priključak za uvoz nedovršenih fajlova -Name[sv]=Insticksprogram för partiell filimport -Name[tr]=Tamamlanmamış Dosya Alma Eklentisi -Name[xx]=xxPartialFileImportPluginxx -Name[zh_CN]=部分文件导入插件 -Name[zh_TW]=PartialFileImport外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktpartfileimportplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/rssfeed/Makefile.am b/src/plugins/rssfeed/Makefile.am deleted file mode 100644 index e5fa2ed..0000000 --- a/src/plugins/rssfeed/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktrssfeedplugin.la - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktrssfeedplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktrssfeedplugin -# plugins_DATA = ktrssfeedpluginui.rc - -# Install the desktop file needed to detect the plugin - -rcdir = $(kde_datadir)/ktorrent - -kde_kcfg_DATA = ktrssfeedplugin.kcfg -kde_services_DATA = ktrssfeedplugin.desktop - -noinst_HEADERS = rssfeedplugin.h rssfeedmanager.h rssfeed.h rssfilter.h \ - rssarticle.h rsslinkdownloader.h -ktrssfeedplugin_la_SOURCES = rssfeedplugin.cpp rssfeedmanager.cpp \ - rssfeedwidget.ui rssfeed.cpp rssfilter.cpp rssarticle.cpp rsslinkdownloader.cpp -ktrssfeedplugin_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) rss/librsslocal.la \ - ../../libktorrent/libktorrent.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEPARTS) - -SUBDIRS = rss -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/rssfeed/ktrssfeedplugin.desktop b/src/plugins/rssfeed/ktrssfeedplugin.desktop index 99f6fb3..b8998b4 100644 --- a/src/plugins/rssfeed/ktrssfeedplugin.desktop +++ b/src/plugins/rssfeed/ktrssfeedplugin.desktop @@ -1,22 +1,6 @@ [Desktop Entry] Name=RssFeedPlugin -Name[bg]=Приставка за RssFeed -Name[de]=RSS-Nachrichtenquellen-Modul -Name[el]=Πρόσθετο ροών Rss -Name[et]=RSS-kanali plugin -Name[it]=Plugin Fonti notizie -Name[nb]=RSS-modul -Name[nds]=RSS-Moduul -Name[pl]=Wtyczka kanały RSS -Name[pt_BR]=Plugin de RssFeed -Name[sk]=RssFeed Plugin -Name[sr]=Прикључак Rss довода -Name[sr@Latn]=Priključak Rss dovoda -Name[sv]=RSS-kanalinsticksprogram -Name[tr]=RSS Besleme Eklentisi -Name[uk]=Втулок подач RSS -Name[xx]=xxRssFeedPluginxx -Name[zh_CN]=RSS 种子插件 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktrssfeedplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/rssfeed/rss/Makefile.am b/src/plugins/rssfeed/rss/Makefile.am deleted file mode 100644 index 8053f92..0000000 --- a/src/plugins/rssfeed/rss/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -INCLUDES = \ - -I$(top_srcdir)/src \ - $(all_includes) - -noinst_LTLIBRARIES = \ - librsslocal.la - -noinst_HEADERS = article.h document.h global.h image.h textinput.h \ - loader.h librss.h - -librsslocal_la_SOURCES = article.cpp document.cpp image.cpp textinput.cpp \ - tools_p.cpp loader.cpp - -librsslocal_la_METASOURCES = AUTO - -check_PROGRAMS = testlibrss -testlibrss_SOURCES = testlibrss.cpp -testlibrss_LDFLAGS = $(all_libraries) -testlibrss_LDADD = librsslocal.la $(LIB_TDEIO) -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/scanfolder/Makefile.am b/src/plugins/scanfolder/Makefile.am deleted file mode 100644 index 49ba5a7..0000000 --- a/src/plugins/scanfolder/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktscanfolderplugin.la - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktscanfolderplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktscanfolderplugin -# plugins_DATA = ktscanfolderpluginui.rc - -# Install the desktop file needed to detect the plugin - -rcdir = $(kde_datadir)/ktorrent - -kde_kcfg_DATA = ktscanfolderplugin.kcfg -kde_services_DATA = ktscanfolderplugin.desktop - -noinst_HEADERS = scanfolderplugin.h scanfolderprefpage.h \ - scanfolderprefpagewidget.h scanfolder.h -ktscanfolderplugin_la_SOURCES = scanfolderplugin.cpp \ - scanfolderpluginsettings.kcfgc scanfolderprefpage.cpp sfprefwidgetbase.ui scanfolderprefpagewidget.cpp \ - scanfolder.cpp -ktscanfolderplugin_la_LIBADD = $(LIB_TDEPARTS) ../../libktorrent/libktorrent.la \ - $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/scanfolder/ktscanfolderplugin.desktop b/src/plugins/scanfolder/ktscanfolderplugin.desktop index 53c7a6c..06b51ba 100644 --- a/src/plugins/scanfolder/ktscanfolderplugin.desktop +++ b/src/plugins/scanfolder/ktscanfolderplugin.desktop @@ -1,26 +1,6 @@ [Desktop Entry] Name=ScanFolderPlugin -Name[bg]=Приставка за сканиране -Name[cs]=Modul prohledávání složek -Name[da]=Plugin for mappesøgning -Name[de]=Ordner-Durchsuchen-Modul -Name[el]=Πρόσθετο σάρωσης φακέλων -Name[et]=Kataloogi uurimise plugin -Name[it]=Plugin scansione cartella -Name[nb]=Katalogundersøkingsmdoul -Name[nds]=Moduul för't Dörkieken vun Ornern -Name[nl]=Mapscanplugin -Name[pl]=Wtyczka przeszukiwania katalogów -Name[pt_BR]=Plugins de Busca -Name[sk]=ScanFolder Plugin -Name[sr]=Прикључак прегледа фасцикле -Name[sr@Latn]=Priključak pregleda fascikle -Name[sv]=Insticksprogram för katalogsökning -Name[tr]=Dizin Tarama Eklentisi -Name[uk]=Втулок сканування тек -Name[xx]=xxScanFolderPluginxx -Name[zh_CN]=扫描文件夹插件 -Name[zh_TW]=掃描資料夾外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktscanfolderplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/scheduler/Makefile.am b/src/plugins/scheduler/Makefile.am deleted file mode 100644 index 5b388eb..0000000 --- a/src/plugins/scheduler/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktschedulerplugin.la -noinst_HEADERS = schedulerplugin.h bwscheduler.h schedulerprefpagewidget.h \ - bwsprefpagewidget.h bwswidget.h schedulerprefpage.h -ktschedulerplugin_la_SOURCES = schedulerplugin.cpp \ - schedulerpluginsettings.kcfgc bwscheduler.cpp schedulerprefpagewidget.cpp schedulerpage.ui bwspage.ui \ - bwsprefpagewidget.cpp bwswidget.cpp schedulerprefpage.cpp - -# Libs needed by the plugin -ktschedulerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEPARTS) \ - ../../libktorrent/libktorrent.la \ - $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktschedulerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktschedulerplugin -# plugins_DATA = ktschedulerpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktschedulerplugin.desktop - -kde_kcfg_DATA = ktschedulerplugin.kcfg - -kticonsdir = $(kde_datadir)/ktorrent/icons - -kticons_DATA = cell-a-0000.png cell-a-0001.png cell-a-0002.png cell-a-0003.png\ - cell-a-0004.png cell-b-0000.png cell-b-0001.png cell-b-0002.png\ - cell-b-0003.png cell-b-0004.png -rcdir = $(kde_datadir)/ktorrent -rc_DATA = ktschedulerpluginui.rc -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/scheduler/bwsprefpage.cpp b/src/plugins/scheduler/bwsprefpage.cpp deleted file mode 100644 index e69de29..0000000 --- a/src/plugins/scheduler/bwsprefpage.cpp +++ /dev/null diff --git a/src/plugins/scheduler/bwsprefpage.h b/src/plugins/scheduler/bwsprefpage.h deleted file mode 100644 index e69de29..0000000 --- a/src/plugins/scheduler/bwsprefpage.h +++ /dev/null diff --git a/src/plugins/scheduler/ktschedulerplugin.desktop b/src/plugins/scheduler/ktschedulerplugin.desktop index ea35426..7ec6150 100644 --- a/src/plugins/scheduler/ktschedulerplugin.desktop +++ b/src/plugins/scheduler/ktschedulerplugin.desktop @@ -1,26 +1,6 @@ [Desktop Entry] Name=SchedulerPlugin -Name[bg]=Приставка за график -Name[cs]=Modul plánování -Name[da]=Skemalægger-Plugin -Name[de]=Planer-Modul -Name[el]=Πρόσθετο προγραμματισμού -Name[et]=Ajastamisplugin -Name[it]=Plugin pianificatore -Name[nb]=Planleggermodul -Name[nds]=Planer-Moduul -Name[nl]=Plannerplugin -Name[pl]=Wtyczka planowanie transferu -Name[pt_BR]=Plugin de agendamento -Name[sk]=Scheduler Plugin -Name[sr]=Прикључак распоређивања -Name[sr@Latn]=Priključak raspoređivanja -Name[sv]=Insticksprogram för schemaläggning -Name[tr]=Zamanlayıcı Eklentisi -Name[uk]=Втулок розкладу -Name[xx]=xxSchedulerPluginxx -Name[zh_CN]=带宽规划器插件 -Name[zh_TW]=排程器外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktschedulerplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/scheduler/schedulerplugin.h b/src/plugins/scheduler/schedulerplugin.h index 9143d99..2dec571 100644 --- a/src/plugins/scheduler/schedulerplugin.h +++ b/src/plugins/scheduler/schedulerplugin.h @@ -33,8 +33,6 @@ class TQString; namespace kt { - class BWSPrefPage; - /** * @author Ivan Vasic <ivasic@gmail.com> * @brief KTorrent scheduler plugin. diff --git a/src/plugins/search/Makefile.am b/src/plugins/search/Makefile.am deleted file mode 100644 index 9e5b312..0000000 --- a/src/plugins/search/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktsearchplugin.la -noinst_HEADERS = searchplugin.h searchprefpage.h searchtab.h searchenginelist.h -ktsearchplugin_la_SOURCES = searchplugin.cpp htmlpart.cpp searchbar.ui \ - searchpref.ui searchwidget.cpp searchprefpage.cpp searchpluginsettings.kcfgc \ - searchtab.cpp searchenginelist.cpp - -# Libs needed by the plugin -ktsearchplugin_la_LIBADD = ../../libktorrent/libktorrent.la \ - $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktsearchplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktsearchplugin.desktop - -kde_kcfg_DATA = ktsearchplugin.kcfg - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/search/ktsearchplugin.desktop b/src/plugins/search/ktsearchplugin.desktop index 9feabe0..c0f471b 100644 --- a/src/plugins/search/ktsearchplugin.desktop +++ b/src/plugins/search/ktsearchplugin.desktop @@ -1,60 +1,8 @@ [Desktop Entry] Name=SearchPlugin -Name[bg]=Приставка за търсене -Name[br]=Lugent klask -Name[da]=SøgePlugin -Name[de]=Suche-Modul -Name[el]=Πρόσθετο αναζήτησης -Name[es]=Complemento de búsqueda -Name[et]=Otsimisplugin -Name[fa]=وصلۀ جستجو -Name[it]=Plugin di ricerca -Name[nb]=Søkemodul -Name[nds]=Söök-Moduul -Name[nl]=Zoekplugin -Name[pl]=Wtyczka wyszukiwania -Name[pt]='Plugin' de Procura -Name[pt_BR]=Plugin de Busca -Name[sk]=Vyhľadávací Plugin -Name[sr]=Прикључак претраге -Name[sr@Latn]=Priključak pretrage -Name[sv]=Sökinsticksprogram -Name[tr]=Arama Eklentisi -Name[uk]=Втулок пошуку -Name[xx]=xxSearchPluginxx -Name[zh_CN]=搜索插件 -Name[zh_TW]=搜尋外掛程式 + Comment=Search plugin for KTorrent -Comment[ar]=قابس البحث لِــ KTorrent -Comment[bg]=Приставка за търсене (KTorrent) -Comment[br]=Lugent klask evit KTorrent -Comment[ca]=Connector de cerca per a KTorrent -Comment[cs]=Vyhledávací modul pro KTorrent -Comment[da]=Søge-plugin for KTorrent -Comment[de]=Suche-Modul für KTorrent -Comment[el]=Πρόσθετο αναζήτησης για το KTorrent -Comment[es]=Complemento de búsqueda para KTorrent -Comment[et]=KTorrenti otsimisplugin -Comment[fa]=وصلۀ جستجو برای KTorrent -Comment[gl]=Plugin de procuras para KTorrent -Comment[it]=Plugin di ricerca per KTorrent -Comment[ja]=KTorrent のための検索プラグイン -Comment[ka]=ძებნის მოდული KTorrent-თვის -Comment[nb]=Søkemodul for KTorrent -Comment[nds]=Söök-Moduul för KTorrent -Comment[nl]=Zoekplugin voor KTorrent -Comment[pl]=Wtyczka wyszukiwania dla KTorrent -Comment[pt]='Plugin' de procura para o KTorrent -Comment[pt_BR]=Busca de plug-in para o KTorrent -Comment[sk]=Vyhľadávací plugin pre KTorrent -Comment[sr]=Прикључак претраге за KTorrent -Comment[sr@Latn]=Priključak pretrage za KTorrent -Comment[sv]=Sökinsticksprogram för Ktorrent -Comment[tr]=KTorrent için arama eklentisi -Comment[uk]=Втулок пошуку для KTorrent -Comment[xx]=xxSearch plugin for KTorrentxx -Comment[zh_CN]=KTorrent 的搜索插件 -Comment[zh_TW]=KTorrent 搜尋外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktsearchplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/stats/Makefile.am b/src/plugins/stats/Makefile.am deleted file mode 100644 index efe26b6..0000000 --- a/src/plugins/stats/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes) - -METASOURCES = AUTO - -kde_module_LTLIBRARIES = ktstatsplugin.la - -ktstatsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(all_libraries) -ktstatsplugin_la_SOURCES = ChartDrawerData.cpp ChartDrawer.cpp statsspdwgt.ui statsconwgt.ui StatsSpd.cpp StatsCon.cpp sprefwgt.ui statspluginsettings.kcfgc \ - StatsPluginPrefsPage.cpp StatsPluginPrefs.cpp statsplugin.cpp - -ktstatsplugin_la_LIBADD = $(LIB_TQT) ../../libktorrent/libktorrent.la - -noinst_HEADERS = ChartDrawerData.h ChartDrawer.h StatsSpd.h StatsCon.h StatsPluginPrefsPage.h StatsPluginPrefs.h statsplugin.h - -kde_services_DATA = ktstatsplugin.desktop -kde_kcfg_DATA = ktstatsplugin.kcfg -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/stats/ktstatsplugin.desktop b/src/plugins/stats/ktstatsplugin.desktop index 21a2901..a67ca35 100644 --- a/src/plugins/stats/ktstatsplugin.desktop +++ b/src/plugins/stats/ktstatsplugin.desktop @@ -1,24 +1,6 @@ [Desktop Entry] -Type=Service Name=StatsPlugin -Name[bg]=Приставка за статистика -Name[de]=Statistik-Modul -Name[es]=Complemento de estadísticas -Name[et]=Statistikaplugin -Name[it]=Plugin statistiche -Name[nds]=Statistik-Moduul -Name[nl]=Statistiekenplugin -Name[pl]=Wtyczka statystyk -Name[pt]='Plugin' de Estatísticas -Name[pt_BR]=Plugin de Estatísticas -Name[sr]=Прикључак за статистику -Name[sr@Latn]=Priključak za statistiku -Name[sv]=Statistikinsticksprogram -Name[tr]=Arama Eklentisi -Name[uk]=Втулок статистики -Name[xx]=xxStatsPluginxx -Name[zh_CN]=统计插件 -Comment= -Comment[xx]=xxxx -X-TDE-ServiceTypes=KTorrent/Plugin + +Type=Service X-TDE-Library=ktstatsplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/upnp/Makefile.am b/src/plugins/upnp/Makefile.am deleted file mode 100644 index 467ebc4..0000000 --- a/src/plugins/upnp/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -libktupnp_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libktupnp.la -libktupnp_la_SOURCES = soap.cpp upnpdescriptionparser.cpp upnpmcastsocket.cpp\ - upnprouter.cpp - -kde_module_LTLIBRARIES = ktupnpplugin.la -noinst_HEADERS = upnpplugin.h upnpmcastsocket.h upnprouter.h upnpprefpage.h \ - upnpprefwidget.h upnpdescriptionparser.h soap.h -ktupnpplugin_la_SOURCES = upnpplugin.cpp upnpprefpage.cpp upnpwidget.ui \ - upnpprefwidget.cpp upnppluginsettings.kcfgc - -# Libs needed by the plugin -ktupnpplugin_la_LIBADD = libktupnp.la \ - $(LIB_TDEPARTS) ../../libktorrent/libktorrent.la \ - $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - - - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktupnpplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktupnpplugin.desktop - -kde_kcfg_DATA = ktupnpplugin.kcfg - - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/upnp/ktupnpplugin.desktop b/src/plugins/upnp/ktupnpplugin.desktop index ea17434..f2a529a 100644 --- a/src/plugins/upnp/ktupnpplugin.desktop +++ b/src/plugins/upnp/ktupnpplugin.desktop @@ -1,26 +1,6 @@ [Desktop Entry] Name=UPnPPlugin -Name[bg]=Приставка UPnP -Name[br]=Lugent UPnP -Name[de]=UPnP-Modul -Name[el]=Πρόσθετο UPnP -Name[es]=Complemento UPnP -Name[et]=UPnP plugin -Name[it]=Plugin UPnP -Name[nb]=UPnP-modul -Name[nds]=UPnP-Moduul -Name[nl]=UPnP-plugin -Name[pl]=Wtyczka UPnP -Name[pt]='Plugin' UPnP -Name[pt_BR]=Plugin UPnP -Name[sk]=UPnP Plugin -Name[sr]=Прикључак за UPnP -Name[sr@Latn]=Priključak za UPnP -Name[sv]=UPnP-insticksprogram -Name[tr]=UPnP Eklentisi -Name[xx]=xxUPnPPluginxx -Name[zh_CN]=UPnP 插件 -Name[zh_TW]=UPnP外掛程式 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktupnpplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/webinterface/Makefile.am b/src/plugins/webinterface/Makefile.am deleted file mode 100644 index 5492966..0000000 --- a/src/plugins/webinterface/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes) - -METASOURCES = AUTO -kde_module_LTLIBRARIES = ktwebinterfaceplugin.la -noinst_HEADERS = webinterfaceplugin.h httpserver.h php_handler.h \ - php_interface.h webinterfaceprefwidget.h webinterfaceprefpage.h httpclienthandler.h \ - httpresponseheader.h -ktwebinterfaceplugin_la_SOURCES = webinterfaceplugin.cpp httpserver.cpp \ - php_handler.cpp php_interface.cpp webinterfacepref.ui \ - webinterfacepluginsettings.kcfgc webinterfaceprefwidget.cpp webinterfaceprefpage.cpp \ - httpclienthandler.cpp httpresponseheader.cpp -# Libs needed by the plugin -ktwebinterfaceplugin_la_LIBADD = ../../libktorrent/libktorrent.la \ - $(LIB_TDEHTML) $(LIB_TDEPARTS) $(LIB_TQT) \ - $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) - -# LD flags for the plugin -# -module says: this is a module, i.e. something you're going to dlopen -# so e.g. it has no version number like a normal shared lib would have. -ktwebinterfaceplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) - -# rc file containing the GUI for the plugin -# pluginsdir = $(kde_datadir)/ktsearchplugin -# plugins_DATA = ktsearchpluginui.rc - -# Install the desktop file needed to detect the plugin -kde_services_DATA = ktwebinterfaceplugin.desktop - -kde_kcfg_DATA = ktwebinterfaceplugin.kcfg - -ktdatadir = $(kde_datadir)/ktorrent/www - -SUBDIRS = www -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/plugins/webinterface/ktwebinterfaceplugin.desktop b/src/plugins/webinterface/ktwebinterfaceplugin.desktop index aa2dfa5..8e65383 100644 --- a/src/plugins/webinterface/ktwebinterfaceplugin.desktop +++ b/src/plugins/webinterface/ktwebinterfaceplugin.desktop @@ -1,22 +1,6 @@ [Desktop Entry] Name=WebInterface -Name[bg]=Уеб интерфейс -Name[da]=Web-grænseflade -Name[de]=Web-Schnittstelle -Name[et]=Veebiliides -Name[it]=Interfaccia Web -Name[nb]=Internettgrensesnitt -Name[nds]=Nettkoppelsteed -Name[nl]=Webinterface -Name[pl]=Interfejs WWW -Name[pt]=Interface Web -Name[sr]=Веб интерфејс -Name[sr@Latn]=Veb interfejs -Name[sv]=Webb-gränssnitt -Name[tr]=Ağ Arayüzü -Name[uk]=Веб-інтерфейс -Name[xx]=xxWebInterfacexx -Name[zh_CN]=Web 界面 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktwebinterfaceplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/plugins/webinterface/www/Makefile.am b/src/plugins/webinterface/www/Makefile.am deleted file mode 100644 index 8a92573..0000000 --- a/src/plugins/webinterface/www/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -METASOURCES = AUTO -SUBDIRS = default mobile coldmilk - - - diff --git a/src/plugins/webinterface/www/coldmilk/Makefile.am b/src/plugins/webinterface/www/coldmilk/Makefile.am deleted file mode 100644 index d6a5f08..0000000 --- a/src/plugins/webinterface/www/coldmilk/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk - -ktdata_DATA = favicon.ico icon.png interface.js interface.php login.html page_update.js rest.php shutdown.php style.css - -SUBDIRS= icons diff --git a/src/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am deleted file mode 100644 index 7380c25..0000000 --- a/src/plugins/webinterface/www/coldmilk/icons/16x16/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/16x16/ - -ktdata_DATA = edit_user.png high_priority.png low_priority.png normal_priority.png only_seed.png - diff --git a/src/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am deleted file mode 100644 index 2bd411f..0000000 --- a/src/plugins/webinterface/www/coldmilk/icons/22x22/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/22x22/ - -ktdata_DATA = exit.png ktstart_all.png ktstop_all.png remove.png start.png stop.png - diff --git a/src/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am deleted file mode 100644 index a2b93df..0000000 --- a/src/plugins/webinterface/www/coldmilk/icons/32x32/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/32x32/ - -ktdata_DATA = configure.png extender_opened.png fileopen.png folder1.png - diff --git a/src/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am deleted file mode 100644 index 9318a0c..0000000 --- a/src/plugins/webinterface/www/coldmilk/icons/48x48/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/48x48/ - -ktdata_DATA = exit.png switchuser.png - diff --git a/src/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am deleted file mode 100644 index 3ff3ae0..0000000 --- a/src/plugins/webinterface/www/coldmilk/icons/64x64/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/coldmilk/icons/64x64/ - -ktdata_DATA = down.png folder1_man.png looknfeel.png - diff --git a/src/plugins/webinterface/www/coldmilk/icons/Makefile.am b/src/plugins/webinterface/www/coldmilk/icons/Makefile.am deleted file mode 100644 index cbe7db5..0000000 --- a/src/plugins/webinterface/www/coldmilk/icons/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS= 16x16 22x22 32x32 48x48 64x64 diff --git a/src/plugins/webinterface/www/default/Makefile.am b/src/plugins/webinterface/www/default/Makefile.am deleted file mode 100644 index 01f09df..0000000 --- a/src/plugins/webinterface/www/default/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/default - -ktdata_DATA = details.php only_seed.png favicon.ico grad1.jpg grad2.jpg menu_bg.png \ - header_tile.png high_priority.png icon.png interface.php ktorrentwebinterfacelogo.png \ - login.html low_priority.png normal_priority.png remove.png shutdown.php start.png \ - stop.png style.css stylen.css wz_tooltip.js diff --git a/src/plugins/webinterface/www/mobile/Makefile.am b/src/plugins/webinterface/www/mobile/Makefile.am deleted file mode 100644 index 3aae8b4..0000000 --- a/src/plugins/webinterface/www/mobile/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I$(srcdir)/../../libktorrent $(all_includes) -METASOURCES = AUTO - -ktdatadir = $(kde_datadir)/ktorrent/www/mobile - - - -ktdata_DATA = favicon.ico interface.php ktorrentwebinterfacelogo.png login.html remove.png start.png stop.png settings.php torrent.php diff --git a/src/plugins/zeroconf/Makefile.am b/src/plugins/zeroconf/Makefile.am deleted file mode 100644 index 594adf8..0000000 --- a/src/plugins/zeroconf/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -INCLUDES = -I$(top_srcdir)/src/libktorrent -I$(top_builddir)/src/libktorrent $(all_includes) - -METASOURCES = AUTO - -if COMPILE_ZEROCONF -kde_module_LTLIBRARIES = ktzeroconfplugin.la -endif - -ktzeroconfplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(AVAHI_LIBS) $(AVAHI_TQT_LIBS) -ktzeroconfplugin_la_SOURCES = localbrowser.cpp avahiservice.cpp \ - zeroconfplugin.cpp - -ktzeroconfplugin_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEUI)\ - $(LIB_TQT) ../../libktorrent/libktorrent.la - -noinst_HEADERS = zeroconfplugin.h - -kde_services_DATA = ktzeroconfplugin.desktop -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) - - diff --git a/src/plugins/zeroconf/ktzeroconfplugin.desktop b/src/plugins/zeroconf/ktzeroconfplugin.desktop index 2cabcc7..069048e 100644 --- a/src/plugins/zeroconf/ktzeroconfplugin.desktop +++ b/src/plugins/zeroconf/ktzeroconfplugin.desktop @@ -1,22 +1,6 @@ [Desktop Entry] Name=ZeroConfPlugin -Name[bg]=Приставка ZeroConf -Name[de]=ZeroConf-Modul -Name[es]=Complemento de ZeroConf -Name[et]=ZeroConfi plugin -Name[it]=Plugin ZeroConf -Name[nb]=ZeroConf-modul -Name[nds]=ZeroConf-Moduul -Name[pl]=Wtyczka ZeroConf -Name[pt]='Plugin' do ZeroConf -Name[pt_BR]=Plugin ZeroConf -Name[sr]=ZeroConf прикључак -Name[sr@Latn]=ZeroConf priključak -Name[sv]=Zeroconf-insticksprogram -Name[tr]=ZeroConf Eklentisi -Name[uk]=Втулок ZeroConf -Name[xx]=xxZeroConfPluginxx -Name[zh_CN]=ZeroConf 插件 -X-TDE-ServiceTypes=KTorrent/Plugin + Type=Service X-TDE-Library=ktzeroconfplugin +X-TDE-ServiceTypes=KTorrent/Plugin diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am deleted file mode 100644 index 2c6a020..0000000 --- a/src/scripts/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -bin_SCRIPTS=ktshell diff --git a/src/utests/CMakeLists.txt b/src/utests/CMakeLists.txt new file mode 100644 index 0000000..7eebbbe --- /dev/null +++ b/src/utests/CMakeLists.txt @@ -0,0 +1,18 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/src/libktorrent +) + + +##### ktorrent (executable) + +tde_add_check_executable( ktutester AUTOMOC + SOURCES + unittest.cpp testrunner.cpp main.cpp upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp + dhtmsgparsetest.cpp biginttest.cpp rc4test.cpp difflehellmantest.cpp + LINK + ktupnp-static + ktorrent-shared tdecore-shared tdeui-shared tdeio-shared DCOP-shared +) diff --git a/src/utests/Makefile.am b/src/utests/Makefile.am deleted file mode 100644 index 78de5ad..0000000 --- a/src/utests/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES = -I$(srcdir)/../libktorrent -I$(srcdir)/.. $(all_includes) -METASOURCES = AUTO -noinst_HEADERS = unittest.h testrunner.h upnpparsedescriptiontest.h \ - upnpparseresponsetest.h dhtmsgparsetest.h biginttest.h rc4test.h difflehellmantest.h -bin_PROGRAMS = ktutester -ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ktutester_SOURCES = unittest.cpp testrunner.cpp main.cpp \ - upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp dhtmsgparsetest.cpp biginttest.cpp \ - rc4test.cpp difflehellmantest.cpp -ktutester_LDADD = ../plugins/upnp/libktupnp.la \ - ../libktorrent/libktorrent.la -KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI) diff --git a/src/utests/main.cpp b/src/utests/main.cpp index 7618cac..f9feb89 100644 --- a/src/utests/main.cpp +++ b/src/utests/main.cpp @@ -28,6 +28,7 @@ #include "biginttest.h" #include "rc4test.h" #include "difflehellmantest.h" +#include <tqfile.h> using namespace kt; using namespace bt; @@ -38,6 +39,7 @@ using namespace utest; int main(int argc,char** argv) { Globals::instance().setDebugMode(true); + TQFile::remove("ktutester.log"); Globals::instance().initLog("ktutester.log"); TestRunner tr; tr.addTest(new UPnPParseDescriptionTest()); diff --git a/src/utests/upnpparseresponsetest.cpp b/src/utests/upnpparseresponsetest.cpp index 97102cf..a096b59 100644 --- a/src/utests/upnpparseresponsetest.cpp +++ b/src/utests/upnpparseresponsetest.cpp @@ -38,7 +38,7 @@ namespace utest bool UPnPParseResponseTest::doTest() { - static const char* test_ps = "M-SEARCH * HTTP/1.1\r\n" + static const char* test_ps = "HTTP/1.1\r\n" "HOST: 239.255.255.250:1900\r\n" "ST:urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" "MAN:\"ssdp:discover\"\r\n" |