Merge branch 'master' into 'master'

Progress support on notifications

See merge request !4

declarative/declarativetransfermodel.cpp

@@ -416,7 +416,7 @@ QSqlDatabase TransferModel::database()
 	TransferDatabase database;
         database.setDatabaseName(absDbPath);
         database.setConnectOptions(QLatin1String("QSQLITE_OPEN_READONLY")); // sanity check
-	thread_database.setLocalData(database);
+        thread_database.setLocalData(database);
     }
 
     QSqlDatabase &database = thread_database.localData();

doc/src/index.qdoc

@@ -63,10 +63,10 @@ share functionality implementation depends on the client e.g. if it's HW specifi
 such as Facebook. Each plugin must implement or use the following interface:
 
 \list
-    \o \l {TransferPluginInterface} Share plugin must implement this interface
-    \o \l {MediaTransferInterface} Share plugin must implement this interface
-    \o \l {TransferPluginInfo} Share plugin must provide information about plugin using this class
-    \o \l {TransferMethodInfo} Share plugin must provide information about e.g. accounts using this class
+    \li \l {TransferPluginInterface} Share plugin must implement this interface
+    \li \l {MediaTransferInterface} Share plugin must implement this interface
+    \li \l {TransferPluginInfo} Share plugin must provide information about plugin using this class
+    \li \l {TransferMethodInfo} Share plugin must provide information about e.g. accounts using this class
 \endlist
 
 \section3 Client API
@@ -77,14 +77,14 @@ example Transfer UI and client side sharing interface on top of it. The Transfer
 be used by clients who want to inform Nemo Transfer Engine of ongoing Sync or Downloads.
 
 \list
-    \o DBus API - see org.nemomobile.transferengine.xml. For the client side it will generate TransferEngineInterface
+    \li DBus API - see org.nemomobile.transferengine.xml. For the client side it will generate TransferEngineInterface
     class which can be used directly.
-    \o TransferEngineClient - The convenience API to create Sync and Download events.
+    \li TransferEngineClient - The convenience API to create Sync and Download events.
 \endlist
 
 \section3 Reference
 \list
-    \o \l {Nemo Transfer Engine Reference}
+    \li \l {Nemo Transfer Engine Reference}
 \endlist
 
 */

doc/src/mediaplugininterface.qdoc

@@ -41,9 +41,9 @@
     TransferEngine supports C++ share plugins. Each share plugin must implement couple of well defined interfaces:
 
     \list
-        \o \l TransferPluginInterface Provides interfaces to access required objects to start sharing.
-        \o \l MediaTransferInterface  Implements the actual sharing functionality
-        \o \l TransferPluginInfo      Provides information about plugin status such as is it ready.
+        \li \l TransferPluginInterface Provides interfaces to access required objects to start sharing.
+        \li \l MediaTransferInterface  Implements the actual sharing functionality
+        \li \l TransferPluginInfo      Provides information about plugin status such as is it ready.
     \endlist
 
     TransferPluginInterface provides information to the TransferEngine via this interface.

lib/imageoperation.cpp

@@ -38,9 +38,9 @@
 
     This class is meant to be used by share plugins. It can be used for:
     \list
-        \o Removing image metadata
-        \o Scaling image
-        \o Create a temp files from the image paths
+        \li Removing image metadata
+        \li Scaling image
+        \li Create a temp files from the image paths
     \endlist
 */
 

lib/mediatransferinterface.cpp

@@ -60,10 +60,10 @@ class MediaTransferInterfacePrivate
     each share plugin. The subclass of this class is resposible of providing:
 
     \list
-        \o Status information of the sharing
-        \o Progress of the sharing
-        \o Information, if cancel and restart actions are supported
-        \o Starting and/or canceling the sharing
+        \li Status information of the sharing
+        \li Progress of the sharing
+        \li Information, if cancel and restart actions are supported
+        \li Starting and/or canceling the sharing
     \endlist
 
 

lib/mediatransferinterface.h

@@ -53,7 +53,6 @@ class MediaTransferInterface: public QObject
 
     MediaItem *mediaItem();
 
-
     virtual QString displayName() const = 0;
     virtual QUrl serviceIcon() const = 0;
     virtual bool cancelEnabled() const = 0;

lib/transferdbrecord.h

@@ -32,9 +32,7 @@
 
 class TransferDBRecord
 {
-
 public:
-
     enum TransferDBRecordField {
         TransferID = 0,
         TransferType,

lib/transferengineclient.cpp

@@ -78,11 +78,11 @@ CallbackInterface::CallbackInterface()
     Construct CallbackInterface instance to provide callback information to the TransferEngineClient. Setup
     arguments as:
     \list
-        \o \a server  e.g. "com.jolla.myapp"
-        \o \a path   e.g. "/com/jolla/myapp"
-        \o \a interface  e.g. "com.jolla.myapp"
-        \o \a cancelMethod   Cancel method name e.g. "cancelSync"
-        \o \a restartMethod Restart method name e.g. "restartSync"
+        \li \a server  e.g. "com.jolla.myapp"
+        \li \a path   e.g. "/com/jolla/myapp"
+        \li \a interface  e.g. "com.jolla.myapp"
+        \li \a cancelMethod   Cancel method name e.g. "cancelSync"
+        \li \a restartMethod Restart method name e.g. "restartSync"
     \endlist
  */
 CallbackInterface::CallbackInterface(const QString &server, const QString &path, const QString &interface,
@@ -222,9 +222,9 @@ TransferEngineClient::~TransferEngineClient()
     Create a download event to the TransferEngine. This only creates and entry, and client
     needs still call:
     \list
-        \o \l TransferEngineClient::startTransfer()
-        \o \l TransferEngineClient::updateTransferProgress()
-        \o \l TransferEngineClient::finishTransfer()
+        \li \l TransferEngineClient::startTransfer()
+        \li \l TransferEngineClient::updateTransferProgress()
+        \li \l TransferEngineClient::finishTransfer()
     \endlist
 
     \sa createSyncEvent(), startTransfer(), updateTransferProgress(), finishTransfer()
@@ -325,9 +325,9 @@ void TransferEngineClient::updateTransferProgress(int transferId, qreal progress
     Finalize the transfer with \a transferId. There are three options for finalizing the transfer by setting
     the \a status parameter value:
     \list
-        \o \l TransferEngineClient::TransferFinished - success
-        \o \l TransferEngineClient::TransferCanceled - user cancelation
-        \o \l TransferEngineClient::TransferInterrupted - an error
+        \li \l TransferEngineClient::TransferFinished - success
+        \li \l TransferEngineClient::TransferCanceled - user cancelation
+        \li \l TransferEngineClient::TransferInterrupted - an error
     \endlist
 
     If the client wants to provide reason for finishing the transfer, it's possible to provide \a reason
@@ -388,7 +388,7 @@ void TransferEngineClient::enableNotifications(bool enable)
 /*!
     Private method for QML interface.
 
-    \returns true if notifications are enabled, otherwise false is returned.
+    Returns true if notifications are enabled, otherwise false is returned.
  */
 bool TransferEngineClient::notificationsEnabled() const
 {

lib/transfermethodinfo.cpp

@@ -182,7 +182,7 @@ QVariant TransferMethodInfo::value(int index) const
         return accountId;
     case AccountIcon:
         return accountIcon;
-   default:
+    default:
         return QVariant();
     }
 }

rpm/transfer-engine-qt5.spec

@@ -36,7 +36,6 @@ Obsoletes: nemo-transferengine <= 0.0.19
 %{_bindir}/nemo-transfer-engine
 %{_datadir}/dbus-1/services/org.nemo.transferengine.service
 %{_datadir}/translations/nemo-transfer-engine_eng_en.qm
-%{_datadir}/lipstick/notificationcategories/*
 
 %package -n libnemotransferengine-qt5
 Summary: Transfer engine library.