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

---
 knotes/knoteslegacy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'knotes/knoteslegacy.cpp')

diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index c7e79172f..6c59f13ea 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -146,7 +146,7 @@ bool KNotesLegacy::convertKNotes1Config( Journal *journal, TQDir& noteDir,
     TQString configFile = noteDir.absFilePath( journal->uid() );
 
     // set the defaults
-    KIO::NetAccess::copy(
+    TDEIO::NetAccess::copy(
         KURL( TDEGlobal::dirs()->saveLocation( "config" ) + "knotesrc" ),
         KURL( configFile ),
         0
@@ -240,7 +240,7 @@ bool KNotesLegacy::convertKNotes2Config( Journal *journal, TQDir& noteDir,
     }
 
     // update the config
-    KConfig config( configFile );
+    TDEConfig config( configFile );
     config.setGroup( "Data" );
     journal->setSummary( config.readEntry( "name" ) );
     config.deleteGroup( "Data", true );
-- 
cgit v1.2.1