[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.2/kdelibs/kio/kio
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-02-25 8:22:46
Message-ID: 1235550166.478176.4036.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 931326 by tmcguire:

Backport r927894 by tmcguire from trunk to the 4.2 branch:

Un-deprecate KIO::Slave, which is still returned by the scheduler.
This fixes half a gazillion false warnings when building KMail.
Add a KDE5 todo instead.



 M  +6 -5      slave.h  


--- branches/KDE/4.2/kdelibs/kio/kio/slave.h #931325:931326
@@ -22,11 +22,7 @@
 #ifndef KIO_SLAVE_H
 #define KIO_SLAVE_H
 
-#if defined(MAKE_KIO_LIB) || defined(MAKE_KLAUNCHER)
-# define KIO_SLAVE_EXPORT  KIO_EXPORT
-#else
-# define KIO_SLAVE_EXPORT  KIO_EXPORT_DEPRECATED
-#endif
+#define KIO_SLAVE_EXPORT KIO_EXPORT
 
 #include <time.h>
 #include <unistd.h>
@@ -43,6 +39,11 @@
     // Attention developers: If you change the implementation of KIO::Slave,
     // do *not* use connection() or slaveconn but the respective KIO::Slave
     // accessor methods. Otherwise classes derived from Slave might break. (LS)
+    //
+    // Do not use this class directly, outside of KIO. Only use the Slave pointer
+    // that is returned by the scheduler for passing it around.
+    //
+    // TODO: KDE5: Separate public API and private stuff for this better
     class KIO_SLAVE_EXPORT Slave : public KIO::SlaveInterface
     {
 	Q_OBJECT
[prev in list] [next in list] [prev in thread] [next in thread]