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

3 files changed, 14 insertions, 14 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 );
diff --git a/libkpgp/kpgp.h b/libkpgp/kpgp.h
index 967254b6b..6628f41e5 100644
--- a/libkpgp/kpgp.h
+++ b/libkpgp/kpgp.h
@@ -43,7 +43,7 @@ class TQCursor;
 class TQCheckBox;
 class TQGridLayout;
 
-class KConfig;
+class TDEConfig;
 
 namespace Kpgp {
 
@@ -304,7 +304,7 @@ public:
   static Kpgp::Module *getKpgp();
 
   /** get the kpgp config object */
-  static KConfig *getConfig();
+  static TDEConfig *getConfig();
 
   /** Parses the given message and splits it into OpenPGP blocks and
       Non-OpenPGP blocks.
@@ -416,7 +416,7 @@ private:
   void assignPGPBase(void);
 
   static Kpgp::Module *kpgpObject;
-  KConfig *config;
+  TDEConfig *config;
 
   struct AddressData {
     KeyIDList keyIds;
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index 2e6d71606..164225d19 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -296,8 +296,8 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList,
   if ( kapp )
     KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() );
   Kpgp::Module *pgp = Kpgp::Module::getKpgp();
-  KConfig *config = pgp->getConfig();
-  KConfigGroup dialogConfig( config, "Key Selection Dialog" );
+  TDEConfig *config = pgp->getConfig();
+  TDEConfigGroup dialogConfig( config, "Key Selection Dialog" );
 
   TQSize defaultSize( 580, 400 );
   TQSize dialogSize = dialogConfig.readSizeEntry( "Dialog size", &defaultSize );
@@ -397,8 +397,8 @@ KeySelectionDialog::KeySelectionDialog( const KeyList& keyList,
 KeySelectionDialog::~KeySelectionDialog()
 {
   Kpgp::Module *pgp = Kpgp::Module::getKpgp();
-  KConfig *config = pgp->getConfig();
-  KConfigGroup dialogConfig( config, "Key Selection Dialog" );
+  TDEConfig *config = pgp->getConfig();
+  TDEConfigGroup dialogConfig( config, "Key Selection Dialog" );
   dialogConfig.writeEntry( "Dialog size", size() );
   config->sync();
   delete mKeyGoodPix;
@@ -1662,7 +1662,7 @@ void CipherTextDialog::setMinimumSize()
 #if KDE_IS_VERSION( 3, 1, 90 )
   int maxWidth = TDEGlobalSettings::desktopGeometry(parentWidget()).width()-100;
 #else
-  KConfig gc("kdeglobals", false, false);
+  TDEConfig gc("kdeglobals", false, false);
   gc.setGroup("Windows");
   int maxWidth;
   if (TQApplication::desktop()->isVirtualDesktop() &&