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.h | |
| 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.h')
| -rw-r--r-- | konqueror/konq_factory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h index ac24061e6..4307defb9 100644 --- a/konqueror/konq_factory.h +++ b/konqueror/konq_factory.h @@ -32,7 +32,7 @@ class BrowserView; class KonqMainWindow; -class KAboutData; +class TDEAboutData; class KonqViewFactory { @@ -77,10 +77,10 @@ public: KTrader::OfferList *partServiceOffers = 0, KTrader::OfferList *appServiceOffers = 0); - static const KAboutData* aboutData(); + static const TDEAboutData* aboutData(); private: - static KAboutData *s_aboutData; + static TDEAboutData *s_aboutData; }; #endif |