summaryrefslogtreecommitdiffstats
path: root/superkaramba/src/karambaapp.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:08 -0600
commit8856e75c203aa69be210b2fee1095ab9761aca7e (patch)
treed59810016bc093e8dd7f2f886f07c45fa25447a5 /superkaramba/src/karambaapp.h
parented70cd1b539ac2e02319b55183a5be7a28f2d116 (diff)
downloadtdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz
tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'superkaramba/src/karambaapp.h')
-rw-r--r--superkaramba/src/karambaapp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h
index 30f40e6..d4470aa 100644
--- a/superkaramba/src/karambaapp.h
+++ b/superkaramba/src/karambaapp.h
@@ -34,7 +34,7 @@ class TDECmdLineArgs;
class ThemesDlg;
class dcopIface_stub;
class KHelpMenu;
-class KAboutData;
+class TDEAboutData;
class KarambaApplication : public TDEApplication
{
@@ -65,7 +65,7 @@ class KarambaApplication : public TDEApplication
TQStringList getKarambas();
bool themeExists(TQString pretty_name);
void initDcopStub(TQCString app = "");
- void setUpSysTray(KAboutData* about);
+ void setUpSysTray(TDEAboutData* about);
void checkPreviousSession(TDEApplication &app, TQStringList &lst);
void checkCommandLine(TDECmdLineArgs *args, TQStringList &lst);
bool startThemes(TQStringList &lst);