@@ -65,21 +65,21 @@ void TestQgsScaleComboBox::basic()
65
65
l->setText ( " " );
66
66
QTest::keyClicks ( l, " 1:2345" );
67
67
QTest::keyClick ( l, Qt::Key_Return );
68
- QCOMPARE ( s->scaleString (), QString ( " 1:2345 " ) );
68
+ QCOMPARE ( s->scaleString (), QString ( " 1:%1 " ). arg ( QLocale::system (). toString ( 2345 ) ) );
69
69
QCOMPARE ( s->scale (), (( double ) 1.0 / ( double ) 2345.0 ) );
70
70
71
71
// Testing conversion from number to "1:x"
72
72
l->setText ( " " );
73
73
QTest::keyClicks ( l, QLocale::system ().toString ( 0.02 ) );
74
74
QTest::keyClick ( l, Qt::Key_Return );
75
- QCOMPARE ( s->scaleString (), QString ( " 1:50 " ) );
75
+ QCOMPARE ( s->scaleString (), QString ( " 1:%1 " ). arg ( QLocale::system (). toString ( 50 ) ) );
76
76
QCOMPARE ( s->scale (), ( double ) 0.02 );
77
77
78
78
// Testing conversion from number to "1:x"
79
79
l->setText ( " " );
80
80
QTest::keyClicks ( l, QLocale::system ().toString ( 42 ) );
81
81
QTest::keyClick ( l, Qt::Key_Return );
82
- QCOMPARE ( s->scaleString (), QString ( " 1:42 " ) );
82
+ QCOMPARE ( s->scaleString (), QString ( " 1:%1 " ). arg ( QLocale::system (). toString ( 42 ) ) );
83
83
QCOMPARE ( s->scale (), ( double ) 1.0 / ( double ) 42.0 );
84
84
85
85
// Testing rounding and conversion from illegal
@@ -91,22 +91,22 @@ void TestQgsScaleComboBox::basic()
91
91
l->setText ( " " );
92
92
QTest::keyClicks ( l, " 1:x:2" );
93
93
QTest::keyClick ( l, Qt::Key_Return );
94
- QCOMPARE ( s->scaleString (), QString ( " 1:4 " ) );
94
+ QCOMPARE ( s->scaleString (), QString ( " 1:%1 " ). arg ( QLocale::system (). toString ( 4 ) ) );
95
95
QCOMPARE ( s->scale (), ( double ) 0.25 );
96
96
97
97
// Test setting programatically
98
98
s->setScale (( double ) 0.19 );
99
- QCOMPARE ( s->scaleString (), QString ( " 1:5 " ) );
99
+ QCOMPARE ( s->scaleString (), QString ( " 1:%1 " ). arg ( QLocale::system (). toString ( 5 ) ) );
100
100
QCOMPARE ( s->scale (), ( double ) 0.2 );
101
101
102
102
// Test setting programatically
103
103
s->setScaleString ( QString ( " 1:240" ) );
104
- QCOMPARE ( s->scaleString (), QString ( " 1:240 " ) );
104
+ QCOMPARE ( s->scaleString (), QString ( " 1:%1 " ). arg ( QLocale::system (). toString ( 240 ) ) );
105
105
QCOMPARE ( s->scale (), ( double ) 1.0 / ( double ) 240.0 );
106
106
107
107
// Test setting programatically illegal string
108
108
s->setScaleString ( QString ( " 1:2.4" ) );
109
- QCOMPARE ( s->scaleString (), QString ( " 1:240 " ) );
109
+ QCOMPARE ( s->scaleString (), QString ( " 1:%1 " ). arg ( QLocale::system (). toString ( 240 ) ) );
110
110
QCOMPARE ( s->scale (), ( double ) 1.0 / ( double ) 240.0 );
111
111
112
112
};
0 commit comments