diff --git a/FAQ b/FAQ index a4c0389..677f5af 100644 --- a/FAQ +++ b/FAQ @@ -468,16 +468,16 @@ Usage FAQ 7. Krusader reports "krarc:... protocol not supported" error at opening an archive file, what to do? Install the krarc slave properly: - Copy the kio_krarc.so, kio_krarc.la files into $TDEDIR/lib/trinity + Copy the tdeio_krarc.so, tdeio_krarc.la files into $TDEDIR/lib/trinity Copy the krarc.protocol file into $TDEDIR/share/services or the directory where the KIO slaves are placed in your Linux� distribution. 8. I get the error message "Protocol not supported by Krusader: "krarc:/path/ to/foo-archive", when I try to open foo-Archive, what to do? - The icons, kio_slaves and documentation must be installed in the correct - places in the TDE directory tree. The kio_krarc.* files must be in the same - directory with the other KIO slaves. Try this: locate kio_tar.* and copy/ - link the kio_krarc.* files to the same location. Don't forget to run # + The icons, tdeio_slaves and documentation must be installed in the correct + places in the TDE directory tree. The tdeio_krarc.* files must be in the same + directory with the other KIO slaves. Try this: locate tdeio_tar.* and copy/ + link the tdeio_krarc.* files to the same location. Don't forget to run # ldconfig on this directory when you're done. For more information click here. 9. What todo if an extenal tool doesn't seem to work? diff --git a/doc/ChangeLog b/doc/ChangeLog index e09009b..cca796a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -331,7 +331,7 @@ Final handbook revision for "Krusader 1.60.0 stable" ADDED: PopUp Panel has now a Full Viewer ADDED: Shift+DEL will delete a file permanently ADDED: inport/export keybindings (konfigurator, look & feel) - ADDED: kio_krarc.* "Protocol not supported by Krusader" (FAQ) + ADDED: tdeio_krarc.* "Protocol not supported by Krusader" (FAQ) ADDED: krusader-devel-ro mailing list ADDED: Ctrl+O keybinding ADDED: This handbook is available in several formats (HTML, TXT, RTF, PDF) diff --git a/doc/en/faq.docbook b/doc/en/faq.docbook index 169567d..55020d0 100644 --- a/doc/en/faq.docbook +++ b/doc/en/faq.docbook @@ -927,8 +927,8 @@ Install the krarc slave properly: Copy the - kio_krarc.so, - kio_krarc.la files into + tdeio_krarc.so, + tdeio_krarc.la files into $TDEDIR/lib/trinity Copy the @@ -948,13 +948,13 @@ open foo-Archive, what to do? - The icons, kio_slaves and documentation must be + The icons, tdeio_slaves and documentation must be installed in the correct places in the &kde; directory tree. The - kio_krarc.* files must be in the same + tdeio_krarc.* files must be in the same directory with the other KIO slaves. Try this: locate - kio_tar.* and copy/link the - kio_krarc.* files to the same + tdeio_tar.* and copy/link the + tdeio_krarc.* files to the same location. Don't forget to run # ldconfig on this directory when you're done. For more information click diff --git a/doc/ru/faq.docbook b/doc/ru/faq.docbook index 0d9d4f4..7aa3a73 100644 --- a/doc/ru/faq.docbook +++ b/doc/ru/faq.docbook @@ -905,9 +905,9 @@ >Решение: установите правильно krarc slave: Скопируйте файлы kio_krarc.sotdeio_krarc.so, kio_krarc.latdeio_krarc.la в $TDEDIR/lib/trinity @@ -931,12 +931,12 @@ Иконки, kio_slaves и документация должны быть правильно установлены в дереве каталогов &kde;. Файлы kio_krarc.*Иконки, tdeio_slaves и документация должны быть правильно установлены в дереве каталогов &kde;. Файлы tdeio_krarc.* быть в той же директории , что и остальные KIO slaves.Попробуйте : locate kio_tar.*tdeio_tar.* и копируйте/сделайте ссылки на файлы kio_krarc.*tdeio_krarc.* в соответствующей директории. Не забудьте после запустить команду # ldconfig в соответствующей директории.Дополнительная информация KIOSlaves'> -KIOipod-slave'> ipod:/ используется для доступа к &kio_ipodslave_url;, загрузка песен и управление &appleipod;. используется для доступа к &tdeio_ipodslave_url;, загрузка песен и управление &appleipod;. fileName().length() ); - kdDebug() << "kio_isoProtocol::checkNewFile returning " << path << endl; + kdDebug() << "tdeio_isoProtocol::checkNewFile returning " << path << endl; return true; } } @@ -157,7 +157,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star } if ( isoFile.isEmpty() ) { - kdDebug() << "kio_isoProtocol::checkNewFile: not found" << endl; + kdDebug() << "tdeio_isoProtocol::checkNewFile: not found" << endl; return false; } @@ -177,7 +177,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star } -void kio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry & entry ) +void tdeio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry & entry ) { UDSAtom atom; @@ -230,9 +230,9 @@ void kio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry & entry.append( atom ); } -void kio_isoProtocol::listDir( const KURL & url ) +void tdeio_isoProtocol::listDir( const KURL & url ) { - kdDebug() << "kio_isoProtocol::listDir " << url.url() << endl; + kdDebug() << "tdeio_isoProtocol::listDir " << url.url() << endl; TQString path; if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) ) @@ -263,7 +263,7 @@ void kio_isoProtocol::listDir( const KURL & url ) kdDebug() << "url.path()==" << url.path() << endl; if (url.hasRef()) redir.setRef(url.htmlRef()); redir.setPath( url.path() + TQString::fromLatin1("/") ); - kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl; + kdDebug() << "tdeio_isoProtocol::listDir: redirection " << redir.url() << endl; redirection( redir ); finished(); return; @@ -310,21 +310,21 @@ void kio_isoProtocol::listDir( const KURL & url ) finished(); - kdDebug() << "kio_isoProtocol::listDir done" << endl; + kdDebug() << "tdeio_isoProtocol::listDir done" << endl; } -void kio_isoProtocol::stat( const KURL & url ) +void tdeio_isoProtocol::stat( const KURL & url ) { TQString path; UDSEntry entry; - kdDebug() << "kio_isoProtocol::stat " << url.url() << endl; + kdDebug() << "tdeio_isoProtocol::stat " << url.url() << endl; if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) ) { // We may be looking at a real directory - this happens // when pressing up after being in the root of an archive TQCString _path( TQFile::encodeName(url.path())); - kdDebug() << "kio_isoProtocol::stat (stat) on " << _path << endl; + kdDebug() << "tdeio_isoProtocol::stat (stat) on " << _path << endl; struct stat buff; if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) { kdDebug() << "isdir=" << S_ISDIR( buff.st_mode ) << " errno=" << strerror(errno) << endl; @@ -336,7 +336,7 @@ void kio_isoProtocol::stat( const KURL & url ) atom.m_uds = TDEIO::UDS_NAME; atom.m_str = url.fileName(); entry.append( atom ); - kdDebug() << "kio_isoProtocol::stat returning name=" << url.fileName() << endl; + kdDebug() << "tdeio_isoProtocol::stat returning name=" << url.fileName() << endl; atom.m_uds = TDEIO::UDS_FILE_TYPE; atom.m_long = buff.st_mode & S_IFMT; @@ -371,7 +371,7 @@ void kio_isoProtocol::stat( const KURL & url ) finished(); } -void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &path ) +void tdeio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &path ) { unsigned long long size, pos = 0; bool mime=false,zlib=false; @@ -485,9 +485,9 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat } -void kio_isoProtocol::get( const KURL & url ) +void tdeio_isoProtocol::get( const KURL & url ) { - kdDebug() << "kio_isoProtocol::get" << url.url() << endl; + kdDebug() << "tdeio_isoProtocol::get" << url.url() << endl; TQString path; if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) ) diff --git a/iso/iso.h b/iso/iso.h index f0393d7..b284e22 100644 --- a/iso/iso.h +++ b/iso/iso.h @@ -28,11 +28,11 @@ class KIso; -class kio_isoProtocol : public TDEIO::SlaveBase +class tdeio_isoProtocol : public TDEIO::SlaveBase { public: - kio_isoProtocol( const TQCString &pool, const TQCString &app ); - virtual ~kio_isoProtocol(); + tdeio_isoProtocol( const TQCString &pool, const TQCString &app ); + virtual ~tdeio_isoProtocol(); virtual void listDir( const KURL & url ); virtual void stat( const KURL & url ); diff --git a/iso/iso.protocol b/iso/iso.protocol index cd2d1d2..150b036 100644 --- a/iso/iso.protocol +++ b/iso/iso.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_iso +exec=tdeio_iso protocol=iso listing=Name,Type,Size,Date,AccessDate,CreationDate,Access,Owner,Group,Link input=filesystem diff --git a/iso/kiso.cpp b/iso/kiso.cpp index 060f1fd..2074211 100644 --- a/iso/kiso.cpp +++ b/iso/kiso.cpp @@ -325,7 +325,7 @@ void KIso::readParams() { TDEConfig *config; - config = new TDEConfig("kio_isorc"); + config = new TDEConfig("tdeio_isorc"); showhidden=config->readBoolEntry("showhidden",false); showrr=config->readBoolEntry("showrr",true); diff --git a/krArc/Makefile.am b/krArc/Makefile.am index f937598..9ac2db5 100644 --- a/krArc/Makefile.am +++ b/krArc/Makefile.am @@ -1,5 +1,5 @@ ####### tdevelop will overwrite this part!!! (begin)########## -kde_module_LTLIBRARIES = kio_krarc.la +kde_module_LTLIBRARIES = tdeio_krarc.la INCLUDES = $(all_includes) @@ -7,13 +7,13 @@ INCLUDES = $(all_includes) #LDFLAGS = -kio_krarc_la_METASOURCES=AUTO +tdeio_krarc_la_METASOURCES=AUTO -kio_krarc_la_SOURCES = krarc.cpp -kio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) +tdeio_krarc_la_SOURCES = krarc.cpp +tdeio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) # $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -kio_krarc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeio_krarc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) noinst_HEADERS = krarc.h diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp index 757ff28..78b31a9 100644 --- a/krArc/krarc.cpp +++ b/krArc/krarc.cpp @@ -61,14 +61,14 @@ using namespace TDEIO; extern "C" { int kdemain( int argc, char **argv ){ - TDEInstance instance( "kio_krarc" ); + TDEInstance instance( "tdeio_krarc" ); if (argc != 4) { - kdWarning() << "Usage: kio_krarc protocol domain-socket1 domain-socket2" << endl; + kdWarning() << "Usage: tdeio_krarc protocol domain-socket1 domain-socket2" << endl; exit(-1); } - kio_krarcProtocol slave(argv[2], argv[3]); + tdeio_krarcProtocol slave(argv[2], argv[3]); slave.dispatchLoop(); return 0; @@ -76,8 +76,8 @@ int kdemain( int argc, char **argv ){ } // extern "C" -kio_krarcProtocol::kio_krarcProtocol(const TQCString &pool_socket, const TQCString &app_socket) - : SlaveBase("kio_krarc", pool_socket, app_socket), archiveChanged(true), arcFile(0L),extArcReady(false), +tdeio_krarcProtocol::tdeio_krarcProtocol(const TQCString &pool_socket, const TQCString &app_socket) + : SlaveBase("tdeio_krarc", pool_socket, app_socket), archiveChanged(true), arcFile(0L),extArcReady(false), password(TQString()) { krConfig = new TDEConfig( "krusaderrc" ); @@ -93,7 +93,7 @@ kio_krarcProtocol::kio_krarcProtocol(const TQCString &pool_socket, const TQCStri } /* ---------------------------------------------------------------------------------- */ -kio_krarcProtocol::~kio_krarcProtocol(){ +tdeio_krarcProtocol::~tdeio_krarcProtocol(){ // delete the temp directory KrShellProcess proc; proc << "rm -rf "<< arcTempDir; @@ -101,7 +101,7 @@ kio_krarcProtocol::~kio_krarcProtocol(){ } /* ---------------------------------------------------------------------------------- */ -void kio_krarcProtocol::receivedData(TDEProcess*,char* buf,int len){ +void tdeio_krarcProtocol::receivedData(TDEProcess*,char* buf,int len){ TQByteArray d(len); d.setRawData(buf,len); data(d); @@ -110,7 +110,7 @@ void kio_krarcProtocol::receivedData(TDEProcess*,char* buf,int len){ decompressedLen += len; } -void kio_krarcProtocol::mkdir(const KURL& url,int permissions){ +void tdeio_krarcProtocol::mkdir(const KURL& url,int permissions){ KRDEBUG(url.path()); if( !setArcFile( url ) ) { @@ -171,7 +171,7 @@ void kio_krarcProtocol::mkdir(const KURL& url,int permissions){ finished(); } -void kio_krarcProtocol::put(const KURL& url,int permissions,bool overwrite,bool resume){ +void tdeio_krarcProtocol::put(const KURL& url,int permissions,bool overwrite,bool resume){ KRDEBUG(url.path()); if( !setArcFile( url ) ) { error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); @@ -240,11 +240,11 @@ void kio_krarcProtocol::put(const KURL& url,int permissions,bool overwrite,bool finished(); } -void kio_krarcProtocol::get(const KURL& url ){ +void tdeio_krarcProtocol::get(const KURL& url ){ get( url, TRIES_WITH_PASSWORDS ); } -void kio_krarcProtocol::get(const KURL& url, int tries ){ +void tdeio_krarcProtocol::get(const KURL& url, int tries ){ bool decompressToFile = false; KRDEBUG(url.path()); @@ -425,7 +425,7 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){ finished(); } -void kio_krarcProtocol::del(KURL const & url, bool isFile){ +void tdeio_krarcProtocol::del(KURL const & url, bool isFile){ KRDEBUG(url.path()); if( !setArcFile( url ) ) { @@ -466,7 +466,7 @@ void kio_krarcProtocol::del(KURL const & url, bool isFile){ finished(); } -void kio_krarcProtocol::stat( const KURL & url ){ +void tdeio_krarcProtocol::stat( const KURL & url ){ KRDEBUG(url.path()); if( !setArcFile( url ) ) { error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); @@ -506,7 +506,7 @@ void kio_krarcProtocol::stat( const KURL & url ){ } else error( TDEIO::ERR_DOES_NOT_EXIST, path ); } -void kio_krarcProtocol::copy (const KURL &url, const KURL &dest, int, bool overwrite) { +void tdeio_krarcProtocol::copy (const KURL &url, const KURL &dest, int, bool overwrite) { KRDEBUG(url.path()); // KDE HACK: opening the password dlg in copy causes error for the COPY, and further problems @@ -571,7 +571,7 @@ void kio_krarcProtocol::copy (const KURL &url, const KURL &dest, int, bool overw error( ERR_UNSUPPORTED_ACTION, unsupportedActionErrorString(mProtocol, CMD_COPY)); } -void kio_krarcProtocol::listDir(const KURL& url){ +void tdeio_krarcProtocol::listDir(const KURL& url){ KRDEBUG(url.path()); if( !setArcFile( url ) ) { error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); @@ -615,7 +615,7 @@ void kio_krarcProtocol::listDir(const KURL& url){ finished(); } -bool kio_krarcProtocol::setArcFile(const KURL& url){ +bool tdeio_krarcProtocol::setArcFile(const KURL& url){ TQString path = url.path(); time_t currTime = time( 0 ); archiveChanged = true; @@ -690,7 +690,7 @@ bool kio_krarcProtocol::setArcFile(const KURL& url){ return initArcParameters(); } -bool kio_krarcProtocol::initDirDict(const KURL&url, bool forced){ +bool tdeio_krarcProtocol::initDirDict(const KURL&url, bool forced){ // set the archive location //if( !setArcFile(url.path()) ) return false; // no need to rescan the archive if it's not changed @@ -807,7 +807,7 @@ bool kio_krarcProtocol::initDirDict(const KURL&url, bool forced){ return true; } -TQString kio_krarcProtocol::findArcDirectory(const KURL& url){ +TQString tdeio_krarcProtocol::findArcDirectory(const KURL& url){ TQString path = url.path(); if( path.right(1) == "/" ) path.truncate(path.length()-1); @@ -821,7 +821,7 @@ TQString kio_krarcProtocol::findArcDirectory(const KURL& url){ return arcDir; } -UDSEntry* kio_krarcProtocol::findFileEntry(const KURL& url){ +UDSEntry* tdeio_krarcProtocol::findFileEntry(const KURL& url){ TQString arcDir = findArcDirectory(url); if( arcDir.isEmpty() ) return 0; @@ -851,7 +851,7 @@ UDSEntry* kio_krarcProtocol::findFileEntry(const KURL& url){ return 0; } -TQString kio_krarcProtocol::nextWord(TQString &s,char d) { +TQString tdeio_krarcProtocol::nextWord(TQString &s,char d) { s=s.stripWhiteSpace(); int j=s.find(d,0); TQString temp=s.left(j); // find the leftmost word. @@ -859,7 +859,7 @@ TQString kio_krarcProtocol::nextWord(TQString &s,char d) { return temp; } -mode_t kio_krarcProtocol::parsePermString(TQString perm){ +mode_t tdeio_krarcProtocol::parsePermString(TQString perm){ mode_t mode=0; // file type if(perm[0] == 'd') mode |= S_IFDIR; @@ -881,7 +881,7 @@ mode_t kio_krarcProtocol::parsePermString(TQString perm){ return mode; } -UDSEntryList* kio_krarcProtocol::addNewDir(TQString path){ +UDSEntryList* tdeio_krarcProtocol::addNewDir(TQString path){ UDSEntryList* dir; // check if the current dir exists @@ -928,7 +928,7 @@ UDSEntryList* kio_krarcProtocol::addNewDir(TQString path){ return dir; } -void kio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) { +void tdeio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) { UDSEntryList* dir; UDSEntry entry; UDSAtom atom; @@ -1232,7 +1232,7 @@ void kio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) { dir->append(entry); } -bool kio_krarcProtocol::initArcParameters() { +bool tdeio_krarcProtocol::initArcParameters() { KRDEBUG("arcType: "<url().path(-1) + "/" ); if( !encrypted ) @@ -1596,7 +1596,7 @@ void kio_krarcProtocol::invalidatePassword() { cacheAuthentication( authInfo ); } -TQString kio_krarcProtocol::getPassword() { +TQString tdeio_krarcProtocol::getPassword() { KRDEBUG( encrypted ); if( !password.isNull() ) @@ -1631,20 +1631,20 @@ TQString kio_krarcProtocol::getPassword() { return password; } -TQString kio_krarcProtocol::fullPathName( TQString name ) { +TQString tdeio_krarcProtocol::fullPathName( TQString name ) { TQString supposedName = krConfig->readEntry( name, name ); if( supposedName.isEmpty() ) supposedName = name; return escape( supposedName ); } -TQString kio_krarcProtocol::convertFileName( TQString name ) { +TQString tdeio_krarcProtocol::convertFileName( TQString name ) { if( arcType == "zip" ) name = name.replace( "[", "[[]" ); return convertName( name ); } -TQString kio_krarcProtocol::convertName( TQString name ) { +TQString tdeio_krarcProtocol::convertName( TQString name ) { if( !name.contains( '\'' ) ) return "'" + name + "'"; if( !name.contains( '"' ) && !name.contains( '$' ) ) @@ -1652,7 +1652,7 @@ TQString kio_krarcProtocol::convertName( TQString name ) { return escape( name ); } -TQString kio_krarcProtocol::escape( TQString name ) { +TQString tdeio_krarcProtocol::escape( TQString name ) { const TQString evilstuff = "\\\"'`()[]{}!?;$&<>| "; // stuff that should get escaped for ( unsigned int i = 0; i < evilstuff.length(); ++i ) diff --git a/krArc/krarc.h b/krArc/krarc.h index abfde47..df9e7ab 100644 --- a/krArc/krarc.h +++ b/krArc/krarc.h @@ -32,12 +32,12 @@ class TDEProcess; class KFileItem; class TQCString; -class kio_krarcProtocol : public TQObject, public TDEIO::SlaveBase { +class tdeio_krarcProtocol : public TQObject, public TDEIO::SlaveBase { Q_OBJECT public: - kio_krarcProtocol(const TQCString &pool_socket, const TQCString &app_socket); - virtual ~kio_krarcProtocol(); + tdeio_krarcProtocol(const TQCString &pool_socket, const TQCString &app_socket); + virtual ~tdeio_krarcProtocol(); virtual void stat( const KURL & url ); virtual void get(const KURL& url); virtual void put(const KURL& url,int permissions,bool overwrite,bool resume); diff --git a/krArc/krarc.protocol b/krArc/krarc.protocol index fec5796..cea254a 100644 --- a/krArc/krarc.protocol +++ b/krArc/krarc.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_krarc +exec=tdeio_krarc protocol=krarc mimetype=application/x-archive input=filesystem diff --git a/krusader/GUI/krremoteencodingmenu.cpp b/krusader/GUI/krremoteencodingmenu.cpp index f7fae8f..76af521 100644 --- a/krusader/GUI/krremoteencodingmenu.cpp +++ b/krusader/GUI/krremoteencodingmenu.cpp @@ -120,7 +120,7 @@ void KrRemoteEncodingMenu::slotItemSelected(int id) { KURL currentURL = ACTIVE_PANEL->virtualPath(); - TDEConfig config(("kio_" + currentURL.protocol() + "rc").latin1()); + TDEConfig config(("tdeio_" + currentURL.protocol() + "rc").latin1()); TQString host = currentURL.host(); if (!popupMenu()->isItemChecked(id)) @@ -147,7 +147,7 @@ void KrRemoteEncodingMenu::slotDefault() // We have no choice but delete all higher domain level // settings here since it affects what will be matched. - TDEConfig config(("kio_" + currentURL.protocol() + "rc").latin1()); + TDEConfig config(("tdeio_" + currentURL.protocol() + "rc").latin1()); TQStringList partList = TQStringList::split('.', currentURL.host(), false); if (!partList.isEmpty()) diff --git a/krusader/GUI/mediabutton.cpp b/krusader/GUI/mediabutton.cpp index 4abf1c0..152fd61 100644 --- a/krusader/GUI/mediabutton.cpp +++ b/krusader/GUI/mediabutton.cpp @@ -577,7 +577,7 @@ bool MediaButton::mount( int index ) { if ( (unsigned)index < mimes.count() ) { if( !mediaUrls[ index ].isEmpty() ) { TDEProcess proc; - proc << KrServices::fullPathName( "kio_media_mounthelper" ) << "-m" << mediaUrls[ index ].url(); + proc << KrServices::fullPathName( "tdeio_media_mounthelper" ) << "-m" << mediaUrls[ index ].url(); proc.start( TDEProcess::DontCare ); } else { krMtMan.mount( urls[ index ].path(), false ); @@ -590,7 +590,7 @@ bool MediaButton::umount( int index ) { if ( (unsigned)index < mimes.count() ) { if( !mediaUrls[ index ].isEmpty() ) { TDEProcess proc; - proc << KrServices::fullPathName( "kio_media_mounthelper" ) << "-u" << mediaUrls[ index ].url(); + proc << KrServices::fullPathName( "tdeio_media_mounthelper" ) << "-u" << mediaUrls[ index ].url(); proc.start( TDEProcess::DontCare ); } else { krMtMan.unmount( urls[ index ].path(), false ); @@ -603,7 +603,7 @@ bool MediaButton::eject( int index ) { if ( (unsigned)index < mimes.count() ) { if( !mediaUrls[ index ].isEmpty() ) { TDEProcess proc; - proc << KrServices::fullPathName( "kio_media_mounthelper" ) << "-e" << mediaUrls[ index ].url(); + proc << KrServices::fullPathName( "tdeio_media_mounthelper" ) << "-e" << mediaUrls[ index ].url(); proc.start( TDEProcess::DontCare ); } else { krMtMan.eject( urls[ index ].path() ); diff --git a/tar/Makefile.am b/tar/Makefile.am index 86b1b8a..f4409ab 100644 --- a/tar/Makefile.am +++ b/tar/Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO -kde_module_LTLIBRARIES = kio_tar.la +kde_module_LTLIBRARIES = tdeio_tar.la -kio_tar_la_SOURCES = tar.cc -kio_tar_la_LIBADD = $(LIB_KSYCOCA) -kio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeio_tar_la_SOURCES = tar.cc +tdeio_tar_la_LIBADD = $(LIB_KSYCOCA) +tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) check_PROGRAMS = ktartest diff --git a/tar/ar.protocol b/tar/ar.protocol index 31e765a..61779db 100644 --- a/tar/ar.protocol +++ b/tar/ar.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_tar +exec=tdeio_tar protocol=ar mimetype=application/x-archive input=filesystem diff --git a/tar/tar.cc b/tar/tar.cc index cb0d9f6..cd47156 100644 --- a/tar/tar.cc +++ b/tar/tar.cc @@ -30,12 +30,12 @@ extern "C" { int kdemain( int argc, char **argv ); } #endif int kdemain( int argc, char **argv ) { - TDEInstance instance( "kio_tar" ); + TDEInstance instance( "tdeio_tar" ); kdDebug( 7109 ) << "Starting " << getpid() << endl; if ( argc != 4 ) { - fprintf( stderr, "Usage: kio_tar protocol domain-socket1 domain-socket2\n" ); + fprintf( stderr, "Usage: tdeio_tar protocol domain-socket1 domain-socket2\n" ); exit( -1 ); } diff --git a/tar/tar.protocol b/tar/tar.protocol index bd97ba6..83d5fa6 100644 --- a/tar/tar.protocol +++ b/tar/tar.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_tar +exec=tdeio_tar protocol=tar mimetype=application/x-tar input=filesystem diff --git a/tar/zip.protocol b/tar/zip.protocol index d67d5b2..b16f820 100644 --- a/tar/zip.protocol +++ b/tar/zip.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_tar +exec=tdeio_tar protocol=zip mimetype=application/x-zip input=filesystem diff --git a/virt/Makefile.am b/virt/Makefile.am index d0a5971..87eedad 100644 --- a/virt/Makefile.am +++ b/virt/Makefile.am @@ -4,11 +4,11 @@ INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO -kde_module_LTLIBRARIES = kio_virt.la +kde_module_LTLIBRARIES = tdeio_virt.la -kio_virt_la_SOURCES = virt.cc -kio_virt_la_LIBADD = $(LIB_KSYCOCA) -kio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) +tdeio_virt_la_SOURCES = virt.cc +tdeio_virt_la_LIBADD = $(LIB_KSYCOCA) +tdeio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) noinst_HEADERS = virt.h diff --git a/virt/virt.cc b/virt/virt.cc index 4e9c1d4..426fc63 100644 --- a/virt/virt.cc +++ b/virt/virt.cc @@ -48,13 +48,13 @@ extern "C" { int kdemain( int argc, char **argv ); } } TQDict VirtProtocol::kioVirtDict; -TDEConfig* VirtProtocol::kio_virt_db; +TDEConfig* VirtProtocol::tdeio_virt_db; int kdemain( int argc, char **argv ) { - TDEInstance instance( "kio_virt" ); + TDEInstance instance( "tdeio_virt" ); if ( argc != 4 ) { - fprintf( stderr, "Usage: kio_virt protocol domain-socket1 domain-socket2\n" ); + fprintf( stderr, "Usage: tdeio_virt protocol domain-socket1 domain-socket2\n" ); exit( -1 ); } @@ -65,11 +65,11 @@ int kdemain( int argc, char **argv ) { } VirtProtocol::VirtProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "virt", pool, app ) { - kio_virt_db = new TDEConfig(VIRT_VFS_DB,false,"data"); + tdeio_virt_db = new TDEConfig(VIRT_VFS_DB,false,"data"); } VirtProtocol::~VirtProtocol() { - delete kio_virt_db; + delete tdeio_virt_db; } void VirtProtocol::del(KURL const & /*url */, bool /* isFile */ ){ diff --git a/virt/virt.h b/virt/virt.h index fd04265..8f5bc79 100644 --- a/virt/virt.h +++ b/virt/virt.h @@ -46,7 +46,7 @@ protected: static TQDict kioVirtDict; - static TDEConfig* kio_virt_db; + static TDEConfig* tdeio_virt_db; bool rewriteURL(const KURL&, KURL&); diff --git a/virt/virt.protocol b/virt/virt.protocol index fa8d334..cd0d782 100644 --- a/virt/virt.protocol +++ b/virt/virt.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_virt +exec=tdeio_virt protocol=virt input=filesystem output=filesystem