alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the negative values of the enums

Browse Source
This commit is contained in:
Giorgos Tsiapaliwkas 2012-03-16 17:03:18 +02:00
parent 48def0fb72
commit ee8eadcc80
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
declarativeimports/locale/locale.h
View File

@ -447,10 +447,10 @@ public:
*/ */
enum BinarySizeUnits { enum BinarySizeUnits {
/// Auto-choose a unit such that the result is in the range [0, 1000 or 1024) /// Auto-choose a unit such that the result is in the range [0, 1000 or 1024)
DefaultBinaryUnits = -1, DefaultBinaryUnits = 1000,
// The first real unit must be 0 for the current implementation! // The first real unit must be 0 for the current implementation!
UnitByte, ///< B 1 byte UnitByte = 0, ///< B 1 byte
UnitKiloByte, ///< KiB/KB/kB 1024/1000 bytes. UnitKiloByte, ///< KiB/KB/kB 1024/1000 bytes.
UnitMegaByte, ///< MiB/MB/MB 2^20/10^06 bytes. UnitMegaByte, ///< MiB/MB/MB 2^20/10^06 bytes.
UnitGigaByte, ///< GiB/GB/GB 2^30/10^09 bytes. UnitGigaByte, ///< GiB/GB/GB 2^30/10^09 bytes.
@ -480,8 +480,8 @@ public:
* @see setBinaryUnitDialect * @see setBinaryUnitDialect
*/ */
enum BinaryUnitDialect { enum BinaryUnitDialect {
DefaultBinaryDialect = -1, ///< Used if no specific preference DefaultBinaryDialect = 1000, ///< Used if no specific preference
IECBinaryDialect, ///< KDE Default, KiB, MiB, etc. 2^(10*n) IECBinaryDialect = 0, ///< KDE Default, KiB, MiB, etc. 2^(10*n)
JEDECBinaryDialect, ///< KDE 3.5 default, KB, MB, etc. 2^(10*n) JEDECBinaryDialect, ///< KDE 3.5 default, KB, MB, etc. 2^(10*n)
MetricBinaryDialect, ///< SI Units, kB, MB, etc. 10^(3*n) MetricBinaryDialect, ///< SI Units, kB, MB, etc. 10^(3*n)
LastBinaryDialect = MetricBinaryDialect LastBinaryDialect = MetricBinaryDialect
@ -620,7 +620,7 @@ public:
* @see weekNumberSystem() * @see weekNumberSystem()
*/ */
enum WeekNumberSystem { enum WeekNumberSystem {
DefaultWeekNumber = -1, /**< The system locale default */ DefaultWeekNumber = 1000, /**< The system locale default */
IsoWeekNumber = 0, /**< ISO Week Number */ IsoWeekNumber = 0, /**< ISO Week Number */
FirstFullWeek = 1, /**< Week 1 starts on the first Week Start Day in year ends after 7 days */ FirstFullWeek = 1, /**< Week 1 starts on the first Week Start Day in year ends after 7 days */
FirstPartialWeek = 2, /**< Week 1 starts Jan 1st ends day before first Week Start Day in year */ FirstPartialWeek = 2, /**< Week 1 starts Jan 1st ends day before first Week Start Day in year */
@ -704,7 +704,7 @@ public:
* @see DateTimeComponentFormat * @see DateTimeComponentFormat
*/ */
enum DateTimeComponentFormat { enum DateTimeComponentFormat {
DefaultComponentFormat = -1, /**< The system locale default for the componant */ DefaultComponentFormat = 1000, /**< The system locale default for the componant */
ShortNumber = 0, /**< Number at its natural width, e.g. 2 for the 2nd*/ ShortNumber = 0, /**< Number at its natural width, e.g. 2 for the 2nd*/
LongNumber, /**< Number padded to a required width, e.g. 02 for the 2nd*/ LongNumber, /**< Number padded to a required width, e.g. 02 for the 2nd*/
//OrdinalNumber /**< Ordinal number format, e.g. "2nd" for the 2nd */ //OrdinalNumber /**< Ordinal number format, e.g. "2nd" for the 2nd */

4
declarativeimports/locale/tests/contents/code/klocaleqmltest.qml
View File

@ -312,8 +312,8 @@ Item {
Locale { Locale {
id: locale id: locale
//TODO enums with negative value(like -1) doesn't work in QML!
binaryUnitDialect: Locale.IECBinaryDialect binaryUnitDialect: Locale.DefaultBinaryUnits
onBinaryUnitDialectChanged: { onBinaryUnitDialectChanged: {
console.log("the binaryUnitDialect property has been changed") console.log("the binaryUnitDialect property has been changed")
} }