TDE
/
krusader
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/krusader
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix a few remaining references to kio_

Browse Source
feat/lzip-support
Timothy Pearson 12 years ago
parent 314a114ebf
commit fb3914c062
26 changed files with 119 additions and 119 deletions
Show Stats Download Patch File Download Diff File

10
FAQ
Unescape View File

@ -468,16 +468,16 @@ Usage FAQ
7. Krusader reports "krarc:... protocol not supported" error at opening an 7. Krusader reports "krarc:... protocol not supported" error at opening an
archive file, what to do? archive file, what to do?
Install the krarc slave properly: 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 Copy the krarc.protocol file into $TDEDIR/share/services
or the directory where the KIO slaves are placed in your Linux<75> or the directory where the KIO slaves are placed in your Linux<75>
distribution. distribution.
8. I get the error message "Protocol not supported by Krusader: "krarc:/path/ 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? 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 The icons, tdeio_slaves and documentation must be installed in the correct
places in the TDE directory tree. The kio_krarc.* files must be in the same places in the TDE directory tree. The tdeio_krarc.* files must be in the same
directory with the other KIO slaves. Try this: locate kio_tar.* and copy/ directory with the other KIO slaves. Try this: locate tdeio_tar.* and copy/
link the kio_krarc.* files to the same location. Don't forget to run # 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 ldconfig on this directory when you're done. For more information click
here. here.
9. What todo if an extenal tool doesn't seem to work? 9. What todo if an extenal tool doesn't seem to work?

2
doc/ChangeLog
Unescape View File

@ -331,7 +331,7 @@ Final handbook revision for "Krusader 1.60.0 stable"
ADDED: PopUp Panel has now a Full Viewer ADDED: PopUp Panel has now a Full Viewer
ADDED: Shift+DEL will delete a file permanently ADDED: Shift+DEL will delete a file permanently
ADDED: inport/export keybindings (konfigurator, look & feel) 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: krusader-devel-ro mailing list
ADDED: Ctrl+O keybinding ADDED: Ctrl+O keybinding
ADDED: This handbook is available in several formats (HTML, TXT, RTF, PDF) ADDED: This handbook is available in several formats (HTML, TXT, RTF, PDF)

12
doc/en/faq.docbook
Unescape View File

@ -927,8 +927,8 @@
<answer> <answer>
<para>Install the krarc slave properly:</para> <para>Install the krarc slave properly:</para>
<para>Copy the <para>Copy the
<filename>kio_krarc.so</filename>, <filename>tdeio_krarc.so</filename>,
<filename>kio_krarc.la</filename> files into <filename>tdeio_krarc.la</filename> files into
<filename class="directory"> <filename class="directory">
$TDEDIR/lib/trinity</filename></para> $TDEDIR/lib/trinity</filename></para>
<para>Copy the <para>Copy the
@ -948,13 +948,13 @@
open foo-Archive, what to do?</para> open foo-Archive, what to do?</para>
</question> </question>
<answer> <answer>
<para>The icons, kio_slaves and documentation must be <para>The icons, tdeio_slaves and documentation must be
installed in the correct places in the &kde; installed in the correct places in the &kde;
directory tree. The directory tree. The
<filename>kio_krarc.*</filename> files must be in the same <filename>tdeio_krarc.*</filename> files must be in the same
directory with the other KIO slaves. Try this: locate directory with the other KIO slaves. Try this: locate
<filename>kio_tar.*</filename> and copy/link the <filename>tdeio_tar.*</filename> and copy/link the
<filename>kio_krarc.*</filename> files to the same <filename>tdeio_krarc.*</filename> files to the same
location. Don't forget to run location. Don't forget to run
<command># ldconfig</command> on this directory when <command># ldconfig</command> on this directory when
you're done. For more information click you're done. For more information click

12
doc/ru/faq.docbook
Unescape View File

@ -905,9 +905,9 @@
>Решение: установите правильно krarc slave:</para> >Решение: установите правильно krarc slave:</para>
<para <para
>Скопируйте файлы <filename >Скопируйте файлы <filename
>kio_krarc.so</filename >tdeio_krarc.so</filename
>, <filename >, <filename
>kio_krarc.la</filename >tdeio_krarc.la</filename
> в <filename class="directory" > в <filename class="directory"
>$TDEDIR/lib/trinity</filename >$TDEDIR/lib/trinity</filename
></para> ></para>
@ -931,12 +931,12 @@
</question> </question>
<answer> <answer>
<para <para
>Иконки, kio_slaves и документация должны быть правильно установлены в дереве каталогов &kde;. Файлы <filename >Иконки, tdeio_slaves и документация должны быть правильно установлены в дереве каталогов &kde;. Файлы <filename
>kio_krarc.*</filename >tdeio_krarc.*</filename
> быть в той же директории , что и остальные KIO slaves.Попробуйте : locate <filename > быть в той же директории , что и остальные KIO slaves.Попробуйте : locate <filename
>kio_tar.*</filename >tdeio_tar.*</filename
> и копируйте/сделайте ссылки на файлы <filename > и копируйте/сделайте ссылки на файлы <filename
>kio_krarc.*</filename >tdeio_krarc.*</filename
> в соответствующей директории. Не забудьте после запустить команду <command > в соответствующей директории. Не забудьте после запустить команду <command
># ldconfig</command ># ldconfig</command
> в соответствующей директории.Дополнительная информация <ulink url="www.krusader.org/phpBB/viewtopic.php?t=991" > в соответствующей директории.Дополнительная информация <ulink url="www.krusader.org/phpBB/viewtopic.php?t=991"

2
doc/ru/index.docbook
Unescape View File

@ -368,7 +368,7 @@ since the Entity Backspace is not defined in
<!ENTITY tdeioslaves2_url '<ulink url="http://developer.kde.org/documentation/library/3.4-api/tdeio/html/index.html" <!ENTITY tdeioslaves2_url '<ulink url="http://developer.kde.org/documentation/library/3.4-api/tdeio/html/index.html"
>KIOSlaves</ulink >KIOSlaves</ulink
>'> >'>
<!ENTITY kio_ipodslave_url '<ulink url="http://sourceforge.net/projects/kpod" <!ENTITY tdeio_ipodslave_url '<ulink url="http://sourceforge.net/projects/kpod"
>KIOipod-slave</ulink >KIOipod-slave</ulink
>'> >'>
<!ENTITY tdelibs_url '<ulink url="http://lxr.kde.org/source/tdelibs/tdeioslave" <!ENTITY tdelibs_url '<ulink url="http://lxr.kde.org/source/tdelibs/tdeioslave"

2
doc/ru/user-interface.docbook
Unescape View File

@ -349,7 +349,7 @@
> <command > <command
>ipod:/</command >ipod:/</command
></userinput ></userinput
> используется для доступа к &kio_ipodslave_url;, загрузка песен и управление &appleipod;.</para > используется для доступа к &tdeio_ipodslave_url;, загрузка песен и управление &appleipod;.</para
></listitem ></listitem
> <listitem > <listitem
><para ><para

10
iso/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
kde_module_LTLIBRARIES = kio_iso.la kde_module_LTLIBRARIES = tdeio_iso.la
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
@ -6,12 +6,12 @@ INCLUDES = $(all_includes)
#LDFLAGS = #LDFLAGS =
kio_iso_la_METASOURCES=AUTO tdeio_iso_la_METASOURCES=AUTO
kio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
kio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) tdeio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
kio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
SUBDIRS = libisofs SUBDIRS = libisofs

44
iso/iso.cpp
Unescape View File

@ -60,17 +60,17 @@ extern "C" { int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv ) int kdemain( int argc, char **argv )
{ {
TDEInstance instance( "kio_iso" ); TDEInstance instance( "tdeio_iso" );
kdDebug() << "Starting " << getpid() << endl; kdDebug() << "Starting " << getpid() << endl;
if (argc != 4) if (argc != 4)
{ {
fprintf(stderr, "Usage: kio_iso protocol domain-socket1 domain-socket2\n"); fprintf(stderr, "Usage: tdeio_iso protocol domain-socket1 domain-socket2\n");
exit(-1); exit(-1);
} }
kio_isoProtocol slave(argv[2], argv[3]); tdeio_isoProtocol slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
kdDebug() << "Done" << endl; kdDebug() << "Done" << endl;
@ -78,20 +78,20 @@ int kdemain( int argc, char **argv )
} }
kio_isoProtocol::kio_isoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "iso", pool, app ) tdeio_isoProtocol::tdeio_isoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "iso", pool, app )
{ {
kdDebug() << "kio_isoProtocol::kio_isoProtocol" << endl; kdDebug() << "tdeio_isoProtocol::tdeio_isoProtocol" << endl;
m_isoFile = 0L; m_isoFile = 0L;
} }
kio_isoProtocol::~kio_isoProtocol() tdeio_isoProtocol::~tdeio_isoProtocol()
{ {
delete m_isoFile; delete m_isoFile;
} }
bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int startsec ) bool tdeio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int startsec )
{ {
kdDebug() << "kio_isoProtocol::checkNewFile " << fullPath << " startsec: " << kdDebug() << "tdeio_isoProtocol::checkNewFile " << fullPath << " startsec: " <<
startsec << endl; startsec << endl;
// Are we already looking at that file ? // Are we already looking at that file ?
@ -105,7 +105,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
if ( m_mtime == statbuf.st_mtime ) if ( m_mtime == statbuf.st_mtime )
{ {
path = fullPath.mid( m_isoFile->fileName().length() ); path = fullPath.mid( m_isoFile->fileName().length() );
kdDebug() << "kio_isoProtocol::checkNewFile returning " << path << endl; kdDebug() << "tdeio_isoProtocol::checkNewFile returning " << path << endl;
return true; return true;
} }
} }
@ -157,7 +157,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
} }
if ( isoFile.isEmpty() ) if ( isoFile.isEmpty() )
{ {
kdDebug() << "kio_isoProtocol::checkNewFile: not found" << endl; kdDebug() << "tdeio_isoProtocol::checkNewFile: not found" << endl;
return false; 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; UDSAtom atom;
@ -230,9 +230,9 @@ void kio_isoProtocol::createUDSEntry( const KArchiveEntry * isoEntry, UDSEntry &
entry.append( atom ); 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; TQString path;
if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) ) 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; kdDebug() << "url.path()==" << url.path() << endl;
if (url.hasRef()) redir.setRef(url.htmlRef()); if (url.hasRef()) redir.setRef(url.htmlRef());
redir.setPath( url.path() + TQString::fromLatin1("/") ); redir.setPath( url.path() + TQString::fromLatin1("/") );
kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl; kdDebug() << "tdeio_isoProtocol::listDir: redirection " << redir.url() << endl;
redirection( redir ); redirection( redir );
finished(); finished();
return; return;
@ -310,21 +310,21 @@ void kio_isoProtocol::listDir( const KURL & url )
finished(); 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; TQString path;
UDSEntry entry; 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 ) ) if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
{ {
// We may be looking at a real directory - this happens // We may be looking at a real directory - this happens
// when pressing up after being in the root of an archive // when pressing up after being in the root of an archive
TQCString _path( TQFile::encodeName(url.path())); 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; struct stat buff;
if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) { if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) {
kdDebug() << "isdir=" << S_ISDIR( buff.st_mode ) << " errno=" << strerror(errno) << endl; 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_uds = TDEIO::UDS_NAME;
atom.m_str = url.fileName(); atom.m_str = url.fileName();
entry.append( atom ); 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_uds = TDEIO::UDS_FILE_TYPE;
atom.m_long = buff.st_mode & S_IFMT; atom.m_long = buff.st_mode & S_IFMT;
@ -371,7 +371,7 @@ void kio_isoProtocol::stat( const KURL & url )
finished(); 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; unsigned long long size, pos = 0;
bool mime=false,zlib=false; 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; TQString path;
if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) ) if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )

6
iso/iso.h
Unescape View File

@ -28,11 +28,11 @@
class KIso; class KIso;
class kio_isoProtocol : public TDEIO::SlaveBase class tdeio_isoProtocol : public TDEIO::SlaveBase
{ {
public: public:
kio_isoProtocol( const TQCString &pool, const TQCString &app ); tdeio_isoProtocol( const TQCString &pool, const TQCString &app );
virtual ~kio_isoProtocol(); virtual ~tdeio_isoProtocol();
virtual void listDir( const KURL & url ); virtual void listDir( const KURL & url );
virtual void stat( const KURL & url ); virtual void stat( const KURL & url );

2
iso/iso.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_iso exec=tdeio_iso
protocol=iso protocol=iso
listing=Name,Type,Size,Date,AccessDate,CreationDate,Access,Owner,Group,Link listing=Name,Type,Size,Date,AccessDate,CreationDate,Access,Owner,Group,Link
input=filesystem input=filesystem

2
iso/kiso.cpp
Unescape View File

@ -325,7 +325,7 @@ void KIso::readParams()
{ {
TDEConfig *config; TDEConfig *config;
config = new TDEConfig("kio_isorc"); config = new TDEConfig("tdeio_isorc");
showhidden=config->readBoolEntry("showhidden",false); showhidden=config->readBoolEntry("showhidden",false);
showrr=config->readBoolEntry("showrr",true); showrr=config->readBoolEntry("showrr",true);

10
krArc/Makefile.am
Unescape View File

@ -1,5 +1,5 @@
####### tdevelop will overwrite this part!!! (begin)########## ####### tdevelop will overwrite this part!!! (begin)##########
kde_module_LTLIBRARIES = kio_krarc.la kde_module_LTLIBRARIES = tdeio_krarc.la
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
@ -7,13 +7,13 @@ INCLUDES = $(all_includes)
#LDFLAGS = #LDFLAGS =
kio_krarc_la_METASOURCES=AUTO tdeio_krarc_la_METASOURCES=AUTO
kio_krarc_la_SOURCES = krarc.cpp tdeio_krarc_la_SOURCES = krarc.cpp
kio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO) tdeio_krarc_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
# $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) # $(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 noinst_HEADERS = krarc.h

66
krArc/krarc.cpp
Unescape View File

@ -61,14 +61,14 @@ using namespace TDEIO;
extern "C" { extern "C" {
int kdemain( int argc, char **argv ){ int kdemain( int argc, char **argv ){
TDEInstance instance( "kio_krarc" ); TDEInstance instance( "tdeio_krarc" );
if (argc != 4) { 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); exit(-1);
} }
kio_krarcProtocol slave(argv[2], argv[3]); tdeio_krarcProtocol slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
return 0; return 0;
@ -76,8 +76,8 @@ int kdemain( int argc, char **argv ){
} // extern "C" } // extern "C"
kio_krarcProtocol::kio_krarcProtocol(const TQCString &pool_socket, const TQCString &app_socket) tdeio_krarcProtocol::tdeio_krarcProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("kio_krarc", pool_socket, app_socket), archiveChanged(true), arcFile(0L),extArcReady(false), : SlaveBase("tdeio_krarc", pool_socket, app_socket), archiveChanged(true), arcFile(0L),extArcReady(false),
password(TQString()) { password(TQString()) {
krConfig = new TDEConfig( "krusaderrc" ); 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 // delete the temp directory
KrShellProcess proc; KrShellProcess proc;
proc << "rm -rf "<< arcTempDir; 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); TQByteArray d(len);
d.setRawData(buf,len); d.setRawData(buf,len);
data(d); data(d);
@ -110,7 +110,7 @@ void kio_krarcProtocol::receivedData(TDEProcess*,char* buf,int len){
decompressedLen += len; decompressedLen += len;
} }
void kio_krarcProtocol::mkdir(const KURL& url,int permissions){ void tdeio_krarcProtocol::mkdir(const KURL& url,int permissions){
KRDEBUG(url.path()); KRDEBUG(url.path());
if( !setArcFile( url ) ) { if( !setArcFile( url ) ) {
@ -171,7 +171,7 @@ void kio_krarcProtocol::mkdir(const KURL& url,int permissions){
finished(); 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()); KRDEBUG(url.path());
if( !setArcFile( url ) ) { if( !setArcFile( url ) ) {
error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); error(ERR_CANNOT_ENTER_DIRECTORY,url.path());
@ -240,11 +240,11 @@ void kio_krarcProtocol::put(const KURL& url,int permissions,bool overwrite,bool
finished(); finished();
} }
void kio_krarcProtocol::get(const KURL& url ){ void tdeio_krarcProtocol::get(const KURL& url ){
get( url, TRIES_WITH_PASSWORDS ); 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; bool decompressToFile = false;
KRDEBUG(url.path()); KRDEBUG(url.path());
@ -425,7 +425,7 @@ void kio_krarcProtocol::get(const KURL& url, int tries ){
finished(); finished();
} }
void kio_krarcProtocol::del(KURL const & url, bool isFile){ void tdeio_krarcProtocol::del(KURL const & url, bool isFile){
KRDEBUG(url.path()); KRDEBUG(url.path());
if( !setArcFile( url ) ) { if( !setArcFile( url ) ) {
@ -466,7 +466,7 @@ void kio_krarcProtocol::del(KURL const & url, bool isFile){
finished(); finished();
} }
void kio_krarcProtocol::stat( const KURL & url ){ void tdeio_krarcProtocol::stat( const KURL & url ){
KRDEBUG(url.path()); KRDEBUG(url.path());
if( !setArcFile( url ) ) { if( !setArcFile( url ) ) {
error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); 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 ); } 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()); KRDEBUG(url.path());
// KDE HACK: opening the password dlg in copy causes error for the COPY, and further problems // 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)); 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()); KRDEBUG(url.path());
if( !setArcFile( url ) ) { if( !setArcFile( url ) ) {
error(ERR_CANNOT_ENTER_DIRECTORY,url.path()); error(ERR_CANNOT_ENTER_DIRECTORY,url.path());
@ -615,7 +615,7 @@ void kio_krarcProtocol::listDir(const KURL& url){
finished(); finished();
} }
bool kio_krarcProtocol::setArcFile(const KURL& url){ bool tdeio_krarcProtocol::setArcFile(const KURL& url){
TQString path = url.path(); TQString path = url.path();
time_t currTime = time( 0 ); time_t currTime = time( 0 );
archiveChanged = true; archiveChanged = true;
@ -690,7 +690,7 @@ bool kio_krarcProtocol::setArcFile(const KURL& url){
return initArcParameters(); return initArcParameters();
} }
bool kio_krarcProtocol::initDirDict(const KURL&url, bool forced){ bool tdeio_krarcProtocol::initDirDict(const KURL&url, bool forced){
// set the archive location // set the archive location
//if( !setArcFile(url.path()) ) return false; //if( !setArcFile(url.path()) ) return false;
// no need to rescan the archive if it's not changed // 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; return true;
} }
TQString kio_krarcProtocol::findArcDirectory(const KURL& url){ TQString tdeio_krarcProtocol::findArcDirectory(const KURL& url){
TQString path = url.path(); TQString path = url.path();
if( path.right(1) == "/" ) path.truncate(path.length()-1); if( path.right(1) == "/" ) path.truncate(path.length()-1);
@ -821,7 +821,7 @@ TQString kio_krarcProtocol::findArcDirectory(const KURL& url){
return arcDir; return arcDir;
} }
UDSEntry* kio_krarcProtocol::findFileEntry(const KURL& url){ UDSEntry* tdeio_krarcProtocol::findFileEntry(const KURL& url){
TQString arcDir = findArcDirectory(url); TQString arcDir = findArcDirectory(url);
if( arcDir.isEmpty() ) return 0; if( arcDir.isEmpty() ) return 0;
@ -851,7 +851,7 @@ UDSEntry* kio_krarcProtocol::findFileEntry(const KURL& url){
return 0; return 0;
} }
TQString kio_krarcProtocol::nextWord(TQString &s,char d) { TQString tdeio_krarcProtocol::nextWord(TQString &s,char d) {
s=s.stripWhiteSpace(); s=s.stripWhiteSpace();
int j=s.find(d,0); int j=s.find(d,0);
TQString temp=s.left(j); // find the leftmost word. TQString temp=s.left(j); // find the leftmost word.
@ -859,7 +859,7 @@ TQString kio_krarcProtocol::nextWord(TQString &s,char d) {
return temp; return temp;
} }
mode_t kio_krarcProtocol::parsePermString(TQString perm){ mode_t tdeio_krarcProtocol::parsePermString(TQString perm){
mode_t mode=0; mode_t mode=0;
// file type // file type
if(perm[0] == 'd') mode |= S_IFDIR; if(perm[0] == 'd') mode |= S_IFDIR;
@ -881,7 +881,7 @@ mode_t kio_krarcProtocol::parsePermString(TQString perm){
return mode; return mode;
} }
UDSEntryList* kio_krarcProtocol::addNewDir(TQString path){ UDSEntryList* tdeio_krarcProtocol::addNewDir(TQString path){
UDSEntryList* dir; UDSEntryList* dir;
// check if the current dir exists // check if the current dir exists
@ -928,7 +928,7 @@ UDSEntryList* kio_krarcProtocol::addNewDir(TQString path){
return dir; return dir;
} }
void kio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) { void tdeio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) {
UDSEntryList* dir; UDSEntryList* dir;
UDSEntry entry; UDSEntry entry;
UDSAtom atom; UDSAtom atom;
@ -1232,7 +1232,7 @@ void kio_krarcProtocol::parseLine(int lineNo, TQString line, TQFile*) {
dir->append(entry); dir->append(entry);
} }
bool kio_krarcProtocol::initArcParameters() { bool tdeio_krarcProtocol::initArcParameters() {
KRDEBUG("arcType: "<<arcType); KRDEBUG("arcType: "<<arcType);
if(arcType == "zip"){ if(arcType == "zip"){
@ -1376,7 +1376,7 @@ bool kio_krarcProtocol::initArcParameters() {
return true; return true;
} }
bool kio_krarcProtocol::checkStatus( int exitCode ) { bool tdeio_krarcProtocol::checkStatus( int exitCode ) {
KRDEBUG( exitCode ); KRDEBUG( exitCode );
if( arcType == "zip" || arcType == "rar" || arcType == "7z" ) if( arcType == "zip" || arcType == "rar" || arcType == "7z" )
@ -1395,7 +1395,7 @@ struct AutoDetectParams {
TQString detectionString; TQString detectionString;
}; };
TQString kio_krarcProtocol::detectArchive( bool &encrypted, TQString fileName ) { TQString tdeio_krarcProtocol::detectArchive( bool &encrypted, TQString fileName ) {
static AutoDetectParams autoDetectParams[] = {{"zip", 0, "PK\x03\x04"}, static AutoDetectParams autoDetectParams[] = {{"zip", 0, "PK\x03\x04"},
{"rar", 0, "Rar!\x1a" }, {"rar", 0, "Rar!\x1a" },
{"arj", 0, "\x60\xea" }, {"arj", 0, "\x60\xea" },
@ -1548,7 +1548,7 @@ TQString kio_krarcProtocol::detectArchive( bool &encrypted, TQString fileName )
return TQString(); return TQString();
} }
void kio_krarcProtocol::checkOutputForPassword( TDEProcess *proc,char *buf,int len ) { void tdeio_krarcProtocol::checkOutputForPassword( TDEProcess *proc,char *buf,int len ) {
TQByteArray d(len); TQByteArray d(len);
d.setRawData(buf,len); d.setRawData(buf,len);
TQString data = TQString( d ); TQString data = TQString( d );
@ -1574,7 +1574,7 @@ void kio_krarcProtocol::checkOutputForPassword( TDEProcess *proc,char *buf,int l
} }
} }
void kio_krarcProtocol::invalidatePassword() { void tdeio_krarcProtocol::invalidatePassword() {
KRDEBUG( arcFile->url().path(-1) + "/" ); KRDEBUG( arcFile->url().path(-1) + "/" );
if( !encrypted ) if( !encrypted )
@ -1596,7 +1596,7 @@ void kio_krarcProtocol::invalidatePassword() {
cacheAuthentication( authInfo ); cacheAuthentication( authInfo );
} }
TQString kio_krarcProtocol::getPassword() { TQString tdeio_krarcProtocol::getPassword() {
KRDEBUG( encrypted ); KRDEBUG( encrypted );
if( !password.isNull() ) if( !password.isNull() )
@ -1631,20 +1631,20 @@ TQString kio_krarcProtocol::getPassword() {
return password; return password;
} }
TQString kio_krarcProtocol::fullPathName( TQString name ) { TQString tdeio_krarcProtocol::fullPathName( TQString name ) {
TQString supposedName = krConfig->readEntry( name, name ); TQString supposedName = krConfig->readEntry( name, name );
if( supposedName.isEmpty() ) if( supposedName.isEmpty() )
supposedName = name; supposedName = name;
return escape( supposedName ); return escape( supposedName );
} }
TQString kio_krarcProtocol::convertFileName( TQString name ) { TQString tdeio_krarcProtocol::convertFileName( TQString name ) {
if( arcType == "zip" ) if( arcType == "zip" )
name = name.replace( "[", "[[]" ); name = name.replace( "[", "[[]" );
return convertName( name ); return convertName( name );
} }
TQString kio_krarcProtocol::convertName( TQString name ) { TQString tdeio_krarcProtocol::convertName( TQString name ) {
if( !name.contains( '\'' ) ) if( !name.contains( '\'' ) )
return "'" + name + "'"; return "'" + name + "'";
if( !name.contains( '"' ) && !name.contains( '$' ) ) if( !name.contains( '"' ) && !name.contains( '$' ) )
@ -1652,7 +1652,7 @@ TQString kio_krarcProtocol::convertName( TQString name ) {
return escape( name ); return escape( name );
} }
TQString kio_krarcProtocol::escape( TQString name ) { TQString tdeio_krarcProtocol::escape( TQString name ) {
const TQString evilstuff = "\\\"'`()[]{}!?;$&<>| "; // stuff that should get escaped const TQString evilstuff = "\\\"'`()[]{}!?;$&<>| "; // stuff that should get escaped
for ( unsigned int i = 0; i < evilstuff.length(); ++i ) for ( unsigned int i = 0; i < evilstuff.length(); ++i )

6
krArc/krarc.h
Unescape View File

@ -32,12 +32,12 @@ class TDEProcess;
class KFileItem; class KFileItem;
class TQCString; class TQCString;
class kio_krarcProtocol : public TQObject, public TDEIO::SlaveBase { class tdeio_krarcProtocol : public TQObject, public TDEIO::SlaveBase {
Q_OBJECT Q_OBJECT
public: public:
kio_krarcProtocol(const TQCString &pool_socket, const TQCString &app_socket); tdeio_krarcProtocol(const TQCString &pool_socket, const TQCString &app_socket);
virtual ~kio_krarcProtocol(); virtual ~tdeio_krarcProtocol();
virtual void stat( const KURL & url ); virtual void stat( const KURL & url );
virtual void get(const KURL& url); virtual void get(const KURL& url);
virtual void put(const KURL& url,int permissions,bool overwrite,bool resume); virtual void put(const KURL& url,int permissions,bool overwrite,bool resume);

2
krArc/krarc.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_krarc exec=tdeio_krarc
protocol=krarc protocol=krarc
mimetype=application/x-archive mimetype=application/x-archive
input=filesystem input=filesystem

4
krusader/GUI/krremoteencodingmenu.cpp
Unescape View File

@ -120,7 +120,7 @@ void KrRemoteEncodingMenu::slotItemSelected(int id)
{ {
KURL currentURL = ACTIVE_PANEL->virtualPath(); KURL currentURL = ACTIVE_PANEL->virtualPath();
TDEConfig config(("kio_" + currentURL.protocol() + "rc").latin1()); TDEConfig config(("tdeio_" + currentURL.protocol() + "rc").latin1());
TQString host = currentURL.host(); TQString host = currentURL.host();
if (!popupMenu()->isItemChecked(id)) if (!popupMenu()->isItemChecked(id))
@ -147,7 +147,7 @@ void KrRemoteEncodingMenu::slotDefault()
// We have no choice but delete all higher domain level // We have no choice but delete all higher domain level
// settings here since it affects what will be matched. // 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); TQStringList partList = TQStringList::split('.', currentURL.host(), false);
if (!partList.isEmpty()) if (!partList.isEmpty())

6
krusader/GUI/mediabutton.cpp
Unescape View File

@ -577,7 +577,7 @@ bool MediaButton::mount( int index ) {
if ( (unsigned)index < mimes.count() ) { if ( (unsigned)index < mimes.count() ) {
if( !mediaUrls[ index ].isEmpty() ) { if( !mediaUrls[ index ].isEmpty() ) {
TDEProcess proc; 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 ); proc.start( TDEProcess::DontCare );
} else { } else {
krMtMan.mount( urls[ index ].path(), false ); krMtMan.mount( urls[ index ].path(), false );
@ -590,7 +590,7 @@ bool MediaButton::umount( int index ) {
if ( (unsigned)index < mimes.count() ) { if ( (unsigned)index < mimes.count() ) {
if( !mediaUrls[ index ].isEmpty() ) { if( !mediaUrls[ index ].isEmpty() ) {
TDEProcess proc; 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 ); proc.start( TDEProcess::DontCare );
} else { } else {
krMtMan.unmount( urls[ index ].path(), false ); krMtMan.unmount( urls[ index ].path(), false );
@ -603,7 +603,7 @@ bool MediaButton::eject( int index ) {
if ( (unsigned)index < mimes.count() ) { if ( (unsigned)index < mimes.count() ) {
if( !mediaUrls[ index ].isEmpty() ) { if( !mediaUrls[ index ].isEmpty() ) {
TDEProcess proc; 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 ); proc.start( TDEProcess::DontCare );
} else { } else {
krMtMan.eject( urls[ index ].path() ); krMtMan.eject( urls[ index ].path() );

8
tar/Makefile.am
Unescape View File

@ -4,11 +4,11 @@ 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_KIO) -ltdetexteditor
METASOURCES = AUTO METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_tar.la kde_module_LTLIBRARIES = tdeio_tar.la
kio_tar_la_SOURCES = tar.cc tdeio_tar_la_SOURCES = tar.cc
kio_tar_la_LIBADD = $(LIB_KSYCOCA) tdeio_tar_la_LIBADD = $(LIB_KSYCOCA)
kio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
check_PROGRAMS = ktartest check_PROGRAMS = ktartest

2
tar/ar.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_tar exec=tdeio_tar
protocol=ar protocol=ar
mimetype=application/x-archive mimetype=application/x-archive
input=filesystem input=filesystem

4
tar/tar.cc
Unescape View File

@ -30,12 +30,12 @@ extern "C" { int kdemain( int argc, char **argv ); }
#endif #endif
int kdemain( int argc, char **argv ) { int kdemain( int argc, char **argv ) {
TDEInstance instance( "kio_tar" ); TDEInstance instance( "tdeio_tar" );
kdDebug( 7109 ) << "Starting " << getpid() << endl; kdDebug( 7109 ) << "Starting " << getpid() << endl;
if ( argc != 4 ) { 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 ); exit( -1 );
} }

2
tar/tar.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_tar exec=tdeio_tar
protocol=tar protocol=tar
mimetype=application/x-tar mimetype=application/x-tar
input=filesystem input=filesystem

2
tar/zip.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_tar exec=tdeio_tar
protocol=zip protocol=zip
mimetype=application/x-zip mimetype=application/x-zip
input=filesystem input=filesystem

8
virt/Makefile.am
Unescape View File

@ -4,11 +4,11 @@ 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_KIO) -ltdetexteditor
METASOURCES = AUTO METASOURCES = AUTO
kde_module_LTLIBRARIES = kio_virt.la kde_module_LTLIBRARIES = tdeio_virt.la
kio_virt_la_SOURCES = virt.cc tdeio_virt_la_SOURCES = virt.cc
kio_virt_la_LIBADD = $(LIB_KSYCOCA) tdeio_virt_la_LIBADD = $(LIB_KSYCOCA)
kio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) tdeio_virt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE)
noinst_HEADERS = virt.h noinst_HEADERS = virt.h

10
virt/virt.cc
Unescape View File

@ -48,13 +48,13 @@ extern "C" { int kdemain( int argc, char **argv ); }
} }
TQDict<KURL::List> VirtProtocol::kioVirtDict; TQDict<KURL::List> VirtProtocol::kioVirtDict;
TDEConfig* VirtProtocol::kio_virt_db; TDEConfig* VirtProtocol::tdeio_virt_db;
int kdemain( int argc, char **argv ) { int kdemain( int argc, char **argv ) {
TDEInstance instance( "kio_virt" ); TDEInstance instance( "tdeio_virt" );
if ( argc != 4 ) { 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 ); exit( -1 );
} }
@ -65,11 +65,11 @@ int kdemain( int argc, char **argv ) {
} }
VirtProtocol::VirtProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "virt", pool, app ) { 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() { VirtProtocol::~VirtProtocol() {
delete kio_virt_db; delete tdeio_virt_db;
} }
void VirtProtocol::del(KURL const & /*url */, bool /* isFile */ ){ void VirtProtocol::del(KURL const & /*url */, bool /* isFile */ ){

2
virt/virt.h
Unescape View File

@ -46,7 +46,7 @@ protected:
static TQDict<KURL::List> kioVirtDict; static TQDict<KURL::List> kioVirtDict;
static TDEConfig* kio_virt_db; static TDEConfig* tdeio_virt_db;
bool rewriteURL(const KURL&, KURL&); bool rewriteURL(const KURL&, KURL&);

2
virt/virt.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol] [Protocol]
exec=kio_virt exec=tdeio_virt
protocol=virt protocol=virt
input=filesystem input=filesystem
output=filesystem output=filesystem

Write Preview
Loading…
Cancel
Save