diff options
Diffstat (limited to 'tdeioslave')
69 files changed, 436 insertions, 436 deletions
diff --git a/tdeioslave/about/Makefile.am b/tdeioslave/about/Makefile.am index 7ac082ee3..9fca3428a 100644 --- a/tdeioslave/about/Makefile.am +++ b/tdeioslave/about/Makefile.am @@ -1,14 +1,14 @@ ## Makefile.am of tdebase/tdeioslave/about INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor ####### Files kde_module_LTLIBRARIES = tdeio_about.la tdeio_about_la_SOURCES = tdeio_about.cpp -tdeio_about_la_LIBADD = $(LIB_KSYCOCA) +tdeio_about_la_LIBADD = $(LIB_TDESYCOCA) tdeio_about_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = tdeio_about.h diff --git a/tdeioslave/cgi/Makefile.am b/tdeioslave/cgi/Makefile.am index b996757cf..dd4391e0f 100644 --- a/tdeioslave/cgi/Makefile.am +++ b/tdeioslave/cgi/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = tdeio_cgi.la tdeio_cgi_la_SOURCES = cgi.cpp -tdeio_cgi_la_LIBADD = $(LIB_KIO) +tdeio_cgi_la_LIBADD = $(LIB_TDEIO) tdeio_cgi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = cgi.h diff --git a/tdeioslave/cgi/cgi.h b/tdeioslave/cgi/cgi.h index 165b34a47..2113acd0f 100644 --- a/tdeioslave/cgi/cgi.h +++ b/tdeioslave/cgi/cgi.h @@ -15,8 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KIO_CGI_H -#define KIO_CGI_H +#ifndef TDEIO_CGI_H +#define TDEIO_CGI_H #include <tqobject.h> diff --git a/tdeioslave/cgi/kcmcgi/Makefile.am b/tdeioslave/cgi/kcmcgi/Makefile.am index 32f4be3ea..366c59c05 100644 --- a/tdeioslave/cgi/kcmcgi/Makefile.am +++ b/tdeioslave/cgi/kcmcgi/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_cgi.la kcm_cgi_la_SOURCES = kcmcgi.cpp kcm_cgi_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_cgi_la_LIBADD = -ltdeui $(LIB_KIO) +kcm_cgi_la_LIBADD = -ltdeui $(LIB_TDEIO) INCLUDES= $(all_includes) diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp index 592371cb6..70eec4d4d 100644 --- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp @@ -69,7 +69,7 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name) updateButton(); TDEAboutData *about = new TDEAboutData( I18N_NOOP("kcmcgi"), - I18N_NOOP("CGI KIO Slave Control Module"), + I18N_NOOP("CGI TDEIO Slave Control Module"), 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2002 Cornelius Schumacher") ); @@ -144,7 +144,7 @@ void KCMCgi::removePath() TQString KCMCgi::quickHelp() const { - return i18n("<h1>CGI Scripts</h1> The CGI KIO slave lets you execute " + return i18n("<h1>CGI Scripts</h1> The CGI TDEIO slave lets you execute " "local CGI programs without the need to run a web server. " "In this control module you can configure the paths that " "are searched for CGI scripts."); diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop index 0b4bb3b2c..33a7604dc 100644 --- a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop +++ b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop @@ -85,147 +85,147 @@ Name[xh]=Amagama ashicilelwe phantsi CGI Name[zh_CN]=CGI 脚本 Name[zh_TW]=CGI 命令稿 Name[zu]=Izikript ze-CGI -Comment=Configure the CGI KIO slave -Comment[af]=Stel die CGI KIO slaaf op -Comment[ar]=تهيئة CGI KIO slave -Comment[be]=Настаўленні CGI KIO slave -Comment[bg]=Настройване на модула за изпълнение на скриптове без уеб сървър - CGI KIO -Comment[bn]=CGI KIO স্লেভ কনফিগার করুন -Comment[bs]=Podešavanje CGI KIO slave-a -Comment[ca]=Configura l'esclau KIO CGI +Comment=Configure the CGI TDEIO slave +Comment[af]=Stel die CGI TDEIO slaaf op +Comment[ar]=تهيئة CGI TDEIO slave +Comment[be]=Настаўленні CGI TDEIO slave +Comment[bg]=Настройване на модула за изпълнение на скриптове без уеб сървър - CGI TDEIO +Comment[bn]=CGI TDEIO স্লেভ কনফিগার করুন +Comment[bs]=Podešavanje CGI TDEIO slave-a +Comment[ca]=Configura l'esclau TDEIO CGI Comment[cs]=Nastavení CGI pro TDE Comment[csb]=Kònfigùracëjô procedurë òbsłużënkù CGI -Comment[cy]=Ffurfweddu'r gwas CGI KIO -Comment[da]=Indstilling af CGI KIO-slaven +Comment[cy]=Ffurfweddu'r gwas CGI TDEIO +Comment[da]=Indstilling af CGI TDEIO-slaven Comment[de]=Ein-/Ausgabemodul für CGI einrichten -Comment[el]=Ρυθμίστε το CGI KIO slave +Comment[el]=Ρυθμίστε το CGI TDEIO slave Comment[eo]=Agordu CGI-enel-sklavon -Comment[es]=Configuración del KIO slave de CGI -Comment[et]=CGI KIO mooduli seadistamine -Comment[eu]=CGI KIO slave-a konfiguratu -Comment[fa]=پیکربندی پیرو CGI KIO -Comment[fi]=Muokkaa CGI-KIO-palvelun asetuksia -Comment[fr]=Configuration du CGI KIO slave +Comment[es]=Configuración del TDEIO slave de CGI +Comment[et]=CGI TDEIO mooduli seadistamine +Comment[eu]=CGI TDEIO slave-a konfiguratu +Comment[fa]=پیکربندی پیرو CGI TDEIO +Comment[fi]=Muokkaa CGI-TDEIO-palvelun asetuksia +Comment[fr]=Configuration du CGI TDEIO slave Comment[fy]=Hjir kinne jo de CGI Kio-slave ynstelle -Comment[ga]=Cumraigh an sclábhaí CGI KIO -Comment[gl]=Configuración do escravo KIO de CGI +Comment[ga]=Cumraigh an sclábhaí CGI TDEIO +Comment[gl]=Configuración do escravo TDEIO de CGI Comment[he]=שינוי הגדרות פרוטוקול ה־CGI Comment[hi]=सीजीआई केआईओ स्लेव कॉन्फ़िगर करें -Comment[hr]=Konfiguriranje CGI KIO podčinjenog +Comment[hr]=Konfiguriranje CGI TDEIO podčinjenog Comment[hu]=A CGI TDE-protokoll beállításai Comment[is]=Stilla CGI þrælinn -Comment[it]=Configura il KIO-slave CGI -Comment[ja]=CGI KIO スレーブの設定 -Comment[ka]=CGI KIO slave-ის კონფიგურაცია -Comment[kk]=CGI KIO slave-ты баптау -Comment[km]=កំណត់រចនាសម្ព័ន្ធកូនចៅ CGI KIO -Comment[ko]=CGI KIO 슬레이브 설정 +Comment[it]=Configura il TDEIO-slave CGI +Comment[ja]=CGI TDEIO スレーブの設定 +Comment[ka]=CGI TDEIO slave-ის კონფიგურაცია +Comment[kk]=CGI TDEIO slave-ты баптау +Comment[km]=កំណត់រចនាសម្ព័ន្ធកូនចៅ CGI TDEIO +Comment[ko]=CGI TDEIO 슬레이브 설정 Comment[lo]=ປັບແຕ່ງກ້ອງ -Comment[lt]=Konfigūruoti CGI KIO slave -Comment[lv]=Konfigurēt CGI KIO vergu -Comment[mk]=Конфигурација на CGI KIO служителот +Comment[lt]=Konfigūruoti CGI TDEIO slave +Comment[lv]=Konfigurēt CGI TDEIO vergu +Comment[mk]=Конфигурација на CGI TDEIO служителот Comment[mn]=CGI-Оролт/Гаралтын-Модул тохируулах -Comment[ms]=Konfigur hamba CGI KIO +Comment[ms]=Konfigur hamba CGI TDEIO Comment[mt]=Ikkonfigura l-iskjav CGI -Comment[nb]=Tilpass CGI KIO slave +Comment[nb]=Tilpass CGI TDEIO slave Comment[nds]=Den CGI-In-/Utgaavdeenst instellen -Comment[ne]=CGI KIO स्लेभ कन्फिगर गर्नुहोस् +Comment[ne]=CGI TDEIO स्लेभ कन्फिगर गर्नुहोस् Comment[nl]=Hier kunt u de CGI Kio-slave instellen -Comment[nn]=Set opp CGI-KIO-slaven -Comment[nso]=Beakanya lekgoba la KIO ya CGI -Comment[pa]=CGI KIO ਸਲੇਵ ਸੰਰਚਨਾ +Comment[nn]=Set opp CGI-TDEIO-slaven +Comment[nso]=Beakanya lekgoba la TDEIO ya CGI +Comment[pa]=CGI TDEIO ਸਲੇਵ ਸੰਰਚਨਾ Comment[pl]=Konfiguracja procedury obsługi CGI -Comment[pt]=Configuração do KIO slave de CGIs -Comment[pt_BR]=Configurar o KIO (escravo) do CGI +Comment[pt]=Configuração do TDEIO slave de CGIs +Comment[pt_BR]=Configurar o TDEIO (escravo) do CGI Comment[ro]=Configurează dispozitivul I/O CGI -Comment[ru]=Настройка CGI KIO slave -Comment[rw]=Kuboneza CGI KIO umugaragu -Comment[se]=Heivet CGI-KIO-šláva +Comment[ru]=Настройка CGI TDEIO slave +Comment[rw]=Kuboneza CGI TDEIO umugaragu +Comment[se]=Heivet CGI-TDEIO-šláva Comment[sk]=Nastavenie IO klienta CGI -Comment[sl]=Nastavi podrejenega KIO CGI -Comment[sr]=Подешавање CGI KIO slave-а -Comment[sr@Latn]=Podešavanje CGI KIO slave-a +Comment[sl]=Nastavi podrejenega TDEIO CGI +Comment[sr]=Подешавање CGI TDEIO slave-а +Comment[sr@Latn]=Podešavanje CGI TDEIO slave-a Comment[sv]=Anpassa I/O-slaven för CGI -Comment[ta]=CGI KIO slaveஐ வடிவமை -Comment[tg]=Бандаи CGI KIO-ро танзим кунед -Comment[th]=ปรับแต่ง CGI KIO slave -Comment[tr]=CGI KIO aracısını yapılandır -Comment[tt]=CGI KIO slave caylawı -Comment[uk]=Налаштування підлеглого KIO CGI -Comment[uz]=CGI KIO sleyvni moslash -Comment[uz@cyrillic]=CGI KIO слейвни мослаш -Comment[ven]=Dzudzanyani phuli CGI KIO -Comment[vi]=Cấu hình đày tớCGI KIO -Comment[wa]=Apontyî li mandaye KIO CGI -Comment[xh]=Qwlalsela i CGI KIO slave -Comment[zh_CN]=配置 CGI KIO 仆人 -Comment[zh_TW]=設定 CGI KIO slave -Comment[zu]=Hlanganisela i-CGI KIO slave +Comment[ta]=CGI TDEIO slaveஐ வடிவமை +Comment[tg]=Бандаи CGI TDEIO-ро танзим кунед +Comment[th]=ปรับแต่ง CGI TDEIO slave +Comment[tr]=CGI TDEIO aracısını yapılandır +Comment[tt]=CGI TDEIO slave caylawı +Comment[uk]=Налаштування підлеглого TDEIO CGI +Comment[uz]=CGI TDEIO sleyvni moslash +Comment[uz@cyrillic]=CGI TDEIO слейвни мослаш +Comment[ven]=Dzudzanyani phuli CGI TDEIO +Comment[vi]=Cấu hình đày tớCGI TDEIO +Comment[wa]=Apontyî li mandaye TDEIO CGI +Comment[xh]=Qwlalsela i CGI TDEIO slave +Comment[zh_CN]=配置 CGI TDEIO 仆人 +Comment[zh_TW]=設定 CGI TDEIO slave +Comment[zu]=Hlanganisela i-CGI TDEIO slave -Keywords=CGI,KIO,Slave,Paths -Keywords[ar]=CGI,KIO,Slave,Paths,مسارات -Keywords[az]=CGI,KIO,Slave,Paths,Cığırlar -Keywords[be]=Шляхі,CGI,KIO,Slave,Paths -Keywords[bg]=скриптове, уеб, динамичен, скрипт, Интернет, път, пътища, CGI, KIO, Slave, Paths -Keywords[br]=CGI,KIO,sklav,hentoù -Keywords[ca]=CGI,KIO,Esclau,Rutes -Keywords[cs]=CGI,KIO,slave,cesty -Keywords[csb]=CGI,KIO,procedurë wé/wi,stegnë -Keywords[cy]=CGI,KIO,Gwas,Llwybrau -Keywords[da]=CGI,KIO,Slave,Stier -Keywords[de]=CGI,KIO,Ein-/Ausgabemodul,Pfade -Keywords[el]=CGI,KIO,Slave,Διαδρομές +Keywords=CGI,TDEIO,Slave,Paths +Keywords[ar]=CGI,TDEIO,Slave,Paths,مسارات +Keywords[az]=CGI,TDEIO,Slave,Paths,Cığırlar +Keywords[be]=Шляхі,CGI,TDEIO,Slave,Paths +Keywords[bg]=скриптове, уеб, динамичен, скрипт, Интернет, път, пътища, CGI, TDEIO, Slave, Paths +Keywords[br]=CGI,TDEIO,sklav,hentoù +Keywords[ca]=CGI,TDEIO,Esclau,Rutes +Keywords[cs]=CGI,TDEIO,slave,cesty +Keywords[csb]=CGI,TDEIO,procedurë wé/wi,stegnë +Keywords[cy]=CGI,TDEIO,Gwas,Llwybrau +Keywords[da]=CGI,TDEIO,Slave,Stier +Keywords[de]=CGI,TDEIO,Ein-/Ausgabemodul,Pfade +Keywords[el]=CGI,TDEIO,Slave,Διαδρομές Keywords[eo]=CGI,Enel,K-enel,sklavo,servo,vojoj -Keywords[es]=CGI,KIO,Slave,Rutas -Keywords[et]=CGI,KIO,moodul,otsinguteed -Keywords[fa]=CGI، KIO، Slave، مسیرها -Keywords[fi]=CGI,KIO,KIO-palvelu,palvelu,Polut -Keywords[fr]=CGI,KIO,Slave,Paths,Chemins,Emplacements -Keywords[fy]=cgi,kio,slave,paths,paden -Keywords[ga]=CGI,KIO,Sclábhaí,Bealaí -Keywords[gl]=CGI,KIO,Escravo,Camiños -Keywords[he]=CGI,KIO,פרוטוקול,נתיבים, Slave,Paths +Keywords[es]=CGI,TDEIO,Slave,Rutas +Keywords[et]=CGI,TDEIO,moodul,otsinguteed +Keywords[fa]=CGI، TDEIO، Slave، مسیرها +Keywords[fi]=CGI,TDEIO,TDEIO-palvelu,palvelu,Polut +Keywords[fr]=CGI,TDEIO,Slave,Paths,Chemins,Emplacements +Keywords[fy]=cgi,tdeio,slave,paths,paden +Keywords[ga]=CGI,TDEIO,Sclábhaí,Bealaí +Keywords[gl]=CGI,TDEIO,Escravo,Camiños +Keywords[he]=CGI,TDEIO,פרוטוקול,נתיבים, Slave,Paths Keywords[hi]=सीजीआई,केआईओ,स्लेव,पथ -Keywords[hr]=CGI,KIO,Slave,Paths,podčinjeni,putanje -Keywords[hu]=CGI,KIO,protokoll,elérési utak -Keywords[is]=CGI,KIO,þræll,slóðir -Keywords[it]=CGI,KIO,tdeioslave,percorsi -Keywords[ja]=CGI,KIO,スレーブ,パス -Keywords[km]=CGI,KIO,កូនចៅ,ផ្លូវ -Keywords[lt]=CGI,KIO,Slave,Paths, keliai -Keywords[lv]=CGI,KIO,vergi,ceļi -Keywords[mk]=CGI,KIO,Slave,Paths,Патеки -Keywords[mn]=CGI,KIO,Оролт/Гаралтын-Модул,Зам -Keywords[mt]=CGI,KIO,Slave,Paths,skjav,passaġġ -Keywords[nb]=CGI,KIO,Slave,slave,stier -Keywords[nds]=CGI,KIO,Slave,IU,In-/Utgaavdeenst,Deenst,Padden -Keywords[ne]=CGI,KIO,स्लेभ, मार्ग -Keywords[nl]=cgi,kio,slave,paths,paden -Keywords[nn]=CGI,KIO,slave,stiar -Keywords[nso]=CGI,KIO,Lekgoba,Ditsejana -Keywords[pa]=CGI,KIO,ਸਲੇਵ,ਮਾਰਗ -Keywords[pl]=CGI,KIO,procedury we/wy,ścieżki -Keywords[pt]=CGI,KIO,Slave,Localizações -Keywords[pt_BR]=CGI,KIO,Escravo,Caminhos -Keywords[ro]=I/E,IE,CGI,KIO,dispozitiv,căi -Keywords[rw]=CGI,KIO,Umugaragu,Inzira -Keywords[se]=CGI,KIO,šláva,bálgát -Keywords[sk]=CGI,KIO,klient,cesty -Keywords[sl]=CGI,KIO,podrejeni,pot -Keywords[sr]=CGI,KIO,Slave,Путање -Keywords[sr@Latn]=CGI,KIO,Slave,Putanje -Keywords[sv]=CGI,KIO,Slav,Sökvägar -Keywords[ta]=CGI,KIO,ஸ்லேவ்,பாதைகள் +Keywords[hr]=CGI,TDEIO,Slave,Paths,podčinjeni,putanje +Keywords[hu]=CGI,TDEIO,protokoll,elérési utak +Keywords[is]=CGI,TDEIO,þræll,slóðir +Keywords[it]=CGI,TDEIO,tdeioslave,percorsi +Keywords[ja]=CGI,TDEIO,スレーブ,パス +Keywords[km]=CGI,TDEIO,កូនចៅ,ផ្លូវ +Keywords[lt]=CGI,TDEIO,Slave,Paths, keliai +Keywords[lv]=CGI,TDEIO,vergi,ceļi +Keywords[mk]=CGI,TDEIO,Slave,Paths,Патеки +Keywords[mn]=CGI,TDEIO,Оролт/Гаралтын-Модул,Зам +Keywords[mt]=CGI,TDEIO,Slave,Paths,skjav,passaġġ +Keywords[nb]=CGI,TDEIO,Slave,slave,stier +Keywords[nds]=CGI,TDEIO,Slave,IU,In-/Utgaavdeenst,Deenst,Padden +Keywords[ne]=CGI,TDEIO,स्लेभ, मार्ग +Keywords[nl]=cgi,tdeio,slave,paths,paden +Keywords[nn]=CGI,TDEIO,slave,stiar +Keywords[nso]=CGI,TDEIO,Lekgoba,Ditsejana +Keywords[pa]=CGI,TDEIO,ਸਲੇਵ,ਮਾਰਗ +Keywords[pl]=CGI,TDEIO,procedury we/wy,ścieżki +Keywords[pt]=CGI,TDEIO,Slave,Localizações +Keywords[pt_BR]=CGI,TDEIO,Escravo,Caminhos +Keywords[ro]=I/E,IE,CGI,TDEIO,dispozitiv,căi +Keywords[rw]=CGI,TDEIO,Umugaragu,Inzira +Keywords[se]=CGI,TDEIO,šláva,bálgát +Keywords[sk]=CGI,TDEIO,klient,cesty +Keywords[sl]=CGI,TDEIO,podrejeni,pot +Keywords[sr]=CGI,TDEIO,Slave,Путање +Keywords[sr@Latn]=CGI,TDEIO,Slave,Putanje +Keywords[sv]=CGI,TDEIO,Slav,Sökvägar +Keywords[ta]=CGI,TDEIO,ஸ்லேவ்,பாதைகள் Keywords[te]=సిజిఐ,కెఐఒ,బానిస,దారులు -Keywords[th]=CGI,KIO,Slave,เส้นทาง -Keywords[tr]=CGI,KIO,Aracı,Yollar -Keywords[uk]=CGI,KIO,підлеглий,шлях -Keywords[uz]=CGI,KIO,Sleyv,Yoʻllar -Keywords[uz@cyrillic]=CGI,KIO,Слейв,Йўллар -Keywords[ven]=CGI,KIO,Phuli,Ludila -Keywords[vi]=CGI,KIO,Đày tớ,Đường dẫn -Keywords[wa]=CGI,KIO,Slave,Paths,tchimins,mandaye -Keywords[zh_CN]=CGI,KIO,Slave,Paths,路径 -Keywords[zh_TW]=CGI,KIO,Slave,Paths,路徑 -Keywords[zu]=CGI,KIO,Slave,Izindlela +Keywords[th]=CGI,TDEIO,Slave,เส้นทาง +Keywords[tr]=CGI,TDEIO,Aracı,Yollar +Keywords[uk]=CGI,TDEIO,підлеглий,шлях +Keywords[uz]=CGI,TDEIO,Sleyv,Yoʻllar +Keywords[uz@cyrillic]=CGI,TDEIO,Слейв,Йўллар +Keywords[ven]=CGI,TDEIO,Phuli,Ludila +Keywords[vi]=CGI,TDEIO,Đày tớ,Đường dẫn +Keywords[wa]=CGI,TDEIO,Slave,Paths,tchimins,mandaye +Keywords[zh_CN]=CGI,TDEIO,Slave,Paths,路径 +Keywords[zh_TW]=CGI,TDEIO,Slave,Paths,路徑 +Keywords[zu]=CGI,TDEIO,Slave,Izindlela Categories=Qt;TDE;X-TDE-settings-webbrowsing; diff --git a/tdeioslave/filter/Makefile.am b/tdeioslave/filter/Makefile.am index 2a972960c..0ccdf55ee 100644 --- a/tdeioslave/filter/Makefile.am +++ b/tdeioslave/filter/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = tdeio_filter.la tdeio_filter_la_SOURCES = filter.cc -tdeio_filter_la_LIBADD = $(LIB_KSYCOCA) +tdeio_filter_la_LIBADD = $(LIB_TDESYCOCA) tdeio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = filter.h diff --git a/tdeioslave/finger/Makefile.am b/tdeioslave/finger/Makefile.am index 46e0ff69c..c5b95f2d0 100644 --- a/tdeioslave/finger/Makefile.am +++ b/tdeioslave/finger/Makefile.am @@ -2,7 +2,7 @@ ## Edit from Makefile.am of tdebase/tdeioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor ####### Files diff --git a/tdeioslave/fish/Makefile.am b/tdeioslave/fish/Makefile.am index e060da76f..3c79a3d3e 100644 --- a/tdeioslave/fish/Makefile.am +++ b/tdeioslave/fish/Makefile.am @@ -1,10 +1,10 @@ kde_module_LTLIBRARIES = tdeio_fish.la INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor tdeio_fish_la_SOURCES = fish.cpp -tdeio_fish_la_LIBADD = $(LIB_KSYCOCA) $(LIBUTIL) +tdeio_fish_la_LIBADD = $(LIB_TDESYCOCA) $(LIBUTIL) tdeio_fish_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lutil noinst_HEADERS = fishcode.h fish.h diff --git a/tdeioslave/fish/fish.protocol b/tdeioslave/fish/fish.protocol index dfff5a789..e4ab09d56 100644 --- a/tdeioslave/fish/fish.protocol +++ b/tdeioslave/fish/fish.protocol @@ -43,11 +43,11 @@ Description[ja]=FISH プロトコルのための tdeioslave Description[ka]=tdeioslave FISH პროტოკოლისთვის Description[kk]=FISH протоколға арналған файл жүйесінің модулі Description[km]=tdeioslave សម្រាប់ពិធីការ FISH -Description[ko]=FISH 프로토콜을 위한 KIO 슬레이브 +Description[ko]=FISH 프로토콜을 위한 TDEIO 슬레이브 Description[lt]=Kiovergas FISH protokolui -Description[lv]=KIO vergs FISH protokolam +Description[lv]=TDEIO vergs FISH protokolam Description[mk]=КИО-служител за протоколот FISH -Description[ms]=Hamba kio untuk protokol FISH +Description[ms]=Hamba tdeio untuk protokol FISH Description[nb]=En IU-slave for FISH-protokollen Description[nds]=En In-/Utgaavdeenst för dat FISH-Protokoll Description[ne]=FISH प्रोटोकलका लागि एउटा किओस्लेभ @@ -59,7 +59,7 @@ Description[pt]=Um 'tdeioslave' para o protocolo FISH Description[pt_BR]=Uma implementação para o protocolo FISH Description[ro]=Un dispozitiv de I/E pentru protocolul FISH Description[ru]=Модуль файловой системы для протокола FISH -Description[rw]=kio-umugaragu ya Porotokole FISH +Description[rw]=tdeio-umugaragu ya Porotokole FISH Description[se]=SO-šláva FISH-protokolla várás Description[sk]=tdeioslave pre protokol FISH Description[sl]=tdeioslave za protokol FISH @@ -76,6 +76,6 @@ Description[uz]=FISH protokoli uchun KCH-sleyv Description[uz@cyrillic]=FISH протоколи учун КЧ-слейв Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho giao thức FISH Description[wa]=On tdeioslave pol protocole FISH -Description[zh_CN]=FISH 协议的 KIO 仆人 +Description[zh_CN]=FISH 协议的 TDEIO 仆人 Description[zh_TW]=用於 FISH 通訊協定的 tdeioslave DocPath=tdeioslave/fish.html diff --git a/tdeioslave/fish/nxfish.protocol b/tdeioslave/fish/nxfish.protocol index 27f1fb853..38a100cfb 100644 --- a/tdeioslave/fish/nxfish.protocol +++ b/tdeioslave/fish/nxfish.protocol @@ -41,8 +41,8 @@ Description[ja]=NXFISH プロトコルのための tdeioslave Description[ka]=tdeioslave NXFISH ოქმისთვის Description[kk]=NXFISH протоколы үшін tdeioslave Description[km]=tdeioslave សម្រាប់ពិធីការ NXFISH -Description[ko]=FISH 프로토콜을 위한 KIO 슬레이브 -Description[lt]=Pagalbinė kio programa NXFISH protokolui +Description[ko]=FISH 프로토콜을 위한 TDEIO 슬레이브 +Description[lt]=Pagalbinė tdeio programa NXFISH protokolui Description[mk]=КИО-служител за протоколот NXFISH Description[nb]=En kioskslave for NXFISH-protokollen Description[nds]=En In-/Utgaavdeenst för dat NXFISH-Protokoll @@ -69,6 +69,6 @@ Description[uz]=NXFISH protokoli uchun KCH-sleyvi Description[uz@cyrillic]=NXFISH протоколи учун КЧ-слейви Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho giao thức NXFISH Description[wa]=On tdeioslave pol protocole NXFISH -Description[zh_CN]=NXFISH 协议的 KIO 仆人 +Description[zh_CN]=NXFISH 协议的 TDEIO 仆人 Description[zh_TW]=用於 NXFISH 通訊協定的 tdeioslave DocPath=tdeioslave/fish.html diff --git a/tdeioslave/floppy/Makefile.am b/tdeioslave/floppy/Makefile.am index e6b52fe17..da97e4339 100644 --- a/tdeioslave/floppy/Makefile.am +++ b/tdeioslave/floppy/Makefile.am @@ -8,7 +8,7 @@ AM_LDFLAGS = $(all_libraries) kde_module_LTLIBRARIES = tdeio_floppy.la tdeio_floppy_la_SOURCES = tdeio_floppy.cpp program.cpp -tdeio_floppy_la_LIBADD = $(LIB_KIO) +tdeio_floppy_la_LIBADD = $(LIB_TDEIO) tdeio_floppy_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kdelnk_DATA = floppy.protocol diff --git a/tdeioslave/floppy/tdeio_floppy.h b/tdeioslave/floppy/tdeio_floppy.h index d38340729..07892a46d 100644 --- a/tdeioslave/floppy/tdeio_floppy.h +++ b/tdeioslave/floppy/tdeio_floppy.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KIO_FLOPPY_H -#define KIO_FLOPPY_H +#ifndef TDEIO_FLOPPY_H +#define TDEIO_FLOPPY_H #include <tdeio/slavebase.h> #include <tdeio/global.h> diff --git a/tdeioslave/home/Makefile.am b/tdeioslave/home/Makefile.am index d40341aab..3bd078852 100644 --- a/tdeioslave/home/Makefile.am +++ b/tdeioslave/home/Makefile.am @@ -7,7 +7,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = tdeio_home.la tdeio_home_la_SOURCES = dummy.cpp -tdeio_home_la_LIBADD = libtdeiohome.la $(LIB_KIO) +tdeio_home_la_LIBADD = libtdeiohome.la $(LIB_TDEIO) tdeio_home_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined dummy.cpp: @@ -20,7 +20,7 @@ libtdeiohome_la_SOURCES = tdeio_home.cpp homeimpl.cpp check_PROGRAMS = testhome testhome_SOURCES = testhome.cpp -testhome_LDADD = libtdeiohome.la $(LIB_KIO) +testhome_LDADD = libtdeiohome.la $(LIB_TDEIO) testhome_LDFLAGS = $(all_libraries) ## TODO in unsermake: TESTS = testhome diff --git a/tdeioslave/home/kdedmodule/Makefile.am b/tdeioslave/home/kdedmodule/Makefile.am index 3d7a54f9b..e0bf9757b 100644 --- a/tdeioslave/home/kdedmodule/Makefile.am +++ b/tdeioslave/home/kdedmodule/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(all_includes) kded_homedirnotify_la_SOURCES = homedirnotify.cpp homedirnotify.skel homedirnotifymodule.cpp homedirnotifymodule.skel kded_homedirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_homedirnotify_la_LIBADD = $(LIB_KSYCOCA) +kded_homedirnotify_la_LIBADD = $(LIB_TDESYCOCA) servicesdir = $(kde_servicesdir)/kded diff --git a/tdeioslave/home/tdeio_home.h b/tdeioslave/home/tdeio_home.h index db5d8902c..51187af7c 100644 --- a/tdeioslave/home/tdeio_home.h +++ b/tdeioslave/home/tdeio_home.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KIO_HOME_H -#define KIO_HOME_H +#ifndef TDEIO_HOME_H +#define TDEIO_HOME_H #include <tdeio/forwardingslavebase.h> #include "homeimpl.h" diff --git a/tdeioslave/info/Makefile.am b/tdeioslave/info/Makefile.am index 1b2d21f32..a682f4a77 100644 --- a/tdeioslave/info/Makefile.am +++ b/tdeioslave/info/Makefile.am @@ -9,7 +9,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = tdeio_info.la tdeio_info_la_SOURCES = info.cc -tdeio_info_la_LIBADD = $(LIB_KIO) +tdeio_info_la_LIBADD = $(LIB_TDEIO) tdeio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = info.h diff --git a/tdeioslave/ldap/Makefile.am b/tdeioslave/ldap/Makefile.am index f21902229..8861d6c67 100644 --- a/tdeioslave/ldap/Makefile.am +++ b/tdeioslave/ldap/Makefile.am @@ -3,14 +3,14 @@ INCLUDES = $(all_includes) $(LDAP_INCS) AM_CXXFLAGS = -DLDAP_DEPRECATED AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -LDADD = $(LIB_KIO) $(LDAP_LIBS) +LDADD = $(LIB_TDEIO) $(LDAP_LIBS) ####### Files kde_module_LTLIBRARIES = tdeio_ldap.la tdeio_ldap_la_SOURCES = tdeio_ldap.cpp -tdeio_ldap_la_LIBADD = $(LIB_KIO) $(LDAP_LIBS) $(LIB_TDEABC) +tdeio_ldap_la_LIBADD = $(LIB_TDEIO) $(LDAP_LIBS) $(LIB_TDEABC) tdeio_ldap_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH) -module $(KDE_PLUGIN) noinst_HEADERS = tdeio_ldap.h diff --git a/tdeioslave/mac/Makefile.am b/tdeioslave/mac/Makefile.am index 42f73b507..9d9267055 100644 --- a/tdeioslave/mac/Makefile.am +++ b/tdeioslave/mac/Makefile.am @@ -1,7 +1,7 @@ ## Makfile.am for tdeio_mac INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor ####### Files diff --git a/tdeioslave/mac/mac.protocol b/tdeioslave/mac/mac.protocol index 1a9044158..c21307a89 100644 --- a/tdeioslave/mac/mac.protocol +++ b/tdeioslave/mac/mac.protocol @@ -39,9 +39,9 @@ Description[ka]=tdeioslave MacOS HFS+ პარტიციებისთვი Description[kk]=MacOS HFS+ файл жүйесінің енгізу-шығару модулі Description[km]=tdeioslave សម្រាប់ភាគ MacOS HFS+ Description[lt]=Kiovergas MacOS HFS+ dalmenims -Description[lv]=KIO vergs MacOS HFS+ partīcijām -Description[mk]=kio-служител за HFS+ партиции од MacOS -Description[ms]=Hamba kio untuk MacOS HFS+ petak +Description[lv]=TDEIO vergs MacOS HFS+ partīcijām +Description[mk]=tdeio-служител за HFS+ партиции од MacOS +Description[ms]=Hamba tdeio untuk MacOS HFS+ petak Description[nb]=En kioskslave for MacOS HFS+-partisjoner Description[nds]=En In-/Utgaavdeenst för MacOS-HFS+-Partitschonen Description[ne]=MacOS HFS+ विभाजनका लागि किओस्लेभ @@ -67,7 +67,7 @@ Description[tt]=MacOS HFS+ bülemnäre öçen birem sistemeneñ modulı Description[uk]=Підлеглий B/В для розділів MacOS HFS+ Description[vi]=A tdeioslave (đày tớ vào ra KDE) cho MacOS HFS và các phân vùng Description[wa]=On tdeioslave po MacOS HFS + pårticions -Description[zh_CN]=MacOS HFS+ 分区的 KIO 仆人 +Description[zh_CN]=MacOS HFS+ 分区的 TDEIO 仆人 Description[zh_TW]=用於 MacOS HFS+ 分割區的 tdeioslave Icon=mac DocPath=tdeioslave/mac.html diff --git a/tdeioslave/man/Makefile.am b/tdeioslave/man/Makefile.am index 7b2554ba0..e1dd3c867 100644 --- a/tdeioslave/man/Makefile.am +++ b/tdeioslave/man/Makefile.am @@ -1,28 +1,28 @@ ## Makefile.am of tdebase/tdeioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor EXTRA_PROGRAMS = tdeio_man_test man2html ####### just for testing ([email protected], 15.02.2001) tdeio_man_test_SOURCES = tdeio_man_test.cpp -tdeio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -tdeio_man_test_LDADD = man2html.lo tdeio_man.lo $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +tdeio_man_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdeio_man_test_LDADD = man2html.lo tdeio_man.lo $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) ####### Files kde_module_LTLIBRARIES = tdeio_man.la libkmanpart.la tdeio_man_la_SOURCES = man2html.cpp tdeio_man.cpp -tdeio_man_la_LIBADD = $(LIB_KSYCOCA) +tdeio_man_la_LIBADD = $(LIB_TDESYCOCA) tdeio_man_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = tdeio_man.h ### TODO Why is man2htmk.h distributed? libkmanpart_la_SOURCES = kmanpart.cpp -libkmanpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) +libkmanpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS) libkmanpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) kdelnk_DATA = man.protocol kmanpart.desktop @@ -39,7 +39,7 @@ messages: man2html_SOURCES = dummy.cpp man2html_LDADD = man2html_simple.o $(LIB_QT) -man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +man2html_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor dummy.cpp: echo > $@ diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp index a2f8365cb..67354e1b1 100644 --- a/tdeioslave/man/man2html.cpp +++ b/tdeioslave/man/man2html.cpp @@ -318,7 +318,7 @@ static void InitStringDefinitions( void ) // Missing characters from man(7): // \*S "Change to default font size" #ifndef SIMPLE_MAN2HTML - // Special KDE KIO man: + // Special KDE TDEIO man: const TQCString tdeversion(TDE_VERSION_STRING); s_stringDefinitionMap.insert( ".TDE_VERSION_STRING", StringDefinition( tdeversion.length(), tdeversion ) ); #endif @@ -1428,7 +1428,7 @@ static int read_only_number_register( const TQCString& name ) else if ( name == ".A" ) return s_nroff; #ifndef SIMPLE_MAN2HTML - // Special KDE KIO man: + // Special KDE TDEIO man: else if ( name == ".TDE_VERSION_MAJOR" ) return TDE_VERSION_MAJOR; else if ( name == ".TDE_VERSION_MINOR" ) diff --git a/tdeioslave/media/Makefile.am b/tdeioslave/media/Makefile.am index c827568a4..a5551fb2e 100644 --- a/tdeioslave/media/Makefile.am +++ b/tdeioslave/media/Makefile.am @@ -11,7 +11,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = tdeio_media.la tdeio_media_la_SOURCES = dummy.cpp -tdeio_media_la_LIBADD = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_KIO) +tdeio_media_la_LIBADD = libtdeiomedia.la libmediacommon/libmediacommon.la $(LIB_TDEIO) tdeio_media_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined dummy.cpp: @@ -24,7 +24,7 @@ libtdeiomedia_la_SOURCES = tdeio_media.cpp mediaimpl.cpp mediaimpl.skel check_PROGRAMS = testmedia testmedia_SOURCES = testmedia.cpp -testmedia_LDADD = libtdeiomedia.la $(LIB_KIO) +testmedia_LDADD = libtdeiomedia.la $(LIB_TDEIO) testmedia_LDFLAGS = $(all_libraries) ## TODO in unsermake: TESTS = testmedia diff --git a/tdeioslave/media/mediamanager/Makefile.am b/tdeioslave/media/mediamanager/Makefile.am index 45289a9eb..0641dd57e 100644 --- a/tdeioslave/media/mediamanager/Makefile.am +++ b/tdeioslave/media/mediamanager/Makefile.am @@ -24,7 +24,7 @@ noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB) +kded_mediamanager_la_LIBADD = $(LIB_TDESYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB) servicesdir = $(kde_servicesdir)/kded diff --git a/tdeioslave/media/medianotifier/Makefile.am b/tdeioslave/media/medianotifier/Makefile.am index b31354810..a19727958 100644 --- a/tdeioslave/media/medianotifier/Makefile.am +++ b/tdeioslave/media/medianotifier/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(all_includes) kde_module_LTLIBRARIES = kded_medianotifier.la kded_medianotifier_la_LDFLAGS = -module -avoid-version $(all_libraries) kded_medianotifier_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDECORE) \ - $(LIB_TDEUI) $(LIB_KIO) + $(LIB_TDEUI) $(LIB_TDEIO) kded_medianotifier_la_SOURCES = medianotifier.cpp medianotifier.skel \ notificationdialog.cpp notificationdialogview.ui diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index 9b4c0e17e..bb8948db8 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/tdeioslave/media/medianotifier/medianotifier.cpp @@ -137,7 +137,7 @@ bool MediaNotifier::autostart( const KFileItem &medium ) } // From now we're sure the medium is already mounted. - // We can use the local path for stating, no need to use KIO here. + // We can use the local path for stating, no need to use TDEIO here. bool local; TQString path = medium.mostLocalURL( local ).path(); // local is always true here... diff --git a/tdeioslave/media/mounthelper/Makefile.am b/tdeioslave/media/mounthelper/Makefile.am index c1e056c18..b541ecb69 100644 --- a/tdeioslave/media/mounthelper/Makefile.am +++ b/tdeioslave/media/mounthelper/Makefile.am @@ -5,8 +5,8 @@ AM_LDFLAGS = $(all_libraries) tdeio_media_mounthelper_SOURCES = tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp -tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) $(LIB_TDEUI) +tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO) $(LIB_TDEUI) METASOURCES = AUTO diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h index 0fc6aa697..97df6b7e8 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h @@ -19,8 +19,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KIO_MEDIA_MOUNTHELPER_H_ -#define _KIO_MEDIA_MOUNTHELPER_H_ +#ifndef _TDEIO_MEDIA_MOUNTHELPER_H_ +#define _TDEIO_MEDIA_MOUNTHELPER_H_ #include <tdeapplication.h> #include <tqstring.h> diff --git a/tdeioslave/media/propsdlgplugin/Makefile.am b/tdeioslave/media/propsdlgplugin/Makefile.am index 5e3d8af83..7202681a8 100644 --- a/tdeioslave/media/propsdlgplugin/Makefile.am +++ b/tdeioslave/media/propsdlgplugin/Makefile.am @@ -2,7 +2,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = media_propsdlgplugin.la -media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) +media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO) media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) AM_CPPFLAGS = $(all_includes) diff --git a/tdeioslave/media/tdecmodule/Makefile.am b/tdeioslave/media/tdecmodule/Makefile.am index 72f9f385c..5bb7948a6 100644 --- a/tdeioslave/media/tdecmodule/Makefile.am +++ b/tdeioslave/media/tdecmodule/Makefile.am @@ -9,7 +9,7 @@ kcm_media_la_SOURCES = notifiermodule.cpp notifiermoduleview.ui \ main.cpp kcm_media_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) +kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO) noinst_HEADERS = notifiermodule.h managermodule.h \ serviceconfigdialog.h mimetypelistboxitem.h \ diff --git a/tdeioslave/media/tdefile-plugin/Makefile.am b/tdeioslave/media/tdefile-plugin/Makefile.am index 15807ea19..c15adce99 100644 --- a/tdeioslave/media/tdefile-plugin/Makefile.am +++ b/tdeioslave/media/tdefile-plugin/Makefile.am @@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = tdefile_media.la tdefile_media_la_SOURCES = tdefilemediaplugin.cpp tdefile_media_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) -tdefile_media_la_LIBADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la +tdefile_media_la_LIBADD = $(LIB_TDEIO) ../libmediacommon/libmediacommon.la kdelnkdir = $(kde_servicesdir) kde_services_DATA = tdefile_media.desktop diff --git a/tdeioslave/media/tdeio_media.h b/tdeioslave/media/tdeio_media.h index bf1325475..7acc44df0 100644 --- a/tdeioslave/media/tdeio_media.h +++ b/tdeioslave/media/tdeio_media.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KIO_MEDIA_H_ -#define _KIO_MEDIA_H_ +#ifndef _TDEIO_MEDIA_H_ +#define _TDEIO_MEDIA_H_ #include <tdeio/forwardingslavebase.h> diff --git a/tdeioslave/nfs/Makefile.am b/tdeioslave/nfs/Makefile.am index 0857fa223..bda4479de 100644 --- a/tdeioslave/nfs/Makefile.am +++ b/tdeioslave/nfs/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/tdeioslave/man INCLUDES= $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor ####### Files diff --git a/tdeioslave/nfs/tdeio_nfs.h b/tdeioslave/nfs/tdeio_nfs.h index b548fc487..0930924a2 100644 --- a/tdeioslave/nfs/tdeio_nfs.h +++ b/tdeioslave/nfs/tdeio_nfs.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KIO_NFS_H -#define KIO_NFS_H +#ifndef TDEIO_NFS_H +#define TDEIO_NFS_H #include <tdeio/slavebase.h> #include <tdeio/global.h> diff --git a/tdeioslave/nntp/Makefile.am b/tdeioslave/nntp/Makefile.am index 9f1b322eb..2cc883c3d 100644 --- a/tdeioslave/nntp/Makefile.am +++ b/tdeioslave/nntp/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes) kde_module_LTLIBRARIES = tdeio_nntp.la tdeio_nntp_la_SOURCES = nntp.cpp -tdeio_nntp_la_LIBADD = $(LIB_KIO) +tdeio_nntp_la_LIBADD = $(LIB_TDEIO) tdeio_nntp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/tdeioslave/pop3/Makefile.am b/tdeioslave/pop3/Makefile.am index 1bd5c95e5..130fb34d8 100644 --- a/tdeioslave/pop3/Makefile.am +++ b/tdeioslave/pop3/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = tdeio_pop3.la tdeio_pop3_la_SOURCES = pop3.cc -tdeio_pop3_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) +tdeio_pop3_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS) tdeio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = pop3.h diff --git a/tdeioslave/remote/Makefile.am b/tdeioslave/remote/Makefile.am index 780e0ac36..9505065f3 100644 --- a/tdeioslave/remote/Makefile.am +++ b/tdeioslave/remote/Makefile.am @@ -7,7 +7,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = tdeio_remote.la tdeio_remote_la_SOURCES = dummy.cpp -tdeio_remote_la_LIBADD = libtdeioremote.la $(LIB_KIO) +tdeio_remote_la_LIBADD = libtdeioremote.la $(LIB_TDEIO) tdeio_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined dummy.cpp: @@ -20,7 +20,7 @@ libtdeioremote_la_SOURCES = tdeio_remote.cpp remoteimpl.cpp check_PROGRAMS = testremote testremote_SOURCES = testremote.cpp -testremote_LDADD = libtdeioremote.la $(LIB_KIO) +testremote_LDADD = libtdeioremote.la $(LIB_TDEIO) testremote_LDFLAGS = $(all_libraries) ## TODO in unsermake: TESTS = testremote diff --git a/tdeioslave/remote/kdedmodule/Makefile.am b/tdeioslave/remote/kdedmodule/Makefile.am index 61f4d2261..af9169985 100644 --- a/tdeioslave/remote/kdedmodule/Makefile.am +++ b/tdeioslave/remote/kdedmodule/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(all_includes) kded_remotedirnotify_la_SOURCES = remotedirnotify.cpp remotedirnotify.skel remotedirnotifymodule.cpp remotedirnotifymodule.skel kded_remotedirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_remotedirnotify_la_LIBADD = $(LIB_KSYCOCA) +kded_remotedirnotify_la_LIBADD = $(LIB_TDESYCOCA) servicesdir = $(kde_servicesdir)/kded diff --git a/tdeioslave/remote/tdeio_remote.h b/tdeioslave/remote/tdeio_remote.h index ebc6dd1ad..47d80c04d 100644 --- a/tdeioslave/remote/tdeio_remote.h +++ b/tdeioslave/remote/tdeio_remote.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KIO_REMOTE_H -#define KIO_REMOTE_H +#ifndef TDEIO_REMOTE_H +#define TDEIO_REMOTE_H #include <tdeio/slavebase.h> #include "remoteimpl.h" diff --git a/tdeioslave/settings/Makefile.am b/tdeioslave/settings/Makefile.am index 2c2ac9320..b470a7782 100644 --- a/tdeioslave/settings/Makefile.am +++ b/tdeioslave/settings/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= $(all_includes) kde_module_LTLIBRARIES = tdeio_settings.la tdeio_settings_la_SOURCES = tdeio_settings.cc -tdeio_settings_la_LIBADD = $(LIB_KSYCOCA) +tdeio_settings_la_LIBADD = $(LIB_TDESYCOCA) tdeio_settings_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = tdeio_settings.h diff --git a/tdeioslave/sftp/Makefile.am b/tdeioslave/sftp/Makefile.am index d64f7567c..2d2079e09 100644 --- a/tdeioslave/sftp/Makefile.am +++ b/tdeioslave/sftp/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/tdeioslave/sftp INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO ####### Files @@ -9,12 +9,12 @@ METASOURCES = AUTO check_PROGRAMS = ksshprocesstest ksshprocesstest_SOURCES = ksshprocesstest.cpp -ksshprocesstest_LDADD = $(LIB_KSYCOCA) ksshprocess.lo process.lo atomicio.lo +ksshprocesstest_LDADD = $(LIB_TDESYCOCA) ksshprocess.lo process.lo atomicio.lo kde_module_LTLIBRARIES = tdeio_sftp.la tdeio_sftp_la_SOURCES = process.cpp atomicio.cpp tdeio_sftp.cpp sftpfileattr.cpp ksshprocess.cpp -tdeio_sftp_la_LIBADD = $(LIB_KIO) +tdeio_sftp_la_LIBADD = $(LIB_TDEIO) tdeio_sftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = atomicio.h tdeio_sftp.h ksshprocess.h process.h sftpfileattr.h sftp.h diff --git a/tdeioslave/sftp/sftp.protocol b/tdeioslave/sftp/sftp.protocol index 522b23b01..6c998f02d 100644 --- a/tdeioslave/sftp/sftp.protocol +++ b/tdeioslave/sftp/sftp.protocol @@ -44,10 +44,10 @@ Description[it]=Un tdeioslave per sftp Description[ja]=sftp のための tdeioslave Description[kk]=sftp-ке арналған енгізу-шығару модулі Description[km]=tdeioslave របស់ sftp -Description[ko]=SFTP KIO 슬레이브 +Description[ko]=SFTP TDEIO 슬레이브 Description[lt]=Kiovergas sftp protokolui -Description[lv]=KIO vergs priekš sftp -Description[mk]=kio-служител за sftp +Description[lv]=TDEIO vergs priekš sftp +Description[mk]=tdeio-служител за sftp Description[ms]=Kioslave untuk sftp Description[nb]=En tdeioslave for sftp Description[nds]=En In-/Utgaavdeenst för sftpl diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp index 1e529363c..eab0eae42 100644 --- a/tdeioslave/sftp/tdeio_sftp.cpp +++ b/tdeioslave/sftp/tdeio_sftp.cpp @@ -81,17 +81,17 @@ extern "C" { TDEInstance instance( "tdeio_sftp" ); - kdDebug(KIO_SFTP_DB) << "*** Starting tdeio_sftp " << endl; + kdDebug(TDEIO_SFTP_DB) << "*** Starting tdeio_sftp " << endl; if (argc != 4) { - kdDebug(KIO_SFTP_DB) << "Usage: tdeio_sftp protocol domain-socket1 domain-socket2" << endl; + kdDebug(TDEIO_SFTP_DB) << "Usage: tdeio_sftp protocol domain-socket1 domain-socket2" << endl; exit(-1); } sftpProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); - kdDebug(KIO_SFTP_DB) << "*** tdeio_sftp Done" << endl; + kdDebug(TDEIO_SFTP_DB) << "*** tdeio_sftp Done" << endl; return 0; } } @@ -134,12 +134,12 @@ static int writeToFile (int fd, const char *buf, size_t len) sftpProtocol::sftpProtocol(const TQCString &pool_socket, const TQCString &app_socket) : SlaveBase("tdeio_sftp", pool_socket, app_socket), mConnected(false), mPort(-1), mMsgId(0) { - kdDebug(KIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpProtocol(): pid = " << getpid() << endl; } sftpProtocol::~sftpProtocol() { - kdDebug(KIO_SFTP_DB) << "~sftpProtocol(): pid = " << getpid() << endl; + kdDebug(TDEIO_SFTP_DB) << "~sftpProtocol(): pid = " << getpid() << endl; closeConnection(); } @@ -183,7 +183,7 @@ bool sftpProtocol::isSupportedOperation(int type) { case SSH2_FXP_SYMLINK: return sftpVersion >= 3 ? true : false; default: - kdDebug(KIO_SFTP_DB) << "isSupportedOperation(type:" + kdDebug(TDEIO_SFTP_DB) << "isSupportedOperation(type:" << type << "): unrecognized operation type" << endl; break; } @@ -193,7 +193,7 @@ bool sftpProtocol::isSupportedOperation(int type) { void sftpProtocol::copy(const KURL &src, const KURL &dest, int permissions, bool overwrite) { - kdDebug(KIO_SFTP_DB) << "copy(): " << src << " -> " << dest << endl; + kdDebug(TDEIO_SFTP_DB) << "copy(): " << src << " -> " << dest << endl; bool srcLocal = src.isLocalFile(); bool destLocal = dest.isLocalFile(); @@ -208,7 +208,7 @@ void sftpProtocol::copy(const KURL &src, const KURL &dest, int permissions, bool void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool overwrite) { - kdDebug(KIO_SFTP_DB) << "sftpCopyGet(): " << src << " -> " << dest << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet(): " << src << " -> " << dest << endl; // Attempt to establish a connection... openConnection(); @@ -251,7 +251,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool if (canResume( buff_part.st_size )) { offset = buff_part.st_size; - kdDebug(KIO_SFTP_DB) << "sftpCopyGet: Resuming @ " << offset << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet: Resuming @ " << offset << endl; } } @@ -283,7 +283,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool if(fd == -1) { - kdDebug(KIO_SFTP_DB) << "sftpCopyGet: Unable to open (" << fd << ") for writting." << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet: Unable to open (" << fd << ") for writting." << endl; if (errno == EACCES) error (ERR_WRITE_ACCESS_DENIED, dest.prettyURL()); else @@ -320,7 +320,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool } data(TQByteArray()); - kdDebug(KIO_SFTP_DB) << "sftpCopyGet(): emit finished()" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpCopyGet(): emit finished()" << endl; finished(); } @@ -333,7 +333,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t o res.code = 0; res.size = 0; - kdDebug(KIO_SFTP_DB) << "sftpGet(): " << src << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpGet(): " << src << endl; // stat the file first to get its size if( (code = sftpStat(src, attr)) != SSH2_FX_OK ) { @@ -371,7 +371,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t o TQ_UINT32 len = 60*1024; code = SSH2_FX_OK; - kdDebug(KIO_SFTP_DB) << "sftpGet(): offset = " << offset << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpGet(): offset = " << offset << endl; while( code == SSH2_FX_OK ) { if( (code = sftpRead(handle, offset, len, buff)) == SSH2_FX_OK ) { offset += buff.size(); @@ -386,7 +386,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t o // determine mimetype KMimeMagicResult* result = KMimeMagic::self()->findBufferFileType(mimeBuffer, src.fileName()); - kdDebug(KIO_SFTP_DB) << "sftpGet(): mimetype is " << + kdDebug(TDEIO_SFTP_DB) << "sftpGet(): mimetype is " << result->mimeType() << endl; mimeType(result->mimeType()); @@ -442,7 +442,7 @@ sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, TDEIO::filesize_t o } void sftpProtocol::get(const KURL& url) { - kdDebug(KIO_SFTP_DB) << "get(): " << url << endl ; + kdDebug(TDEIO_SFTP_DB) << "get(): " << url << endl ; openConnection(); if( !mConnected ) @@ -452,7 +452,7 @@ void sftpProtocol::get(const KURL& url) { TQ_UINT64 offset = config()->readUnsignedLongNumEntry("resume"); if( offset > 0 ) { canResume(); - kdDebug(KIO_SFTP_DB) << "get(): canResume(), offset = " << offset << endl; + kdDebug(TDEIO_SFTP_DB) << "get(): canResume(), offset = " << offset << endl; } Status info = sftpGet(url, offset); @@ -464,14 +464,14 @@ void sftpProtocol::get(const KURL& url) { } data(TQByteArray()); - kdDebug(KIO_SFTP_DB) << "get(): emit finished()" << endl; + kdDebug(TDEIO_SFTP_DB) << "get(): emit finished()" << endl; finished(); } void sftpProtocol::setHost (const TQString& h, int port, const TQString& user, const TQString& pass) { - kdDebug(KIO_SFTP_DB) << "setHost(): " << user << "@" << h << ":" << port << endl; + kdDebug(TDEIO_SFTP_DB) << "setHost(): " << user << "@" << h << ":" << port << endl; if( mHost != h || mPort != port || user != mUsername || mPassword != pass ) closeConnection(); @@ -500,13 +500,13 @@ void sftpProtocol::openConnection() { if(mConnected) return; - kdDebug(KIO_SFTP_DB) << "openConnection(): " << mUsername << "@" + kdDebug(TDEIO_SFTP_DB) << "openConnection(): " << mUsername << "@" << mHost << ":" << mPort << endl; infoMessage( i18n("Opening SFTP connection to host <b>%1:%2</b>").arg(mHost).arg(mPort)); if( mHost.isEmpty() ) { - kdDebug(KIO_SFTP_DB) << "openConnection(): Need hostname..." << endl; + kdDebug(TDEIO_SFTP_DB) << "openConnection(): Need hostname..." << endl; error(ERR_UNKNOWN_HOST, i18n("No hostname specified")); return; } @@ -529,7 +529,7 @@ void sftpProtocol::openConnection() { // Check for cached authentication info if a username AND password were // not specified in setHost(). if( mUsername.isEmpty() && mPassword.isEmpty() ) { - kdDebug(KIO_SFTP_DB) << "openConnection(): checking cache " + kdDebug(TDEIO_SFTP_DB) << "openConnection(): checking cache " << "info.username = " << info.username << ", info.url = " << info.url.prettyURL() << endl; @@ -611,7 +611,7 @@ void sftpProtocol::openConnection() { while( !(mConnected = ssh.connect()) ) { err = ssh.error(); - kdDebug(KIO_SFTP_DB) << "openConnection(): " + kdDebug(TDEIO_SFTP_DB) << "openConnection(): " "Got " << err << " from KSshProcess::connect()" << endl; switch(err) { @@ -626,7 +626,7 @@ void sftpProtocol::openConnection() { else info.prompt = i18n("Please enter your username and password."); - kdDebug(KIO_SFTP_DB) << "openConnection(): info.username = " << info.username + kdDebug(TDEIO_SFTP_DB) << "openConnection(): info.username = " << info.username << ", info.url = " << info.url.prettyURL() << endl; if( firstTime ) @@ -644,7 +644,7 @@ void sftpProtocol::openConnection() { else { // user canceled or dialog failed to open error(ERR_USER_CANCELED, TQString::null); - kdDebug(KIO_SFTP_DB) << "openConnection(): user canceled, dlgResult = " << dlgResult << endl; + kdDebug(TDEIO_SFTP_DB) << "openConnection(): user canceled, dlgResult = " << dlgResult << endl; closeConnection(); return; } @@ -658,7 +658,7 @@ void sftpProtocol::openConnection() { // the password option so the user is not prompted for // it again. if( mUsername != info.username ) { - kdDebug(KIO_SFTP_DB) << "openConnection(): Username changed from " + kdDebug(TDEIO_SFTP_DB) << "openConnection(): Username changed from " << mUsername << " to " << info.username << endl; ssh.disconnect(); @@ -668,14 +668,14 @@ void sftpProtocol::openConnection() { // the iterators will be equal to the empty iterator. // Create the opts now and add them to the opt list. if( usernameIt == KSshProcess::SshOptListIterator() ) { - kdDebug(KIO_SFTP_DB) << "openConnection(): " + kdDebug(TDEIO_SFTP_DB) << "openConnection(): " "Adding username to options list" << endl; opt.opt = KSshProcess::SSH_USERNAME; usernameIt = opts.append(opt); } if( passwdIt == KSshProcess::SshOptListIterator() ) { - kdDebug(KIO_SFTP_DB) << "openConnection(): " + kdDebug(TDEIO_SFTP_DB) << "openConnection(): " "Adding password to options list" << endl; opt.opt = KSshProcess::SSH_PASSWD; passwdIt = opts.append(opt); @@ -765,7 +765,7 @@ void sftpProtocol::openConnection() { } // Now send init packet. - kdDebug(KIO_SFTP_DB) << "openConnection(): Sending SSH2_FXP_INIT packet." << endl; + kdDebug(TDEIO_SFTP_DB) << "openConnection(): Sending SSH2_FXP_INIT packet." << endl; TQByteArray p; TQDataStream packet(p, IO_WriteOnly); packet << (TQ_UINT32)5; // packet length @@ -779,11 +779,11 @@ void sftpProtocol::openConnection() { TQ_UINT32 version; TQ_UINT8 type; s >> type; - kdDebug(KIO_SFTP_DB) << "openConnection(): Got type " << type << endl; + kdDebug(TDEIO_SFTP_DB) << "openConnection(): Got type " << type << endl; if( type == SSH2_FXP_VERSION ) { s >> version; - kdDebug(KIO_SFTP_DB) << "openConnection(): Got server version " << version << endl; + kdDebug(TDEIO_SFTP_DB) << "openConnection(): Got server version " << version << endl; // XXX Get extensions here sftpVersion = version; @@ -812,7 +812,7 @@ void sftpProtocol::openConnection() { info.url.setUser(mUsername); info.username = mUsername; info.password = mPassword; - kdDebug(KIO_SFTP_DB) << "sftpProtocol(): caching info.username = " << info.username << + kdDebug(TDEIO_SFTP_DB) << "sftpProtocol(): caching info.username = " << info.username << ", info.url = " << info.url.prettyURL() << endl; cacheAuthentication(info); mConnected = true; @@ -825,7 +825,7 @@ void sftpProtocol::openConnection() { } void sftpProtocol::closeConnection() { - kdDebug(KIO_SFTP_DB) << "closeConnection()" << endl; + kdDebug(TDEIO_SFTP_DB) << "closeConnection()" << endl; ssh.disconnect(); mConnected = false; } @@ -865,7 +865,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool if( !mConnected ) return; - kdDebug(KIO_SFTP_DB) << "sftpPut(): " << dest + kdDebug(TDEIO_SFTP_DB) << "sftpPut(): " << dest << ", resume=" << resume << ", overwrite=" << overwrite << endl; @@ -877,7 +877,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool int code = sftpStat(origUrl, origAttr); if( code == SSH2_FX_OK ) { - kdDebug(KIO_SFTP_DB) << "sftpPut(): <file> already exists" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpPut(): <file> already exists" << endl; // Delete remote file if its size is zero if( origAttr.fileSize() == 0 ) { @@ -916,7 +916,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool code = sftpStat(partUrl, partAttr); if( code == SSH2_FX_OK ) { - kdDebug(KIO_SFTP_DB) << "sftpPut(): .part file already exists" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpPut(): .part file already exists" << endl; partExists = true; offset = partAttr.fileSize(); @@ -943,7 +943,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool else resume = canResume( offset ); - kdDebug(KIO_SFTP_DB) << "sftpPut(): can resume = " << resume + kdDebug(TDEIO_SFTP_DB) << "sftpPut(): can resume = " << resume << ", offset = " << offset; if( !resume ) { @@ -1083,14 +1083,14 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool } void sftpProtocol::put ( const KURL& url, int permissions, bool overwrite, bool resume ){ - kdDebug(KIO_SFTP_DB) << "put(): " << url << ", overwrite = " << overwrite + kdDebug(TDEIO_SFTP_DB) << "put(): " << url << ", overwrite = " << overwrite << ", resume = " << resume << endl; sftpPut( url, permissions, resume, overwrite ); } void sftpProtocol::stat ( const KURL& url ){ - kdDebug(KIO_SFTP_DB) << "stat(): " << url << endl; + kdDebug(TDEIO_SFTP_DB) << "stat(): " << url << endl; openConnection(); if( !mConnected ) @@ -1141,13 +1141,13 @@ void sftpProtocol::stat ( const KURL& url ){ finished(); - kdDebug(KIO_SFTP_DB) << "stat: END" << endl; + kdDebug(TDEIO_SFTP_DB) << "stat: END" << endl; return; } void sftpProtocol::mimetype ( const KURL& url ){ - kdDebug(KIO_SFTP_DB) << "mimetype(): " << url << endl; + kdDebug(TDEIO_SFTP_DB) << "mimetype(): " << url << endl; openConnection(); if( !mConnected ) @@ -1171,7 +1171,7 @@ void sftpProtocol::mimetype ( const KURL& url ){ offset += mydata.size(); processedSize(offset); - kdDebug(KIO_SFTP_DB) << "mimetype(): offset = " << offset << endl; + kdDebug(TDEIO_SFTP_DB) << "mimetype(): offset = " << offset << endl; } } @@ -1180,12 +1180,12 @@ void sftpProtocol::mimetype ( const KURL& url ){ processedSize(offset); sftpClose(handle); finished(); - kdDebug(KIO_SFTP_DB) << "mimetype(): END" << endl; + kdDebug(TDEIO_SFTP_DB) << "mimetype(): END" << endl; } void sftpProtocol::listDir(const KURL& url) { - kdDebug(KIO_SFTP_DB) << "listDir(): " << url << endl; + kdDebug(TDEIO_SFTP_DB) << "listDir(): " << url << endl; openConnection(); if( !mConnected ) @@ -1194,7 +1194,7 @@ void sftpProtocol::listDir(const KURL& url) { if( !url.hasPath() ) { KURL newUrl ( url ); if( sftpRealPath(url, newUrl) == SSH2_FX_OK ) { - kdDebug(KIO_SFTP_DB) << "listDir: Redirecting to " << newUrl << endl; + kdDebug(TDEIO_SFTP_DB) << "listDir: Redirecting to " << newUrl << endl; redirection(newUrl); finished(); return; @@ -1205,7 +1205,7 @@ void sftpProtocol::listDir(const KURL& url) { TQByteArray handle; if( (code = sftpOpenDirectory(url, handle)) != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "listDir(): open directory failed" << endl; + kdError(TDEIO_SFTP_DB) << "listDir(): open directory failed" << endl; processStatus(code, url.prettyURL()); return; } @@ -1216,17 +1216,17 @@ void sftpProtocol::listDir(const KURL& url) { code = sftpReadDir(handle, url); if( code != SSH2_FX_OK && code != SSH2_FX_EOF ) processStatus(code, url.prettyURL()); - kdDebug(KIO_SFTP_DB) << "listDir(): return code = " << code << endl; + kdDebug(TDEIO_SFTP_DB) << "listDir(): return code = " << code << endl; } if( (code = sftpClose(handle)) != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "listdir(): closing of directory failed" << endl; + kdError(TDEIO_SFTP_DB) << "listdir(): closing of directory failed" << endl; processStatus(code, url.prettyURL()); return; } finished(); - kdDebug(KIO_SFTP_DB) << "listDir(): END" << endl; + kdDebug(TDEIO_SFTP_DB) << "listDir(): END" << endl; } /** Make a directory. @@ -1238,7 +1238,7 @@ void sftpProtocol::listDir(const KURL& url) { */ void sftpProtocol::mkdir(const KURL&url, int permissions){ - kdDebug(KIO_SFTP_DB) << "mkdir() creating dir: " << url.path() << endl; + kdDebug(TDEIO_SFTP_DB) << "mkdir() creating dir: " << url.path() << endl; openConnection(); if( !mConnected ) @@ -1263,7 +1263,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){ s.writeBytes(path.data(), len); s << attr; - kdDebug(KIO_SFTP_DB) << "mkdir(): packet size is " << p.size() << endl; + kdDebug(TDEIO_SFTP_DB) << "mkdir(): packet size is " << p.size() << endl; putPacket(p); getPacket(p); @@ -1273,14 +1273,14 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "mkdir: sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "mkdir: sftp packet id mismatch" << endl; error(ERR_COULD_NOT_MKDIR, path); finished(); return; } if( type != SSH2_FXP_STATUS ) { - kdError(KIO_SFTP_DB) << "mkdir(): unexpected packet type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "mkdir(): unexpected packet type of " << type << endl; error(ERR_COULD_NOT_MKDIR, path); finished(); return; @@ -1289,7 +1289,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){ int code; r >> code; if( code != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "mkdir(): failed with code " << code << endl; + kdError(TDEIO_SFTP_DB) << "mkdir(): failed with code " << code << endl; // Check if mkdir failed because the directory already exists so that // we can return the appropriate message... @@ -1307,7 +1307,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){ } void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite){ - kdDebug(KIO_SFTP_DB) << "rename(" << src << " -> " << dest << ")" << endl; + kdDebug(TDEIO_SFTP_DB) << "rename(" << src << " -> " << dest << ")" << endl; if (!isSupportedOperation(SSH2_FXP_RENAME)) { error(ERR_UNSUPPORTED_ACTION, @@ -1352,11 +1352,11 @@ void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite){ } finished(); - kdDebug(KIO_SFTP_DB) << "rename(): END" << endl; + kdDebug(TDEIO_SFTP_DB) << "rename(): END" << endl; } void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwrite){ - kdDebug(KIO_SFTP_DB) << "symlink()" << endl; + kdDebug(TDEIO_SFTP_DB) << "symlink()" << endl; if (!isSupportedOperation(SSH2_FXP_SYMLINK)) { error(ERR_UNSUPPORTED_ACTION, @@ -1408,7 +1408,7 @@ void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwr void sftpProtocol::chmod(const KURL& url, int permissions){ TQString perms; perms.setNum(permissions, 8); - kdDebug(KIO_SFTP_DB) << "chmod(" << url << ", " << perms << ")" << endl; + kdDebug(TDEIO_SFTP_DB) << "chmod(" << url << ", " << perms << ")" << endl; openConnection(); if( !mConnected ) @@ -1421,7 +1421,7 @@ void sftpProtocol::chmod(const KURL& url, int permissions){ int code; if( (code = sftpSetStat(url, attr)) != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "chmod(): sftpSetStat failed with error " << code << endl; + kdError(TDEIO_SFTP_DB) << "chmod(): sftpSetStat failed with error " << code << endl; if( code == SSH2_FX_FAILURE ) error(ERR_CANNOT_CHMOD, TQString::null); else @@ -1432,7 +1432,7 @@ void sftpProtocol::chmod(const KURL& url, int permissions){ void sftpProtocol::del(const KURL &url, bool isfile){ - kdDebug(KIO_SFTP_DB) << "del(" << url << ", " << (isfile?"file":"dir") << ")" << endl; + kdDebug(TDEIO_SFTP_DB) << "del(" << url << ", " << (isfile?"file":"dir") << ")" << endl; openConnection(); if( !mConnected ) @@ -1440,14 +1440,14 @@ void sftpProtocol::del(const KURL &url, bool isfile){ int code; if( (code = sftpRemove(url, isfile)) != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "del(): sftpRemove failed with error code " << code << endl; + kdError(TDEIO_SFTP_DB) << "del(): sftpRemove failed with error code " << code << endl; processStatus(code, url.prettyURL()); } finished(); } void sftpProtocol::slave_status() { - kdDebug(KIO_SFTP_DB) << "slave_status(): connected to " + kdDebug(TDEIO_SFTP_DB) << "slave_status(): connected to " << mHost << "? " << mConnected << endl; slaveStatus ((mConnected ? mHost : TQString::null), mConnected); @@ -1460,7 +1460,7 @@ bool sftpProtocol::getPacket(TQByteArray& msg) { ssize_t len = atomicio(ssh.stdioFd(), buf.data(), 4, true /*read*/); if( len == 0 || len == -1 ) { - kdDebug(KIO_SFTP_DB) << "getPacket(): read of packet length failed, ret = " + kdDebug(TDEIO_SFTP_DB) << "getPacket(): read of packet length failed, ret = " << len << ", error =" << strerror(errno) << endl; closeConnection(); error( ERR_CONNECTION_BROKEN, mHost); @@ -1472,7 +1472,7 @@ bool sftpProtocol::getPacket(TQByteArray& msg) { TQDataStream s(buf, IO_ReadOnly); s >> msgLen; - //kdDebug(KIO_SFTP_DB) << "getPacket(): Message size = " << msgLen << endl; + //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Message size = " << msgLen << endl; msg.resize(0); @@ -1488,7 +1488,7 @@ bool sftpProtocol::getPacket(TQByteArray& msg) { errmsg = i18n("Connection closed"); else errmsg = i18n("Could not read SFTP packet"); - kdDebug(KIO_SFTP_DB) << "getPacket(): nothing to read, ret = " << + kdDebug(TDEIO_SFTP_DB) << "getPacket(): nothing to read, ret = " << len << ", error =" << strerror(errno) << endl; closeConnection(); error(ERR_CONNECTION_BROKEN, errmsg); @@ -1498,8 +1498,8 @@ bool sftpProtocol::getPacket(TQByteArray& msg) { b.writeBlock(buf.data(), len); - //kdDebug(KIO_SFTP_DB) << "getPacket(): Read Message size = " << len << endl; - //kdDebug(KIO_SFTP_DB) << "getPacket(): Copy Message size = " << msg.size() << endl; + //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Read Message size = " << len << endl; + //kdDebug(TDEIO_SFTP_DB) << "getPacket(): Copy Message size = " << msg.size() << endl; msgLen -= len; } @@ -1511,11 +1511,11 @@ bool sftpProtocol::getPacket(TQByteArray& msg) { /** Send an sftp packet to stdin of the ssh process. */ bool sftpProtocol::putPacket(TQByteArray& p){ -// kdDebug(KIO_SFTP_DB) << "putPacket(): size == " << p.size() << endl; +// kdDebug(TDEIO_SFTP_DB) << "putPacket(): size == " << p.size() << endl; int ret; ret = atomicio(ssh.stdioFd(), p.data(), p.size(), false /*write*/); if( ret <= 0 ) { - kdDebug(KIO_SFTP_DB) << "putPacket(): write failed, ret =" << ret << + kdDebug(TDEIO_SFTP_DB) << "putPacket(): write failed, ret =" << ret << ", error = " << strerror(errno) << endl; return false; } @@ -1529,7 +1529,7 @@ pathnames without a leading slash into absolute paths. Returns the canonicalized url. */ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ - kdDebug(KIO_SFTP_DB) << "sftpRealPath(" << url << ", newUrl)" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpRealPath(" << url << ", newUrl)" << endl; TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); @@ -1552,7 +1552,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpRealPath: sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpRealPath: sftp packet id mismatch" << endl; return -1; } @@ -1563,14 +1563,14 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ } if( type != SSH2_FXP_NAME ) { - kdError(KIO_SFTP_DB) << "sftpRealPath(): unexpected packet type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpRealPath(): unexpected packet type of " << type << endl; return -1; } TQ_UINT32 count; r >> count; if( count != 1 ) { - kdError(KIO_SFTP_DB) << "sftpRealPath(): Bad number of file attributes for realpath command" << endl; + kdError(TDEIO_SFTP_DB) << "sftpRealPath(): Bad number of file attributes for realpath command" << endl; return -1; } @@ -1633,7 +1633,7 @@ void sftpProtocol::processStatus(TQ_UINT8 code, const TQString& message){ /** Opens a directory handle for url.path. Returns true if succeeds. */ int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){ - kdDebug(KIO_SFTP_DB) << "sftpOpenDirectory(" << url << ", handle)" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpOpenDirectory(" << url << ", handle)" << endl; TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); @@ -1656,7 +1656,7 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpOpenDirectory: sftp packet id mismatch: " << + kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: sftp packet id mismatch: " << "expected " << expectedId << ", got " << id << endl; return -1; } @@ -1668,24 +1668,24 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){ } if( type != SSH2_FXP_HANDLE ) { - kdError(KIO_SFTP_DB) << "sftpOpenDirectory: unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: unexpected message type of " << type << endl; return -1; } r >> handle; if( handle.size() > 256 ) { - kdError(KIO_SFTP_DB) << "sftpOpenDirectory: handle exceeds max length" << endl; + kdError(TDEIO_SFTP_DB) << "sftpOpenDirectory: handle exceeds max length" << endl; return -1; } - kdDebug(KIO_SFTP_DB) << "sftpOpenDirectory: handle (" << handle.size() << "): [" << handle << "]" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpOpenDirectory: handle (" << handle.size() << "): [" << handle << "]" << endl; return SSH2_FX_OK; } /** Closes a directory or file handle. */ int sftpProtocol::sftpClose(const TQByteArray& handle){ - kdDebug(KIO_SFTP_DB) << "sftpClose()" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpClose()" << endl; TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; @@ -1705,19 +1705,19 @@ int sftpProtocol::sftpClose(const TQByteArray& handle){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpClose: sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpClose: sftp packet id mismatch" << endl; return -1; } if( type != SSH2_FXP_STATUS ) { - kdError(KIO_SFTP_DB) << "sftpClose: unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpClose: unexpected message type of " << type << endl; return -1; } TQ_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "sftpClose: close failed with err code " << code << endl; + kdError(TDEIO_SFTP_DB) << "sftpClose: close failed with err code " << code << endl; } return code; @@ -1726,7 +1726,7 @@ int sftpProtocol::sftpClose(const TQByteArray& handle){ /** Set a files attributes. */ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){ - kdDebug(KIO_SFTP_DB) << "sftpSetStat(" << url << ", attr)" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpSetStat(" << url << ", attr)" << endl; TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); @@ -1750,20 +1750,20 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpSetStat(): sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpSetStat(): sftp packet id mismatch" << endl; return -1; // XXX How do we do a fatal error? } if( type != SSH2_FXP_STATUS ) { - kdError(KIO_SFTP_DB) << "sftpSetStat(): unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpSetStat(): unexpected message type of " << type << endl; return -1; } TQ_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "sftpSetStat(): set stat failed with err code " << code << endl; + kdError(TDEIO_SFTP_DB) << "sftpSetStat(): set stat failed with err code " << code << endl; } return code; @@ -1772,7 +1772,7 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){ /** Sends a sftp command to remove a file or directory. */ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){ - kdDebug(KIO_SFTP_DB) << "sftpRemove(): " << url << ", isFile ? " << isfile << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpRemove(): " << url << ", isFile ? " << isfile << endl; TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); @@ -1795,19 +1795,19 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "del(): sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "del(): sftp packet id mismatch" << endl; return -1; } if( type != SSH2_FXP_STATUS ) { - kdError(KIO_SFTP_DB) << "del(): unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "del(): unexpected message type of " << type << endl; return -1; } TQ_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "del(): del failed with err code " << code << endl; + kdError(TDEIO_SFTP_DB) << "del(): del failed with err code " << code << endl; } return code; @@ -1816,7 +1816,7 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){ /** Send a sftp command to rename a file or directoy. */ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){ - kdDebug(KIO_SFTP_DB) << "sftpRename(" << src << " -> " << dest << ")" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpRename(" << src << " -> " << dest << ")" << endl; TQCString srcPath = remoteEncoding()->encode(src.path()); TQCString destPath = remoteEncoding()->encode(dest.path()); @@ -1845,19 +1845,19 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpRename(): sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpRename(): sftp packet id mismatch" << endl; return -1; } if( type != SSH2_FXP_STATUS ) { - kdError(KIO_SFTP_DB) << "sftpRename(): unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpRename(): unexpected message type of " << type << endl; return -1; } int code; r >> code; if( code != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "sftpRename(): rename failed with err code " << code << endl; + kdError(TDEIO_SFTP_DB) << "sftpRename(): rename failed with err code " << code << endl; } return code; @@ -1865,7 +1865,7 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){ /** Get directory listings. */ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){ // url is needed so we can lookup the link destination - kdDebug(KIO_SFTP_DB) << "sftpReadDir(): " << url << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpReadDir(): " << url << endl; TQ_UINT32 id, expectedId, count; TQ_UINT8 type; @@ -1888,7 +1888,7 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpReadDir(): sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpReadDir(): sftp packet id mismatch" << endl; return -1; } @@ -1899,12 +1899,12 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){ } if( type != SSH2_FXP_NAME ) { - kdError(KIO_SFTP_DB) << "tdeio_sftpProtocl::sftpReadDir(): Unexpected message" << endl; + kdError(TDEIO_SFTP_DB) << "tdeio_sftpProtocl::sftpReadDir(): Unexpected message" << endl; return -1; } r >> count; - kdDebug(KIO_SFTP_DB) << "sftpReadDir(): got " << count << " entries" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpReadDir(): got " << count << " entries" << endl; while(count--) { r >> attr; @@ -1931,13 +1931,13 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ - kdDebug(KIO_SFTP_DB) << "sftpReadLink(): " << url << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): " << url << endl; TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - //kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path << endl; - //kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Size: " << len << endl; + //kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path << endl; + //kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Encoded Size: " << len << endl; TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; @@ -1958,26 +1958,26 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpReadLink(): sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpReadLink(): sftp packet id mismatch" << endl; return -1; } if( type == SSH2_FXP_STATUS ) { TQ_UINT32 code; r >> code; - kdDebug(KIO_SFTP_DB) << "sftpReadLink(): read link failed with code " << code << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): read link failed with code " << code << endl; return code; } if( type != SSH2_FXP_NAME ) { - kdError(KIO_SFTP_DB) << "sftpReadLink(): unexpected packet type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpReadLink(): unexpected packet type of " << type << endl; return -1; } TQ_UINT32 count; r >> count; if( count != 1 ) { - kdError(KIO_SFTP_DB) << "sftpReadLink(): Bad number of file attributes for realpath command" << endl; + kdError(TDEIO_SFTP_DB) << "sftpReadLink(): Bad number of file attributes for realpath command" << endl; return -1; } @@ -1985,7 +1985,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ r >> linkAddress; linkAddress.truncate(linkAddress.size()); - kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Link address: " << linkAddress << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpReadLink(): Link address: " << linkAddress << endl; target = remoteEncoding()->decode(linkAddress); @@ -1999,7 +1999,7 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){ uint dlen = destPath.length(); uint tlen = target.length(); - kdDebug(KIO_SFTP_DB) << "sftpSymLink(" << target << " -> " << destPath << ")" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpSymLink(" << target << " -> " << destPath << ")" << endl; TQ_UINT32 id, expectedId; id = expectedId = mMsgId++; @@ -2022,19 +2022,19 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){ r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpSymLink(): sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpSymLink(): sftp packet id mismatch" << endl; return -1; } if( type != SSH2_FXP_STATUS ) { - kdError(KIO_SFTP_DB) << "sftpSymLink(): unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpSymLink(): unexpected message type of " << type << endl; return -1; } TQ_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "sftpSymLink(): rename failed with err code " << code << endl; + kdError(TDEIO_SFTP_DB) << "sftpSymLink(): rename failed with err code " << code << endl; } return code; @@ -2043,7 +2043,7 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){ /** Stats a file. */ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { - kdDebug(KIO_SFTP_DB) << "sftpStat(): " << url << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpStat(): " << url << endl; TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); @@ -2066,25 +2066,25 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpStat(): sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpStat(): sftp packet id mismatch" << endl; return -1; } if( type == SSH2_FXP_STATUS ) { TQ_UINT32 errCode; r >> errCode; - kdError(KIO_SFTP_DB) << "sftpStat(): stat failed with code " << errCode << endl; + kdError(TDEIO_SFTP_DB) << "sftpStat(): stat failed with code " << errCode << endl; return errCode; } if( type != SSH2_FXP_ATTRS ) { - kdError(KIO_SFTP_DB) << "sftpStat(): unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpStat(): unexpected message type of " << type << endl; return -1; } r >> attr; attr.setFilename(url.fileName()); - kdDebug(KIO_SFTP_DB) << "sftpStat(): " << attr << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpStat(): " << attr << endl; // If the stat'ed resource is a symlink, perform a recursive stat // to determine the actual destination's type (file/dir). @@ -2094,11 +2094,11 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { int code = sftpReadLink( url, target ); if ( code != SSH2_FX_OK ) { - kdError(KIO_SFTP_DB) << "sftpStat(): Unable to stat symlink destination" << endl; + kdError(TDEIO_SFTP_DB) << "sftpStat(): Unable to stat symlink destination" << endl; return -1; } - kdDebug(KIO_SFTP_DB) << "sftpStat(): Resource is a symlink to -> " << target << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpStat(): Resource is a symlink to -> " << target << endl; KURL dest( url ); if( target[0] == '/' ) @@ -2121,7 +2121,7 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { attr.setLinkDestination(target); - kdDebug(KIO_SFTP_DB) << "sftpStat(): File type: " << attr.fileType() << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpStat(): File type: " << attr.fileType() << endl; } } @@ -2131,7 +2131,7 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle) { - kdDebug(KIO_SFTP_DB) << "sftpOpen(" << url << ", handle" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpOpen(" << url << ", handle" << endl; TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); @@ -2158,7 +2158,7 @@ int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags, r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpOpen(): sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpOpen(): sftp packet id mismatch" << endl; return -1; } @@ -2169,24 +2169,24 @@ int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags, } if( type != SSH2_FXP_HANDLE ) { - kdError(KIO_SFTP_DB) << "sftpOpen(): unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpOpen(): unexpected message type of " << type << endl; return -1; } r >> handle; if( handle.size() > 256 ) { - kdError(KIO_SFTP_DB) << "sftpOpen(): handle exceeds max length" << endl; + kdError(TDEIO_SFTP_DB) << "sftpOpen(): handle exceeds max length" << endl; return -1; } - kdDebug(KIO_SFTP_DB) << "sftpOpen(): handle (" << handle.size() << "): [" << handle << "]" << endl; + kdDebug(TDEIO_SFTP_DB) << "sftpOpen(): handle (" << handle.size() << "): [" << handle << "]" << endl; return SSH2_FX_OK; } int sftpProtocol::sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data) { - // kdDebug(KIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl; + // kdDebug(TDEIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl; TQByteArray p; TQDataStream s(p, IO_WriteOnly); @@ -2209,19 +2209,19 @@ int sftpProtocol::sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpRead: sftp packet id mismatch" << endl; + kdError(TDEIO_SFTP_DB) << "sftpRead: sftp packet id mismatch" << endl; return -1; } if( type == SSH2_FXP_STATUS ) { TQ_UINT32 errCode; r >> errCode; - kdError(KIO_SFTP_DB) << "sftpRead: read failed with code " << errCode << endl; + kdError(TDEIO_SFTP_DB) << "sftpRead: read failed with code " << errCode << endl; return errCode; } if( type != SSH2_FXP_DATA ) { - kdError(KIO_SFTP_DB) << "sftpRead: unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpRead: unexpected message type of " << type << endl; return -1; } @@ -2232,7 +2232,7 @@ int sftpProtocol::sftpRead(const TQByteArray& handle, TDEIO::filesize_t offset, int sftpProtocol::sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset, const TQByteArray& data){ -// kdDebug(KIO_SFTP_DB) << "sftpWrite( offset = " << offset << +// kdDebug(TDEIO_SFTP_DB) << "sftpWrite( offset = " << offset << // ", data sz = " << data.size() << ")" << endl; TQByteArray p; TQDataStream s(p, IO_WriteOnly); @@ -2249,28 +2249,28 @@ int sftpProtocol::sftpWrite(const TQByteArray& handle, TDEIO::filesize_t offset, s << offset; // we don't have a convienient 64 bit int so set upper int to zero s << data; -// kdDebug(KIO_SFTP_DB) << "sftpWrite(): SSH2_FXP_WRITE, id:" +// kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): SSH2_FXP_WRITE, id:" // << id << ", handle:" << handle << ", offset:" << offset << ", some data" << endl; -// kdDebug(KIO_SFTP_DB) << "sftpWrite(): send packet [" << p << "]" << endl; +// kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): send packet [" << p << "]" << endl; putPacket(p); getPacket(p); -// kdDebug(KIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]" << endl; +// kdDebug(TDEIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]" << endl; TQDataStream r(p, IO_ReadOnly); TQ_UINT8 type; r >> type >> id; if( id != expectedId ) { - kdError(KIO_SFTP_DB) << "sftpWrite(): sftp packet id mismatch, got " + kdError(TDEIO_SFTP_DB) << "sftpWrite(): sftp packet id mismatch, got " << id << ", expected " << expectedId << endl; return -1; } if( type != SSH2_FXP_STATUS ) { - kdError(KIO_SFTP_DB) << "sftpWrite(): unexpected message type of " << type << endl; + kdError(TDEIO_SFTP_DB) << "sftpWrite(): unexpected message type of " << type << endl; return -1; } diff --git a/tdeioslave/sftp/tdeio_sftp.h b/tdeioslave/sftp/tdeio_sftp.h index 23ff101b7..30c452f9b 100644 --- a/tdeioslave/sftp/tdeio_sftp.h +++ b/tdeioslave/sftp/tdeio_sftp.h @@ -30,7 +30,7 @@ #include "sftpfileattr.h" #include "ksshprocess.h" -#define KIO_SFTP_DB 7120 +#define TDEIO_SFTP_DB 7120 class sftpProtocol : public TDEIO::SlaveBase diff --git a/tdeioslave/smb/tdeio_smb.cpp b/tdeioslave/smb/tdeio_smb.cpp index 8ee270256..28c54b3ac 100644 --- a/tdeioslave/smb/tdeio_smb.cpp +++ b/tdeioslave/smb/tdeio_smb.cpp @@ -62,7 +62,7 @@ int KDE_EXPORT kdemain( int argc, char **argv ) TDEInstance instance( "tdeio_smb" ); if( argc != 4 ) { - kdDebug(KIO_SMB) << "Usage: tdeio_smb protocol domain-socket1 domain-socket2" + kdDebug(TDEIO_SMB) << "Usage: tdeio_smb protocol domain-socket1 domain-socket2" << endl; return -1; } diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h index b2566cb5f..a81728d5d 100644 --- a/tdeioslave/smb/tdeio_smb.h +++ b/tdeioslave/smb/tdeio_smb.h @@ -33,8 +33,8 @@ ///////////////////////////////////////////////////////////////////////////// -#ifndef KIO_SMB_H_INCLUDED -#define KIO_SMB_H_INCLUDED +#ifndef TDEIO_SMB_H_INCLUDED +#define TDEIO_SMB_H_INCLUDED //------------- // QT includes @@ -84,7 +84,7 @@ extern "C" #include "tdeio_smb_internal.h" #define MAX_XFER_BUF_SIZE 16348 -#define KIO_SMB 7106 +#define TDEIO_SMB 7106 using namespace TDEIO; class TDEProcess; @@ -298,4 +298,4 @@ int kdemain( int argc, char **argv ); } -#endif //#endif KIO_SMB_H_INCLUDED +#endif //#endif TDEIO_SMB_H_INCLUDED diff --git a/tdeioslave/smb/tdeio_smb_auth.cpp b/tdeioslave/smb/tdeio_smb_auth.cpp index ebc15c1c6..87dd8c026 100644 --- a/tdeioslave/smb/tdeio_smb_auth.cpp +++ b/tdeioslave/smb/tdeio_smb_auth.cpp @@ -61,10 +61,10 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share, SMBUrlType t = m_current_url.getType(); if( t == SMBURLTYPE_ENTIRE_NETWORK ) { - kdDebug(KIO_SMB) << "we don't really need to authenticate for this top level url, returning" << endl; + kdDebug(TDEIO_SMB) << "we don't really need to authenticate for this top level url, returning" << endl; return; } - kdDebug(KIO_SMB) << "AAAAAAAAAAAAAA auth_smbc_get_dat: set user=" << username << ", workgroup=" << workgroup + kdDebug(TDEIO_SMB) << "AAAAAAAAAAAAAA auth_smbc_get_dat: set user=" << username << ", workgroup=" << workgroup << " server=" << server << ", share=" << share << endl; TQString s_server = TQString::fromUtf8(server); @@ -85,7 +85,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share, info.password = s_password; info.verifyPath = true; - kdDebug(KIO_SMB) << "libsmb-auth-callback URL:" << info.url << endl; + kdDebug(TDEIO_SMB) << "libsmb-auth-callback URL:" << info.url << endl; if ( !checkCachedAuthentication( info ) ) { @@ -103,7 +103,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share, } } else - kdDebug(KIO_SMB) << "got password through cache" << endl; + kdDebug(TDEIO_SMB) << "got password through cache" << endl; strncpy(username, info.username.utf8(), unmaxlen - 1); strncpy(password, info.password.utf8(), pwmaxlen - 1); @@ -111,7 +111,7 @@ void SMBSlave::auth_smbc_get_data(const char *server,const char *share, bool SMBSlave::checkPassword(SMBUrl &url) { - kdDebug(KIO_SMB) << "checkPassword for " << url << endl; + kdDebug(TDEIO_SMB) << "checkPassword for " << url << endl; TDEIO::AuthInfo info; info.url = KURL("smb:///"); @@ -139,15 +139,15 @@ bool SMBSlave::checkPassword(SMBUrl &url) .arg( share ); info.username = url.user(); - kdDebug(KIO_SMB) << "call openPassDlg for " << info.url << endl; + kdDebug(TDEIO_SMB) << "call openPassDlg for " << info.url << endl; if ( openPassDlg(info) ) { - kdDebug(KIO_SMB) << "openPassDlg returned " << info.username << endl; + kdDebug(TDEIO_SMB) << "openPassDlg returned " << info.username << endl; url.setUser(info.username); url.setPass(info.password); return true; } - kdDebug(KIO_SMB) << "no value from openPassDlg\n"; + kdDebug(TDEIO_SMB) << "no value from openPassDlg\n"; return false; } @@ -159,10 +159,10 @@ bool SMBSlave::auth_initialize_smbc() { SMBCCTX *smb_context = NULL; - kdDebug(KIO_SMB) << "auth_initialize_smbc " << endl; + kdDebug(TDEIO_SMB) << "auth_initialize_smbc " << endl; if(m_initialized_smbc == false) { - kdDebug(KIO_SMB) << "smbc_init call" << endl; + kdDebug(TDEIO_SMB) << "smbc_init call" << endl; KSimpleConfig cfg( "tdeioslaverc", true ); cfg.setGroup( "SMB" ); diff --git a/tdeioslave/smb/tdeio_smb_browse.cpp b/tdeioslave/smb/tdeio_smb_browse.cpp index c8d39b8f8..e6113d16e 100644 --- a/tdeioslave/smb/tdeio_smb_browse.cpp +++ b/tdeioslave/smb/tdeio_smb_browse.cpp @@ -46,8 +46,8 @@ using namespace TDEIO; int SMBSlave::cache_stat(const SMBUrl &url, struct stat* st ) { int result = smbc_stat( url.toSmbcUrl(), st); - kdDebug(KIO_SMB) << "smbc_stat " << url << " " << errno << " " << result << endl; - kdDebug(KIO_SMB) << "size " << (TDEIO::filesize_t)st->st_size << endl; + kdDebug(TDEIO_SMB) << "smbc_stat " << url << " " << errno << " " << result << endl; + kdDebug(TDEIO_SMB) << "size " << (TDEIO::filesize_t)st->st_size << endl; return result; } @@ -63,7 +63,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign { if(!S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode)) { - kdDebug(KIO_SMB)<<"SMBSlave::browse_stat_path mode: "<<st.st_mode<<endl; + kdDebug(TDEIO_SMB)<<"SMBSlave::browse_stat_path mode: "<<st.st_mode<<endl; warning(i18n("%1:\n" "Unknown file type, neither directory or file.").arg(url.prettyURL())); return false; @@ -125,7 +125,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign } else if (errno == ENOENT || errno == ENOTDIR) { warning(i18n("File does not exist: %1").arg(url.url())); } - kdDebug(KIO_SMB) << "SMBSlave::browse_stat_path ERROR!!"<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::browse_stat_path ERROR!!"<< endl; return false; } @@ -135,7 +135,7 @@ bool SMBSlave::browse_stat_path(const SMBUrl& _url, UDSEntry& udsentry, bool ign //=========================================================================== void SMBSlave::stat( const KURL& kurl ) { - kdDebug(KIO_SMB) << "SMBSlave::stat on "<< kurl << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::stat on "<< kurl << endl; // make a valid URL KURL url = checkURL(kurl); @@ -175,12 +175,12 @@ void SMBSlave::stat( const KURL& kurl ) if (browse_stat_path(m_current_url, udsentry, false)) break; else { - kdDebug(KIO_SMB) << "SMBSlave::stat ERROR!!"<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::stat ERROR!!"<< endl; finished(); return; } default: - kdDebug(KIO_SMB) << "SMBSlave::stat UNKNOWN " << url << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::stat UNKNOWN " << url << endl; finished(); return; } @@ -193,7 +193,7 @@ void SMBSlave::stat( const KURL& kurl ) // TODO: complete checking KURL SMBSlave::checkURL(const KURL& kurl) const { - kdDebug(KIO_SMB) << "checkURL " << kurl << endl; + kdDebug(TDEIO_SMB) << "checkURL " << kurl << endl; TQString surl = kurl.url(); if (surl.startsWith("smb:/")) { if (surl.length() == 5) // just the above @@ -201,7 +201,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const if (surl.at(5) != '/') { surl = "smb://" + surl.mid(5); - kdDebug(KIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl; + kdDebug(TDEIO_SMB) << "checkURL return1 " << surl << " " << KURL(surl) << endl; return KURL(surl); } } @@ -218,7 +218,7 @@ KURL SMBSlave::checkURL(const KURL& kurl) const } else { url.setUser(userinfo); } - kdDebug(KIO_SMB) << "checkURL return2 " << url << endl; + kdDebug(TDEIO_SMB) << "checkURL return2 " << url << endl; return url; } @@ -228,13 +228,13 @@ KURL SMBSlave::checkURL(const KURL& kurl) const if (url.path().isEmpty()) url.setPath("/"); - kdDebug(KIO_SMB) << "checkURL return3 " << url << endl; + kdDebug(TDEIO_SMB) << "checkURL return3 " << url << endl; return url; } void SMBSlave::reportError(const SMBUrl &url) { - kdDebug(KIO_SMB) << "reportError " << url << " " << perror << endl; + kdDebug(TDEIO_SMB) << "reportError " << url << " " << perror << endl; switch(errno) { case ENOENT: @@ -312,7 +312,7 @@ void SMBSlave::reportError(const SMBUrl &url) //=========================================================================== void SMBSlave::listDir( const KURL& kurl ) { - kdDebug(KIO_SMB) << "SMBSlave::listDir on " << kurl << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::listDir on " << kurl << endl; // check (correct) URL KURL url = checkURL(kurl); @@ -332,11 +332,11 @@ void SMBSlave::listDir( const KURL& kurl ) UDSAtom atom; dirfd = smbc_opendir( m_current_url.toSmbcUrl() ); - kdDebug(KIO_SMB) << "SMBSlave::listDir open " << m_current_url.toSmbcUrl() << " " << m_current_url.getType() << " " << dirfd << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::listDir open " << m_current_url.toSmbcUrl() << " " << m_current_url.getType() << " " << dirfd << endl; if(dirfd >= 0) { do { - kdDebug(KIO_SMB) << "smbc_readdir " << endl; + kdDebug(TDEIO_SMB) << "smbc_readdir " << endl; dirp = smbc_readdir(dirfd); if(dirp == 0) break; @@ -355,7 +355,7 @@ void SMBSlave::listDir( const KURL& kurl ) } else atom.m_str = dirpName; - kdDebug(KIO_SMB) << "dirp->name " << dirp->name << " " << dirpName << " '" << comment << "'" << " " << dirp->smbc_type << endl; + kdDebug(TDEIO_SMB) << "dirp->name " << dirp->name << " " << dirpName << " '" << comment << "'" << " " << dirp->smbc_type << endl; udsentry.append( atom ); if (atom.m_str.upper()=="IPC$" || atom.m_str=="." || atom.m_str == ".." || @@ -405,7 +405,7 @@ void SMBSlave::listDir( const KURL& kurl ) // when libsmbclient knows // atom.m_str = TQString("smb://%1?WORKGROUP=%2").arg(dirpName).arg(workgroup.upper()); - kdDebug(KIO_SMB) << "list item " << atom.m_str << endl; + kdDebug(TDEIO_SMB) << "list item " << atom.m_str << endl; udsentry.append(atom); atom.m_uds = TDEIO::UDS_MIME_TYPE; @@ -444,7 +444,7 @@ void SMBSlave::listDir( const KURL& kurl ) } else { - kdDebug(KIO_SMB) << "SMBSlave::listDir SMBC_UNKNOWN :" << dirpName << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::listDir SMBC_UNKNOWN :" << dirpName << endl; // TODO: we don't handle SMBC_IPC_SHARE, SMBC_PRINTER_SHARE // SMBC_LINK, SMBC_COMMS_SHARE //SlaveBase::error(ERR_INTERNAL, TEXT_UNSUPPORTED_FILE_TYPE); diff --git a/tdeioslave/smb/tdeio_smb_dir.cpp b/tdeioslave/smb/tdeio_smb_dir.cpp index e27420336..1e707e14e 100644 --- a/tdeioslave/smb/tdeio_smb_dir.cpp +++ b/tdeioslave/smb/tdeio_smb_dir.cpp @@ -51,7 +51,7 @@ void SMBSlave::copy( const KURL& ksrc, TDEIO::filesize_t processed_size = 0; unsigned char buf[MAX_XFER_BUF_SIZE]; - kdDebug(KIO_SMB) << "SMBSlave::copy with src = " << ksrc << "and dest = " << kdst << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::copy with src = " << ksrc << "and dest = " << kdst << endl; // setup urls src = ksrc; @@ -152,7 +152,7 @@ void SMBSlave::copy( const KURL& ksrc, n = smbc_write(dstfd, buf, n); if(n == -1) { - kdDebug(KIO_SMB) << "SMBSlave::copy copy now TDEIO::ERR_COULD_NOT_WRITE" << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::copy copy now TDEIO::ERR_COULD_NOT_WRITE" << endl; error( TDEIO::ERR_COULD_NOT_WRITE, dst.prettyURL()); break; } @@ -199,13 +199,13 @@ void SMBSlave::copy( const KURL& ksrc, //=========================================================================== void SMBSlave::del( const KURL &kurl, bool isfile) { - kdDebug(KIO_SMB) << "SMBSlave::del on " << kurl << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::del on " << kurl << endl; m_current_url = kurl; if(isfile) { // Delete file - kdDebug(KIO_SMB) << "SMBSlave:: unlink " << kurl << endl; + kdDebug(TDEIO_SMB) << "SMBSlave:: unlink " << kurl << endl; if(smbc_unlink(m_current_url.toSmbcUrl()) == -1) { switch(errno) @@ -220,7 +220,7 @@ void SMBSlave::del( const KURL &kurl, bool isfile) } else { - kdDebug(KIO_SMB) << "SMBSlave:: rmdir " << kurl << endl; + kdDebug(TDEIO_SMB) << "SMBSlave:: rmdir " << kurl << endl; // Delete directory if(smbc_rmdir(m_current_url.toSmbcUrl()) == -1) { @@ -234,7 +234,7 @@ void SMBSlave::del( const KURL &kurl, bool isfile) //=========================================================================== void SMBSlave::mkdir( const KURL &kurl, int permissions ) { - kdDebug(KIO_SMB) << "SMBSlave::mkdir on " << kurl << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::mkdir on " << kurl << endl; m_current_url = kurl; if(smbc_mkdir(m_current_url.toSmbcUrl(), 0777) != 0) @@ -253,7 +253,7 @@ void SMBSlave::mkdir( const KURL &kurl, int permissions ) } } else reportError(kurl); - kdDebug(KIO_SMB) << "SMBSlave::mkdir exit with error " << kurl << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::mkdir exit with error " << kurl << endl; } else { @@ -275,35 +275,35 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite ) SMBUrl src; SMBUrl dst; - kdDebug(KIO_SMB) << "SMBSlave::rename, old name = " << ksrc << ", new name = " << kdest << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::rename, old name = " << ksrc << ", new name = " << kdest << endl; src = ksrc; dst = kdest; // Check to se if the destination exists - kdDebug(KIO_SMB) << "SMBSlave::rename stat dst" << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::rename stat dst" << endl; if(cache_stat(dst, &st) != -1) { if(S_ISDIR(st.st_mode)) { - kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_DIR_ALREADY_EXIST" << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_DIR_ALREADY_EXIST" << endl; error( TDEIO::ERR_DIR_ALREADY_EXIST, dst.prettyURL()); finished(); return; } if(!overwrite) { - kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_FILE_ALREADY_EXIST" << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_FILE_ALREADY_EXIST" << endl; error( TDEIO::ERR_FILE_ALREADY_EXIST, dst.prettyURL()); finished(); return; } } - kdDebug(KIO_SMB ) << "smbc_rename " << src.toSmbcUrl() << " " << dst.toSmbcUrl() << endl; + kdDebug(TDEIO_SMB ) << "smbc_rename " << src.toSmbcUrl() << " " << dst.toSmbcUrl() << endl; if(smbc_rename(src.toSmbcUrl(), dst.toSmbcUrl())!=0) { - kdDebug(KIO_SMB ) << "failed " << perror << endl; + kdDebug(TDEIO_SMB ) << "failed " << perror << endl; switch(errno) { case ENOENT: @@ -311,12 +311,12 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite ) { if(errno == EACCES) { - kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl; error(TDEIO::ERR_ACCESS_DENIED, src.prettyURL()); } else { - kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_DOES_NOT_EXIST" << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_DOES_NOT_EXIST" << endl; error(TDEIO::ERR_DOES_NOT_EXIST, src.prettyURL()); } } @@ -324,21 +324,21 @@ void SMBSlave::rename( const KURL& ksrc, const KURL& kdest, bool overwrite ) case EACCES: case EPERM: - kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_ACCESS_DENIED" << endl; error( TDEIO::ERR_ACCESS_DENIED, dst.prettyURL() ); break; default: - kdDebug(KIO_SMB) << "SMBSlave::rename TDEIO::ERR_CANNOT_RENAME" << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::rename TDEIO::ERR_CANNOT_RENAME" << endl; error( TDEIO::ERR_CANNOT_RENAME, src.prettyURL() ); } - kdDebug(KIO_SMB) << "SMBSlave::rename exit with error" << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::rename exit with error" << endl; return; } - kdDebug(KIO_SMB ) << "everything fine\n"; + kdDebug(TDEIO_SMB ) << "everything fine\n"; finished(); } diff --git a/tdeioslave/smb/tdeio_smb_file.cpp b/tdeioslave/smb/tdeio_smb_file.cpp index a6c010526..2152c7469 100644 --- a/tdeioslave/smb/tdeio_smb_file.cpp +++ b/tdeioslave/smb/tdeio_smb_file.cpp @@ -48,7 +48,7 @@ void SMBSlave::get( const KURL& kurl ) TQByteArray filedata; SMBUrl url; - kdDebug(KIO_SMB) << "SMBSlave::get on " << kurl << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::get on " << kurl << endl; // check (correct) URL KURL kvurl = checkURL(kurl); @@ -163,7 +163,7 @@ void SMBSlave::put( const KURL& kurl, mode_t mode; TQByteArray filedata; - kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl << endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl << endl; exists = (cache_stat(m_current_url, &st) != -1 ); @@ -171,12 +171,12 @@ void SMBSlave::put( const KURL& kurl, { if (S_ISDIR(st.st_mode)) { - kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" already isdir !!"<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl <<" already isdir !!"<< endl; error( TDEIO::ERR_DIR_ALREADY_EXIST, m_current_url.prettyURL()); } else { - kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" already exist !!"<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl <<" already exist !!"<< endl; error( TDEIO::ERR_FILE_ALREADY_EXIST, m_current_url.prettyURL()); } return; @@ -184,7 +184,7 @@ void SMBSlave::put( const KURL& kurl, if (exists && !resume && overwrite) { - kdDebug(KIO_SMB) << "SMBSlave::put exists try to remove " << m_current_url.toSmbcUrl()<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put exists try to remove " << m_current_url.toSmbcUrl()<< endl; // remove(m_current_url.url().local8Bit()); } @@ -192,7 +192,7 @@ void SMBSlave::put( const KURL& kurl, if (resume) { // append if resuming - kdDebug(KIO_SMB) << "SMBSlave::put resume " << m_current_url.toSmbcUrl()<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put resume " << m_current_url.toSmbcUrl()<< endl; filefd = smbc_open(m_current_url.toSmbcUrl(), O_RDWR, 0 ); smbc_lseek(filefd, 0, SEEK_END); } @@ -207,7 +207,7 @@ void SMBSlave::put( const KURL& kurl, mode = 600;//0666; } - kdDebug(KIO_SMB) << "SMBSlave::put NO resume " << m_current_url.toSmbcUrl()<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put NO resume " << m_current_url.toSmbcUrl()<< endl; filefd = smbc_open(m_current_url.toSmbcUrl(), O_CREAT | O_TRUNC | O_WRONLY, mode); } @@ -215,12 +215,12 @@ void SMBSlave::put( const KURL& kurl, { if ( errno == EACCES ) { - kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" access denied !!"<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put error " << kurl <<" access denied !!"<< endl; error( TDEIO::ERR_WRITE_ACCESS_DENIED, m_current_url.prettyURL()); } else { - kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" can not open for writing !!"<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put error " << kurl <<" can not open for writing !!"<< endl; error( TDEIO::ERR_CANNOT_OPEN_FOR_WRITING, m_current_url.prettyURL()); } finished(); @@ -230,33 +230,33 @@ void SMBSlave::put( const KURL& kurl, // Loop until we got 0 (end of data) while(1) { - kdDebug(KIO_SMB) << "SMBSlave::put request data "<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put request data "<< endl; dataReq(); // Request for data - kdDebug(KIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl; if (readData(filedata) <= 0) { - kdDebug(KIO_SMB) << "readData <= 0" << endl; + kdDebug(TDEIO_SMB) << "readData <= 0" << endl; break; } - kdDebug(KIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put write " << m_current_url.toSmbcUrl()<< endl; buf = filedata.data(); bufsize = filedata.size(); int size = smbc_write(filefd, buf, bufsize); if ( size < 0) { - kdDebug(KIO_SMB) << "SMBSlave::put error " << kurl <<" could not write !!"<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put error " << kurl <<" could not write !!"<< endl; error( TDEIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL()); finished(); return; } - kdDebug(KIO_SMB ) << "wrote " << size << endl; + kdDebug(TDEIO_SMB ) << "wrote " << size << endl; } - kdDebug(KIO_SMB) << "SMBSlave::put close " << m_current_url.toSmbcUrl()<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put close " << m_current_url.toSmbcUrl()<< endl; if(smbc_close(filefd)) { - kdDebug(KIO_SMB) << "SMBSlave::put on " << kurl <<" could not write !!"<< endl; + kdDebug(TDEIO_SMB) << "SMBSlave::put on " << kurl <<" could not write !!"<< endl; error( TDEIO::ERR_COULD_NOT_WRITE, m_current_url.prettyURL()); finished(); return; diff --git a/tdeioslave/smb/tdeio_smb_internal.cpp b/tdeioslave/smb/tdeio_smb_internal.cpp index ebb91b30a..1b466e196 100644 --- a/tdeioslave/smb/tdeio_smb_internal.cpp +++ b/tdeioslave/smb/tdeio_smb_internal.cpp @@ -79,7 +79,7 @@ void SMBUrl::updateCache() cleanPath(); // SMB URLs are UTF-8 encoded - kdDebug(KIO_SMB) << "updateCache " << KURL::path() << endl; + kdDebug(TDEIO_SMB) << "updateCache " << KURL::path() << endl; if (KURL::url() == "smb:/") m_surl = "smb://"; else { diff --git a/tdeioslave/smb/tdeio_smb_internal.h b/tdeioslave/smb/tdeio_smb_internal.h index 3eeae43a7..d04736298 100644 --- a/tdeioslave/smb/tdeio_smb_internal.h +++ b/tdeioslave/smb/tdeio_smb_internal.h @@ -28,8 +28,8 @@ // ///////////////////////////////////////////////////////////////////////////// -#ifndef KIO_SMB_INTERNAL_H_INCLUDED -#define KIO_SMB_INTERNAL_H_INCLUDED +#ifndef TDEIO_SMB_INTERNAL_H_INCLUDED +#define TDEIO_SMB_INTERNAL_H_INCLUDED #include <tdeio/authinfo.h> diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp index 0cf9775d0..0aef92698 100644 --- a/tdeioslave/smb/tdeio_smb_mount.cpp +++ b/tdeioslave/smb/tdeio_smb_mount.cpp @@ -37,7 +37,7 @@ void SMBSlave::readStdErr(TDEProcess *, char *buffer, int buflen) void SMBSlave::special( const TQByteArray & data) { - kdDebug(KIO_SMB)<<"Smb::special()"<<endl; + kdDebug(TDEIO_SMB)<<"Smb::special()"<<endl; int tmp; TQDataStream stream(data, IO_ReadOnly); stream >> tmp; @@ -56,12 +56,12 @@ void SMBSlave::special( const TQByteArray & data) { host=(*sl.at(0)).mid(2); share=(*sl.at(1)); - kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl; + kdDebug(TDEIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl; } remotePath.replace('\\', '/'); // smbmounterplugin sends \\host/share - kdDebug(KIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl; + kdDebug(TDEIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl; if (tmp==3) { if (!TDEStandardDirs::makeDir(mountPoint)) { @@ -126,7 +126,7 @@ void SMBSlave::special( const TQByteArray & data) return; } - kdDebug(KIO_SMB) << "mount exit " << proc.exitStatus() << endl + kdDebug(TDEIO_SMB) << "mount exit " << proc.exitStatus() << endl << "stdout:" << mybuf << endl << "stderr:" << mystderr << endl; if (proc.exitStatus() != 0) @@ -167,7 +167,7 @@ void SMBSlave::special( const TQByteArray & data) return; } - kdDebug(KIO_SMB) << "smbumount exit " << proc.exitStatus() << endl + kdDebug(TDEIO_SMB) << "smbumount exit " << proc.exitStatus() << endl << "stdout:" << mybuf << endl << "stderr:" << mystderr << endl; if (proc.exitStatus() != 0) diff --git a/tdeioslave/smtp/Makefile.am b/tdeioslave/smtp/Makefile.am index e6db9885c..5d0ad64c0 100644 --- a/tdeioslave/smtp/Makefile.am +++ b/tdeioslave/smtp/Makefile.am @@ -4,7 +4,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = tdeio_smtp.la tdeio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc -tdeio_smtp_la_LIBADD = $(LIB_KIO) $(SASL2_LIBS) +tdeio_smtp_la_LIBADD = $(LIB_TDEIO) $(SASL2_LIBS) tdeio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = smtp.h request.h response.h capabilities.h command.h transactionstate.h diff --git a/tdeioslave/smtp/TODO b/tdeioslave/smtp/TODO index cad79f139..bdfc54258 100644 --- a/tdeioslave/smtp/TODO +++ b/tdeioslave/smtp/TODO @@ -4,7 +4,7 @@ SMTP server that supports it). 3. Better error message (translated standard meanings of the known response codes, ENHANCEDSTATUSCODES extension (rfc2034)). -4. (KIO) MultiPutJob to support pipelining across messages. +4. (TDEIO) MultiPutJob to support pipelining across messages. 5. Ged rid of slave's header generation after checking who on earth uses that... diff --git a/tdeioslave/smtp/compliance.txt b/tdeioslave/smtp/compliance.txt index 5b305a765..52acb2aa7 100644 --- a/tdeioslave/smtp/compliance.txt +++ b/tdeioslave/smtp/compliance.txt @@ -29,5 +29,5 @@ General: Known shortcomings: - Doesn't enforce the CRLF lineending convention on user-supplied data. -- Due to the lack of a Mulit_Put_ in the KIO infrastructure, pipelining +- Due to the lack of a Mulit_Put_ in the TDEIO infrastructure, pipelining across messages isn't supported. diff --git a/tdeioslave/smtp/response.h b/tdeioslave/smtp/response.h index f2caf62e0..97220661f 100644 --- a/tdeioslave/smtp/response.h +++ b/tdeioslave/smtp/response.h @@ -56,7 +56,7 @@ namespace KioSMTP { /** Return an internationalized error message according to the response's code. */ TQString errorMessage() const; - /** Translate the SMTP error code into a KIO one */ + /** Translate the SMTP error code into a TDEIO one */ int errorCode() const; enum Reply { diff --git a/tdeioslave/smtp/transactionstate.h b/tdeioslave/smtp/transactionstate.h index a5a78f49c..ec39e3ac6 100644 --- a/tdeioslave/smtp/transactionstate.h +++ b/tdeioslave/smtp/transactionstate.h @@ -102,7 +102,7 @@ namespace KioSMTP { bool complete() const { return mComplete; } void setComplete() { mComplete = true; } - /** @return an appropriate KIO error code in case the transaction + /** @return an appropriate TDEIO error code in case the transaction failed, or 0 otherwise */ int errorCode() const; /** @return an appropriate error message in case the transaction diff --git a/tdeioslave/system/Makefile.am b/tdeioslave/system/Makefile.am index 58d779a9b..da49adca3 100644 --- a/tdeioslave/system/Makefile.am +++ b/tdeioslave/system/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = tdeio_system.la tdeio_system_la_SOURCES = dummy.cpp -tdeio_system_la_LIBADD = libtdeiosystem.la $(LIB_KIO) +tdeio_system_la_LIBADD = libtdeiosystem.la $(LIB_TDEIO) tdeio_system_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined dummy.cpp: @@ -19,7 +19,7 @@ libtdeiosystem_la_SOURCES = tdeio_system.cpp systemimpl.cpp check_PROGRAMS = testsystem testsystem_SOURCES = testsystem.cpp -testsystem_LDADD = libtdeiosystem.la $(LIB_KIO) +testsystem_LDADD = libtdeiosystem.la $(LIB_TDEIO) testsystem_LDFLAGS = $(all_libraries) ## TODO in unsermake: TESTS = testsystem diff --git a/tdeioslave/system/kdedmodule/Makefile.am b/tdeioslave/system/kdedmodule/Makefile.am index bc368f9b1..9550f9e0a 100644 --- a/tdeioslave/system/kdedmodule/Makefile.am +++ b/tdeioslave/system/kdedmodule/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(all_includes) kded_systemdirnotify_la_SOURCES = systemdirnotify.cpp systemdirnotify.skel systemdirnotifymodule.cpp systemdirnotifymodule.skel kded_systemdirnotify_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_systemdirnotify_la_LIBADD = $(LIB_KSYCOCA) +kded_systemdirnotify_la_LIBADD = $(LIB_TDESYCOCA) servicesdir = $(kde_servicesdir)/kded diff --git a/tdeioslave/system/tdeio_system.h b/tdeioslave/system/tdeio_system.h index fb3423889..198b7f401 100644 --- a/tdeioslave/system/tdeio_system.h +++ b/tdeioslave/system/tdeio_system.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KIO_MEDIA_H_ -#define _KIO_MEDIA_H_ +#ifndef _TDEIO_MEDIA_H_ +#define _TDEIO_MEDIA_H_ #include <tdeio/forwardingslavebase.h> diff --git a/tdeioslave/tar/Makefile.am b/tdeioslave/tar/Makefile.am index caec5236d..1388d640d 100644 --- a/tdeioslave/tar/Makefile.am +++ b/tdeioslave/tar/Makefile.am @@ -1,19 +1,19 @@ ## Makefile.am of tdebase/tdeioslave/tar INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO kde_module_LTLIBRARIES = tdeio_tar.la tdeio_tar_la_SOURCES = tar.cc -tdeio_tar_la_LIBADD = $(LIB_KSYCOCA) +tdeio_tar_la_LIBADD = $(LIB_TDESYCOCA) tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) check_PROGRAMS = ktartest ktartest_SOURCES = ktartest.cpp -ktartest_LDADD = $(LIB_KSYCOCA) +ktartest_LDADD = $(LIB_TDESYCOCA) noinst_HEADERS = tar.h diff --git a/tdeioslave/tar/tar.h b/tdeioslave/tar/tar.h index 42cb2457a..775578b4b 100644 --- a/tdeioslave/tar/tar.h +++ b/tdeioslave/tar/tar.h @@ -42,7 +42,7 @@ protected: * \brief find, check and open the archive file * \param url The URL of the archive * \param path Path where the archive really is (returned value) - * \param errNum KIO error number (undefined if the function returns true) + * \param errNum TDEIO error number (undefined if the function returns true) * \return true if file was found, false if there was an error */ bool checkNewFile( const KURL & url, TQString & path, TDEIO::Error& errorNum ); diff --git a/tdeioslave/thumbnail/Makefile.am b/tdeioslave/thumbnail/Makefile.am index 5dcdbe5c9..91355023d 100644 --- a/tdeioslave/thumbnail/Makefile.am +++ b/tdeioslave/thumbnail/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am of tdebase/tdeioslave/thumbnail INCLUDES = $(all_includes) $(EXR_FLAGS) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO if have_xcursor @@ -20,15 +20,15 @@ kde_module_LTLIBRARIES = tdeio_thumbnail.la imagethumbnail.la \ $(EXR_MODULE) tdeio_thumbnail_la_SOURCES = thumbnail.cpp -tdeio_thumbnail_la_LIBADD = $(LIB_KIO) +tdeio_thumbnail_la_LIBADD = $(LIB_TDEIO) tdeio_thumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) imagethumbnail_la_SOURCES = imagecreator.cpp -imagethumbnail_la_LIBADD = $(LIB_KIO) # for kimageio +imagethumbnail_la_LIBADD = $(LIB_TDEIO) # for kimageio imagethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) textthumbnail_la_SOURCES = textcreator.cpp -textthumbnail_la_LIBADD = $(LIB_KIO) # for kmimetype +textthumbnail_la_LIBADD = $(LIB_TDEIO) # for kmimetype textthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) htmlthumbnail_la_SOURCES = htmlcreator.cpp diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am index f2ad65d28..02b43e90a 100644 --- a/tdeioslave/trash/Makefile.am +++ b/tdeioslave/trash/Makefile.am @@ -6,13 +6,13 @@ SUBDIRS = . tdefile-plugin kde_module_LTLIBRARIES = tdeio_trash.la tdeio_trash_la_SOURCES = tdeio_trash.cpp -tdeio_trash_la_LIBADD = libtrashcommon.la $(LIB_KIO) +tdeio_trash_la_LIBADD = libtrashcommon.la $(LIB_TDEIO) tdeio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined bin_PROGRAMS = ktrash ktrash_SOURCES = ktrash.cpp -ktrash_LDADD = $(LIB_KIO) -ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +ktrash_LDADD = $(LIB_TDEIO) +ktrash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kde_services_DATA = trash.protocol @@ -21,7 +21,7 @@ libtrashcommon_la_SOURCES = trashimpl.cpp check_PROGRAMS = testtrash testtrash_SOURCES = testtrash.cpp -testtrash_LDADD = libtrashcommon.la $(LIB_KIO) +testtrash_LDADD = libtrashcommon.la $(LIB_TDEIO) testtrash_LDFLAGS = $(all_libraries) TESTS = testtrash diff --git a/tdeioslave/trash/tdefile-plugin/Makefile.am b/tdeioslave/trash/tdefile-plugin/Makefile.am index 50d2373e9..4b2c5d40e 100644 --- a/tdeioslave/trash/tdefile-plugin/Makefile.am +++ b/tdeioslave/trash/tdefile-plugin/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = tdefile_trash.la tdefile_trash_la_SOURCES = tdefile_trash.cpp tdefile_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdefile_trash_la_LIBADD = ../libtrashcommon.la $(LIB_KIO) +tdefile_trash_la_LIBADD = ../libtrashcommon.la $(LIB_TDEIO) METASOURCES = AUTO diff --git a/tdeioslave/trash/tdeio_trash.h b/tdeioslave/trash/tdeio_trash.h index ceaa27cfb..954dbe7a6 100644 --- a/tdeioslave/trash/tdeio_trash.h +++ b/tdeioslave/trash/tdeio_trash.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KIO_TRASH_H -#define KIO_TRASH_H +#ifndef TDEIO_TRASH_H +#define TDEIO_TRASH_H #include <tdeio/slavebase.h> #include "trashimpl.h" diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp index cf37b8b94..c96d15d3a 100644 --- a/tdeioslave/trash/trashimpl.cpp +++ b/tdeioslave/trash/trashimpl.cpp @@ -57,7 +57,7 @@ TrashImpl::TrashImpl() : m_homeDevice( 0 ), m_trashDirectoriesScanned( false ), m_mibEnum( TDEGlobal::locale()->fileEncodingMib() ), - // not using tdeio_trashrc since KIO uses that one already for tdeio_trash + // not using tdeio_trashrc since TDEIO uses that one already for tdeio_trash // so better have a separate one, for faster parsing by e.g. kmimetype.cpp m_config( "trashrc" ) { @@ -325,7 +325,7 @@ bool TrashImpl::moveToTrash( const TQString& origPath, int trashId, const TQStri const TQString dest = filesPath( trashId, fileId ); if ( !move( origPath, dest ) ) { // Maybe the move failed due to no permissions to delete source. - // In that case, delete dest to keep things consistent, since KIO doesn't do it. + // In that case, delete dest to keep things consistent, since TDEIO doesn't do it. if ( TQFileInfo( dest ).isFile() ) TQFile::remove( dest ); else @@ -367,7 +367,7 @@ bool TrashImpl::move( const TQString& src, const TQString& dest ) urlDest.setPath( dest ); kdDebug() << k_funcinfo << urlSrc << " -> " << urlDest << endl; TDEIO::CopyJob* job = TDEIO::moveAs( urlSrc, urlDest, false ); -#ifdef KIO_COPYJOB_HAS_SETINTERACTIVE +#ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE job->setInteractive( false ); #endif connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), @@ -414,7 +414,7 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest ) urlDest.setPath( dest ); kdDebug() << k_funcinfo << "copying " << src << " to " << dest << endl; TDEIO::CopyJob* job = TDEIO::copyAs( urlSrc, urlDest, false ); -#ifdef KIO_COPYJOB_HAS_SETINTERACTIVE +#ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE job->setInteractive( false ); #endif connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h index 34308a712..3a06dd9e8 100644 --- a/tdeioslave/trash/trashimpl.h +++ b/tdeioslave/trash/trashimpl.h @@ -98,7 +98,7 @@ public: /// Move data from the old trash system to the new one void migrateOldTrash(); - /// KIO error code + /// TDEIO error code int lastErrorCode() const { return m_lastErrorCode; } TQString lastErrorMessage() const { return m_lastErrorMessage; } |