diff options
Diffstat (limited to 'tdewallet/backend')
-rw-r--r-- | tdewallet/backend/tdewalletbackend.cc | 18 | ||||
-rw-r--r-- | tdewallet/backend/tdewalletbackend.h | 2 | ||||
-rw-r--r-- | tdewallet/backend/tdewalletentry.cc | 2 | ||||
-rw-r--r-- | tdewallet/backend/tdewalletentry.h | 2 | ||||
-rw-r--r-- | tdewallet/backend/tests/backendtest.cpp | 4 |
5 files changed, 14 insertions, 14 deletions
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<KWallet::Wallet::EntryType>(x); + et = static_cast<TDEWallet::Wallet::EntryType>(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; |