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

---
 kmail/kmreaderwin.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'kmail/kmreaderwin.cpp')

diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 80d46120..2ce6c862 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -877,8 +877,8 @@ bool KMReaderWin::event(TQEvent *e)
 //-----------------------------------------------------------------------------
 void KMReaderWin::readConfig(void)
 {
-  const KConfigGroup mdnGroup( KMKernel::config(), "MDN" );
-  /*should be: const*/ KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup mdnGroup( KMKernel::config(), "MDN" );
+  /*should be: const*/ TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   delete mCSSHelper;
   mCSSHelper = new KMail::CSSHelper( TQPaintDeviceMetrics( mViewer->view() ) );
@@ -957,7 +957,7 @@ void KMReaderWin::adjustLayout() {
 }
 
 
-void KMReaderWin::saveSplitterSizes( KConfigBase & c ) const {
+void KMReaderWin::saveSplitterSizes( TDEConfigBase & c ) const {
   if ( !mSplitter || !mMimePartTree )
     return;
   if ( mMimePartTree->isHidden() )
@@ -969,7 +969,7 @@ void KMReaderWin::saveSplitterSizes( KConfigBase & c ) const {
 
 //-----------------------------------------------------------------------------
 void KMReaderWin::writeConfig( bool sync ) const {
-  KConfigGroup reader( KMKernel::config(), "Reader" );
+  TDEConfigGroup reader( KMKernel::config(), "Reader" );
 
   reader.writeEntry( "useFixedFont", mUseFixedFont );
   if ( headerStyle() )
@@ -1443,7 +1443,7 @@ void KMReaderWin::showHideMimeTree( bool isPlainTextTopLevel ) {
     mMimePartTree->show();
   else {
     // don't rely on TQSplitter maintaining sizes for hidden widgets:
-    KConfigGroup reader( KMKernel::config(), "Reader" );
+    TDEConfigGroup reader( KMKernel::config(), "Reader" );
     saveSplitterSizes( reader );
     mMimePartTree->hide();
   }
@@ -1513,7 +1513,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
   TQString cntDesc = aMsg->subject();
   if( cntDesc.isEmpty() )
     cntDesc = i18n("( body part )");
-  KIO::filesize_t cntSize = aMsg->msgSize();
+  TDEIO::filesize_t cntSize = aMsg->msgSize();
   TQString cntEnc;
   if( aMsg->contentTransferEncodingStr().isEmpty() )
     cntEnc = "7bit";
@@ -1574,7 +1574,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg)
   }
 
   bool emitReplaceMsgByUnencryptedVersion = false;
-  const KConfigGroup reader( KMKernel::config(), "Reader" );
+  const TDEConfigGroup reader( KMKernel::config(), "Reader" );
   if ( reader.readBoolEntry( "store-displayed-messages-unencrypted", false ) ) {
 
   // Hack to make sure the S/MIME CryptPlugs follows the strict requirement
-- 
cgit v1.2.3