From 4d3b32d56eb9515efcbd988c6d086d2b9e9c7288 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 25 Mar 2017 19:51:19 +0100 Subject: [PATCH] Fix typo --- lib/alpm/package.cpp | 10 +++++----- lib/alpm/package.h | 2 +- lib/alpm/repository.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/alpm/package.cpp b/lib/alpm/package.cpp index 7924084..6203484 100644 --- a/lib/alpm/package.cpp +++ b/lib/alpm/package.cpp @@ -118,11 +118,11 @@ bool Package::matches(const QString &name, const QString &version, const Depende case DependencyMode::Equal: return PackageVersion(version).compare(PackageVersion(dependency.version)) == PackageVersionComparsion::Equal; case DependencyMode::GreatherEqual: - return (cmp = PackageVersion(version).compare(PackageVersion(dependency.version))) == PackageVersionComparsion::Equal || cmp == PackageVersionComparsion::NewerThenSyncVersion; + return (cmp = PackageVersion(version).compare(PackageVersion(dependency.version))) == PackageVersionComparsion::Equal || cmp == PackageVersionComparsion::NewerThanSyncVersion; case DependencyMode::LessEqual: return (cmp = PackageVersion(version).compare(PackageVersion(dependency.version))) == PackageVersionComparsion::Equal || cmp == PackageVersionComparsion::PackageUpgradeOnly || cmp == PackageVersionComparsion::SoftwareUpgrade; case DependencyMode::GreatherThen: - return PackageVersion(version).compare(PackageVersion(dependency.version)) == PackageVersionComparsion::NewerThenSyncVersion; + return PackageVersion(version).compare(PackageVersion(dependency.version)) == PackageVersionComparsion::NewerThanSyncVersion; case DependencyMode::LessThen: return (cmp = PackageVersion(version).compare(PackageVersion(dependency.version))) == PackageVersionComparsion::PackageUpgradeOnly || cmp == PackageVersionComparsion::SoftwareUpgrade; default: @@ -995,14 +995,14 @@ PackageVersionComparsion PackageVersion::compare(const PackageVersion &other) co if(!epoch.isEmpty() || !other.epoch.isEmpty()) { switch(compareParts(other.epoch, epoch)) { case PackageVersionPartComparsion::Newer: return PackageVersionComparsion::SoftwareUpgrade; - case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThenSyncVersion; + case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThanSyncVersion; case PackageVersionPartComparsion::Equal: ; } } // check whether upstream version differs switch(compareParts(other.version, version)) { case PackageVersionPartComparsion::Newer: return PackageVersionComparsion::SoftwareUpgrade; - case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThenSyncVersion; + case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThanSyncVersion; case PackageVersionPartComparsion::Equal: ; } // check whether package version differs @@ -1010,7 +1010,7 @@ PackageVersionComparsion PackageVersion::compare(const PackageVersion &other) co // only consider package release if both versions specify it (otherwise consider packages equal) switch(compareParts(other.release, release)) { case PackageVersionPartComparsion::Newer: return PackageVersionComparsion::PackageUpgradeOnly; - case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThenSyncVersion; + case PackageVersionPartComparsion::Older: return PackageVersionComparsion::NewerThanSyncVersion; case PackageVersionPartComparsion::Equal: ; } } diff --git a/lib/alpm/package.h b/lib/alpm/package.h index c23446b..a00ded7 100644 --- a/lib/alpm/package.h +++ b/lib/alpm/package.h @@ -25,7 +25,7 @@ enum class PackageVersionComparsion Equal, /*!< The version of this package is the same as the version of the package from the sync db. */ SoftwareUpgrade, /*!< The software version of the package from the sync db is newer. */ PackageUpgradeOnly, /*!< The package release number of the package from the sync db is newer. */ - NewerThenSyncVersion /*!< The version of this package is NEWER then the version of the package from the sync db. */ + NewerThanSyncVersion /*!< The version of this package is NEWER than the version of the package from the sync db. */ }; /*! diff --git a/lib/alpm/repository.cpp b/lib/alpm/repository.cpp index b7dce4b..ce20042 100644 --- a/lib/alpm/repository.cpp +++ b/lib/alpm/repository.cpp @@ -403,7 +403,7 @@ void Repository::checkForUpgrades(UpgradeLookupResults &results, const QListversion()); break; - case PackageVersionComparsion::NewerThenSyncVersion: + case PackageVersionComparsion::NewerThanSyncVersion: results.downgrades << UpgradeResult(syncPkg, pkgEntry.second->version()); } orphaned = false;