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/annotationjobs.h | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'kmail/annotationjobs.h')

diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h
index 3972a80b0..8b50a025a 100644
--- a/kmail/annotationjobs.h
+++ b/kmail/annotationjobs.h
@@ -65,14 +65,14 @@ namespace AnnotationJobs {
  * @param entry the name of the annotation entry
  * @param attributes attribute name+value pairs
  */
-KIO::SimpleJob* setAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+TDEIO::SimpleJob* setAnnotation( TDEIO::Slave* slave, const KURL& url, const TQString& entry,
                                const TQMap<TQString,TQString>& attributes );
 
 class MultiSetAnnotationJob;
 /**
  * Set multiple annotation entries
  */
-MultiSetAnnotationJob* multiSetAnnotation( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations );
+MultiSetAnnotationJob* multiSetAnnotation( TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations );
 
 class GetAnnotationJob;
 /**
@@ -82,7 +82,7 @@ class GetAnnotationJob;
  * @param entry the name of the annotation entry
  * @param attributes attribute names
  */
-GetAnnotationJob* getAnnotation( KIO::Slave* slave, const KURL& url, const TQString& entry,
+GetAnnotationJob* getAnnotation( TDEIO::Slave* slave, const KURL& url, const TQString& entry,
                                  const TQStringList& attributes );
 
 class MultiGetAnnotationJob;
@@ -90,7 +90,7 @@ class MultiGetAnnotationJob;
  * Get multiple annotation entries
  * Currently we assume we want to get the "value" for each, to simplify the data structure.
  */
-MultiGetAnnotationJob* multiGetAnnotation( KIO::Slave* slave, const KURL& url, const TQStringList& entries );
+MultiGetAnnotationJob* multiGetAnnotation( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries );
 
 class MultiUrlGetAnnotationJob;
 /**
@@ -98,14 +98,14 @@ class MultiUrlGetAnnotationJob;
  * @param paths The paths to get the annotation for 
  * @param annotation The annotation to get
  */
-MultiUrlGetAnnotationJob* multiUrlGetAnnotation( KIO::Slave* slave,
+MultiUrlGetAnnotationJob* multiUrlGetAnnotation( TDEIO::Slave* slave,
                                               const KURL& baseUrl,
                                               const TQStringList& paths,
                                               const TQString& annotation );
 
 
 /// for getAnnotation()
-class GetAnnotationJob : public KIO::SimpleJob
+class GetAnnotationJob : public TDEIO::SimpleJob
 {
   Q_OBJECT
   
@@ -116,20 +116,20 @@ public:
   const AnnotationList& annotations() const { return mAnnotations; }
 
 protected slots:
-  void slotInfoMessage( KIO::Job*, const TQString& );
+  void slotInfoMessage( TDEIO::Job*, const TQString& );
 private:
   AnnotationList mAnnotations;
   TQString mEntry;
 };
 
 /// for multiGetAnnotation
-class MultiGetAnnotationJob : public KIO::Job
+class MultiGetAnnotationJob : public TDEIO::Job
 {
   Q_OBJECT
   
 
 public:
-  MultiGetAnnotationJob( KIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
+  MultiGetAnnotationJob( TDEIO::Slave* slave, const KURL& url, const TQStringList& entries, bool showProgressInfo );
 
 signals:
   // Emitted when a given annotation was found - or not found
@@ -137,33 +137,33 @@ signals:
 
 protected slots:
   virtual void slotStart();
-  virtual void slotResult( KIO::Job *job );
+  virtual void slotResult( TDEIO::Job *job );
 
 private:
-  KIO::Slave* mSlave;
+  TDEIO::Slave* mSlave;
   const KURL mUrl;
   const TQStringList mEntryList;
   TQStringList::const_iterator mEntryListIterator;
 };
 
 /// for multiUrlGetAnnotation
-class MultiUrlGetAnnotationJob : public KIO::Job
+class MultiUrlGetAnnotationJob : public TDEIO::Job
 {
   Q_OBJECT
   
 
 public:
-  MultiUrlGetAnnotationJob( KIO::Slave* slave, const KURL& baseUrl,
+  MultiUrlGetAnnotationJob( TDEIO::Slave* slave, const KURL& baseUrl,
                             const TQStringList& paths, const TQString& annotation );
 
   TQMap<TQString, TQString> annotations() const;
 
 protected slots:
   virtual void slotStart();
-  virtual void slotResult( KIO::Job *job );
+  virtual void slotResult( TDEIO::Job *job );
 
 private:
-  KIO::Slave* mSlave;
+  TDEIO::Slave* mSlave;
   const KURL mUrl;
   const TQStringList mPathList;
   TQStringList::const_iterator mPathListIterator;
@@ -172,13 +172,13 @@ private:
 };
 
 /// for multiSetAnnotation
-class MultiSetAnnotationJob : public KIO::Job
+class MultiSetAnnotationJob : public TDEIO::Job
 {
   Q_OBJECT
   
 
 public:
-  MultiSetAnnotationJob( KIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
+  MultiSetAnnotationJob( TDEIO::Slave* slave, const KURL& url, const AnnotationList& annotations, bool showProgressInfo );
 
 signals:
   // Emitted when a given annotation was successfully changed
@@ -186,10 +186,10 @@ signals:
 
 protected slots:
   virtual void slotStart();
-  virtual void slotResult( KIO::Job *job );
+  virtual void slotResult( TDEIO::Job *job );
 
 private:
-  KIO::Slave* mSlave;
+  TDEIO::Slave* mSlave;
   const KURL mUrl;
   const AnnotationList mAnnotationList;
   AnnotationList::const_iterator mAnnotationListIterator;
-- 
cgit v1.2.1