From 087cd36e84399cf9220537fbc7a0102439316211 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 15:49:03 -0600 Subject: Rename kioslaves --- atlantik/ChangeLog | 6 +-- atlantik/Makefile.am | 2 +- atlantik/kio_atlantik/Makefile.am | 15 ------- atlantik/kio_atlantik/atlantik.protocol | 7 --- atlantik/kio_atlantik/kio_atlantik.cpp | 70 ------------------------------ atlantik/kio_atlantik/kio_atlantik.h | 22 ---------- atlantik/tdeio_atlantik/Makefile.am | 15 +++++++ atlantik/tdeio_atlantik/atlantik.protocol | 7 +++ atlantik/tdeio_atlantik/tdeio_atlantik.cpp | 70 ++++++++++++++++++++++++++++++ atlantik/tdeio_atlantik/tdeio_atlantik.h | 22 ++++++++++ cmake | 2 +- knetwalk/src/SConscript | 2 +- 12 files changed, 120 insertions(+), 120 deletions(-) delete mode 100644 atlantik/kio_atlantik/Makefile.am delete mode 100644 atlantik/kio_atlantik/atlantik.protocol delete mode 100644 atlantik/kio_atlantik/kio_atlantik.cpp delete mode 100644 atlantik/kio_atlantik/kio_atlantik.h create mode 100644 atlantik/tdeio_atlantik/Makefile.am create mode 100644 atlantik/tdeio_atlantik/atlantik.protocol create mode 100644 atlantik/tdeio_atlantik/tdeio_atlantik.cpp create mode 100644 atlantik/tdeio_atlantik/tdeio_atlantik.h diff --git a/atlantik/ChangeLog b/atlantik/ChangeLog index a6b10b98..b16274aa 100644 --- a/atlantik/ChangeLog +++ b/atlantik/ChangeLog @@ -8,7 +8,7 @@ 0.7.2 (KDE 3.3.2) ----- -- Proper use of host and port in kio_atlantik: fixes problems with +- Proper use of host and port in tdeio_atlantik: fixes problems with invitations sent by newer clients. - bugfix: scroll player views when they get too big. (#69043) - bugfix: show correct amount of players in trade widget. @@ -106,7 +106,7 @@ - fixed potential double initialization of gameboard - don't crash when removing money from a trade -- properly quote arguments given to TDEProcess in kio_atlantik +- properly quote arguments given to TDEProcess in tdeio_atlantik - valgrind leak and unitialised memory access fixes 0.5.0 @@ -125,7 +125,7 @@ - fix buttons, they have specific targets, not just the current widget - delete buttons in EstateDetails::newUpdate() - commandline parameters host, port and game supported (for auto-join) -- kio_atlantik allows for easy connecting from other applications +- tdeio_atlantik allows for easy connecting from other applications (kopete/kmail) - leave game and leave server options - pre-game configuration diff --git a/atlantik/Makefile.am b/atlantik/Makefile.am index d4389577..08d83768 100644 --- a/atlantik/Makefile.am +++ b/atlantik/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = libatlantic libatlantikclient libatlantikui client \ - kio_atlantik pics themes + tdeio_atlantik pics themes EXTRA_DIST = atlantik.desktop diff --git a/atlantik/kio_atlantik/Makefile.am b/atlantik/kio_atlantik/Makefile.am deleted file mode 100644 index 39579cd8..00000000 --- a/atlantik/kio_atlantik/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes) -METASOURCES = AUTO - -kde_module_LTLIBRARIES = kio_atlantik.la - -kio_atlantik_la_SOURCES = kio_atlantik.cpp -kio_atlantik_la_LIBADD = $(LIB_KIO) -kio_atlantik_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -noinst_HEADERS = kio_atlantik.h - -kdelnk_DATA = atlantik.protocol -kdelnkdir = $(kde_servicesdir) - -messages: - $(XGETTEXT) *.cpp -o $(podir)/tdeio_atlantik.pot diff --git a/atlantik/kio_atlantik/atlantik.protocol b/atlantik/kio_atlantik/atlantik.protocol deleted file mode 100644 index 6839c736..00000000 --- a/atlantik/kio_atlantik/atlantik.protocol +++ /dev/null @@ -1,7 +0,0 @@ -[Protocol] -exec=kio_atlantik -protocol=atlantik -input=none -output=none -reading=true -Icon=atlantik diff --git a/atlantik/kio_atlantik/kio_atlantik.cpp b/atlantik/kio_atlantik/kio_atlantik.cpp deleted file mode 100644 index 4305867b..00000000 --- a/atlantik/kio_atlantik/kio_atlantik.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) 2002-2004 Rob Kaper -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// version 2 as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; see the file COPYING. If not, write to -// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -// Boston, MA 02110-1301, USA. - -#include - -#include - -#include -#undef KDE_3_1_FEATURES -#ifdef TDE_MAKE_VERSION -#if TDE_VERSION > TDE_MAKE_VERSION (3, 1, 0) -#define KDE_3_1_FEATURES -#endif -#endif -#include -#include -#include - -#include "kio_atlantik.h" -#include "libatlantic_export.h" - -extern "C" -{ - int LIBATLANTIC_EXPORT kdemain( int, char **argv ) - { - TDEInstance instance( "kio_atlantik" ); - AtlantikProtocol slave(argv[2], argv[3]); - slave.dispatchLoop(); - return 0; - } -} - -void AtlantikProtocol::get( const KURL& url ) -{ - TDEProcess *proc = new TDEProcess; - *proc << "atlantik"; - -#ifdef KDE_3_1_FEATURES - TQString host = url.hasHost() ? url.host() : TDEProcess::quote( url.queryItem("host") ); -#else - TQString host = url.hasHost() ? url.host() : url.queryItem("host"); -#endif - TQString port = TQString::number( url.port() ? url.port() : 1234 ); - int game = url.queryItem("game").toInt(); - TQString gameString = game ? TQString::number( game ) : TQString(); - - if (!host.isNull() && !port.isNull()) - { - *proc << "--host" << host << "--port" << port; - if (!gameString.isNull()) - *proc << "--game" << gameString; - } - - proc->start(TDEProcess::DontCare); - proc->detach(); - finished(); -} diff --git a/atlantik/kio_atlantik/kio_atlantik.h b/atlantik/kio_atlantik/kio_atlantik.h deleted file mode 100644 index 8c109ec2..00000000 --- a/atlantik/kio_atlantik/kio_atlantik.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 2002-2003 Rob Kaper -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// version 2 as published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; see the file COPYING. If not, write to -// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -// Boston, MA 02110-1301, USA. - -class AtlantikProtocol : public TDEIO::SlaveBase -{ -public: - AtlantikProtocol( const TQCString &pool, const TQCString &app) : SlaveBase( "atlantik", pool, app ) {} - virtual void get( const KURL& url ); -}; diff --git a/atlantik/tdeio_atlantik/Makefile.am b/atlantik/tdeio_atlantik/Makefile.am new file mode 100644 index 00000000..71939856 --- /dev/null +++ b/atlantik/tdeio_atlantik/Makefile.am @@ -0,0 +1,15 @@ +INCLUDES = -I$(top_srcdir)/atlantik/libatlantic $(all_includes) +METASOURCES = AUTO + +kde_module_LTLIBRARIES = tdeio_atlantik.la + +tdeio_atlantik_la_SOURCES = tdeio_atlantik.cpp +tdeio_atlantik_la_LIBADD = $(LIB_KIO) +tdeio_atlantik_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +noinst_HEADERS = tdeio_atlantik.h + +kdelnk_DATA = atlantik.protocol +kdelnkdir = $(kde_servicesdir) + +messages: + $(XGETTEXT) *.cpp -o $(podir)/tdeio_atlantik.pot diff --git a/atlantik/tdeio_atlantik/atlantik.protocol b/atlantik/tdeio_atlantik/atlantik.protocol new file mode 100644 index 00000000..d9d95fd5 --- /dev/null +++ b/atlantik/tdeio_atlantik/atlantik.protocol @@ -0,0 +1,7 @@ +[Protocol] +exec=tdeio_atlantik +protocol=atlantik +input=none +output=none +reading=true +Icon=atlantik diff --git a/atlantik/tdeio_atlantik/tdeio_atlantik.cpp b/atlantik/tdeio_atlantik/tdeio_atlantik.cpp new file mode 100644 index 00000000..9eb106f1 --- /dev/null +++ b/atlantik/tdeio_atlantik/tdeio_atlantik.cpp @@ -0,0 +1,70 @@ +// Copyright (c) 2002-2004 Rob Kaper +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// version 2 as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; see the file COPYING. If not, write to +// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +// Boston, MA 02110-1301, USA. + +#include + +#include + +#include +#undef KDE_3_1_FEATURES +#ifdef TDE_MAKE_VERSION +#if TDE_VERSION > TDE_MAKE_VERSION (3, 1, 0) +#define KDE_3_1_FEATURES +#endif +#endif +#include +#include +#include + +#include "tdeio_atlantik.h" +#include "libatlantic_export.h" + +extern "C" +{ + int LIBATLANTIC_EXPORT kdemain( int, char **argv ) + { + TDEInstance instance( "tdeio_atlantik" ); + AtlantikProtocol slave(argv[2], argv[3]); + slave.dispatchLoop(); + return 0; + } +} + +void AtlantikProtocol::get( const KURL& url ) +{ + TDEProcess *proc = new TDEProcess; + *proc << "atlantik"; + +#ifdef KDE_3_1_FEATURES + TQString host = url.hasHost() ? url.host() : TDEProcess::quote( url.queryItem("host") ); +#else + TQString host = url.hasHost() ? url.host() : url.queryItem("host"); +#endif + TQString port = TQString::number( url.port() ? url.port() : 1234 ); + int game = url.queryItem("game").toInt(); + TQString gameString = game ? TQString::number( game ) : TQString(); + + if (!host.isNull() && !port.isNull()) + { + *proc << "--host" << host << "--port" << port; + if (!gameString.isNull()) + *proc << "--game" << gameString; + } + + proc->start(TDEProcess::DontCare); + proc->detach(); + finished(); +} diff --git a/atlantik/tdeio_atlantik/tdeio_atlantik.h b/atlantik/tdeio_atlantik/tdeio_atlantik.h new file mode 100644 index 00000000..8c109ec2 --- /dev/null +++ b/atlantik/tdeio_atlantik/tdeio_atlantik.h @@ -0,0 +1,22 @@ +// Copyright (c) 2002-2003 Rob Kaper +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// version 2 as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; see the file COPYING. If not, write to +// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +// Boston, MA 02110-1301, USA. + +class AtlantikProtocol : public TDEIO::SlaveBase +{ +public: + AtlantikProtocol( const TQCString &pool, const TQCString &app) : SlaveBase( "atlantik", pool, app ) {} + virtual void get( const KURL& url ); +}; diff --git a/cmake b/cmake index 9a217903..274366fb 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/knetwalk/src/SConscript b/knetwalk/src/SConscript index a71252a5..58d61214 100644 --- a/knetwalk/src/SConscript +++ b/knetwalk/src/SConscript @@ -6,7 +6,7 @@ knetwalk_sources = [ ] myenv.KDEprogram( "knetwalk", knetwalk_sources) myenv.KDEaddpaths_includes( ['./', '#./']) -myenv.KDEaddlibs( ['qt-mt', 'kio', 'tdecore', 'tdegames']) +myenv.KDEaddlibs( ['qt-mt', 'tdeio', 'tdecore', 'tdegames']) myenv.KDEinstall('KDEDATA', 'knetwalk', 'knetwalkui.rc') myenv.KDEinstall('KDEDATA', 'knetwalk', 'eventsrc') myenv.KDEinstall('KDEXDG', '', 'knetwalk.desktop') -- cgit v1.2.1