On Wed, Nov 21, 2012 at 11:01 AM, David Faure <faure+bluesystems@kde.org> wrote:

Git commit 47ca762ac14e88739a055da0a2140cfeaea5a14e by David Faure.
Committed on 21/11/2012 at 17:00.
Pushed by dfaure into branch 'frameworks'.

Implement TODO: make SessionData completely private

M +0 -1 kio/CMakeLists.txt
M +1 -1 kio/kio/scheduler.cpp
M +1 -1 kio/kio/sessiondata.cpp
R +4 -13 kio/kio/sessiondata_p.h [from: kio/kio/sessiondata.h - 074% similarity]

http://commits.kde.org/kdelibs/47ca762ac14e88739a055da0a2140cfeaea5a14e

diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index 3d3a0eb..5297da0 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -391,7 +391,6 @@ install( FILES
kio/slaveinterface.h
kio/slave.h
kio/slaveconfig.h
- kio/sessiondata.h
kio/pixmaploader.h
kio/netaccess.h
kio/job.h
diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
index 1283e59..0dcf64a 100644
--- a/kio/kio/scheduler.cpp
+++ b/kio/kio/scheduler.cpp
@@ -21,7 +21,7 @@
#include "scheduler.h"
#include "scheduler_p.h"

-#include "sessiondata.h"
+#include "sessiondata_p.h"
#include "slaveconfig.h"
#include "authinfo.h"
#include "slave.h"
diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp
index 0ae954b..19f70b2 100644
--- a/kio/kio/sessiondata.cpp
+++ b/kio/kio/sessiondata.cpp
@@ -18,7 +18,7 @@
Fifth Floor, Boston, MA 02110-1301, USA.
*/

-#include "sessiondata.h"
+#include "sessiondata_p.h"

#include <QtCore/QList>
#include <QtCore/QTextCodec>
diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata_p.h
similarity index 74%
rename from kio/kio/sessiondata.h
rename to kio/kio/sessiondata_p.h
index 76fa6de..f2dc6c0 100644
--- a/kio/kio/sessiondata.h
+++ b/kio/kio/sessiondata_p.h
@@ -27,12 +27,10 @@

namespace KIO {

-// KDE5 TODO: remove the KIO_EXPORT and rename to _p.h, this is really internal only
-
/**
* @internal
*/
-class KIO_EXPORT SessionData : public QObject
+class SessionData : public QObject
{
Q_OBJECT

@@ -40,18 +38,11 @@ public:
SessionData();
~SessionData();

- virtual void configDataFor( KIO::MetaData &configData, const QString &proto,
- const QString &host );
- virtual void reset();
-
-// struct AuthData;
-
-private:
- class AuthDataList;
- friend class AuthDataList;
-// AuthDataList* authData;
+ void configDataFor( KIO::MetaData &configData, const QString &proto, const QString &host );
+ void reset();

private:
+ // TODO: fold private class back into this one, it's internal anyway
class SessionDataPrivate;
SessionDataPrivate* const d;
};