diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 15:36:38 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 15:36:38 -0600 |
commit | 353ee75c29c4f6fb5ba22de5e2d1418cb9506ace (patch) | |
tree | 7fc7809a5521596c075e8c0e9369d4c270c73f1d /kmrml/kmrml | |
parent | 4cdb763932d3379a368cea2b8d60baadbf5c4b44 (diff) | |
download | tdegraphics-353ee75c29c4f6fb5ba22de5e2d1418cb9506ace.tar.gz tdegraphics-353ee75c29c4f6fb5ba22de5e2d1418cb9506ace.zip |
Rename kioslaves
Diffstat (limited to 'kmrml/kmrml')
-rw-r--r-- | kmrml/kmrml/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kmrml/kmrml/Makefile.am | 8 | ||||
-rw-r--r-- | kmrml/kmrml/lib/kmrml_config.cpp | 2 | ||||
-rw-r--r-- | kmrml/kmrml/lib/kmrml_config.h | 2 | ||||
-rw-r--r-- | kmrml/kmrml/lib/mrml_shared.cpp | 24 | ||||
-rw-r--r-- | kmrml/kmrml/lib/mrml_shared.h | 16 | ||||
-rw-r--r-- | kmrml/kmrml/lib/mrml_utils.cpp | 4 | ||||
-rw-r--r-- | kmrml/kmrml/mrml.cpp | 12 | ||||
-rw-r--r-- | kmrml/kmrml/mrml.protocol | 2 | ||||
-rw-r--r-- | kmrml/kmrml/mrml_part.cpp | 4 | ||||
-rw-r--r-- | kmrml/kmrml/mrmlsearch.cpp | 2 |
11 files changed, 40 insertions, 40 deletions
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(); |