From 595a6e60c6aafad9006327dbeb822b608e7f9b33 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 18:03:26 -0600 Subject: Rename kioslaves --- .../cpp/app_templates/kscons_kxt/SConscript-src | 2 +- .../cpp/app_templates/kscons_tdemdi/SConscript-src | 4 ++-- languages/cpp/app_templates/tdeioslave/slave.cpp | 28 +++++++++++----------- languages/cpp/app_templates/tdeioslave/slave.h | 6 ++--- .../cpp/app_templates/tdeioslave/slave.protocol | 2 +- .../cpp/app_templates/tdeioslave/src-Makefile.am | 8 +++---- languages/csharp/CMakeLists.txt | 4 ++-- languages/csharp/Makefile.am | 8 +++---- languages/csharp/csharpdoc.cpp | 4 ++-- languages/csharp/csharpdoc.protocol | 2 +- languages/lib/debugger/Makefile.am | 2 +- languages/lib/designer_integration/Makefile.am | 2 +- languages/lib/interfaces/Makefile.am | 2 +- languages/perl/CMakeLists.txt | 4 ++-- languages/perl/Makefile.am | 8 +++---- languages/perl/perldoc.cpp | 4 ++-- languages/perl/perldoc.protocol | 2 +- languages/python/CMakeLists.txt | 4 ++-- languages/python/Makefile.am | 8 +++---- languages/python/pydoc.cpp | 6 ++--- languages/python/pydoc.protocol | 2 +- 21 files changed, 56 insertions(+), 56 deletions(-) (limited to 'languages') diff --git a/languages/cpp/app_templates/kscons_kxt/SConscript-src b/languages/cpp/app_templates/kscons_kxt/SConscript-src index a60cb116..173b458f 100644 --- a/languages/cpp/app_templates/kscons_kxt/SConscript-src +++ b/languages/cpp/app_templates/kscons_kxt/SConscript-src @@ -37,7 +37,7 @@ myenv.TDEprogram( "%{APPNAMELC}", %{APPNAMELC}_sources ) myenv.TDEaddpaths_includes( "./ ../" ) ## Necessary libraries to link against -myenv.TDEaddlibs( "qt-mt kio tdecore tdeprint" ) +myenv.TDEaddlibs( "tqt-mt tqtinterface tdeio tdecore tdeprint" ) ## This shows how to add other link flags to the program # myenv.TDEaddflags_link('-export-dynamic') diff --git a/languages/cpp/app_templates/kscons_tdemdi/SConscript-src b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src index 97f5140c..26fa3265 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/SConscript-src +++ b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src @@ -22,7 +22,7 @@ prefs.ui # Now that we have our list of sources we can build the program myenv.TDEprogram( '%{APPNAMELC}', %{APPNAMELC}_sources ) # main program myenv.TDEaddpaths_includes( './ ../' ) # additional paths -myenv.TDEaddlibs( 'qt-mt tdecore kio tdeparts tdemdi' ) # additional libraries +myenv.TDEaddlibs( 'tqt-mt tqtinterface tdecore tdeio tdeparts tdemdi' ) # additional libraries ## Next, the kpart library ## using TDEshlib, the .so and .la are installed automatically when needed @@ -31,7 +31,7 @@ myenv2=env.Copy() %{APPNAMELC}part_sources = '%{APPNAMELC}_part.cpp' myenv2.TDEshlib( 'lib%{APPNAMELC}part', %{APPNAMELC}part_sources) myenv2.TDEaddpaths_includes( './ #/' ) # the '#' means the top-level directory -myenv2.TDEaddlibs( 'qt-mt kio tdecore tdeprint tdeparts' ) +myenv2.TDEaddlibs( 'tqt-mt tqtinterface tdeio tdecore tdeprint tdeparts' ) # myenv2.TDEaddflags_link( '-DQT_THREAD_SUPPORT' ) ############################# diff --git a/languages/cpp/app_templates/tdeioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp index 3c780e7f..683d959e 100644 --- a/languages/cpp/app_templates/tdeioslave/slave.cpp +++ b/languages/cpp/app_templates/tdeioslave/slave.cpp @@ -26,22 +26,22 @@ using namespace TDEIO; -kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket) - : SlaveBase("kio_%{APPNAMELC}", pool_socket, app_socket) +tdeio_%{APPNAMELC}Protocol::tdeio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket) + : SlaveBase("tdeio_%{APPNAMELC}", pool_socket, app_socket) { - kdDebug() << "kio_%{APPNAMELC}Protocol::kio_%{APPNAMELC}Protocol()" << endl; + kdDebug() << "tdeio_%{APPNAMELC}Protocol::tdeio_%{APPNAMELC}Protocol()" << endl; } -kio_%{APPNAMELC}Protocol::~kio_%{APPNAMELC}Protocol() +tdeio_%{APPNAMELC}Protocol::~tdeio_%{APPNAMELC}Protocol() { - kdDebug() << "kio_%{APPNAMELC}Protocol::~kio_%{APPNAMELC}Protocol()" << endl; + kdDebug() << "tdeio_%{APPNAMELC}Protocol::~tdeio_%{APPNAMELC}Protocol()" << endl; } -void kio_%{APPNAMELC}Protocol::get(const KURL& url ) +void tdeio_%{APPNAMELC}Protocol::get(const KURL& url ) { - kdDebug() << "kio_%{APPNAMELC}::get(const KURL& url)" << endl ; + kdDebug() << "tdeio_%{APPNAMELC}::get(const KURL& url)" << endl ; kdDebug() << "Seconds: " << url.query() << endl; TQString remoteServer = url.host(); @@ -52,14 +52,14 @@ void kio_%{APPNAMELC}Protocol::get(const KURL& url ) // Send the mimeType as soon as it is known mimeType("text/plain"); // Send the data - TQString theData = "This is a test of kio_%{APPNAMELC}"; + TQString theData = "This is a test of tdeio_%{APPNAMELC}"; data(TQCString(theData.local8Bit())); data(TQByteArray()); // empty array means we're done sending the data finished(); } -void kio_%{APPNAMELC}Protocol::mimetype(const KURL & /*url*/) +void tdeio_%{APPNAMELC}Protocol::mimetype(const KURL & /*url*/) { mimeType("text/plain"); finished(); @@ -70,19 +70,19 @@ extern "C" { int kdemain(int argc, char **argv) { - TDEInstance instance( "kio_%{APPNAMELC}" ); + TDEInstance instance( "tdeio_%{APPNAMELC}" ); - kdDebug(7101) << "*** Starting kio_%{APPNAMELC} " << endl; + kdDebug(7101) << "*** Starting tdeio_%{APPNAMELC} " << endl; if (argc != 4) { - kdDebug(7101) << "Usage: kio_%{APPNAMELC} protocol domain-socket1 domain-socket2" << endl; + kdDebug(7101) << "Usage: tdeio_%{APPNAMELC} protocol domain-socket1 domain-socket2" << endl; exit(-1); } - kio_%{APPNAMELC}Protocol slave(argv[2], argv[3]); + tdeio_%{APPNAMELC}Protocol slave(argv[2], argv[3]); slave.dispatchLoop(); - kdDebug(7101) << "*** kio_%{APPNAMELC} Done" << endl; + kdDebug(7101) << "*** tdeio_%{APPNAMELC} Done" << endl; return 0; } } diff --git a/languages/cpp/app_templates/tdeioslave/slave.h b/languages/cpp/app_templates/tdeioslave/slave.h index 672e6121..a77090cc 100644 --- a/languages/cpp/app_templates/tdeioslave/slave.h +++ b/languages/cpp/app_templates/tdeioslave/slave.h @@ -11,11 +11,11 @@ class TQCString; -class kio_%{APPNAMELC}Protocol : public TDEIO::SlaveBase +class tdeio_%{APPNAMELC}Protocol : public TDEIO::SlaveBase { public: - kio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket); - virtual ~kio_%{APPNAMELC}Protocol(); + tdeio_%{APPNAMELC}Protocol(const TQCString &pool_socket, const TQCString &app_socket); + virtual ~tdeio_%{APPNAMELC}Protocol(); virtual void mimetype(const KURL& url); virtual void get(const KURL& url); }; diff --git a/languages/cpp/app_templates/tdeioslave/slave.protocol b/languages/cpp/app_templates/tdeioslave/slave.protocol index 5a1f6445..c9347839 100644 --- a/languages/cpp/app_templates/tdeioslave/slave.protocol +++ b/languages/cpp/app_templates/tdeioslave/slave.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_%{APPNAMELC} +exec=tdeio_%{APPNAMELC} protocol=%{APPNAMELC} input=none output=stream diff --git a/languages/cpp/app_templates/tdeioslave/src-Makefile.am b/languages/cpp/app_templates/tdeioslave/src-Makefile.am index b160d973..c7ed36ea 100644 --- a/languages/cpp/app_templates/tdeioslave/src-Makefile.am +++ b/languages/cpp/app_templates/tdeioslave/src-Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kio_%{APPNAMELC}.la +kde_module_LTLIBRARIES = tdeio_%{APPNAMELC}.la -kio_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp -kio_%{APPNAMELC}_la_LIBADD = -lkio -kio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) +tdeio_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp +tdeio_%{APPNAMELC}_la_LIBADD = -ltdeio +tdeio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) protocol_DATA = %{APPNAMELC}.protocol protocoldir = $(kde_servicesdir) diff --git a/languages/csharp/CMakeLists.txt b/languages/csharp/CMakeLists.txt index 362a22fe..5e148431 100644 --- a/languages/csharp/CMakeLists.txt +++ b/languages/csharp/CMakeLists.txt @@ -50,9 +50,9 @@ tde_add_kpart( libkdevcsharpsupport AUTOMOC ) -##### kio_csharpdoc (module) #################### +##### tdeio_csharpdoc (module) #################### -tde_add_kpart( kio_csharpdoc AUTOMOC +tde_add_kpart( tdeio_csharpdoc AUTOMOC SOURCES csharpdoc.cpp LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/csharp/Makefile.am b/languages/csharp/Makefile.am index 9524ed00..d04f1481 100644 --- a/languages/csharp/Makefile.am +++ b/languages/csharp/Makefile.am @@ -6,15 +6,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libkdevcsharpsupport.la kio_csharpdoc.la +kde_module_LTLIBRARIES = libkdevcsharpsupport.la tdeio_csharpdoc.la libkdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la libkdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui -kio_csharpdoc_la_SOURCES = csharpdoc.cpp -kio_csharpdoc_la_LIBADD = $(LIB_KIO) -kio_csharpdoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeio_csharpdoc_la_SOURCES = csharpdoc.cpp +tdeio_csharpdoc_la_LIBADD = $(LIB_KIO) +tdeio_csharpdoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/languages/csharp/csharpdoc.cpp b/languages/csharp/csharpdoc.cpp index 1657d268..d9d2e548 100644 --- a/languages/csharp/csharpdoc.cpp +++ b/languages/csharp/csharpdoc.cpp @@ -116,11 +116,11 @@ extern "C" { int kdemain(int argc, char **argv) { - TDEInstance instance( "kio_csharpdoc" ); + TDEInstance instance( "tdeio_csharpdoc" ); TDEGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { - fprintf(stderr, "Usage: kio_csharpdoc protocol domain-socket1 domain-socket2\n"); + fprintf(stderr, "Usage: tdeio_csharpdoc protocol domain-socket1 domain-socket2\n"); exit(-1); } diff --git a/languages/csharp/csharpdoc.protocol b/languages/csharp/csharpdoc.protocol index 9b813b02..337316f1 100644 --- a/languages/csharp/csharpdoc.protocol +++ b/languages/csharp/csharpdoc.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_csharpdoc +exec=tdeio_csharpdoc protocol=csharpdoc input=none output=filesystem diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am index 1a6b7d2e..326f9805 100644 --- a/languages/lib/debugger/Makefile.am +++ b/languages/lib/debugger/Makefile.am @@ -7,7 +7,7 @@ liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp langincludedirdir = $(includedir)/tdevelop/languages/debugger langincludedir_HEADERS = debugger.h kdevdebugger.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil DOXYGEN_PROJECTNAME = KDevelop Debugger Support Library DOXYGEN_DOCDIRPREFIX = kdevlang include ../../../Doxyfile.am diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am index 250b8be6..6e9680a9 100644 --- a/languages/lib/designer_integration/Makefile.am +++ b/languages/lib/designer_integration/Makefile.am @@ -11,6 +11,6 @@ libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \ langincludedirdir = $(includedir)/tdevelop/languages/designer_integration langincludedir_HEADERS = qtdesignerintegration.h implementationwidget.h implementationwidgetbase.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil DOXYGEN_PROJECTNAME = KDevelop Designer Integration Support Library include ../../../Doxyfile.am diff --git a/languages/lib/interfaces/Makefile.am b/languages/lib/interfaces/Makefile.am index 3edd1097..c3ed3d00 100644 --- a/languages/lib/interfaces/Makefile.am +++ b/languages/lib/interfaces/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = $(all_includes) servicetypedir = $(kde_servicetypesdir) servicetype_DATA = tdeveloppcsimporter.desktop -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil DOXYGEN_PROJECTNAME = KDevelop Language Support Interfaces Library DOXYGEN_DOCDIRPREFIX = kdevlang include ../../../Doxyfile.am diff --git a/languages/perl/CMakeLists.txt b/languages/perl/CMakeLists.txt index f67ec9c0..e458c240 100644 --- a/languages/perl/CMakeLists.txt +++ b/languages/perl/CMakeLists.txt @@ -45,9 +45,9 @@ tde_add_kpart( libkdevperlsupport AUTOMOC ) -##### kio_perldoc (module) ###################### +##### tdeio_perldoc (module) ###################### -tde_add_kpart( kio_perldoc +tde_add_kpart( tdeio_perldoc SOURCES perldoc.cpp LINK tdeio-shared diff --git a/languages/perl/Makefile.am b/languages/perl/Makefile.am index c0fa3598..bf8f9388 100644 --- a/languages/perl/Makefile.am +++ b/languages/perl/Makefile.am @@ -6,15 +6,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libkdevperlsupport.la kio_perldoc.la +kde_module_LTLIBRARIES = libkdevperlsupport.la tdeio_perldoc.la libkdevperlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkdevperlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la libkdevperlsupport_la_SOURCES = perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui -kio_perldoc_la_SOURCES = perldoc.cpp -kio_perldoc_la_LIBADD = $(LIB_KIO) -kio_perldoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeio_perldoc_la_SOURCES = perldoc.cpp +tdeio_perldoc_la_LIBADD = $(LIB_KIO) +tdeio_perldoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/languages/perl/perldoc.cpp b/languages/perl/perldoc.cpp index dee9b6d0..85aee7b3 100644 --- a/languages/perl/perldoc.cpp +++ b/languages/perl/perldoc.cpp @@ -116,11 +116,11 @@ extern "C" { int kdemain(int argc, char **argv) { - TDEInstance instance( "kio_perldoc" ); + TDEInstance instance( "tdeio_perldoc" ); TDEGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { - fprintf(stderr, "Usage: kio_perldoc protocol domain-socket1 domain-socket2\n"); + fprintf(stderr, "Usage: tdeio_perldoc protocol domain-socket1 domain-socket2\n"); exit(-1); } diff --git a/languages/perl/perldoc.protocol b/languages/perl/perldoc.protocol index 031ca931..9da10d69 100644 --- a/languages/perl/perldoc.protocol +++ b/languages/perl/perldoc.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_perldoc +exec=tdeio_perldoc protocol=perldoc input=none output=filesystem diff --git a/languages/python/CMakeLists.txt b/languages/python/CMakeLists.txt index 93ba69c2..989ea1b1 100644 --- a/languages/python/CMakeLists.txt +++ b/languages/python/CMakeLists.txt @@ -49,9 +49,9 @@ tde_add_kpart( libkdevpythonsupport AUTOMOC ) -##### kio_pydoc (module) ######################## +##### tdeio_pydoc (module) ######################## -tde_add_kpart( kio_pydoc +tde_add_kpart( tdeio_pydoc SOURCES pydoc.cpp LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/python/Makefile.am b/languages/python/Makefile.am index 3474eceb..4b8da707 100644 --- a/languages/python/Makefile.am +++ b/languages/python/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/languages/lib/designer SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libkdevpythonsupport.la kio_pydoc.la +kde_module_LTLIBRARIES = libkdevpythonsupport.la tdeio_pydoc.la libkdevpythonsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) libkdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ @@ -15,9 +15,9 @@ libkdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ libkdevpythonsupport_la_SOURCES = pythonsupportpart.cpp pythonconfigwidget.cpp pythonconfigwidgetbase.ui \ pythonimplementationwidget.cpp qtdesignerpythonintegration.cpp -kio_pydoc_la_SOURCES = pydoc.cpp -kio_pydoc_la_LIBADD = $(LIB_KIO) -kio_pydoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +tdeio_pydoc_la_SOURCES = pydoc.cpp +tdeio_pydoc_la_LIBADD = $(LIB_KIO) +tdeio_pydoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index 760728c7..c021b368 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -20,7 +20,7 @@ PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app) : SlaveBase("pydoc", pool, app), key() { python = TDEGlobal::dirs()->findExe("python"); - script = locate("data", "kio_pydoc/kde_pydoc.py"); + script = locate("data", "tdeio_pydoc/kde_pydoc.py"); } @@ -96,11 +96,11 @@ extern "C" { int kdemain(int argc, char **argv) { - TDEInstance instance( "kio_pydoc" ); + TDEInstance instance( "tdeio_pydoc" ); TDEGlobal::locale()->setMainCatalogue("tdevelop"); if (argc != 4) { - fprintf(stderr, "Usage: kio_pydoc protocol domain-socket1 domain-socket2\n"); + fprintf(stderr, "Usage: tdeio_pydoc protocol domain-socket1 domain-socket2\n"); exit(-1); } diff --git a/languages/python/pydoc.protocol b/languages/python/pydoc.protocol index 4801357f..10e04d7d 100644 --- a/languages/python/pydoc.protocol +++ b/languages/python/pydoc.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_pydoc +exec=tdeio_pydoc protocol=pydoc input=none output=filesystem -- cgit v1.2.1