Fixed 'use of function is deprecated' warnings reported by RVCT

Task-number: 241223
Reviewed-by: Janne Koskinen

4 files changed, 9 insertions, 8 deletions

diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 50b4af7..c7fc01b 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -565,7 +565,7 @@ QString QFSFileEngine::currentPath(const QString &)
         // try to create it (can happen with application private dirs)
         // Ignore mkdir failures; we want to be consistent with Open C
         // current path regardless.
-        QT_MKDIR(QFile::encodeName(nativeCurrentName), 0777);
+        QT_MKDIR(QFile::encodeName(QLatin1String(nativeCurrentName)), 0777);
 #else
 # if defined(QT_DEBUG)
         qWarning("QFSFileEngine::currentPath: stat(\".\") failed");
diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp
index d41321b..e394de1 100644
--- a/src/corelib/io/qprocess_symbian.cpp
+++ b/src/corelib/io/qprocess_symbian.cpp
@@ -62,6 +62,7 @@
 #include <stdio.h>
 #include "qplatformdefs.h"
 
+#include "qdir.h"
 #include "qstring.h"
 #include "qprocess.h"
 #include "qprocess_p.h"
@@ -261,8 +262,8 @@ static TInt qt_create_symbian_process(RProcess **proc, const QString &programNam
 
     if (err == KErrNotFound) {
         // Strip path from program name and try again (i.e. try from default location "\sys\bin")
-        int index = programName.lastIndexOf(QChar('\\'));
-        int index2 = programName.lastIndexOf(QChar('/'));
+        int index = programName.lastIndexOf(QDir::separator());
+        int index2 = programName.lastIndexOf(QChar(QLatin1Char('/')));
         index = qMax(index, index2);
 
         if (index != -1 && programName.length() >= index) {
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 423bdf8..ac5c804 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2184,10 +2184,10 @@ QStringList QCoreApplication::libraryPaths()
         QString installPathPlugins =  QLibraryInfo::location(QLibraryInfo::PluginsPath);
 #if defined(Q_OS_SYMBIAN)
         // Add existing path on all drives for relative PluginsPath in Symbian
-        if (installPathPlugins.at(1) != QChar(':')) {
+        if (installPathPlugins.at(1) != QChar(QLatin1Char(':'))) {
             QString tempPath = installPathPlugins;
-            if (tempPath.at(tempPath.length() - 1) != QChar('\\')) {
-                tempPath += QChar('\\');
+            if (tempPath.at(tempPath.length() - 1) != QDir::separator()) {
+                tempPath += QDir::separator();
             }
             RFs& fs = qt_s60GetRFs();
             TPtrC tempPathPtr(reinterpret_cast<const TText*> (tempPath.constData()));
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index 6b9e271..71f4e44 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -797,7 +797,7 @@ QLocale QSystemLocale::fallbackLocale() const
     }
 
     TLanguage lang = User::Language();
-    QString locale = qt_symbianLocaleName(lang);
+    QString locale = QLatin1String(qt_symbianLocaleName(lang));
     return QLocale(locale);
 }
 
@@ -853,7 +853,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const
         case LanguageId:
         case CountryId: {
                 TLanguage language = User::Language();
-                QString locale = qt_symbianLocaleName(language);
+                QString locale = QLatin1String(qt_symbianLocaleName(language));
                 QLocale::Language lang;
                 QLocale::Country cntry;
                 getLangAndCountry(locale, lang, cntry);