summaryrefslogtreecommitdiffstats
path: root/kshisen
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:19:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:19:04 -0600
commit2e384e286e5ec2f884ceab9a360f90f544554066 (patch)
tree44e1defd7efd7f8f09d446992685d167ec546e5f /kshisen
parent4ffd16a310c74db19a5ba0c297234470f01cd7b3 (diff)
downloadtdegames-2e384e286e5ec2f884ceab9a360f90f544554066.tar.gz
tdegames-2e384e286e5ec2f884ceab9a360f90f544554066.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kshisen')
-rw-r--r--kshisen/main.cpp2
-rw-r--r--kshisen/tileset.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kshisen/main.cpp b/kshisen/main.cpp
index 099bb702..d492e01c 100644
--- a/kshisen/main.cpp
+++ b/kshisen/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
aboutData.addCredit(0, I18N_NOOP("Thanks also to everyone who should be listed here but isn't!"), 0);
TDECmdLineArgs::init( argc, argv, &aboutData );
- KApplication a;
+ TDEApplication a;
KGlobal::locale()->insertCatalogue("libtdegames");
App *app = new App();
diff --git a/kshisen/tileset.cpp b/kshisen/tileset.cpp
index e9b50c43..4ca6319d 100644
--- a/kshisen/tileset.cpp
+++ b/kshisen/tileset.cpp
@@ -40,7 +40,7 @@ TileSet::TileSet() : scaledTiles(nTiles)
if(tileset.isNull())
{
KMessageBox::sorry(0, i18n("Cannot load tiles pixmap!"));
- KApplication::exit(1);
+ TDEApplication::exit(1);
}
// split into individual tiles