From aef5eada7f51ee48f3d21448db290bd8f06953a8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:50:20 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kwallet/allyourbase.cpp | 8 ++++---- kwallet/kwalleteditor.cpp | 2 +- kwallet/kwalletmanager.cpp | 2 +- kwallet/main.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kwallet') diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp index d06898c..b7dbc64 100644 --- a/kwallet/allyourbase.cpp +++ b/kwallet/allyourbase.cpp @@ -51,7 +51,7 @@ KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, con } TQPixmap KWalletFolderItem::getFolderIcon(KIcon::Group group){ - KIconLoader *loader = KGlobal::instance()->iconLoader(); + KIconLoader *loader = TDEGlobal::instance()->iconLoader(); TQPixmap pix = loader->loadIcon( _name, group, 0, KIcon::DefaultState, 0, true ); if (pix.isNull()) @@ -620,7 +620,7 @@ class KWalletIconDrag : public TQIconDrag { * */ KWalletIconView::KWalletIconView(TQWidget *parent, const char *name) : KIconView(parent, name) { - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList&))); } @@ -654,7 +654,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueListsaveLocation("kwallet") + u.fileName(); + TQString dest = TDEGlobal::dirs()->saveLocation("kwallet") + u.fileName(); if (TQFile::exists(dest)) { KMessageBox::sorry(viewport(), i18n("That wallet file already exists. You cannot overwrite wallets.")); e->ignore(); @@ -676,7 +676,7 @@ void KWalletIconView::contentsMousePressEvent(TQMouseEvent *e) { TQDragObject *KWalletIconView::dragObject() { KWalletIconDrag* id = new KWalletIconDrag(viewport(), "KWallet Drag"); - TQString path = "file:" + KGlobal::dirs()->saveLocation("kwallet"); + TQString path = "file:" + TDEGlobal::dirs()->saveLocation("kwallet"); TQPoint pos = _mousePos; for (TQIconViewItem *item = firstItem(); item; item = item->nextItem()) { if (item->isSelected()) { diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp index 5233047..69dbb48 100644 --- a/kwallet/kwalleteditor.cpp +++ b/kwallet/kwalleteditor.cpp @@ -1131,7 +1131,7 @@ void KWalletEditor::saveAs() { if (_nonLocal) { KIO::NetAccess::file_copy(KURL(_walletName), url, 0600, false, false, this); } else { - TQString path = KGlobal::dirs()->saveLocation("kwallet") + "/" + _walletName + ".kwl"; + TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _walletName + ".kwl"; KURL destURL; destURL.setPath(path); KIO::NetAccess::file_copy(destURL, url, 0600, false, false, this); } diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp index d73cba2..20ab41d 100644 --- a/kwallet/kwalletmanager.cpp +++ b/kwallet/kwalletmanager.cpp @@ -48,7 +48,7 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f) : KMainWindow(parent, name, f), DCOPObject("KWalletManager") { - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); _kwalletdLaunch = false; TQAccel *accel = new TQAccel(this, "kwalletmanager"); diff --git a/kwallet/main.cpp b/kwallet/main.cpp index 7503737..5790ef9 100644 --- a/kwallet/main.cpp +++ b/kwallet/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char **argv) { a.setMainWidget(&wm); - KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); + TDEGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); -- cgit v1.2.1