diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:57:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:57:52 -0600 |
| commit | 5456283a4169e6a94dcb12ea8d1388ed956d3089 (patch) | |
| tree | eaf17471652117a837b3c10c61ffa8240c2eb7e8 | |
| parent | 341bdc9229803e20af150d0e84af71aebbf558a4 (diff) | |
| download | ktorrent-5456283a4169e6a94dcb12ea8d1388ed956d3089.tar.gz ktorrent-5456283a4169e6a94dcb12ea8d1388ed956d3089.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
| -rw-r--r-- | apps/ktorrent/main.cpp | 4 | ||||
| -rw-r--r-- | apps/ktupnptest/main.cpp | 4 | ||||
| -rw-r--r-- | plugins/rssfeed/rss/testlibrss.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/ktorrent/main.cpp b/apps/ktorrent/main.cpp index 5492f82..ee6a0b4 100644 --- a/apps/ktorrent/main.cpp +++ b/apps/ktorrent/main.cpp @@ -117,8 +117,8 @@ int main(int argc, char **argv) signal(SIGPIPE,SIG_IGN); signal(SIGXFSZ,SIG_IGN); tqInstallMsgHandler( StupidWarningMessagesFromTQt ); - KAboutData about("ktorrent", I18N_NOOP("KTorrent"), kt::VERSION_STRING, description, - KAboutData::License_GPL, "(C) 2005 -2008 Joris Guisson and Ivan Vasic", 0, + TDEAboutData about("ktorrent", I18N_NOOP("KTorrent"), kt::VERSION_STRING, description, + TDEAboutData::License_GPL, "(C) 2005 -2008 Joris Guisson and Ivan Vasic", 0, "http://www.ktorrent.org/"); about.addAuthor("Joris Guisson", 0, "joris.guisson@gmail.com" ); about.addAuthor("Ivan Vasic",0,"ivasic@gmail.com"); diff --git a/apps/ktupnptest/main.cpp b/apps/ktupnptest/main.cpp index 97461ae..dc70c35 100644 --- a/apps/ktupnptest/main.cpp +++ b/apps/ktupnptest/main.cpp @@ -48,8 +48,8 @@ static KCmdLineOptions options[] = int main(int argc,char** argv) { Globals::instance().setDebugMode(true); - KAboutData about("ktupnptest", I18N_NOOP("KTUPnPTest"), version, description, - KAboutData::License_GPL, "(C) 2005 Joris Guisson", 0, + TDEAboutData about("ktupnptest", I18N_NOOP("KTUPnPTest"), version, description, + TDEAboutData::License_GPL, "(C) 2005 Joris Guisson", 0, "http://ktorrent.org/"); TDECmdLineArgs::init(argc, argv,&about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp index 721c112..154facb 100644 --- a/plugins/rssfeed/rss/testlibrss.cpp +++ b/plugins/rssfeed/rss/testlibrss.cpp @@ -58,7 +58,7 @@ void Tester::slotLoadingComplete( Loader *loader, Document doc, Status status ) int main( int argc, char **argv ) { - KAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); + TDEAboutData aboutData( "testlibrss", "testlibrss", "0.1" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication app; |