diff options
| author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-11-22 18:39:46 -0200 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-11-24 14:45:45 -0200 |
| commit | 64f2fb1d8406000815294b81035228af041358e0 (patch) | |
| tree | ad3732e4f1371d3e4983af60bf7156dbd38af4fd /TelepathyQt/readiness-helper.cpp | |
| parent | c9201a5bb28ac31e21762b468e8814cae081d78f (diff) | |
Only generate QLatin1String macros for errors/constants.
Diffstat (limited to 'TelepathyQt/readiness-helper.cpp')
| -rw-r--r-- | TelepathyQt/readiness-helper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TelepathyQt/readiness-helper.cpp b/TelepathyQt/readiness-helper.cpp index 1bc810ab..c39fbf78 100644 --- a/TelepathyQt/readiness-helper.cpp +++ b/TelepathyQt/readiness-helper.cpp @@ -286,7 +286,7 @@ void ReadinessHelper::Private::iterateIntrospection() if (!depsFor(feature).intersect(missingFeatures).isEmpty()) { missingFeatures.insert(feature); missingFeaturesErrors.insert(feature, - QPair<QString, QString>(QLatin1String(TELEPATHY_ERROR_NOT_AVAILABLE), + QPair<QString, QString>(TP_QT_ERROR_NOT_AVAILABLE, QLatin1String("Feature depends on other features that are not available"))); } } @@ -363,7 +363,7 @@ void ReadinessHelper::Private::iterateIntrospection() introspectable.mPriv->dependsOnInterfaces << ", but interface" << interface << "is not present"; setIntrospectCompleted(feature, false, - QLatin1String(TELEPATHY_ERROR_NOT_AVAILABLE), + TP_QT_ERROR_NOT_AVAILABLE, QLatin1String("Feature depend on interfaces that are not available")); return; // will be called with a single-shot soon again } @@ -528,7 +528,7 @@ bool ReadinessHelper::isReady(const Feature &feature, if (!mPriv->supportedFeatures.contains(feature)) { if (errorName) { - *errorName = QLatin1String(TELEPATHY_ERROR_INVALID_ARGUMENT); + *errorName = TP_QT_ERROR_INVALID_ARGUMENT; } if (errorMessage) { *errorMessage = QLatin1String("Unsupported feature"); @@ -611,7 +611,7 @@ PendingReady *ReadinessHelper::becomeReady(const Features &requestedFeatures) PendingReady *operation = new PendingReady(SharedPtr<RefCounted>(mPriv->object), requestedFeatures); operation->setFinishedWithError( - QLatin1String(TELEPATHY_ERROR_INVALID_ARGUMENT), + TP_QT_ERROR_INVALID_ARGUMENT, QLatin1String("Requested features contains unsupported feature")); return operation; } |