diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in index 42a41571f01..3b1fb1e6bb3 100644 --- a/cmake_templates/Doxyfile.in +++ b/cmake_templates/Doxyfile.in @@ -1448,7 +1448,7 @@ DOT_NUM_THREADS = 0 # By default doxygen will write a font called FreeSans.ttf to the output # directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need +# font does not include all possible Unicode characters however, so when you need # these (or just want a differently looking font) you can specify the font name # using DOT_FONTNAME. You need need to make sure dot is able to find the font, # which can be done by putting it in a standard location or by setting the diff --git a/python/plugins/db_manager/db_plugins/data_model.py b/python/plugins/db_manager/db_plugins/data_model.py index 6ffc3f52232..de0ddd2208b 100644 --- a/python/plugins/db_manager/db_plugins/data_model.py +++ b/python/plugins/db_manager/db_plugins/data_model.py @@ -89,7 +89,7 @@ class BaseTableModel(QAbstractTableModel): # too much data to display, elide the string val = val[:300] try: - return str(val) # convert to unicode + return str(val) # convert to Unicode except UnicodeDecodeError: return str(val, 'utf-8', 'replace') # convert from utf8 and replace errors (if any) diff --git a/python/plugins/processing/algs/qgis/Eliminate.py b/python/plugins/processing/algs/qgis/Eliminate.py index 144f5c59e2c..6b3766eb2c1 100644 --- a/python/plugins/processing/algs/qgis/Eliminate.py +++ b/python/plugins/processing/algs/qgis/Eliminate.py @@ -133,7 +133,7 @@ class Eliminate(GeoAlgorithm): y = str(comparisonvalue) except ValueError: selectionError = True - msg = self.tr('Cannot convert "%s" to unicode' % str(comparisonvalue)) + msg = self.tr('Cannot convert "%s" to Unicode' % str(comparisonvalue)) elif selectType == QVariant.Date: # date dateAndFormat = comparisonvalue.split(' ') diff --git a/python/pyplugin_installer/version_compare.py b/python/pyplugin_installer/version_compare.py index 116ba723b2f..4071d3091fd 100644 --- a/python/pyplugin_installer/version_compare.py +++ b/python/pyplugin_installer/version_compare.py @@ -23,7 +23,7 @@ and recognizes all major notations, prefixes (ver. and version), delimiters Usage: compareVersions(version1, version2) -The function accepts arguments of any type convertable to unicode string +The function accepts arguments of any type convertable to Unicode string and returns integer value: 0 - the versions are equal 1 - version 1 is higher @@ -31,7 +31,7 @@ and returns integer value: ----------------------------------------------------------------------------- HOW DOES IT WORK... -First, both arguments are converted to uppercase unicode and stripped of +First, both arguments are converted to uppercase Unicode and stripped of 'VERSION' or 'VER.' prefix. Then they are chopped into a list of particular numeric and alphabetic elements. The dots, dashes and underlines are recognized as delimiters. Also numbers and non numbers are separated. See example below: diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp index 616daa1135a..aed292b2927 100644 --- a/src/providers/postgres/qgspostgresconn.cpp +++ b/src/providers/postgres/qgspostgresconn.cpp @@ -269,7 +269,7 @@ QgsPostgresConn::QgsPostgresConn( const QString& conninfo, bool readOnly, bool s return; } - //set client encoding to unicode because QString uses UTF-8 anyway + //set client encoding to Unicode because QString uses UTF-8 anyway QgsDebugMsg( "setting client encoding to UNICODE" ); int errcode = PQsetClientEncoding( mConn, QStringLiteral( "UNICODE" ).toLocal8Bit() ); if ( errcode == 0 ) diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp index 32c9999c1d6..d7ec3c168b0 100644 --- a/src/python/qgspythonutilsimpl.cpp +++ b/src/python/qgspythonutilsimpl.cpp @@ -546,7 +546,7 @@ QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj ) } // it's some other type of object: - // convert object to unicode string (equivalent to calling unicode(obj) ) + // convert object to Unicode string (equivalent to calling unicode(obj) ) PyObject* obj_uni = PyObject_Unicode( obj ); // obj_uni is new reference if ( obj_uni ) { @@ -564,7 +564,7 @@ QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj ) } #endif - // if conversion to unicode failed, try to convert it to classic string, i.e. str(obj) + // if conversion to Unicode failed, try to convert it to classic string, i.e. str(obj) PyObject* obj_str = PyObject_Str( obj ); // new reference if ( obj_str ) { @@ -573,7 +573,7 @@ QString QgsPythonUtilsImpl::PyObjectToQString( PyObject* obj ) return result; } - // some problem with conversion to unicode string + // some problem with conversion to Unicode string QgsDebugMsg( "unable to convert PyObject to a QString!" ); return QStringLiteral( "(qgis error)" ); }