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

---
 cervisia/cervisiapart.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'cervisia/cervisiapart.cpp')

diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index 931adefa..e3eb4e95 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -121,7 +121,7 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName,
       cvsService = new CvsService_stub(appId, "CvsService");
 
     // Create UI
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     conf->setGroup("LookAndFeel");
     bool splitHorz = conf->readBoolEntry("SplitHorizontally",true);
 
@@ -176,7 +176,7 @@ CervisiaPart::~CervisiaPart()
         writeSettings();
 }
 
-KConfig *CervisiaPart::config()
+TDEConfig *CervisiaPart::config()
 {
     return CervisiaFactory::instance()->config();
 }
@@ -184,7 +184,7 @@ KConfig *CervisiaPart::config()
 bool CervisiaPart::openURL( const KURL &u )
 {
     // support url protocols like system:// or home://
-    KURL url = KIO::NetAccess::mostLocalURL(u, widget());
+    KURL url = TDEIO::NetAccess::mostLocalURL(u, widget());
 
     // right now, we are unfortunately not network-aware
     if( !url.isLocalFile() )
@@ -975,7 +975,7 @@ void CervisiaPart::slotCommit()
             while (recentCommits.count() > 50)
                 recentCommits.remove( recentCommits.last() );
 
-            KConfig* conf = config();
+            TDEConfig* conf = config();
             conf->setGroup( "CommitLogs" );
             conf->writeEntry( sandbox, recentCommits, COMMIT_SPLIT_CHAR );
         }
@@ -1628,7 +1628,7 @@ void CervisiaPart::slotDoCVSEdit()
 
 void CervisiaPart::slotConfigure()
 {
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     SettingsDialog *l = new SettingsDialog( conf, widget() );
     l->exec();
 
@@ -1755,7 +1755,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
     update->openDirectory(sandbox);
     setFilter();
 
-    KConfig *conf = config();
+    TDEConfig *conf = config();
     conf->setGroup("General");
     bool dostatus = conf->readBoolEntry(repository.contains(":")?
                                         "StatusForRemoteRepos" :
@@ -1767,7 +1767,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname)
         slotStatus();
     }
 
-    //load the recentCommits for this app from the KConfig app
+    //load the recentCommits for this app from the TDEConfig app
     conf->setGroup( "CommitLogs" );
     recentCommits = conf->readListEntry( sandbox, COMMIT_SPLIT_CHAR );
 
@@ -1808,12 +1808,12 @@ void CervisiaPart::setFilter()
 
 void CervisiaPart::readSettings()
 {
-    KConfig* config = CervisiaFactory::instance()->config();
+    TDEConfig* config = CervisiaFactory::instance()->config();
 
     config->setGroup("Session");
     recent->loadEntries( config );
 
-    // Unfortunately, the KConfig systems sucks and we have to live
+    // Unfortunately, the TDEConfig systems sucks and we have to live
     // with all entries in one group for session management.
 
     opt_createDirs = config->readBoolEntry("Create Dirs", true);
@@ -1872,7 +1872,7 @@ void CervisiaPart::readSettings()
 
 void CervisiaPart::writeSettings()
 {
-    KConfig* config = CervisiaFactory::instance()->config();
+    TDEConfig* config = CervisiaFactory::instance()->config();
 
     config->setGroup("Session");
     recent->saveEntries( config );
-- 
cgit v1.2.1