From 7ba4f7b09ce0325c335216ccfab5edd8d8e7ac5f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:56:49 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- src/kpicosim.cpp | 4 ++-- src/main.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp index 0f75111..7b36768 100755 --- a/src/kpicosim.cpp +++ b/src/kpicosim.cpp @@ -233,12 +233,12 @@ void KPicoSim::buildMenu() m_jtagMenu = new KPopupMenu( this ) ; m_jtagMenu->insertItem( "Download", TQT_TQOBJECT(this), TQT_SLOT( jtagDownload() ) ) ; - KAboutData *aboutData = new KAboutData( + TDEAboutData *aboutData = new TDEAboutData( "kpicosim", "kpicosim", version, "IDE for the picoblaze\n\nCopyright (c) 2005 Mark Six", - KAboutData::License_GPL, + TDEAboutData::License_GPL, 0, 0, "http://www.xs4all.nl/~marksix", diff --git a/src/main.cpp b/src/main.cpp index 7fe8e33..33bb160 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -38,8 +38,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kpicosim", I18N_NOOP("KPicoSim"), version, description, - KAboutData::License_GPL, "(C) %{YEAR} Mark Six", 0, 0, "m6@xs4all.nl"); + TDEAboutData about("kpicosim", I18N_NOOP("KPicoSim"), version, description, + TDEAboutData::License_GPL, "(C) %{YEAR} Mark Six", 0, 0, "m6@xs4all.nl"); about.addAuthor( "Mark Six", 0, "m6@xs4all.nl" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); -- cgit v1.2.1