Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

1 files changed, 6 insertions, 6 deletions

diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 08557a727..18060ec6d 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -63,7 +63,7 @@ Module::Module()
   kpgpObject=kpgpod.setObject(Module::kpgpObject, this);
   pgp = 0;
 
-  config = new KConfig("kpgprc");
+  config = new TDEConfig("kpgprc");
 
   init();
 }
@@ -1013,7 +1013,7 @@ Module::getKpgp()
 }
 
 
-KConfig *
+TDEConfig *
 Module::getConfig()
 {
   return getKpgp()->config;
@@ -1739,12 +1739,12 @@ Module::readAddressData()
   TQString address;
   AddressData data;
 
-  KConfigGroup general( config, "General" );
+  TDEConfigGroup general( config, "General" );
   int num = general.readNumEntry( "addressEntries", 0 );
 
   addressDataDict.clear();
   for( int i=1; i<=num; i++ ) {
-    KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
+    TDEConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
     address = addrGroup.readEntry( "Address" );
     data.keyIds = KeyIDList::fromStringList( addrGroup.readListEntry( "Key IDs" ) );
     data.encrPref = (EncryptPref) addrGroup.readNumEntry( "EncryptionPreference",
@@ -1761,7 +1761,7 @@ Module::readAddressData()
 void
 Module::writeAddressData()
 {
-  KConfigGroup general( config, "General" );
+  TDEConfigGroup general( config, "General" );
   general.writeEntry( "addressEntries", addressDataDict.count() );
 
   int i;
@@ -1769,7 +1769,7 @@ Module::writeAddressData()
   for ( i=1, it = addressDataDict.begin();
         it != addressDataDict.end();
         ++it, i++ ) {
-    KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
+    TDEConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
     addrGroup.writeEntry( "Address", it.key() );
     addrGroup.writeEntry( "Key IDs", it.data().keyIds.toStringList() );
     addrGroup.writeEntry( "EncryptionPreference", it.data().encrPref );