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

1 files changed, 11 insertions, 11 deletions

diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index f1436618..da10d442 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -93,29 +93,29 @@
 // This should be ported to a .kcfg one day I suppose (dfaure).
 
 static inline bool warnSendUnsigned() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-warning-unsigned", false );
 }
 static inline bool warnSendUnencrypted() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-warning-unencrypted", false );
 }
 static inline bool saveMessagesEncrypted() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-store-encrypted", true );
 }
 static inline bool encryptToSelf() {
     // return !Kpgp::Module::getKpgp() || Kpgp::Module::getKpgp()->encryptToSelf();
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-encrypt-to-self", true );
 }
 static inline bool showKeyApprovalDialog() {
-    KConfigGroup group( KMKernel::config(), "Composer" );
+    TDEConfigGroup group( KMKernel::config(), "Composer" );
     return group.readBoolEntry( "crypto-show-keys-for-approval", true );
 }
 
 static inline int encryptKeyNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-encr-key-near-expire-int", 14 );
@@ -123,7 +123,7 @@ static inline int encryptKeyNearExpiryWarningThresholdInDays() {
 }
 
 static inline int signingKeyNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-sign-key-near-expire-int", 14 );
@@ -131,7 +131,7 @@ static inline int signingKeyNearExpiryWarningThresholdInDays() {
 }
 
 static inline int encryptRootCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-encr-root-near-expire-int", 14 );
@@ -139,7 +139,7 @@ static inline int encryptRootCertNearExpiryWarningThresholdInDays() {
 }
 
 static inline int signingRootCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-sign-root-near-expire-int", 14 );
@@ -147,7 +147,7 @@ static inline int signingRootCertNearExpiryWarningThresholdInDays() {
 }
 
 static inline int encryptChainCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-encr-chaincert-near-expire-int", 14 );
@@ -155,7 +155,7 @@ static inline int encryptChainCertNearExpiryWarningThresholdInDays() {
 }
 
 static inline int signingChainCertNearExpiryWarningThresholdInDays() {
-  const KConfigGroup composer( KMKernel::config(), "Composer" );
+  const TDEConfigGroup composer( KMKernel::config(), "Composer" );
   if ( ! composer.readBoolEntry( "crypto-warn-when-near-expire", true ) )
     return -1;
   const int num = composer.readNumEntry( "crypto-warn-sign-chaincert-near-expire-int", 14 );