diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kounavail/kounavail.cc | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kounavail/kounavail.cc')
| -rw-r--r-- | kounavail/kounavail.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kounavail/kounavail.cc b/kounavail/kounavail.cc index 364a8e84..d3db14cc 100644 --- a/kounavail/kounavail.cc +++ b/kounavail/kounavail.cc @@ -127,8 +127,8 @@ void KoUnavailView::paintEvent( TQPaintEvent* ev ) K_EXPORT_COMPONENT_FACTORY( libkounavailpart, KoUnavailFactory ) -KInstance* KoUnavailFactory::s_global = 0L; -KAboutData* KoUnavailFactory::s_aboutData = 0L; +TDEInstance* KoUnavailFactory::s_global = 0L; +TDEAboutData* KoUnavailFactory::s_aboutData = 0L; KoUnavailFactory::KoUnavailFactory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -149,25 +149,25 @@ KParts::Part* KoUnavailFactory::createPartObject( TQWidget *parentWidget, const return new KoUnavailPart( parentWidget, widgetName, parent, name ); } -KAboutData* KoUnavailFactory::aboutData() +TDEAboutData* KoUnavailFactory::aboutData() { if ( !s_aboutData ) { static const char* description=I18N_NOOP("KoUnavail KOffice Program"); static const char* version="0.1"; - s_aboutData=new KAboutData( "kounavail", I18N_NOOP("KoUnavail"), - version, description, KAboutData::License_LGPL, + s_aboutData=new TDEAboutData( "kounavail", I18N_NOOP("KoUnavail"), + version, description, TDEAboutData::License_LGPL, "(c) 2001, David Faure"); s_aboutData->addAuthor("David Faure",0, "[email protected]"); } return s_aboutData; } -KInstance* KoUnavailFactory::global() +TDEInstance* KoUnavailFactory::global() { if ( !s_global ) { - s_global = new KInstance( aboutData() ); + s_global = new TDEInstance( aboutData() ); // Tell the iconloader about share/apps/koffice/icons //s_global->iconLoader()->addAppDir("koffice"); } |