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 --- kshisen/board.cpp | 4 ++-- kshisen/main.cpp | 2 +- kshisen/tileset.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kshisen') diff --git a/kshisen/board.cpp b/kshisen/board.cpp index ae2fd750..475b3672 100644 --- a/kshisen/board.cpp +++ b/kshisen/board.cpp @@ -74,7 +74,7 @@ Board::Board(TQWidget *parent, const char *name) : _redo.setAutoDelete(true); _undo.setAutoDelete(true); - TQPixmap bg(KGlobal::dirs()->findResource("appdata", "kshisen_bgnd.png")); + TQPixmap bg(TDEGlobal::dirs()->findResource("appdata", "kshisen_bgnd.png")); setBackgroundPixmap(bg); loadSettings(); @@ -458,7 +458,7 @@ void Board::paintEvent(TQPaintEvent *e) if(paused) { - p.setFont(KGlobalSettings::largeFont()); + p.setFont(TDEGlobalSettings::largeFont()); p.drawText(rect(), TQt::AlignCenter, i18n("Game Paused")); } else diff --git a/kshisen/main.cpp b/kshisen/main.cpp index 00bff799..db5d96d8 100644 --- a/kshisen/main.cpp +++ b/kshisen/main.cpp @@ -63,7 +63,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication a; - KGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); App *app = new App(); app->show(); diff --git a/kshisen/tileset.cpp b/kshisen/tileset.cpp index 4ca6319d..fdaf184f 100644 --- a/kshisen/tileset.cpp +++ b/kshisen/tileset.cpp @@ -36,7 +36,7 @@ TileSet::TileSet() : scaledTiles(nTiles) { //loadTiles - TQImage tileset(KGlobal::dirs()->findResource("appdata", "tileset.png")); + TQImage tileset(TDEGlobal::dirs()->findResource("appdata", "tileset.png")); if(tileset.isNull()) { KMessageBox::sorry(0, i18n("Cannot load tiles pixmap!")); -- cgit v1.2.1