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

---
 kabc/plugins/sql/resourcesql.cpp       | 2 +-
 kabc/plugins/sql/resourcesql.h         | 2 +-
 kabc/plugins/sql/resourcesqlconfig.cpp | 4 ++--
 kabc/plugins/sql/resourcesqlconfig.h   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kabc/plugins/sql')

diff --git a/kabc/plugins/sql/resourcesql.cpp b/kabc/plugins/sql/resourcesql.cpp
index 55f02bae7..150fe54eb 100644
--- a/kabc/plugins/sql/resourcesql.cpp
+++ b/kabc/plugins/sql/resourcesql.cpp
@@ -39,7 +39,7 @@ extern "C"
   }
 }
 
-ResourceSql::ResourceSql( AddressBook *ab, const KConfig *config )
+ResourceSql::ResourceSql( AddressBook *ab, const TDEConfig *config )
   : Resource( ab ), mDb( 0 )
 {
   TQString user, password, db, host;
diff --git a/kabc/plugins/sql/resourcesql.h b/kabc/plugins/sql/resourcesql.h
index 80ebf9e7a..9f1201844 100644
--- a/kabc/plugins/sql/resourcesql.h
+++ b/kabc/plugins/sql/resourcesql.h
@@ -35,7 +35,7 @@ class ResourceSql : public Resource
 public:
   ResourceSql( AddressBook *ab, const TQString &user, const TQString &password,
     const TQString &db, const TQString &host );
-  ResourceSql( AddressBook *ab, const KConfig * );
+  ResourceSql( AddressBook *ab, const TDEConfig * );
   
   bool open();
   void close();
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/kabc/plugins/sql/resourcesqlconfig.cpp
index ef1651cde..f62890c3d 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/kabc/plugins/sql/resourcesqlconfig.cpp
@@ -74,7 +74,7 @@ ResourceSqlConfig::ResourceSqlConfig( TQWidget* parent,  const char* name )
   mainLayout->addWidget( mDbName, 4, 1 );
 }
 
-void ResourceSqlConfig::loadSettings( KConfig *config )
+void ResourceSqlConfig::loadSettings( TDEConfig *config )
 {
   mUser->setText( config->readEntry( "SqlUser" ) );
   mPassword->setText( KABC::Resource::cryptStr( config->readEntry( "SqlPassword" ) ) );
@@ -83,7 +83,7 @@ void ResourceSqlConfig::loadSettings( KConfig *config )
   mPort->setValue( config->readNumEntry( "SqlPort" ) );
 }
 
-void ResourceSqlConfig::saveSettings( KConfig *config )
+void ResourceSqlConfig::saveSettings( TDEConfig *config )
 {
   config->writeEntry( "SqlUser", mUser->text() );
   config->writeEntry( "SqlPassword", KABC::Resource::cryptStr( mPassword->text() ) );
diff --git a/kabc/plugins/sql/resourcesqlconfig.h b/kabc/plugins/sql/resourcesqlconfig.h
index 7bd27d969..ae2de7d6d 100644
--- a/kabc/plugins/sql/resourcesqlconfig.h
+++ b/kabc/plugins/sql/resourcesqlconfig.h
@@ -36,8 +36,8 @@ public:
   ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 );
 
 public slots:
-  void loadSettings( KConfig *config );
-  void saveSettings( KConfig *config );
+  void loadSettings( TDEConfig *config );
+  void saveSettings( TDEConfig *config );
 
 private:
   KLineEdit* mUser;
-- 
cgit v1.2.1