Fix compilation of the WMDM device lister on windows
This commit is contained in:
parent
04dcfeb9d2
commit
526a9d9960
@ -595,6 +595,7 @@ boost::shared_ptr<ConnectedDevice> DeviceManager::Connect(int row) {
|
|||||||
QObject* instance = meta_object.newInstance(
|
QObject* instance = meta_object.newInstance(
|
||||||
Q_ARG(QUrl, device_url), Q_ARG(DeviceLister*, info.BestBackend()->lister_),
|
Q_ARG(QUrl, device_url), Q_ARG(DeviceLister*, info.BestBackend()->lister_),
|
||||||
Q_ARG(QString, info.BestBackend()->unique_id_), Q_ARG(DeviceManager*, this),
|
Q_ARG(QString, info.BestBackend()->unique_id_), Q_ARG(DeviceManager*, this),
|
||||||
|
Q_ARG(Application*, app_),
|
||||||
Q_ARG(int, info.database_id_), Q_ARG(bool, first_time));
|
Q_ARG(int, info.database_id_), Q_ARG(bool, first_time));
|
||||||
ret.reset(static_cast<ConnectedDevice*>(instance));
|
ret.reset(static_cast<ConnectedDevice*>(instance));
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
#include "wmdmloader.h"
|
#include "wmdmloader.h"
|
||||||
#include "wmdmprogress.h"
|
#include "wmdmprogress.h"
|
||||||
#include "wmdmthread.h"
|
#include "wmdmthread.h"
|
||||||
|
#include "core/application.h"
|
||||||
#include "core/logging.h"
|
#include "core/logging.h"
|
||||||
#include "core/utilities.h"
|
#include "core/utilities.h"
|
||||||
#include "library/librarybackend.h"
|
#include "library/librarybackend.h"
|
||||||
@ -35,8 +36,9 @@
|
|||||||
|
|
||||||
WmdmDevice::WmdmDevice(const QUrl& url, DeviceLister* lister,
|
WmdmDevice::WmdmDevice(const QUrl& url, DeviceLister* lister,
|
||||||
const QString& unique_id, DeviceManager* manager,
|
const QString& unique_id, DeviceManager* manager,
|
||||||
|
Application* app,
|
||||||
int database_id, bool first_time)
|
int database_id, bool first_time)
|
||||||
: ConnectedDevice(url, lister, unique_id, manager, database_id, first_time),
|
: ConnectedDevice(url, lister, unique_id, manager, app, database_id, first_time),
|
||||||
loader_thread_(new QThread(this)),
|
loader_thread_(new QThread(this)),
|
||||||
loader_(NULL)
|
loader_(NULL)
|
||||||
{
|
{
|
||||||
@ -49,7 +51,7 @@ void WmdmDevice::Init() {
|
|||||||
InitBackendDirectory("/", first_time_, false);
|
InitBackendDirectory("/", first_time_, false);
|
||||||
model_->Init();
|
model_->Init();
|
||||||
|
|
||||||
loader_ = new WmdmLoader(manager_->task_manager(), backend_, shared_from_this());
|
loader_ = new WmdmLoader(app_->task_manager(), backend_, shared_from_this());
|
||||||
loader_->moveToThread(loader_thread_);
|
loader_->moveToThread(loader_thread_);
|
||||||
|
|
||||||
connect(loader_, SIGNAL(Error(QString)), SIGNAL(Error(QString)));
|
connect(loader_, SIGNAL(Error(QString)), SIGNAL(Error(QString)));
|
||||||
|
@ -35,6 +35,7 @@ class WmdmDevice : public ConnectedDevice {
|
|||||||
public:
|
public:
|
||||||
Q_INVOKABLE WmdmDevice(const QUrl& url, DeviceLister* lister,
|
Q_INVOKABLE WmdmDevice(const QUrl& url, DeviceLister* lister,
|
||||||
const QString& unique_id, DeviceManager* manager,
|
const QString& unique_id, DeviceManager* manager,
|
||||||
|
Application* app,
|
||||||
int database_id, bool first_time);
|
int database_id, bool first_time);
|
||||||
~WmdmDevice();
|
~WmdmDevice();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user