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/kmcomposewin.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kmail/kmcomposewin.h')

diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 02f92154..840d3434 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -488,8 +488,8 @@ private slots:
   /**
    * KIO slots for attachment insertion
    */
-  void slotAttachFileData(KIO::Job *, const TQByteArray &);
-  void slotAttachFileResult(KIO::Job *);
+  void slotAttachFileData(TDEIO::Job *, const TQByteArray &);
+  void slotAttachFileResult(TDEIO::Job *);
 
   void slotListAction(const TQString &);
   void slotFontAction(const TQString &);
@@ -829,7 +829,7 @@ private:
 
   TQStringList mFolderNames;
   TQValueList<TQGuardedPtr<KMFolder> > mFolderList;
-  TQMap<KIO::Job*, KURL> mAttachJobs;
+  TQMap<TDEIO::Job*, KURL> mAttachJobs;
   KURL::List mAttachFilesPending;
   int mAttachFilesSend;
 
@@ -893,7 +893,7 @@ private:
     bool insert;
     TQCString encoding;
   };
-  TQMap<KIO::Job *, atmLoadData> mMapAtmLoadData;
+  TQMap<TDEIO::Job *, atmLoadData> mMapAtmLoadData;
 
   // These are for passing on methods over the applyChanges calls
   KMail::MessageSender::SendMethod mSendMethod;
-- 
cgit v1.2.3