Minor changes

core/backends/devicelink.cpp

@@ -29,6 +29,5 @@ DeviceLink::DeviceLink(const QString& deviceId, LinkProvider* parent)
     Q_ASSERT(!deviceId.isEmpty());
 
     setProperty("deviceId", deviceId);
-    //gcc complains if we don't add something to compile on a class with virtual functions
 }
 

core/backends/lan/lanlinkprovider.cpp

@@ -193,7 +193,6 @@ void LanLinkProvider::connected()
 
     bool success = deviceLink->sendPackage(np2);
 
-    //TODO: Use reverse connection too to preffer connecting a unstable device (a phone) to a stable device (a computer)
     if (success) {
 
         //kDebug(debugArea()) << "Handshaking done (i'm the existing device)";

core/backends/linkprovider.h

@@ -36,7 +36,7 @@ class LinkProvider
 
 public:
 
-    const static int PRIORITY_LOW = 0;      //eg: 3g
+    const static int PRIORITY_LOW = 0;      //eg: 3g internet
     const static int PRIORITY_MEDIUM = 50;  //eg: internet
     const static int PRIORITY_HIGH = 100;   //eg: lan
 

core/daemon.cpp

@@ -77,7 +77,7 @@ Daemon::Daemon(QObject *parent)
 
     //kDebug(debugArea()) << "QCA supported capabilities:" << QCA::supportedFeatures().join(",");
     if(!QCA::isSupported("rsa")) {
-        //TODO: Maybe display this in a more visible way?
+        //TODO: Display this in a notification or another visible way
         kWarning(debugArea()) << "Error: KDE Connect could not find support for RSA in your QCA installation, if your distribution provides"
                    << "separate packages for QCA-ossl and QCA-gnupg plugins, make sure you have them installed and try again.";
         return;

core/dbushelper.cpp

@@ -21,7 +21,6 @@
 #include "dbushelper.h"
 
 #include <QRegExp>
-#include <kdebug.h>
 
 namespace DbusHelper {
 

core/filetransferjob.cpp

@@ -190,7 +190,7 @@ void FileTransferJob::sourceFinished()
     //Make sure we do not enter this function again
     disconnect(mOrigin.data(), SIGNAL(aboutToClose()),this, SLOT(sourceFinished()));
 
-    //TODO: MD5 check the file
+    //TODO: MD5-check the file
     if (mSize > -1 && mWritten != mSize) {
         kDebug(debugArea()) << "Received incomplete file (" << mWritten << " of " << mSize << " bytes)";
         setError(1);

core/networkpackage.cpp

@@ -58,7 +58,7 @@ void NetworkPackage::createIdentityPackage(NetworkPackage* np)
     np->mPayloadSize = 0;
     np->set("deviceId", id);
     np->set("deviceName", qgetenv("USER") + "@" + QHostInfo::localHostName());
-    np->set("protocolType", "desktop"); //TODO: Detect laptop, tablet, phone...
+    np->set("deviceType", "desktop"); //TODO: Detect laptop, tablet, phone...
     np->set("protocolVersion",  NetworkPackage::ProtocolVersion);
     np->set("SupportedIncomingInterfaces", PluginLoader::instance()->incomingInterfaces().join(","));
     np->set("SupportedOutgoingInterfaces", PluginLoader::instance()->outgoingInterfaces().join(","));

kio/kiokdeconnect.cpp

@@ -92,7 +92,8 @@ void KioKdeconnect::listAllDevices()
 {
     infoMessage(i18n("Listing devices..."));
 
-    QStringList devices = m_dbusInterface->devices(true, true); //TODO: Change to all devices and show different icons for connected and disconnected?
+    //TODO: Change to all devices and show different icons for connected and disconnected?
+    QStringList devices = m_dbusInterface->devices(true, true);
 
     totalSize(devices.length());
 

plugins/mousepad/mousepadplugin.cpp

@@ -78,7 +78,7 @@ MousepadPlugin::~MousepadPlugin()
 
 bool MousepadPlugin::receivePackage(const NetworkPackage& np)
 {
-    //TODO: Split in several package types to avoid big if statements: mouse move, mouse click and keyboard events
+    //TODO: Split mouse/keyboard in two different plugins to avoid big if statements
 
     float dx = np.get<float>("dx", 0);
     float dy = np.get<float>("dy", 0);

plugins/mpriscontrol/mpriscontrolplugin.cpp

@@ -20,7 +20,6 @@
 
 #include "mpriscontrolplugin.h"
 
-
 #include <QDBusArgument>
 #include <QDBusConnection>
 #include <QDBusInterface>
@@ -158,7 +157,7 @@ bool MprisControlPlugin::receivePackage (const NetworkPackage& np)
     if (np.has("action")) {
         const QString& action = np.get<QString>("action");
         kDebug(debugArea()) << "Calling action" << action << "in" << playerList[player];
-        //TODO: Check for valid actions
+        //TODO: Check for valid actions, currently we trust anything the other end sends us
         mprisInterface.call(action);
     }
     if (np.has("setVolume")) {

plugins/sftp/mounter.cpp

@@ -95,7 +95,6 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
     //TODO implement on android side
     //if (np.get<int>("id") != m_id) return;
 
-
     //This is the previous code, to access sftp server using KIO. Now we are
     //using the external binary sshfs, and accessing it as a local filesystem.
   /*

plugins/share/shareplugin.cpp

@@ -64,7 +64,7 @@ KUrl SharePlugin::destinationDir() const
 bool SharePlugin::receivePackage(const NetworkPackage& np)
 {
 /*
-    //TODO: Use this code to write a test
+    //TODO: Write a test like this
     if (np.type() == PACKAGE_TYPE_PING) {
 
         kDebug(debugArea()) << "sending file" << (QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/.bashrc");

plugins/telephony/telephonyplugin.cpp

@@ -60,10 +60,13 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
     } else if (event == "talking") {
         return NULL;
     } else {
-        //TODO: return NULL if !debug
+#ifdef NDEBUG
+        return NULL;
+#else
         type = "unknownEvent";
         icon = "pda";
         content = i18n("Unknown telephony event: %2", event);
+#endif
     }
 
     kDebug(debugArea()) << "Creating notification with type:" << type;