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

Fix a few remaining references to kio_

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 26cac03168
commit eac5ad1b33
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

8
tdeioslaves/videodvd/Makefile.am
Unescape View File

@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../libk3b/tools \
-I$(srcdir)/../../libk3bdevice \
$(all_includes)
kde_module_LTLIBRARIES = kio_videodvd.la
kde_module_LTLIBRARIES = tdeio_videodvd.la
kio_videodvd_la_SOURCES = videodvd.cpp
kio_videodvd_la_LIBADD = -ltdeio ../../libk3b/libk3b.la
kio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -ltdeio -ltdecore -L../../libk3bdevice/.libs -lk3bdevice
tdeio_videodvd_la_SOURCES = videodvd.cpp
tdeio_videodvd_la_LIBADD = -ltdeio ../../libk3b/libk3b.la
tdeio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) -ltdeio -ltdecore -L../../libk3bdevice/.libs -lk3bdevice
protocol_DATA = videodvd.protocol
protocoldir = $(kde_servicesdir)

44
tdeioslaves/videodvd/videodvd.cpp
Unescape View File

@ -42,20 +42,20 @@ extern "C"
{
LIBK3B_EXPORT int kdemain( int argc, char **argv )
{
TDEInstance instance( "kio_videodvd" );
TDEInstance instance( "tdeio_videodvd" );
kdDebug(7101) << "*** Starting kio_videodvd " << endl;
kdDebug(7101) << "*** Starting tdeio_videodvd " << endl;
if (argc != 4)
{
kdDebug(7101) << "Usage: kio_videodvd protocol domain-socket1 domain-socket2" << endl;
kdDebug(7101) << "Usage: tdeio_videodvd protocol domain-socket1 domain-socket2" << endl;
exit(-1);
}
kio_videodvdProtocol slave(argv[2], argv[3]);
tdeio_videodvdProtocol slave(argv[2], argv[3]);
slave.dispatchLoop();
kdDebug(7101) << "*** kio_videodvd Done" << endl;
kdDebug(7101) << "*** tdeio_videodvd Done" << endl;
return 0;
}
}
@ -64,13 +64,13 @@ extern "C"
// FIXME: Does it really make sense to use a static device manager? Are all instances
// of videodvd started in another process?
K3bDevice::DeviceManager* kio_videodvdProtocol::s_deviceManager = 0;
int kio_videodvdProtocol::s_instanceCnt = 0;
K3bDevice::DeviceManager* tdeio_videodvdProtocol::s_deviceManager = 0;
int tdeio_videodvdProtocol::s_instanceCnt = 0;
kio_videodvdProtocol::kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("kio_videodvd", pool_socket, app_socket)
tdeio_videodvdProtocol::tdeio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket)
: SlaveBase("tdeio_videodvd", pool_socket, app_socket)
{
kdDebug() << "kio_videodvdProtocol::kio_videodvdProtocol()" << endl;
kdDebug() << "tdeio_videodvdProtocol::tdeio_videodvdProtocol()" << endl;
if( !s_deviceManager )
{
s_deviceManager = new K3bDevice::DeviceManager();
@ -81,9 +81,9 @@ kio_videodvdProtocol::kio_videodvdProtocol(const TQCString &pool_socket, const T
}
kio_videodvdProtocol::~kio_videodvdProtocol()
tdeio_videodvdProtocol::~tdeio_videodvdProtocol()
{
kdDebug() << "kio_videodvdProtocol::~kio_videodvdProtocol()" << endl;
kdDebug() << "tdeio_videodvdProtocol::~tdeio_videodvdProtocol()" << endl;
s_instanceCnt--;
if( s_instanceCnt == 0 )
{
@ -93,7 +93,7 @@ kio_videodvdProtocol::~kio_videodvdProtocol()
}
TDEIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) const
TDEIO::UDSEntry tdeio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e ) const
{
TDEIO::UDSEntry uds;
TDEIO::UDSAtom a;
@ -150,12 +150,12 @@ TDEIO::UDSEntry kio_videodvdProtocol::createUDSEntry( const K3bIso9660Entry* e )
// FIXME: remember the iso instance for quicker something and search for the videodvd
// in the available devices.
K3bIso9660* kio_videodvdProtocol::openIso( const KURL& url, TQString& plainIsoPath )
K3bIso9660* tdeio_videodvdProtocol::openIso( const KURL& url, TQString& plainIsoPath )
{
// get the volume id from the url
TQString volumeId = url.path().section( '/', 1, 1 );
kdDebug() << "(kio_videodvdProtocol) searching for Video dvd: " << volumeId << endl;
kdDebug() << "(tdeio_videodvdProtocol) searching for Video dvd: " << volumeId << endl;
// now search the devices for this volume id
// FIXME: use the cache created in listVideoDVDs
@ -171,7 +171,7 @@ K3bIso9660* kio_videodvdProtocol::openIso( const KURL& url, TQString& plainIsoPa
iso->setPlainIso9660( true );
if( iso->open() && iso->primaryDescriptor().volumeId == volumeId ) {
plainIsoPath = url.path().section( "/", 2, -1 ) + "/";
kdDebug() << "(kio_videodvdProtocol) using iso path: " << plainIsoPath << endl;
kdDebug() << "(tdeio_videodvdProtocol) using iso path: " << plainIsoPath << endl;
return iso;
}
delete iso;
@ -183,9 +183,9 @@ K3bIso9660* kio_videodvdProtocol::openIso( const KURL& url, TQString& plainIsoPa
}
void kio_videodvdProtocol::get(const KURL& url )
void tdeio_videodvdProtocol::get(const KURL& url )
{
kdDebug() << "kio_videodvd::get(const KURL& url)" << endl ;
kdDebug() << "tdeio_videodvd::get(const KURL& url)" << endl ;
TQString isoPath;
if( K3bIso9660* iso = openIso( url, isoPath ) )
@ -227,7 +227,7 @@ void kio_videodvdProtocol::get(const KURL& url )
}
void kio_videodvdProtocol::listDir( const KURL& url )
void tdeio_videodvdProtocol::listDir( const KURL& url )
{
if( url.path() == "/" ) {
listVideoDVDs();
@ -265,7 +265,7 @@ void kio_videodvdProtocol::listDir( const KURL& url )
}
void kio_videodvdProtocol::listVideoDVDs()
void tdeio_videodvdProtocol::listVideoDVDs()
{
int cnt = 0;
@ -321,7 +321,7 @@ void kio_videodvdProtocol::listVideoDVDs()
}
void kio_videodvdProtocol::stat( const KURL& url )
void tdeio_videodvdProtocol::stat( const KURL& url )
{
if( url.path() == "/" ) {
//
@ -364,7 +364,7 @@ void kio_videodvdProtocol::stat( const KURL& url )
// FIXME: when does this get called? It seems not to be used for the files.
void kio_videodvdProtocol::mimetype( const KURL& url )
void tdeio_videodvdProtocol::mimetype( const KURL& url )
{
if( url.path() == "/" ) {
error( ERR_UNSUPPORTED_ACTION, "mimetype(/)" );

6
tdeioslaves/videodvd/videodvd.h
Unescape View File

@ -32,11 +32,11 @@ namespace K3bDevice
class DeviceManager;
}
class kio_videodvdProtocol : public TDEIO::SlaveBase
class tdeio_videodvdProtocol : public TDEIO::SlaveBase
{
public:
kio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket);
~kio_videodvdProtocol();
tdeio_videodvdProtocol(const TQCString &pool_socket, const TQCString &app_socket);
~tdeio_videodvdProtocol();
void mimetype( const KURL& url );
void stat( const KURL& url );

2
tdeioslaves/videodvd/videodvd.protocol
Unescape View File

@ -1,5 +1,5 @@
[Protocol]
exec=kio_videodvd
exec=tdeio_videodvd
protocol=videodvd
input=none
output=filesystem

Write Preview
Loading…
Cancel
Save