Skip to content

Commit 69498c7

Browse files
BLumiaBLumia
authored
refactor: rename classes prefix from DFM to D (#2)
Since it is no longer under deepin file manager domain.
1 parent 484a9b7 commit 69498c7

11 files changed

Lines changed: 325 additions & 325 deletions

dfmblockdevice.cpp renamed to dblockdevice.cpp

Lines changed: 127 additions & 127 deletions
Large diffs are not rendered by default.

dfmblockdevice.h renamed to dblockdevice.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@
1818
* You should have received a copy of the GNU General Public License
1919
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2020
*/
21-
#ifndef DFMBLOCKDEVICE_H
22-
#define DFMBLOCKDEVICE_H
21+
#ifndef DBLOCKDEVICE_H
22+
#define DBLOCKDEVICE_H
2323

2424
#include <QObject>
2525
#include <QVariantMap>
2626
#include <QDBusUnixFileDescriptor>
2727

2828
class QDBusObjectPath;
2929

30-
class DFMBlockDevicePrivate;
31-
class DFMBlockDevice : public QObject
30+
class DBlockDevicePrivate;
31+
class DBlockDevice : public QObject
3232
{
3333
Q_OBJECT
34-
Q_DECLARE_PRIVATE(DFMBlockDevice)
34+
Q_DECLARE_PRIVATE(DBlockDevice)
3535

3636
Q_PROPERTY(QString path READ path CONSTANT FINAL)
3737
Q_PROPERTY(bool watchChanges READ watchChanges WRITE setWatchChanges)
@@ -110,7 +110,7 @@ class DFMBlockDevice : public QObject
110110

111111
Q_ENUM(FSType)
112112

113-
~DFMBlockDevice();
113+
~DBlockDevice();
114114

115115
bool isValid() const;
116116
bool watchChanges() const;
@@ -213,18 +213,18 @@ public Q_SLOTS:
213213
void childConfigurationChanged(QList<QPair<QString, QVariantMap>> childConfiguration);
214214

215215
protected:
216-
explicit DFMBlockDevice(const QString &path, QObject *parent = nullptr);
217-
explicit DFMBlockDevice(DFMBlockDevicePrivate &dd, const QString &path, QObject *parent = nullptr);
216+
explicit DBlockDevice(const QString &path, QObject *parent = nullptr);
217+
explicit DBlockDevice(DBlockDevicePrivate &dd, const QString &path, QObject *parent = nullptr);
218218

219-
QScopedPointer<DFMBlockDevicePrivate> d_ptr;
219+
QScopedPointer<DBlockDevicePrivate> d_ptr;
220220

221221
private Q_SLOTS:
222222
void onInterfacesAdded(const QDBusObjectPath &object_path, const QMap<QString, QVariantMap> &interfaces_and_properties);
223223
void onInterfacesRemoved(const QDBusObjectPath &object_path, const QStringList &interfaces);
224224
void onPropertiesChanged(const QString &interface, const QVariantMap &changed_properties);
225225
// Q_PRIVATE_SLOT(d_ptr, void _q_onPropertiesChanged(const QString &, const QVariantMap &))
226226

227-
friend class DFMDiskManager;
227+
friend class DDiskManager;
228228
};
229229

230-
#endif // DFMBLOCKDEVICE_H
230+
#endif // DBLOCKDEVICE_H

dfmblockpartition.cpp renamed to dblockpartition.cpp

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -18,88 +18,88 @@
1818
* You should have received a copy of the GNU General Public License
1919
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2020
*/
21-
#include "dfmblockpartition.h"
22-
#include "private/dfmblockdevice_p.h"
21+
#include "dblockpartition.h"
22+
#include "private/dblockdevice_p.h"
2323
#include "udisks2_interface.h"
2424

25-
class DFMBlockPartitionPrivate : public DFMBlockDevicePrivate
25+
class DBlockPartitionPrivate : public DBlockDevicePrivate
2626
{
2727
public:
28-
DFMBlockPartitionPrivate(DFMBlockPartition *qq);
28+
DBlockPartitionPrivate(DBlockPartition *qq);
2929

3030
OrgFreedesktopUDisks2PartitionInterface *dbus;
3131
};
3232

33-
DFMBlockPartitionPrivate::DFMBlockPartitionPrivate(DFMBlockPartition *qq)
34-
: DFMBlockDevicePrivate(qq)
33+
DBlockPartitionPrivate::DBlockPartitionPrivate(DBlockPartition *qq)
34+
: DBlockDevicePrivate(qq)
3535
{
3636

3737
}
3838

39-
qulonglong DFMBlockPartition::flags() const
39+
qulonglong DBlockPartition::flags() const
4040
{
41-
Q_D(const DFMBlockPartition);
41+
Q_D(const DBlockPartition);
4242

4343
return d->dbus->flags();
4444
}
4545

46-
bool DFMBlockPartition::isContained() const
46+
bool DBlockPartition::isContained() const
4747
{
48-
Q_D(const DFMBlockPartition);
48+
Q_D(const DBlockPartition);
4949

5050
return d->dbus->isContained();
5151
}
5252

53-
bool DFMBlockPartition::isContainer() const
53+
bool DBlockPartition::isContainer() const
5454
{
55-
Q_D(const DFMBlockPartition);
55+
Q_D(const DBlockPartition);
5656

5757
return d->dbus->isContainer();
5858
}
5959

60-
QString DFMBlockPartition::name() const
60+
QString DBlockPartition::name() const
6161
{
62-
Q_D(const DFMBlockPartition);
62+
Q_D(const DBlockPartition);
6363

6464
return d->dbus->name();
6565
}
6666

67-
uint DFMBlockPartition::number() const
67+
uint DBlockPartition::number() const
6868
{
69-
Q_D(const DFMBlockPartition);
69+
Q_D(const DBlockPartition);
7070

7171
return d->dbus->number();
7272
}
7373

74-
qulonglong DFMBlockPartition::offset() const
74+
qulonglong DBlockPartition::offset() const
7575
{
76-
Q_D(const DFMBlockPartition);
76+
Q_D(const DBlockPartition);
7777

7878
return d->dbus->offset();
7979
}
8080

81-
qulonglong DFMBlockPartition::size() const
81+
qulonglong DBlockPartition::size() const
8282
{
83-
Q_D(const DFMBlockPartition);
83+
Q_D(const DBlockPartition);
8484

8585
return d->dbus->size();
8686
}
8787

88-
QString DFMBlockPartition::table() const
88+
QString DBlockPartition::table() const
8989
{
90-
Q_D(const DFMBlockPartition);
90+
Q_D(const DBlockPartition);
9191

9292
return d->dbus->table().path();
9393
}
9494

95-
QString DFMBlockPartition::type() const
95+
QString DBlockPartition::type() const
9696
{
97-
Q_D(const DFMBlockPartition);
97+
Q_D(const DBlockPartition);
9898

9999
return d->dbus->type();
100100
}
101101

102-
DFMBlockPartition::Type DFMBlockPartition::eType() const
102+
DBlockPartition::Type DBlockPartition::eType() const
103103
{
104104
const QString &type = this->type();
105105

@@ -116,14 +116,14 @@ DFMBlockPartition::Type DFMBlockPartition::eType() const
116116
return static_cast<Type>(value);
117117
}
118118

119-
QString DFMBlockPartition::UUID() const
119+
QString DBlockPartition::UUID() const
120120
{
121-
Q_D(const DFMBlockPartition);
121+
Q_D(const DBlockPartition);
122122

123123
return d->dbus->uUID();
124124
}
125125

126-
DFMBlockPartition::GUIDType DFMBlockPartition::guidType() const
126+
DBlockPartition::GUIDType DBlockPartition::guidType() const
127127
{
128128
static QByteArrayList list;
129129

@@ -272,7 +272,7 @@ DFMBlockPartition::GUIDType DFMBlockPartition::guidType() const
272272
return static_cast<GUIDType>((index + GUIDTypeBegin));
273273
}
274274

275-
QString DFMBlockPartition::typeDescription(DFMBlockPartition::Type type)
275+
QString DBlockPartition::typeDescription(DBlockPartition::Type type)
276276
{
277277
switch (type) {
278278
case Empty:
@@ -460,7 +460,7 @@ QString DFMBlockPartition::typeDescription(DFMBlockPartition::Type type)
460460
return QString();
461461
}
462462

463-
QString DFMBlockPartition::guidTypeDescription(GUIDType type)
463+
QString DBlockPartition::guidTypeDescription(GUIDType type)
464464
{
465465
switch ((int)type) {
466466
case Unused_None:
@@ -694,42 +694,42 @@ QString DFMBlockPartition::guidTypeDescription(GUIDType type)
694694
return "Invalid GUID type";
695695
}
696696

697-
void DFMBlockPartition::deletePartition(const QVariantMap &options)
697+
void DBlockPartition::deletePartition(const QVariantMap &options)
698698
{
699-
Q_D(DFMBlockPartition);
699+
Q_D(DBlockPartition);
700700

701701
d->dbus->Delete(options);
702702
}
703703

704-
void DFMBlockPartition::resize(qulonglong size, const QVariantMap &options)
704+
void DBlockPartition::resize(qulonglong size, const QVariantMap &options)
705705
{
706-
Q_D(DFMBlockPartition);
706+
Q_D(DBlockPartition);
707707

708708
d->dbus->Resize(size, options);
709709
}
710710

711-
void DFMBlockPartition::setFlags(qulonglong flags, const QVariantMap &options)
711+
void DBlockPartition::setFlags(qulonglong flags, const QVariantMap &options)
712712
{
713-
Q_D(DFMBlockPartition);
713+
Q_D(DBlockPartition);
714714

715715
d->dbus->SetFlags(flags, options);
716716
}
717717

718-
void DFMBlockPartition::setName(const QString &name, const QVariantMap &options)
718+
void DBlockPartition::setName(const QString &name, const QVariantMap &options)
719719
{
720-
Q_D(DFMBlockPartition);
720+
Q_D(DBlockPartition);
721721

722722
d->dbus->SetName(name, options);
723723
}
724724

725-
void DFMBlockPartition::setType(const QString &type, const QVariantMap &options)
725+
void DBlockPartition::setType(const QString &type, const QVariantMap &options)
726726
{
727-
Q_D(DFMBlockPartition);
727+
Q_D(DBlockPartition);
728728

729729
d->dbus->SetType(type, options);
730730
}
731731

732-
void DFMBlockPartition::setType(DFMBlockPartition::Type type, const QVariantMap &options)
732+
void DBlockPartition::setType(DBlockPartition::Type type, const QVariantMap &options)
733733
{
734734
if (type == Unknow)
735735
return;
@@ -741,19 +741,19 @@ void DFMBlockPartition::setType(DFMBlockPartition::Type type, const QVariantMap
741741
}
742742

743743
/*!
744-
* \class DFMBlockPartition
744+
* \class DBlockPartition
745745
* \inmodule dde-file-manager-lib
746746
*
747-
* \brief DFMBlockPartition class comment goes here
747+
* \brief DBlockPartition class comment goes here
748748
*
749-
* \sa DFMDiskManager::createBlockPartition
749+
* \sa DDiskManager::createBlockPartition
750750
*/
751751

752-
DFMBlockPartition::DFMBlockPartition(const QString &path, QObject *parent)
753-
: DFMBlockDevice(*new DFMBlockPartitionPrivate(this), path, parent)
752+
DBlockPartition::DBlockPartition(const QString &path, QObject *parent)
753+
: DBlockDevice(*new DBlockPartitionPrivate(this), path, parent)
754754
{
755755
d_func()->dbus = new OrgFreedesktopUDisks2PartitionInterface(UDISKS2_SERVICE, path, QDBusConnection::systemBus(), this);
756756

757-
connect(this, &DFMBlockPartition::typeChanged, this, &DFMBlockPartition::eTypeChanged);
758-
connect(this, &DFMBlockPartition::UUIDChanged, this, &DFMBlockPartition::guidTypeChanged);
757+
connect(this, &DBlockPartition::typeChanged, this, &DBlockPartition::eTypeChanged);
758+
connect(this, &DBlockPartition::UUIDChanged, this, &DBlockPartition::guidTypeChanged);
759759
}

dfmblockpartition.h renamed to dblockpartition.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
* You should have received a copy of the GNU General Public License
1919
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2020
*/
21-
#ifndef DFMBLOCKPARTITION_H
22-
#define DFMBLOCKPARTITION_H
21+
#ifndef DBLOCKPARTITION_H
22+
#define DBLOCKPARTITION_H
2323

24-
#include <dfmblockdevice.h>
24+
#include <dblockdevice.h>
2525

26-
class DFMBlockPartitionPrivate;
27-
class DFMBlockPartition : public DFMBlockDevice
26+
class DBlockPartitionPrivate;
27+
class DBlockPartition : public DBlockDevice
2828
{
2929
Q_OBJECT
30-
Q_DECLARE_PRIVATE(DFMBlockPartition)
30+
Q_DECLARE_PRIVATE(DBlockPartition)
3131

3232
Q_PROPERTY(qulonglong flags READ flags NOTIFY flagsChanged)
3333
Q_PROPERTY(bool isContained READ isContained NOTIFY isContainedChanged)
@@ -311,9 +311,9 @@ public Q_SLOTS: // METHODS
311311
void guidTypeChanged();
312312

313313
private:
314-
explicit DFMBlockPartition(const QString &path, QObject *parent = nullptr);
314+
explicit DBlockPartition(const QString &path, QObject *parent = nullptr);
315315

316-
friend class DFMDiskManager;
316+
friend class DDiskManager;
317317
};
318318

319-
#endif // DFMBLOCKPARTITION_H
319+
#endif // DBLOCKPARTITION_H

0 commit comments

Comments
 (0)