From 905e326a1d1fc90f1626bcb12e01efa387375827 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:28:09 -0600 Subject: Rename KStandard for enhanced compatibility with KDE4 --- atlantik/client/configdlg.cpp | 2 +- atlantik/libatlantikui/portfolioview.cpp | 4 ++-- atlantik/libatlantikui/token.cpp | 4 ++-- kasteroids/main.cpp | 4 ++-- kgoldrunner/src/kgoldrunner.cpp | 2 +- kpat/pwidget.cpp | 4 ++-- ksokoban/NEWS | 2 +- libtdegames/kcarddialog.cpp | 10 +++++----- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp index 28de553c..380f9831 100644 --- a/atlantik/client/configdlg.cpp +++ b/atlantik/client/configdlg.cpp @@ -171,7 +171,7 @@ void ConfigPlayer::chooseImage() void ConfigPlayer::setImage() { TQString filename = locate("data", "atlantik/themes/default/tokens/" + m_playerImage); - if (KStandardDirs::exists(filename)) + if (TDEStandardDirs::exists(filename)) m_playerIcon->setPixmap( TQPixmap(filename) ); } diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp index df24c6df..c2a7b1a4 100644 --- a/atlantik/libatlantikui/portfolioview.cpp +++ b/atlantik/libatlantikui/portfolioview.cpp @@ -160,7 +160,7 @@ void PortfolioView::loadIcon() if (!m_imageName.isEmpty()) { TQString filename = locate("data", "atlantik/themes/default/tokens/" + m_imageName); - if (KStandardDirs::exists(filename)) + if (TDEStandardDirs::exists(filename)) m_image = new TQPixmap(filename); } @@ -172,7 +172,7 @@ void PortfolioView::loadIcon() m_imageName = "hamburger.png"; TQString filename = locate("data", "atlantik/themes/default/tokens/" + m_imageName); - if (KStandardDirs::exists(filename)) + if (TDEStandardDirs::exists(filename)) m_image = new TQPixmap(filename); */ } diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp index 81cad373..791062eb 100644 --- a/atlantik/libatlantikui/token.cpp +++ b/atlantik/libatlantikui/token.cpp @@ -97,7 +97,7 @@ void Token::loadIcon() if (!m_imageName.isEmpty()) { TQString filename = locate("data", "atlantik/themes/default/tokens/" + m_imageName); - if (KStandardDirs::exists(filename)) + if (TDEStandardDirs::exists(filename)) m_image = new TQPixmap(filename); } @@ -106,7 +106,7 @@ void Token::loadIcon() m_imageName = "hamburger.png"; TQString filename = locate("data", "atlantik/themes/default/tokens/" + m_imageName); - if (KStandardDirs::exists(filename)) + if (TDEStandardDirs::exists(filename)) m_image = new TQPixmap(filename); } diff --git a/kasteroids/main.cpp b/kasteroids/main.cpp index 24992bf2..1438bfc9 100644 --- a/kasteroids/main.cpp +++ b/kasteroids/main.cpp @@ -31,8 +31,8 @@ int main( int argc, char *argv[] ) TDEApplication app; TDEGlobal::locale()->insertCatalogue("libtdegames"); - TDEGlobal::dirs()->addResourceType("sprite", KStandardDirs::kde_default("data") + "kasteroids/sprites/"); - TDEGlobal::dirs()->addResourceType("sounds", KStandardDirs::kde_default("data") + "kasteroids/sounds/"); + TDEGlobal::dirs()->addResourceType("sprite", TDEStandardDirs::kde_default("data") + "kasteroids/sprites/"); + TDEGlobal::dirs()->addResourceType("sounds", TDEStandardDirs::kde_default("data") + "kasteroids/sounds/"); #ifdef KA_ENABLE_SOUND // setup mcop communication diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 319b65fd..f793af47 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -835,7 +835,7 @@ bool KGoldrunner::getDirectories() // The directory strings are set by KDE at run time and might change in // later releases, so use them with caution and only if something gets lost. - KStandardDirs * dirs = new KStandardDirs(); + TDEStandardDirs * dirs = new TDEStandardDirs(); #ifdef QT3 TQString myDir = "kgoldrunner"; diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp index 791955c1..7e0f85c2 100644 --- a/kpat/pwidget.cpp +++ b/kpat/pwidget.cpp @@ -102,8 +102,8 @@ pWidget::pWidget() } games->setItems(list); - TDEGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "kpat/backgrounds/"); - TDEGlobal::dirs()->addResourceType("wallpaper", KStandardDirs::kde_default("data") + "ksnake/backgrounds/"); + TDEGlobal::dirs()->addResourceType("wallpaper", TDEStandardDirs::kde_default("data") + "kpat/backgrounds/"); + TDEGlobal::dirs()->addResourceType("wallpaper", TDEStandardDirs::kde_default("data") + "ksnake/backgrounds/"); wallpapers = new KSelectAction(i18n("&Change Background"), 0, TQT_TQOBJECT(this), TQT_SLOT(changeWallpaper()), actionCollection(), "wallpaper"); diff --git a/ksokoban/NEWS b/ksokoban/NEWS index 6f1352ed..f1b083c6 100644 --- a/ksokoban/NEWS +++ b/ksokoban/NEWS @@ -14,7 +14,7 @@ version 0.3.0: Date 1999-07-13 * Some changes related to KDE 2.0 / Qt 2.0 - replaced many char * with QString - - uses KStandardDirs instead of localtdedir + - uses TDEStandardDirs instead of localtdedir * Some minor bugfixes/cleanups diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp index f544f308..b6967b5b 100644 --- a/libtdegames/kcarddialog.cpp +++ b/libtdegames/kcarddialog.cpp @@ -234,11 +234,11 @@ TQString KCardDialog::getCardPath(const TQString &carddir, int index) KCardDialog::init(); TQString entry = carddir + TQString::number(index); - if (KStandardDirs::exists(entry + TQString::fromLatin1(".png"))) + if (TDEStandardDirs::exists(entry + TQString::fromLatin1(".png"))) return entry + TQString::fromLatin1(".png"); // rather theoretical - if (KStandardDirs::exists(entry + TQString::fromLatin1(".xpm"))) + if (TDEStandardDirs::exists(entry + TQString::fromLatin1(".xpm"))) return entry + TQString::fromLatin1(".xpm"); return TQString(); @@ -562,11 +562,11 @@ void KCardDialog::slotCardClicked(TQIconViewItem *item) TQString KCardDialog::getDeckName(const TQString &desktop) { TQString entry = desktop.left(desktop.length() - strlen(".desktop")); - if (KStandardDirs::exists(entry + TQString::fromLatin1(".png"))) + if (TDEStandardDirs::exists(entry + TQString::fromLatin1(".png"))) return entry + TQString::fromLatin1(".png"); // rather theoretical - if (KStandardDirs::exists(entry + TQString::fromLatin1(".xpm"))) + if (TDEStandardDirs::exists(entry + TQString::fromLatin1(".xpm"))) return entry + TQString::fromLatin1(".xpm"); return TQString(); } @@ -799,7 +799,7 @@ void KCardDialog::init() static bool _inited = false; if (_inited) return; - TDEGlobal::dirs()->addResourceType("cards", KStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/")); + TDEGlobal::dirs()->addResourceType("cards", TDEStandardDirs::kde_default("data") + TQString::fromLatin1("carddecks/")); TDEGlobal::locale()->insertCatalogue("libtdegames"); _inited = true; -- cgit v1.2.3