From bfd3620cd83f108b5f82d034ffb250748755dfd5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:07:22 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 src/kdiff3.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/kdiff3.cpp')

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 )
    {
-- 
cgit v1.2.3