Git commit 13a78bec9f6a7d215146b217ef6a0007847c83bf by Konstantinos Smanis. Committed on 24/10/2013 at 16:50. Pushed by ksmanis into branch 'master'. Compile with QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII. M +1 -1 CMakeLists.txt M +10 -10 src/common.cpp M +3 -3 src/convertDlg.cpp M +2 -2 src/entry.cpp M +39 -39 src/helper/helper.cpp M +10 -10 src/installDlg.cpp M +200 -200 src/kcm_grub2.cpp http://commits.kde.org/kcm-grub2/13a78bec9f6a7d215146b217ef6a0007847c83bf diff --git a/CMakeLists.txt b/CMakeLists.txt index 010debc..8fbf4c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ include(KDE4Defaults) include(GRUBPaths) = # Qt -add_definitions(-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS -DQT_STRICT_I= TERATORS -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) +add_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST= _FROM_BYTEARRAY -DQT_NO_KEYWORDS -DQT_STRICT_ITERATORS -DQT_USE_FAST_CONCAT= ENATION -DQT_USE_FAST_OPERATOR_PLUS) # ImageMagick add_definitions(-DMAGICKCORE_HDRI_ENABLE=3D0 -DMAGICKCORE_QUANTUM_DEPTH=3D= 16) = diff --git a/src/common.cpp b/src/common.cpp index 5fc008b..909b8cd 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -27,12 +27,12 @@ = QString quoteWord(const QString &word) { - return !word.startsWith('`') || !word.endsWith('`') ? KShell::quoteArg= (word) : word; + return !word.startsWith(QLatin1Char('`')) || !word.endsWith(QLatin1Cha= r('`')) ? KShell::quoteArg(word) : word; } QString unquoteWord(const QString &word) { KProcess echo; - echo.setShellCommand(QString("echo -n %1").arg(word)); + echo.setShellCommand(QString(QLatin1String("echo -n %1")).arg(word)); echo.setOutputChannelMode(KProcess::OnlyStdoutChannel); if (echo.execute() =3D=3D 0) { return QString::fromLocal8Bit(echo.readAllStandardOutput().constDa= ta()); @@ -43,25 +43,25 @@ QString unquoteWord(const QString &word) QTextStream stream("edWord, QIODevice::ReadOnly | QIODevice::Text); while (!stream.atEnd()) { stream >> ch; - if (ch =3D=3D '\'') { + if (ch =3D=3D QLatin1Char('\'')) { while (true) { if (stream.atEnd()) { return QString(); } stream >> ch; - if (ch =3D=3D '\'') { + if (ch =3D=3D QLatin1Char('\'')) { return unquotedWord; } else { unquotedWord.append(ch); } } - } else if (ch =3D=3D '"') { + } else if (ch =3D=3D QLatin1Char('"')) { while (true) { if (stream.atEnd()) { return QString(); } stream >> ch; - if (ch =3D=3D '\\') { + if (ch =3D=3D QLatin1Char('\\')) { if (stream.atEnd()) { return QString(); } @@ -73,13 +73,13 @@ QString unquoteWord(const QString &word) unquotedWord.append(ch); break; case '\n': - unquotedWord.append(' '); + unquotedWord.append(QLatin1Char(' ')); break; default: - unquotedWord.append('\\').append(ch); + unquotedWord.append(QLatin1Char('\\')).append(= ch); break; } - } else if (ch =3D=3D '"') { + } else if (ch =3D=3D QLatin1Char('"')) { return unquotedWord; } else { unquotedWord.append(ch); @@ -87,7 +87,7 @@ QString unquoteWord(const QString &word) } } else { while (true) { - if (ch =3D=3D '\\') { + if (ch =3D=3D QLatin1Char('\\')) { if (stream.atEnd()) { return unquotedWord; } diff --git a/src/convertDlg.cpp b/src/convertDlg.cpp index ef589c4..b798b43 100644 --- a/src/convertDlg.cpp +++ b/src/convertDlg.cpp @@ -42,12 +42,12 @@ ConvertDialog::ConvertDialog(QWidget *parent, Qt::WFlag= s flags) : KDialog(parent QList::const_iterator it =3D coderList.constBegin(); QList::const_iterator end =3D coderList.constEnd(); for (; it !=3D end; ++it) { - readFilter.append(QString(" *.%1").arg(QString::fromStdString(it->= name()).toLower())); + readFilter.append(QString(QLatin1String(" *.%1")).arg(QString::fro= mStdString(it->name()).toLower())); } readFilter.remove(0, 1); - readFilter.append('|').append(i18nc("@item:inlistbox", "ImageMagick su= pported image formats")); + readFilter.append(QLatin1Char('|')).append(i18nc("@item:inlistbox", "I= mageMagick supported image formats")); = - QString writeFilter =3D QString("*%1|%5 (%1)\n*%2|%6 (%2)\n*%3 *%4|%7 = (%3 %4)").arg(".png", ".tga", ".jpg", ".jpeg", KMimeType::mimeType("image/p= ng")->comment(), KMimeType::mimeType("image/x-tga")->comment(), KMimeType::= mimeType("image/jpeg")->comment()); + QString writeFilter =3D QString(QLatin1String("*%1|%5 (%1)\n*%2|%6 (%2= )\n*%3 *%4|%7 (%3 %4)")).arg(QLatin1String(".png"), QLatin1String(".tga"), = QLatin1String(".jpg"), QLatin1String(".jpeg"), KMimeType::mimeType(QLatin1S= tring("image/png"))->comment(), KMimeType::mimeType(QLatin1String("image/x-= tga"))->comment(), KMimeType::mimeType(QLatin1String("image/jpeg"))->commen= t()); = ui->kurlrequester_image->setMode(KFile::File | KFile::ExistingOnly | K= File::LocalOnly); ui->kurlrequester_image->fileDialog()->setOperationMode(KFileDialog::O= pening); diff --git a/src/entry.cpp b/src/entry.cpp index ddd7041..bc60737 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -41,7 +41,7 @@ QString Entry::fullTitle() const { QString fullTitle; Q_FOREACH(const Entry::Title &ancestor, m_ancestors) { - fullTitle +=3D unquoteWord(ancestor.str) +=3D '>'; + fullTitle +=3D unquoteWord(ancestor.str) +=3D QLatin1Char('>'); } return fullTitle + unquoteWord(m_title.str); } @@ -49,7 +49,7 @@ QString Entry::fullNumTitle() const { QString fullNumTitle; Q_FOREACH(const Entry::Title &ancestor, m_ancestors) { - fullNumTitle +=3D QString::number(ancestor.num) +=3D '>'; + fullNumTitle +=3D QString::number(ancestor.num) +=3D QLatin1Char('= >'); } return fullNumTitle + QString::number(m_title.num); } diff --git a/src/helper/helper.cpp b/src/helper/helper.cpp index 34cb3a7..b5182e6 100644 --- a/src/helper/helper.cpp +++ b/src/helper/helper.cpp @@ -45,7 +45,7 @@ static const QString path =3D QLatin1String("/usr/sbin:/u= sr/bin:/sbin:/bin"); = Helper::Helper() { - KGlobal::locale()->insertCatalog("kcm-grub2"); + KGlobal::locale()->insertCatalog(QLatin1String("kcm-grub2")); qputenv("PATH", path.toLatin1()); } = @@ -55,7 +55,7 @@ ActionReply Helper::executeCommand(const QStringList &com= mand) process.setProgram(command); process.setOutputChannelMode(KProcess::MergedChannels); = - kDebug() << "Executing" << command.join(" "); + kDebug() << "Executing" << command.join(QLatin1String(" ")); int exitCode =3D process.execute(); = ActionReply reply; @@ -63,13 +63,13 @@ ActionReply Helper::executeCommand(const QStringList &c= ommand) reply =3D ActionReply::HelperErrorReply; reply.setErrorCode(exitCode); } - reply.addData("command", command); - reply.addData("output", process.readAll()); + reply.addData(QLatin1String("command"), command); + reply.addData(QLatin1String("output"), process.readAll()); return reply; } bool Helper::setLang(const QString &lang) { - QFile file(GRUB_MENU); + QFile file(QString::fromUtf8(GRUB_MENU)); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { kError() << "Failed to open file for reading:" << GRUB_MENU; kError() << "Error code:" << file.error(); @@ -99,22 +99,22 @@ ActionReply Helper::defaults(QVariantMap args) { Q_UNUSED(args) ActionReply reply; - QString configFileName =3D GRUB_CONFIG; - QString originalConfigFileName =3D configFileName + ".original"; + QString configFileName =3D QString::fromUtf8(GRUB_CONFIG); + QString originalConfigFileName =3D configFileName + QLatin1String(".or= iginal"); = if (!QFile::exists(originalConfigFileName)) { reply =3D ActionReply::HelperErrorReply; - reply.addData("errorDescription", i18nc("@info", "Original configu= ration file %1 does not exist.", originalConfigFileNam= e)); + reply.addData(QLatin1String("errorDescription"), i18nc("@info", "O= riginal configuration file %1 does not exist.", origin= alConfigFileName)); return reply; } if (!QFile::remove(configFileName)) { reply =3D ActionReply::HelperErrorReply; - reply.addData("errorDescription", i18nc("@info", "Cannot remove cu= rrent configuration file %1.", configFileName)); + reply.addData(QLatin1String("errorDescription"), i18nc("@info", "C= annot remove current configuration file %1.", configFi= leName)); return reply; } if (!QFile::copy(originalConfigFileName, configFileName)) { reply =3D ActionReply::HelperErrorReply; - reply.addData("errorDescription", i18nc("@info", "Cannot copy orig= inal configuration file %1 to %2.= ", originalConfigFileName, configFileName)); + reply.addData(QLatin1String("errorDescription"), i18nc("@info", "C= annot copy original configuration file %1 to %2.", originalConfigFileName, configFileName)); return reply; } return reply; @@ -122,39 +122,39 @@ ActionReply Helper::defaults(QVariantMap args) ActionReply Helper::install(QVariantMap args) { ActionReply reply; - QString partition =3D args.value("partition").toString(); - QString mountPoint =3D args.value("mountPoint").toString(); - bool mbrInstall =3D args.value("mbrInstall").toBool(); + QString partition =3D args.value(QLatin1String("partition")).toString(= ); + QString mountPoint =3D args.value(QLatin1String("mountPoint")).toStrin= g(); + bool mbrInstall =3D args.value(QLatin1String("mbrInstall")).toBool(); = if (mountPoint.isEmpty()) { - for (int i =3D 0; QDir(mountPoint =3D QString("%1/kcm-grub2-%2").a= rg(QDir::tempPath(), QString::number(i))).exists(); i++); + for (int i =3D 0; QDir(mountPoint =3D QString(QLatin1String("%1/kc= m-grub2-%2")).arg(QDir::tempPath(), QString::number(i))).exists(); i++); if (!QDir().mkpath(mountPoint)) { reply =3D ActionReply::HelperErrorReply; - reply.addData("errorDescription", i18nc("@info", "Failed to cr= eate temporary mount point.")); + reply.addData(QLatin1String("errorDescription"), i18nc("@info"= , "Failed to create temporary mount point.")); return reply; } - ActionReply mountReply =3D executeCommand(QStringList() << "mount"= << partition << mountPoint); + ActionReply mountReply =3D executeCommand(QStringList() << QLatin1= String("mount") << partition << mountPoint); if (mountReply.failed()) { return mountReply; } } = QStringList grub_installCommand; - grub_installCommand << GRUB_INSTALL_EXE << "--root-directory" << mount= Point; + grub_installCommand << QString::fromUtf8(GRUB_INSTALL_EXE) << QLatin1S= tring("--root-directory") << mountPoint; if (mbrInstall) { - grub_installCommand << partition.remove(QRegExp("\\d+")); + grub_installCommand << partition.remove(QRegExp(QLatin1String("\\d= +"))); } else { - grub_installCommand << "--force" << partition; + grub_installCommand << QLatin1String("--force") << partition; } return executeCommand(grub_installCommand); } ActionReply Helper::load(QVariantMap args) { ActionReply reply; - LoadOperations operations =3D (LoadOperations)(args.value("operations"= ).toInt()); + LoadOperations operations =3D (LoadOperations)(args.value(QLatin1Strin= g("operations")).toInt()); = if (operations.testFlag(MenuFile)) { - QFile file(GRUB_MENU); + QFile file(QString::fromUtf8(GRUB_MENU)); bool ok =3D file.open(QIODevice::ReadOnly | QIODevice::Text); reply.addData(QLatin1String("menuSuccess"), ok); if (ok) { @@ -165,7 +165,7 @@ ActionReply Helper::load(QVariantMap args) } } if (operations.testFlag(ConfigurationFile)) { - QFile file(GRUB_CONFIG); + QFile file(QString::fromUtf8(GRUB_CONFIG)); bool ok =3D file.open(QIODevice::ReadOnly | QIODevice::Text); reply.addData(QLatin1String("configSuccess"), ok); if (ok) { @@ -176,7 +176,7 @@ ActionReply Helper::load(QVariantMap args) } } if (operations.testFlag(EnvironmentFile)) { - QFile file(GRUB_ENV); + QFile file(QString::fromUtf8(GRUB_ENV)); bool ok =3D file.open(QIODevice::ReadOnly | QIODevice::Text); reply.addData(QLatin1String("envSuccess"), ok); if (ok) { @@ -187,10 +187,10 @@ ActionReply Helper::load(QVariantMap args) } } if (operations.testFlag(MemtestFile)) { - bool memtest =3D QFile::exists(GRUB_MEMTEST); + bool memtest =3D QFile::exists(QString::fromUtf8(GRUB_MEMTEST)); reply.addData(QLatin1String("memtest"), memtest); if (memtest) { - reply.addData(QLatin1String("memtestOn"), (bool)(QFile::permis= sions(GRUB_MEMTEST) & (QFile::ExeOwner | QFile::ExeGroup | QFile::ExeOther)= )); + reply.addData(QLatin1String("memtestOn"), (bool)(QFile::permis= sions(QString::fromUtf8(GRUB_MEMTEST)) & (QFile::ExeOwner | QFile::ExeGroup= | QFile::ExeOther))); } } #if HAVE_HD @@ -201,52 +201,52 @@ ActionReply Helper::load(QVariantMap args) hd_t *hd =3D hd_list(&hd_data, hw_framebuffer, 1, NULL); for (hd_res_t *res =3D hd->res; res; res =3D res->next) { if (res->any.type =3D=3D res_framebuffer) { - gfxmodes +=3D QString("%1x%2x%3").arg(QString::number(res-= >framebuffer.width), QString::number(res->framebuffer.height), QString::num= ber(res->framebuffer.colorbits)); + gfxmodes +=3D QString(QLatin1String("%1x%2x%3")).arg(QStri= ng::number(res->framebuffer.width), QString::number(res->framebuffer.height= ), QString::number(res->framebuffer.colorbits)); } } hd_free_hd_list(hd); hd_free_hd_data(&hd_data); - reply.addData("gfxmodes", gfxmodes); + reply.addData(QLatin1String("gfxmodes"), gfxmodes); } #endif if (operations.testFlag(Locales)) { - reply.addData(QLatin1String("locales"), QDir(GRUB_LOCALE).entryLis= t(QStringList() << QLatin1String("*.mo"), QDir::Files).replaceInStrings(QRe= gExp(QLatin1String("\\.mo$")), QString())); + reply.addData(QLatin1String("locales"), QDir(QString::fromUtf8(GRU= B_LOCALE)).entryList(QStringList() << QLatin1String("*.mo"), QDir::Files).r= eplaceInStrings(QRegExp(QLatin1String("\\.mo$")), QString())); } return reply; } ActionReply Helper::save(QVariantMap args) { ActionReply reply; - QString configFileName =3D GRUB_CONFIG; - QByteArray rawConfigFileContents =3D args.value("rawConfigFileContents= ").toByteArray(); - QByteArray rawDefaultEntry =3D args.value("rawDefaultEntry").toByteArr= ay(); - bool memtest =3D args.value("memtest").toBool(); + QString configFileName =3D QString::fromUtf8(GRUB_CONFIG); + QByteArray rawConfigFileContents =3D args.value(QLatin1String("rawConf= igFileContents")).toByteArray(); + QByteArray rawDefaultEntry =3D args.value(QLatin1String("rawDefaultEnt= ry")).toByteArray(); + bool memtest =3D args.value(QLatin1String("memtest")).toBool(); = - QFile::copy(configFileName, configFileName + ".original"); + QFile::copy(configFileName, configFileName + QLatin1String(".original"= )); = QFile file(configFileName); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { reply =3D ActionReply::HelperErrorReply; - reply.addData("errorDescription", file.errorString()); + reply.addData(QLatin1String("errorDescription"), file.errorString(= )); return reply; } file.write(rawConfigFileContents); file.close(); = - if (args.contains("memtest")) { - QFile::Permissions permissions =3D QFile::permissions(GRUB_MEMTEST= ); + if (args.contains(QLatin1String("memtest"))) { + QFile::Permissions permissions =3D QFile::permissions(QString::fro= mUtf8(GRUB_MEMTEST)); if (memtest) { permissions |=3D (QFile::ExeOwner | QFile::ExeUser | QFile::Ex= eGroup | QFile::ExeOther); } else { permissions &=3D ~(QFile::ExeOwner | QFile::ExeUser | QFile::E= xeGroup | QFile::ExeOther); } - QFile::setPermissions(GRUB_MEMTEST, permissions); + QFile::setPermissions(QString::fromUtf8(GRUB_MEMTEST), permissions= ); } = if (args.contains(QLatin1String("LANG"))) { qputenv("LANG", args.value(QLatin1String("LANG")).toByteArray()); } - ActionReply grub_mkconfigReply =3D executeCommand(QStringList() << GRU= B_MKCONFIG_EXE << "-o" << GRUB_MENU); + ActionReply grub_mkconfigReply =3D executeCommand(QStringList() << QSt= ring::fromUtf8(GRUB_MKCONFIG_EXE) << QLatin1String("-o") << QString::fromUt= f8(GRUB_MENU)); if (grub_mkconfigReply.failed()) { return grub_mkconfigReply; } @@ -257,7 +257,7 @@ ActionReply Helper::save(QVariantMap args) } } = - ActionReply grub_set_defaultReply =3D executeCommand(QStringList() << = GRUB_SET_DEFAULT_EXE << rawDefaultEntry); + ActionReply grub_set_defaultReply =3D executeCommand(QStringList() << = QString::fromUtf8(GRUB_SET_DEFAULT_EXE) << QString::fromUtf8(rawDefaultEntr= y.constData())); if (grub_set_defaultReply.failed()) { return grub_set_defaultReply; } diff --git a/src/installDlg.cpp b/src/installDlg.cpp index ceff92c..34a2847 100644 --- a/src/installDlg.cpp +++ b/src/installDlg.cpp @@ -43,7 +43,7 @@ InstallDialog::InstallDialog(QWidget *parent, Qt::WFlags = flags) : KDialog(parent setMainWidget(widget); enableButtonOk(false); setWindowTitle(i18nc("@title:window", "Install/Recover Bootloader")); - setWindowIcon(KIcon("system-software-update")); + setWindowIcon(KIcon(QLatin1String("system-software-update"))); if (parent) { setInitialSize(parent->size()); } @@ -64,7 +64,7 @@ InstallDialog::InstallDialog(QWidget *parent, Qt::WFlags = flags) : KDialog(parent continue; } = - QString uuidDir =3D "/dev/disk/by-uuid/", uuid =3D volume->uuid(),= name; + QString uuidDir =3D QLatin1String("/dev/disk/by-uuid/"), uuid =3D = volume->uuid(), name; name =3D (QFile::exists((name =3D uuidDir + uuid)) || QFile::exist= s((name =3D uuidDir + uuid.toLower())) || QFile::exists((name =3D uuidDir += uuid.toUpper())) ? QFile::symLinkTarget(name) : QString()); QTreeWidgetItem *item =3D new QTreeWidgetItem(ui->treeWidget_recov= er, QStringList() << QString() << name << partition->filePath() << volume->= label() << volume->fsType() << KGlobal::locale()->formatByteSize(volume->si= ze())); item->setIcon(1, KIcon(device.icon())); @@ -83,18 +83,18 @@ InstallDialog::~InstallDialog() void InstallDialog::slotButtonClicked(int button) { if (button =3D=3D KDialog::Ok) { - Action installAction("org.kde.kcontrol.kcmgrub2.install"); - installAction.setHelperID("org.kde.kcontrol.kcmgrub2"); + Action installAction(QLatin1String("org.kde.kcontrol.kcmgrub2.inst= all")); + installAction.setHelperID(QLatin1String("org.kde.kcontrol.kcmgrub2= ")); for (int i =3D 0; i < ui->treeWidget_recover->topLevelItemCount();= i++) { QRadioButton *radio =3D qobject_cast(ui->treeW= idget_recover->itemWidget(ui->treeWidget_recover->topLevelItem(i), 0)); if (radio && radio->isChecked()) { - installAction.addArgument("partition", ui->treeWidget_reco= ver->topLevelItem(i)->text(1)); - installAction.addArgument("mountPoint", ui->treeWidget_rec= over->topLevelItem(i)->text(2)); - installAction.addArgument("mbrInstall", !ui->checkBox_part= ition->isChecked()); + installAction.addArgument(QLatin1String("partition"), ui->= treeWidget_recover->topLevelItem(i)->text(1)); + installAction.addArgument(QLatin1String("mountPoint"), ui-= >treeWidget_recover->topLevelItem(i)->text(2)); + installAction.addArgument(QLatin1String("mbrInstall"), !ui= ->checkBox_partition->isChecked()); break; } } - if (installAction.arguments().value("partition").toString().isEmpt= y()) { + if (installAction.arguments().value(QLatin1String("partition")).to= String().isEmpty()) { KMessageBox::sorry(this, i18nc("@info", "Sorry, you have to se= lect a partition with a proper name!")); return; } @@ -122,9 +122,9 @@ void InstallDialog::slotButtonClicked(int button) dialog->setModal(true); dialog->setDefaultButton(KDialog::Ok); dialog->setEscapeButton(KDialog::Ok); - KMessageBox::createKMessageBox(dialog, QMessageBox::Informatio= n, i18nc("@info", "Successfully installed GRUB."), QStringList(), QString()= , 0, KMessageBox::Notify, reply.data().value("output").toString()); // kraz= y:exclude=3Dqclasses + KMessageBox::createKMessageBox(dialog, QMessageBox::Informatio= n, i18nc("@info", "Successfully installed GRUB."), QStringList(), QString()= , 0, KMessageBox::Notify, reply.data().value(QLatin1String("output")).toStr= ing()); // krazy:exclude=3Dqclasses } else { - KMessageBox::detailedError(this, i18nc("@info", "Failed to ins= tall GRUB."), KDE_IS_VERSION(4,7,0) ? reply.errorDescription() : reply.data= ().value("errorDescription").toString()); + KMessageBox::detailedError(this, i18nc("@info", "Failed to ins= tall GRUB."), KDE_IS_VERSION(4,7,0) ? reply.errorDescription() : reply.data= ().value(QLatin1String("errorDescription")).toString()); } } KDialog::slotButtonClicked(button); diff --git a/src/kcm_grub2.cpp b/src/kcm_grub2.cpp index 4722f58..896b2ac 100644 --- a/src/kcm_grub2.cpp +++ b/src/kcm_grub2.cpp @@ -57,7 +57,7 @@ K_EXPORT_PLUGIN(GRUB2Factory("kcmgrub2")) KCMGRUB2::KCMGRUB2(QWidget *parent, const QVariantList &list) : KCModule(G= RUB2Factory::componentData(), parent, list) { //Isn't KAboutData's second argument supposed to do this? - KGlobal::locale()->insertCatalog("kcm-grub2"); + KGlobal::locale()->insertCatalog(QLatin1String("kcm-grub2")); = KAboutData *about =3D new KAboutData("kcmgrub2", "kcm-grub2", ki18nc("= @title", "KDE GRUB2 Bootloader Control Module"), KCM_GRUB2_VERSION, ki18nc(= "@title", "A KDE Control Module for configuring the GRUB2 bootloader."), KA= boutData::License_GPL_V3, ki18nc("@info:credit", "Copyright (C) 2008-2013 K= onstantinos Smanis"), KLocalizedString(), "http://ksmanis.wordpress.com/pro= jects/grub2-editor/"); about->addAuthor(ki18nc("@info:credit", "=CE=9Aonstantinos Smanis"), k= i18nc("@info:credit", "Main Developer"), "konstantinos.smanis@gmail.com", "= http://ksmanis.wordpress.com/"); @@ -75,8 +75,8 @@ KCMGRUB2::~KCMGRUB2() = void KCMGRUB2::defaults() { - Action defaultsAction("org.kde.kcontrol.kcmgrub2.defaults"); - defaultsAction.setHelperID("org.kde.kcontrol.kcmgrub2"); + Action defaultsAction(QLatin1String("org.kde.kcontrol.kcmgrub2.default= s")); + defaultsAction.setHelperID(QLatin1String("org.kde.kcontrol.kcmgrub2")); #if KDE_IS_VERSION(4,6,0) defaultsAction.setParentWidget(this); #endif @@ -95,9 +95,9 @@ void KCMGRUB2::load() { readAll(); = - QString grubDefault =3D unquoteWord(m_settings.value("GRUB_DEFAULT")); + QString grubDefault =3D unquoteWord(m_settings.value(QLatin1String("GR= UB_DEFAULT"))); if (grubDefault =3D=3D QLatin1String("saved")) { - grubDefault =3D (m_env.value("saved_entry").isEmpty() ? "0" : m_en= v.value("saved_entry")); + grubDefault =3D (m_env.value(QLatin1String("saved_entry")).isEmpty= () ? QString(QLatin1Char('0')) : m_env.value(QLatin1String("saved_entry"))); } = ui->kcombobox_default->clear(); @@ -136,7 +136,7 @@ void KCMGRUB2::load() ui->kcombobox_default->setModel(model); ui->kcombobox_default->setMinimumContentsLength(maxLen + maxLvl * = 3); = - bool numericDefault =3D QRegExp("((\\d)+>)*(\\d)+").exactMatch(gru= bDefault); + bool numericDefault =3D QRegExp(QLatin1String("((\\d)+>)*(\\d)+"))= .exactMatch(grubDefault); int entryIndex =3D -1; for (int i =3D 0; i < m_entries.size(); i++) { if ((numericDefault && m_entries.at(i).fullNumTitle() =3D=3D g= rubDefault) || (!numericDefault && m_entries.at(i).fullTitle() =3D=3D grubD= efault)) { @@ -162,11 +162,11 @@ void KCMGRUB2::load() } } ui->kpushbutton_remove->setEnabled(!m_entries.isEmpty()); - ui->checkBox_savedefault->setChecked(unquoteWord(m_settings.value("GRU= B_SAVEDEFAULT")).compare("true") =3D=3D 0); + ui->checkBox_savedefault->setChecked(unquoteWord(m_settings.value(QLat= in1String("GRUB_SAVEDEFAULT"))).compare(QLatin1String("true")) =3D=3D 0); = bool ok; - if (!m_settings.value("GRUB_HIDDEN_TIMEOUT").isEmpty()) { - int grubHiddenTimeout =3D unquoteWord(m_settings.value("GRUB_HIDDE= N_TIMEOUT")).toInt(&ok); + if (!m_settings.value(QLatin1String("GRUB_HIDDEN_TIMEOUT")).isEmpty())= { + int grubHiddenTimeout =3D unquoteWord(m_settings.value(QLatin1Stri= ng("GRUB_HIDDEN_TIMEOUT"))).toInt(&ok); if (ok && grubHiddenTimeout >=3D 0) { ui->checkBox_hiddenTimeout->setChecked(grubHiddenTimeout > 0); ui->spinBox_hiddenTimeout->setValue(grubHiddenTimeout); @@ -174,8 +174,8 @@ void KCMGRUB2::load() kWarning() << "Invalid GRUB_HIDDEN_TIMEOUT value"; } } - ui->checkBox_hiddenTimeoutShowTimer->setChecked(unquoteWord(m_settings= .value("GRUB_HIDDEN_TIMEOUT_QUIET")).compare("true") !=3D 0); - int grubTimeout =3D (m_settings.value("GRUB_TIMEOUT").isEmpty() ? 5 : = unquoteWord(m_settings.value("GRUB_TIMEOUT")).toInt(&ok)); + ui->checkBox_hiddenTimeoutShowTimer->setChecked(unquoteWord(m_settings= .value(QLatin1String("GRUB_HIDDEN_TIMEOUT_QUIET"))).compare(QLatin1String("= true")) !=3D 0); + int grubTimeout =3D (m_settings.value(QLatin1String("GRUB_TIMEOUT")).i= sEmpty() ? 5 : unquoteWord(m_settings.value(QLatin1String("GRUB_TIMEOUT")))= .toInt(&ok)); if (ok && grubTimeout >=3D -1) { ui->checkBox_timeout->setChecked(grubTimeout > -1); ui->radioButton_timeout0->setChecked(grubTimeout =3D=3D 0); @@ -192,18 +192,18 @@ void KCMGRUB2::load() } else { kWarning() << "Invalid LANGUAGE value"; } - ui->checkBox_recovery->setChecked(unquoteWord(m_settings.value("GRUB_D= ISABLE_RECOVERY")).compare("true") !=3D 0); + ui->checkBox_recovery->setChecked(unquoteWord(m_settings.value(QLatin1= String("GRUB_DISABLE_RECOVERY"))).compare(QLatin1String("true")) !=3D 0); ui->checkBox_memtest->setVisible(m_memtest); ui->checkBox_memtest->setChecked(m_memtestOn); - ui->checkBox_osProber->setChecked(unquoteWord(m_settings.value("GRUB_D= ISABLE_OS_PROBER")).compare("true") !=3D 0); + ui->checkBox_osProber->setChecked(unquoteWord(m_settings.value(QLatin1= String("GRUB_DISABLE_OS_PROBER"))).compare(QLatin1String("true")) !=3D 0); = - m_resolutions.append("640x480"); - QString grubGfxmode =3D (m_settings.value("GRUB_GFXMODE").isEmpty() ? = "640x480" : unquoteWord(m_settings.value("GRUB_GFXMODE"))); + m_resolutions.append(QLatin1String("640x480")); + QString grubGfxmode =3D (m_settings.value(QLatin1String("GRUB_GFXMODE"= )).isEmpty() ? QLatin1String("640x480") : unquoteWord(m_settings.value(QLat= in1String("GRUB_GFXMODE")))); if (!grubGfxmode.isEmpty() && !m_resolutions.contains(grubGfxmode)) { m_resolutions.append(grubGfxmode); } - QString grubGfxpayloadLinux =3D unquoteWord(m_settings.value("GRUB_GFX= PAYLOAD_LINUX")); - if (!grubGfxpayloadLinux.isEmpty() && grubGfxpayloadLinux.compare("tex= t") !=3D 0 && grubGfxpayloadLinux.compare("keep") !=3D 0 && !m_resolutions.= contains(grubGfxpayloadLinux)) { + QString grubGfxpayloadLinux =3D unquoteWord(m_settings.value(QLatin1St= ring("GRUB_GFXPAYLOAD_LINUX"))); + if (!grubGfxpayloadLinux.isEmpty() && grubGfxpayloadLinux.compare(QLat= in1String("text")) !=3D 0 && grubGfxpayloadLinux.compare(QLatin1String("kee= p")) !=3D 0 && !m_resolutions.contains(grubGfxpayloadLinux)) { m_resolutions.append(grubGfxpayloadLinux); } m_resolutions.removeDuplicates(); @@ -212,10 +212,10 @@ void KCMGRUB2::load() ui->kcombobox_gfxmode->setCurrentIndex(ui->kcombobox_gfxmode->findData= (grubGfxmode)); ui->kcombobox_gfxpayload->setCurrentIndex(ui->kcombobox_gfxpayload->fi= ndData(grubGfxpayloadLinux)); = - QString grubColorNormal =3D unquoteWord(m_settings.value("GRUB_COLOR_N= ORMAL")); + QString grubColorNormal =3D unquoteWord(m_settings.value(QLatin1String= ("GRUB_COLOR_NORMAL"))); if (!grubColorNormal.isEmpty()) { - int normalForegroundIndex =3D ui->kcombobox_normalForeground->find= Data(grubColorNormal.section('/', 0, 0)); - int normalBackgroundIndex =3D ui->kcombobox_normalBackground->find= Data(grubColorNormal.section('/', 1)); + int normalForegroundIndex =3D ui->kcombobox_normalForeground->find= Data(grubColorNormal.section(QLatin1Char('/'), 0, 0)); + int normalBackgroundIndex =3D ui->kcombobox_normalBackground->find= Data(grubColorNormal.section(QLatin1Char('/'), 1)); if (normalForegroundIndex =3D=3D -1 || normalBackgroundIndex =3D= =3D -1) { kWarning() << "Invalid GRUB_COLOR_NORMAL value"; } @@ -226,10 +226,10 @@ void KCMGRUB2::load() ui->kcombobox_normalBackground->setCurrentIndex(normalBackgrou= ndIndex); } } - QString grubColorHighlight =3D unquoteWord(m_settings.value("GRUB_COLO= R_HIGHLIGHT")); + QString grubColorHighlight =3D unquoteWord(m_settings.value(QLatin1Str= ing("GRUB_COLOR_HIGHLIGHT"))); if (!grubColorHighlight.isEmpty()) { - int highlightForegroundIndex =3D ui->kcombobox_highlightForeground= ->findData(grubColorHighlight.section('/', 0, 0)); - int highlightBackgroundIndex =3D ui->kcombobox_highlightBackground= ->findData(grubColorHighlight.section('/', 1)); + int highlightForegroundIndex =3D ui->kcombobox_highlightForeground= ->findData(grubColorHighlight.section(QLatin1Char('/'), 0, 0)); + int highlightBackgroundIndex =3D ui->kcombobox_highlightBackground= ->findData(grubColorHighlight.section(QLatin1Char('/'), 1)); if (highlightForegroundIndex =3D=3D -1 || highlightBackgroundIndex= =3D=3D -1) { kWarning() << "Invalid GRUB_COLOR_HIGHLIGHT value"; } @@ -241,25 +241,25 @@ void KCMGRUB2::load() } } = - QString grubBackground =3D unquoteWord(m_settings.value("GRUB_BACKGROU= ND")); + QString grubBackground =3D unquoteWord(m_settings.value(QLatin1String(= "GRUB_BACKGROUND"))); ui->kurlrequester_background->setText(grubBackground); ui->kpushbutton_preview->setEnabled(!grubBackground.isEmpty()); - ui->kurlrequester_theme->setText(unquoteWord(m_settings.value("GRUB_TH= EME"))); + ui->kurlrequester_theme->setText(unquoteWord(m_settings.value(QLatin1S= tring("GRUB_THEME")))); = - ui->klineedit_cmdlineDefault->setText(unquoteWord(m_settings.value("GR= UB_CMDLINE_LINUX_DEFAULT"))); - ui->klineedit_cmdline->setText(unquoteWord(m_settings.value("GRUB_CMDL= INE_LINUX"))); + ui->klineedit_cmdlineDefault->setText(unquoteWord(m_settings.value(QLa= tin1String("GRUB_CMDLINE_LINUX_DEFAULT")))); + ui->klineedit_cmdline->setText(unquoteWord(m_settings.value(QLatin1Str= ing("GRUB_CMDLINE_LINUX")))); = - QString grubTerminal =3D unquoteWord(m_settings.value("GRUB_TERMINAL")= ); + QString grubTerminal =3D unquoteWord(m_settings.value(QLatin1String("G= RUB_TERMINAL"))); ui->klineedit_terminal->setText(grubTerminal); ui->klineedit_terminalInput->setReadOnly(!grubTerminal.isEmpty()); ui->klineedit_terminalOutput->setReadOnly(!grubTerminal.isEmpty()); - ui->klineedit_terminalInput->setText(!grubTerminal.isEmpty() ? grubTer= minal : unquoteWord(m_settings.value("GRUB_TERMINAL_INPUT"))); - ui->klineedit_terminalOutput->setText(!grubTerminal.isEmpty() ? grubTe= rminal : unquoteWord(m_settings.value("GRUB_TERMINAL_OUTPUT"))); + ui->klineedit_terminalInput->setText(!grubTerminal.isEmpty() ? grubTer= minal : unquoteWord(m_settings.value(QLatin1String("GRUB_TERMINAL_INPUT")))= ); + ui->klineedit_terminalOutput->setText(!grubTerminal.isEmpty() ? grubTe= rminal : unquoteWord(m_settings.value(QLatin1String("GRUB_TERMINAL_OUTPUT")= ))); = - ui->klineedit_distributor->setText(unquoteWord(m_settings.value("GRUB_= DISTRIBUTOR"))); - ui->klineedit_serial->setText(unquoteWord(m_settings.value("GRUB_SERIA= L_COMMAND"))); - ui->klineedit_initTune->setText(unquoteWord(m_settings.value("GRUB_INI= T_TUNE"))); - ui->checkBox_uuid->setChecked(unquoteWord(m_settings.value("GRUB_DISAB= LE_LINUX_UUID")).compare("true") !=3D 0); + ui->klineedit_distributor->setText(unquoteWord(m_settings.value(QLatin= 1String("GRUB_DISTRIBUTOR")))); + ui->klineedit_serial->setText(unquoteWord(m_settings.value(QLatin1Stri= ng("GRUB_SERIAL_COMMAND")))); + ui->klineedit_initTune->setText(unquoteWord(m_settings.value(QLatin1St= ring("GRUB_INIT_TUNE")))); + ui->checkBox_uuid->setChecked(unquoteWord(m_settings.value(QLatin1Stri= ng("GRUB_DISABLE_LINUX_UUID"))).compare(QLatin1String("true")) !=3D 0); = m_dirtyBits.fill(0); Q_EMIT changed(false); @@ -268,7 +268,7 @@ void KCMGRUB2::save() { QString grubDefault; if (!m_entries.isEmpty()) { - m_settings["GRUB_DEFAULT"] =3D "saved"; + m_settings[QLatin1String("GRUB_DEFAULT")] =3D QLatin1String("saved= "); QStandardItemModel *model =3D qobject_cast(u= i->kcombobox_default->model()); QTreeView *view =3D qobject_cast(ui->kcombobox_defaul= t->view()); //Ugly, ugly hack. The view's current QModelIndex is invalidated @@ -282,34 +282,34 @@ void KCMGRUB2::save() } if (m_dirtyBits.testBit(grubSavedefaultDirty)) { if (ui->checkBox_savedefault->isChecked()) { - m_settings["GRUB_SAVEDEFAULT"] =3D "true"; + m_settings[QLatin1String("GRUB_SAVEDEFAULT")] =3D QLatin1Strin= g("true"); } else { - m_settings.remove("GRUB_SAVEDEFAULT"); + m_settings.remove(QLatin1String("GRUB_SAVEDEFAULT")); } } if (m_dirtyBits.testBit(grubHiddenTimeoutDirty)) { if (ui->checkBox_hiddenTimeout->isChecked()) { - m_settings["GRUB_HIDDEN_TIMEOUT"] =3D QString::number(ui->spin= Box_hiddenTimeout->value()); + m_settings[QLatin1String("GRUB_HIDDEN_TIMEOUT")] =3D QString::= number(ui->spinBox_hiddenTimeout->value()); } else { - m_settings.remove("GRUB_HIDDEN_TIMEOUT"); + m_settings.remove(QLatin1String("GRUB_HIDDEN_TIMEOUT")); } } if (m_dirtyBits.testBit(grubHiddenTimeoutQuietDirty)) { if (ui->checkBox_hiddenTimeoutShowTimer->isChecked()) { - m_settings.remove("GRUB_HIDDEN_TIMEOUT_QUIET"); + m_settings.remove(QLatin1String("GRUB_HIDDEN_TIMEOUT_QUIET")); } else { - m_settings["GRUB_HIDDEN_TIMEOUT_QUIET"] =3D "true"; + m_settings[QLatin1String("GRUB_HIDDEN_TIMEOUT_QUIET")] =3D QLa= tin1String("true"); } } if (m_dirtyBits.testBit(grubTimeoutDirty)) { if (ui->checkBox_timeout->isChecked()) { if (ui->radioButton_timeout0->isChecked()) { - m_settings["GRUB_TIMEOUT"] =3D '0'; + m_settings[QLatin1String("GRUB_TIMEOUT")] =3D QLatin1Char(= '0'); } else { - m_settings["GRUB_TIMEOUT"] =3D QString::number(ui->spinBox= _timeout->value()); + m_settings[QLatin1String("GRUB_TIMEOUT")] =3D QString::num= ber(ui->spinBox_timeout->value()); } } else { - m_settings["GRUB_TIMEOUT"] =3D "-1"; + m_settings[QLatin1String("GRUB_TIMEOUT")] =3D QLatin1String("-= 1"); } } if (m_dirtyBits.testBit(grubLocaleDirty)) { @@ -322,137 +322,137 @@ void KCMGRUB2::save() } if (m_dirtyBits.testBit(grubDisableRecoveryDirty)) { if (ui->checkBox_recovery->isChecked()) { - m_settings.remove("GRUB_DISABLE_RECOVERY"); + m_settings.remove(QLatin1String("GRUB_DISABLE_RECOVERY")); } else { - m_settings["GRUB_DISABLE_RECOVERY"] =3D "true"; + m_settings[QLatin1String("GRUB_DISABLE_RECOVERY")] =3D QLatin1= String("true"); } } if (m_dirtyBits.testBit(grubDisableOsProberDirty)) { if (ui->checkBox_osProber->isChecked()) { - m_settings.remove("GRUB_DISABLE_OS_PROBER"); + m_settings.remove(QLatin1String("GRUB_DISABLE_OS_PROBER")); } else { - m_settings["GRUB_DISABLE_OS_PROBER"] =3D "true"; + m_settings[QLatin1String("GRUB_DISABLE_OS_PROBER")] =3D QLatin= 1String("true"); } } if (m_dirtyBits.testBit(grubGfxmodeDirty)) { if (ui->kcombobox_gfxmode->currentIndex() <=3D 0) { kError() << "Something went terribly wrong!"; } else { - m_settings["GRUB_GFXMODE"] =3D quoteWord(ui->kcombobox_gfxmode= ->itemData(ui->kcombobox_gfxmode->currentIndex()).toString()); + m_settings[QLatin1String("GRUB_GFXMODE")] =3D quoteWord(ui->kc= ombobox_gfxmode->itemData(ui->kcombobox_gfxmode->currentIndex()).toString()= ); } } if (m_dirtyBits.testBit(grubGfxpayloadLinuxDirty)) { if (ui->kcombobox_gfxpayload->currentIndex() <=3D 0) { kError() << "Something went terribly wrong!"; } else if (ui->kcombobox_gfxpayload->currentIndex() =3D=3D 1) { - m_settings.remove("GRUB_GFXPAYLOAD_LINUX"); + m_settings.remove(QLatin1String("GRUB_GFXPAYLOAD_LINUX")); } else if (ui->kcombobox_gfxpayload->currentIndex() > 1) { - m_settings["GRUB_GFXPAYLOAD_LINUX"] =3D quoteWord(ui->kcombobo= x_gfxpayload->itemData(ui->kcombobox_gfxpayload->currentIndex()).toString()= ); + m_settings[QLatin1String("GRUB_GFXPAYLOAD_LINUX")] =3D quoteWo= rd(ui->kcombobox_gfxpayload->itemData(ui->kcombobox_gfxpayload->currentInde= x()).toString()); } } if (m_dirtyBits.testBit(grubColorNormalDirty)) { QString normalForeground =3D ui->kcombobox_normalForeground->itemD= ata(ui->kcombobox_normalForeground->currentIndex()).toString(); QString normalBackground =3D ui->kcombobox_normalBackground->itemD= ata(ui->kcombobox_normalBackground->currentIndex()).toString(); - if (normalForeground.compare("light-gray") !=3D 0 || normalBackgro= und.compare("black") !=3D 0) { - m_settings["GRUB_COLOR_NORMAL"] =3D normalForeground + '/' + n= ormalBackground; + if (normalForeground.compare(QLatin1String("light-gray")) !=3D 0 |= | normalBackground.compare(QLatin1String("black")) !=3D 0) { + m_settings[QLatin1String("GRUB_COLOR_NORMAL")] =3D normalForeg= round + QLatin1Char('/') + normalBackground; } else { - m_settings.remove("GRUB_COLOR_NORMAL"); + m_settings.remove(QLatin1String("GRUB_COLOR_NORMAL")); } } if (m_dirtyBits.testBit(grubColorHighlightDirty)) { QString highlightForeground =3D ui->kcombobox_highlightForeground-= >itemData(ui->kcombobox_highlightForeground->currentIndex()).toString(); QString highlightBackground =3D ui->kcombobox_highlightBackground-= >itemData(ui->kcombobox_highlightBackground->currentIndex()).toString(); - if (highlightForeground.compare("black") !=3D 0 || highlightBackgr= ound.compare("light-gray") !=3D 0) { - m_settings["GRUB_COLOR_HIGHLIGHT"] =3D highlightForeground + '= /' + highlightBackground; + if (highlightForeground.compare(QLatin1String("black")) !=3D 0 || = highlightBackground.compare(QLatin1String("light-gray")) !=3D 0) { + m_settings[QLatin1String("GRUB_COLOR_HIGHLIGHT")] =3D highligh= tForeground + QLatin1Char('/') + highlightBackground; } else { - m_settings.remove("GRUB_COLOR_HIGHLIGHT"); + m_settings.remove(QLatin1String("GRUB_COLOR_HIGHLIGHT")); } } if (m_dirtyBits.testBit(grubBackgroundDirty)) { QString background =3D ui->kurlrequester_background->url().toLocal= File(); if (!background.isEmpty()) { - m_settings["GRUB_BACKGROUND"] =3D quoteWord(background); + m_settings[QLatin1String("GRUB_BACKGROUND")] =3D quoteWord(bac= kground); } else { - m_settings.remove("GRUB_BACKGROUND"); + m_settings.remove(QLatin1String("GRUB_BACKGROUND")); } } if (m_dirtyBits.testBit(grubThemeDirty)) { QString theme =3D ui->kurlrequester_theme->url().toLocalFile(); if (!theme.isEmpty()) { - m_settings["GRUB_THEME"] =3D quoteWord(theme); + m_settings[QLatin1String("GRUB_THEME")] =3D quoteWord(theme); } else { - m_settings.remove("GRUB_THEME"); + m_settings.remove(QLatin1String("GRUB_THEME")); } } if (m_dirtyBits.testBit(grubCmdlineLinuxDefaultDirty)) { QString cmdlineLinuxDefault =3D ui->klineedit_cmdlineDefault->text= (); if (!cmdlineLinuxDefault.isEmpty()) { - m_settings["GRUB_CMDLINE_LINUX_DEFAULT"] =3D quoteWord(cmdline= LinuxDefault); + m_settings[QLatin1String("GRUB_CMDLINE_LINUX_DEFAULT")] =3D qu= oteWord(cmdlineLinuxDefault); } else { - m_settings.remove("GRUB_CMDLINE_LINUX_DEFAULT"); + m_settings.remove(QLatin1String("GRUB_CMDLINE_LINUX_DEFAULT")); } } if (m_dirtyBits.testBit(grubCmdlineLinuxDirty)) { QString cmdlineLinux =3D ui->klineedit_cmdline->text(); if (!cmdlineLinux.isEmpty()) { - m_settings["GRUB_CMDLINE_LINUX"] =3D quoteWord(cmdlineLinux); + m_settings[QLatin1String("GRUB_CMDLINE_LINUX")] =3D quoteWord(= cmdlineLinux); } else { - m_settings.remove("GRUB_CMDLINE_LINUX"); + m_settings.remove(QLatin1String("GRUB_CMDLINE_LINUX")); } } if (m_dirtyBits.testBit(grubTerminalDirty)) { QString terminal =3D ui->klineedit_terminal->text(); if (!terminal.isEmpty()) { - m_settings["GRUB_TERMINAL"] =3D quoteWord(terminal); + m_settings[QLatin1String("GRUB_TERMINAL")] =3D quoteWord(termi= nal); } else { - m_settings.remove("GRUB_TERMINAL"); + m_settings.remove(QLatin1String("GRUB_TERMINAL")); } } if (m_dirtyBits.testBit(grubTerminalInputDirty)) { QString terminalInput =3D ui->klineedit_terminalInput->text(); if (!terminalInput.isEmpty()) { - m_settings["GRUB_TERMINAL_INPUT"] =3D quoteWord(terminalInput); + m_settings[QLatin1String("GRUB_TERMINAL_INPUT")] =3D quoteWord= (terminalInput); } else { - m_settings.remove("GRUB_TERMINAL_INPUT"); + m_settings.remove(QLatin1String("GRUB_TERMINAL_INPUT")); } } if (m_dirtyBits.testBit(grubTerminalOutputDirty)) { QString terminalOutput =3D ui->klineedit_terminalOutput->text(); if (!terminalOutput.isEmpty()) { - m_settings["GRUB_TERMINAL_OUTPUT"] =3D quoteWord(terminalOutpu= t); + m_settings[QLatin1String("GRUB_TERMINAL_OUTPUT")] =3D quoteWor= d(terminalOutput); } else { - m_settings.remove("GRUB_TERMINAL_OUTPUT"); + m_settings.remove(QLatin1String("GRUB_TERMINAL_OUTPUT")); } } if (m_dirtyBits.testBit(grubDistributorDirty)) { QString distributor =3D ui->klineedit_distributor->text(); if (!distributor.isEmpty()) { - m_settings["GRUB_DISTRIBUTOR"] =3D quoteWord(distributor); + m_settings[QLatin1String("GRUB_DISTRIBUTOR")] =3D quoteWord(di= stributor); } else { - m_settings.remove("GRUB_DISTRIBUTOR"); + m_settings.remove(QLatin1String("GRUB_DISTRIBUTOR")); } } if (m_dirtyBits.testBit(grubSerialCommandDirty)) { QString serialCommand =3D ui->klineedit_serial->text(); if (!serialCommand.isEmpty()) { - m_settings["GRUB_SERIAL_COMMAND"] =3D quoteWord(serialCommand); + m_settings[QLatin1String("GRUB_SERIAL_COMMAND")] =3D quoteWord= (serialCommand); } else { - m_settings.remove("GRUB_SERIAL_COMMAND"); + m_settings.remove(QLatin1String("GRUB_SERIAL_COMMAND")); } } if (m_dirtyBits.testBit(grubInitTuneDirty)) { QString initTune =3D ui->klineedit_initTune->text(); if (!initTune.isEmpty()) { - m_settings["GRUB_INIT_TUNE"] =3D quoteWord(initTune); + m_settings[QLatin1String("GRUB_INIT_TUNE")] =3D quoteWord(init= Tune); } else { - m_settings.remove("GRUB_INIT_TUNE"); + m_settings.remove(QLatin1String("GRUB_INIT_TUNE")); } } if (m_dirtyBits.testBit(grubDisableLinuxUuidDirty)) { if (ui->checkBox_uuid->isChecked()) { - m_settings.remove("GRUB_DISABLE_LINUX_UUID"); + m_settings.remove(QLatin1String("GRUB_DISABLE_LINUX_UUID")); } else { - m_settings["GRUB_DISABLE_LINUX_UUID"] =3D "true"; + m_settings[QLatin1String("GRUB_DISABLE_LINUX_UUID")] =3D QLati= n1String("true"); } } = @@ -464,16 +464,16 @@ void KCMGRUB2::save() stream << it.key() << '=3D' << it.value() << endl; } = - Action saveAction("org.kde.kcontrol.kcmgrub2.save"); - saveAction.setHelperID("org.kde.kcontrol.kcmgrub2"); - saveAction.addArgument("rawConfigFileContents", configFileContents.toU= tf8()); - saveAction.addArgument("rawDefaultEntry", !m_entries.isEmpty() ? grubD= efault.toUtf8() : m_settings.value("GRUB_DEFAULT").toUtf8()); + Action saveAction(QLatin1String("org.kde.kcontrol.kcmgrub2.save")); + saveAction.setHelperID(QLatin1String("org.kde.kcontrol.kcmgrub2")); + saveAction.addArgument(QLatin1String("rawConfigFileContents"), configF= ileContents.toUtf8()); + saveAction.addArgument(QLatin1String("rawDefaultEntry"), !m_entries.is= Empty() ? grubDefault.toUtf8() : m_settings.value(QLatin1String("GRUB_DEFAU= LT")).toUtf8()); if (ui->kcombobox_language->currentIndex() > 0) { saveAction.addArgument(QLatin1String("LANG"), qgetenv("LANG")); saveAction.addArgument(QLatin1String("LANGUAGE"), m_settings.value= (QLatin1String("LANGUAGE"))); } if (m_dirtyBits.testBit(memtestDirty)) { - saveAction.addArgument("memtest", ui->checkBox_memtest->isChecked(= )); + saveAction.addArgument(QLatin1String("memtest"), ui->checkBox_memt= est->isChecked()); } #if KDE_IS_VERSION(4,6,0) saveAction.setParentWidget(this); @@ -500,7 +500,7 @@ void KCMGRUB2::save() dialog->setModal(true); dialog->setDefaultButton(KDialog::Ok); dialog->setEscapeButton(KDialog::Ok); - KMessageBox::createKMessageBox(dialog, QMessageBox::Information, i= 18nc("@info", "Successfully saved GRUB settings."), QStringList(), QString(= ), 0, KMessageBox::Notify, QString::fromUtf8(reply.data().value("output").t= oByteArray().constData())); // krazy:exclude=3Dqclasses + KMessageBox::createKMessageBox(dialog, QMessageBox::Information, i= 18nc("@info", "Successfully saved GRUB settings."), QStringList(), QString(= ), 0, KMessageBox::Notify, QString::fromUtf8(reply.data().value(QLatin1Stri= ng("output")).toByteArray().constData())); // krazy:exclude=3Dqclasses load(); } else { KMessageBox::detailedError(this, i18nc("@info", "Failed to save GR= UB settings."), reply.errorDescription()); @@ -578,7 +578,7 @@ void KCMGRUB2::slotGrubGfxmodeChanged() { if (ui->kcombobox_gfxmode->currentIndex() =3D=3D 0) { bool ok; - QRegExpValidator regExp(QRegExp("\\d{3,4}x\\d{3,4}(x\\d{1,2})?"), = this); + QRegExpValidator regExp(QRegExp(QLatin1String("\\d{3,4}x\\d{3,4}(x= \\d{1,2})?")), this); QString resolution =3D KInputDialog::getText(i18nc("@title:window"= , "Enter screen resolution"), i18nc("@label:textbox", "Please enter a GRUB = resolution:"), QString(), &ok, this, ®Exp); if (ok) { if (!m_resolutions.contains(resolution)) { @@ -590,7 +590,7 @@ void KCMGRUB2::slotGrubGfxmodeChanged() } ui->kcombobox_gfxmode->setCurrentIndex(ui->kcombobox_gfxmode->= findData(resolution)); } else { - ui->kcombobox_gfxmode->setCurrentIndex(ui->kcombobox_gfxmode->= findData("640x480")); + ui->kcombobox_gfxmode->setCurrentIndex(ui->kcombobox_gfxmode->= findData(QLatin1String("640x480"))); } } m_dirtyBits.setBit(grubGfxmodeDirty); @@ -600,7 +600,7 @@ void KCMGRUB2::slotGrubGfxpayloadLinuxChanged() { if (ui->kcombobox_gfxpayload->currentIndex() =3D=3D 0) { bool ok; - QRegExpValidator regExp(QRegExp("\\d{3,4}x\\d{3,4}(x\\d{1,2})?"), = this); + QRegExpValidator regExp(QRegExp(QLatin1String("\\d{3,4}x\\d{3,4}(x= \\d{1,2})?")), this); QString resolution =3D KInputDialog::getText(i18nc("@title:window"= , "Enter screen resolution"), i18nc("@label:textbox", "Please enter a Linux= boot resolution:"), QString(), &ok, this, ®Exp); if (ok) { if (!m_resolutions.contains(resolution)) { @@ -647,14 +647,14 @@ void KCMGRUB2::slotPreviewGrubBackground() label->setPixmap(QPixmap::fromImage(QImage::fromData(file.readAll())).= scaled(QDesktopWidget().screenGeometry(this).size())); dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->showFullScreen(); - KMessageBox::information(dialog, i18nc("@info", "Press Escap= e to exit fullscreen mode."), QString(), "GRUBFullscreenPreview"= ); + KMessageBox::information(dialog, i18nc("@info", "Press Escap= e to exit fullscreen mode."), QString(), QLatin1String("GRUBFull= screenPreview")); } void KCMGRUB2::slotCreateGrubBackground() { #if HAVE_IMAGEMAGICK QPointer convertDlg =3D new ConvertDialog(this); QString resolution =3D ui->kcombobox_gfxmode->itemData(ui->kcombobox_g= fxmode->currentIndex()).toString(); - convertDlg->setResolution(resolution.section('x', 0, 0).toInt(), resol= ution.section('x', 1, 1).toInt()); + convertDlg->setResolution(resolution.section(QLatin1Char('x'), 0, 0).t= oInt(), resolution.section(QLatin1Char('x'), 1, 1).toInt()); connect(convertDlg, SIGNAL(splashImageCreated(QString)), ui->kurlreque= ster_background, SLOT(setText(QString))); convertDlg->exec(); delete convertDlg; @@ -680,8 +680,8 @@ void KCMGRUB2::slotGrubTerminalChanged() QString grubTerminal =3D ui->klineedit_terminal->text(); ui->klineedit_terminalInput->setReadOnly(!grubTerminal.isEmpty()); ui->klineedit_terminalOutput->setReadOnly(!grubTerminal.isEmpty()); - ui->klineedit_terminalInput->setText(!grubTerminal.isEmpty() ? grubTer= minal : unquoteWord(m_settings.value("GRUB_TERMINAL_INPUT"))); - ui->klineedit_terminalOutput->setText(!grubTerminal.isEmpty() ? grubTe= rminal : unquoteWord(m_settings.value("GRUB_TERMINAL_OUTPUT"))); + ui->klineedit_terminalInput->setText(!grubTerminal.isEmpty() ? grubTer= minal : unquoteWord(m_settings.value(QLatin1String("GRUB_TERMINAL_INPUT")))= ); + ui->klineedit_terminalOutput->setText(!grubTerminal.isEmpty() ? grubTe= rminal : unquoteWord(m_settings.value(QLatin1String("GRUB_TERMINAL_OUTPUT")= ))); m_dirtyBits.setBit(grubTerminalDirty); Q_EMIT changed(true); } @@ -741,7 +741,7 @@ void KCMGRUB2::slotUpdateSuggestions() if (!action->isCheckable()) { action->setCheckable(true); } - action->setChecked(lineEdit->text().contains(QRegExp(QString("\\b%= 1\\b").arg(action->data().toString())))); + action->setChecked(lineEdit->text().contains(QRegExp(QString(QLati= n1String("\\b%1\\b")).arg(action->data().toString())))); } } void KCMGRUB2::slotTriggeredSuggestion(QAction *action) @@ -769,9 +769,9 @@ void KCMGRUB2::slotTriggeredSuggestion(QAction *action) = QString lineEditText =3D lineEdit->text(); if (!action->isChecked()) { - lineEdit->setText(lineEditText.remove(QRegExp(QString("\\b%1\\b").= arg(action->data().toString()))).simplified()); + lineEdit->setText(lineEditText.remove(QRegExp(QString(QLatin1Strin= g("\\b%1\\b")).arg(action->data().toString()))).simplified()); } else { - lineEdit->setText(lineEditText.isEmpty() ? action->data().toString= () : lineEditText + ' ' + action->data().toString()); + lineEdit->setText(lineEditText.isEmpty() ? action->data().toString= () : lineEditText + QLatin1Char(' ') + action->data().toString()); } (this->*updateFunction)(); } @@ -789,46 +789,46 @@ void KCMGRUB2::setupObjects() view->setRootIsDecorated(false); ui->kcombobox_default->setView(view); = - ui->kpushbutton_install->setIcon(KIcon("system-software-update")); - ui->kpushbutton_remove->setIcon(KIcon("list-remove")); + ui->kpushbutton_install->setIcon(KIcon(QLatin1String("system-software-= update"))); + ui->kpushbutton_remove->setIcon(KIcon(QLatin1String("list-remove"))); ui->kpushbutton_remove->setVisible(HAVE_QAPT || HAVE_QPACKAGEKIT); = QPixmap black(16, 16), transparent(16, 16); black.fill(Qt::black); transparent.fill(Qt::transparent); - ui->kcombobox_normalForeground->addItem(QIcon(black), i18nc("@item:inl= istbox Refers to color.", "Black"), "black"); - ui->kcombobox_highlightForeground->addItem(QIcon(black), i18nc("@item:= inlistbox Refers to color.", "Black"), "black"); - ui->kcombobox_normalBackground->addItem(QIcon(transparent), i18nc("@it= em:inlistbox Refers to color.", "Transparent"), "black"); - ui->kcombobox_highlightBackground->addItem(QIcon(transparent), i18nc("= @item:inlistbox Refers to color.", "Transparent"), "black"); + ui->kcombobox_normalForeground->addItem(QIcon(black), i18nc("@item:inl= istbox Refers to color.", "Black"), QLatin1String("black")); + ui->kcombobox_highlightForeground->addItem(QIcon(black), i18nc("@item:= inlistbox Refers to color.", "Black"), QLatin1String("black")); + ui->kcombobox_normalBackground->addItem(QIcon(transparent), i18nc("@it= em:inlistbox Refers to color.", "Transparent"), QLatin1String("black")); + ui->kcombobox_highlightBackground->addItem(QIcon(transparent), i18nc("= @item:inlistbox Refers to color.", "Transparent"), QLatin1String("black")); QHash colors; - colors.insertMulti("blue", i18nc("@item:inlistbox Refers to color.", "= Blue")); - colors.insertMulti("blue", "blue"); - colors.insertMulti("cyan", i18nc("@item:inlistbox Refers to color.", "= Cyan")); - colors.insertMulti("cyan", "cyan"); - colors.insertMulti("dark-gray", i18nc("@item:inlistbox Refers to color= .", "Dark Gray")); - colors.insertMulti("dark-gray", "darkgray"); - colors.insertMulti("green", i18nc("@item:inlistbox Refers to color.", = "Green")); - colors.insertMulti("green", "green"); - colors.insertMulti("light-cyan", i18nc("@item:inlistbox Refers to colo= r.", "Light Cyan")); - colors.insertMulti("light-cyan", "lightcyan"); - colors.insertMulti("light-blue", i18nc("@item:inlistbox Refers to colo= r.", "Light Blue")); - colors.insertMulti("light-blue", "lightblue"); - colors.insertMulti("light-green", i18nc("@item:inlistbox Refers to col= or.", "Light Green")); - colors.insertMulti("light-green", "lightgreen"); - colors.insertMulti("light-gray", i18nc("@item:inlistbox Refers to colo= r.", "Light Gray")); - colors.insertMulti("light-gray", "lightgray"); - colors.insertMulti("light-magenta", i18nc("@item:inlistbox Refers to c= olor.", "Light Magenta")); - colors.insertMulti("light-magenta", "magenta"); - colors.insertMulti("light-red", i18nc("@item:inlistbox Refers to color= .", "Light Red")); - colors.insertMulti("light-red", "orangered"); - colors.insertMulti("magenta", i18nc("@item:inlistbox Refers to color."= , "Magenta")); - colors.insertMulti("magenta", "darkmagenta"); - colors.insertMulti("red", i18nc("@item:inlistbox Refers to color.", "R= ed")); - colors.insertMulti("red", "red"); - colors.insertMulti("white", i18nc("@item:inlistbox Refers to color.", = "White")); - colors.insertMulti("white", "white"); - colors.insertMulti("yellow", i18nc("@item:inlistbox Refers to color.",= "Yellow")); - colors.insertMulti("yellow", "yellow"); + colors.insertMulti(QLatin1String("blue"), i18nc("@item:inlistbox Refer= s to color.", "Blue")); + colors.insertMulti(QLatin1String("blue"), QLatin1String("blue")); + colors.insertMulti(QLatin1String("cyan"), i18nc("@item:inlistbox Refer= s to color.", "Cyan")); + colors.insertMulti(QLatin1String("cyan"), QLatin1String("cyan")); + colors.insertMulti(QLatin1String("dark-gray"), i18nc("@item:inlistbox = Refers to color.", "Dark Gray")); + colors.insertMulti(QLatin1String("dark-gray"), QLatin1String("darkgray= ")); + colors.insertMulti(QLatin1String("green"), i18nc("@item:inlistbox Refe= rs to color.", "Green")); + colors.insertMulti(QLatin1String("green"), QLatin1String("green")); + colors.insertMulti(QLatin1String("light-cyan"), i18nc("@item:inlistbox= Refers to color.", "Light Cyan")); + colors.insertMulti(QLatin1String("light-cyan"), QLatin1String("lightcy= an")); + colors.insertMulti(QLatin1String("light-blue"), i18nc("@item:inlistbox= Refers to color.", "Light Blue")); + colors.insertMulti(QLatin1String("light-blue"), QLatin1String("lightbl= ue")); + colors.insertMulti(QLatin1String("light-green"), i18nc("@item:inlistbo= x Refers to color.", "Light Green")); + colors.insertMulti(QLatin1String("light-green"), QLatin1String("lightg= reen")); + colors.insertMulti(QLatin1String("light-gray"), i18nc("@item:inlistbox= Refers to color.", "Light Gray")); + colors.insertMulti(QLatin1String("light-gray"), QLatin1String("lightgr= ay")); + colors.insertMulti(QLatin1String("light-magenta"), i18nc("@item:inlist= box Refers to color.", "Light Magenta")); + colors.insertMulti(QLatin1String("light-magenta"), QLatin1String("mage= nta")); + colors.insertMulti(QLatin1String("light-red"), i18nc("@item:inlistbox = Refers to color.", "Light Red")); + colors.insertMulti(QLatin1String("light-red"), QLatin1String("orangere= d")); + colors.insertMulti(QLatin1String("magenta"), i18nc("@item:inlistbox Re= fers to color.", "Magenta")); + colors.insertMulti(QLatin1String("magenta"), QLatin1String("darkmagent= a")); + colors.insertMulti(QLatin1String("red"), i18nc("@item:inlistbox Refers= to color.", "Red")); + colors.insertMulti(QLatin1String("red"), QLatin1String("red")); + colors.insertMulti(QLatin1String("white"), i18nc("@item:inlistbox Refe= rs to color.", "White")); + colors.insertMulti(QLatin1String("white"), QLatin1String("white")); + colors.insertMulti(QLatin1String("yellow"), i18nc("@item:inlistbox Ref= ers to color.", "Yellow")); + colors.insertMulti(QLatin1String("yellow"), QLatin1String("yellow")); QHash::const_iterator it =3D colors.constBegin(); QHash::const_iterator end =3D colors.constEnd(); for (; it !=3D end; it +=3D 2) { @@ -839,52 +839,52 @@ void KCMGRUB2::setupObjects() ui->kcombobox_normalBackground->addItem(QIcon(color), colors.value= s(it.key()).at(1), it.key()); ui->kcombobox_highlightBackground->addItem(QIcon(color), colors.va= lues(it.key()).at(1), it.key()); } - ui->kcombobox_normalForeground->setCurrentIndex(ui->kcombobox_normalFo= reground->findData("light-gray")); - ui->kcombobox_normalBackground->setCurrentIndex(ui->kcombobox_normalBa= ckground->findData("black")); - ui->kcombobox_highlightForeground->setCurrentIndex(ui->kcombobox_highl= ightForeground->findData("black")); - ui->kcombobox_highlightBackground->setCurrentIndex(ui->kcombobox_highl= ightBackground->findData("light-gray")); + ui->kcombobox_normalForeground->setCurrentIndex(ui->kcombobox_normalFo= reground->findData(QLatin1String("light-gray"))); + ui->kcombobox_normalBackground->setCurrentIndex(ui->kcombobox_normalBa= ckground->findData(QLatin1String("black"))); + ui->kcombobox_highlightForeground->setCurrentIndex(ui->kcombobox_highl= ightForeground->findData(QLatin1String("black"))); + ui->kcombobox_highlightBackground->setCurrentIndex(ui->kcombobox_highl= ightBackground->findData(QLatin1String("light-gray"))); = - ui->kpushbutton_preview->setIcon(KIcon("image-png")); - ui->kpushbutton_create->setIcon(KIcon("insert-image")); + ui->kpushbutton_preview->setIcon(KIcon(QLatin1String("image-png"))); + ui->kpushbutton_create->setIcon(KIcon(QLatin1String("insert-image"))); ui->kpushbutton_create->setVisible(HAVE_IMAGEMAGICK); = - ui->kpushbutton_cmdlineDefaultSuggestions->setIcon(KIcon("tools-wizard= ")); + ui->kpushbutton_cmdlineDefaultSuggestions->setIcon(KIcon(QLatin1String= ("tools-wizard"))); ui->kpushbutton_cmdlineDefaultSuggestions->setMenu(new KMenu(ui->kpush= button_cmdlineDefaultSuggestions)); - ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Quiet Boot"))->setData("quiet"); - ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Show Splash Screen"))->setData("splash"); - ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Disable Plymouth"))->setData("noplymouth"); - ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Turn Off ACPI"))->setData("acpi=3Doff"); - ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Turn Off APIC"))->setData("noapic"); - ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Turn Off Local APIC"))->setData("nolapic"); - ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Single User Mode"))->setData("single"); - ui->kpushbutton_cmdlineSuggestions->setIcon(KIcon("tools-wizard")); + ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Quiet Boot"))->setData(QLatin1String("quiet")); + ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Show Splash Screen"))->setData(QLatin1String("splash")); + ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Disable Plymouth"))->setData(QLatin1String("noplymouth")); + ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Turn Off ACPI"))->setData(QLatin1String("acpi=3Doff")); + ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Turn Off APIC"))->setData(QLatin1String("noapic")); + ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Turn Off Local APIC"))->setData(QLatin1String("nolapic")); + ui->kpushbutton_cmdlineDefaultSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Single User Mode"))->setData(QLatin1String("single")); + ui->kpushbutton_cmdlineSuggestions->setIcon(KIcon(QLatin1String("tools= -wizard"))); ui->kpushbutton_cmdlineSuggestions->setMenu(new KMenu(ui->kpushbutton_= cmdlineSuggestions)); - ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Quiet Boot"))->setData("quiet"); - ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Show Splash Screen"))->setData("splash"); - ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Disable Plymouth"))->setData("noplymouth"); - ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Turn Off ACPI"))->setData("acpi=3Doff"); - ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Turn Off APIC"))->setData("noapic"); - ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Turn Off Local APIC"))->setData("nolapic"); - ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Single User Mode"))->setData("single"); - ui->kpushbutton_terminalSuggestions->setIcon(KIcon("tools-wizard")); + ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Quiet Boot"))->setData(QLatin1String("quiet")); + ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Show Splash Screen"))->setData(QLatin1String("splash")); + ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Disable Plymouth"))->setData(QLatin1String("noplymouth")); + ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Turn Off ACPI"))->setData(QLatin1String("acpi=3Doff")); + ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Turn Off APIC"))->setData(QLatin1String("noapic")); + ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Turn Off Local APIC"))->setData(QLatin1String("nolapic")); + ui->kpushbutton_cmdlineSuggestions->menu()->addAction(i18nc("@action:i= nmenu", "Single User Mode"))->setData(QLatin1String("single")); + ui->kpushbutton_terminalSuggestions->setIcon(KIcon(QLatin1String("tool= s-wizard"))); ui->kpushbutton_terminalSuggestions->setMenu(new KMenu(ui->kpushbutton= _terminalSuggestions)); - ui->kpushbutton_terminalSuggestions->menu()->addAction(i18nc("@action:= inmenu", "PC BIOS && EFI Console"))->setData("console"); - ui->kpushbutton_terminalSuggestions->menu()->addAction(i18nc("@action:= inmenu", "Serial Terminal"))->setData("serial"); - ui->kpushbutton_terminalSuggestions->menu()->addAction(i18nc("@action:= inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a former= IEEE standard.", "Open Firmware Console"))->setData("ofconsole"); - ui->kpushbutton_terminalInputSuggestions->setIcon(KIcon("tools-wizard"= )); + ui->kpushbutton_terminalSuggestions->menu()->addAction(i18nc("@action:= inmenu", "PC BIOS && EFI Console"))->setData(QLatin1String("console")); + ui->kpushbutton_terminalSuggestions->menu()->addAction(i18nc("@action:= inmenu", "Serial Terminal"))->setData(QLatin1String("serial")); + ui->kpushbutton_terminalSuggestions->menu()->addAction(i18nc("@action:= inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a former= IEEE standard.", "Open Firmware Console"))->setData(QLatin1String("ofconso= le")); + ui->kpushbutton_terminalInputSuggestions->setIcon(KIcon(QLatin1String(= "tools-wizard"))); ui->kpushbutton_terminalInputSuggestions->setMenu(new KMenu(ui->kpushb= utton_terminalInputSuggestions)); - ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu", "PC BIOS && EFI Console"))->setData("console"); - ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu", "Serial Terminal"))->setData("serial"); - ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a f= ormer IEEE standard.", "Open Firmware Console"))->setData("ofconsole"); - ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu", "PC AT Keyboard (Coreboot)"))->setData("at_keyboard"); - ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu", "USB Keyboard (HID Boot Protocol)"))->setData("usb_keyboard"); - ui->kpushbutton_terminalOutputSuggestions->setIcon(KIcon("tools-wizard= ")); + ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu", "PC BIOS && EFI Console"))->setData(QLatin1String("console")); + ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu", "Serial Terminal"))->setData(QLatin1String("serial")); + ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a f= ormer IEEE standard.", "Open Firmware Console"))->setData(QLatin1String("of= console")); + ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu", "PC AT Keyboard (Coreboot)"))->setData(QLatin1String("at_keyb= oard")); + ui->kpushbutton_terminalInputSuggestions->menu()->addAction(i18nc("@ac= tion:inmenu", "USB Keyboard (HID Boot Protocol)"))->setData(QLatin1String("= usb_keyboard")); + ui->kpushbutton_terminalOutputSuggestions->setIcon(KIcon(QLatin1String= ("tools-wizard"))); ui->kpushbutton_terminalOutputSuggestions->setMenu(new KMenu(ui->kpush= button_terminalOutputSuggestions)); - ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "PC BIOS && EFI Console"))->setData("console"); - ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Serial Terminal"))->setData("serial"); - ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a = former IEEE standard.", "Open Firmware Console"))->setData("ofconsole"); - ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Graphics Mode Output"))->setData("gfxterm"); - ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "VGA Text Output (Coreboot)"))->setData("vga_text"); + ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "PC BIOS && EFI Console"))->setData(QLatin1String("console")= ); + ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Serial Terminal"))->setData(QLatin1String("serial")); + ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu 'Open' is an adjective here, not a verb. 'Open Firmware' is a = former IEEE standard.", "Open Firmware Console"))->setData(QLatin1String("o= fconsole")); + ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "Graphics Mode Output"))->setData(QLatin1String("gfxterm")); + ui->kpushbutton_terminalOutputSuggestions->menu()->addAction(i18nc("@a= ction:inmenu", "VGA Text Output (Coreboot)"))->setData(QLatin1String("vga_t= ext")); } void KCMGRUB2::setupConnections() { @@ -965,40 +965,40 @@ void KCMGRUB2::readAll() QByteArray fileContents; LoadOperations operations =3D NoOperation; = - if (readFile(GRUB_MENU, fileContents)) { + if (readFile(QString::fromUtf8(GRUB_MENU), fileContents)) { parseEntries(QString::fromUtf8(fileContents.constData())); } else { operations |=3D MenuFile; } - if (readFile(GRUB_CONFIG, fileContents)) { + if (readFile(QString::fromUtf8(GRUB_CONFIG), fileContents)) { parseSettings(QString::fromUtf8(fileContents.constData())); } else { operations |=3D ConfigurationFile; } - if (readFile(GRUB_ENV, fileContents)) { + if (readFile(QString::fromUtf8(GRUB_ENV), fileContents)) { parseEnv(QString::fromUtf8(fileContents.constData())); } else { operations |=3D EnvironmentFile; } - if (QFile::exists(GRUB_MEMTEST)) { + if (QFile::exists(QString::fromUtf8(GRUB_MEMTEST))) { m_memtest =3D true; - m_memtestOn =3D (bool)(QFile::permissions(GRUB_MEMTEST) & (QFile::= ExeOwner | QFile::ExeGroup | QFile::ExeOther)); + m_memtestOn =3D (bool)(QFile::permissions(QString::fromUtf8(GRUB_M= EMTEST)) & (QFile::ExeOwner | QFile::ExeGroup | QFile::ExeOther)); } else { operations |=3D MemtestFile; } #if HAVE_HD operations |=3D Vbe; #endif - if (QFileInfo(GRUB_LOCALE).isReadable()) { - m_locales =3D QDir(GRUB_LOCALE).entryList(QStringList() << QLatin1= String("*.mo"), QDir::Files).replaceInStrings(QRegExp(QLatin1String("\\.mo$= ")), QString()); + if (QFileInfo(QString::fromUtf8(GRUB_LOCALE)).isReadable()) { + m_locales =3D QDir(QString::fromUtf8(GRUB_LOCALE)).entryList(QStri= ngList() << QLatin1String("*.mo"), QDir::Files).replaceInStrings(QRegExp(QL= atin1String("\\.mo$")), QString()); } else { operations |=3D Locales; } = if (operations) { - Action loadAction("org.kde.kcontrol.kcmgrub2.load"); - loadAction.setHelperID("org.kde.kcontrol.kcmgrub2"); - loadAction.addArgument("operations", (int)(operations)); + Action loadAction(QLatin1String("org.kde.kcontrol.kcmgrub2.load")); + loadAction.setHelperID(QLatin1String("org.kde.kcontrol.kcmgrub2")); + loadAction.addArgument(QLatin1String("operations"), (int)(operatio= ns)); #if KDE_IS_VERSION(4,6,0) loadAction.setParentWidget(this); #endif @@ -1062,33 +1062,33 @@ void KCMGRUB2::showLocales() Q_FOREACH(const QString &locale, m_locales) { QString language =3D KGlobal::locale()->languageCodeToName(locale); if (language.isEmpty()) { - language =3D KGlobal::locale()->languageCodeToName(locale.spli= t('@').first()); + language =3D KGlobal::locale()->languageCodeToName(locale.spli= t(QLatin1Char('@')).first()); if (language.isEmpty()) { - language =3D KGlobal::locale()->languageCodeToName(locale.= split('@').first().split('_').first()); + language =3D KGlobal::locale()->languageCodeToName(locale.= split(QLatin1Char('@')).first().split(QLatin1Char('_')).first()); } } - ui->kcombobox_language->addItem(QString("%1 (%2)").arg(language, l= ocale), locale); + ui->kcombobox_language->addItem(QString(QLatin1String("%1 (%2)")).= arg(language, locale), locale); } } void KCMGRUB2::sortResolutions() { for (int i =3D 0; i < m_resolutions.size(); i++) { - if (m_resolutions.at(i).contains(QRegExp("^\\d{3,4}x\\d{3,4}$"))) { - m_resolutions[i] =3D QString("%1x%2x0").arg(m_resolutions.at(i= ).section('x', 0, 0).rightJustified(4, '0'), m_resolutions.at(i).section('x= ', 1).rightJustified(4, '0')); - } else if (m_resolutions.at(i).contains(QRegExp("^\\d{3,4}x\\d{3,4= }x\\d{1,2}$"))) { - m_resolutions[i] =3D QString("%1x%2x%3").arg(m_resolutions.at(= i).section('x', 0, 0).rightJustified(4, '0'), m_resolutions.at(i).section('= x', 1, 1).rightJustified(4, '0'), m_resolutions.at(i).section('x', 2).right= Justified(2, '0')); + if (m_resolutions.at(i).contains(QRegExp(QLatin1String("^\\d{3,4}x= \\d{3,4}$")))) { + m_resolutions[i] =3D QString(QLatin1String("%1x%2x0")).arg(m_r= esolutions.at(i).section(QLatin1Char('x'), 0, 0).rightJustified(4, QLatin1C= har('0')), m_resolutions.at(i).section(QLatin1Char('x'), 1).rightJustified(= 4, QLatin1Char('0'))); + } else if (m_resolutions.at(i).contains(QRegExp(QLatin1String("^\\= d{3,4}x\\d{3,4}x\\d{1,2}$")))) { + m_resolutions[i] =3D QString(QLatin1String("%1x%2x%3")).arg(m_= resolutions.at(i).section(QLatin1Char('x'), 0, 0).rightJustified(4, QLatin1= Char('0')), m_resolutions.at(i).section(QLatin1Char('x'), 1, 1).rightJustif= ied(4, QLatin1Char('0')), m_resolutions.at(i).section(QLatin1Char('x'), 2).= rightJustified(2, QLatin1Char('0'))); } } m_resolutions.sort(); for (int i =3D 0; i < m_resolutions.size(); i++) { - if (!m_resolutions.at(i).contains(QRegExp("^\\d{3,4}x\\d{3,4}x\\d{= 1,2}$"))) { + if (!m_resolutions.at(i).contains(QRegExp(QLatin1String("^\\d{3,4}= x\\d{3,4}x\\d{1,2}$")))) { continue; } - if (m_resolutions.at(i).startsWith('0')) { + if (m_resolutions.at(i).startsWith(QLatin1Char('0'))) { m_resolutions[i].remove(0, 1); } - m_resolutions[i].replace("x0", "x"); - if (m_resolutions.at(i).endsWith('x')) { + m_resolutions[i].replace(QLatin1String("x0"), QLatin1String("x")); + if (m_resolutions.at(i).endsWith(QLatin1Char('x'))) { m_resolutions[i].remove(m_resolutions.at(i).length() - 1, 1); } } @@ -1096,13 +1096,13 @@ void KCMGRUB2::sortResolutions() void KCMGRUB2::showResolutions() { ui->kcombobox_gfxmode->clear(); - ui->kcombobox_gfxmode->addItem(i18nc("@item:inlistbox Refers to screen= resolution.", "Custom..."), "custom"); + ui->kcombobox_gfxmode->addItem(i18nc("@item:inlistbox Refers to screen= resolution.", "Custom..."), QLatin1String("custom")); = ui->kcombobox_gfxpayload->clear(); - ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox Refers to scr= een resolution.", "Custom..."), "custom"); + ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox Refers to scr= een resolution.", "Custom..."), QLatin1String("custom")); ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox", "Unspecifie= d"), QString()); - ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox", "Boot in Te= xt Mode"), "text"); - ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox", "Keep GRUB'= s Resolution"), "keep"); + ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox", "Boot in Te= xt Mode"), QLatin1String("text")); + ui->kcombobox_gfxpayload->addItem(i18nc("@item:inlistbox", "Keep GRUB'= s Resolution"), QLatin1String("keep")); = Q_FOREACH(const QString &resolution, m_resolutions) { ui->kcombobox_gfxmode->addItem(resolution, resolution); @@ -1153,22 +1153,22 @@ QString KCMGRUB2::parseTitle(const QString &line) = stream >> ch; entry +=3D ch; - if (ch =3D=3D '\'') { + if (ch =3D=3D QLatin1Char('\'')) { do { if (stream.atEnd()) { return QString(); } stream >> ch; entry +=3D ch; - } while (ch !=3D '\''); - } else if (ch =3D=3D '"') { + } while (ch !=3D QLatin1Char('\'')); + } else if (ch =3D=3D QLatin1Char('"')) { do { if (stream.atEnd()) { return QString(); } stream >> ch; entry +=3D ch; - } while (ch !=3D '"' || entry.at(entry.size() - 2) =3D=3D '\\'); + } while (ch !=3D QLatin1Char('"') || entry.at(entry.size() - 2) = =3D=3D QLatin1Char('\\')); } else { do { if (stream.atEnd()) { @@ -1176,7 +1176,7 @@ QString KCMGRUB2::parseTitle(const QString &line) } stream >> ch; entry +=3D ch; - } while (!ch.isSpace() || entry.at(entry.size() - 2) =3D=3D '\\'); + } while (!ch.isSpace() || entry.at(entry.size() - 2) =3D=3D QLatin= 1Char('\\')); entry.chop(1); //remove trailing space } return entry; @@ -1262,7 +1262,7 @@ void KCMGRUB2::parseSettings(const QString &config) while (!stream.atEnd()) { line =3D stream.readLine().trimmed(); if (line.contains(QRegExp(QLatin1String("^(GRUB_|LANGUAGE=3D)"))))= { - m_settings[line.section('=3D', 0, 0)] =3D line.section('=3D', = 1); + m_settings[line.section(QLatin1Char('=3D'), 0, 0)] =3D line.se= ction(QLatin1Char('=3D'), 1); } } } @@ -1274,9 +1274,9 @@ void KCMGRUB2::parseEnv(const QString &config) m_env.clear(); while (!stream.atEnd()) { line =3D stream.readLine().trimmed(); - if (line.startsWith('#')) { + if (line.startsWith(QLatin1Char('#'))) { continue; } - m_env[line.section('=3D', 0, 0)] =3D line.section('=3D', 1); + m_env[line.section(QLatin1Char('=3D'), 0, 0)] =3D line.section(QLa= tin1Char('=3D'), 1); } }