Changeset 423

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk/src

Files:

• 3rdparty/os2/xsystray/xsystray_api.c (modified) (1 diff)
• corelib/io/qprocess_os2.cpp (modified) (8 diffs)
• corelib/plugin/qlibrary_os2.cpp (modified) (1 diff)
• gui/kernel/qmime_pm.cpp (modified) (2 diffs)
• gui/text/qfontdatabase_pm.cpp (modified) (3 diffs)

trunk/src/3rdparty/os2/xsystray/xsystray_api.c

@@ -19 +19 @@
  */
 
+
 #define INCL_DOSERRORS
 #define INCL_DOSPROCESS

trunk/src/corelib/io/qprocess_os2.cpp

@@ -263 +263 @@
         if (procKey > MaxProcKey) {
             // oops, no more free keys!
-            process->setErrorString(QString("Internal error: Too many processes"));
+            process->setErrorString(QString("Internal error: Too many processes"));
             return InvalidProcKey;
         }
@@ -752 +752 @@
     // elements in front of the array for a posssible command processor call
     // insertion.
-    char **argvBase = new char *[arguments.count() + 2 + 3];
+    c char *[arguments.count() + 2 + 3];
 
     // Don't use leading elements by default
-    char **argv = argvBase + 3;
+    char **argv = argvBase + 3;
     // Set the final argument to 0
     argv[arguments.count() + 1] = 0;
@@ -828 +828 @@
         QFileInfo programInfo(program);
         QStringList knownExts;
-        knownExts << "exe" << "cmd" << "bat"; // in order of CMD.EXE's precedence
+        knownExts << QLatin1String("exe") << QLatin1String("cmd")
+                  << QLatin1String("bat"); // in order of CMD.EXE's precedence
         QByteArray path =
             QFile::encodeName(QDir::toNativeSeparators(programInfo.path()));
@@ -891 +892 @@
         if (arc == NO_ERROR) {
             QString path = QFile::decodeName(libPathBuf);
-            paths = path.split(';', QString::SkipEmptyParts);
+            paths = path.split(, QString::SkipEmptyParts);
             if (paths.contains(fullPath, Qt::CaseInsensitive)) {
 #if defined(QPROCESS_DEBUG)
@@ -909 +910 @@
         }
 
-        char *programReal = fullProgramName.data();
-        char **argvReal = argv;
+        char *programReal = fullProgramName.data();
+        char **argvReal = argv;
 
         if (mode == P_DETACH) {
@@ -961 +962 @@
 #endif
 
-        // finally, start the thing
-        pid = spawnve(mode, programReal, argvReal, envv);
+        // finally, start the thing (note that due to the incorrect definiton of
+        // spawnve we have to perform a pointless cast; the devinition for the
+        // 3rd and 4th arg should be: char const * const *)
+        pid = spawnve(mode, programReal, const_cast<char * const *>(argvReal), envv);
 
 #if defined(QPROCESS_DEBUG)
@@ -1117 +1120 @@
         processError = QProcess::FailedToStart;
         if (arc != NO_ERROR) {
-            // handle duplication failed
+            // handle duplication faile
             q->setErrorString(QProcess::tr("Process failed to start: %1")
-                                           .arg(QString("DOS error %1").arg(arc)));
+                                           .arg(QString(QLatin1String("DOS error %1"))
+                                                .arg(arc)));
         } else {
 #if defined (QPROCESS_DEBUG)
@@ -1125 +1129 @@
 #endif
             q->setErrorString(QProcess::tr("Process failed to start: %1")
-                                           .arg(qPrintable(qt_error_string(errno))));
+                                           .arg(q)));
         }
         emit q->error(processError);

trunk/src/corelib/plugin/qlibrary_os2.cpp

@@ -112 +112 @@
             .arg(fileName).arg(qt_os2_error_string(rc));
         if (*errModule != '\0')
-            errorString += QLibrary::tr(" (failed module: %1)").arg(errModule);
+            errorString += QLibrary::tr(" (failed module: %1)")
+                .arg(QFile::decodeName(errModule));
         return false;
     }

trunk/src/gui/kernel/qmime_pm.cpp

@@ -530 +530 @@
     QVariant ret;
 
-    if (!mimeType.startsWith("text/plain") &&
-        !mimeType.startsWith("text/html"))
+    if (!mimeType.startsWith() &&
+        !mimeType.startsWith())
         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 + QChar('\"');
     }
 

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -319 +319 @@
         QStringList files = fontCache.childGroups();
         foreach(QString file, files) {
-            file.replace("|", "/");
+            file.replace();
             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();
 
         QList<FaceData> cachedFaces;
@@ -613 +613 @@
             // remove from the both caches
             QString fileKey = it.key();
-            fileKey.replace("/", "|");
+            fileKey.replace();
             fontCache.remove(fileKey);
             it = knownFontFiles.erase(it);