diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konqueror/konq_factory.cc | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_factory.cc')
| -rw-r--r-- | konqueror/konq_factory.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index 97da7b4f6..a61ae8068 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -35,7 +35,7 @@ #include <assert.h> -KAboutData *KonqFactory::s_aboutData = 0; +TDEAboutData *KonqFactory::s_aboutData = 0; KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args, bool createBrowser ) @@ -211,14 +211,14 @@ void KonqFactory::getOffers( const TQString & serviceType, } -const KAboutData *KonqFactory::aboutData() +const TDEAboutData *KonqFactory::aboutData() { if (!s_aboutData) { - s_aboutData = new KAboutData( "konqueror", I18N_NOOP("Konqueror"), + s_aboutData = new TDEAboutData( "konqueror", I18N_NOOP("Konqueror"), KONQUEROR_VERSION, I18N_NOOP("Web browser, file manager, ..."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2010, The Konqueror developers"), 0, I18N_NOOP("http://konqueror.kde.org") ); |