Changeset 423 for trunk/src/gui

Timestamp:

Dec 14, 2009, 8:18:13 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

general: Fixed a bunch of deprecated QString/QChar initializers.

Location:

trunk/src/gui

Files:

• kernel/qmime_pm.cpp (modified) (2 diffs)
• text/qfontdatabase_pm.cpp (modified) (3 diffs)

trunk/src/gui/kernel/qmime_pm.cpp

@@ -530 +530 @@
     QVariant ret;
 
-    if (!mimeType.startsWith("text/plain") &&
-        !mimeType.startsWith("text/html"))
+    if (!mimeType.startsWith(QLatin1String("text/plain")) &&
+        !mimeType.startsWith(QLatin1String("text/html")))
         return ret;
     if ((format != CF_TEXT && format != CF_TextUnicode && format != CF_TextHtml) ||
@@ -821 +821 @@
         // prepend the non-standard type with the prefix that makes it comply
         // with the standard
-        mimeToReg = customPrefix + mime + QChar('\"');
+        mimeToReg = customPrefix + mime + QLatin1Char('\"');
     }
 

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -319 +319 @@
         QStringList files = fontCache.childGroups();
         foreach(QString file, files) {
-            file.replace("|", "/");
+            file.replace(QLatin1Char('|'), QLatin1Char('/'));
             knownFontFiles.insert(file, FileData());
             // note that QFileInfo is empty so the file will be considered as
@@ -401 +401 @@
 
         // QSettings uses / for splitting into groups, suppress it
-        fileKey.replace("/", "|");
+        fileKey.replace(QLatin1Char('/'), QLatin1Char('|'));
 
         QList<FaceData> cachedFaces;
@@ -613 +613 @@
             // remove from the both caches
             QString fileKey = it.key();
-            fileKey.replace("/", "|");
+            fileKey.replace(QLatin1Char('/'), QLatin1Char('|'));
             fontCache.remove(fileKey);
             it = knownFontFiles.erase(it);