--e89a8fb204c448429504cf03c87b
Content-Type: text/plain; charset=UTF-8

Actually SlaveConfig itself should also be made private, but some apps
might already be using it directly which is unfortunate. It was not really
intended for external use.


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;
>  };
>

--e89a8fb204c448429504cf03c87b
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Actually SlaveConfig itself should also be made private, but some apps migh=
t already be using it directly which is unfortunate. It was not really inte=
nded for external use.<div class=3D"gmail_extra"><br><br><div class=3D"gmai=
l_quote">

On Wed, Nov 21, 2012 at 11:01 AM, David Faure <span dir=3D"ltr">&lt;<a href=
=3D"mailto:faure+bluesystems@kde.org" target=3D"_blank">faure+bluesystems@k=
de.org</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_quote" style=3D"=
margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

Git commit 47ca762ac14e88739a055da0a2140cfeaea5a14e by David Faure.<br>
Committed on 21/11/2012 at 17:00.<br>
Pushed by dfaure into branch &#39;frameworks&#39;.<br>
<br>
Implement TODO: make SessionData completely private<br>
<br>
M =C2=A0+0 =C2=A0 =C2=A0-1 =C2=A0 =C2=A0kio/CMakeLists.txt<br>
M =C2=A0+1 =C2=A0 =C2=A0-1 =C2=A0 =C2=A0kio/kio/scheduler.cpp<br>
M =C2=A0+1 =C2=A0 =C2=A0-1 =C2=A0 =C2=A0kio/kio/sessiondata.cpp<br>
R =C2=A0+4 =C2=A0 =C2=A0-13 =C2=A0 kio/kio/sessiondata_p.h [from: kio/kio/s=
essiondata.h - 074% similarity]<br>
<br>
<a href=3D"http://commits.kde.org/kdelibs/47ca762ac14e88739a055da0a2140cfea=
ea5a14e" target=3D"_blank">http://commits.kde.org/kdelibs/47ca762ac14e88739=
a055da0a2140cfeaea5a14e</a><br>
<br>
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt<br>
index 3d3a0eb..5297da0 100644<br>
--- a/kio/CMakeLists.txt<br>
+++ b/kio/CMakeLists.txt<br>
@@ -391,7 +391,6 @@ install( =C2=A0FILES<br>
=C2=A0 =C2=A0kio/slaveinterface.h<br>
=C2=A0 =C2=A0kio/slave.h<br>
=C2=A0 =C2=A0kio/slaveconfig.h<br>
- =C2=A0kio/sessiondata.h<br>
=C2=A0 =C2=A0kio/pixmaploader.h<br>
=C2=A0 =C2=A0kio/netaccess.h<br>
=C2=A0 =C2=A0kio/job.h<br>
diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp<br>
index 1283e59..0dcf64a 100644<br>
--- a/kio/kio/scheduler.cpp<br>
+++ b/kio/kio/scheduler.cpp<br>
@@ -21,7 +21,7 @@<br>
=C2=A0#include &quot;scheduler.h&quot;<br>
=C2=A0#include &quot;scheduler_p.h&quot;<br>
<br>
-#include &quot;sessiondata.h&quot;<br>
+#include &quot;sessiondata_p.h&quot;<br>
=C2=A0#include &quot;slaveconfig.h&quot;<br>
=C2=A0#include &quot;authinfo.h&quot;<br>
=C2=A0#include &quot;slave.h&quot;<br>
diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp<br>
index 0ae954b..19f70b2 100644<br>
--- a/kio/kio/sessiondata.cpp<br>
+++ b/kio/kio/sessiondata.cpp<br>
@@ -18,7 +18,7 @@<br>
=C2=A0 =C2=A0 Fifth Floor, Boston, MA 02110-1301, USA.<br>
=C2=A0*/<br>
<br>
-#include &quot;sessiondata.h&quot;<br>
+#include &quot;sessiondata_p.h&quot;<br>
<br>
=C2=A0#include &lt;QtCore/QList&gt;<br>
=C2=A0#include &lt;QtCore/QTextCodec&gt;<br>
diff --git a/kio/kio/sessiondata.h b/kio/kio/sessiondata_p.h<br>
similarity index 74%<br>
rename from kio/kio/sessiondata.h<br>
rename to kio/kio/sessiondata_p.h<br>
index 76fa6de..f2dc6c0 100644<br>
--- a/kio/kio/sessiondata.h<br>
+++ b/kio/kio/sessiondata_p.h<br>
@@ -27,12 +27,10 @@<br>
<br>
=C2=A0namespace KIO =C2=A0{<br>
<br>
-// KDE5 TODO: remove the KIO_EXPORT and rename to _p.h, this is really int=
ernal only<br>
-<br>
=C2=A0/**<br>
=C2=A0 * @internal<br>
=C2=A0 */<br>
-class KIO_EXPORT SessionData : public QObject<br>
+class SessionData : public QObject<br>
=C2=A0{<br>
=C2=A0 =C2=A0 =C2=A0Q_OBJECT<br>
<br>
@@ -40,18 +38,11 @@ public:<br>
=C2=A0 =C2=A0 =C2=A0SessionData();<br>
=C2=A0 =C2=A0 =C2=A0~SessionData();<br>
<br>
- =C2=A0 =C2=A0virtual void configDataFor( KIO::MetaData &amp;configData, c=
onst QString &amp;proto,<br>
- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0const QString &amp;host );<br>
- =C2=A0 =C2=A0virtual void reset();<br>
-<br>
-// =C2=A0 =C2=A0struct AuthData;<br>
-<br>
-private:<br>
- =C2=A0 =C2=A0class AuthDataList;<br>
- =C2=A0 =C2=A0friend class AuthDataList;<br>
-// =C2=A0 =C2=A0AuthDataList* authData;<br>
+ =C2=A0 =C2=A0void configDataFor( KIO::MetaData &amp;configData, const QSt=
ring &amp;proto, const QString &amp;host );<br>
+ =C2=A0 =C2=A0void reset();<br>
<br>
=C2=A0private:<br>
+ =C2=A0 =C2=A0// TODO: fold private class back into this one, it&#39;s int=
ernal anyway<br>
=C2=A0 =C2=A0 =C2=A0class SessionDataPrivate;<br>
=C2=A0 =C2=A0 =C2=A0SessionDataPrivate* const d;<br>
=C2=A0};<br>
</blockquote></div><br></div>

--e89a8fb204c448429504cf03c87b--