Rename a number of libraries and executables to avoid conflicts with KDE4

7 files changed, 0 insertions, 221 deletions

diff --git a/kwallet/tests/Makefile.am b/kwallet/tests/Makefile.am
deleted file mode 100644
index d3d9ecb99..000000000
--- a/kwallet/tests/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_ASCII_CAST $(all_includes)
-
-METASOURCES = AUTO
-check_PROGRAMS = kwalletasync kwalletsync kwalletboth
-
-kwalletasync_SOURCES = kwalletasync.cpp kwallettest.cpp
-kwalletasync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
-kwalletasync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_TDECORE) $(LIB_QT)
-
-kwalletsync_SOURCES = kwalletsync.cpp
-kwalletsync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
-kwalletsync_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_TDECORE) $(LIB_QT)
-
-kwalletboth_SOURCES = kwalletboth.cpp kwallettest.cpp
-kwalletboth_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
-kwalletboth_LDADD = $(top_builddir)/kwallet/client/libkwalletclient.la \
-	$(LIB_TDECORE) $(LIB_QT)
-INCLUDES = -I$(top_srcdir)/kwallet/client
diff --git a/kwallet/tests/README b/kwallet/tests/README
deleted file mode 100644
index 73c3ad1db..000000000
--- a/kwallet/tests/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Tests for opening the wallet synchronously and asynchronously
-
-kwalletsync - open synchronously
-kwalletasync - open asynchronously
-kwalletboth - start opening asynchronously, then, during the async call, open synchronously
diff --git a/kwallet/tests/kwalletasync.cpp b/kwallet/tests/kwalletasync.cpp
deleted file mode 100644
index e4371448c..000000000
--- a/kwallet/tests/kwalletasync.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <tqtextstream.h>
-#include <tqtimer.h>
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kdebug.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <dcopclient.h>
-#include <kwallet.h>
-
-#include "kwallettest.h"
-
-static TQTextStream _out( stdout, IO_WriteOnly );
-
-void openWallet()
-{
-	_out << "About to ask for wallet async" << endl;
-
-        // we have no wallet: ask for one.
-	KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous );
-
-	WalletReceiver r;
-	r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) );
-
-	_out << "About to start 30 second event loop" << endl;
-
-	TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) );
-	int ret = tqApp->exec();
-
-	if ( ret == 0 )
-		_out << "Timed out!" << endl;
-	else
-		_out << "Success!" << endl;
-}
-
-void WalletReceiver::walletOpened( bool got )
-{
-	_out << "Got async wallet: " << got << endl;
-	tqApp->exit( 1 );
-}
-
-int main( int argc, char *argv[] )
-{
-	TDEAboutData aboutData( "kwalletasync", "kwalletasync", "version" );
-	TDECmdLineArgs::init( argc, argv, &aboutData );
-	TDEApplication app( "kwalletasync" );
-
-	// register with DCOP
-	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
-
-	openWallet();
-
-	return 0;
-}
-
-// vim: set noet ts=4 sts=4 sw=4:
-
diff --git a/kwallet/tests/kwalletboth.cpp b/kwallet/tests/kwalletboth.cpp
deleted file mode 100644
index 5df7b56ab..000000000
--- a/kwallet/tests/kwalletboth.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <tqtextstream.h>
-#include <tqtimer.h>
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kdebug.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <dcopclient.h>
-#include <kwallet.h>
-
-#include "kwallettest.h"
-
-static TQTextStream _out( stdout, IO_WriteOnly );
-
-void openWallet()
-{
-	_out << "About to ask for wallet async" << endl;
-
-        // we have no wallet: ask for one.
-	KWallet::Wallet *wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous );
-
-	WalletReceiver r;
-	r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) );
-
-	_out << "About to ask for wallet sync" << endl;
-
-	wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous );
-
-	_out << "Got sync wallet: " << (wallet != 0) << endl;
-	_out << "About to start 30 second event loop" << endl;
-
-	TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) );
-	int ret = tqApp->exec();
-
-
-	if ( ret == 0 )
-		_out << "Timed out!" << endl;
-	else
-		_out << "Success!" << endl;
-
-	TQMap<TQString,TQString> p;
-	ret = wallet->readPasswordList("*", p);
-	_out << "readPasswordList returned: " << ret << endl;
-	_out << "readPasswordList returned " << p.keys().count() << " entries" << endl;
-	TQMap<TQString, TQMap<TQString, TQString> > q;
-	ret = wallet->readMapList("*", q);
-	_out << "readMapList returned: " << ret << endl;
-	_out << "readMapList returned " << q.keys().count() << " entries" << endl;
-
-	TQMap<TQString, TQByteArray> s;
-	ret = wallet->readEntryList("*", s);
-	_out << "readEntryList returned: " << ret << endl;
-	_out << "readEntryList returned " << s.keys().count() << " entries" << endl;
-
-	delete wallet;
-}
-
-void WalletReceiver::walletOpened( bool got )
-{
-	_out << "Got async wallet: " << got << endl;
-	tqApp->exit( 1 );
-}
-
-int main( int argc, char *argv[] )
-{
-	TDEAboutData aboutData( "kwalletboth", "kwalletboth", "version" );
-	TDECmdLineArgs::init( argc, argv, &aboutData );
-	TDEApplication app( "kwalletboth" );
-
-	// register with DCOP
-	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
-
-	openWallet();
-
-	return 0;
-}
-
-// vim: set noet ts=4 sts=4 sw=4:
-
diff --git a/kwallet/tests/kwalletsync.cpp b/kwallet/tests/kwalletsync.cpp
deleted file mode 100644
index 743692740..000000000
--- a/kwallet/tests/kwalletsync.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <tqtextstream.h>
-#include <tqtimer.h>
-
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kdebug.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <dcopclient.h>
-#include <kwallet.h>
-
-static TQTextStream _out( stdout, IO_WriteOnly );
-
-void openWallet()
-{
-	_out << "About to ask for wallet sync" << endl;
-
-	KWallet::Wallet *w = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous );
-
-	_out << "Got sync wallet: " << (w != 0) << endl;
-}
-
-int main( int argc, char *argv[] )
-{
-	TDEAboutData aboutData( "kwalletsync", "kwalletsync", "version" );
-	TDECmdLineArgs::init( argc, argv, &aboutData );
-	TDEApplication app( "kwalletsync" );
-
-	// register with DCOP
-	_out << "DCOP registration returned " << app.dcopClient()->registerAs(app.name()) << endl;
-
-	openWallet();
-
-	return 0;
-}
-
-// vim: set noet ts=4 sts=4 sw=4:
-
diff --git a/kwallet/tests/kwallettest.cpp b/kwallet/tests/kwallettest.cpp
deleted file mode 100644
index a17644cfb..000000000
--- a/kwallet/tests/kwallettest.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "kwallettest.h"
-#include "kwallettest.moc"
diff --git a/kwallet/tests/kwallettest.h b/kwallet/tests/kwallettest.h
deleted file mode 100644
index c062760a4..000000000
--- a/kwallet/tests/kwallettest.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef KWALLETASYNC_H
-#define KWALLETASYNC_H
-
-#include <tqobject.h>
-
-namespace KWallet { class Wallet; }
-
-class WalletReceiver : public TQObject
-{
-	Q_OBJECT
-public slots:
-	void walletOpened( bool );
-};
-
-#endif