summaryrefslogtreecommitdiffstats
path: root/src/kdiff3.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:07:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:07:22 -0600
commitbfd3620cd83f108b5f82d034ffb250748755dfd5 (patch)
treed14f8bc2abaa71dc9216b85dcf323cc3df62f845 /src/kdiff3.cpp
parent672c9c39de40e4da2849acbacf0b943dd26a31ac (diff)
downloadkdiff3-bfd3620cd83f108b5f82d034ffb250748755dfd5.tar.gz
kdiff3-bfd3620cd83f108b5f82d034ffb250748755dfd5.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src/kdiff3.cpp')
-rw-r--r--src/kdiff3.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index f971081..377257b 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -568,7 +568,7 @@ void KDiff3App::initStatusBar()
statusBar()->message( i18n("Ready.") );
}
-void KDiff3App::saveOptions( KConfig* config )
+void KDiff3App::saveOptions( TDEConfig* config )
{
if ( !m_bAutoMode )
{