summaryrefslogtreecommitdiffstats
path: root/kexi/main/keximainwindowimpl.cpp
diff options
context:
space:
mode:
authorMavridis Philippe <mavridisf@gmail.com>2024-09-30 00:04:56 +0300
committerPhilippe Mavridis <philippe.mavridis@yandex.com>2025-05-15 21:00:25 +0300
commit04e86613f67d171cc965fce64a4310c0d25c98e1 (patch)
tree08a85d43bc40568f94259601339ccd7e1de11773 /kexi/main/keximainwindowimpl.cpp
parentcf85b9c285a2b9baa87c9d0cb9d683b48e82a475 (diff)
downloadkoffice-feat/cmake-port.tar.gz
koffice-feat/cmake-port.zip
WIP: CMake portfeat/cmake-port
Signed-off-by: Philippe Mavridis <philippe.mavridis@yandex.com>
Diffstat (limited to 'kexi/main/keximainwindowimpl.cpp')
-rw-r--r--kexi/main/keximainwindowimpl.cpp10
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() );