diff options
author | Timothy Pearson <[email protected]> | 2013-01-22 19:56:49 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-22 19:56:49 -0600 |
commit | 7ba4f7b09ce0325c335216ccfab5edd8d8e7ac5f (patch) | |
tree | f2402f8e9d75ca8b54dda67acfc4029aa3498e88 /src | |
parent | b0bf2d99791a996b8769137071945172fa0a1a48 (diff) | |
download | kpicosim-7ba4f7b09ce0325c335216ccfab5edd8d8e7ac5f.tar.gz kpicosim-7ba4f7b09ce0325c335216ccfab5edd8d8e7ac5f.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rwxr-xr-x | src/kpicosim.cpp | 4 | ||||
-rwxr-xr-x | 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, "[email protected]"); + TDEAboutData about("kpicosim", I18N_NOOP("KPicoSim"), version, description, + TDEAboutData::License_GPL, "(C) %{YEAR} Mark Six", 0, 0, "[email protected]"); about.addAuthor( "Mark Six", 0, "[email protected]" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); |