Diffstat (limited to 'noncore/settings/aqpkg/version.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/settings/aqpkg/version.cpp | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/noncore/settings/aqpkg/version.cpp b/noncore/settings/aqpkg/version.cpp index e836da1..59e6f3f 100644 --- a/noncore/settings/aqpkg/version.cpp +++ b/noncore/settings/aqpkg/version.cpp @@ -25,3 +25,5 @@ -# define _(Text) Text +#include <qobject.h> + +//# define _(Text) Text @@ -46,3 +48,3 @@ public: } - + unsigned long epoch; @@ -51,5 +53,5 @@ public: const char *familiar_revision; -}; +}; -static int verrevcmp(const char *val, const char *ref) +static int verrevcmp(const char *val, const char *ref) { @@ -84,3 +86,3 @@ static int verrevcmp(const char *val, const char *ref) int versioncompare(const struct versionrevision *version, - const struct versionrevision *refversion) + const struct versionrevision *refversion) { @@ -97,3 +99,3 @@ int versionsatisfied3(const struct versionrevision *it, const struct versionrevision *ref, - const char *op) + const char *op) { @@ -111,3 +113,3 @@ int versionsatisfied3(const struct versionrevision *it, return r == 0; - fprintf(stderr, "unknown operator: %s", op); +// fprintf(stderr, "unknown operator: %s", op); @@ -116,3 +118,3 @@ int versionsatisfied3(const struct versionrevision *it, -const char *parseversion(struct versionrevision *rversion, const char *string) +const char *parseversion(struct versionrevision *rversion, const char *string) { @@ -121,4 +123,5 @@ const char *parseversion(struct versionrevision *rversion, const char *string) - if (!*string) return _("version string is empty"); - + if ( !*string ) + return QObject::tr( "Version string is empty." ); + colon= strchr(string,':'); @@ -126,4 +129,6 @@ const char *parseversion(struct versionrevision *rversion, const char *string) epoch= strtoul(string,&eepochcolon,10); - if (colon != eepochcolon) return _("epoch in version is not number"); - if (!*++colon) return _("nothing after colon in version number"); + if ( colon != eepochcolon ) + return QObject::tr( "Epoch in version is not number." ); + if ( !*++colon ) + return QObject::tr( "Nothing after colon in version number." ); string= colon; @@ -158,3 +163,3 @@ const char *parseversion(struct versionrevision *rversion, const char *string) rversion->familiar_revision); -*/ +*/ return 0; @@ -169,3 +174,3 @@ int compareVersions( const char *v1, const char *v2 ) if (err) { - fprintf(stderr, "Invalid version `%s': %s\n", v2, err); +// fprintf(stderr, "Invalid version `%s': %s\n", v2, err); return -2; @@ -175,3 +180,3 @@ int compareVersions( const char *v1, const char *v2 ) if (err) { - fprintf(stderr, "Invalid version `%s': %s\n", v1, err); +// fprintf(stderr, "Invalid version `%s': %s\n", v1, err); return -2; @@ -188,3 +193,3 @@ int compareVersions( const char *v1, const char *v2 ) /* -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) { @@ -203,3 +208,3 @@ int main(int argc, char *argv[]) } - + err = parseversion(&ref, argv[3]); |