summaryrefslogtreecommitdiffstats
path: root/knetwalk
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:45:16 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:45:16 -0600
commitf3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 (patch)
treeb312fd7d5b7a34b88941b2fc50661431637b78b4 /knetwalk
parent23a5c62758c4898e3afc1b8bb4c3ae78f4b526ac (diff)
downloadtdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.tar.gz
tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'knetwalk')
-rw-r--r--knetwalk/src/cell.cpp12
-rw-r--r--knetwalk/src/main.cpp2
-rw-r--r--knetwalk/src/mainwindow.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/knetwalk/src/cell.cpp b/knetwalk/src/cell.cpp
index 2847f4d2..e3ee7193 100644
--- a/knetwalk/src/cell.cpp
+++ b/knetwalk/src/cell.cpp
@@ -46,7 +46,7 @@ void Cell::initPixmaps()
NamesMap::ConstIterator it;
for(it = names.constBegin(); it != names.constEnd(); ++it)
{
- connectedpixmap[it.key()]=new TQPixmap(KGlobal::iconLoader()->loadIcon(
+ connectedpixmap[it.key()]=new TQPixmap(TDEGlobal::iconLoader()->loadIcon(
locate("data","knetwalk/cable"+it.data()+".png"), KIcon::NoGroup, 32) );
TQImage image = connectedpixmap[it.key()]->convertToImage();
@@ -152,9 +152,9 @@ void Cell::paintEvent(TQPaintEvent*)
{
changed = false;
if ( locked ) {
- pixmap = KGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background_locked.png"), KIcon::NoGroup, 32);
+ pixmap = TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background_locked.png"), KIcon::NoGroup, 32);
} else {
- pixmap = KGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background.png"), KIcon::NoGroup, 32);
+ pixmap = TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background.png"), KIcon::NoGroup, 32);
}
TQPainter paint;
@@ -185,14 +185,14 @@ void Cell::paintEvent(TQPaintEvent*)
if(root)
{
- pix=KGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/server.png"), KIcon::NoGroup, 32);
+ pix=TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/server.png"), KIcon::NoGroup, 32);
}
else if(ddirs == U || ddirs == L || ddirs == D || ddirs == R)
{
if(connected)
- pix=KGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer2.png"),KIcon::NoGroup,32);
+ pix=TDEGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer2.png"),KIcon::NoGroup,32);
else
- pix=KGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer1.png"),KIcon::NoGroup,32);
+ pix=TDEGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer1.png"),KIcon::NoGroup,32);
}
paint.drawPixmap(0, 0, pix);
}
diff --git a/knetwalk/src/main.cpp b/knetwalk/src/main.cpp
index ea55a816..94b54af1 100644
--- a/knetwalk/src/main.cpp
+++ b/knetwalk/src/main.cpp
@@ -50,7 +50,7 @@ int main(int argc, char ** argv)
TDEApplication app;
- KGlobal::locale()->insertCatalogue("libtdegames");
+ TDEGlobal::locale()->insertCatalogue("libtdegames");
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->isSet("Novice")) Settings::setSkill(Settings::EnumSkill::Novice);
diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp
index 24d2a528..5d45af3b 100644
--- a/knetwalk/src/mainwindow.cpp
+++ b/knetwalk/src/mainwindow.cpp
@@ -94,7 +94,7 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) :
" to turn it in a counter-clockwise direction."
"<p>Start the LAN with as few turns as possible!"));
- //const int cellsize = KGlobal::iconLoader()->loadIcon("knetwalk/background.png", KIcon::User, 32).width();
+ //const int cellsize = TDEGlobal::iconLoader()->loadIcon("knetwalk/background.png", KIcon::User, 32).width();
const int cellsize = 32;
const int gridsize = cellsize * MasterBoardSize + 2;