diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2012-09-21 13:54:38 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-09-21 21:03:48 +0200 |
commit | 3d9e49286091db22fe8b4cf3183cbcd69b4c3d84 (patch) | |
tree | b58f1a95b0094946355a3edbcda160115c02cd99 | |
parent | 903281b3520693e1e116523c6690d07f420feca5 (diff) |
Do not use the fromAscii() and toAscii() functions.
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.
Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
44 files changed, 60 insertions, 60 deletions
diff --git a/share/qtcreator/dumper/dumper.cpp b/share/qtcreator/dumper/dumper.cpp index dc1a11f6d5..b784f01522 100644 --- a/share/qtcreator/dumper/dumper.cpp +++ b/share/qtcreator/dumper/dumper.cpp @@ -2368,7 +2368,7 @@ static void qDumpQObjectProperty(QDumper &d) if (dotPos == -1) return; iname.remove(0, dotPos + 1); - const int index = mob->indexOfProperty(iname.toAscii()); + const int index = mob->indexOfProperty(iname.toLatin1()); if (index == -1) return; const QMetaProperty mop = mob->property(index); diff --git a/share/qtcreator/qml/qmldump/main.cpp b/share/qtcreator/qml/qmldump/main.cpp index fc80f3f877..a116bbfa1a 100644 --- a/share/qtcreator/qml/qmldump/main.cpp +++ b/share/qtcreator/qml/qmldump/main.cpp @@ -585,10 +585,10 @@ int main(int argc, char *argv[]) // find all QMetaObjects reachable when the specified module is imported if (action != Path) { - importCode += QString("import %0 %1\n").arg(pluginImportUri, pluginImportVersion).toAscii(); + importCode += QString("import %0 %1\n").arg(pluginImportUri, pluginImportVersion).toLatin1(); } else { // pluginImportVersion can be empty - importCode += QString("import \".\" %2\n").arg(pluginImportVersion).toAscii(); + importCode += QString("import \".\" %2\n").arg(pluginImportVersion).toLatin1(); } // create a component with these imports to make sure the imports are valid diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index 8dfd475dd5..e9205d9caf 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -339,7 +339,7 @@ void SshConnectionPrivate::handleIncomingData() e.errorString); } catch (Botan::Exception &e) { closeConnection(SSH_DISCONNECT_BY_APPLICATION, SshInternalError, "", - tr("Botan library exception: %1").arg(QString::fromAscii(e.what()))); + tr("Botan library exception: %1").arg(QString::fromLatin1(e.what()))); } } diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp index ef28c05eeb..242cf085f7 100644 --- a/src/libs/ssh/sshkeygenerator.cpp +++ b/src/libs/ssh/sshkeygenerator.cpp @@ -77,7 +77,7 @@ bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, int ke } return true; } catch (Botan::Exception &e) { - m_error = tr("Error generating key: %1").arg(QString::fromAscii(e.what())); + m_error = tr("Error generating key: %1").arg(QString::fromLatin1(e.what())); return false; } } diff --git a/src/libs/ssh/sshremoteprocess.cpp b/src/libs/ssh/sshremoteprocess.cpp index a4f4ae76b5..4c376035b6 100644 --- a/src/libs/ssh/sshremoteprocess.cpp +++ b/src/libs/ssh/sshremoteprocess.cpp @@ -207,7 +207,7 @@ void SshRemoteProcess::sendSignal(Signal signal) d->m_sendFacility.sendChannelSignalPacket(d->remoteChannel(), signalString); } } catch (Botan::Exception &e) { - setErrorString(QString::fromAscii(e.what())); + setErrorString(QString::fromLatin1(e.what())); d->closeChannel(); } } diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp index 881194a04f..fcc60cd20c 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp @@ -125,7 +125,7 @@ QString ConsoleProcess::msgCannotCreateTempDir(const QString & dir, const QStrin QString ConsoleProcess::msgUnexpectedOutput(const QByteArray &what) { - return tr("Unexpected output from helper program (%1).").arg(QString::fromAscii(what)); + return tr("Unexpected output from helper program (%1).").arg(QString::fromLatin1(what)); } QString ConsoleProcess::msgCannotChangeToWorkDir(const QString & dir, const QString &why) diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp index f71c1f46eb..ea82d3611a 100644 --- a/src/libs/utils/persistentsettings.cpp +++ b/src/libs/utils/persistentsettings.cpp @@ -389,7 +389,7 @@ bool PersistentSettingsWriter::save(const QVariantMap &data, QWidget *parent) co w.setAutoFormattingIndent(1); // Historical, used to be QDom. w.writeStartDocument(); w.writeDTD(QLatin1String("<!DOCTYPE ") + m_docType + QLatin1Char('>')); - w.writeComment(QString::fromAscii(" Written by %1 %2, %3. "). + w.writeComment(QString::fromLatin1(" Written by %1 %2, %3. "). arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion(), QDateTime::currentDateTime().toString(Qt::ISODate))); diff --git a/src/libs/utils/portlist.cpp b/src/libs/utils/portlist.cpp index 39a258149d..78e2c6940c 100644 --- a/src/libs/utils/portlist.cpp +++ b/src/libs/utils/portlist.cpp @@ -117,7 +117,7 @@ private: } bool atEnd() const { return m_pos == m_portsSpec.length(); } - char nextChar() const { return m_portsSpec.at(m_pos).toAscii(); } + char nextChar() const { return m_portsSpec.at(m_pos).toLatin1(); } PortList m_portList; int m_pos; diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 65d2d5507c..0ce0a6755a 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -279,7 +279,7 @@ QStringList QtcProcess::splitArgs(const QString &_args, bool abortOnMeta, SplitE inline static bool isQuoteMeta(QChar cUnicode) { - char c = cUnicode.toAscii(); + char c = cUnicode.toLatin1(); return c == '\\' || c == '\'' || c == '"' || c == '$'; } diff --git a/src/libs/zeroconf/embeddedLib.cpp b/src/libs/zeroconf/embeddedLib.cpp index cb0d5e4b76..fb369fb358 100644 --- a/src/libs/zeroconf/embeddedLib.cpp +++ b/src/libs/zeroconf/embeddedLib.cpp @@ -129,7 +129,7 @@ public: logger->appendError(ErrorMessage::NoteLevel, ZConfLib::tr("%1: log of previous daemon run is: '%2'.\n") .arg(name()) - .arg(QString::fromAscii(logBA.constData(), logBA.size()))); + .arg(QString::fromLatin1(logBA.constData(), logBA.size()))); qDebug()<<logBA.size()<<oldLog.error()<<oldLog.errorString(); } oldLog.close(); diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 17d8695c9e..c0b67ae198 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -85,7 +85,7 @@ void AndroidRunner::checkPID() qint64 pid = -1; QList<QByteArray> procs = psProc.readAll().split('\n'); foreach (const QByteArray &proc, procs) { - if (proc.trimmed().endsWith(m_packageName.toAscii())) { + if (proc.trimmed().endsWith(m_packageName.toLatin1())) { QRegExp rx(QLatin1String("(\\d+)")); if (rx.indexIn(QLatin1String(proc), proc.indexOf(' ')) > 0) { pid = rx.cap(1).toLongLong(); @@ -259,7 +259,7 @@ void AndroidRunner::logcatReadStandardOutput() m_logcat += m_adbLogcatProcess.readAllStandardOutput(); bool keepLastLine = m_logcat.endsWith('\n'); QByteArray line; - QByteArray pid(QString::fromLatin1("%1):").arg(m_processPID).toAscii()); + QByteArray pid(QString::fromLatin1("%1):").arg(m_processPID).toLatin1()); foreach (line, m_logcat.split('\n')) { if (!line.contains(pid)) continue; diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 8c9044a2cc..2adbd379d1 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -153,7 +153,7 @@ static inline const VcsBase::VcsBaseEditorParameters *findType(int ie) static inline QString debugCodec(const QTextCodec *c) { - return c ? QString::fromAscii(c->name()) : QString::fromAscii("Null codec"); + return c ? QString::fromLatin1(c->name()) : QString::fromLatin1("Null codec"); } // ------------- ClearCasePlugin diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index b536af7c82..8510ebb91b 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -1149,7 +1149,7 @@ void CMakeCbpParser::parseAdd() compilerOption[assignIndex] = ' '; } m_defines.append("#define "); - m_defines.append(compilerOption.mid(macroNameIndex).toAscii()); + m_defines.append(compilerOption.mid(macroNameIndex).toLatin1()); m_defines.append('\n'); } } diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.cpp b/src/plugins/coreplugin/actionmanager/commandsfile.cpp index 508ecc596b..1066adcef0 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.cpp +++ b/src/plugins/coreplugin/actionmanager/commandsfile.cpp @@ -141,7 +141,7 @@ bool CommandsFile::exportCommands(const QList<ShortcutItem *> &items) w.setAutoFormattingIndent(1); // Historical, used to be QDom. w.writeStartDocument(); w.writeDTD(QLatin1String("<!DOCTYPE KeyboardMappingScheme>")); - w.writeComment(QString::fromAscii(" Written by Qt Creator %1, %2. "). + w.writeComment(QString::fromLatin1(" Written by Qt Creator %1, %2. "). arg(QLatin1String(Core::Constants::IDE_VERSION_LONG), QDateTime::currentDateTime().toString(Qt::ISODate))); w.writeStartElement(ctx.mappingElement); diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp index 0a226fd90b..206d2722e0 100644 --- a/src/plugins/coreplugin/mimedatabase.cpp +++ b/src/plugins/coreplugin/mimedatabase.cpp @@ -1094,7 +1094,7 @@ bool BaseMimeTypeParser::parse(QIODevice *dev, const QString &fileName, QString case ParseComment: { // comments have locale attributes. We want the default, English one QString locale = atts.value(QLatin1String(localeAttributeC)).toString(); - const QString comment = QCoreApplication::translate("MimeType", reader.readElementText().toAscii()); + const QString comment = QCoreApplication::translate("MimeType", reader.readElementText().toLatin1()); if (locale.isEmpty()) { data.comment = comment; } else { diff --git a/src/plugins/cpaster/codepasterprotocol.cpp b/src/plugins/cpaster/codepasterprotocol.cpp index 8e3679f23b..e0046fa8cb 100644 --- a/src/plugins/cpaster/codepasterprotocol.cpp +++ b/src/plugins/cpaster/codepasterprotocol.cpp @@ -158,7 +158,7 @@ void CodePasterProtocol::pasteFinished() qWarning("Error pasting: %s", qPrintable(m_pasteReply->errorString())); } else { // Cut out the href-attribute - QString contents = QString::fromAscii(m_pasteReply->readAll()); + QString contents = QString::fromLatin1(m_pasteReply->readAll()); int hrefPos = contents.indexOf(QLatin1String("href=\"")); if (hrefPos != -1) { hrefPos += 6; @@ -189,7 +189,7 @@ void CodePasterProtocol::fetchFinished() if (error) { content = m_fetchReply->errorString(); } else { - content = QString::fromAscii(m_fetchReply->readAll()); // Codepaster does not support special characters. + content = QString::fromLatin1(m_fetchReply->readAll()); // Codepaster does not support special characters. if (debug) qDebug() << content; if (content.contains(QLatin1String("<B>No such paste!</B>"))) { @@ -209,7 +209,7 @@ void CodePasterProtocol::listFinished() Core::ICore::messageManager()->printToOutputPane(m_listReply->errorString(), true); } else { const QByteArray data = m_listReply->readAll(); - const QStringList lines = QString::fromAscii(data).split(QLatin1Char('\n')); + const QStringList lines = QString::fromLatin1(data).split(QLatin1Char('\n')); emit listDone(name(), lines); } m_listReply->deleteLater(); diff --git a/src/plugins/cpaster/pastebindotcaprotocol.cpp b/src/plugins/cpaster/pastebindotcaprotocol.cpp index 3e1a8c15ba..ae87f1e771 100644 --- a/src/plugins/cpaster/pastebindotcaprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcaprotocol.cpp @@ -119,7 +119,7 @@ void PasteBinDotCaProtocol::pasteFinished() } else { /// returns ""SUCCESS:[id]"" const QByteArray data = m_pasteReply->readAll(); - const QString link = QString::fromLatin1(urlC) + QString::fromAscii(data).remove(QLatin1String("SUCCESS:")); + const QString link = QString::fromLatin1(urlC) + QString::fromLatin1(data).remove(QLatin1String("SUCCESS:")); emit pasteDone(link); } m_pasteReply->deleteLater(); diff --git a/src/plugins/cpaster/pastebindotcomprotocol.cpp b/src/plugins/cpaster/pastebindotcomprotocol.cpp index 5c29ce6bb5..7abb0b95a1 100644 --- a/src/plugins/cpaster/pastebindotcomprotocol.cpp +++ b/src/plugins/cpaster/pastebindotcomprotocol.cpp @@ -134,7 +134,7 @@ void PasteBinDotComProtocol::pasteFinished() if (m_pasteReply->error()) { qWarning("Pastebin.com protocol error: %s", qPrintable(m_pasteReply->errorString())); } else { - emit pasteDone(QString::fromAscii(m_pasteReply->readAll())); + emit pasteDone(QString::fromLatin1(m_pasteReply->readAll())); } m_pasteReply->deleteLater(); @@ -171,7 +171,7 @@ void PasteBinDotComProtocol::fetchFinished() qDebug() << "fetchFinished: error" << m_fetchId << content; } else { title = QString::fromLatin1("Pastebin.com: %1").arg(m_fetchId); - content = QString::fromAscii(m_fetchReply->readAll()); + content = QString::fromLatin1(m_fetchReply->readAll()); // Cut out from '<pre>' formatting const int preEnd = content.lastIndexOf(QLatin1String("</pre>")); if (preEnd != -1) diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index 86eb443119..2e6a2ac34d 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -574,7 +574,7 @@ Utils::ChangeSet FunctionDeclDefLink::changes(const Snapshot &snapshot, int targ QString newDeclText = linkSelection.selectedText(); for (int i = 0; i < newDeclText.size(); ++i) { - if (newDeclText.at(i).toAscii() == 0) + if (newDeclText.at(i).toLatin1() == 0) newDeclText[i] = QLatin1Char('\n'); } newDeclText.append(QLatin1String("{}")); diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 1bf6a4fc6c..5a051c07d5 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -148,7 +148,7 @@ static inline const VcsBaseEditorParameters *findType(int ie) static inline QString debugCodec(const QTextCodec *c) { - return c ? QString::fromAscii(c->name()) : QString::fromAscii("Null codec"); + return c ? QString::fromLatin1(c->name()) : QString::fromLatin1("Null codec"); } static inline bool messageBoxQuestion(const QString &title, const QString &question, QWidget *parent = 0) diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index a5707624d0..4185529286 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -800,7 +800,7 @@ void CdbEngine::runEngine() if (debug) qDebug("runEngine"); foreach (const QString &breakEvent, m_options->breakEvents) - postCommand(QByteArray("sxe ") + breakEvent.toAscii(), 0); + postCommand(QByteArray("sxe ") + breakEvent.toLatin1(), 0); // Break functions: each function must be fully qualified, // else the debugger will slow down considerably. foreach (const QString &breakFunctionS, m_options->breakFunctions) { @@ -1260,7 +1260,7 @@ void CdbEngine::handleJumpToLineAddressResolution(const CdbBuiltinCommandPtr &cm static inline bool isAsciiWord(const QString &s) { foreach (const QChar &c, s) { - if (!c.isLetterOrNumber() || c.toAscii() == 0) + if (!c.isLetterOrNumber() || c.toLatin1() == 0) return false; } return true; diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.cpp b/src/plugins/debugger/cdb/cdbparsehelpers.cpp index 5e886553af..95847102be 100644 --- a/src/plugins/debugger/cdb/cdbparsehelpers.cpp +++ b/src/plugins/debugger/cdb/cdbparsehelpers.cpp @@ -556,7 +556,7 @@ bool parseCdbDisassemblerLine(const QString &line, DisassemblerLine *dLine, uint dLine->address = addressS.toULongLong(&ok, 16); if (!ok) return false; - dLine->rawData = QByteArray::fromHex(line.mid(rawDataPos, rawDataEnd - rawDataPos).toAscii()); + dLine->rawData = QByteArray::fromHex(line.mid(rawDataPos, rawDataEnd - rawDataPos).toLatin1()); dLine->data = line.right(line.size() - instructionPos).trimmed(); return true; } diff --git a/src/plugins/debugger/namedemangler/namedemangler.cpp b/src/plugins/debugger/namedemangler/namedemangler.cpp index 741c7bb4f6..2f23b09cc1 100644 --- a/src/plugins/debugger/namedemangler/namedemangler.cpp +++ b/src/plugins/debugger/namedemangler/namedemangler.cpp @@ -56,7 +56,7 @@ bool NameDemanglerPrivate::demangle(const QString &mangledName) { bool success; try { - m_parseState.m_mangledName = mangledName.toAscii(); + m_parseState.m_mangledName = mangledName.toLatin1(); m_parseState.m_pos = 0; m_demangledName.clear(); diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index fd91502654..1106cb78c9 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -943,7 +943,7 @@ QtMessageLogItem *QmlV8DebuggerClientPrivate::constructLogItemTree( if (objectData.name.isEmpty()) text = objectData.value.toString(); else - text = QString(_("%1: %2")).arg(QString::fromAscii(objectData.name)) + text = QString(_("%1: %2")).arg(QString::fromLatin1(objectData.name)) .arg(objectData.value.toString()); QtMessageLogItem *item = new QtMessageLogItem(parent, diff --git a/src/plugins/debugger/watchdelegatewidgets.cpp b/src/plugins/debugger/watchdelegatewidgets.cpp index 4342aaa9d6..2964047147 100644 --- a/src/plugins/debugger/watchdelegatewidgets.cpp +++ b/src/plugins/debugger/watchdelegatewidgets.cpp @@ -91,10 +91,10 @@ IntegerValidator::IntegerValidator(QObject *parent) : bool IntegerValidator::isCharAcceptable(const QChar &c, int base) { if (c.isLetter()) - return base == 16 && c.toLower().toAscii() <= 'f'; + return base == 16 && c.toLower().toLatin1() <= 'f'; if (!c.isDigit()) return false; - const int digit = c.toAscii() - '0'; + const int digit = c.toLatin1() - '0'; if (base == 8 && digit > 7) return false; if (base == 2 && digit > 1) diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp index bada2a9b2c..a3c0e69cb8 100644 --- a/src/plugins/debugger/watchutils.cpp +++ b/src/plugins/debugger/watchutils.cpp @@ -281,7 +281,7 @@ bool isKeyWord(const QString &exp) { // FIXME: incomplete QTC_ASSERT(!exp.isEmpty(), return false); - switch (exp.at(0).toAscii()) { + switch (exp.at(0).toLatin1()) { case 'a': return exp == QLatin1String("auto"); case 'b': diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 843660f023..db333bddc6 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -799,7 +799,7 @@ static Input parseVimKeyName(const QString &keyName) static const QMap<QString, int> k = vimKeyNames(); QMap<QString, int>::ConstIterator it = k.constFind(key.toUpper()); if (it != k.end()) - return Input(*it, mods, *it <= 0x7f ? QString(QChar::fromAscii(*it)) : QString("")); + return Input(*it, mods, *it <= 0x7f ? QString(QChar::fromLatin1(*it)) : QString("")); } return Input(); diff --git a/src/plugins/madde/debianmanager.cpp b/src/plugins/madde/debianmanager.cpp index 427deba50a..11021680df 100644 --- a/src/plugins/madde/debianmanager.cpp +++ b/src/plugins/madde/debianmanager.cpp @@ -538,7 +538,7 @@ bool DebianManager::setPackageManagerIcon(const Utils::FileName &debianDir, Core QBuffer buffer(&iconAsBase64); buffer.open(QIODevice::WriteOnly); if (!pixmap.scaled(MaddeDevice::packageManagerIconSize(deviceType)) - .save(&buffer, iconPath.toFileInfo().suffix().toAscii())) { + .save(&buffer, iconPath.toFileInfo().suffix().toLatin1())) { if (error) *error = tr("Could not export image file '%1'.").arg(iconPath.toUserOutput()); return false; diff --git a/src/plugins/madde/maemoglobal.cpp b/src/plugins/madde/maemoglobal.cpp index a2d3ea063c..86f6028ebb 100644 --- a/src/plugins/madde/maemoglobal.cpp +++ b/src/plugins/madde/maemoglobal.cpp @@ -96,7 +96,7 @@ bool MaemoGlobal::isValidMaemoQtVersion(const QString &qmakePath, Core::Id devic return false; madAdminProc.setReadChannel(QProcess::StandardOutput); - const QByteArray tgtName = targetName(qmakePath).toAscii(); + const QByteArray tgtName = targetName(qmakePath).toLatin1(); while (madAdminProc.canReadLine()) { const QByteArray &line = madAdminProc.readLine(); if (line.contains(tgtName) @@ -141,7 +141,7 @@ QString MaemoGlobal::remoteSourceProfilesCommand() QByteArray remoteCall(":"); foreach (const QByteArray &profile, profiles) remoteCall += "; test -f " + profile + " && source " + profile; - return QString::fromAscii(remoteCall); + return QString::fromLatin1(remoteCall); } PortList MaemoGlobal::freePorts(const Kit *k) diff --git a/src/plugins/madde/maemopackagecreationwidget.cpp b/src/plugins/madde/maemopackagecreationwidget.cpp index 36680f14c6..3ad59723cf 100644 --- a/src/plugins/madde/maemopackagecreationwidget.cpp +++ b/src/plugins/madde/maemopackagecreationwidget.cpp @@ -188,7 +188,7 @@ void MaemoPackageCreationWidget::setPackageManagerIcon() QString imageFilter = tr("Images") + QLatin1String("( "); const QList<QByteArray> &imageTypes = QImageReader::supportedImageFormats(); foreach (const QByteArray &imageType, imageTypes) - imageFilter += "*." + QString::fromAscii(imageType) + QLatin1Char(' '); + imageFilter += "*." + QString::fromLatin1(imageType) + QLatin1Char(' '); imageFilter += QLatin1Char(')'); const QSize iconSize = MaddeDevice::packageManagerIconSize(deviceType); const QString iconFileName = QFileDialog::getOpenFileName(this, diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 8cef8a5fb6..7c390c2b0e 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -109,7 +109,7 @@ static inline const VcsBase::VcsBaseEditorParameters *findType(int ie) static inline QString debugCodec(const QTextCodec *c) { - return c ? QString::fromAscii(c->name()) : QString::fromAscii("Null codec"); + return c ? QString::fromLatin1(c->name()) : QString::fromLatin1("Null codec"); } // Ensure adding "..." to relative paths which is p4's convention @@ -624,7 +624,7 @@ void PerforcePlugin::startSubmitProject() Utils::TempFileSaver saver; saver.setAutoRemove(false); - saver.write(result.stdOut.toAscii()); + saver.write(result.stdOut.toLatin1()); if (!saver.finalize()) { VcsBase::VcsBaseOutputWindow::instance()->appendError(saver.errorString()); cleanCommitMessageFile(); diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 538e3101a0..400ddcddbf 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -695,7 +695,7 @@ QList<Abi> Abi::abisOfBinary(const Utils::FileName &path) quint64 fileNameOffset = 0; if (fileName.startsWith(QLatin1String("#1/"))) fileNameOffset = fileName.mid(3).toInt(); - const QString fileLength = QString::fromAscii(data.mid(48, 10)); + const QString fileLength = QString::fromLatin1(data.mid(48, 10)); int toSkip = 60 + fileNameOffset; offset += fileLength.toInt() + 60 /* header */; diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 4b721a3c9e..d99a789019 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -237,7 +237,7 @@ void ItemLibraryWidget::setSearchFilter(const QString &searchFilter) nameFilterList.append(QString("*%1*").arg(searchFilter)); } else { foreach (const QByteArray &extension, QImageReader::supportedImageFormats()) { - nameFilterList.append(QString("*%1*.%2").arg(searchFilter, QString::fromAscii(extension))); + nameFilterList.append(QString("*%1*.%2").arg(searchFilter, QString::fromLatin1(extension))); } } diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index 941c7a567d..3742567242 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -78,7 +78,7 @@ SubComponentManager::SubComponentManager(Model *model, QObject *parent) void SubComponentManager::addImport(int pos, const Import &import) { if (debug) - qDebug() << Q_FUNC_INFO << pos << import.file().toAscii(); + qDebug() << Q_FUNC_INFO << pos << import.file().toLatin1(); if (import.isFileImport()) { QFileInfo dirInfo = QFileInfo(m_filePath.resolved(import.file()).toLocalFile()); diff --git a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp index 36e5381434..5b2187fbd4 100644 --- a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp @@ -48,7 +48,7 @@ QVariant read(const QString &typeStr, const QString &str, const MetaInfo &) QVariant read(const QString &typeStr, const QString &str) { - int type = QMetaType::type(typeStr.toAscii().constData()); + int type = QMetaType::type(typeStr.toLatin1().constData()); if (type == 0) { qWarning() << "Type " << typeStr << " is unknown to QMetaType system. Cannot create properly typed QVariant for value " diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index 100f6193f6..d4ce015efa 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp @@ -326,7 +326,7 @@ ImageFileFilterItem::ImageFileFilterItem(QObject *parent) // supported image formats according to QList<QByteArray> extensions = QImageReader::supportedImageFormats(); foreach (const QByteArray &extension, extensions) { - filter.append(QString("*.%1;").arg(QString::fromAscii(extension))); + filter.append(QString("*.%1;").arg(QString::fromLatin1(extension))); } setFilter(filter); } diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index ae7dd00d23..4bc660d98f 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -280,8 +280,8 @@ QByteArray AbstractMobileApp::generateProFile(QString *errorMessage) const out << line << endl; }; - proFileContent.replace("../shared/" + DeploymentPriFileName.toAscii(), - DeploymentPriFileName.toAscii()); + proFileContent.replace("../shared/" + DeploymentPriFileName.toLatin1(), + DeploymentPriFileName.toLatin1()); return proFileContent; } @@ -438,7 +438,7 @@ QByteArray AbstractMobileApp::generateFile(int fileType, const QString versionLine = comment + sep + FileChecksum + sep + checkSumString + sep + FileStubVersion + sep + versionString + QLatin1Char('\x0A'); - return versionLine.toAscii() + data; + return versionLine.toLatin1() + data; } int AbstractMobileApp::makeStubVersion(int minor) diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp index b6fba3759d..43368f88c2 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp @@ -150,7 +150,7 @@ static inline bool generateFormClass(const GuiAppParameters ¶ms, } } if (headerContents.isEmpty() || sourceContents.isEmpty()) { - *errorMessage = QString::fromAscii("Failed to obtain Designer plugin code generation service."); + *errorMessage = QString::fromLatin1("Failed to obtain Designer plugin code generation service."); return false; } diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp index 9265111eb7..7c86756d2f 100644 --- a/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardpages.cpp @@ -154,7 +154,7 @@ public: saver.setAutoRemove(false); if (!saver.hasError()) saver.setResult(m_pixmap.save( - saver.file(), QFileInfo(m_iconPath).suffix().toAscii().constData())); + saver.file(), QFileInfo(m_iconPath).suffix().toLatin1().constData())); if (!saver.finalize()) { QMessageBox::critical(QApplication::activeWindow(), tr("File Error"), diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 1d72dd0621..58320b74a9 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -178,7 +178,7 @@ public: Q_UNUSED(size) QMutexLocker lock(&m_mutex); - QUrl url = QUrl::fromEncoded(id.toAscii()); + QUrl url = QUrl::fromEncoded(id.toLatin1()); if (!m_fetcher.asynchronousFetchData(url)) return QImage(); diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index e5bf18bc32..4bd8dede65 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -250,19 +250,19 @@ bool TarPackageCreationStep::writeHeader(QFile &tarFile, const QFileInfo &fileIn | (02 * fileInfo.permission(QFile::WriteOther)) | (01 * fileInfo.permission(QFile::ExeOther)); const QByteArray permissionString = QString("%1").arg(permissions, - sizeof header.fileMode - 1, 8, QLatin1Char('0')).toAscii(); + sizeof header.fileMode - 1, 8, QLatin1Char('0')).toLatin1(); std::memcpy(&header.fileMode, permissionString.data(), permissionString.length()); const QByteArray uidString = QString("%1").arg(fileInfo.ownerId(), - sizeof header.uid - 1, 8, QLatin1Char('0')).toAscii(); + sizeof header.uid - 1, 8, QLatin1Char('0')).toLatin1(); std::memcpy(&header.uid, uidString.data(), uidString.length()); const QByteArray gidString = QString("%1").arg(fileInfo.groupId(), - sizeof header.gid - 1, 8, QLatin1Char('0')).toAscii(); + sizeof header.gid - 1, 8, QLatin1Char('0')).toLatin1(); std::memcpy(&header.gid, gidString.data(), gidString.length()); const QByteArray sizeString = QString("%1").arg(fileInfo.size(), - sizeof header.length - 1, 8, QLatin1Char('0')).toAscii(); + sizeof header.length - 1, 8, QLatin1Char('0')).toLatin1(); std::memcpy(&header.length, sizeString.data(), sizeString.length()); const QByteArray mtimeString = QString("%1").arg(fileInfo.lastModified().toTime_t(), - sizeof header.mtime - 1, 8, QLatin1Char('0')).toAscii(); + sizeof header.mtime - 1, 8, QLatin1Char('0')).toLatin1(); std::memcpy(&header.mtime, mtimeString.data(), mtimeString.length()); if (fileInfo.isDir()) header.typeflag = '5'; @@ -277,7 +277,7 @@ bool TarPackageCreationStep::writeHeader(QFile &tarFile, const QFileInfo &fileIn for (size_t i = 0; i < sizeof header; ++i) checksum += reinterpret_cast<char *>(&header)[i]; const QByteArray checksumString = QString("%1").arg(checksum, - sizeof header.chksum - 1, 8, QLatin1Char('0')).toAscii(); + sizeof header.chksum - 1, 8, QLatin1Char('0')).toLatin1(); std::memcpy(&header.chksum, checksumString.data(), checksumString.length()); header.chksum[sizeof header.chksum-1] = 0; if (!tarFile.write(reinterpret_cast<char *>(&header), sizeof header)) { diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp index 92d58e6292..a139baeeec 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp @@ -699,7 +699,7 @@ bool ResourceModel::iconFileExtension(const QString &path) const QList<QByteArray> _ext_list = QImageReader::supportedImageFormats(); foreach (const QByteArray &ext, _ext_list) { QString dotExt = QString(QLatin1Char('.')); - dotExt += QString::fromAscii(ext); + dotExt += QString::fromLatin1(ext); ext_list.append(dotExt); } } diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 83a1696162..8b160b9279 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -144,7 +144,7 @@ static inline const VcsBase::VcsBaseEditorParameters *findType(int ie) static inline QString debugCodec(const QTextCodec *c) { - return c ? QString::fromAscii(c->name()) : QString::fromAscii("Null codec"); + return c ? QString::fromLatin1(c->name()) : QString::fromLatin1("Null codec"); } // Parse "svn status" output for added/modified/deleted files diff --git a/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp index 42eff1285a..d0b086e128 100644 --- a/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp +++ b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp @@ -62,7 +62,7 @@ QString toolTipForFrame(const Frame &frame) if (frame.instructionPointer()) lines << qMakePair(QCoreApplication::translate("Valgrind::XmlProtocol", "Instruction pointer:"), - QString::fromAscii("0x%1").arg(frame.instructionPointer(), 0, 16)); + QString::fromLatin1("0x%1").arg(frame.instructionPointer(), 0, 16)); if (!frame.object().isEmpty()) lines << qMakePair(QCoreApplication::translate("Valgrind::XmlProtocol", "Object:"), frame.object()); |