diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kugar/kudesigner/kudesigner_factory.cpp | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kugar/kudesigner/kudesigner_factory.cpp')
| -rw-r--r-- | kugar/kudesigner/kudesigner_factory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp index 1f5a8740..82b88f03 100644 --- a/kugar/kudesigner/kudesigner_factory.cpp +++ b/kugar/kudesigner/kudesigner_factory.cpp @@ -26,8 +26,8 @@ #include <kdebug.h> #include <kstandarddirs.h> -KInstance* KudesignerFactory::s_global = 0L; -KAboutData* KudesignerFactory::s_aboutData = 0L; +TDEInstance* KudesignerFactory::s_global = 0L; +TDEAboutData* KudesignerFactory::s_aboutData = 0L; KudesignerFactory::KudesignerFactory( TQObject* parent, const char* name ) : KoFactory( parent, name ) @@ -74,18 +74,18 @@ KParts::Part* KudesignerFactory::createPartObject( TQWidget *parentWidget, const return part; } -KAboutData* KudesignerFactory::aboutData() +TDEAboutData* KudesignerFactory::aboutData() { if ( !s_aboutData ) s_aboutData = newKudesignerAboutData(); return s_aboutData; } -KInstance* KudesignerFactory::global() +TDEInstance* KudesignerFactory::global() { if ( !s_global ) { - s_global = new KInstance( aboutData() ); + s_global = new TDEInstance( aboutData() ); // Add any application-specific resource directories here s_global->dirs() ->addResourceType( "kudesigner_template", KStandardDirs::kde_default( "data" ) + "kudesigner/templates/" ); |