git.iko.soy/unity8
on xenial help sign in
Rename files, fix some includes and add a FIXME in DownloadTracker
64aad43Michał Sawicz
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt+2−2
compare with xenial
unifiedsplit
@@ -10,8 +10,8 @@ include_directories(
10)
10)
11
11
12set(DOWNLOADDAEMONLISTENER_SOURCES
12set(DOWNLOADDAEMONLISTENER_SOURCES
13− backend.cpp
13+ plugin.cpp
14− download_tracker.cpp
14+ DownloadTracker.cpp
15 interface/downloadtrackeradaptor.cpp
15 interface/downloadtrackeradaptor.cpp
16 )
16 )
17
17
plugins/Ubuntu/DownloadDaemonListener/download_tracker.cpp → plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpprenamed+2−1
@@ -19,7 +19,7 @@
19 */
19 */
20
20
21
21
22−#include "download_tracker.h"
22+#include "DownloadTracker.h"
23
23
24DownloadTracker::DownloadTracker(QObject *parent) :
24DownloadTracker::DownloadTracker(QObject *parent) :
25 QObject(parent)
25 QObject(parent)
@@ -66,6 +66,7 @@ void DownloadTracker::setService(QString& service)
66
66
67void DownloadTracker::startService()
67void DownloadTracker::startService()
68{
68{
69+ // FIXME update dbus path and service on changes
69 if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
70 if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
70 m_adaptor = new DownloadTrackerAdaptor(m_service, m_dbusPath, QDBusConnection::sessionBus(), 0);
71 m_adaptor = new DownloadTrackerAdaptor(m_service, m_dbusPath, QDBusConnection::sessionBus(), 0);
71
72
plugins/Ubuntu/DownloadDaemonListener/download_tracker.h → plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.hrenamed

The content is the same.

plugins/Ubuntu/DownloadDaemonListener/backend.cpp → plugins/Ubuntu/DownloadDaemonListener/plugin.cpprenamed+3−2
@@ -19,10 +19,11 @@
19 */
19 */
20
20
21
21
22+#include "plugin.h"
23+#include "DownloadTracker.h"
24+
22#include <QtQml>
25#include <QtQml>
23#include <QtQml/QQmlContext>
26#include <QtQml/QQmlContext>
24−#include "backend.h"
25−#include "download_tracker.h"
26
27
27
28
28void BackendPlugin::registerTypes(const char *uri)
29void BackendPlugin::registerTypes(const char *uri)
plugins/Ubuntu/DownloadDaemonListener/backend.h → plugins/Ubuntu/DownloadDaemonListener/plugin.hrenamed+2−2
@@ -22,8 +22,8 @@
22#ifndef BACKEND_PLUGIN_H
22#ifndef BACKEND_PLUGIN_H
23#define BACKEND_PLUGIN_H
23#define BACKEND_PLUGIN_H
24
24
25−#include <QtQml/QQmlEngine>
25+#include <QQmlEngine>
26−#include <QtQml/QQmlExtensionPlugin>
26+#include <QQmlExtensionPlugin>
27
27
28class BackendPlugin : public QQmlExtensionPlugin
28class BackendPlugin : public QQmlExtensionPlugin
29{
29{