Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 341bdc9229
commit 5456283a41

@ -117,8 +117,8 @@ int main(int argc, char **argv)
signal(SIGPIPE,SIG_IGN); signal(SIGPIPE,SIG_IGN);
signal(SIGXFSZ,SIG_IGN); signal(SIGXFSZ,SIG_IGN);
tqInstallMsgHandler( StupidWarningMessagesFromTQt ); tqInstallMsgHandler( StupidWarningMessagesFromTQt );
KAboutData about("ktorrent", I18N_NOOP("KTorrent"), kt::VERSION_STRING, description, TDEAboutData about("ktorrent", I18N_NOOP("KTorrent"), kt::VERSION_STRING, description,
KAboutData::License_GPL, "(C) 2005 -2008 Joris Guisson and Ivan Vasic", 0, TDEAboutData::License_GPL, "(C) 2005 -2008 Joris Guisson and Ivan Vasic", 0,
"http://www.ktorrent.org/"); "http://www.ktorrent.org/");
about.addAuthor("Joris Guisson", 0, "joris.guisson@gmail.com" ); about.addAuthor("Joris Guisson", 0, "joris.guisson@gmail.com" );
about.addAuthor("Ivan Vasic",0,"ivasic@gmail.com"); about.addAuthor("Ivan Vasic",0,"ivasic@gmail.com");

@ -48,8 +48,8 @@ static KCmdLineOptions options[] =
int main(int argc,char** argv) int main(int argc,char** argv)
{ {
Globals::instance().setDebugMode(true); Globals::instance().setDebugMode(true);
KAboutData about("ktupnptest", I18N_NOOP("KTUPnPTest"), version, description, TDEAboutData about("ktupnptest", I18N_NOOP("KTUPnPTest"), version, description,
KAboutData::License_GPL, "(C) 2005 Joris Guisson", 0, TDEAboutData::License_GPL, "(C) 2005 Joris Guisson", 0,
"http://ktorrent.org/"); "http://ktorrent.org/");
TDECmdLineArgs::init(argc, argv,&about); TDECmdLineArgs::init(argc, argv,&about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -58,7 +58,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status )
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); TDEAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
TDEApplication app; TDEApplication app;

Loading…
Cancel
Save