From bab94d83782bbc76f3a02a415576ce4cdc56aec5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 27 Aug 2013 23:20:50 -0500 Subject: Rename KWallet to TDEWallet --- tdewallet/README | 4 ++-- tdewallet/backend/tdewalletbackend.cc | 18 +++++++++--------- tdewallet/backend/tdewalletbackend.h | 2 +- tdewallet/backend/tdewalletentry.cc | 2 +- tdewallet/backend/tdewalletentry.h | 2 +- tdewallet/backend/tests/backendtest.cpp | 4 ++-- tdewallet/client/tdewallet.cc | 2 +- tdewallet/client/tdewallet.h | 8 ++++---- tdewallet/tests/tdewalletasync.cpp | 2 +- tdewallet/tests/tdewalletboth.cpp | 4 ++-- tdewallet/tests/tdewalletsync.cpp | 2 +- tdewallet/tests/tdewallettest.h | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) (limited to 'tdewallet') diff --git a/tdewallet/README b/tdewallet/README index 661729a2f..59ca36b1e 100644 --- a/tdewallet/README +++ b/tdewallet/README @@ -6,8 +6,8 @@ It has been updated to 10/22/2003. This directory consists of two libraries: tdewalletbackend and tdewalletclient -KWallet::Backend is used inside kded to manage the actual files and -encryption. On the other hand, KWallet::Wallet is used to represent +TDEWallet::Backend is used inside kded to manage the actual files and +encryption. On the other hand, TDEWallet::Wallet is used to represent wallet entries and to encapsulate communication to and from the wallet server inside kded. diff --git a/tdewallet/backend/tdewalletbackend.cc b/tdewallet/backend/tdewalletbackend.cc index 17fecae0c..e8bc45d2c 100644 --- a/tdewallet/backend/tdewalletbackend.cc +++ b/tdewallet/backend/tdewalletbackend.cc @@ -49,18 +49,18 @@ #define KWALLET_HASH_MD5 1 // unsupported -using namespace KWallet; +using namespace TDEWallet; #define KWMAGIC "KWALLET\n\r\0\r\n" #define KWMAGIC_LEN 12 -static void initKWalletDir() +static void initTDEWalletDir() { TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); } Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) { - initKWalletDir(); + initTDEWalletDir(); if (isPath) { _path = name; } else { @@ -244,7 +244,7 @@ static int password2hash(const TQByteArray& password, TQByteArray& hash) { bool Backend::exists(const TQString& wallet) { - initKWalletDir(); + initTDEWalletDir(); TQString path = TDEGlobal::dirs()->saveLocation("tdewallet") + "/" + wallet + ".kwl"; // Note: 60 bytes is presently the minimum size of a wallet file. // Anything smaller is junk. @@ -453,17 +453,17 @@ int Backend::open(const TQByteArray& password) { for (size_t i = 0; i < n; i++) { TQString key; - KWallet::Wallet::EntryType et = KWallet::Wallet::Unknown; + TDEWallet::Wallet::EntryType et = TDEWallet::Wallet::Unknown; Entry *e = new Entry; eStream >> key; TQ_INT32 x = 0; // necessary to read properly eStream >> x; - et = static_cast(x); + et = static_cast(x); switch (et) { - case KWallet::Wallet::Password: - case KWallet::Wallet::Stream: - case KWallet::Wallet::Map: + case TDEWallet::Wallet::Password: + case TDEWallet::Wallet::Stream: + case TDEWallet::Wallet::Map: break; default: // Unknown entry delete e; diff --git a/tdewallet/backend/tdewalletbackend.h b/tdewallet/backend/tdewalletbackend.h index 105d421db..dbbddba79 100644 --- a/tdewallet/backend/tdewalletbackend.h +++ b/tdewallet/backend/tdewalletbackend.h @@ -30,7 +30,7 @@ #include "tdewalletentry.h" -namespace KWallet { +namespace TDEWallet { class MD5Digest; diff --git a/tdewallet/backend/tdewalletentry.cc b/tdewallet/backend/tdewalletentry.cc index a7e8a0425..d6b3aa84e 100644 --- a/tdewallet/backend/tdewalletentry.cc +++ b/tdewallet/backend/tdewalletentry.cc @@ -21,7 +21,7 @@ #include "tdewalletentry.h" -using namespace KWallet; +using namespace TDEWallet; Entry::Entry() { diff --git a/tdewallet/backend/tdewalletentry.h b/tdewallet/backend/tdewalletentry.h index bd39e97d1..641b52195 100644 --- a/tdewallet/backend/tdewalletentry.h +++ b/tdewallet/backend/tdewalletentry.h @@ -27,7 +27,7 @@ #include "tdewallet.h" -namespace KWallet { +namespace TDEWallet { /* @internal */ diff --git a/tdewallet/backend/tests/backendtest.cpp b/tdewallet/backend/tests/backendtest.cpp index 76d59b153..85e916940 100644 --- a/tdewallet/backend/tests/backendtest.cpp +++ b/tdewallet/backend/tests/backendtest.cpp @@ -9,8 +9,8 @@ int main(int argc, char **argv) { TDEApplication a(argc, argv, "tdewalletbackendtest"); - KWallet::Backend be("ktestwallet"); - printf("KWalletBackend constructed\n"); + TDEWallet::Backend be("ktestwallet"); + printf("TDEWalletBackend constructed\n"); TQByteArray apass, bpass, cpass; diff --git a/tdewallet/client/tdewallet.cc b/tdewallet/client/tdewallet.cc index add75c93d..c730f10d4 100644 --- a/tdewallet/client/tdewallet.cc +++ b/tdewallet/client/tdewallet.cc @@ -30,7 +30,7 @@ #include -using namespace KWallet; +using namespace TDEWallet; const TQString Wallet::LocalWallet() { diff --git a/tdewallet/client/tdewallet.h b/tdewallet/client/tdewallet.h index fa5dbcbb2..e9bb65cec 100644 --- a/tdewallet/client/tdewallet.h +++ b/tdewallet/client/tdewallet.h @@ -38,7 +38,7 @@ class DCOPRef; /** Namespace collecting all the Wallet-related classes. */ -namespace KWallet { +namespace TDEWallet { /** * KDE Wallet @@ -55,14 +55,14 @@ class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject { Q_OBJECT protected: /** - * Construct a KWallet object. + * Construct a TDEWallet object. * @internal * @param handle The handle for the wallet. * @param name The name of the wallet. */ Wallet(int handle, const TQString& name); /** - * Copy a KWallet object. + * Copy a TDEWallet object. * @internal */ Wallet(const Wallet&); @@ -71,7 +71,7 @@ class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject { enum EntryType { Unknown=0, Password, Stream, Map, Unused=0xffff }; /** - * Destroy a KWallet object. Closes the wallet. + * Destroy a TDEWallet object. Closes the wallet. */ virtual ~Wallet(); diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp index 75d475b97..0c5d05ebc 100644 --- a/tdewallet/tests/tdewalletasync.cpp +++ b/tdewallet/tests/tdewalletasync.cpp @@ -19,7 +19,7 @@ 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 ); + TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous ); WalletReceiver r; r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) ); diff --git a/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp index efeeebc98..5dcdd57cc 100644 --- a/tdewallet/tests/tdewalletboth.cpp +++ b/tdewallet/tests/tdewalletboth.cpp @@ -19,14 +19,14 @@ 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 ); + TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::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 ); + wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Synchronous ); _out << "Got sync wallet: " << (wallet != 0) << endl; _out << "About to start 30 second event loop" << endl; diff --git a/tdewallet/tests/tdewalletsync.cpp b/tdewallet/tests/tdewalletsync.cpp index 9ee39e4d4..ee0f29064 100644 --- a/tdewallet/tests/tdewalletsync.cpp +++ b/tdewallet/tests/tdewalletsync.cpp @@ -16,7 +16,7 @@ void openWallet() { _out << "About to ask for wallet sync" << endl; - KWallet::Wallet *w = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous ); + TDEWallet::Wallet *w = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Synchronous ); _out << "Got sync wallet: " << (w != 0) << endl; } diff --git a/tdewallet/tests/tdewallettest.h b/tdewallet/tests/tdewallettest.h index c062760a4..e379a6cb4 100644 --- a/tdewallet/tests/tdewallettest.h +++ b/tdewallet/tests/tdewallettest.h @@ -3,7 +3,7 @@ #include -namespace KWallet { class Wallet; } +namespace TDEWallet { class Wallet; } class WalletReceiver : public TQObject { -- cgit v1.2.3