Changeset 423 for trunk/src/corelib/io

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.

File:

• trunk/src/corelib/io/qprocess_os2.cpp (modified) (8 diffs)

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);