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 --- kreversi/board.cpp | 4 ++-- kreversi/kreversi.cpp | 2 +- kreversi/kreversi.kcfg | 2 +- kreversi/main.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kreversi') diff --git a/kreversi/board.cpp b/kreversi/board.cpp index 8950fc8f..6f9c7a57 100644 --- a/kreversi/board.cpp +++ b/kreversi/board.cpp @@ -56,7 +56,7 @@ #ifndef PICDATA -#define PICDATA(x) KGlobal::dirs()->findResource("appdata", TQString("pics/")+ x) +#define PICDATA(x) TDEGlobal::dirs()->findResource("appdata", TQString("pics/")+ x) #endif const uint HINT_BLINKRATE = 250000; @@ -109,7 +109,7 @@ void QReversiBoardView::loadChips(ChipType type) TQString name("pics/"); name += (type==Colored ? "chips.png" : "chips_mono.png"); - TQString s = KGlobal::dirs()->findResource("appdata", name); + TQString s = TDEGlobal::dirs()->findResource("appdata", name); bool ok = allchips.load(s); Q_ASSERT( ok && allchips.width()==CHIP_SIZE*5 diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp index eee245b0..22d1f5c5 100644 --- a/kreversi/kreversi.cpp +++ b/kreversi/kreversi.cpp @@ -74,7 +74,7 @@ #ifndef PICDATA #define PICDATA(x) \ - KGlobal::dirs()->findResource("appdata", TQString("pics/") + x) + TDEGlobal::dirs()->findResource("appdata", TQString("pics/") + x) #endif diff --git a/kreversi/kreversi.kcfg b/kreversi/kreversi.kcfg index c1dc6e52..900a3cdf 100644 --- a/kreversi/kreversi.kcfg +++ b/kreversi/kreversi.kcfg @@ -55,7 +55,7 @@ - #define PICDATA(x) KGlobal::dirs()->findResource("appdata", QString("pics/")+ x) + #define PICDATA(x) TDEGlobal::dirs()->findResource("appdata", QString("pics/")+ x) PICDATA("background/Light_Wood.png") diff --git a/kreversi/main.cpp b/kreversi/main.cpp index 1bf0ef79..711559a6 100644 --- a/kreversi/main.cpp +++ b/kreversi/main.cpp @@ -67,7 +67,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); // used for loading background pixmaps KImageIO::registerFormats(); -- cgit v1.2.1