summaryrefslogtreecommitdiffstats
path: root/kio/kioexec/main.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 /kio/kioexec/main.cpp
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kio/kioexec/main.cpp')
-rw-r--r--kio/kioexec/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp
index 18014f08f..2a1494043 100644
--- a/kio/kioexec/main.cpp
+++ b/kio/kioexec/main.cpp
@@ -271,8 +271,8 @@ void KIOExec::slotRunApp()
int main( int argc, char **argv )
{
- KAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
- VERSION, description, KAboutData::License_GPL,
+ TDEAboutData aboutData( "kioexec", I18N_NOOP("KIOExec"),
+ VERSION, description, TDEAboutData::License_GPL,
"(c) 1998-2000,2003 The KFM/Konqueror Developers");
aboutData.addAuthor("David Faure",0, "faure@kde.org");
aboutData.addAuthor("Stephan Kulow",0, "coolo@kde.org");