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

7 files changed, 221 insertions, 0 deletions

diff --git a/tdewallet/tests/Makefile.am b/tdewallet/tests/Makefile.am
new file mode 100644
index 000000000..83aa39dc0
--- /dev/null
+++ b/tdewallet/tests/Makefile.am
@@ -0,0 +1,20 @@
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_ASCII_CAST $(all_includes)
+
+METASOURCES = AUTO
+check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth
+
+tdewalletasync_SOURCES = tdewalletasync.cpp tdewallettest.cpp
+tdewalletasync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
+tdewalletasync_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
+	$(LIB_TDECORE) $(LIB_QT)
+
+tdewalletsync_SOURCES = tdewalletsync.cpp
+tdewalletsync_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
+tdewalletsync_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
+	$(LIB_TDECORE) $(LIB_QT)
+
+tdewalletboth_SOURCES = tdewalletboth.cpp tdewallettest.cpp
+tdewalletboth_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries)
+tdewalletboth_LDADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la \
+	$(LIB_TDECORE) $(LIB_QT)
+INCLUDES = -I$(top_srcdir)/tdewallet/client
diff --git a/tdewallet/tests/README b/tdewallet/tests/README
new file mode 100644
index 000000000..0996c216d
--- /dev/null
+++ b/tdewallet/tests/README
@@ -0,0 +1,5 @@
+Tests for opening the wallet synchronously and asynchronously
+
+tdewalletsync - open synchronously
+tdewalletasync - open asynchronously
+tdewalletboth - start opening asynchronously, then, during the async call, open synchronously
diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp
new file mode 100644
index 000000000..3512cc799
--- /dev/null
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -0,0 +1,59 @@
+#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 <tdewallet.h>
+
+#include "tdewallettest.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( "tdewalletasync", "tdewalletasync", "version" );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
+	TDEApplication app( "tdewalletasync" );
+
+	// 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/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp
new file mode 100644
index 000000000..eabb26eaa
--- /dev/null
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -0,0 +1,81 @@
+#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 <tdewallet.h>
+
+#include "tdewallettest.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( "tdewalletboth", "tdewalletboth", "version" );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
+	TDEApplication app( "tdewalletboth" );
+
+	// 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/tdewallet/tests/tdewalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp
new file mode 100644
index 000000000..54ffd6a12
--- /dev/null
+++ b/tdewallet/tests/tdewalletsync.cpp
@@ -0,0 +1,39 @@
+#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 <tdewallet.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( "tdewalletsync", "tdewalletsync", "version" );
+	TDECmdLineArgs::init( argc, argv, &aboutData );
+	TDEApplication app( "tdewalletsync" );
+
+	// 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/tdewallet/tests/tdewallettest.cpp b/tdewallet/tests/tdewallettest.cpp
new file mode 100644
index 000000000..c0acac812
--- /dev/null
+++ b/tdewallet/tests/tdewallettest.cpp
@@ -0,0 +1,2 @@
+#include "tdewallettest.h"
+#include "tdewallettest.moc"
diff --git a/tdewallet/tests/tdewallettest.h b/tdewallet/tests/tdewallettest.h
new file mode 100644
index 000000000..c062760a4
--- /dev/null
+++ b/tdewallet/tests/tdewallettest.h
@@ -0,0 +1,15 @@
+#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