summaryrefslogtreecommitdiffstats
path: root/kwallet
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /kwallet
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kwallet')
-rw-r--r--kwallet/backend/kwalletbackend.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/kwallet/backend/kwalletbackend.cc b/kwallet/backend/kwalletbackend.cc
index 59b7dda2e..cfc296a61 100644
--- a/kwallet/backend/kwalletbackend.cc
+++ b/kwallet/backend/kwalletbackend.cc
@@ -56,7 +56,7 @@ using namespace KWallet;
static void initKWalletDir()
{
- KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
+ TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
}
Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) {
@@ -64,7 +64,7 @@ Backend::Backend(const TQString& name, bool isPath) : _name(name), _ref(0) {
if (isPath) {
_path = name;
} else {
- _path = KGlobal::dirs()->saveLocation("kwallet") + "/" + _name + ".kwl";
+ _path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _name + ".kwl";
}
_open = false;
@@ -245,7 +245,7 @@ static int password2hash(const TQByteArray& password, TQByteArray& hash) {
bool Backend::exists(const TQString& wallet) {
initKWalletDir();
- TQString path = KGlobal::dirs()->saveLocation("kwallet") + "/" + wallet + ".kwl";
+ TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + wallet + ".kwl";
// Note: 60 bytes is presently the minimum size of a wallet file.
// Anything smaller is junk.
return TQFile::exists(path) && TQFileInfo(path).size() >= 60;