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 /kioslave/man/kmanpart.cpp | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/man/kmanpart.cpp')
-rw-r--r-- | kioslave/man/kmanpart.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp index a8d08908e..06ced93ec 100644 --- a/kioslave/man/kmanpart.cpp +++ b/kioslave/man/kmanpart.cpp @@ -36,8 +36,8 @@ extern "C" } } -KInstance* KManPartFactory::s_instance = 0L; -KAboutData* KManPartFactory::s_about = 0L; +TDEInstance* KManPartFactory::s_instance = 0L; +TDEAboutData* KManPartFactory::s_about = 0L; KManPartFactory::KManPartFactory( TQObject* parent, const char* name ) : KParts::Factory( parent, name ) @@ -57,13 +57,13 @@ KParts::Part* KManPartFactory::createPartObject( TQWidget * parentWidget, const return part; } -KInstance* KManPartFactory::instance() +TDEInstance* KManPartFactory::instance() { if( !s_instance ) { - s_about = new KAboutData( "kmanpart", + s_about = new TDEAboutData( "kmanpart", I18N_NOOP( "KMan" ), TDE_VERSION_STRING ); - s_instance = new KInstance( s_about ); + s_instance = new TDEInstance( s_about ); } return s_instance; } @@ -73,7 +73,7 @@ KManPart::KManPart( TQWidget * parent, const char * name ) : KHTMLPart( parent, name ) ,m_job(0) { - KInstance * instance = new KInstance( "kmanpart" ); + TDEInstance * instance = new TDEInstance( "kmanpart" ); setInstance( instance ); m_extension=new KParts::BrowserExtension(this); } |