From 6538b3d2235fc67aa8722eadcf11dc21ccdf622b Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Tue, 21 Jan 2025 14:24:12 +0900
Subject: Use tdeApp
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
src/kdiff3.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src/kdiff3.cpp')
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index 83eb692..acef944 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -130,7 +130,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
m_pOptionDialog = new OptionDialog( m_pKDiff3Shell!=0, this );
connect( m_pOptionDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotRefresh()) );
- m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() );
+ m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : tdeApp->config() );
// Option handling: Only when pParent==0 (no parent)
TDECmdLineArgs *args = isPart() ? 0 : TDECmdLineArgs::parsedArgs();
@@ -277,7 +277,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
m_pDirectoryMergeSplitter = new TQSplitter( m_pMainSplitter );
m_pDirectoryMergeSplitter->setOrientation(TQt::Horizontal );
m_pDirectoryMergeWindow = new DirectoryMergeWindow( m_pDirectoryMergeSplitter, m_pOptionDialog,
- TDEApplication::kApplication()->iconLoader() );
+ tdeApp->iconLoader() );
m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter );
m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo );
connect( m_pDirectoryMergeWindow, TQ_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)),
@@ -593,7 +593,7 @@ void KDiff3App::saveOptions( TDEConfig* config )
bool KDiff3App::queryClose()
{
- saveOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() );
+ saveOptions( isPart() ? m_pKDiff3Part->instance()->config() : tdeApp->config() );
if(m_bOutputModified)
{
--
cgit v1.2.1