summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/publishsubscribe/publish-subscribe/publisherdialog.cpp2
-rw-r--r--src/publishsubscribe/gconfitem.cpp6
-rw-r--r--src/publishsubscribe/gconflayer.cpp6
-rw-r--r--src/serviceframework/servicedatabase.cpp2
-rw-r--r--src/systeminfo/qdeviceinfo_linux.cpp4
-rw-r--r--src/systeminfo/qjsondbwrapper.cpp8
-rw-r--r--src/systeminfo/qnetworkinfo_linux.cpp12
-rw-r--r--src/systeminfo/qstorageinfo_linux.cpp10
-rw-r--r--src/tools/servicefw/servicefw.cpp2
-rw-r--r--tests/auto/serviceframework/qservicemanager_ipc/client/tst_qservicemanager_ipc.cpp6
-rw-r--r--tests/auto/systeminfo/qdeviceinfo/tst_qdeviceinfo.cpp4
11 files changed, 31 insertions, 31 deletions
diff --git a/examples/publishsubscribe/publish-subscribe/publisherdialog.cpp b/examples/publishsubscribe/publish-subscribe/publisherdialog.cpp
index 91665178..b2c95e14 100644
--- a/examples/publishsubscribe/publish-subscribe/publisherdialog.cpp
+++ b/examples/publishsubscribe/publish-subscribe/publisherdialog.cpp
@@ -107,7 +107,7 @@ void PublisherDialog::setStringValue()
void PublisherDialog::setByteArrayValue()
{
- publisher->setValue(QStringLiteral("byteArrayValue"), ui->byteArrayValue->text().toAscii());
+ publisher->setValue(QStringLiteral("byteArrayValue"), ui->byteArrayValue->text().toLatin1());
}
//! [0]
diff --git a/src/publishsubscribe/gconfitem.cpp b/src/publishsubscribe/gconfitem.cpp
index 31c89fb5..1b1770dd 100644
--- a/src/publishsubscribe/gconfitem.cpp
+++ b/src/publishsubscribe/gconfitem.cpp
@@ -66,12 +66,12 @@ struct GConfItemPrivate
static QByteArray convertKey(QString key)
{
- if (key.startsWith(QString::fromAscii("/"))) {
+ if (key.startsWith(QString::fromLatin1("/"))) {
return key.toUtf8();
} else {
qWarning() << "Using dot-separated key names with GConfItem is deprecated.";
- qWarning() << "Please use" << QString::fromAscii("/") + key.replace(QString::fromAscii("."), QString::fromAscii("/")) << "instead of" << key;
- return QString(QString::fromAscii("/") + key.replace(QString::fromAscii("."), QString::fromAscii("/"))).toUtf8();
+ qWarning() << "Please use" << QString::fromLatin1("/") + key.replace(QString::fromLatin1("."), QString::fromLatin1("/")) << "instead of" << key;
+ return QString(QString::fromLatin1("/") + key.replace(QString::fromLatin1("."), QString::fromLatin1("/"))).toUtf8();
}
}
diff --git a/src/publishsubscribe/gconflayer.cpp b/src/publishsubscribe/gconflayer.cpp
index b80bf973..bb926eef 100644
--- a/src/publishsubscribe/gconflayer.cpp
+++ b/src/publishsubscribe/gconflayer.cpp
@@ -49,7 +49,7 @@ Q_GLOBAL_STATIC(GConfLayer, gConfLayer)
GConfLayer::GConfLayer()
{
- GConfItem *gconfItem = new GConfItem(QString::fromAscii("/"), true, this);
+ GConfItem *gconfItem = new GConfItem(QString::fromLatin1("/"), true, this);
connect(gconfItem, SIGNAL(subtreeChanged(QString,QVariant)), this, SLOT(notifyChanged(QString,QVariant)));
}
@@ -148,7 +148,7 @@ bool GConfLayer::getValue(Handle handle, const QString &subPath, QVariant *data)
break;
case QVariant::String: {
QString readString = readValue.toString();
- QDataStream readStream(QByteArray::fromBase64(readString.toAscii()));
+ QDataStream readStream(QByteArray::fromBase64(readString.toLatin1()));
QVariant serializedValue;
readStream >> serializedValue;
if (serializedValue.isValid())
@@ -321,7 +321,7 @@ bool GConfLayer::setValue(QValueSpacePublisher */*creator*/, Handle handle, cons
QByteArray byteArray;
QDataStream writeStream(&byteArray, QIODevice::WriteOnly);
writeStream << data;
- QString serializedValue(QString::fromAscii(byteArray.toBase64().data()));
+ QString serializedValue(QString::fromLatin1(byteArray.toBase64().data()));
gconfItem.set(serializedValue);
}
diff --git a/src/serviceframework/servicedatabase.cpp b/src/serviceframework/servicedatabase.cpp
index cc890268..4ca7764c 100644
--- a/src/serviceframework/servicedatabase.cpp
+++ b/src/serviceframework/servicedatabase.cpp
@@ -444,7 +444,7 @@ bool ServiceDatabase::registerService(const ServiceMetaDataResults &service, con
qWarning() << "ServiceDatabase::registerService():-"
<< "Unable to confirm if implementation version"
<< (QString::number(interface.majorVersion()) + "."
- + QString::number(interface.minorVersion())).toAscii()
+ + QString::number(interface.minorVersion())).toLatin1()
<< "for interface" << interface.interfaceName()
<< "is already registered for service "
<< interface.serviceName()
diff --git a/src/systeminfo/qdeviceinfo_linux.cpp b/src/systeminfo/qdeviceinfo_linux.cpp
index f97a9505..1f603aed 100644
--- a/src/systeminfo/qdeviceinfo_linux.cpp
+++ b/src/systeminfo/qdeviceinfo_linux.cpp
@@ -325,7 +325,7 @@ QString QDeviceInfoPrivate::productName()
QStringList() << QStringLiteral("-c"));
if (lsbRelease.waitForFinished()) {
QString buffer(QString::fromLocal8Bit(lsbRelease.readAllStandardOutput().constData()));
- productNameBuffer = buffer.section(QChar::fromAscii('\t'), 1, 1).simplified();
+ productNameBuffer = buffer.section(QChar::fromLatin1('\t'), 1, 1).simplified();
}
}
#endif
@@ -365,7 +365,7 @@ QString QDeviceInfoPrivate::version(QDeviceInfo::Version type)
QStringList() << QStringLiteral("-r"));
if (lsbRelease.waitForFinished()) {
QString buffer(QString::fromLocal8Bit(lsbRelease.readAllStandardOutput().constData()));
- versionBuffer[0] = buffer.section(QChar::fromAscii('\t'), 1, 1).simplified();
+ versionBuffer[0] = buffer.section(QChar::fromLatin1('\t'), 1, 1).simplified();
}
}
if (versionBuffer[0].isEmpty()) {
diff --git a/src/systeminfo/qjsondbwrapper.cpp b/src/systeminfo/qjsondbwrapper.cpp
index c75e06f4..37c13bf9 100644
--- a/src/systeminfo/qjsondbwrapper.cpp
+++ b/src/systeminfo/qjsondbwrapper.cpp
@@ -265,7 +265,7 @@ void QJsonDbWrapper::onJsonDbLockObjectsReadRequestFinished()
if (results.size() > 0) {
for (int i = 0; i < results.size(); i++) {
- const QByteArray objectType = results.at(i).value(QStringLiteral("_type")).toString().toAscii();
+ const QByteArray objectType = results.at(i).value(QStringLiteral("_type")).toString().toLatin1();
if (objectType.size() == strlen("com.nokia.mt.system.Lockscreen") &&
strcmp(objectType.constData(), "com.nokia.mt.system.Lockscreen") == 0) {
if (!enabledLocks.testFlag(QDeviceInfo::TouchOrKeyboardLock))
@@ -390,7 +390,7 @@ void QJsonDbWrapper::onJsonDbWatcherLocksNotificationsAvailable()
QList<QJsonDbNotification> notifications = locksWatcher->takeNotifications();
if (notifications.size() > 0) {
const QJsonDbNotification notification = notifications.at(0);
- const QByteArray objectType = notification.object().value(QStringLiteral("_type")).toString().toAscii();
+ const QByteArray objectType = notification.object().value(QStringLiteral("_type")).toString().toLatin1();
if (notification.action() == QJsonDbWatcher::Removed) {
if (objectType.size() == strlen("com.nokia.mt.system.Lockscreen")
&& strcmp(objectType.constData(), "com.nokia.mt.system.Lockscreen") == 0) {
@@ -472,10 +472,10 @@ void QJsonDbWrapper::onJsonDbWatcherSoundSettingsNotificationsAvailable()
QList<QJsonDbNotification> notifications = soundSettingsWatcher->takeNotifications();
if (notifications.size() > 0) {
const QJsonDbNotification notification = notifications.at(0);
- const QByteArray objectType = notification.object().value(QStringLiteral("_type")).toString().toAscii();
+ const QByteArray objectType = notification.object().value(QStringLiteral("_type")).toString().toLatin1();
if (objectType.size() == strlen("com.nokia.mt.settings.SystemSettings")
&& strcmp(objectType.constData(), "com.nokia.mt.settings.SystemSettings") == 0) {
- const QByteArray identifier = notification.object().value(QStringLiteral("identifier")).toString().toAscii();
+ const QByteArray identifier = notification.object().value(QStringLiteral("identifier")).toString().toLatin1();
if (identifier.size() == strlen("com.nokia.mt.settings.sounds")
&& strcmp(identifier.constData(), "com.nokia.mt.settings.sounds") == 0) {
bool vibration = notification.object().value(QString(QStringLiteral("settings"))).toObject().value(QString(QStringLiteral("vibrationOn"))).toBool();
diff --git a/src/systeminfo/qnetworkinfo_linux.cpp b/src/systeminfo/qnetworkinfo_linux.cpp
index 58b82593..47073829 100644
--- a/src/systeminfo/qnetworkinfo_linux.cpp
+++ b/src/systeminfo/qnetworkinfo_linux.cpp
@@ -378,7 +378,7 @@ QString QNetworkInfoPrivate::macAddress(QNetworkInfo::NetworkMode mode, int inte
if (interface < dirs.size()) {
QFile carrier(*NETWORK_SYSFS_PATH() + dirs.at(interface) + QString(QStringLiteral("/address")));
if (carrier.open(QIODevice::ReadOnly))
- return QString::fromAscii(carrier.readAll().simplified().data());
+ return QString::fromLatin1(carrier.readAll().simplified().data());
}
break;
}
@@ -388,7 +388,7 @@ QString QNetworkInfoPrivate::macAddress(QNetworkInfo::NetworkMode mode, int inte
if (interface < dirs.size()) {
QFile carrier(*NETWORK_SYSFS_PATH() + dirs.at(interface) + QString(QStringLiteral("/address")));
if (carrier.open(QIODevice::ReadOnly))
- return QString::fromAscii(carrier.readAll().simplified().data());
+ return QString::fromLatin1(carrier.readAll().simplified().data());
}
break;
}
@@ -416,7 +416,7 @@ QString QNetworkInfoPrivate::macAddress(QNetworkInfo::NetworkMode mode, int inte
}
char address[18];
ba2str(&deviceInfo.bdaddr, address);
- macAddress = QString::fromAscii(address);
+ macAddress = QString::fromLatin1(address);
}
}
}
@@ -1028,7 +1028,7 @@ QString QNetworkInfoPrivate::getNetworkName(QNetworkInfo::NetworkMode mode, int
strncpy(iwInfo.ifr_name, fileName.toLocal8Bit().constData(), IFNAMSIZ);
if (ioctl(sock, SIOCGIWESSID, &iwInfo) == 0) {
close(sock);
- return QString::fromAscii((const char *)iwInfo.u.essid.pointer);
+ return QString::fromLatin1((const char *)iwInfo.u.essid.pointer);
}
close(sock);
@@ -1042,7 +1042,7 @@ QString QNetworkInfoPrivate::getNetworkName(QNetworkInfo::NetworkMode mode, int
char domainName[64];
if (getdomainname(domainName, 64) == 0) {
if (strcmp(domainName, "(none)") != 0)
- return QString::fromAscii(domainName);
+ return QString::fromLatin1(domainName);
}
break;
}
@@ -1062,7 +1062,7 @@ QString QNetworkInfoPrivate::getNetworkName(QNetworkInfo::NetworkMode mode, int
if (fd > 0) {
char name[249];
if (hci_read_local_name(fd, sizeof(name), name, 0) == 0)
- networkName = QString::fromAscii(name);
+ networkName = QString::fromLatin1(name);
}
}
}
diff --git a/src/systeminfo/qstorageinfo_linux.cpp b/src/systeminfo/qstorageinfo_linux.cpp
index 5837f8a6..d9af1dd0 100644
--- a/src/systeminfo/qstorageinfo_linux.cpp
+++ b/src/systeminfo/qstorageinfo_linux.cpp
@@ -118,9 +118,9 @@ QString QStorageInfoPrivate::uriForDrive(const QString &drive)
char buffer[512];
QString uri;
while ((getmntent_r(fsDescription, &entry, buffer, sizeof(buffer))) != NULL) {
- if (drive != QString::fromAscii(entry.mnt_dir))
+ if (drive != QString::fromLatin1(entry.mnt_dir))
continue;
- int idx = fileinfolist.indexOf(QString::fromAscii(entry.mnt_fsname));
+ int idx = fileinfolist.indexOf(QString::fromLatin1(entry.mnt_fsname));
if (idx != -1)
uri = fileinfolist[idx].fileName();
break;
@@ -182,7 +182,7 @@ QStorageInfo::DriveType QStorageInfoPrivate::driveType(const QString &drive)
struct mntent entry;
char buffer[512];
while ((getmntent_r(fsDescription, &entry, buffer, sizeof(buffer))) != NULL) {
- if (drive != QString::fromAscii(entry.mnt_dir))
+ if (drive != QString::fromLatin1(entry.mnt_dir))
continue;
if (strcmp(entry.mnt_type, "binfmt_misc") == 0
@@ -220,7 +220,7 @@ QStorageInfo::DriveType QStorageInfoPrivate::driveType(const QString &drive)
}
// Now need to guess if it's InternalDrive or RemovableDrive
- QString fsName(QString::fromAscii(entry.mnt_fsname));
+ QString fsName(QString::fromLatin1(entry.mnt_fsname));
if (fsName.contains(QString(QStringLiteral("mapper")))) {
struct stat status;
stat(entry.mnt_fsname, &status);
@@ -358,7 +358,7 @@ void QStorageInfoPrivate::updateLogicalDrives()
logicalDrives.clear();
while (getmntent_r(fsDescription, &entry, buffer, sizeof(buffer)) != NULL)
- logicalDrives << QString::fromAscii(entry.mnt_dir);
+ logicalDrives << QString::fromLatin1(entry.mnt_dir);
endmntent(fsDescription);
}
diff --git a/src/tools/servicefw/servicefw.cpp b/src/tools/servicefw/servicefw.cpp
index 85330eb0..9988672c 100644
--- a/src/tools/servicefw/servicefw.cpp
+++ b/src/tools/servicefw/servicefw.cpp
@@ -120,7 +120,7 @@ void CommandProcessor::execute(const QStringList &options, const QString &cmd, c
if (!setOptions(options))
return;
- int methodIndex = metaObject()->indexOfMethod(cmd.toAscii() + "(QStringList)");
+ int methodIndex = metaObject()->indexOfMethod(cmd.toLatin1() + "(QStringList)");
if (methodIndex < 0) {
*stdoutStream << "Bad command: " << cmd << "\n\n";
showUsage();
diff --git a/tests/auto/serviceframework/qservicemanager_ipc/client/tst_qservicemanager_ipc.cpp b/tests/auto/serviceframework/qservicemanager_ipc/client/tst_qservicemanager_ipc.cpp
index e345b136..8f263c36 100644
--- a/tests/auto/serviceframework/qservicemanager_ipc/client/tst_qservicemanager_ipc.cpp
+++ b/tests/auto/serviceframework/qservicemanager_ipc/client/tst_qservicemanager_ipc.cpp
@@ -967,7 +967,7 @@ void tst_QServiceManager_IPC::verifyUniqueClassInfo()
QFETCH(QString, classInfoValue);
const QMetaObject* meta = serviceUnique->metaObject();
- const int index = meta->indexOfClassInfo(classInfoKey.toAscii().constData());
+ const int index = meta->indexOfClassInfo(classInfoKey.toLatin1().constData());
QMetaClassInfo info = meta->classInfo(index);
QCOMPARE(classInfoKey, QString(info.name()));
@@ -1015,7 +1015,7 @@ void tst_QServiceManager_IPC::verifyUniqueEnumerator()
QFETCH(QList<int>, enumKeyValues);
const QMetaObject* meta = serviceUnique->metaObject();
- const int index = meta->indexOfEnumerator(enumName.toAscii().constData());
+ const int index = meta->indexOfEnumerator(enumName.toLatin1().constData());
QMetaEnum metaEnum = meta->enumerator(index);
QVERIFY(metaEnum.isValid());
@@ -1026,7 +1026,7 @@ void tst_QServiceManager_IPC::verifyUniqueEnumerator()
for (int i=0; i<enumKeyNames.count(); i++) {
QCOMPARE(enumKeyNames.at(i), QString(metaEnum.valueToKey(enumKeyValues.at(i))));
- QCOMPARE(enumKeyValues.at(i), metaEnum.keyToValue(enumKeyNames.at(i).toAscii().constData()));
+ QCOMPARE(enumKeyValues.at(i), metaEnum.keyToValue(enumKeyNames.at(i).toLatin1().constData()));
}
}
diff --git a/tests/auto/systeminfo/qdeviceinfo/tst_qdeviceinfo.cpp b/tests/auto/systeminfo/qdeviceinfo/tst_qdeviceinfo.cpp
index 62f09876..0621d573 100644
--- a/tests/auto/systeminfo/qdeviceinfo/tst_qdeviceinfo.cpp
+++ b/tests/auto/systeminfo/qdeviceinfo/tst_qdeviceinfo.cpp
@@ -100,10 +100,10 @@ void tst_QDeviceInfo::tst_lockTypes()
void tst_QDeviceInfo::tst_version()
{
- QRegExp osversion(QString::fromAscii("(\\d+(\\.\\d+)*)?"));
+ QRegExp osversion(QString::fromLatin1("(\\d+(\\.\\d+)*)?"));
QVERIFY(osversion.exactMatch(deviceInfo->version(QDeviceInfo::Os)));
- QRegExp firmwareversion(QString::fromAscii(".*"));
+ QRegExp firmwareversion(QString::fromLatin1(".*"));
QVERIFY(firmwareversion.exactMatch(deviceInfo->version(QDeviceInfo::Firmware)));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 21:31:19 +0000