summaryrefslogtreecommitdiffstats
path: root/kcalc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 20:23:08 -0600
committerTimothy Pearson <[email protected]>2013-01-22 20:23:08 -0600
commit8856e75c203aa69be210b2fee1095ab9761aca7e (patch)
treed59810016bc093e8dd7f2f886f07c45fa25447a5 /kcalc
parented70cd1b539ac2e02319b55183a5be7a28f2d116 (diff)
downloadtdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz
tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcalc')
-rw-r--r--kcalc/kcalc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index cbf8218..5242cc4 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -2269,8 +2269,8 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
{
- KAboutData aboutData( "kcalc", I18N_NOOP("KCalc"),
- version, description, KAboutData::License_GPL,
+ TDEAboutData aboutData( "kcalc", I18N_NOOP("KCalc"),
+ version, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2003-2005, Klaus Niederkr" "\xc3\xbc" "ger\n"
"(c) 1996-2000, Bernd Johannes Wuebben\n"
"(c) 2000-2005, The KDE Team"));