summaryrefslogtreecommitdiffstats
path: root/tdeui/kstdaction.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdeui/kstdaction.cpp
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kstdaction.cpp')
-rw-r--r--tdeui/kstdaction.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/kstdaction.cpp b/tdeui/kstdaction.cpp
index e1adac16a..befd93fc1 100644
--- a/tdeui/kstdaction.cpp
+++ b/tdeui/kstdaction.cpp
@@ -64,9 +64,9 @@ KAction* create( StdAction id, const char *name, const TQObject *recvr, const ch
case Preferences:
case HelpContents:
{
- const KAboutData *aboutData = KGlobal::instance()->aboutData();
+ const TDEAboutData *aboutData = KGlobal::instance()->aboutData();
/* TODO KDE4
- const KAboutData *aboutData;
+ const TDEAboutData *aboutData;
if ( parent )
aboutData = parent->instance()->aboutData();
else