Skip to content

Commit

Permalink
Fix typo "partions" to "partitions"
Browse files Browse the repository at this point in the history
  • Loading branch information
rainemak committed Aug 29, 2018
1 parent cec3b79 commit bc304fb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions src/udisks2monitor.cpp
Expand Up @@ -188,10 +188,10 @@ void UDisks2::Monitor::format(const QString &deviceName, const QString &type, co
}

const QString objectPath = this->objectPath(deviceName);
PartitionManagerPrivate::Partitions affectedPartions;
lookupPartitions(affectedPartions, QStringList() << objectPath);
PartitionManagerPrivate::Partitions affectedPartitions;
lookupPartitions(affectedPartitions, QStringList() << objectPath);

for (auto partition : affectedPartions) {
for (auto partition : affectedPartitions) {
if (partition->status == Partition::Mounted) {
m_operationQueue.enqueue(Operation(QStringLiteral("format"), deviceName, objectPath, type, arguments));
unmount(deviceName);
Expand Down Expand Up @@ -309,10 +309,10 @@ void UDisks2::Monitor::updatePartitionProperties(const UDisks2::Block *blockDevi
void UDisks2::Monitor::updatePartitionStatus(const UDisks2::Job *job, bool success)
{
UDisks2::Job::Operation operation = job->operation();
PartitionManagerPrivate::Partitions affectedPartions;
lookupPartitions(affectedPartions, job->value(UDISKS2_JOB_KEY_OBJECTS).toStringList());
PartitionManagerPrivate::Partitions affectedPartitions;
lookupPartitions(affectedPartitions, job->value(UDISKS2_JOB_KEY_OBJECTS).toStringList());
if (operation == UDisks2::Job::Lock || operation == UDisks2::Job::Unlock) {
for (auto partition : affectedPartions) {
for (auto partition : affectedPartitions) {
Partition::Status oldStatus = partition->status;
if (success) {
if (job->status() == UDisks2::Job::Added) {
Expand All @@ -332,7 +332,7 @@ void UDisks2::Monitor::updatePartitionStatus(const UDisks2::Job *job, bool succe
}
}
} else if (operation == UDisks2::Job::Mount || operation == UDisks2::Job::Unmount) {
for (auto partition : affectedPartions) {
for (auto partition : affectedPartitions) {
Partition::Status oldStatus = partition->status;

if (success) {
Expand All @@ -359,7 +359,7 @@ void UDisks2::Monitor::updatePartitionStatus(const UDisks2::Job *job, bool succe
}
}
} else if (operation == UDisks2::Job::Format) {
for (auto partition : affectedPartions) {
for (auto partition : affectedPartitions) {
Partition::Status oldStatus = partition->status;
if (success) {
if (job->status() == UDisks2::Job::Added) {
Expand Down Expand Up @@ -526,7 +526,7 @@ void UDisks2::Monitor::startMountOperation(const QString &deviceName, const QStr
}
}

void UDisks2::Monitor::lookupPartitions(PartitionManagerPrivate::Partitions &affectedPartions, const QStringList &objects)
void UDisks2::Monitor::lookupPartitions(PartitionManagerPrivate::Partitions &affectedPartitions, const QStringList &objects)
{
QStringList blockDevs;
for (const QString objectPath : objects) {
Expand All @@ -541,7 +541,7 @@ void UDisks2::Monitor::lookupPartitions(PartitionManagerPrivate::Partitions &aff
for (const QString &dev : blockDevs) {
for (auto partition : m_manager->m_partitions) {
if (partition->devicePath == dev) {
affectedPartions << partition;
affectedPartitions << partition;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/udisks2monitor_p.h
Expand Up @@ -107,7 +107,7 @@ private slots:

void startLuksOperation(const QString &deviceName, const QString &dbusMethod, const QString &dbusObjectPath, const QVariantList &arguments);
void startMountOperation(const QString &deviceName, const QString &dbusMethod, const QString &dbusObjectPath, const QVariantList &arguments);
void lookupPartitions(PartitionManagerPrivate::Partitions &affectedPartions, const QStringList &objects);
void lookupPartitions(PartitionManagerPrivate::Partitions &affectedPartitions, const QStringList &objects);

void createPartition(const Block *block);
void createBlockDevice(const QString &path, const InterfaceAndPropertyMap &interfacePropertyMap);
Expand Down

0 comments on commit bc304fb

Please sign in to comment.