From 0195ac2fb345c2f94ece5d8bc4fc70feafc3e1ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:54:00 -0600 Subject: [PATCH] Rename KInstance and KAboutData to avoid conflicts with KDE4 --- knights/knights.cpp | 2 +- knights/knights.h | 2 +- knights/main.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/knights/knights.cpp b/knights/knights.cpp index 8b5f7c0..5cef31c 100644 --- a/knights/knights.cpp +++ b/knights/knights.cpp @@ -67,7 +67,7 @@ void Knights::BirthAll(void) if( Resource->OPTION_Show_Splash ) SplashScreen = new splash(); - aboutData = new KAboutData( "knights", I18N_NOOP("Knights"), _VERSION_ ); + aboutData = new TDEAboutData( "knights", I18N_NOOP("Knights"), _VERSION_ ); topMenu = menuBar(); myAccel = new Accel( this, Resource->myAccel ); help = helpMenu(); diff --git a/knights/knights.h b/knights/knights.h index b1949aa..50e5719 100644 --- a/knights/knights.h +++ b/knights/knights.h @@ -59,7 +59,7 @@ class Knights : public KMainWindow Q_OBJECT public: - KAboutData *aboutData; + TDEAboutData *aboutData; resource *Resource; Knights( TDECmdLineArgs *Args, TQWidget* parent=0, const char *name=0 ); diff --git a/knights/main.cpp b/knights/main.cpp index 52e131a..a8e664b 100644 --- a/knights/main.cpp +++ b/knights/main.cpp @@ -30,11 +30,11 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "knights", + TDEAboutData aboutData( "knights", I18N_NOOP("Knights"), _VERSION_, I18N_NOOP("The Knights Chess Interface\n\nKnights is a chess interface\nfor the Trinity Desktop Environment."), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(c) 2003, Troy Corbin Jr.", 0, "http://knights-chess.com",