From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kio/misc/kwalletd/kwalletd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kio/misc/kwalletd') diff --git a/kio/misc/kwalletd/kwalletd.cpp b/kio/misc/kwalletd/kwalletd.cpp index a88f4e5b1..e87f96c31 100644 --- a/kio/misc/kwalletd/kwalletd.cpp +++ b/kio/misc/kwalletd/kwalletd.cpp @@ -94,13 +94,13 @@ KWalletD::KWalletD(const TQCString &name) _idleTime = 0; connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); reconfigure(); - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); connect(TDEApplication::dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), this, TQT_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "KWallet Directory Watcher"); - _dw->addDir(KGlobal::dirs()->saveLocation("kwallet")); + _dw->addDir(TDEGlobal::dirs()->saveLocation("kwallet")); _dw->startScan(true); connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); } @@ -593,7 +593,7 @@ bool KWalletD::isAuthorizedApp(const TQCString& appid, const TQString& wallet, W int KWalletD::deleteWallet(const TQString& wallet) { - TQString path = KGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; + TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + TQDir::separator() + wallet + ".kwl"; if (TQFile::exists(path)) { close(wallet, true); @@ -806,7 +806,7 @@ bool KWalletD::isOpen(int handle) { TQStringList KWalletD::wallets() const { - TQString path = KGlobal::dirs()->saveLocation("kwallet"); + TQString path = TDEGlobal::dirs()->saveLocation("kwallet"); TQDir dir(path, "*.kwl"); TQStringList rc; -- cgit v1.2.1