From f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:45:16 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- libtdegames/kcarddialog.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libtdegames/kcarddialog.cpp') diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp index 937eb26b..4a2c4168 100644 --- a/libtdegames/kcarddialog.cpp +++ b/libtdegames/kcarddialog.cpp @@ -226,7 +226,7 @@ TQString KCardDialog::getDefaultCardDir() KCardDialog::init(); TQString file = KCARD_DEFAULTCARDDIR + KCARD_DEFAULTCARD; - return KGlobal::dirs()->findResourceDir("cards",file) + KCARD_DEFAULTCARDDIR; + return TDEGlobal::dirs()->findResourceDir("cards",file) + KCARD_DEFAULTCARDDIR; } TQString KCardDialog::getCardPath(const TQString &carddir, int index) @@ -452,7 +452,7 @@ void KCardDialog::setupDialog(bool showResizeBox) void KCardDialog::insertCardIcons() { - TQStringList list = KGlobal::dirs()->findAllResources("cards", "card*/index.desktop", false, true); + TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "card*/index.desktop", false, true); // kdDebug(11000) << "insert " << list.count() << endl; if (list.isEmpty()) return; @@ -488,7 +488,7 @@ void KCardDialog::insertCardIcons() void KCardDialog::insertDeckIcons() { - TQStringList list = KGlobal::dirs()->findAllResources("cards", "decks/*.desktop", false, true); + TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "decks/*.desktop", false, true); if (list.isEmpty()) return; @@ -575,7 +575,7 @@ TQString KCardDialog::getRandomDeck() { KCardDialog::init(); - TQStringList list = KGlobal::dirs()->findAllResources("cards", "decks/*.desktop"); + TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "decks/*.desktop"); if (list.isEmpty()) return TQString(); @@ -587,7 +587,7 @@ TQString KCardDialog::getRandomCardDir() { KCardDialog::init(); - TQStringList list = KGlobal::dirs()->findAllResources("cards", "card*/index.desktop"); + TQStringList list = TDEGlobal::dirs()->findAllResources("cards", "card*/index.desktop"); if (list.isEmpty()) return TQString(); @@ -799,9 +799,9 @@ void KCardDialog::init() static bool _inited = false; if (_inited) return; - KGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/")); + TDEGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/")); - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); _inited = true; } -- cgit v1.2.1