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 /lib/kofficeui/KoTemplateChooseDia.cpp | |
parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'lib/kofficeui/KoTemplateChooseDia.cpp')
-rw-r--r-- | lib/kofficeui/KoTemplateChooseDia.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index af79486d..d904fac0 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -119,7 +119,7 @@ private: class KoTemplateChooseDiaPrivate { public: - KoTemplateChooseDiaPrivate(const TQCString& templateType, KInstance* instance, + KoTemplateChooseDiaPrivate(const TQCString& templateType, TDEInstance* instance, const TQCString &format, const TQString &nativeName, const TQStringList& extraNativeMimeTypes, @@ -136,7 +136,7 @@ class KoTemplateChooseDiaPrivate { ~KoTemplateChooseDiaPrivate() {} TQCString m_templateType; - KInstance* m_instance; + TDEInstance* m_instance; TQCString m_format; TQString m_nativeName; TQStringList m_extraNativeMimeTypes; @@ -178,7 +178,7 @@ class KoTemplateChooseDiaPrivate { /******************************************************************/ /*================================================================*/ -KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, KInstance* instance, +KoTemplateChooseDia::KoTemplateChooseDia(TQWidget *parent, const char *name, TDEInstance* instance, const TQCString &format, const TQString &nativeName, const TQStringList &extraNativeMimeTypes, @@ -227,7 +227,7 @@ static bool cancelQuits() { return onlyDoc && onlyMainWindow && kapp->instanceName() != "koshell"; // hack for koshell } -KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file, +KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file, const KoTemplateChooseDia::DialogType &dialogType, const TQCString& templateType, TQWidget* parent) @@ -241,7 +241,7 @@ KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, dialogType, templateType, parent ); } -KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(KInstance* instance, TQString &file, +KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file, const TQCString &format, const TQString &nativeName, const TQStringList& extraNativeMimeTypes, @@ -746,7 +746,7 @@ TQString KoTemplateChooseDia::descriptionText(const TQString &name, const TQStri /*================================================================*/ -TQIconViewItem * KoTCDIconCanvas::load( KoTemplateGroup *group, const TQString& name, KInstance* instance ) +TQIconViewItem * KoTCDIconCanvas::load( KoTemplateGroup *group, const TQString& name, TDEInstance* instance ) { TQIconViewItem * itemtoreturn = 0; |