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

List:       kde-commits
Subject:    Re: [kdelibs/frameworks] kio: Implement TODO: make SessionData completely private
From:       Dawit A <adawit () kde ! org>
Date:       2012-11-21 16:23:38
Message-ID: CALa28R6=uNAbsnyry1FKPSU=doHnGkSP_B3X9Tv34tE4suhkHw () mail ! gmail ! com
[Download RAW message or body]

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

[Attachment #3 (text/html)]

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.<div class="gmail_extra"><br><br><div class="gmail_quote">

On Wed, Nov 21, 2012 at 11:01 AM, David Faure <span dir="ltr">&lt;<a \
href="mailto:faure+bluesystems@kde.org" \
target="_blank">faure+bluesystems@kde.org</a>&gt;</span> wrote:<br><blockquote \
class="gmail_quote" style="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   +0      -1      kio/CMakeLists.txt<br>
M   +1      -1      kio/kio/scheduler.cpp<br>
M   +1      -1      kio/kio/sessiondata.cpp<br>
R   +4      -13    kio/kio/sessiondata_p.h [from: kio/kio/sessiondata.h - 074% \
similarity]<br> <br>
<a href="http://commits.kde.org/kdelibs/47ca762ac14e88739a055da0a2140cfeaea5a14e" \
target="_blank">http://commits.kde.org/kdelibs/47ca762ac14e88739a055da0a2140cfeaea5a14e</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(   FILES<br>
     kio/slaveinterface.h<br>
     kio/slave.h<br>
     kio/slaveconfig.h<br>
-   kio/sessiondata.h<br>
     kio/pixmaploader.h<br>
     kio/netaccess.h<br>
     kio/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>
  #include &quot;scheduler.h&quot;<br>
  #include &quot;scheduler_p.h&quot;<br>
<br>
-#include &quot;sessiondata.h&quot;<br>
+#include &quot;sessiondata_p.h&quot;<br>
  #include &quot;slaveconfig.h&quot;<br>
  #include &quot;authinfo.h&quot;<br>
  #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>
      Fifth Floor, Boston, MA 02110-1301, USA.<br>
  */<br>
<br>
-#include &quot;sessiondata.h&quot;<br>
+#include &quot;sessiondata_p.h&quot;<br>
<br>
  #include &lt;QtCore/QList&gt;<br>
  #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>
  namespace KIO   {<br>
<br>
-// KDE5 TODO: remove the KIO_EXPORT and rename to _p.h, this is really internal \
                only<br>
-<br>
  /**<br>
   * @internal<br>
   */<br>
-class KIO_EXPORT SessionData : public QObject<br>
+class SessionData : public QObject<br>
  {<br>
        Q_OBJECT<br>
<br>
@@ -40,18 +38,11 @@ public:<br>
        SessionData();<br>
        ~SessionData();<br>
<br>
-      virtual void configDataFor( KIO::MetaData &amp;configData, const QString \
                &amp;proto,<br>
-                                                const QString &amp;host );<br>
-      virtual void reset();<br>
-<br>
-//      struct AuthData;<br>
-<br>
-private:<br>
-      class AuthDataList;<br>
-      friend class AuthDataList;<br>
-//      AuthDataList* authData;<br>
+      void configDataFor( KIO::MetaData &amp;configData, const QString &amp;proto, \
const QString &amp;host );<br> +      void reset();<br>
<br>
  private:<br>
+      // TODO: fold private class back into this one, it&#39;s internal anyway<br>
        class SessionDataPrivate;<br>
        SessionDataPrivate* const d;<br>
  };<br>
</blockquote></div><br></div>



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

Configure | About | News | Add a list | Sponsored by KoreLogic