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 /kexi/main | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kexi/main')
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 4 | ||||
| -rw-r--r-- | kexi/main/keximainwindowimpl.h | 2 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupDialog.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 96bd81be..d5d77cd9 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -144,7 +144,7 @@ //------------------------------------------------- //static -int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata) +int KexiMainWindowImpl::create(int argc, char *argv[], TDEAboutData* aboutdata) { Kexi::initCmdLineArgs( argc, argv, aboutdata ); @@ -3957,7 +3957,7 @@ void KexiMainWindowImpl::slotStartFeedbackAgent() { #ifndef KEXI_NO_FEEDBACK_AGENT #ifdef FEEDBACK_CLASS - const KAboutData* about = TDEApplication::kApplication()->aboutData(); + const TDEAboutData* about = TDEApplication::kApplication()->aboutData(); FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(), about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages ); diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index f477d2fb..0e81a91b 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -55,7 +55,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI /*! Used by the main kexi routine. Creates a new Kexi main window and a new TDEApplication object. kdemain() has to destroy the latter on exit. \return result 1 on error and 0 on success (the result can be used as a result of kdemain()) */ - static int create(int argc, char *argv[], KAboutData* aboutdata = 0); + static int create(int argc, char *argv[], TDEAboutData* aboutdata = 0); //! \return KexiMainWindowImpl singleton (if it is instantiated) static KexiMainWindowImpl* self() { return dynamic_cast<KexiMainWindowImpl*>(tqApp->mainWidget()); } diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 91bd6bfc..688bc7d9 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -142,7 +142,7 @@ TQString captionForDialogType(int type) } /*================================================================*/ -/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, KInstance* global, +/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, TDEInstance* global, const TQCString &format, const TQString &nativePattern, const TQString &nativeName, const DialogType &dialogType, const TQCString& templateType) : |