summaryrefslogtreecommitdiffstats
path: root/iso
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-30 13:43:41 -0600
committerTimothy Pearson <[email protected]>2013-01-30 13:43:41 -0600
commitfb3914c062f1a66bec49d9e56aabce53bb79385a (patch)
tree6e2b4840c4e59b1bb8ff22be7da5d92d17845840 /iso
parent314a114ebf348f0232454a1e1936543a2aa0c9a3 (diff)
downloadkrusader-fb3914c062f1a66bec49d9e56aabce53bb79385a.tar.gz
krusader-fb3914c062f1a66bec49d9e56aabce53bb79385a.zip
Fix a few remaining references to kio_
Diffstat (limited to 'iso')
-rw-r--r--iso/Makefile.am10
-rw-r--r--iso/iso.cpp44
-rw-r--r--iso/iso.h6
-rw-r--r--iso/iso.protocol2
-rw-r--r--iso/kiso.cpp2
5 files changed, 32 insertions, 32 deletions
diff --git a/iso/Makefile.am b/iso/Makefile.am
index cb08ad6..b0a1c8f 100644
--- a/iso/Makefile.am
+++ b/iso/Makefile.am
@@ -1,4 +1,4 @@
-kde_module_LTLIBRARIES = kio_iso.la
+kde_module_LTLIBRARIES = tdeio_iso.la
INCLUDES = $(all_includes)
@@ -6,12 +6,12 @@ INCLUDES = $(all_includes)
#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
-kio_iso_la_LIBADD = libisofs/libisofs.la $(LIB_QT) $(LIB_TDECORE) $(LIB_KIO)
+tdeio_iso_la_SOURCES = kisodirectory.cpp kisofile.cpp qfilehack.cpp kiso.cpp iso.cpp
+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
diff --git a/iso/iso.cpp b/iso/iso.cpp
index 520bf24..019cac9 100644
--- a/iso/iso.cpp
+++ b/iso/iso.cpp
@@ -60,17 +60,17 @@ extern "C" { int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
- TDEInstance instance( "kio_iso" );
+ TDEInstance instance( "tdeio_iso" );
kdDebug() << "Starting " << getpid() << endl;
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);
}
- kio_isoProtocol slave(argv[2], argv[3]);
+ tdeio_isoProtocol slave(argv[2], argv[3]);
slave.dispatchLoop();
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;
}
-kio_isoProtocol::~kio_isoProtocol()
+tdeio_isoProtocol::~tdeio_isoProtocol()
{
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;
// 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 )
{
path = fullPath.mid( m_isoFile->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);