Skip to content

Commit 9e58b07

Browse files
wonder-skwonder-sk
committedAug 19, 2011
Made strings translatable, made some functions static
·
ltr-3_40Before-merge-new_vector_api
1 parent 2154a81 commit 9e58b07

File tree

1 file changed

+40
-38
lines changed

1 file changed

+40
-38
lines changed
 

‎src/core/qgsexpression.cpp

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,24 @@ enum TVL
3737
Unknown
3838
};
3939

40-
static TVL AND[3][3] = {
40+
static TVL AND[3][3] =
41+
{
4142
// false true unknown
4243
{ False, False, False }, // false
4344
{ False, True, Unknown }, // true
4445
{ False, Unknown, Unknown } // unknown
4546
};
4647

47-
static TVL OR[3][3] = {
48+
static TVL OR[3][3] =
49+
{
4850
{ False, True, Unknown }, // false
4951
{ True, True, True }, // true
5052
{ Unknown, True, Unknown } // unknown
5153
};
5254

5355
static TVL NOT[3] = { True, False, Unknown };
5456

55-
QVariant tvl2variant( TVL v )
57+
static QVariant tvl2variant( TVL v )
5658
{
5759
switch ( v )
5860
{
@@ -122,7 +124,7 @@ static double getDoubleValue( const QVariant& value, QgsExpression* parent )
122124
double x = value.toDouble( &ok );
123125
if ( !ok )
124126
{
125-
parent->setEvalErrorString( QString( "Cannot convert '%1' to double" ).arg( value.toString() ) );
127+
parent->setEvalErrorString( QObject::tr( "Cannot convert '%1' to double" ).arg( value.toString() ) );
126128
return 0;
127129
}
128130
return x;
@@ -134,7 +136,7 @@ static int getIntValue( const QVariant& value, QgsExpression* parent )
134136
int x = value.toInt( &ok );
135137
if ( !ok )
136138
{
137-
parent->setEvalErrorString( QString( "Cannot convert '%1' to int" ).arg( value.toString() ) );
139+
parent->setEvalErrorString( QObject::tr( "Cannot convert '%1' to int" ).arg( value.toString() ) );
138140
return 0;
139141
}
140142
return x;
@@ -155,90 +157,90 @@ static TVL getTVLValue( const QVariant& value, QgsExpression* parent )
155157
double x = value.toDouble( &ok );
156158
if ( !ok )
157159
{
158-
parent->setEvalErrorString( QString( "Cannot convert '%1' to boolean" ).arg( value.toString() ) );
160+
parent->setEvalErrorString( QObject::tr( "Cannot convert '%1' to boolean" ).arg( value.toString() ) );
159161
return Unknown;
160162
}
161163
return x != 0 ? True : False;
162164
}
163165

164166
//////
165167

166-
QVariant fcnSqrt( const QVariantList& values, QgsFeature* /*f*/, QgsExpression* parent )
168+
static QVariant fcnSqrt( const QVariantList& values, QgsFeature* /*f*/, QgsExpression* parent )
167169
{
168170
double x = getDoubleValue( values.at( 0 ), parent );
169171
return QVariant( sqrt( x ) );
170172
}
171-
QVariant fcnSin( const QVariantList& values, QgsFeature* , QgsExpression* parent )
173+
static QVariant fcnSin( const QVariantList& values, QgsFeature* , QgsExpression* parent )
172174
{
173175
double x = getDoubleValue( values.at( 0 ), parent );
174176
return QVariant( sin( x ) );
175177
}
176-
QVariant fcnCos( const QVariantList& values, QgsFeature* , QgsExpression* parent )
178+
static QVariant fcnCos( const QVariantList& values, QgsFeature* , QgsExpression* parent )
177179
{
178180
double x = getDoubleValue( values.at( 0 ), parent );
179181
return QVariant( cos( x ) );
180182
}
181-
QVariant fcnTan( const QVariantList& values, QgsFeature* , QgsExpression* parent )
183+
static QVariant fcnTan( const QVariantList& values, QgsFeature* , QgsExpression* parent )
182184
{
183185
double x = getDoubleValue( values.at( 0 ), parent );
184186
return QVariant( tan( x ) );
185187
}
186-
QVariant fcnAsin( const QVariantList& values, QgsFeature* , QgsExpression* parent )
188+
static QVariant fcnAsin( const QVariantList& values, QgsFeature* , QgsExpression* parent )
187189
{
188190
double x = getDoubleValue( values.at( 0 ), parent );
189191
return QVariant( asin( x ) );
190192
}
191-
QVariant fcnAcos( const QVariantList& values, QgsFeature* , QgsExpression* parent )
193+
static QVariant fcnAcos( const QVariantList& values, QgsFeature* , QgsExpression* parent )
192194
{
193195
double x = getDoubleValue( values.at( 0 ), parent );
194196
return QVariant( acos( x ) );
195197
}
196-
QVariant fcnAtan( const QVariantList& values, QgsFeature* , QgsExpression* parent )
198+
static QVariant fcnAtan( const QVariantList& values, QgsFeature* , QgsExpression* parent )
197199
{
198200
double x = getDoubleValue( values.at( 0 ), parent );
199201
return QVariant( atan( x ) );
200202
}
201-
QVariant fcnAtan2( const QVariantList& values, QgsFeature* , QgsExpression* parent )
203+
static QVariant fcnAtan2( const QVariantList& values, QgsFeature* , QgsExpression* parent )
202204
{
203205
double y = getDoubleValue( values.at( 0 ), parent );
204206
double x = getDoubleValue( values.at( 1 ), parent );
205207
return QVariant( atan2( y, x ) );
206208
}
207-
QVariant fcnToInt( const QVariantList& values, QgsFeature* , QgsExpression* parent )
209+
static QVariant fcnToInt( const QVariantList& values, QgsFeature* , QgsExpression* parent )
208210
{
209211
return QVariant( getIntValue( values.at( 0 ), parent ) );
210212
}
211-
QVariant fcnToReal( const QVariantList& values, QgsFeature* , QgsExpression* parent )
213+
static QVariant fcnToReal( const QVariantList& values, QgsFeature* , QgsExpression* parent )
212214
{
213215
return QVariant( getDoubleValue( values.at( 0 ), parent ) );
214216
}
215-
QVariant fcnToString( const QVariantList& values, QgsFeature* , QgsExpression* parent )
217+
static QVariant fcnToString( const QVariantList& values, QgsFeature* , QgsExpression* parent )
216218
{
217219
return QVariant( getStringValue( values.at( 0 ), parent ) );
218220
}
219-
QVariant fcnLower( const QVariantList& values, QgsFeature* , QgsExpression* parent )
221+
static QVariant fcnLower( const QVariantList& values, QgsFeature* , QgsExpression* parent )
220222
{
221223
QString str = getStringValue( values.at( 0 ), parent );
222224
return QVariant( str.toLower() );
223225
}
224-
QVariant fcnUpper( const QVariantList& values, QgsFeature* , QgsExpression* parent )
226+
static QVariant fcnUpper( const QVariantList& values, QgsFeature* , QgsExpression* parent )
225227
{
226228
QString str = getStringValue( values.at( 0 ), parent );
227229
return QVariant( str.toUpper() );
228230
}
229-
QVariant fcnLength( const QVariantList& values, QgsFeature* , QgsExpression* parent )
231+
static QVariant fcnLength( const QVariantList& values, QgsFeature* , QgsExpression* parent )
230232
{
231233
QString str = getStringValue( values.at( 0 ), parent );
232234
return QVariant( str.length() );
233235
}
234-
QVariant fcnReplace( const QVariantList& values, QgsFeature* , QgsExpression* parent )
236+
static QVariant fcnReplace( const QVariantList& values, QgsFeature* , QgsExpression* parent )
235237
{
236238
QString str = getStringValue( values.at( 0 ), parent );
237239
QString before = getStringValue( values.at( 1 ), parent );
238240
QString after = getStringValue( values.at( 2 ), parent );
239241
return QVariant( str.replace( before, after ) );
240242
}
241-
QVariant fcnRegexpReplace( const QVariantList& values, QgsFeature* , QgsExpression* parent )
243+
static QVariant fcnRegexpReplace( const QVariantList& values, QgsFeature* , QgsExpression* parent )
242244
{
243245
QString str = getStringValue( values.at( 0 ), parent );
244246
QString regexp = getStringValue( values.at( 1 ), parent );
@@ -247,25 +249,25 @@ QVariant fcnRegexpReplace( const QVariantList& values, QgsFeature* , QgsExpressi
247249
QRegExp re( regexp );
248250
if ( !re.isValid() )
249251
{
250-
parent->setEvalErrorString( QString( "Invalid regular expression '%1': %2" ).arg( regexp ).arg( re.errorString() ) );
252+
parent->setEvalErrorString( QObject::tr( "Invalid regular expression '%1': %2" ).arg( regexp ).arg( re.errorString() ) );
251253
return QVariant();
252254
}
253255
return QVariant( str.replace( re, after ) );
254256
}
255-
QVariant fcnSubstr( const QVariantList& values, QgsFeature* , QgsExpression* parent )
257+
static QVariant fcnSubstr( const QVariantList& values, QgsFeature* , QgsExpression* parent )
256258
{
257259
QString str = getStringValue( values.at( 0 ), parent );
258260
int from = getIntValue( values.at( 1 ), parent );
259261
int len = getIntValue( values.at( 2 ), parent );
260262
return QVariant( str.mid( from -1, len ) );
261263
}
262264

263-
QVariant fcnRowNumber( const QVariantList& , QgsFeature* , QgsExpression* parent )
265+
static QVariant fcnRowNumber( const QVariantList& , QgsFeature* , QgsExpression* parent )
264266
{
265267
return QVariant( parent->currentRowNumber() );
266268
}
267269

268-
QVariant fcnFeatureId( const QVariantList& , QgsFeature* f, QgsExpression* )
270+
static QVariant fcnFeatureId( const QVariantList& , QgsFeature* f, QgsExpression* )
269271
{
270272
// TODO: handling of 64-bit feature ids?
271273
return f ? QVariant(( int )f->id() ) : QVariant();
@@ -276,12 +278,12 @@ QVariant fcnFeatureId( const QVariantList& , QgsFeature* f, QgsExpression* )
276278
if (!g || g->type() != geomtype) return QVariant();
277279

278280

279-
QVariant fcnX( const QVariantList& , QgsFeature* f, QgsExpression* )
281+
static QVariant fcnX( const QVariantList& , QgsFeature* f, QgsExpression* )
280282
{
281283
ENSURE_GEOM_TYPE( f, g, QGis::Point );
282284
return g->asPoint().x();
283285
}
284-
QVariant fcnY( const QVariantList& , QgsFeature* f, QgsExpression* )
286+
static QVariant fcnY( const QVariantList& , QgsFeature* f, QgsExpression* )
285287
{
286288
ENSURE_GEOM_TYPE( f, g, QGis::Point );
287289
return g->asPoint().y();
@@ -297,21 +299,21 @@ static QVariant pointAt( const QVariantList& values, QgsFeature* f, QgsExpressio
297299

298300
if ( idx < 0 || idx >= polyline.count() )
299301
{
300-
parent->setEvalErrorString( "Index is out of range" );
302+
parent->setEvalErrorString( QObject::tr( "Index is out of range" ) );
301303
return QVariant();
302304
}
303305
return QVariant( QPointF( polyline[idx].x(), polyline[idx].y() ) );
304306
}
305307

306-
QVariant fcnXat( const QVariantList& values, QgsFeature* f, QgsExpression* parent )
308+
static QVariant fcnXat( const QVariantList& values, QgsFeature* f, QgsExpression* parent )
307309
{
308310
QVariant v = pointAt( values, f, parent );
309311
if ( v.type() == QVariant::PointF )
310312
return QVariant( v.toPointF().x() );
311313
else
312314
return QVariant();
313315
}
314-
QVariant fcnYat( const QVariantList& values, QgsFeature* f, QgsExpression* parent )
316+
static QVariant fcnYat( const QVariantList& values, QgsFeature* f, QgsExpression* parent )
315317
{
316318
QVariant v = pointAt( values, f, parent );
317319
if ( v.type() == QVariant::PointF )
@@ -320,19 +322,19 @@ QVariant fcnYat( const QVariantList& values, QgsFeature* f, QgsExpression* paren
320322
return QVariant();
321323
}
322324

323-
QVariant fcnGeomArea( const QVariantList& , QgsFeature* f, QgsExpression* parent )
325+
static QVariant fcnGeomArea( const QVariantList& , QgsFeature* f, QgsExpression* parent )
324326
{
325327
ENSURE_GEOM_TYPE( f, g, QGis::Polygon );
326328
QgsDistanceArea* calc = parent->geomCalculator();
327329
return QVariant( calc->measure( f->geometry() ) );
328330
}
329-
QVariant fcnGeomLength( const QVariantList& , QgsFeature* f, QgsExpression* parent )
331+
static QVariant fcnGeomLength( const QVariantList& , QgsFeature* f, QgsExpression* parent )
330332
{
331333
ENSURE_GEOM_TYPE( f, g, QGis::Line );
332334
QgsDistanceArea* calc = parent->geomCalculator();
333335
return QVariant( calc->measure( f->geometry() ) );
334336
}
335-
QVariant fcnGeomPerimeter( const QVariantList& , QgsFeature* f, QgsExpression* parent )
337+
static QVariant fcnGeomPerimeter( const QVariantList& , QgsFeature* f, QgsExpression* parent )
336338
{
337339
ENSURE_GEOM_TYPE( f, g, QGis::Polygon );
338340
QgsDistanceArea* calc = parent->geomCalculator();
@@ -455,7 +457,7 @@ bool QgsExpression::prepare( const QgsFieldMap& fields )
455457
mEvalErrorString = QString();
456458
if ( !mRootNode )
457459
{
458-
mEvalErrorString = "No root node! Parsing failed?";
460+
mEvalErrorString = QObject::tr( "No root node! Parsing failed?" );
459461
return false;
460462
}
461463

@@ -467,7 +469,7 @@ QVariant QgsExpression::evaluate( QgsFeature* f )
467469
mEvalErrorString = QString();
468470
if ( !mRootNode )
469471
{
470-
mEvalErrorString = "No root node! Parsing failed?";
472+
mEvalErrorString = QObject::tr( "No root node! Parsing failed?" );
471473
return QVariant();
472474
}
473475

@@ -529,7 +531,7 @@ QVariant QgsExpression::NodeUnaryOperator::eval( QgsExpression* parent, QgsFeatu
529531
else if ( isDoubleSafe( val ) )
530532
return QVariant( - getDoubleValue( val, parent ) );
531533
else
532-
SET_EVAL_ERROR( "Unary minus only for numeric values." );
534+
SET_EVAL_ERROR( QObject::tr( "Unary minus only for numeric values." ) );
533535
break;
534536
default:
535537
Q_ASSERT( 0 && "unknown unary operation" );
@@ -906,7 +908,7 @@ bool QgsExpression::NodeColumnRef::prepare( QgsExpression* parent, const QgsFiel
906908
return true;
907909
}
908910
}
909-
parent->mEvalErrorString = QString( "Column %1 not found" ).arg( mName );
911+
parent->mEvalErrorString = QObject::tr( "Column '%1'' not found" ).arg( mName );
910912
mIndex = -1;
911913
return false;
912914
}

0 commit comments

Comments
 (0)
Please sign in to comment.