[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=78e9c08

The following commit has been merged in the master branch:
commit 78e9c08732981402b69e6a5263e9eb4f895d4f17
Merge: 17da38e5ba89b385f6e02fd658e265d96b2211bc 1924173df206a03af8b119d62ff04dcb4cb629cf
Author: Vineet Garg <grgvineet at gmail.com>
Date:   Tue Aug 25 03:43:41 2015 +0530

    Merge branch 'master' into ssl
    
    Conflicts:
    	core/backends/lan/socketlinereader.h
    	core/backends/lan/uploadjob.h
    	core/networkpackage.h

 core/backends/lan/lanlinkprovider.cpp         |  2 +-
 core/backends/lan/socketlinereader.h          |  3 +-
 core/backends/lan/uploadjob.cpp               |  3 +-
 core/backends/lan/uploadjob.h                 |  4 ++-
 core/core_debug.h                             |  2 +-
 core/daemon.cpp                               |  5 ++-
 core/daemon.h                                 |  2 +-
 core/dbushelper.cpp                           |  2 +-
 core/dbushelper.h                             |  2 +-
 core/device.cpp                               |  4 +--
 core/kdeconnectconfig.cpp                     |  3 +-
 core/networkpackage.h                         |  3 +-
 interfaces/dbusinterfaces.h                   | 16 +++++-----
 interfaces/devicesmodel.cpp                   |  4 +--
 interfaces/devicesmodel.h                     |  2 +-
 interfaces/devicessortproxymodel.h            |  2 +-
 interfaces/interfaces_debug.h                 |  2 +-
 interfaces/modeltest.cpp                      | 46 +++++++++++++--------------
 interfaces/modeltest.h                        |  2 +-
 interfaces/notificationsmodel.cpp             |  6 ++--
 interfaces/notificationsmodel.h               |  2 +-
 kio/kiokdeconnect.cpp                         |  4 +--
 plasmoid/declarativeplugin/processrunner.h    |  2 +-
 plasmoid/declarativeplugin/responsewaiter.cpp |  3 +-
 plasmoid/declarativeplugin/responsewaiter.h   |  2 +-
 plugins/mpriscontrol/mpriscontrolplugin.cpp   |  2 +-
 plugins/notifications/notification_debug.h    |  2 +-
 plugins/sftp/mounter.cpp                      |  2 +-
 plugins/sftp/sftp_debug.h                     |  2 +-
 plugins/share/autoclosingqfile.h              |  2 +-
 plugins/share/share_debug.h                   |  2 +-
 31 files changed, 70 insertions(+), 70 deletions(-)

diff --cc core/backends/lan/socketlinereader.h
index e0d04f0,29b059a..79e4199
--- a/core/backends/lan/socketlinereader.h
+++ b/core/backends/lan/socketlinereader.h
@@@ -37,7 -37,7 +37,8 @@@ class SocketLineReade
      Q_OBJECT
  
  public:
-     SocketLineReader(QSslSocket* socket, QObject* parent = 0);
 -    explicit SocketLineReader(QTcpSocket* socket, QObject* parent = 0);
++
++    explicit SocketLineReader(QSslSocket* socket, QObject* parent = 0);
  
      QByteArray readLine() { return mPackages.dequeue(); }
      qint64 write(const QByteArray& data) { return mSocket->write(data); }
diff --cc core/backends/lan/uploadjob.cpp
index aab4366,90978f2..c426d2c
--- a/core/backends/lan/uploadjob.cpp
+++ b/core/backends/lan/uploadjob.cpp
@@@ -18,17 -18,17 +18,18 @@@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  
+ #include "uploadjob.h"
+ 
  #include <qalgorithms.h>
  #include <QtGlobal>
 +#include <kdeconnectconfig.h>
  
- #include "uploadjob.h"
  #include "core_debug.h"
  
 -UploadJob::UploadJob(const QSharedPointer<QIODevice>& source): KJob()
 +UploadJob::UploadJob(const QSharedPointer<QIODevice>& source, const QVariantMap& transferInfo): KJob()
  {
      mInput = source;
 -    mServer = new QTcpServer(this);
 +    mServer = new Server(this);
      mSocket = 0;
      mPort = 0;
  
diff --cc core/backends/lan/uploadjob.h
index c6105fe,40056b3..095381b
--- a/core/backends/lan/uploadjob.h
+++ b/core/backends/lan/uploadjob.h
@@@ -34,9 -34,9 +34,11 @@@ class UploadJo
  {
      Q_OBJECT
  public:
-     UploadJob(const QSharedPointer<QIODevice>& source,const QVariantMap& sslInfo);
 -    explicit UploadJob(const QSharedPointer<QIODevice>& source);
++
++    explicit UploadJob(const QSharedPointer<QIODevice>& source,const QVariantMap& sslInfo);
++
      virtual void start();
 -    QVariantMap getTransferInfo();
 +    QVariantMap transferInfo();
  
  private:
      QSharedPointer<QIODevice> mInput;

-- 
kdeconnect packaging