Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent b0bf2d9979
commit 7ba4f7b09c

@ -233,12 +233,12 @@ void KPicoSim::buildMenu()
m_jtagMenu = new KPopupMenu( this ) ; m_jtagMenu = new KPopupMenu( this ) ;
m_jtagMenu->insertItem( "Download", TQT_TQOBJECT(this), TQT_SLOT( jtagDownload() ) ) ; m_jtagMenu->insertItem( "Download", TQT_TQOBJECT(this), TQT_SLOT( jtagDownload() ) ) ;
KAboutData *aboutData = new KAboutData( TDEAboutData *aboutData = new TDEAboutData(
"kpicosim", "kpicosim",
"kpicosim", "kpicosim",
version, version,
"IDE for the picoblaze\n\nCopyright (c) 2005 Mark Six", "IDE for the picoblaze\n\nCopyright (c) 2005 Mark Six",
KAboutData::License_GPL, TDEAboutData::License_GPL,
0, 0,
0, 0,
"http://www.xs4all.nl/~marksix", "http://www.xs4all.nl/~marksix",

@ -38,8 +38,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("kpicosim", I18N_NOOP("KPicoSim"), version, description, TDEAboutData about("kpicosim", I18N_NOOP("KPicoSim"), version, description,
KAboutData::License_GPL, "(C) %{YEAR} Mark Six", 0, 0, "m6@xs4all.nl"); TDEAboutData::License_GPL, "(C) %{YEAR} Mark Six", 0, 0, "m6@xs4all.nl");
about.addAuthor( "Mark Six", 0, "m6@xs4all.nl" ); about.addAuthor( "Mark Six", 0, "m6@xs4all.nl" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

Loading…
Cancel
Save