summaryrefslogtreecommitdiffstats
path: root/kteatime
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:41 -0600
commit59ea7131b34cafad6181711d490cceafe0d0e87b (patch)
tree2c47a77c9e4bcb24cc8fed9fdcc3c52e7185a615 /kteatime
parent545d48dc2acbfb766a1c277b6f82ae54eea3754f (diff)
downloadtdetoys-59ea7131b34cafad6181711d490cceafe0d0e87b.tar.gz
tdetoys-59ea7131b34cafad6181711d490cceafe0d0e87b.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kteatime')
-rw-r--r--kteatime/main.cpp2
-rw-r--r--kteatime/toplevel.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kteatime/main.cpp b/kteatime/main.cpp
index d9d31d5..1c374d2 100644
--- a/kteatime/main.cpp
+++ b/kteatime/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
aboutData.addCredit("Daniel Teske", I18N_NOOP("Many patches"), "teske@bigfoot.com");
TDECmdLineArgs::init( argc, argv, &aboutData );
- KApplication app;
+ TDEApplication app;
TopLevel toplevel;
KWin::setSystemTrayWindowFor(toplevel.winId(), 0);
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index 5deb404..0d4928e 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -182,7 +182,7 @@ TopLevel::TopLevel() : KSystemTray()
stop(); // reset timer, disable some menu entries, etc.
}
-/* slot: signal shutDown() from KApplication */
+/* slot: signal shutDown() from TDEApplication */
/* (not currently needed)
void TopLevel::queryExit()
{