Albert Vaca
a58fab4fb3
Merge branch 'master' into frameworks
...
Conflicts:
cli/kdeconnect-cli.cpp
core/device.cpp
core/filetransferjob.cpp
core/filetransferjob.h
core/networkpackage.h
kded/CMakeLists.txt
plugins/share/shareplugin.cpp
plugins/telephony/telephonyplugin.cpp
2014-11-11 21:40:54 -08:00
Jens Dagerbo
53a33096ad
Changed int to qint64 for tracking payload size
...
No longer keeping the entire file in RAM while uploading
2014-11-09 12:57:09 -08:00
Aleix Pol
21ab5a4f81
Merge branch 'master' into frameworks
...
Mostly kDebug -> qCDebug
Also some KCmdLineArgs -> QCommandLineParser
Conflicts:
cli/kdeconnect-cli.cpp
core/CMakeLists.txt
core/backends/lan/lanlinkprovider.cpp
core/daemon.cpp
core/pluginloader.cpp
interfaces/CMakeLists.txt
kio/kiokdeconnect.cpp
plugins/mousepad/CMakeLists.txt
plugins/mousepad/mousepadplugin.h
plugins/mpriscontrol/mpriscontrolplugin.cpp
plugins/sftp/sftpplugin.cpp
2014-11-04 19:12:29 +01:00
Àlex Fiestas
d971269bd5
Remove kdebugnamespace completely and replace by core_debug
...
In those places that belong to "core" we use core_debug, in any other
place we have added custom logging categories so we use those instead.
2014-09-22 00:59:34 +02:00
Àlex Fiestas
473a34b76f
Por filetranasferjob to QUrl
...
Pretty much a straight forward port from KUrl to QUrl, since we are only
forwarding arguments there was not much to port but a simple /kurl/qurl/
2014-09-21 22:22:06 +02:00
Àlex Fiestas
f20f489999
Port to aelperay from QJson to native json support
...
Straight forward port from QJson to the native Json support.
As a note I have added 2 helper functions that make the code bit more
readable (object2qvariant and qvariatn2qobject).
2014-09-13 00:49:56 +02:00
Saikrishna Arcot
05fdbe0e5b
Add support for receiving keyboard entries.
...
This patch gets the keyboard entries from the Android client and passes
along the keycode.
REVIEW: 119254
2014-08-14 18:01:31 +02:00
Aleix Pol
b88897847b
Reorganize sources
...
We broke kded into core and kded, core contains the library with the backends
and plugins.
Also we renamed libkdeconnect to interfaces.
2014-06-14 15:22:40 +02:00
