summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:56:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:56:49 -0600
commit7ba4f7b09ce0325c335216ccfab5edd8d8e7ac5f (patch)
treef2402f8e9d75ca8b54dda67acfc4029aa3498e88
parentb0bf2d99791a996b8769137071945172fa0a1a48 (diff)
downloadkpicosim-7ba4f7b09ce0325c335216ccfab5edd8d8e7ac5f.tar.gz
kpicosim-7ba4f7b09ce0325c335216ccfab5edd8d8e7ac5f.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
-rwxr-xr-xsrc/kpicosim.cpp4
-rwxr-xr-xsrc/main.cpp4
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 );