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 +++---- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'languages/cpp') 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) -- cgit v1.2.1