summaryrefslogtreecommitdiffstats
path: root/dcop
diff options
context:
space:
mode:
Diffstat (limited to 'dcop')
-rw-r--r--dcop/HOWTO28
-rw-r--r--dcop/Mainpage.dox16
-rw-r--r--dcop/Makefile.am6
-rw-r--r--dcop/client/dcopfind.cpp6
-rw-r--r--dcop/client/dcopstart.cpp2
-rw-r--r--dcop/dcop_deadlock_test.cpp4
-rw-r--r--dcop/dcop_deadlock_test.h2
-rw-r--r--dcop/dcopclient.h10
-rw-r--r--dcop/dcopidl/dcopidl_test.h4
-rw-r--r--dcop/dcopidl2cpp/dcopidl_test.h2
-rw-r--r--dcop/dcopidlng/kalyptus2
-rw-r--r--dcop/testdcop.cpp4
-rw-r--r--dcop/tests/driver.cpp8
-rw-r--r--dcop/tests/test.cpp8
14 files changed, 51 insertions, 51 deletions
diff --git a/dcop/HOWTO b/dcop/HOWTO
index 071136a4f..4c98b6df2 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -74,18 +74,18 @@ compiler later.
Establishing the Connection:
----------------------------
-KApplication has gained a method called "KApplication::dcopClient()"
+TDEApplication has gained a method called "TDEApplication::dcopClient()"
which returns a pointer to a DCOPClient instance. The first time this
method is called, the client class will be created. DCOPClients have
unique identifiers attached to them which are based on what
-KApplication::name() returns. In fact, if there is only a single
+TDEApplication::name() returns. In fact, if there is only a single
instance of the program running, the appId will be equal to
-KApplication::name().
+TDEApplication::name().
To actually enable DCOP communication to begin, you must use
DCOPClient::attach(). This will attempt to attach to the DCOP server.
If no server is found or there is any other type of error, attach()
-will return false. KApplication will catch a dcop signal and display an
+will return false. TDEApplication will catch a dcop signal and display an
appropriate error message box in that case.
After connecting with the server via DCOPClient::attach(), you need to
@@ -100,7 +100,7 @@ case:
*/
appId = client->registerAs(kApp->name());
-If you never retrieve the DCOPClient pointer from KApplication, the
+If you never retrieve the DCOPClient pointer from TDEApplication, the
object will not be created and thus there will be no memory overhead.
You may also detach from the server by calling DCOPClient::detach().
@@ -309,8 +309,8 @@ in that case the signal connection will always be deleted.
A receiver can create a non-volatile connection while the sender doesn't (yet)
exist. An anonymous DCOP connection should always be non-volatile.
-The following example shows how KLauncher emits a signal whenever it notices
-that an application that was started via KLauncher terminates.
+The following example shows how TDELauncher emits a signal whenever it notices
+that an application that was started via TDELauncher terminates.
QByteArray params;
QDataStream stream(params, IO_WriteOnly);
@@ -319,7 +319,7 @@ that an application that was started via KLauncher terminates.
The task manager of the TDE panel connects to this signal. It uses an
anonymous connection (it doesn't require that the signal is being emitted
-by KLauncher) that is non-volatile:
+by TDELauncher) that is non-volatile:
connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);
@@ -491,13 +491,13 @@ A few back-of-the-napkin tests folks:
Code:
-#include <kapplication.h>
+#include <tdeapplication.h>
int main(int argc, char **argv)
{
- KApplication *app;
+ TDEApplication *app;
- app = new KApplication(argc, argv, "testit");
+ app = new TDEApplication(argc, argv, "testit");
return app->exec();
}
@@ -515,7 +515,7 @@ VmStk: 20 kB
VmExe: 4 kB
VmLib: 6588 kB
-If I create the KApplication's DCOPClient, and call attach() and
+If I create the TDEApplication's DCOPClient, and call attach() and
registerAs(), it changes to this:
VmSize: 8080 kB
@@ -531,8 +531,8 @@ resident, but no more data or stack. So this will be shared between all
processes, right? 100k to enable DCOP in all apps doesn't seem bad at
all. :)
-OK now for some timings. Just creating a KApplication and then exiting
-(i.e. removing the call to KApplication::exec) takes this much time:
+OK now for some timings. Just creating a TDEApplication and then exiting
+(i.e. removing the call to TDEApplication::exec) takes this much time:
0.28user 0.02system 0:00.32elapsed 92%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (1084major+62minor)pagefaults 0swaps
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index a92fb4e50..62fd3cf44 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -38,18 +38,18 @@ The manual method is covered first, followed by the automatic IDL method.
\section establish Establishing the Connection:
-KApplication has gained a method called \p KApplication::dcopClient()
+TDEApplication has gained a method called \p TDEApplication::dcopClient()
which returns a pointer to a DCOPClient instance. The first time this
method is called, the client class will be created. DCOPClients have
unique identifiers attached to them which are based on what
-KApplication::name() returns. In fact, if there is only a single
+TDEApplication::name() returns. In fact, if there is only a single
instance of the program running, the appId will be equal to
-KApplication::name().
+TDEApplication::name().
To actually enable DCOP communication to begin, you must use
\p DCOPClient::attach(). This will attempt to attach to the DCOP server.
If no server is found or there is any other type of error,
-DCOPClient::attach() will return false. KApplication will catch a dcop
+DCOPClient::attach() will return false. TDEApplication will catch a dcop
signal and display an appropriate error message box in that case.
After connecting with the server via DCOPClient::attach(), you need to
@@ -62,7 +62,7 @@ case:
appId = client->registerAs(kapp->name());
\endcode
-If you never retrieve the DCOPClient pointer from KApplication, the
+If you never retrieve the DCOPClient pointer from TDEApplication, the
object will not be created and thus there will be no memory overhead.
You may also detach from the server by calling DCOPClient::detach().
@@ -541,8 +541,8 @@ in that case the signal connection will always be deleted.
A receiver can create a non-volatile connection while the sender doesn't (yet)
exist. An anonymous DCOP connection should always be non-volatile.
-The following example shows how KLauncher emits a signal whenever it notices
-that an application that was started via KLauncher terminates:
+The following example shows how TDELauncher emits a signal whenever it notices
+that an application that was started via TDELauncher terminates:
\code
QByteArray params;
@@ -553,7 +553,7 @@ kapp->dcopClient()->emitDCOPSignal("clientDied(pid_t)", params);
The task manager of the Trinity panel connects to this signal. It uses an
anonymous connection (it doesn't require that the signal is being emitted
-by KLauncher) that is non-volatile:
+by TDELauncher) that is non-volatile:
\code
connectDCOPSignal(0, 0, "clientDied(pid_t)", "clientDied(pid_t)", false);
diff --git a/dcop/Makefile.am b/dcop/Makefile.am
index d59b75cdb..57ce71786 100644
--- a/dcop/Makefile.am
+++ b/dcop/Makefile.am
@@ -50,15 +50,15 @@ dcopserver_la_LIBADD = libDCOP.la $(LIB_QT)
dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
-testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdcop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdcop_SOURCES = testdcop.cpp
testdcop_LDADD = libDCOP.la
-dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+dcop_deadlock_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
dcop_deadlock_test_SOURCES = dcop_deadlock_test.cpp
dcop_deadlock_test_LDADD = ../tdecore/libtdecore.la
-testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testdcopc_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
testdcopc_SOURCES = testdcopc.c dcopc.c
testdcopc_LDADD = KDE-ICE/libkICE.la $(LIBSM)
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index a4bcb67bb..940d62fd6 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -166,16 +166,16 @@ bool launchApp(TQString app)
TQDataStream arg(data, IO_WriteOnly);
arg << app << URLs;
- if ( !dcop->call( "klauncher", "klauncher", "start_service_by_desktop_name(TQString,TQStringList)",
+ if ( !dcop->call( "tdelauncher", "tdelauncher", "start_service_by_desktop_name(TQString,TQStringList)",
data, replyType, replyData) ) {
- tqWarning( "call to klauncher failed.");
+ tqWarning( "call to tdelauncher failed.");
return false;
}
TQDataStream reply(replyData, IO_ReadOnly);
if ( replyType != "serviceResult" )
{
- tqWarning( "unexpected result '%s' from klauncher.", replyType.data());
+ tqWarning( "unexpected result '%s' from tdelauncher.", replyType.data());
return false;
}
int result;
diff --git a/dcop/client/dcopstart.cpp b/dcop/client/dcopstart.cpp
index 737184385..a3ea04726 100644
--- a/dcop/client/dcopstart.cpp
+++ b/dcop/client/dcopstart.cpp
@@ -49,7 +49,7 @@ void startApp(const char *_app, int argc, const char **args)
TQDataStream arg(data, IO_WriteOnly);
arg << app << URLs;
- if ( !dcop->call( "klauncher", "klauncher", function, data, replyType, replyData) ) {
+ if ( !dcop->call( "tdelauncher", "tdelauncher", function, data, replyType, replyData) ) {
tqWarning( "call failed");
exit(1);
} else {
diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp
index 66bd5088a..1ab43f730 100644
--- a/dcop/dcop_deadlock_test.cpp
+++ b/dcop/dcop_deadlock_test.cpp
@@ -71,8 +71,8 @@ tqWarning("%s: Got result '%s' %d:%06d", name(), result.latin1(), tv.tv_sec % 10
int main(int argc, char **argv)
{
- TQCString myName = KApplication::dcopClient()->registerAs("testdcop", false);
- KApplication app(argc, argv, "testdcop");
+ TQCString myName = TDEApplication::dcopClient()->registerAs("testdcop", false);
+ TDEApplication app(argc, argv, "testdcop");
tqWarning("%d:I am '%s'", getpid(), app.dcopClient()->appId().data());
diff --git a/dcop/dcop_deadlock_test.h b/dcop/dcop_deadlock_test.h
index 0557e7062..461c53cba 100644
--- a/dcop/dcop_deadlock_test.h
+++ b/dcop/dcop_deadlock_test.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _TESTDCOP_H_
#define _TESTDCOP_H_
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <dcopobject.h>
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 7595cfc2b..8421c7b80 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -41,7 +41,7 @@ typedef TQValueList<TQCString> QCStringList;
* for KDE applications.
*
* This class provides IPC and RPC for KDE applications. Usually you
- * will not have to instantiate one yourself because KApplication
+ * will not have to instantiate one yourself because TDEApplication
* contains a method to return a pointer to a DCOPClient object which
* can be used for your whole application.
*
@@ -62,7 +62,7 @@ typedef TQValueList<TQCString> QCStringList;
* client->send("someApp", "someObject", "someFunction(TQString)", data);
* \endcode
*
- * @see KApplication::dcopClient()
+ * @see TDEApplication::dcopClient()
* @author Preston Brown <pbrown@kde.org>, Matthias Ettrich <ettrich@kde.org>
*/
class DCOP_EXPORT DCOPClient : public TQObject
@@ -675,7 +675,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
* Returns the application's main dcop client. The main client can
* be used by objects that do not have any specific access to a dcop
* client. In KDE applications, the main client usually is the same
- * as KApplication::dcopClient().
+ * as TDEApplication::dcopClient().
* @return the application's main dcop client
*/
static DCOPClient* mainClient();
@@ -684,7 +684,7 @@ class DCOP_EXPORT DCOPClient : public TQObject
* Sets the application's main dcop client. The main client can
* be used by objects that do not have any specific access to a dcop
* client. In KDE applications, the main client usually is the same
- * as KApplication::dcopClient().
+ * as TDEApplication::dcopClient().
* @param mainClient the new main dcop client
*/
static void setMainClient( DCOPClient* mainClient);
@@ -772,7 +772,7 @@ signals:
* synchronous call. In that case, it will enter a local event
* loop to keep the GUI updated until finally an answer arrives.
*
- * In KDE, the KApplication object connects to this signal to be
+ * In KDE, the TDEApplication object connects to this signal to be
* able to block any user input (i.e. mouse and key events) while
* we are waiting for an answer. If we did not do this, the
* application might end up in an illegal state, as a keyboard
diff --git a/dcop/dcopidl/dcopidl_test.h b/dcop/dcopidl/dcopidl_test.h
index 2e896fb52..6f39cab99 100644
--- a/dcop/dcopidl/dcopidl_test.h
+++ b/dcop/dcopidl/dcopidl_test.h
@@ -14,7 +14,7 @@ class Test2;
// this has to work too
#include <tqstring.h>
-typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
+typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
class Test3;
// Those namespaces are opened and closed, so they should be just ignored
@@ -78,7 +78,7 @@ private:
Test3 *doc();
struct KIODownload;
- typedef TQMap<KIO::Job *, KIODownload> KIODownloadMap;
+ typedef TQMap<TDEIO::Job *, KIODownload> KIODownloadMap;
};
class Test2 : public DCOPObject
diff --git a/dcop/dcopidl2cpp/dcopidl_test.h b/dcop/dcopidl2cpp/dcopidl_test.h
index a6c72a888..66f18f92f 100644
--- a/dcop/dcopidl2cpp/dcopidl_test.h
+++ b/dcop/dcopidl2cpp/dcopidl_test.h
@@ -1,4 +1,4 @@
-#include <klistview.h>
+#include <tdelistview.h>
#include "main.h"
#ifndef TEST_H
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 41f49333d..ec16d8fa8 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -1514,7 +1514,7 @@ sub makeParamList($$$)
}
if (defined $defaultparam && $isEnum) {
- # Remove any casts in enum values, for example this in kfileitem.h:
+ # Remove any casts in enum values, for example this in tdefileitem.h:
# 'enum { Unknown = (mode_t) - 1 };'
$defaultparam =~ s/\([^\)]+\)(.*[0-9].*)/$1/;
}
diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp
index 5e4cd00c7..1e70171d2 100644
--- a/dcop/testdcop.cpp
+++ b/dcop/testdcop.cpp
@@ -258,12 +258,12 @@ int main(int argc, char **argv)
foundApp.data(), foundObj.data());
// Find an object called "object1" in any application.
- boolResult = client->findObject( "", "ksycoca", "", data, foundApp, foundObj);
+ boolResult = client->findObject( "", "tdesycoca", "", data, foundApp, foundObj);
tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
foundApp.data(), foundObj.data());
// Find ourselves in any application.
- boolResult = client->findObject( "testdcop", "ksycoca", "", data, foundApp, foundObj);
+ boolResult = client->findObject( "testdcop", "tdesycoca", "", data, foundApp, foundObj);
tqDebug("findObject: result = %s, %s, %s\n", boolResult ? "true" : "false",
foundApp.data(), foundObj.data());
diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp
index 0c9513305..18b983829 100644
--- a/dcop/tests/driver.cpp
+++ b/dcop/tests/driver.cpp
@@ -1,8 +1,8 @@
#include "driver.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <iostream>
#include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqtimer.h>
#include <tqtimer.h>
@@ -53,8 +53,8 @@ int main(int argc, char** argv)
if ( argc < 2 ) { tqWarning("Usage: driver <appid>"); return 1; }
const char* appname = strdup( argv[ 1 ] );
argv[ 1 ] = 0; // sue me
- KCmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
- KApplication app;
+ TDECmdLineArgs::init( argc, argv, "TestAppDriver", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
+ TDEApplication app;
app.dcopClient()->attach( );
app.dcopClient()->registerAs( "TestAppDriver" );
Driver * object = new Driver( appname );
diff --git a/dcop/tests/test.cpp b/dcop/tests/test.cpp
index 7f5114071..4a751c358 100644
--- a/dcop/tests/test.cpp
+++ b/dcop/tests/test.cpp
@@ -1,8 +1,8 @@
#include "test.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <iostream>
#include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
batch();
return 0;
}
- KCmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
- KApplication app;
+ TDECmdLineArgs::init( argc, argv, "TestApp", "Tests the dcop familly of tools + libraries", "1.0" ); // FIXME
+ TDEApplication app;
if(!app.dcopClient()->attach( ))
return 1;
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-01 15:07:18 +0000