From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:15:55 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kioslave/cgi/cgi.cpp | 2 +- kioslave/cgi/kcmcgi/kcmcgi.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kioslave/cgi') diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp index 7c92a1a76..0181c066a 100644 --- a/kioslave/cgi/cgi.cpp +++ b/kioslave/cgi/cgi.cpp @@ -257,7 +257,7 @@ extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ); } int kdemain( int argc, char **argv ) { - KInstance instance( "kio_cgi" ); + TDEInstance instance( "kio_cgi" ); kdDebug(7124) << "kio_cgi starting " << getpid() << endl; diff --git a/kioslave/cgi/kcmcgi/kcmcgi.cpp b/kioslave/cgi/kcmcgi/kcmcgi.cpp index d1a798aa2..9c8a8df5e 100644 --- a/kioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/kioslave/cgi/kcmcgi/kcmcgi.cpp @@ -67,10 +67,10 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name) load(); updateButton(); - KAboutData *about = - new KAboutData( I18N_NOOP("kcmcgi"), + TDEAboutData *about = + new TDEAboutData( I18N_NOOP("kcmcgi"), I18N_NOOP("CGI KIO Slave Control Module"), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2002 Cornelius Schumacher") ); about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); -- cgit v1.2.1