Changeset 561 for trunk/src/activeqt/control/qaxfactory.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/activeqt/control/qaxfactory.cpp (modified) (7 diffs)

trunk/src/activeqt/control/qaxfactory.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
@@ -51 +52 @@
 QT_BEGIN_NAMESPACE
 
-extern char qAxModuleFilename[MAX_PATH];
+extern  qAxModuleFilename[MAX_PATH];
 
 /*!
@@ -278 +279 @@
 
     if (licenseKey.isEmpty()) {
-        QString licFile(QFile::decodeName(qAxModuleFilename));
+        QString licFile(Q(qAxModuleFilename));
         int lastDot = licFile.lastIndexOf(QLatin1Char('.'));
         licFile = licFile.left(lastDot) + QLatin1String(".lic");
@@ -361 +362 @@
 }
 
-extern char qAxModuleFilename[MAX_PATH];
+extern  qAxModuleFilename[MAX_PATH];
 
 /*!
@@ -373 +374 @@
 QString QAxFactory::serverDirPath()
 {
-    return QFileInfo(QString::fromLocal8Bit(qAxModuleFilename)).absolutePath();
+    return QFileInfo(QString::from(qAxModuleFilename)).absolutePath();
 }
 
@@ -385 +386 @@
 QString QAxFactory::serverFilePath()
 {
-    return QString::fromLocal8Bit(qAxModuleFilename);
+    return QString::from(qAxModuleFilename);
 }
 
@@ -493 +494 @@
         return false;
 
-    if (!QString::fromLocal8Bit(qAxModuleFilename).toLower().endsWith(QLatin1String(".exe")))
+    if (!QString::from(qAxModuleFilename).toLower().endsWith(QLatin1String(".exe")))
         return false;