Commit 955f0772 authored by Raine Makelainen's avatar Raine Makelainen

Merge branch 'jb47352' into 'master'

[nemo-storage] Expose private UDisks2 block. Contributes to JB#47352

See merge request !120
parents 14646e7f 4b14c61b
......@@ -59,6 +59,7 @@ PUBLIC_HEADERS = \
connmanvpnconnectionproxy.h \
developermodesettings.h \
batterystatus.h \
udisks2block_p.h \
udisks2defines.h \
diskusage.h \
partition.h \
......@@ -80,7 +81,6 @@ HEADERS += \
logging_p.h \
partition_p.h \
partitionmanager_p.h \
udisks2block_p.h \
udisks2blockdevices_p.h \
udisks2job_p.h \
udisks2monitor_p.h
......
/*
* Copyright (C) 2018 Jolla Ltd. <raine.makelainen@jolla.com>
* Copyright (c) 2018 - 2019 Jolla Ltd.
* Copyright (c) 2019 Open Mobile Platform LLC.
*
* You may use this file under the terms of the BSD license as follows:
*
......@@ -38,6 +39,8 @@
#include <QPointer>
#include <functional>
#include <systemsettingsglobal.h>
#include "udisks2defines.h"
class QDBusPendingCallWatcher;
......@@ -45,12 +48,13 @@ class QDBusPendingCallWatcher;
namespace UDisks2 {
class Block : public QObject
class SYSTEMSETTINGS_EXPORT Block : public QObject
{
Q_OBJECT
Q_PROPERTY(QString connectionBus READ connectionBus NOTIFY updated)
public:
Block(const QString &path, const UDisks2::InterfacePropertyMap &interfacePropertyMap, QObject *parent = nullptr);
virtual ~Block();
QString path() const;
......@@ -119,7 +123,6 @@ private slots:
void complete();
private:
Block(const QString &path, const UDisks2::InterfacePropertyMap &interfacePropertyMap, QObject *parent = nullptr);
Block& operator=(const Block& other);
bool setEncrypted(bool encrypted);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment