diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:05 -0600 |
| commit | d796716f1dc9dd0b198863d974a03bf356f636e6 (patch) | |
| tree | 1bab87345ab25163397b8033b7e1910360bd94fb | |
| parent | 6f156aae95c8ea00b34ffb59e237df2f00cf8256 (diff) | |
| download | k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.tar.gz k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
162 files changed, 295 insertions, 295 deletions
@@ -64,7 +64,7 @@ * K3b now warns if user parameters for external programs have been specified. This has been introduced because there were some bug report that were caused by faulty user parameters. * Cleaned up all the job classes: No job creates a widget anymore. This allows for non-GUI usage of libk3b. - For example in a kioslave. + For example in a tdeioslave. * New option in the data project to not cache the inodes. That means it is possible to have multiple actual copies of the same file on one CD/DVD. * K3b now tries to disable stuff that might influence the burning process. This includes the KDED module @@ -30,7 +30,7 @@ A: You need to install NAS. Q: Where can I find K3bSetup2? A: K3bSetup2 is a KControlCenter Module. You can find it in the System Administration section or start - it manually with "tdesu kcmshell k3bsetup2". + it manually with "tdesu tdecmshell k3bsetup2". There also is a script since K3b 0.11 called k3bsetup. diff --git a/Makefile.am b/Makefile.am index 6d2b67a..703ac80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,4 +8,4 @@ AUTOMAKE_OPTIONS = foreign 1.5 #include admin/deps.am -SUBDIRS = doc libk3bdevice libk3b src kioslaves plugins kfile-plugins $(K3BSETUPDIR) +SUBDIRS = doc libk3bdevice libk3b src tdeioslaves plugins tdefile-plugins $(K3BSETUPDIR) diff --git a/acinclude.m4 b/acinclude.m4 index 4be09b4..5d61873 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1812,7 +1812,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2118,7 +2118,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2128,7 +2128,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/configure.in b/configure.in index 7a17863..14cea0f 100644 --- a/configure.in +++ b/configure.in @@ -371,7 +371,7 @@ dnl === check for resmgr - end ============ -# HAL check from tdebase/kioslave/media +# HAL check from tdebase/tdeioslave/media AC_ARG_WITH( hal, @@ -675,7 +675,7 @@ dnl dnl Don't use PKG_CHECK, since if there is no pkg-config installed, dnl then there is no auto* magic for it either. dnl -dnl Tests copied from tdebase/kioslave/thumbnail/ +dnl Tests copied from tdebase/tdeioslave/thumbnail/ dnl if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) @@ -951,10 +951,10 @@ KDE_CREATE_SUBDIRSLIST AC_CONFIG_FILES([ Makefile ]) AC_CONFIG_FILES([ doc/Makefile ]) AC_CONFIG_FILES([ k3bsetup/Makefile ]) -AC_CONFIG_FILES([ kfile-plugins/Makefile ]) -AC_CONFIG_FILES([ kfile-plugins/k3bproject/Makefile ]) -AC_CONFIG_FILES([ kioslaves/Makefile ]) -AC_CONFIG_FILES([ kioslaves/videodvd/Makefile ]) +AC_CONFIG_FILES([ tdefile-plugins/Makefile ]) +AC_CONFIG_FILES([ tdefile-plugins/k3bproject/Makefile ]) +AC_CONFIG_FILES([ tdeioslaves/Makefile ]) +AC_CONFIG_FILES([ tdeioslaves/videodvd/Makefile ]) AC_CONFIG_FILES([ libk3b/Makefile ]) AC_CONFIG_FILES([ libk3b/cddb/Makefile ]) AC_CONFIG_FILES([ libk3b/core/Makefile ]) diff --git a/k3bsetup/k3bsetup b/k3bsetup/k3bsetup index 9a85ccd..baed482 100644 --- a/k3bsetup/k3bsetup +++ b/k3bsetup/k3bsetup @@ -17,4 +17,4 @@ #TODO: if tdesu not found and not currently root use kdialog to display an error message -tdesu kcmshell k3bsetup2 +tdesu tdecmshell k3bsetup2 diff --git a/k3bsetup/k3bsetup2.cpp b/k3bsetup/k3bsetup2.cpp index 8cd7e70..e0a8d89 100644 --- a/k3bsetup/k3bsetup2.cpp +++ b/k3bsetup/k3bsetup2.cpp @@ -34,7 +34,7 @@ #include <kmessagebox.h> #include <kinputdialog.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <ktextedit.h> diff --git a/kioslaves/videodvd/videodvd.protocol b/kioslaves/videodvd/videodvd.protocol deleted file mode 100644 index 6337443..0000000 --- a/kioslaves/videodvd/videodvd.protocol +++ /dev/null @@ -1,52 +0,0 @@ -[Protocol] -exec=kio_videodvd -protocol=videodvd -input=none -output=filesystem -reading=true -listing=Name,Type,Size,Date -Icon=dvd_unmount -Class=:local -Description=A kioslave that allows files to be copied from a Video DVD (including decryption) -Description[af]='n 'Kioslave' wat jou toelaat om lêers vanaf 'n Video DVD te kopiëer. Dit doen ook die nodige dekripsie. -Description[ar]= يسمح هذا ال-kioslave بنسخ الملفات من قرص مدمج مرئي رقمي DVD ( بما فيه فك التشفير ) -Description[bg]=kioslave, позволяващ ви да копирате файлове от видео DVD (включително разшифроването) -Description[bn]=একটি কে-আই-ও স্লেভ যেটি একটি ভিডিও ডিভিডি থেকে ফাইল কপি করতে অনুমতিদেয় (ডিক্রিপশন সহ) -Description[ca]=Un kioslave que permet que es copiïn fitxers des d'un DVD de vídeo (incloent el desxifrat) -Description[cs]=Kioslave umožňující kopírování video DVD (včetně dekódování) -Description[da]=En kioslave som gør det muligt at kopiere filer fra en video-dvd (inklusive afkodning) -Description[de]=Ein-/Ausgabemodul, mit dem man Dateien von einer Video-DVD kopieren kann (inkl. Entschlüsselung) -Description[el]=Ένα kioslave που επιτρέπει την αντιγραφή αρχείων από ένα DVD βίντεο (δυνατότητα αποκρυπτογράφησης) -Description[eo]=Kioslave kiu permesas kopii dosierojn el videa DVD (inklude malĉifro) -Description[es]=Un kioslave que permite copiar archivos de un DVD de vídeo (incluye descifrado) -Description[et]=KIO-moodul, mis võimaldab kopeerida faile video DVD-lt (vajadusel dekrüpteerib) -Description[fa]=یک kioslave که اجازه میدهد پروندهها از یک دی وی دی ویدئویی )شامل سرگشایی( رونوشت شوند -Description[fi]=Kioslave-palvelu, joka mahdollistaa tiedostojen purkamisen dvd-levyltä. -Description[fr]=Un kioslave qui permet de copier des fichiers depuis un DVD Vidéo (incluant le déchiffrement) -Description[gl]=Un kioslave que permite copiar ficheiros dun Video DVD (incluindo descifrar) -Description[he]=עבד קלט/פלט של KDE המאפשר לקבצים להיות מועתקים מתקליטור וידאו של DVD (כולל פענוח) -Description[hu]=Kioslave, amellyel fájlokat lehet másolni Video DVD-ről (dekódolással együtt) -Description[is]=Kioslave sem leyfir afritun af skrám frá vídeó DVD (með afkóðun) -Description[it]=Un kioslave che permette ai file di essere copiati da un DVD video (incluso decifrazione) -Description[ja]=ビデオ DVD からファイルをコピーすることを可能にする kioslave (暗号解除も含む) -Description[ka]=Kioslave, რომელიც იძლევა Video DVD-დან ასლის ფაილების მიღების საშუელებას (გაშიფრვასთან ერთად) -Description[km]=kioslave ដែលអនុញ្ញាតឲ្យចម្លងឯកសារពីឌីវីឌីវីដេអូ(រួមទាំងការឌិគ្រីប) -Description[lt]=Priedas (kioslave) leidžiantis kopijuoti bylas iš Video DVD (taip pat ir atšifruoti) -Description[ms]=kioslave yang membenarkan fail untuk disalin dari DVD Video (termasuk nyahenkripsi) -Description[nb]=En kioslave som gjør det mulig å kopiere filer fra en Video-DVD (medregnet dekryptering) -Description[nds]=En In-/Utgaavmoduul, mit dat sik Dateien vun en Video-DVD koperen laat (ok mit Opslöteln) -Description[nl]=Een kioslave waarmee u bestanden van een video-dvd kunt kopiëren (inclusief versleuteling) -Description[nn]=Ein kioslave som gjer det mogleg å kopiera filer frå ein film-DVD (inkludert kryptering) -Description[pa]=ਇੱਕ kioslave ਹੈ, ਜੋ ਕਿ ਫਾਇਲਾਂ ਨੂੰ ਇੱਕ DVD (ਡਿਸਕਰਿਪਸ਼ਨ ਸਮੇ) ਤੋਂ ਨਕਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ -Description[pl]=Wtyczka protokołu pozwalająca kopiować pliki z płyt DVD Video (łącznie z odszyfrowywaniem) -Description[pt]=Um 'kioslave' que permite copiar ficheiros de um DVD Vídeo (incluindo decifrar) -Description[pt_BR]=Um kioslave que permite que arquivos sejam copiados de um DVD de Vídeo (incluindo a quebra da proteção) -Description[ru]=Позволяет копировать файлы с Video DVD (с дешифровкой) -Description[sk]=kioslave, ktorý umožňuje kopírovať súbory z Video DVD (vrátane dešifrovania) -Description[sr]=kioslave који омогућава копирање фајлова са видео DVD-а (укључујући дешифровање) -Description[sr@Latn]=kioslave koji omogućava kopiranje fajlova sa video DVD-a (uključujući dešifrovanje) -Description[sv]=En I/O-slav som gör det möjligt att kopiera filer från en video-dvd (inklusive avkodning) -Description[tr]= Bir Görüntü DVD'sinden dosyaların kopyalanmasını (ve kodunun çözülmesini) sağlayan kioslave -Description[uk]=Підлеглий В/В, який дає змогу копіювати файли з Відео DVD (включаючи розшифрування) -Description[zh_CN]=允许从视频 DVD(包括加密影碟)中复制文件的 kioslave -Description[zh_TW]=允許直接從 Video DVD 複製檔案的 kioslave(會自動解密) diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp index d1852a8..9007455 100644 --- a/libk3b/cddb/k3bcddb.cpp +++ b/libk3b/cddb/k3bcddb.cpp @@ -21,7 +21,7 @@ #include <tqtimer.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp index 63e5581..20d92e5 100644 --- a/libk3b/cddb/k3bcddbhttpquery.cpp +++ b/libk3b/cddb/k3bcddbhttpquery.cpp @@ -25,8 +25,8 @@ #include <klocale.h> #include <kdebug.h> -#include <kio/global.h> -#include <kio/job.h> +#include <tdeio/global.h> +#include <tdeio/job.h> K3bCddbHttpQuery::K3bCddbHttpQuery( TQObject* parent, const char* name ) diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index 4af572f..dde6c95 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -32,7 +32,7 @@ #include <k3bpluginmanager.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaboutdata.h> #include <kstandarddirs.h> #include <kapplication.h> diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp index 83ec1b6..902025d 100644 --- a/libk3b/core/k3bexternalbinmanager.cpp +++ b/libk3b/core/k3bexternalbinmanager.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <tqstring.h> diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index 42ccebc..6001072 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -29,11 +29,11 @@ #include <kglobal.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kdebug.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <dcopref.h> #include <kprocess.h> diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h index 0964258..1a31696 100644 --- a/libk3b/core/k3bglobals.h +++ b/libk3b/core/k3bglobals.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqfile.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kurl.h> #include <k3bdevicetypes.h> #include "k3b_export.h" diff --git a/libk3b/core/k3bglobalsettings.cpp b/libk3b/core/k3bglobalsettings.cpp index 1301b8b..b4b4c20 100644 --- a/libk3b/core/k3bglobalsettings.cpp +++ b/libk3b/core/k3bglobalsettings.cpp @@ -15,7 +15,7 @@ #include "k3bglobalsettings.h" -#include <kconfig.h> +#include <tdeconfig.h> K3bGlobalSettings::K3bGlobalSettings() diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp index aeab621..d023b58 100644 --- a/libk3b/jobs/k3bblankingjob.cpp +++ b/libk3b/jobs/k3bblankingjob.cpp @@ -21,10 +21,10 @@ #include <k3bdevice.h> #include <k3bdevicehandler.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> -#include <kio/global.h> -#include <kio/job.h> +#include <tdeio/global.h> +#include <tdeio/job.h> #include <kdebug.h> #include <tqstring.h> diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index 76bc7d3..91bcbcc 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -33,14 +33,14 @@ #include <k3bcore.h> #include <k3binffilewriter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <klocale.h> #include <kdebug.h> #include <ktempfile.h> -#include <kio/netaccess.h> -#include <kio/job.h> -#include <kio/global.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/global.h> #include <tqtimer.h> #include <tqstringlist.h> diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index 6f36bf6..343f413 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -34,7 +34,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp index e21e780..59a07c9 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.cpp +++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp @@ -31,10 +31,10 @@ #include <k3bfilesplitter.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <ktempfile.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqstring.h> #include <tqtextstream.h> diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index ed4aacd..afb9c9d 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqregexp.h> #include <tqvaluelist.h> diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp index e5333fe..b66ac89 100644 --- a/libk3b/jobs/k3bverificationjob.cpp +++ b/libk3b/jobs/k3bverificationjob.cpp @@ -25,9 +25,9 @@ #include <kdebug.h> #include <klocale.h> -#include <kio/global.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/global.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <tqcstring.h> #include <tqapplication.h> diff --git a/libk3b/plugin/k3baudiodecoder.cpp b/libk3b/plugin/k3baudiodecoder.cpp index b2d347b..915b8e7 100644 --- a/libk3b/plugin/k3baudiodecoder.cpp +++ b/libk3b/plugin/k3baudiodecoder.cpp @@ -21,7 +21,7 @@ #include "k3bpluginmanager.h" #include <kdebug.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <tqmap.h> diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index c66e000..37fb7a8 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -45,10 +45,10 @@ #include <kurl.h> #include <kapplication.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kdebug.h> #include <iostream> diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h index 0970662..3f741be 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.h +++ b/libk3b/projects/audiocd/k3baudiotrack.h @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqptrlist.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <k3bmsf.h> diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index c48650e..8f0fee9 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -52,7 +52,7 @@ #include <kdebug.h> #include <kglobal.h> #include <kprogress.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h index 00312b6..4d9b58e 100644 --- a/libk3b/projects/datacd/k3bdatadoc.h +++ b/libk3b/projects/datacd/k3bdatadoc.h @@ -27,7 +27,7 @@ #include <tqstringlist.h> #include <kurl.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "k3b_export.h" class K3bDataItem; diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h index 1f68d68..7e59621 100644 --- a/libk3b/projects/datacd/k3bdataitem.h +++ b/libk3b/projects/datacd/k3bdataitem.h @@ -23,7 +23,7 @@ class K3bDataDoc; #include <tqstring.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <k3bmsf.h> #include "k3b_export.h" diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index 8eb7d11..c13cf75 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -40,8 +40,8 @@ #include <klocale.h> #include <kstandarddirs.h> #include <ktempfile.h> -#include <kio/global.h> -#include <kio/job.h> +#include <tdeio/global.h> +#include <tdeio/job.h> #include <tqstring.h> #include <tqstringlist.h> diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index c33610f..ba88c21 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -21,7 +21,7 @@ #include <tqstring.h> #include <tqptrlist.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "k3bdataitem.h" #include "k3b_export.h" diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h index 4745264..d754e09 100644 --- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h +++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h @@ -17,7 +17,7 @@ #define _K3B_FILECOMPILATION_SIZE_HANDLER_H_ -#include <kio/global.h> +#include <tdeio/global.h> #include <k3bmsf.h> class K3bDataItem; diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h index 45e5b08..cfa553d 100644 --- a/libk3b/projects/datacd/k3bfileitem.h +++ b/libk3b/projects/datacd/k3bfileitem.h @@ -21,7 +21,7 @@ #include "k3bdataitem.h" #include <k3bglobals.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqstring.h> #include "k3b_export.h" diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index dea41b6..6420023 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -34,9 +34,9 @@ #include <kstandarddirs.h> #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> -#include <kio/global.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/global.h> +#include <tdeio/job.h> #include <kstringhandler.h> #include <tqfile.h> diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp index 91b6302..bd5167e 100644 --- a/libk3b/projects/datacd/k3bisooptions.cpp +++ b/libk3b/projects/datacd/k3bisooptions.cpp @@ -18,7 +18,7 @@ #include <k3bversion.h> #include <k3bglobals.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tqstring.h> diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h index cb7f708..386f031 100644 --- a/libk3b/projects/datacd/k3bspecialdataitem.h +++ b/libk3b/projects/datacd/k3bspecialdataitem.h @@ -20,7 +20,7 @@ #include "k3bdataitem.h" #include "k3bdiritem.h" -#include <kio/global.h> +#include <tdeio/global.h> /** * This can be used to create fake items like the boot catalog diff --git a/libk3b/projects/datadvd/k3bdvddoc.cpp b/libk3b/projects/datadvd/k3bdvddoc.cpp index 2f8a87f..3eaeee4 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.cpp +++ b/libk3b/projects/datadvd/k3bdvddoc.cpp @@ -19,7 +19,7 @@ #include <k3bisooptions.h> -#include <kconfig.h> +#include <tdeconfig.h> K3bDvdDoc::K3bDvdDoc( TQObject* parent ) diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index be7f38c..864fcae 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -40,7 +40,7 @@ #include <klocale.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <ktempfile.h> diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index 9d7474a..11d97c0 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -29,7 +29,7 @@ // include files for KDE #include <kurl.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "k3b_export.h" // forward declaration of the K3b classes diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index 07e1fcf..39334c7 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -25,7 +25,7 @@ #include <tqdom.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kmessagebox.h> diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index bcbe019..885aa92 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -50,8 +50,8 @@ #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> -#include <kio/global.h> +#include <tdeio/netaccess.h> +#include <tdeio/global.h> #include <kstringhandler.h> diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index 06b1d31..69c296a 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -27,7 +27,7 @@ #include <kurl.h> #include <kinputdialog.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <tqdom.h> diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 3ff3997..f4c9f2d 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kdebug.h> #include <ktempfile.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqtextstream.h> #include <tqdir.h> diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp index 1672043..e366bac 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp @@ -16,7 +16,7 @@ #include "k3bmovixdvddoc.h" #include "k3bmovixdvdjob.h" -#include <kconfig.h> +#include <tdeconfig.h> K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* parent ) diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index d28e942..2c5da16 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -28,10 +28,10 @@ #include <kurl.h> #include <kapplication.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kdebug.h> #include <kstdguiitem.h> diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index 7b2d4ff..e4ea8ee 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -14,11 +14,11 @@ */ #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <kurl.h> #include <ktempfile.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqstring.h> #include <tqdatetime.h> diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index f963be8..e19e622 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -15,7 +15,7 @@ // Kde Includes #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <k3bcore.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index 59d6387..0f458b6 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -14,7 +14,7 @@ */ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqstring.h> #include <tqfileinfo.h> diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index f36eb8c..f529275 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -23,7 +23,7 @@ #include <tqptrlist.h> // Kde Includes -#include <kio/global.h> +#include <tdeio/global.h> // K3b Includes #include "mpeginfo/k3bmpeginfo.h" diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.cpp b/libk3b/projects/videodvd/k3bvideodvddoc.cpp index 7ea3666..49f2479 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.cpp +++ b/libk3b/projects/videodvd/k3bvideodvddoc.cpp @@ -21,7 +21,7 @@ #include <k3bisooptions.h> -#include <kconfig.h> +#include <tdeconfig.h> K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* parent ) diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index e261c77..2144a4c 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h index 2acce4b..b33ce5b 100644 --- a/libk3b/tools/k3bdirsizejob.h +++ b/libk3b/tools/k3bdirsizejob.h @@ -17,7 +17,7 @@ #define _K3B_DIR_SIZE_JOB_H_ #include <k3bthreadjob.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <k3b_export.h> diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h index 06cef32..7aaf25e 100644 --- a/libk3b/tools/k3bfilesplitter.h +++ b/libk3b/tools/k3bfilesplitter.h @@ -19,7 +19,7 @@ #include <tqiodevice.h> #include <tqstring.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <k3b_export.h> diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp index 1d3d04c..394f94d 100644 --- a/libk3b/tools/k3bmd5job.cpp +++ b/libk3b/tools/k3bmd5job.cpp @@ -23,7 +23,7 @@ #include <kmdcodec.h> #include <klocale.h> #include <kdebug.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqtimer.h> #include <tqcstring.h> diff --git a/libk3bdevice/configure.in.in b/libk3bdevice/configure.in.in index 2a14f0f..42a8a62 100644 --- a/libk3bdevice/configure.in.in +++ b/libk3bdevice/configure.in.in @@ -62,7 +62,7 @@ dnl === check for resmgr - end ============ -# HAL check from tdebase/kioslave/media +# HAL check from tdebase/tdeioslave/media AC_ARG_WITH( hal, diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp index d5bf336..dc94c9b 100644 --- a/libk3bdevice/k3bdevicemanager.cpp +++ b/libk3bdevice/k3bdevicemanager.cpp @@ -31,7 +31,7 @@ #include <kprocess.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ktempfile.h> #include <iostream> diff --git a/libk3bdevice/k3bdiskinfo.cpp b/libk3bdevice/k3bdiskinfo.cpp index 534e74b..0709d28 100644 --- a/libk3bdevice/k3bdiskinfo.cpp +++ b/libk3bdevice/k3bdiskinfo.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <k3bdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqstringlist.h> diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp index 6228922..dbb19a3 100644 --- a/libk3bdevice/k3bhalconnection.cpp +++ b/libk3bdevice/k3bhalconnection.cpp @@ -269,7 +269,7 @@ void K3bDevice::HalConnection::removeDevice( const char* udi ) int K3bDevice::HalConnection::lock( Device* dev ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; @@ -328,7 +328,7 @@ int K3bDevice::HalConnection::lock( Device* dev ) int K3bDevice::HalConnection::unlock( Device* dev ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; @@ -387,7 +387,7 @@ int K3bDevice::HalConnection::mount( K3bDevice::Device* dev, const TQStringList& options ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; @@ -467,7 +467,7 @@ int K3bDevice::HalConnection::unmount( K3bDevice::Device* dev, const TQStringList& options ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; @@ -538,7 +538,7 @@ int K3bDevice::HalConnection::eject( K3bDevice::Device* dev, const TQStringList& options ) { // - // The code below is based on the code from kioslave/media/mediamanager/halbackend.cpp in the tdebase package + // The code below is based on the code from tdeioslave/media/mediamanager/halbackend.cpp in the tdebase package // Copyright (c) 2004-2005 Jérôme Lodewyck <jerome dot lodewyck at normalesup dot org> // DBusMessage* dmesg = 0; diff --git a/libk3bdevice/k3bmsf.h b/libk3bdevice/k3bmsf.h index 052cadd..ff4b0cc 100644 --- a/libk3bdevice/k3bmsf.h +++ b/libk3bdevice/k3bmsf.h @@ -21,7 +21,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "k3bdevice_export.h" namespace K3b diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp index 8781401..afacdf6 100644 --- a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp +++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kcombobox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <tqlayout.h> diff --git a/plugins/decoder/libsndfile/configure.in.in b/plugins/decoder/libsndfile/configure.in.in index 5c17cca..6b50a68 100644 --- a/plugins/decoder/libsndfile/configure.in.in +++ b/plugins/decoder/libsndfile/configure.in.in @@ -3,7 +3,7 @@ dnl dnl Don't use PKG_CHECK, since if there is no pkg-config installed, dnl then there is no auto* magic for it either. dnl -dnl Tests copied from tdebase/kioslave/thumbnail/ +dnl Tests copied from tdebase/tdeioslave/thumbnail/ dnl if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp index f3a1716..76398fd 100644 --- a/plugins/encoder/external/k3bexternalencoder.cpp +++ b/plugins/encoder/external/k3bexternalencoder.cpp @@ -24,7 +24,7 @@ #include <k3bcore.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/plugins/encoder/external/k3bexternalencodercommand.cpp b/plugins/encoder/external/k3bexternalencodercommand.cpp index 5ab3b1c..16549e6 100644 --- a/plugins/encoder/external/k3bexternalencodercommand.cpp +++ b/plugins/encoder/external/k3bexternalencodercommand.cpp @@ -19,7 +19,7 @@ #include <k3bcore.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp index beec64b..7384ba6 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp @@ -24,7 +24,7 @@ #include <klineedit.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp index 200494c..c201465 100644 --- a/plugins/encoder/lame/k3blameencoder.cpp +++ b/plugins/encoder/lame/k3blameencoder.cpp @@ -21,7 +21,7 @@ #include <k3bpluginfactory.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kinstance.h> #include <knuminput.h> diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp index 35294fa..bcf3903 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp +++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp @@ -22,7 +22,7 @@ #include <k3bpluginfactory.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <knuminput.h> @@ -521,7 +521,7 @@ long long K3bOggVorbisEncoder::fileSize( const TQString&, const K3b::Msf& msf ) TDEConfig* c = k3bcore->config(); c->setGroup( "K3bOggVorbisEncoderPlugin" ); - // the following code is based on the size estimation from the audiocd kioslave + // the following code is based on the size estimation from the audiocd tdeioslave // TODO: reimplement. if( !c->readBoolEntry( "manual bitrate", false ) ) { diff --git a/plugins/encoder/skeleton.cpp b/plugins/encoder/skeleton.cpp index 0fc3d1e..9321501 100644 --- a/plugins/encoder/skeleton.cpp +++ b/plugins/encoder/skeleton.cpp @@ -18,7 +18,7 @@ #include "k3b<name>encoder.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index 3cd7f08..b0f734d 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -24,7 +24,7 @@ #include <k3bpluginfactory.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tqfileinfo.h> diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index 3d30d29..24a21a6 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -29,9 +29,9 @@ #include <kinstance.h> #include <kmessagebox.h> #include <klocale.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmimetype.h> #include <kdialog.h> diff --git a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp index 3699612..93b12f1 100644 --- a/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp +++ b/plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp @@ -36,7 +36,7 @@ #include <kinstance.h> #include <kmessagebox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqstring.h> diff --git a/src/k3b.cpp b/src/k3b.cpp index 038586c..95695ed 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -38,10 +38,10 @@ // include files for KDE #include <kiconloader.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmenubar.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstdaction.h> #include <klineeditdlg.h> #include <kstandarddirs.h> @@ -58,8 +58,8 @@ #include <ktip.h> #include <kxmlguifactory.h> #include <kstdguiitem.h> -#include <kio/global.h> -#include <kio/netaccess.h> +#include <tdeio/global.h> +#include <tdeio/netaccess.h> #include <krecentdocument.h> #include <stdlib.h> @@ -1291,7 +1291,7 @@ void K3bMainWindow::slotProjectAddFiles() void K3bMainWindow::slotK3bSetup() { TDEProcess p; - p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); + p << "tdesu" << "tdecmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); if( !p.start( TDEProcess::DontCare ) ) KMessageBox::error( 0, i18n("Could not find tdesu to run K3bSetup with root privileges. " "Please run it manually as root.") ); diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp index 50cde9c..4a9d346 100644 --- a/src/k3bappdevicemanager.cpp +++ b/src/k3bappdevicemanager.cpp @@ -25,9 +25,9 @@ #include <kinputdialog.h> #include <kmessagebox.h> #include <kinputdialog.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kpopupmenu.h> diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index 09fbb30..1055961 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -46,7 +46,7 @@ #include <ktip.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaboutdata.h> #include <kcmdlineargs.h> #include <dcopclient.h> diff --git a/src/k3bdatamodewidget.cpp b/src/k3bdatamodewidget.cpp index 96065a7..1cb4ab3 100644 --- a/src/k3bdatamodewidget.cpp +++ b/src/k3bdatamodewidget.cpp @@ -18,7 +18,7 @@ #include <k3bglobals.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqwhatsthis.h> #include <tqtooltip.h> diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index 426b652..86e4d20 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -31,7 +31,7 @@ #include <kstdguiitem.h> #include <kglobalsettings.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp index 4504f7f..acf42dc 100644 --- a/src/k3bdiroperator.cpp +++ b/src/k3bdiroperator.cpp @@ -22,7 +22,7 @@ #include <k3bcore.h> #include <kcombiview.h> -#include <kfilepreview.h> +#include <tdefilepreview.h> #include <kaction.h> #include <kbookmarkmenu.h> #include <kstandarddirs.h> diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp index 2ad6a78..fe74f45 100644 --- a/src/k3bdirview.cpp +++ b/src/k3bdirview.cpp @@ -60,23 +60,23 @@ // KDE-includes #include <kmimetype.h> #include <kcursor.h> -#include <kfiledetailview.h> +#include <tdefiledetailview.h> #include <ktoolbar.h> #include <kiconloader.h> #include <kurl.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kio/file.h> -#include <kio/global.h> +#include <tdeio/file.h> +#include <tdeio/global.h> #include <krun.h> #include <kprocess.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kcombobox.h> -#include <kfiletreeview.h> +#include <tdefiletreeview.h> #include <kdialog.h> #include <kmessagebox.h> #include <kstdaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kinputdialog.h> diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp index d586c39..fd37b08 100644 --- a/src/k3bdiskinfoview.cpp +++ b/src/k3bdiskinfoview.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> // FIXME: use K3bListViewItem instead diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp index 7ec0286..6c906d0 100644 --- a/src/k3bemptydiscwaiter.cpp +++ b/src/k3bemptydiscwaiter.cpp @@ -38,7 +38,7 @@ #include <tqfont.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kmessagebox.h> #include <kactivelabel.h> diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index 6fb3d87..d6dfe91 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -30,8 +30,8 @@ #include <kurl.h> #include <kstandarddirs.h> #include <kaction.h> -#include <kio/global.h> -#include <kfileitem.h> +#include <tdeio/global.h> +#include <tdefileitem.h> #include <kapplication.h> #include <kglobalsettings.h> diff --git a/src/k3bfiletreeview.h b/src/k3bfiletreeview.h index d40ca6e..a86a84e 100644 --- a/src/k3bfiletreeview.h +++ b/src/k3bfiletreeview.h @@ -18,7 +18,7 @@ #define K3BFILETREEVIEW_H -#include <kfiletreeview.h> +#include <tdefiletreeview.h> class KFileTreeBranch; class KActionCollection; diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp index 2a087e8..314294a 100644 --- a/src/k3bfileview.cpp +++ b/src/k3bfileview.cpp @@ -28,16 +28,16 @@ #include <tqlabel.h> #include <tqtoolbutton.h> -#include <kfiledetailview.h> +#include <tdefiledetailview.h> #include <klistview.h> #include <kaction.h> #include <ktoolbar.h> #include <ktoolbarbutton.h> #include <kurl.h> #include <kurldrag.h> -#include <kfilefiltercombo.h> +#include <tdefilefiltercombo.h> #include <klocale.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <kmessagebox.h> #include <kdirlister.h> #include <kprogress.h> diff --git a/src/k3bfirstrun.cpp b/src/k3bfirstrun.cpp index f27d927..818eb82 100644 --- a/src/k3bfirstrun.cpp +++ b/src/k3bfirstrun.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp index 9f8327c..be88cef 100644 --- a/src/k3binteractiondialog.cpp +++ b/src/k3binteractiondialog.cpp @@ -43,7 +43,7 @@ #include <kstandarddirs.h> #include <kstdguiitem.h> #include <kpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kglobalsettings.h> #include <tdeversion.h> diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index 215bc88..7e2f77f 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -57,7 +57,7 @@ #include <kmessagebox.h> #include <klistview.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <knotifyclient.h> diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp index a6b95d2..79dae3b 100644 --- a/src/k3bjobprogressosd.cpp +++ b/src/k3bjobprogressosd.cpp @@ -22,7 +22,7 @@ #include <kiconloader.h> #include <kdebug.h> #include <kcursor.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kpopupmenu.h> diff --git a/src/k3bmedium.cpp b/src/k3bmedium.cpp index 29ba46c..295ca2a 100644 --- a/src/k3bmedium.cpp +++ b/src/k3bmedium.cpp @@ -24,7 +24,7 @@ #include <k3biso9660backend.h> #include <klocale.h> -#include <kio/global.h> +#include <tdeio/global.h> /** * Internal class used by K3bMedium diff --git a/src/k3bprojectinterface.h b/src/k3bprojectinterface.h index 1459fd0..7a87922 100644 --- a/src/k3bprojectinterface.h +++ b/src/k3bprojectinterface.h @@ -18,7 +18,7 @@ #define _K3B_PROJECT_INTERFACE_H_ #include <dcopobject.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqstringlist.h> class K3bDoc; diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp index 965a160..b41820b 100644 --- a/src/k3bprojectmanager.cpp +++ b/src/k3bprojectmanager.cpp @@ -48,8 +48,8 @@ #include <kurl.h> #include <kdebug.h> -#include <kconfig.h> -#include <kio/netaccess.h> +#include <tdeconfig.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/src/k3bservicemenuinstaller.cpp b/src/k3bservicemenuinstaller.cpp index 13729c7..c2938bf 100644 --- a/src/k3bservicemenuinstaller.cpp +++ b/src/k3bservicemenuinstaller.cpp @@ -19,7 +19,7 @@ #include <klocale.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kdebug.h> diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp index 4a4fd89..f23f785 100644 --- a/src/k3bstatusbarmanager.cpp +++ b/src/k3bstatusbarmanager.cpp @@ -30,9 +30,9 @@ #include <kiconloader.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kstatusbar.h> #include <kaboutdata.h> #include <kaction.h> diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index de9d846..43c6d1c 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -43,7 +43,7 @@ #include <klocale.h> #include <kstandarddirs.h> #include <ktextedit.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kmessagebox.h> #include <kprocess.h> @@ -608,7 +608,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent, void K3bSystemProblemDialog::slotK3bSetup() { TDEProcess p; - p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); + p << "tdesu" << "tdecmshell k3bsetup2 --lang " + TDEGlobal::locale()->language(); if( !p.start( TDEProcess::DontCare ) ) KMessageBox::error( 0, i18n("Unable to start K3bSetup2.") ); } diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp index 5ba3879..22b2750 100644 --- a/src/k3btempdirselectionwidget.cpp +++ b/src/k3btempdirselectionwidget.cpp @@ -27,15 +27,15 @@ #include <tqwhatsthis.h> #include <tqfileinfo.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdialog.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kurlrequester.h> -#include <kio/global.h> -#include <kconfig.h> +#include <tdeio/global.h> +#include <tdeconfig.h> #include <klineedit.h> diff --git a/src/k3btempdirselectionwidget.h b/src/k3btempdirselectionwidget.h index 639e7b6..52308b0 100644 --- a/src/k3btempdirselectionwidget.h +++ b/src/k3btempdirselectionwidget.h @@ -18,7 +18,7 @@ #define K3BTEMPDIRSELECTIONWIDGET_H #include <tqgroupbox.h> -#include <kio/global.h> +#include <tdeio/global.h> class TQTimer; class TQLabel; diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index a998687..9d717fc 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -39,7 +39,7 @@ #include <kapplication.h> #include <kiconloader.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kpopupmenu.h> #include <kaboutdata.h> diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp index 4c85c5a..6095ee3 100644 --- a/src/k3bwriterselectionwidget.cpp +++ b/src/k3bwriterselectionwidget.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kdialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <kmessagebox.h> #include <kiconloader.h> diff --git a/src/k3bwritingmodewidget.cpp b/src/k3bwritingmodewidget.cpp index 077c2e8..3097e92 100644 --- a/src/k3bwritingmodewidget.cpp +++ b/src/k3bwritingmodewidget.cpp @@ -20,7 +20,7 @@ #include <k3bglobals.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtooltip.h> #include <tqwhatsthis.h> diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index b9dc2a9..79c32db 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -32,7 +32,7 @@ #include <kiconloader.h> #include <kguiitem.h> #include <kstdguiitem.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqgroupbox.h> #include <tqpushbutton.h> diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index 3245906..8e9dd36 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -40,7 +40,7 @@ #include <kstdguiitem.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kiconloader.h> diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h index 4b17fa8..898a1de 100644 --- a/src/misc/k3bcdcopydialog.h +++ b/src/misc/k3bcdcopydialog.h @@ -21,7 +21,7 @@ #include <k3binteractiondialog.h> -#include <kio/global.h> +#include <tdeio/global.h> namespace K3bDevice { class Device; diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 5c73381..f134104 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -45,12 +45,12 @@ #include <klocale.h> #include <kmessagebox.h> #include <kurlrequester.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstdguiitem.h> #include <kguiitem.h> #include <kiconloader.h> -#include <kconfig.h> -#include <kio/global.h> +#include <tdeconfig.h> +#include <tdeio/global.h> #include <kurl.h> #include <kinputdialog.h> #include <kurldrag.h> diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index 729c4c7..c80c1e3 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -46,7 +46,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h index 390ee2e..aad39a3 100644 --- a/src/misc/k3bdvdcopydialog.h +++ b/src/misc/k3bdvdcopydialog.h @@ -19,7 +19,7 @@ #include <k3binteractiondialog.h> -#include <kio/global.h> +#include <tdeio/global.h> namespace K3bDevice { diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index 6524d05..4f6d5ee 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <tqgroupbox.h> diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 32461df..e3eb2fc 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -36,12 +36,12 @@ #include <klocale.h> #include <kmessagebox.h> #include <kurlrequester.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstdguiitem.h> #include <kguiitem.h> #include <kiconloader.h> -#include <kconfig.h> -#include <kio/global.h> +#include <tdeconfig.h> +#include <tdeio/global.h> #include <kurl.h> #include <kinputdialog.h> #include <kurldrag.h> diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp index 97a5aaf..02d680c 100644 --- a/src/option/k3bburningoptiontab.cpp +++ b/src/option/k3bburningoptiontab.cpp @@ -33,7 +33,7 @@ #include <tqwhatsthis.h> #include <knuminput.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <klocale.h> #include <klineedit.h> diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index 1db1ba2..b0d845e 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -36,7 +36,7 @@ #include <klineedit.h> #include <klocale.h> #include <knuminput.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <tdeversion.h> diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp index 1218c60..0b5784e 100644 --- a/src/option/k3bdeviceoptiontab.cpp +++ b/src/option/k3bdeviceoptiontab.cpp @@ -28,7 +28,7 @@ #include <kapplication.h> #include <kdialog.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp index bcc890d..acaf3f2 100644 --- a/src/option/k3bdevicewidget.cpp +++ b/src/option/k3bdevicewidget.cpp @@ -25,11 +25,11 @@ #include <knuminput.h> #include <kdialog.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ksimpleconfig.h> #include <kiconloader.h> #include <kstandarddirs.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqgroupbox.h> #include <tqpushbutton.h> diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index 884291f..1da6f17 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -30,7 +30,7 @@ #include <kapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <kstandarddirs.h> #include <kmessagebox.h> diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index d222134..d6f2df3 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -33,7 +33,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include "k3bnotifyoptiontab.h" diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp index 37a66c8..6a7e4ec 100644 --- a/src/option/k3bpluginoptiontab.cpp +++ b/src/option/k3bpluginoptiontab.cpp @@ -26,7 +26,7 @@ #include <kmessagebox.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <tdeversion.h> diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index ebb92be..edf3f64 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -20,13 +20,13 @@ #include <k3bapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kurlrequester.h> #include <klistview.h> -#include <kio/global.h> -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/global.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> #include <kstandarddirs.h> #include <ktar.h> #include <kurlrequesterdlg.h> diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 5c5634a..8274f3b 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -51,7 +51,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp index 14f3726..8e20636 100644 --- a/src/projects/k3baudiotrackdialog.cpp +++ b/src/projects/k3baudiotrackdialog.cpp @@ -29,7 +29,7 @@ #include <knuminput.h> #include <kmimetype.h> #include <kurl.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <klineedit.h> #include "k3baudiotrackdialog.h" diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index 52c32e2..9b4dd27 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <klistview.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index eee70f0..3df6c2a 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -54,11 +54,11 @@ #include <kmessagebox.h> #include <klineedit.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kcombobox.h> -#include <kio/global.h> +#include <tdeio/global.h> #include "k3bfilecompilationsizehandler.h" diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp index 5566ead..aa038eb 100644 --- a/src/projects/k3bdatamultisessioncombobox.cpp +++ b/src/projects/k3bdatamultisessioncombobox.cpp @@ -16,7 +16,7 @@ #include "k3bdatamultisessioncombobox.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqwhatsthis.h> #include <tqtooltip.h> diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index d6d5075..c3648ca 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -36,8 +36,8 @@ #include <klocale.h> #include <kmimetype.h> #include <kurl.h> -#include <kio/global.h> -#include <kfileitem.h> +#include <tdeio/global.h> +#include <tdefileitem.h> diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index 842520e..9bf28db 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -48,7 +48,7 @@ #include <kiconloader.h> #include <kglobal.h> #include <kstdguiitem.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ksqueezedtextlabel.h> #include <kprogress.h> diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index 1ac59f8..d71d256 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -37,8 +37,8 @@ #include <kpopupmenu.h> #include <kaction.h> #include <kmessagebox.h> -#include <kio/global.h> -#include <kio/job.h> +#include <tdeio/global.h> +#include <tdeio/job.h> #include <kdialogbase.h> #include <tqpixmap.h> diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index 7cfe576..f8dff4f 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -22,7 +22,7 @@ #include "k3bdatadoc.h" #include <k3bvalidators.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kiconloader.h> #include <klocale.h> #include <kmimetype.h> diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index a393360..decfca8 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -28,9 +28,9 @@ #include <k3bstdguiitems.h> #include <k3bglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kmessagebox.h> #include <tqlayout.h> diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 555348b..88d5ba9 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -43,10 +43,10 @@ #include <kpopupmenu.h> #include <klocale.h> #include <kinputdialog.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kmessagebox.h> #include <kglobal.h> #include <kpixmapeffect.h> diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 7d74a2f..3e4353b 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -53,7 +53,7 @@ #include <tqradiobutton.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index c09f930..86a80d7 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -33,9 +33,9 @@ #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqcheckbox.h> #include <tqlayout.h> diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index 83d560b..6b6b706 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -34,9 +34,9 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqcheckbox.h> diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index b3b7fb2..2f3fc31 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <kdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kurldrag.h> #include <tqdragobject.h> diff --git a/src/projects/k3bmovixlistview.h b/src/projects/k3bmovixlistview.h index e175a61..be5750f 100644 --- a/src/projects/k3bmovixlistview.h +++ b/src/projects/k3bmovixlistview.h @@ -19,7 +19,7 @@ #define _K3B_MOVIX_LISTVIEW_H_ #include <k3blistview.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <tqmap.h> diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp index 0a2432d..9ede404 100644 --- a/src/projects/k3bmovixoptionswidget.cpp +++ b/src/projects/k3bmovixoptionswidget.cpp @@ -20,7 +20,7 @@ #include <kcombobox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp index 58c6ba7..6e86212 100644 --- a/src/projects/k3bmovixview.cpp +++ b/src/projects/k3bmovixview.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <kaction.h> #include <kpopupmenu.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kurl.h> diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index 04e829b..2547fef 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -40,7 +40,7 @@ #include <tqlabel.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kguiitem.h> #include <kstdguiitem.h> diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 0a36668..1dd97f0 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -28,10 +28,10 @@ #include <tqfileinfo.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kapplication.h> #include "k3bvcdburndialog.h" diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index b18ec30..363068c 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -#include <kio/global.h> +#include <tdeio/global.h> #include <kiconloader.h> diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 99eeb6c..007d20f 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -32,7 +32,7 @@ // Kde Includes #include <kiconloader.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <klocale.h> #include <kmimetype.h> #include <knuminput.h> diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp index 8a02e2b..1479ffc 100644 --- a/src/projects/k3bvideodvdburndialog.cpp +++ b/src/projects/k3bvideodvdburndialog.cpp @@ -27,9 +27,9 @@ #include <k3bstdguiitems.h> #include <k3bglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kmessagebox.h> #include <tqlayout.h> diff --git a/src/projects/kostore/SPEC b/src/projects/kostore/SPEC index 4010e33..9cbec59 100644 --- a/src/projects/kostore/SPEC +++ b/src/projects/kostore/SPEC @@ -21,7 +21,7 @@ The purpose of this document is to define a common KOffice Storage Structure. Torben, Reggie, and all the others agreed on storing embedded KOffice Parts and binary data (e.g. pictures, movies, sounds) via a simple tar.gz-structure. -The support class for the tar format is tdelibs/kio/ktar.*, written by Torben +The support class for the tar format is tdelibs/tdeio/ktar.*, written by Torben and finished by David. The obvious benefits of this type of storage are: diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc index 4f645e0..dcaf5d0 100644 --- a/src/projects/kostore/koStore.cc +++ b/src/projects/kostore/koStore.cc @@ -37,7 +37,7 @@ #include <tdeversion.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> //#define DefaultFormat KoStore::Tar #define DefaultFormat KoStore::Zip diff --git a/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cc index cd393eb..0bbecdc 100644 --- a/src/projects/kostore/koZipStore.cc +++ b/src/projects/kostore/koZipStore.cc @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdeversion.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #if ! KDE_IS_VERSION( 3, 4, 1 ) #include <tqdir.h> #include <tqfileinfo.h> diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp index 66b4820..7cdf686 100644 --- a/src/rip/k3baudiocdview.cpp +++ b/src/rip/k3baudiocdview.cpp @@ -40,7 +40,7 @@ #include <kaction.h> #include <kstdaction.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <kcombobox.h> #include <kstandarddirs.h> diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp index 15fa9fd..34d1de7 100644 --- a/src/rip/k3baudioconvertingoptionwidget.cpp +++ b/src/rip/k3baudioconvertingoptionwidget.cpp @@ -22,8 +22,8 @@ #include <kcombobox.h> #include <kurlrequester.h> -#include <kio/global.h> -#include <kconfig.h> +#include <tdeio/global.h> +#include <tdeconfig.h> #include <klocale.h> #include <kiconloader.h> diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h index 9352e3f..4c702aa 100644 --- a/src/rip/k3baudioconvertingoptionwidget.h +++ b/src/rip/k3baudioconvertingoptionwidget.h @@ -19,7 +19,7 @@ #include "base_k3baudiorippingoptionwidget.h" #include <tqcheckbox.h> -#include <kio/global.h> +#include <tdeio/global.h> class K3bAudioEncoder; class TDEConfigBase; diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp index 03c7db3..43fe621 100644 --- a/src/rip/k3baudioprojectconvertingdialog.cpp +++ b/src/rip/k3baudioprojectconvertingdialog.cpp @@ -33,11 +33,11 @@ #include <kcombobox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <kurlrequester.h> -#include <kfiledialog.h> -#include <kio/global.h> +#include <tdefiledialog.h> +#include <tdeio/global.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index 4298532..aace387 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -32,11 +32,11 @@ #include <kcombobox.h> #include <klocale.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <kurlrequester.h> -#include <kfiledialog.h> -#include <kio/global.h> +#include <tdefiledialog.h> +#include <tdeio/global.h> #include <kiconloader.h> #include <kstdguiitem.h> #include <kdebug.h> diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp index ae1191f..e8b533a 100644 --- a/src/rip/k3bcddbpatternwidget.cpp +++ b/src/rip/k3bcddbpatternwidget.cpp @@ -15,7 +15,7 @@ #include "k3bcddbpatternwidget.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kcombobox.h> #include <klineedit.h> diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index af29a37..2dea3f7 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -22,7 +22,7 @@ #include <tqdom.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "k3bvideocdinfo.h" diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index b987e96..b6c033d 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -13,9 +13,9 @@ * See the file "COPYING" for the exact licensing terms. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <klocale.h> #include <kstandarddirs.h> #include <ktempfile.h> diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index eeec3d5..8fe85f5 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -17,7 +17,7 @@ // kde include #include <klocale.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurlrequester.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 4aa571e..b5deed5 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -30,8 +30,8 @@ #include <kurlrequester.h> #include <kcombobox.h> #include <klineedit.h> -#include <kio/global.h> -#include <kconfig.h> +#include <tdeio/global.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <tqlayout.h> diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index 763cbe0..ca9e467 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -34,7 +34,7 @@ #include <kmessagebox.h> #include <klocale.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * name ) diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index 51b74a2..5a229bf 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -23,7 +23,7 @@ #include <klistview.h> #include <klocale.h> #include <kurlrequester.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kurllabel.h> #include <kdialogbase.h> #include <klineedit.h> diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h index 1642bbc..812a5d8 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.h +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h @@ -23,7 +23,7 @@ #include <tqvaluevector.h> #include <tqmap.h> -#include <kio/global.h> +#include <tdeio/global.h> class TQTimer; @@ -1,7 +1,7 @@ doc k3bsetup -kfile-plugins -kioslaves +tdefile-plugins +tdeioslaves libk3b libk3bdevice plugins diff --git a/kfile-plugins/Makefile.am b/tdefile-plugins/Makefile.am index c1ba442..c1ba442 100644 --- a/kfile-plugins/Makefile.am +++ b/tdefile-plugins/Makefile.am diff --git a/kfile-plugins/k3bproject/Makefile.am b/tdefile-plugins/k3bproject/Makefile.am index d3f53d4..5d070e2 100644 --- a/kfile-plugins/k3bproject/Makefile.am +++ b/tdefile-plugins/k3bproject/Makefile.am @@ -9,19 +9,19 @@ AM_CPPFLAGS = -I$(srcdir)/../../libk3b/core \ $(all_includes) # these are the headers for your project -noinst_HEADERS = kfile_k3bprojectfileplugin.h +noinst_HEADERS = tdefile_k3bprojectfileplugin.h -kde_module_LTLIBRARIES = kfile_k3b.la +kde_module_LTLIBRARIES = tdefile_k3b.la -kfile_k3b_la_SOURCES = kfile_k3bprojectfileplugin.cpp -kfile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) -kfile_k3b_la_LIBADD = $(LIB_KIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la +tdefile_k3b_la_SOURCES = tdefile_k3bprojectfileplugin.cpp +tdefile_k3b_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -module $(KDE_PLUGIN) +tdefile_k3b_la_LIBADD = $(LIB_KIO) ../../libk3b/libk3b.la ../../src/projects/kostore/libkostore.la # let automoc handle all of the meta source files (moc) METASOURCES = AUTO -services_DATA = kfile_k3b.desktop +services_DATA = tdefile_k3b.desktop servicesdir = $(kde_servicesdir) messages: - $(XGETTEXT) *.cpp -o $(podir)/kfile_k3b.pot + $(XGETTEXT) *.cpp -o $(podir)/tdefile_k3b.pot diff --git a/kfile-plugins/k3bproject/kfile_k3b.desktop b/tdefile-plugins/k3bproject/tdefile_k3b.desktop index 651124f..b93ae66 100644 --- a/kfile-plugins/k3bproject/kfile_k3b.desktop +++ b/tdefile-plugins/k3bproject/tdefile_k3b.desktop @@ -47,7 +47,7 @@ Name[uz@cyrillic]=K3b лойиҳаси ҳақида маълумот Name[zh_CN]=K3b 方案信息 Name[zh_TW]=K3b 專案資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_k3b +X-TDE-Library=tdefile_k3b MimeType=application/x-k3b PreferredGroups=General PreferredItems=documenttype diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.cpp index 953f0e7..e625465 100644 --- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.cpp +++ b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.cpp @@ -16,7 +16,7 @@ #include <config.h> -#include "kfile_k3bprojectfileplugin.h" +#include "tdefile_k3bprojectfileplugin.h" #include "kostore/koStore.h" #include "kostore/koStoreDevice.h" @@ -30,7 +30,7 @@ -K_EXPORT_COMPONENT_FACTORY(kfile_k3b, KGenericFactory<K3bProjectFilePlugin>("kfile_k3b")) +K_EXPORT_COMPONENT_FACTORY(tdefile_k3b, KGenericFactory<K3bProjectFilePlugin>("tdefile_k3b")) K3bProjectFilePlugin::K3bProjectFilePlugin( TQObject *parent, const char *name, @@ -131,5 +131,5 @@ bool K3bProjectFilePlugin::readInfo( KFileMetaInfo& info, uint /*what*/) return success; } -#include "kfile_k3bprojectfileplugin.moc" +#include "tdefile_k3bprojectfileplugin.moc" diff --git a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h index e53ebce..dadb856 100644 --- a/kfile-plugins/k3bproject/kfile_k3bprojectfileplugin.h +++ b/tdefile-plugins/k3bproject/tdefile_k3bprojectfileplugin.h @@ -17,9 +17,9 @@ #define __KFILE_K3BPROJECTFILEPLUGIN_H__ /** - * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h> + * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h> */ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; diff --git a/kioslaves/Makefile.am b/tdeioslaves/Makefile.am index 55ab08d..55ab08d 100644 --- a/kioslaves/Makefile.am +++ b/tdeioslaves/Makefile.am diff --git a/kioslaves/videodvd/Makefile.am b/tdeioslaves/videodvd/Makefile.am index eccc0e9..c20e773 100644 --- a/kioslaves/videodvd/Makefile.am +++ b/tdeioslaves/videodvd/Makefile.am @@ -16,4 +16,4 @@ konq_sidebartree_init_services_data_DATA = videodvd.desktop konq_sidebartree_init_services_datadir = $(kde_datadir)/konqsidebartng/virtual_folders/services messages: - $(XGETTEXT) *.cpp -o $(podir)/kio_videodvd.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_videodvd.pot diff --git a/kioslaves/videodvd/videodvd.cpp b/tdeioslaves/videodvd/videodvd.cpp index c3398a1..c3398a1 100644 --- a/kioslaves/videodvd/videodvd.cpp +++ b/tdeioslaves/videodvd/videodvd.cpp diff --git a/kioslaves/videodvd/videodvd.desktop b/tdeioslaves/videodvd/videodvd.desktop index 1454f40..1454f40 100644 --- a/kioslaves/videodvd/videodvd.desktop +++ b/tdeioslaves/videodvd/videodvd.desktop diff --git a/kioslaves/videodvd/videodvd.h b/tdeioslaves/videodvd/videodvd.h index d408931..3b02aff 100644 --- a/kioslaves/videodvd/videodvd.h +++ b/tdeioslaves/videodvd/videodvd.h @@ -21,8 +21,8 @@ #include <tqcstring.h> #include <kurl.h> -#include <kio/global.h> -#include <kio/slavebase.h> +#include <tdeio/global.h> +#include <tdeio/slavebase.h> class TQCString; class K3bIso9660Entry; diff --git a/tdeioslaves/videodvd/videodvd.protocol b/tdeioslaves/videodvd/videodvd.protocol new file mode 100644 index 0000000..7efaf10 --- /dev/null +++ b/tdeioslaves/videodvd/videodvd.protocol @@ -0,0 +1,52 @@ +[Protocol] +exec=kio_videodvd +protocol=videodvd +input=none +output=filesystem +reading=true +listing=Name,Type,Size,Date +Icon=dvd_unmount +Class=:local +Description=A tdeioslave that allows files to be copied from a Video DVD (including decryption) +Description[af]='n 'Kioslave' wat jou toelaat om lêers vanaf 'n Video DVD te kopiëer. Dit doen ook die nodige dekripsie. +Description[ar]= يسمح هذا ال-tdeioslave بنسخ الملفات من قرص مدمج مرئي رقمي DVD ( بما فيه فك التشفير ) +Description[bg]=tdeioslave, позволяващ ви да копирате файлове от видео DVD (включително разшифроването) +Description[bn]=একটি কে-আই-ও স্লেভ যেটি একটি ভিডিও ডিভিডি থেকে ফাইল কপি করতে অনুমতিদেয় (ডিক্রিপশন সহ) +Description[ca]=Un tdeioslave que permet que es copiïn fitxers des d'un DVD de vídeo (incloent el desxifrat) +Description[cs]=Kioslave umožňující kopírování video DVD (včetně dekódování) +Description[da]=En tdeioslave som gør det muligt at kopiere filer fra en video-dvd (inklusive afkodning) +Description[de]=Ein-/Ausgabemodul, mit dem man Dateien von einer Video-DVD kopieren kann (inkl. Entschlüsselung) +Description[el]=Ένα tdeioslave που επιτρέπει την αντιγραφή αρχείων από ένα DVD βίντεο (δυνατότητα αποκρυπτογράφησης) +Description[eo]=Kioslave kiu permesas kopii dosierojn el videa DVD (inklude malĉifro) +Description[es]=Un tdeioslave que permite copiar archivos de un DVD de vídeo (incluye descifrado) +Description[et]=KIO-moodul, mis võimaldab kopeerida faile video DVD-lt (vajadusel dekrüpteerib) +Description[fa]=یک tdeioslave که اجازه میدهد پروندهها از یک دی وی دی ویدئویی )شامل سرگشایی( رونوشت شوند +Description[fi]=Kioslave-palvelu, joka mahdollistaa tiedostojen purkamisen dvd-levyltä. +Description[fr]=Un tdeioslave qui permet de copier des fichiers depuis un DVD Vidéo (incluant le déchiffrement) +Description[gl]=Un tdeioslave que permite copiar ficheiros dun Video DVD (incluindo descifrar) +Description[he]=עבד קלט/פלט של KDE המאפשר לקבצים להיות מועתקים מתקליטור וידאו של DVD (כולל פענוח) +Description[hu]=Kioslave, amellyel fájlokat lehet másolni Video DVD-ről (dekódolással együtt) +Description[is]=Kioslave sem leyfir afritun af skrám frá vídeó DVD (með afkóðun) +Description[it]=Un tdeioslave che permette ai file di essere copiati da un DVD video (incluso decifrazione) +Description[ja]=ビデオ DVD からファイルをコピーすることを可能にする tdeioslave (暗号解除も含む) +Description[ka]=Kioslave, რომელიც იძლევა Video DVD-დან ასლის ფაილების მიღების საშუელებას (გაშიფრვასთან ერთად) +Description[km]=tdeioslave ដែលអនុញ្ញាតឲ្យចម្លងឯកសារពីឌីវីឌីវីដេអូ(រួមទាំងការឌិគ្រីប) +Description[lt]=Priedas (tdeioslave) leidžiantis kopijuoti bylas iš Video DVD (taip pat ir atšifruoti) +Description[ms]=tdeioslave yang membenarkan fail untuk disalin dari DVD Video (termasuk nyahenkripsi) +Description[nb]=En tdeioslave som gjør det mulig å kopiere filer fra en Video-DVD (medregnet dekryptering) +Description[nds]=En In-/Utgaavmoduul, mit dat sik Dateien vun en Video-DVD koperen laat (ok mit Opslöteln) +Description[nl]=Een tdeioslave waarmee u bestanden van een video-dvd kunt kopiëren (inclusief versleuteling) +Description[nn]=Ein tdeioslave som gjer det mogleg å kopiera filer frå ein film-DVD (inkludert kryptering) +Description[pa]=ਇੱਕ tdeioslave ਹੈ, ਜੋ ਕਿ ਫਾਇਲਾਂ ਨੂੰ ਇੱਕ DVD (ਡਿਸਕਰਿਪਸ਼ਨ ਸਮੇ) ਤੋਂ ਨਕਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ +Description[pl]=Wtyczka protokołu pozwalająca kopiować pliki z płyt DVD Video (łącznie z odszyfrowywaniem) +Description[pt]=Um 'tdeioslave' que permite copiar ficheiros de um DVD Vídeo (incluindo decifrar) +Description[pt_BR]=Um tdeioslave que permite que arquivos sejam copiados de um DVD de Vídeo (incluindo a quebra da proteção) +Description[ru]=Позволяет копировать файлы с Video DVD (с дешифровкой) +Description[sk]=tdeioslave, ktorý umožňuje kopírovať súbory z Video DVD (vrátane dešifrovania) +Description[sr]=tdeioslave који омогућава копирање фајлова са видео DVD-а (укључујући дешифровање) +Description[sr@Latn]=tdeioslave koji omogućava kopiranje fajlova sa video DVD-a (uključujući dešifrovanje) +Description[sv]=En I/O-slav som gör det möjligt att kopiera filer från en video-dvd (inklusive avkodning) +Description[tr]= Bir Görüntü DVD'sinden dosyaların kopyalanmasını (ve kodunun çözülmesini) sağlayan tdeioslave +Description[uk]=Підлеглий В/В, який дає змогу копіювати файли з Відео DVD (включаючи розшифрування) +Description[zh_CN]=允许从视频 DVD(包括加密影碟)中复制文件的 tdeioslave +Description[zh_TW]=允許直接從 Video DVD 複製檔案的 tdeioslave(會自動解密) |