From a9b1fcfcbff6de60cbb5a454924bb65da0253c9e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 23:54:55 -0600 Subject: [PATCH] Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- src/main.cpp | 2 +- src/toplevel.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f4b4062..6f6c5c3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; TopLevel toplevel; KWin::setSystemTrayWindowFor(toplevel.winId(), 0); diff --git a/src/toplevel.cpp b/src/toplevel.cpp index 926784b..b5daa49 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -96,7 +96,7 @@ TopLevel::TopLevel() : KSystemTray(), ticketWatch(0), m_refreshTimer(0), notifyE setupTimers(); } -/* slot: signal shutDown() from KApplication */ +/* slot: signal shutDown() from TDEApplication */ /* (not currently needed) void TopLevel::queryExit() {