diff options
Diffstat (limited to 'kexi/main/keximainwindowimpl.cpp')
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 4a7363741..0b4a5ff76 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -1926,7 +1926,7 @@ void KexiMainWindowImpl::updateAppCaption() view = 0; } - kApp->setCaption( d->appCaption ); + tdeApp->setCaption( d->appCaption ); if (view && view->mdiParent()->state()==KMdiChildFrm::Maximized) { setCaption( view->caption() ); } @@ -3957,13 +3957,21 @@ void KexiMainWindowImpl::slotStartFeedbackAgent() { #ifndef KEXI_NO_FEEDBACK_AGENT #ifdef FEEDBACK_CLASS +<<<<<<< Updated upstream const TDEAboutData* about = tdeApp->aboutData(); +======= + const TDEAboutData* about = TDEApplication::tdeApplication()->aboutData(); +>>>>>>> Stashed changes FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(), about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages ); if ( wizard->exec() ) { +<<<<<<< Updated upstream tdeApp->invokeMailer( "kexi-reports-dummy@kexi.org", +======= + TDEApplication::tdeApplication()->invokeMailer( "kexi-reports-dummy@kexi.org", +>>>>>>> Stashed changes TQString(), TQString(), about->appName() + TQCString( " [feedback]" ), wizard->feedbackDocument().toString( 2 ).local8Bit() ); |