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

Task-number: 241223
Reviewed-by: Janne Koskinen

7 files changed, 24 insertions, 23 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);
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 104d158..5248868 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -213,7 +213,7 @@ void QCoeFepInputContext::mouseHandler( int x, QMouseEvent *event)
 
         QList<QInputMethodEvent::Attribute> attributes;
         attributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, pos + x, 0, QVariant());
-        QInputMethodEvent event("", attributes);
+        QInputMethodEvent event(QLatin1String(""), attributes);
         sendEvent(event);
     }
 }
@@ -500,8 +500,8 @@ void QCoeFepInputContext::SetInlineEditingCursorVisibilityL(TBool aCursorVisibil
 void QCoeFepInputContext::CancelFepInlineEdit()
 {
     QList<QInputMethodEvent::Attribute> attributes;
-    QInputMethodEvent event("", attributes);
-    event.setCommitString("", 0, 0);
+    QInputMethodEvent event(QLatin1String(""), attributes);
+    event.setCommitString(QLatin1String(""), 0, 0);
     m_preeditString.clear();
     sendEvent(event);
 
@@ -618,7 +618,7 @@ void QCoeFepInputContext::commitCurrentString(bool triggeredBySymbian)
     }
 
     QList<QInputMethodEvent::Attribute> attributes;
-    QInputMethodEvent event("", attributes);
+    QInputMethodEvent event(QLatin1String(""), attributes);
     event.setCommitString(m_preeditString, 0, 0);//m_preeditString.size());
     m_preeditString.clear();
     sendEvent(event);
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index b93b4d7..6ef9de3 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -66,7 +66,7 @@ QFileInfoList alternativeFilePaths(const QString &path, const QStringList &nameF
     foreach (const QFileInfo &drive, QDir::drives())
         driveStrings.append(drive.absolutePath());
     driveStrings.sort();
-    const QString zDriveString("Z:/");
+    const QString zDriveString(QLatin1String("Z:/"));
     driveStrings.removeAll(zDriveString);
     driveStrings.prepend(zDriveString);
 
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
index 4541e06..0255c6b 100644
--- a/src/gui/util/qdesktopservices_s60.cpp
+++ b/src/gui/util/qdesktopservices_s60.cpp
@@ -101,17 +101,17 @@ static void handleMailtoSchemeLX(const QUrl &url)
     // this function has many intermingled leaves and throws. Qt and Symbian objects do not have
     // destructor dependencies, and cleanup object is used to prevent cleanup stack dependency on stack.
     QString recipient = url.path();
-    QString subject = url.queryItemValue("subject");
-    QString body = url.queryItemValue("body");
-    QString to = url.queryItemValue("to");
-    QString cc = url.queryItemValue("cc");
-    QString bcc = url.queryItemValue("bcc");
+    QString subject = url.queryItemValue(QLatin1String("subject"));
+    QString body = url.queryItemValue(QLatin1String("body"));
+    QString to = url.queryItemValue(QLatin1String("to"));
+    QString cc = url.queryItemValue(QLatin1String("cc"));
+    QString bcc = url.queryItemValue(QLatin1String("bcc"));
 
     // these fields might have comma separated addresses
-    QStringList recipients = recipient.split(",", QString::SkipEmptyParts);
-    QStringList tos = to.split(",", QString::SkipEmptyParts);
-    QStringList ccs = cc.split(",", QString::SkipEmptyParts);
-    QStringList bccs = bcc.split(",", QString::SkipEmptyParts);
+    QStringList recipients = recipient.split(QLatin1String(","), QString::SkipEmptyParts);
+    QStringList tos = to.split(QLatin1String(","), QString::SkipEmptyParts);
+    QStringList ccs = cc.split(QLatin1String(","), QString::SkipEmptyParts);
+    QStringList bccs = bcc.split(QLatin1String(","), QString::SkipEmptyParts);
 
 
     RSendAs sendAs;
@@ -200,7 +200,7 @@ static void handleOtherSchemesL(const TDesC& aUrl)
 
 static bool handleOtherSchemes(const QUrl &url)
 {
-    QString encUrl(url.toEncoded());
+    QString encUrl(QString::fromUtf8(url.toEncoded()));
     TPtrC urlPtr(qt_QString2TPtrC(encUrl));
     TRAPD( err, handleOtherSchemesL(urlPtr));
     return err ? false : true;