summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kamera/tdeioslave/CMakeLists.txt2
-rw-r--r--kamera/tdeioslave/Makefile.am8
-rw-r--r--kamera/tdeioslave/camera.protocol2
-rw-r--r--kamera/tdeioslave/kamera.cpp4
-rw-r--r--kmrml/README2
-rw-r--r--kmrml/README.DEVELOPMENT4
-rw-r--r--kmrml/kmrml.lsm2
-rw-r--r--kmrml/kmrml.spec2
-rw-r--r--kmrml/kmrml/CMakeLists.txt4
-rw-r--r--kmrml/kmrml/Makefile.am8
-rw-r--r--kmrml/kmrml/lib/kmrml_config.cpp2
-rw-r--r--kmrml/kmrml/lib/kmrml_config.h2
-rw-r--r--kmrml/kmrml/lib/mrml_shared.cpp24
-rw-r--r--kmrml/kmrml/lib/mrml_shared.h16
-rw-r--r--kmrml/kmrml/lib/mrml_utils.cpp4
-rw-r--r--kmrml/kmrml/mrml.cpp12
-rw-r--r--kmrml/kmrml/mrml.protocol2
-rw-r--r--kmrml/kmrml/mrml_part.cpp4
-rw-r--r--kmrml/kmrml/mrmlsearch.cpp2
-rw-r--r--kooka/scanpackager.h10
-rw-r--r--kpovmodeler/kdoc.rules4
-rw-r--r--kuickshow/TODO2
22 files changed, 61 insertions, 61 deletions
diff --git a/kamera/tdeioslave/CMakeLists.txt b/kamera/tdeioslave/CMakeLists.txt
index 33ca815e..1649697c 100644
--- a/kamera/tdeioslave/CMakeLists.txt
+++ b/kamera/tdeioslave/CMakeLists.txt
@@ -30,7 +30,7 @@ install( FILES camera.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
#### kamera (module) ############################
-tde_add_kpart( kio_kamera AUTOMOC
+tde_add_kpart( tdeio_kamera AUTOMOC
SOURCES kamera.cpp
LINK tdeio-shared ${GPHOTO2_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kamera/tdeioslave/Makefile.am b/kamera/tdeioslave/Makefile.am
index 80877fa7..ffc4c855 100644
--- a/kamera/tdeioslave/Makefile.am
+++ b/kamera/tdeioslave/Makefile.am
@@ -5,11 +5,11 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes) $(GPHOTO2_INCS)
####### Files
-kde_module_LTLIBRARIES = kio_kamera.la
+kde_module_LTLIBRARIES = tdeio_kamera.la
-kio_kamera_la_SOURCES = kamera.cpp
-kio_kamera_la_LIBADD = $(LIB_KIO) -lgphoto2
-kio_kamera_la_LDFLAGS = $(all_libraries) $(GPHOTO2_LIBS) -module $(KDE_PLUGIN)
+tdeio_kamera_la_SOURCES = kamera.cpp
+tdeio_kamera_la_LIBADD = $(LIB_KIO) -lgphoto2
+tdeio_kamera_la_LDFLAGS = $(all_libraries) $(GPHOTO2_LIBS) -module $(KDE_PLUGIN)
noinst_HEADERS = kamera.h
diff --git a/kamera/tdeioslave/camera.protocol b/kamera/tdeioslave/camera.protocol
index 947d02b9..28046e14 100644
--- a/kamera/tdeioslave/camera.protocol
+++ b/kamera/tdeioslave/camera.protocol
@@ -1,5 +1,5 @@
[Protocol]
-exec=kio_kamera
+exec=tdeio_kamera
protocol=camera
input=none
output=filesystem
diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp
index 45d11970..94250832 100644
--- a/kamera/tdeioslave/kamera.cpp
+++ b/kamera/tdeioslave/kamera.cpp
@@ -67,10 +67,10 @@ extern "C"
int kdemain(int argc, char **argv)
{
- TDEInstance instance("kio_kamera");
+ TDEInstance instance("tdeio_kamera");
if(argc != 4) {
- kdDebug(7123) << "Usage: kio_kamera protocol "
+ kdDebug(7123) << "Usage: tdeio_kamera protocol "
"domain-socket1 domain-socket2" << endl;
exit(-1);
}
diff --git a/kmrml/README b/kmrml/README
index f65ff1ff..d17322df 100644
--- a/kmrml/README
+++ b/kmrml/README
@@ -1,4 +1,4 @@
-kio_mrml and mrml_part
+tdeio_mrml and mrml_part
Carsten Pfeiffer <[email protected]> 2001/05/03
----------------------------------------------------------------------
diff --git a/kmrml/README.DEVELOPMENT b/kmrml/README.DEVELOPMENT
index c09c0734..6ad744f7 100644
--- a/kmrml/README.DEVELOPMENT
+++ b/kmrml/README.DEVELOPMENT
@@ -2,7 +2,7 @@ This file gives an overview of the structure of the kmrml package.
kmrml consists of the following:
-- kio_mrml: an ioslave that is able to contact an mrml daemon (i.e. the GIFT)
+- tdeio_mrml: an ioslave that is able to contact an mrml daemon (i.e. the GIFT)
and transports the data from the daemon to its master (i.e. the
MrmlPart) as XML (MRML, Multimedia Retrieval Markup Language)
@@ -19,7 +19,7 @@ kmrml consists of the following:
stop services. It is completely independent of GIFT/kmrml.
It is used to have one centralized place where the gift server
is started (ensuring this happens only once, restarting it upon
- failure and stopping the gift after all kio_mrml instances
+ failure and stopping the gift after all tdeio_mrml instances
have been killed.
lib/: common stuff used by more than one module
diff --git a/kmrml/kmrml.lsm b/kmrml/kmrml.lsm
index 1b193b49..bffaaeee 100644
--- a/kmrml/kmrml.lsm
+++ b/kmrml/kmrml.lsm
@@ -2,7 +2,7 @@ Begin4
Title: MRML
Version: R14.0.0
Entered-date: 2010-05-10
-Description: MRML (Multimedia Retrieval Markup Language) kio-slave for the Trinity Desktop Environment
+Description: MRML (Multimedia Retrieval Markup Language) tdeio-slave for the Trinity Desktop Environment
Keywords: Image retrieval, GIFT, MRML, Konqueror, TDE, Qt
Author: Carsten Pfeiffer <[email protected]>
Maintained-by: The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
diff --git a/kmrml/kmrml.spec b/kmrml/kmrml.spec
index 629169b5..76c8be05 100644
--- a/kmrml/kmrml.spec
+++ b/kmrml/kmrml.spec
@@ -22,7 +22,7 @@ which defines a protocol for querying a server for images
based on their content. See http://www.mrml.net about MRML
and the GNU Image Finding Tool (GIFT), an MRML server.
-This package consists of an mrml kio-slave that handles
+This package consists of an mrml tdeio-slave that handles
the communication with the MRML server and a KPart to
be embedded e.g. into Konqueror.
diff --git a/kmrml/kmrml/CMakeLists.txt b/kmrml/kmrml/CMakeLists.txt
index 4d445b2d..07a0b40e 100644
--- a/kmrml/kmrml/CMakeLists.txt
+++ b/kmrml/kmrml/CMakeLists.txt
@@ -33,9 +33,9 @@ install( FILES mrml.desktop DESTINATION ${MIME_INSTALL_DIR}/text )
install( FILES mrml-servicemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus )
-#### kio_mrml (module) ##########################
+#### tdeio_mrml (module) ##########################
-tde_add_kpart( kio_mrml AUTOMOC
+tde_add_kpart( tdeio_mrml AUTOMOC
SOURCES mrml.cpp
LINK kmrmlstuff-static tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kmrml/kmrml/Makefile.am b/kmrml/kmrml/Makefile.am
index 02eaf1e9..d1e2d8a2 100644
--- a/kmrml/kmrml/Makefile.am
+++ b/kmrml/kmrml/Makefile.am
@@ -6,11 +6,11 @@ LIB_KMRMLSTUFF = $(top_builddir)/kmrml/kmrml/lib/libkmrmlstuff.la
####### Files
-kde_module_LTLIBRARIES = kio_mrml.la libkmrmlpart.la
+kde_module_LTLIBRARIES = tdeio_mrml.la libkmrmlpart.la
-kio_mrml_la_SOURCES = mrml.cpp
-kio_mrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO)
-kio_mrml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+tdeio_mrml_la_SOURCES = mrml.cpp
+tdeio_mrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO)
+tdeio_mrml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
libkmrmlpart_la_SOURCES = mrml_part.cpp mrml_view.cpp loader.cpp \
mrml_elements.cpp mrml_creator.cpp browser.cpp algorithmdialog.cpp \
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 9aa92d54..c37e0fec 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -54,7 +54,7 @@ const int DEFAULT_PORT = 12789;
Config::Config()
{
- m_ownConfig = new TDEConfig( "kio_mrmlrc", false, false );
+ m_ownConfig = new TDEConfig( "tdeio_mrmlrc", false, false );
m_config = m_ownConfig;
init();
diff --git a/kmrml/kmrml/lib/kmrml_config.h b/kmrml/kmrml/lib/kmrml_config.h
index 5a423360..9bb435cf 100644
--- a/kmrml/kmrml/lib/kmrml_config.h
+++ b/kmrml/kmrml/lib/kmrml_config.h
@@ -35,7 +35,7 @@ namespace KMrml
TQString& user, const TQString& pass);
// does NOT set the port in the KURL object, if autoPort is selected
- // kio_mrml is going to determine itself (via ServerSettings::port()).
+ // tdeio_mrml is going to determine itself (via ServerSettings::port()).
// This deuglifies the mrml:/ url a bit (no port is shown)
KURL getUrl() const;
diff --git a/kmrml/kmrml/lib/mrml_shared.cpp b/kmrml/kmrml/lib/mrml_shared.cpp
index 3e7d6d95..be653f58 100644
--- a/kmrml/kmrml/lib/mrml_shared.cpp
+++ b/kmrml/kmrml/lib/mrml_shared.cpp
@@ -75,10 +75,10 @@ const TQString * MrmlShared::m_popup = 0L;
// meta-data
const TQString * MrmlShared::m_mrml_data = 0L;
-// kio_mrml tasks
-const TQString * MrmlShared::m_kio_task = 0L;
-const TQString * MrmlShared::m_kio_initialize = 0L;
-const TQString * MrmlShared::m_kio_startQuery = 0L;
+// tdeio_mrml tasks
+const TQString * MrmlShared::m_tdeio_task = 0L;
+const TQString * MrmlShared::m_tdeio_initialize = 0L;
+const TQString * MrmlShared::m_tdeio_startQuery = 0L;
int MrmlShared::s_references = 0;
@@ -163,10 +163,10 @@ void MrmlShared::init()
// meta-data
m_mrml_data = new TQString ( "mrml_data" ) ;
-// kio_mrml tasks
- m_kio_task = new TQString ( "kio_task" ) ;
- m_kio_initialize = new TQString ( "kio_initialize" ) ;
- m_kio_startQuery = new TQString ( "kio_startQuery" ) ;
+// tdeio_mrml tasks
+ m_tdeio_task = new TQString ( "tdeio_task" ) ;
+ m_tdeio_initialize = new TQString ( "tdeio_initialize" ) ;
+ m_tdeio_startQuery = new TQString ( "tdeio_startQuery" ) ;
}
void MrmlShared::cleanup()
@@ -227,9 +227,9 @@ void MrmlShared::cleanup()
// meta-data
delete m_mrml_data;
- // kio_mrml tasks
- delete m_kio_task;
- delete m_kio_initialize;
- delete m_kio_startQuery;
+ // tdeio_mrml tasks
+ delete m_tdeio_task;
+ delete m_tdeio_initialize;
+ delete m_tdeio_startQuery;
}
diff --git a/kmrml/kmrml/lib/mrml_shared.h b/kmrml/kmrml/lib/mrml_shared.h
index 6ed2177a..7f523bc0 100644
--- a/kmrml/kmrml/lib/mrml_shared.h
+++ b/kmrml/kmrml/lib/mrml_shared.h
@@ -88,10 +88,10 @@ public:
// meta-data
static const TQString& mrml_data() { return *m_mrml_data; }
- // kio_mrml tasks
- static const TQString& kio_task() { return *m_kio_task; }
- static const TQString& kio_initialize() { return *m_kio_initialize; }
- static const TQString& kio_startQuery() { return *m_kio_startQuery; }
+ // tdeio_mrml tasks
+ static const TQString& tdeio_task() { return *m_tdeio_task; }
+ static const TQString& tdeio_initialize() { return *m_tdeio_initialize; }
+ static const TQString& tdeio_startQuery() { return *m_tdeio_startQuery; }
private:
@@ -151,10 +151,10 @@ private:
// meta-data
static const TQString * m_mrml_data;
- // kio_mrml tasks
- static const TQString * m_kio_task;
- static const TQString * m_kio_initialize;
- static const TQString * m_kio_startQuery;
+ // tdeio_mrml tasks
+ static const TQString * m_tdeio_task;
+ static const TQString * m_tdeio_initialize;
+ static const TQString * m_tdeio_startQuery;
private:
static void cleanup();
diff --git a/kmrml/kmrml/lib/mrml_utils.cpp b/kmrml/kmrml/lib/mrml_utils.cpp
index d493e58d..80c44489 100644
--- a/kmrml/kmrml/lib/mrml_utils.cpp
+++ b/kmrml/kmrml/lib/mrml_utils.cpp
@@ -38,12 +38,12 @@ Util *Util::s_self = 0L;
Util::Util()
{
- // we need our own dcopclient, when used in kio_mrml
+ // we need our own dcopclient, when used in tdeio_mrml
if ( !DCOPClient::mainClient() )
{
DCOPClient::setMainClient( new DCOPClient() );
if ( !DCOPClient::mainClient()->attach() )
- tqWarning( "kio_mrml: Can't attach to DCOP Server.");
+ tqWarning( "tdeio_mrml: Can't attach to DCOP Server.");
}
}
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index adbbbe95..12855164 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -39,14 +39,14 @@ extern "C" {
KDE_EXPORT int kdemain( int argc, char **argv )
{
KLocale::setMainCatalogue("tdelibs");
- TDEInstance instance( "kio_mrml" );
+ TDEInstance instance( "tdeio_mrml" );
TDEGlobal::locale()->insertCatalogue( "kmrml" );
kdDebug() << "Starting MRML " << getpid() << endl;
if (argc != 4)
{
- fprintf(stderr, "Usage: kio_mrml protocol domain-socket1 domain-socket2\n");
+ fprintf(stderr, "Usage: tdeio_mrml protocol domain-socket1 domain-socket2\n");
exit(-1);
}
@@ -107,13 +107,13 @@ tryConnect:
{
// tqDebug(" connected!");
- TQString task = metaData( MrmlShared::kio_task() );
+ TQString task = metaData( MrmlShared::tdeio_task() );
- if ( task == MrmlShared::kio_initialize() ) {
+ if ( task == MrmlShared::tdeio_initialize() ) {
startSession( url );
}
- else if ( task == MrmlShared::kio_startQuery() ) {
+ else if ( task == MrmlShared::tdeio_startQuery() ) {
TQString meta = metaData( MrmlShared::mrml_data() );
if ( meta.isEmpty() ) {
closeDescriptor();
@@ -217,7 +217,7 @@ bool Mrml::startSession( const KURL& url )
// apparently makes problems in exception handling somehow. So we simply
// accept the server's session-id.
TQString msg = mrmlString( TQString() ).arg(
- "<open-session user-name=\"%1\" session-name=\"kio_mrml session\" /> \
+ "<open-session user-name=\"%1\" session-name=\"tdeio_mrml session\" /> \
<get-algorithms /> \
<get-collections /> \
</mrml>" ).arg( user( url ));
diff --git a/kmrml/kmrml/mrml.protocol b/kmrml/kmrml/mrml.protocol
index 4efceaee..2bea78cb 100644
--- a/kmrml/kmrml/mrml.protocol
+++ b/kmrml/kmrml/mrml.protocol
@@ -1,5 +1,5 @@
[Protocol]
-exec=kio_mrml
+exec=tdeio_mrml
protocol=mrml
input=none
output=filesystem
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index a808da9e..a1df0d6a 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -305,7 +305,7 @@ void MrmlPart::contactServer( const KURL& url )
{
m_job = transferJob( url );
- m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_initialize() );
+ m_job->addMetaData( MrmlShared::tdeio_task(), MrmlShared::tdeio_initialize() );
TQString host = url.host().isEmpty() ?
TQString::fromLatin1("localhost") : url.host();
@@ -690,7 +690,7 @@ void MrmlPart::performQuery( TQDomDocument& doc )
m_job = transferJob( url() );
slotSetStatusBar( randomSearch ? i18n("Random search...") :
i18n("Searching...") );
- m_job->addMetaData( MrmlShared::kio_task(), MrmlShared::kio_startQuery() );
+ m_job->addMetaData( MrmlShared::tdeio_task(), MrmlShared::tdeio_startQuery() );
tqDebug("\n\nSending XML:\n%s", doc.toString().latin1());
m_job->addMetaData( MrmlShared::mrml_data(), doc.toString() );
}
diff --git a/kmrml/kmrml/mrmlsearch.cpp b/kmrml/kmrml/mrmlsearch.cpp
index 9a06f309..13efb411 100644
--- a/kmrml/kmrml/mrmlsearch.cpp
+++ b/kmrml/kmrml/mrmlsearch.cpp
@@ -55,7 +55,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
query.append( path );
}
- TDEInstance instance( "kio_mrml" );
+ TDEInstance instance( "tdeio_mrml" );
KMrml::Config config( instance.config() );
KMrml::ServerSettings settings = config.defaultSettings();
diff --git a/kooka/scanpackager.h b/kooka/scanpackager.h
index 4e1cee38..0fcabb38 100644
--- a/kooka/scanpackager.h
+++ b/kooka/scanpackager.h
@@ -58,16 +58,16 @@ class JobDescription
{
public:
enum JobType { NoJob, ImportJob, RenameJob, ExportJob };
- JobDescription():jobType( NoJob ), kioJob(0L), pitem(0L) {}
- JobDescription( TDEIO::Job* kiojob, KFileTreeViewItem *new_item, JobType type ) :
- jobType(type), kioJob(kiojob), pitem(new_item) {}
+ JobDescription():jobType( NoJob ), tdeioJob(0L), pitem(0L) {}
+ JobDescription( TDEIO::Job* tdeiojob, KFileTreeViewItem *new_item, JobType type ) :
+ jobType(type), tdeioJob(tdeiojob), pitem(new_item) {}
JobType type( void ) { return( jobType ); }
KFileTreeViewItem *item( void ) { return( pitem ); }
- TDEIO::Job* job( void ){ return( kioJob ); }
+ TDEIO::Job* job( void ){ return( tdeioJob ); }
private:
JobType jobType;
- TDEIO::Job* kioJob;
+ TDEIO::Job* tdeioJob;
KFileTreeViewItem* pitem;
};
diff --git a/kpovmodeler/kdoc.rules b/kpovmodeler/kdoc.rules
index 87e9cc96..d6497aa3 100644
--- a/kpovmodeler/kdoc.rules
+++ b/kpovmodeler/kdoc.rules
@@ -6,5 +6,5 @@
kde_MODULES = kpovmodeler
kpovmodeler_FILES = *.h
-kpovmodeler_LIBS = -ltdeui -ltdeparts -ltdecore -ldcop -ltdefile -lkio -lqt -p
-kpovmodeler_PATH = . \ No newline at end of file
+kpovmodeler_LIBS = -ltdeui -ltdeparts -ltdecore -ldcop -ltdefile -ltdeio -lqt -p
+kpovmodeler_PATH = .
diff --git a/kuickshow/TODO b/kuickshow/TODO
index 0f75ec1c..a70a62b8 100644
--- a/kuickshow/TODO
+++ b/kuickshow/TODO
@@ -14,7 +14,7 @@ toolbar in imageviewer
- rename/delete into popupmenu of imagewindow
- if image not readable -> no nagscreen, jump to next image
-- network transparency with kio
+- network transparency with tdeio
- small preview in browser window
- bookmarks?
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-12 23:13:48 +0000