summaryrefslogtreecommitdiffstats
path: root/superkaramba/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:57 -0600
commit2877440fbda2e245d04f534ed51d7cb7c0a06482 (patch)
tree874d2d10bf56b0547de792b6b6d48c4e895be034 /superkaramba/src
parent6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b (diff)
downloadtdeutils-2877440fbda2e245d04f534ed51d7cb7c0a06482.tar.gz
tdeutils-2877440fbda2e245d04f534ed51d7cb7c0a06482.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'superkaramba/src')
-rw-r--r--superkaramba/src/karambaapp.cpp2
-rw-r--r--superkaramba/src/karambaapp.h4
-rw-r--r--superkaramba/src/taskbartest.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index ac0089e..f8b2c1b 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -235,7 +235,7 @@ void KarambaApplication::buildToolTip()
setToolTip(toolTip);
}
-void KarambaApplication::checkPreviousSession(KApplication &app,
+void KarambaApplication::checkPreviousSession(TDEApplication &app,
TQStringList &lst)
{
/******
diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h
index f33fce8..30f40e6 100644
--- a/superkaramba/src/karambaapp.h
+++ b/superkaramba/src/karambaapp.h
@@ -36,7 +36,7 @@ class dcopIface_stub;
class KHelpMenu;
class KAboutData;
-class KarambaApplication : public KApplication
+class KarambaApplication : public TDEApplication
{
Q_OBJECT
@@ -66,7 +66,7 @@ class KarambaApplication : public KApplication
bool themeExists(TQString pretty_name);
void initDcopStub(TQCString app = "");
void setUpSysTray(KAboutData* about);
- void checkPreviousSession(KApplication &app, TQStringList &lst);
+ void checkPreviousSession(TDEApplication &app, TQStringList &lst);
void checkCommandLine(TDECmdLineArgs *args, TQStringList &lst);
bool startThemes(TQStringList &lst);
KarambaIface* dcopIface() { return iface; };
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index 8f5dfc5..45f0be2 100644
--- a/superkaramba/src/taskbartest.cpp
+++ b/superkaramba/src/taskbartest.cpp
@@ -56,7 +56,7 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
// karamba *mainWin = 0;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();