Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 7 insertions, 7 deletions

diff --git a/src/kreplacements/kreplacements.cpp b/src/kreplacements/kreplacements.cpp
index 9b20e49..93954da 100644
--- a/src/kreplacements/kreplacements.cpp
+++ b/src/kreplacements/kreplacements.cpp
@@ -45,7 +45,7 @@ static TQString s_description;
 static TQString s_appName;
 static TQString s_version;
 static TQString s_homepage;
-static KAboutData* s_pAboutData;
+static TDEAboutData* s_pAboutData;
 
 
 #ifdef _WIN32
@@ -372,7 +372,7 @@ void KMainWindow::slotAbout()
       );
    d.addTab(tb1,i18n("&About"));
       
-   std::list<KAboutData::AboutDataEntry>::iterator i;
+   std::list<TDEAboutData::AboutDataEntry>::iterator i;
    
    TQString s2;   
    for( i=s_pAboutData->m_authorList.begin(); i!=s_pAboutData->m_authorList.end(); ++i )
@@ -847,7 +847,7 @@ TQPixmap KIconLoader::loadIcon( const TQString&, int )
    return TQPixmap();
 }
 
-KAboutData::KAboutData( const TQString& /*name*/, const TQString& appName, const TQString& version,
+TDEAboutData::TDEAboutData( const TQString& /*name*/, const TQString& appName, const TQString& version,
       const TQString& description, int,
       const TQString& copyright, int, const TQString& homepage, const TQString& email)
 {
@@ -859,16 +859,16 @@ KAboutData::KAboutData( const TQString& /*name*/, const TQString& appName, const
    s_homepage = homepage;
 }
 
-KAboutData::KAboutData( const TQString& /*name*/, const TQString& /*appName*/, const TQString& /*version*/ )
+TDEAboutData::TDEAboutData( const TQString& /*name*/, const TQString& /*appName*/, const TQString& /*version*/ )
 {
 }
 
-void KAboutData::addAuthor(const char* name, const char* task, const char* email, const char* weblink)
+void TDEAboutData::addAuthor(const char* name, const char* task, const char* email, const char* weblink)
 {
    m_authorList.push_back( AboutDataEntry( name, task, email, weblink) );
 }
 
-void KAboutData::addCredit(const char* name, const char* task, const char* email, const char* weblink)
+void TDEAboutData::addCredit(const char* name, const char* task, const char* email, const char* weblink)
 {
    m_creditList.push_back( AboutDataEntry( name, task, email, weblink) );
 }
@@ -896,7 +896,7 @@ TDECmdLineArgs* TDECmdLineArgs::parsedArgs()  // static
    return &s_cmdLineArgs;
 }
 
-void TDECmdLineArgs::init( int argc, char**argv, KAboutData* pAboutData )  // static
+void TDECmdLineArgs::init( int argc, char**argv, TDEAboutData* pAboutData )  // static
 {
    s_argc = argc;
    s_argv = argv;