Skip to content

Commit a56f928

Browse files
committedDec 29, 2016
Replace unicode by Unicode
1 parent c301369 commit a56f928

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed
 

‎cmake_templates/Doxyfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1448,7 +1448,7 @@ DOT_NUM_THREADS = 0
14481448

14491449
# By default doxygen will write a font called FreeSans.ttf to the output
14501450
# directory and reference it in all dot files that doxygen generates. This
1451-
# font does not include all possible unicode characters however, so when you need
1451+
# font does not include all possible Unicode characters however, so when you need
14521452
# these (or just want a differently looking font) you can specify the font name
14531453
# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
14541454
# which can be done by putting it in a standard location or by setting the

‎python/plugins/db_manager/db_plugins/data_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def data(self, index, role):
8989
# too much data to display, elide the string
9090
val = val[:300]
9191
try:
92-
return str(val) # convert to unicode
92+
return str(val) # convert to Unicode
9393
except UnicodeDecodeError:
9494
return str(val, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
9595

‎python/plugins/processing/algs/qgis/Eliminate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def processAlgorithm(self, progress):
133133
y = str(comparisonvalue)
134134
except ValueError:
135135
selectionError = True
136-
msg = self.tr('Cannot convert "%s" to unicode' % str(comparisonvalue))
136+
msg = self.tr('Cannot convert "%s" to Unicode' % str(comparisonvalue))
137137
elif selectType == QVariant.Date:
138138
# date
139139
dateAndFormat = comparisonvalue.split(' ')

‎python/pyplugin_installer/version_compare.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
2424
Usage: compareVersions(version1, version2)
2525
26-
The function accepts arguments of any type convertable to unicode string
26+
The function accepts arguments of any type convertable to Unicode string
2727
and returns integer value:
2828
0 - the versions are equal
2929
1 - version 1 is higher
3030
2 - version 2 is higher
3131
3232
-----------------------------------------------------------------------------
3333
HOW DOES IT WORK...
34-
First, both arguments are converted to uppercase unicode and stripped of
34+
First, both arguments are converted to uppercase Unicode and stripped of
3535
'VERSION' or 'VER.' prefix. Then they are chopped into a list of particular
3636
numeric and alphabetic elements. The dots, dashes and underlines are recognized
3737
as delimiters. Also numbers and non numbers are separated. See example below:

‎src/providers/postgres/qgspostgresconn.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ QgsPostgresConn::QgsPostgresConn( const QString& conninfo, bool readOnly, bool s
269269
return;
270270
}
271271

272-
//set client encoding to unicode because QString uses UTF-8 anyway
272+
//set client encoding to Unicode because QString uses UTF-8 anyway
273273
QgsDebugMsg( "setting client encoding to UNICODE" );
274274
int errcode = PQsetClientEncoding( mConn, QStringLiteral( "UNICODE" ).toLocal8Bit() );
275275
if ( errcode == 0 )

‎src/python/qgspythonutilsimpl.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj )
546546
}
547547

548548
// it's some other type of object:
549-
// convert object to unicode string (equivalent to calling unicode(obj) )
549+
// convert object to Unicode string (equivalent to calling unicode(obj) )
550550
PyObject* obj_uni = PyObject_Unicode( obj ); // obj_uni is new reference
551551
if ( obj_uni )
552552
{
@@ -564,7 +564,7 @@ QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj )
564564
}
565565
#endif
566566

567-
// if conversion to unicode failed, try to convert it to classic string, i.e. str(obj)
567+
// if conversion to Unicode failed, try to convert it to classic string, i.e. str(obj)
568568
PyObject* obj_str = PyObject_Str( obj ); // new reference
569569
if ( obj_str )
570570
{
@@ -573,7 +573,7 @@ QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj )
573573
return result;
574574
}
575575

576-
// some problem with conversion to unicode string
576+
// some problem with conversion to Unicode string
577577
QgsDebugMsg( "unable to convert PyObject to a QString!" );
578578
return QStringLiteral( "(qgis error)" );
579579
}

0 commit comments

Comments
 (0)
Please sign in to comment.