diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:57:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 23:57:47 -0600 |
| commit | 6ec5cc8d82b29c330def669cf20534cadd2cf29e (patch) | |
| tree | 7e66b929b5455837f22ea54ed91fc9af6f64f7bf /kexi/main | |
| parent | 68a4fdfd2c2b70a7c22c4c6d6c916e604a0efac2 (diff) | |
| download | koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.tar.gz koffice-6ec5cc8d82b29c330def669cf20534cadd2cf29e.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kexi/main')
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 6 | ||||
| -rw-r--r-- | kexi/main/keximainwindowimpl.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index f6be589a..96bd81be 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -151,7 +151,7 @@ int KexiMainWindowImpl::create(int argc, char *argv[], KAboutData* aboutdata) bool GUIenabled = true; TQWidget *dummyWidget = 0; //needed to have icon for dialogs before KexiMainWindowImpl is created //! @todo switch GUIenabled off when needed - KApplication* app = new KApplication(true, GUIenabled); + TDEApplication* app = new TDEApplication(true, GUIenabled); #ifdef KEXI_STANDALONE KGlobal::locale()->removeCatalogue("kexi"); @@ -3957,13 +3957,13 @@ void KexiMainWindowImpl::slotStartFeedbackAgent() { #ifndef KEXI_NO_FEEDBACK_AGENT #ifdef FEEDBACK_CLASS - const KAboutData* about = KApplication::kApplication()->aboutData(); + const KAboutData* about = TDEApplication::kApplication()->aboutData(); FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(), about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages ); if ( wizard->exec() ) { - KApplication::kApplication()->invokeMailer( "kexi-reports-dummy@kexi.org", + TDEApplication::kApplication()->invokeMailer( "kexi-reports-dummy@kexi.org", TQString(), TQString(), about->appName() + TQCString( " [feedback]" ), wizard->feedbackDocument().toString( 2 ).local8Bit() ); diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index 270e9272..f477d2fb 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -52,7 +52,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI KexiMainWindowImpl(); virtual ~KexiMainWindowImpl(); - /*! Used by the main kexi routine. Creates a new Kexi main window and a new KApplication object. + /*! 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); |