diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konqueror/about | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/about')
| -rw-r--r-- | konqueror/about/konq_aboutpage.cc | 4 | ||||
| -rw-r--r-- | konqueror/about/konq_aboutpage.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index d9e62d28a..6b573d438 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -21,7 +21,7 @@ K_EXPORT_COMPONENT_FACTORY( konq_aboutpage, KonqAboutPageFactory ) -KInstance *KonqAboutPageFactory::s_instance = 0; +TDEInstance *KonqAboutPageFactory::s_instance = 0; TQString *KonqAboutPageFactory::s_launch_html = 0; TQString *KonqAboutPageFactory::s_intro_html = 0; TQString *KonqAboutPageFactory::s_specs_html = 0; @@ -31,7 +31,7 @@ TQString *KonqAboutPageFactory::s_plugins_html = 0; KonqAboutPageFactory::KonqAboutPageFactory( TQObject *parent, const char *name ) : KParts::Factory( parent, name ) { - s_instance = new KInstance( "konqaboutpage" ); + s_instance = new TDEInstance( "konqaboutpage" ); } KonqAboutPageFactory::~KonqAboutPageFactory() diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h index c72a85250..96229c42c 100644 --- a/konqueror/about/konq_aboutpage.h +++ b/konqueror/about/konq_aboutpage.h @@ -5,7 +5,7 @@ #include <khtml_part.h> class KHTMLPart; -class KInstance; +class TDEInstance; class KonqAboutPageFactory : public KParts::Factory { @@ -17,7 +17,7 @@ public: TQObject *parent, const char *name, const char *classname, const TQStringList &args ); - static KInstance *instance() { return s_instance; } + static TDEInstance *instance() { return s_instance; } static TQString launch(); static TQString intro(); @@ -28,7 +28,7 @@ public: private: static TQString loadFile( const TQString& file ); - static KInstance *s_instance; + static TDEInstance *s_instance; static TQString *s_launch_html, *s_intro_html, *s_specs_html, *s_tips_html, *s_plugins_html; }; |