diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 23:54:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 23:54:46 -0600 |
| commit | fe52f645fd58a8c0309a37360507c1b13361a348 (patch) | |
| tree | d89a335f7e9331a367e66b388e2e29cbf40be159 /src/kdiff3.cpp | |
| parent | c8fc7b9d459cfe043934f86dd3e0af7bf8ecccf7 (diff) | |
| download | kdiff3-fe52f645fd58a8c0309a37360507c1b13361a348.tar.gz kdiff3-fe52f645fd58a8c0309a37360507c1b13361a348.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src/kdiff3.cpp')
| -rw-r--r-- | src/kdiff3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index b58ddaa..f971081 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -277,7 +277,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par m_pDirectoryMergeSplitter = new TQSplitter( m_pMainSplitter ); m_pDirectoryMergeSplitter->setOrientation(Qt::Horizontal ); m_pDirectoryMergeWindow = new DirectoryMergeWindow( m_pDirectoryMergeSplitter, m_pOptionDialog, - KApplication::kApplication()->iconLoader() ); + TDEApplication::kApplication()->iconLoader() ); m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter ); m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo ); connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)), @@ -927,7 +927,7 @@ void KDiff3App::slotFileQuit() if( !queryClose() ) return; // Don't quit - KApplication::exit( isFileSaved() ? 0 : 1 ); + TDEApplication::exit( isFileSaved() ? 0 : 1 ); } |