[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [apper] /: Be more strict with strings
From: Daniel Nicoletti <null () kde ! org>
Date: 2018-01-18 22:53:46
Message-ID: E1ecJ46-00044i-SH () code ! kde ! org
[Download RAW message or body]
Git commit 0b7b9e5d3c40f5a103fca982e31971409ee80ef9 by Daniel Nicoletti.
Committed on 18/01/2018 at 22:53.
Pushed by dantti into branch 'master'.
Be more strict with strings
M +7 -7 Apper/Apper.cpp
M +18 -18 Apper/ApperKCM.cpp
M +13 -13 Apper/BrowseView.cpp
M +3 -3 Apper/CategoryModel.cpp
M +2 -2 Apper/FiltersMenu.cpp
M +6 -6 Apper/MainUi.cpp
M +14 -14 Apper/PackageDetails.cpp
M +2 -2 Apper/ScreenShotViewer.cpp
M +5 -5 Apper/Settings/Settings.cpp
M +1 -1 Apper/TransactionModel.cpp
M +4 -4 Apper/Updater/DistroUpgrade.cpp
M +49 -51 Apper/Updater/UpdateDetails.cpp
M +8 -8 Apper/Updater/Updater.cpp
M +6 -6 Apper/main.cpp
M +1 -0 CMakeLists.txt
M +2 -2 PkSession/FilesModel.cpp
M +9 -8 PkSession/PkInstallCatalogs.cpp
M +13 -13 PkSession/PkInstallFontconfigResources.cpp
M +6 -6 PkSession/PkInstallGStreamerResources.cpp
M +1 -1 PkSession/PkInstallMimeTypes.cpp
M +1 -1 PkSession/PkInstallPackageFiles.cpp
M +6 -6 PkSession/PkInstallPackageNames.cpp
M +1 -1 PkSession/PkInstallPlasmaResources.cpp
M +4 -4 PkSession/PkInstallPrinterDrivers.cpp
M +2 -2 PkSession/PkInstallProvideFiles.cpp
M +2 -2 PkSession/PkRemovePackageByFiles.cpp
M +2 -2 PkSession/PkSearchFile.cpp
M +38 -38 PkSession/SessionTask.cpp
M +7 -7 PkSession/main.cpp
M +24 -24 apperd/ApperdThread.cpp
M +11 -11 apperd/DistroUpgrade.cpp
M +3 -3 apperd/RefreshCacheTask.cpp
M +10 -10 apperd/TransactionWatcher.cpp
M +15 -15 apperd/Updater.cpp
M +1 -1 declarative-plugins/DBusUpdaterInterface.cpp
M +7 -7 declarative-plugins/qmlplugins.cpp
M +5 -5 libapper/ApplicationLauncher.cpp
M +4 -5 libapper/ApplicationsDelegate.cpp
M +1 -1 libapper/ApplicationsDelegate.h
M +10 -10 libapper/ChangesDelegate.cpp
M +6 -6 libapper/InfoWidget.cpp
M +2 -2 libapper/PackageModel.cpp
M +148 -146 libapper/PkIcons.cpp
M +2 -2 libapper/PkTransaction.cpp
M +5 -5 libapper/Requirements.cpp
https://commits.kde.org/apper/0b7b9e5d3c40f5a103fca982e31971409ee80ef9
diff --git a/Apper/Apper.cpp b/Apper/Apper.cpp
index 1ce8711..b33bb50 100644
--- a/Apper/Apper.cpp
+++ b/Apper/Apper.cpp
@@ -134,7 +134,7 @@ void Apper::activate(const QStringList& arguments, const QString& \
workingDirecto // what will happen if we call the other process to
// install and this very one closes? will the files
// in /tmp be deleted?
- invoke("InstallPackageFiles", args);
+ invoke(QLatin1String("InstallPackageFiles"), args);
return;
}
@@ -148,27 +148,27 @@ void Apper::activate(const QStringList& arguments, const \
QString& workingDirecto }
if (parser.isSet(mimeTypeOpt)) {
- invoke("InstallMimeTypes", parser.values(mimeTypeOpt));
+ invoke(QLatin1String("InstallMimeTypes"), parser.values(mimeTypeOpt));
return;
}
if (parser.isSet(nameOpt)) {
- invoke("InstallPackageNames", parser.values(nameOpt));
+ invoke(QLatin1String("InstallPackageNames"), parser.values(nameOpt));
return;
}
- if (parser.isSet("install-provide-file")) {
- invoke("InstallProvideFiles", parser.values("install-provide-file"));
+ if (parser.isSet(QLatin1String("install-provide-file"))) {
+ invoke(QLatin1String("InstallProvideFiles"), \
parser.values(QLatin1String("install-provide-file"))); return;
}
if (parser.isSet(catalogOpt)) {
- invoke("InstallCatalogs", parser.values(catalogOpt));
+ invoke(QLatin1String("InstallCatalogs"), parser.values(catalogOpt));
return;
}
if (parser.isSet(removeOpt)) {
- invoke("RemovePackageByFiles", parser.values(removeOpt));
+ invoke(QLatin1String("RemovePackageByFiles"), parser.values(removeOpt));
return;
}
diff --git a/Apper/ApperKCM.cpp b/Apper/ApperKCM.cpp
index f0983c5..6b7af5a 100644
--- a/Apper/ApperKCM.cpp
+++ b/Apper/ApperKCM.cpp
@@ -69,8 +69,8 @@ Q_LOGGING_CATEGORY(APPER, "apper")
ApperKCM::ApperKCM(QWidget *parent) :
QWidget(parent),
ui(new Ui::ApperKCM),
- m_findIcon(QIcon::fromTheme("edit-find")),
- m_cancelIcon(QIcon::fromTheme("dialog-cancel"))
+ m_findIcon(QIcon::fromTheme(QLatin1String("edit-find"))),
+ m_cancelIcon(QIcon::fromTheme(QLatin1String("dialog-cancel")))
{
ui->setupUi(this);
@@ -81,7 +81,7 @@ ApperKCM::ApperKCM(QWidget *parent) :
Daemon::global()->setHints(QLatin1String("locale=") + QLocale::system().name() + \
QLatin1String(".UTF-8"));
// Browse TAB
- ui->backTB->setIcon(QIcon::fromTheme("go-previous"));
+ ui->backTB->setIcon(QIcon::fromTheme(QLatin1String("go-previous")));
// create our toolbar
auto toolBar = new QToolBar(this);
@@ -142,7 +142,7 @@ ApperKCM::ApperKCM(QWidget *parent) :
// install the backend filters
ui->filtersTB->setMenu(m_filtersMenu = new FiltersMenu(this));
connect(m_filtersMenu, &FiltersMenu::filtersChanged, this, &ApperKCM::search);
- ui->filtersTB->setIcon(QIcon::fromTheme("view-filter"));
+ ui->filtersTB->setIcon(QIcon::fromTheme(QLatin1String("view-filter")));
ApplicationSortFilterModel *proxy = ui->browseView->proxy();
proxy->setApplicationFilter(m_filtersMenu->filterApplications());
connect(m_filtersMenu, QOverload<bool>::of(&FiltersMenu::filterApplications), \
proxy, &ApplicationSortFilterModel::setApplicationFilter); @@ -172,7 +172,7 @@ \
ApperKCM::ApperKCM(QWidget *parent) :
connect(m_changesModel, &PackageModel::packageUnchecked, m_changesModel, \
&PackageModel::removePackage);
connect(m_changesModel, &PackageModel::packageUnchecked, m_browseModel, \
&PackageModel::uncheckPackageDefault);
- ui->reviewMessage->setIcon(QIcon::fromTheme("edit-redo"));
+ ui->reviewMessage->setIcon(QIcon::fromTheme(QLatin1String("edit-redo")));
ui->reviewMessage->setText(i18n("Some software changes were made"));
auto reviewAction = new QAction(i18n("Review"), this);
connect(reviewAction, &QAction::triggered, this, &ApperKCM::showReviewPages);
@@ -198,18 +198,18 @@ ApperKCM::ApperKCM(QWidget *parent) :
auto menu = new QMenu(this);
ui->settingsTB->setMenu(menu);
- ui->settingsTB->setIcon(QIcon::fromTheme("preferences-other"));
+ ui->settingsTB->setIcon(QIcon::fromTheme(QLatin1String("preferences-other")));
auto signalMapper = new QSignalMapper(this);
connect(signalMapper, QOverload<const QString &>::of(&QSignalMapper::mapped), \
this, &ApperKCM::setPage);
QAction *action;
- action = menu->addAction(QIcon::fromTheme("view-history"), i18n("History"));
- signalMapper->setMapping(action, "history");
+ action = menu->addAction(QIcon::fromTheme(QLatin1String("view-history")), \
i18n("History")); + signalMapper->setMapping(action, QLatin1String("history"));
connect(action, &QAction::triggered, signalMapper, \
QOverload<>::of(&QSignalMapper::map));
- action = menu->addAction(QIcon::fromTheme("preferences-other"), \
i18n("Settings"));
- signalMapper->setMapping(action, "settings");
+ action = menu->addAction(QIcon::fromTheme(QLatin1String("preferences-other")), \
i18n("Settings")); + signalMapper->setMapping(action, QLatin1String("settings"));
connect(action, &QAction::triggered, signalMapper, \
QOverload<>::of(&QSignalMapper::map));
auto helpMenu = new KHelpMenu(this, KAboutData::applicationData());
@@ -282,8 +282,8 @@ void ApperKCM::setCurrentActionCancel(bool cancel)
ui->actionFindFile->setText(i18n("Find by f&ile name"));
ui->actionFindDescription->setText(i18n("Find by &description"));
// Define actions icon
- ui->actionFindFile->setIcon(QIcon::fromTheme("document-open"));
- ui->actionFindDescription->setIcon(QIcon::fromTheme("document-edit"));
+ ui->actionFindFile->setIcon(QIcon::fromTheme(QLatin1String("document-open")));
+ ui->actionFindDescription->setIcon(QIcon::fromTheme(QLatin1String("document-edit")));
ui->actionFindName->setIcon(m_findIcon);
m_genericActionK->setIcon(m_findIcon);
if (m_currentAction) {
@@ -415,7 +415,7 @@ void ApperKCM::on_homeView_activated(const QModelIndex &index)
} else if (m_searchRole == Transaction::RoleSearchGroup) {
if (index.data(CategoryModel::GroupRole).type() == QVariant::String) {
QString category = index.data(CategoryModel::GroupRole).toString();
- if (category.startsWith('@') ||
+ if (category.startsWith(QLatin1Char('@')) ||
(category.startsWith(QLatin1String("repo:")) && category.size() \
> 5)) { m_searchGroupCategory = category;
} else {
@@ -430,7 +430,7 @@ void ApperKCM::on_homeView_activated(const QModelIndex &index)
m_searchString = index.data().toString(); // Store the nice name to \
change the title }
} else if (m_searchRole == Transaction::RoleGetUpdates) {
- setPage("updates");
+ setPage(QLatin1String("updates"));
return;
}
@@ -532,7 +532,7 @@ void ApperKCM::setPage(const QString &page)
connect(m_updaterPage, &Updater::downloadSize, ui->downloadL, \
&QLabel::setText); // connect(m_updaterPage, &Updater::changed, this, \
&ApperKCM::checkChanged); ui->stackedWidget->addWidget(m_updaterPage);
- ui->checkUpdatesPB->setIcon(QIcon::fromTheme("view-refresh"));
+ ui->checkUpdatesPB->setIcon(QIcon::fromTheme(QLatin1String("view-refresh")));
connect(ui->checkUpdatesPB, &QPushButton::clicked, this, \
&ApperKCM::refreshCache);
ui->updatePB->setIcon(QIcon::fromTheme(QLatin1String("system-software-update")));
@@ -772,9 +772,9 @@ void ApperKCM::refreshCache()
}
if (currentWidget == m_settingsPage) {
- setPage("settings");
+ setPage(QLatin1String("settings"));
} else {
- setPage("updates");
+ setPage(QLatin1String("updates"));
}
QTimer::singleShot(0, this, &ApperKCM::checkChanged);
@@ -857,7 +857,7 @@ void ApperKCM::save()
transaction->deleteLater();
if (currentWidget == m_updaterPage) {
m_updaterPage->getUpdates();
- setPage("updates");
+ setPage(QLatin1String("updates"));
} else {
// install then remove packages
search();
diff --git a/Apper/BrowseView.cpp b/Apper/BrowseView.cpp
index 1c7c23c..6609b8a 100644
--- a/Apper/BrowseView.cpp
+++ b/Apper/BrowseView.cpp
@@ -53,7 +53,7 @@ BrowseView::BrowseView(QWidget *parent)
connect(categoryView, &QListView::clicked, this, \
&BrowseView::categoryActivated);
m_busySeq = new KPixmapSequenceOverlayPainter(this);
- m_busySeq->setSequence(KPixmapSequence("process-working", \
KIconLoader::SizeSmallMedium)); + \
m_busySeq->setSequence(KPixmapSequence(QLatin1String("process-working"), \
KIconLoader::SizeSmallMedium)); m_busySeq->setAlignment(Qt::AlignHCenter | \
Qt::AlignVCenter); m_busySeq->setWidget(packageView->viewport());
@@ -78,10 +78,10 @@ BrowseView::BrowseView(QWidget *parent)
ApplicationsDelegate *delegate = new ApplicationsDelegate(packageView);
packageView->setItemDelegate(delegate);
- exportInstalledPB->setIcon(QIcon::fromTheme("document-export"));
- importInstalledPB->setIcon(QIcon::fromTheme("document-import"));
+ exportInstalledPB->setIcon(QIcon::fromTheme(QLatin1String("document-export")));
+ importInstalledPB->setIcon(QIcon::fromTheme(QLatin1String("document-import")));
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "BrowseView");
// Version
@@ -138,7 +138,7 @@ PackageModel* BrowseView::model() const
void BrowseView::showVersions(bool enabled)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "BrowseView");
viewGroup.writeEntry("ShowApplicationVersions", enabled);
packageView->header()->setSectionHidden(PackageModel::VersionCol, !enabled);
@@ -147,7 +147,7 @@ void BrowseView::showVersions(bool enabled)
void BrowseView::showArchs(bool enabled)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "BrowseView");
viewGroup.writeEntry("ShowApplicationArchitectures", enabled);
packageView->header()->setSectionHidden(PackageModel::ArchCol, !enabled);
@@ -156,7 +156,7 @@ void BrowseView::showArchs(bool enabled)
void BrowseView::showOrigins(bool enabled)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "BrowseView");
viewGroup.writeEntry("ShowApplicationOrigins", enabled);
packageView->header()->setSectionHidden(PackageModel::OriginCol, !enabled);
@@ -164,7 +164,7 @@ void BrowseView::showOrigins(bool enabled)
void BrowseView::showSizes(bool enabled)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "BrowseView");
viewGroup.writeEntry("ShowPackageSizes", enabled);
packageView->header()->setSectionHidden(PackageModel::SizeCol, !enabled);
@@ -241,7 +241,7 @@ bool BrowseView::goBack()
// if it's valid we need to know if it wasn't a PK root category
if (index.data(CategoryModel::GroupRole).type() == QVariant::String) {
QString category = index.data(CategoryModel::GroupRole).toString();
- if (!category.startsWith('@')) {
+ if (!category.startsWith(QLatin1Char('@'))) {
return true;
}
}
@@ -312,10 +312,10 @@ void BrowseView::on_importInstalledPB_clicked()
// send a DBus message to install this catalog
QDBusMessage message;
- message = QDBusMessage::createMethodCall("org.freedesktop.PackageKit",
- "/org/freedesktop/PackageKit",
- "org.freedesktop.PackageKit.Modify",
- "InstallCatalogs");
+ message = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.PackageKit"),
+ \
QLatin1String("/org/freedesktop/PackageKit"), + \
QLatin1String("org.freedesktop.PackageKit.Modify"), + \
QLatin1String("InstallCatalogs")); message << static_cast<uint>(effectiveWinId());
message << (QStringList() << fileName);
message << QString();
diff --git a/Apper/CategoryModel.cpp b/Apper/CategoryModel.cpp
index 91080c3..9edb14a 100644
--- a/Apper/CategoryModel.cpp
+++ b/Apper/CategoryModel.cpp
@@ -53,7 +53,7 @@ CategoryModel::CategoryModel(QObject *parent) :
item->setData(Transaction::RoleGetPackages, SearchRole);
item->setData(i18n("Lists"), \
KCategorizedSortFilterProxyModel::CategoryDisplayRole); item->setData(0, \
KCategorizedSortFilterProxyModel::CategorySortRole);
- item->setIcon(QIcon::fromTheme("dialog-ok-apply"));
+ item->setIcon(QIcon::fromTheme(QLatin1String("dialog-ok-apply")));
appendRow(item);
item = new QStandardItem(i18n("Updates"));
@@ -61,7 +61,7 @@ CategoryModel::CategoryModel(QObject *parent) :
item->setData(Transaction::RoleGetUpdates, SearchRole);
item->setData(i18n("Lists"), \
KCategorizedSortFilterProxyModel::CategoryDisplayRole); item->setData(0, \
KCategorizedSortFilterProxyModel::CategorySortRole);
- item->setIcon(QIcon::fromTheme("system-software-update"));
+ item->setIcon(QIcon::fromTheme(QLatin1String("system-software-update")));
appendRow(item);
#ifdef HAVE_APPSTREAM
@@ -167,7 +167,7 @@ void CategoryModel::category(const QString &parentId,
item->setData(i18n("Categories"), \
KCategorizedSortFilterProxyModel::CategoryDisplayRole); item->setData(2, \
KCategorizedSortFilterProxyModel::CategorySortRole); item->setToolTip(summary);
- item->setIcon(QIcon("/usr/share/pixmaps/comps/" + icon + ".png"));
+ item->setIcon(QIcon(QLatin1String("/usr/share/pixmaps/comps/") + icon + \
QLatin1String(".png")));
if (parentId.isEmpty()) {
appendRow(item);
diff --git a/Apper/FiltersMenu.cpp b/Apper/FiltersMenu.cpp
index 66381c3..41a527f 100644
--- a/Apper/FiltersMenu.cpp
+++ b/Apper/FiltersMenu.cpp
@@ -30,7 +30,7 @@ FiltersMenu::FiltersMenu(QWidget *parent)
: QMenu(parent)
{
// Loads the filter menu settings
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup filterMenuGroup(&config, "FilterMenu");
auto menuCollections = new QMenu(i18n("Collections"), this);
@@ -273,7 +273,7 @@ FiltersMenu::FiltersMenu(QWidget *parent)
FiltersMenu::~FiltersMenu()
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup filterMenuGroup(&config, "FilterMenu");
// For usability we will only save ViewInGroups settings and Newest filter,
diff --git a/Apper/MainUi.cpp b/Apper/MainUi.cpp
index 82ec55c..45f9a95 100644
--- a/Apper/MainUi.cpp
+++ b/Apper/MainUi.cpp
@@ -37,10 +37,10 @@ MainUi::MainUi(QWidget *parent) :
QMainWindow(parent),
m_apperModule(0)
{
- setWindowIcon(QIcon::fromTheme("system-software-install"));
+ setWindowIcon(QIcon::fromTheme(QLatin1String("system-software-install")));
setWindowTitle(i18n("Apper"));
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup configGroup(&config, "MainUi");
restoreGeometry(configGroup.readEntry("geometry", QByteArray()));
restoreState(configGroup.readEntry("state", QByteArray()));
@@ -57,27 +57,27 @@ MainUi::~MainUi()
void MainUi::showAll()
{
if (m_apperModule) {
- m_apperModule->setProperty("page", "home");
+ m_apperModule->setProperty("page", QLatin1String("home"));
}
}
void MainUi::showUpdates()
{
if (m_apperModule) {
- m_apperModule->setProperty("page", "updates");
+ m_apperModule->setProperty("page", QLatin1String("updates"));
}
}
void MainUi::showSettings()
{
if (m_apperModule) {
- m_apperModule->setProperty("page", "settings");
+ m_apperModule->setProperty("page", QLatin1String("settings"));
}
}
void MainUi::closeEvent(QCloseEvent *event)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup configGroup(&config, "MainUi");
configGroup.writeEntry("geometry", saveGeometry());
configGroup.writeEntry("state", saveState());
diff --git a/Apper/PackageDetails.cpp b/Apper/PackageDetails.cpp
index d097bfc..21b1158 100644
--- a/Apper/PackageDetails.cpp
+++ b/Apper/PackageDetails.cpp
@@ -81,7 +81,7 @@ PackageDetails::PackageDetails(QWidget *parent)
m_hasFileList(false)
{
ui->setupUi(this);
- ui->hideTB->setIcon(QIcon::fromTheme("window-close"));
+ ui->hideTB->setIcon(QIcon::fromTheme(QLatin1String("window-close")));
connect(ui->hideTB, SIGNAL(clicked()), this, SLOT(hide()));
auto menu = new QMenu(i18n("Display"), this);
@@ -162,12 +162,12 @@ PackageDetails::PackageDetails(QWidget *parent)
// Set the menu
ui->menuTB->setMenu(menu);
- ui->menuTB->setIcon(QIcon::fromTheme("help-about"));
+ ui->menuTB->setIcon(QIcon::fromTheme(QLatin1String("help-about")));
connect(m_actionGroup, SIGNAL(triggered(QAction*)),
this, SLOT(actionActivated(QAction*)));
m_busySeq = new KPixmapSequenceOverlayPainter(this);
- m_busySeq->setSequence(KPixmapSequence("process-working", \
KIconLoader::SizeSmallMedium)); + \
m_busySeq->setSequence(KPixmapSequence(QLatin1String("process-working"), \
KIconLoader::SizeSmallMedium)); m_busySeq->setAlignment(Qt::AlignHCenter | \
Qt::AlignVCenter); m_busySeq->setWidget(ui->stackedWidget);
@@ -522,7 +522,7 @@ void PackageDetails::display()
ui->filesPTE->insertPlainText(i18n("No files were found."));
} else {
m_currentFileList.sort();
- ui->filesPTE->insertPlainText(m_currentFileList.join("\n"));
+ \
ui->filesPTE->insertPlainText(m_currentFileList.join(QLatin1Char('\n'))); }
if (ui->stackedWidget->currentWidget() != ui->pageFiles) {
@@ -579,15 +579,15 @@ void PackageDetails::setupDescription()
}
if (!m_detailsDescription.isEmpty()) {
- ui->descriptionL->setText(m_detailsDescription.replace('\n', "<br>"));
+ ui->descriptionL->setText(m_detailsDescription.replace(QLatin1Char('\n'), \
QLatin1String("<br>"))); ui->descriptionL->show();
} else {
ui->descriptionL->clear();
}
if (!m_details.url().isEmpty()) {
- ui->homepageL->setText("<a href=\"" + m_details.url() + "\">" +
- m_details.url() + "</a>");
+ ui->homepageL->setText(QLatin1String("<a href=\"") + m_details.url() + \
QLatin1String("\">") + + m_details.url() + \
QLatin1String("</a>")); ui->homepageL->show();
} else {
ui->homepageL->hide();
@@ -604,14 +604,14 @@ void PackageDetails::setupDescription()
ui->pathL->hide();
} else {
QString path;
- path.append(QString("<img width=\"16\" heigh=\"16\"src=\"%1\"/>")
- .arg(KIconLoader::global()->iconPath("kde", \
KIconLoader::Small)));
- path.append(QString(" %1 <img width=\"16\" heigh=\"16\" \
src=\"%2\"/> %3") + path.append(QString(QLatin1String("<img width=\"16\" \
heigh=\"16\"src=\"%1\"/>")) + \
.arg(KIconLoader::global()->iconPath(QLatin1String("kde"), KIconLoader::Small))); + \
path.append(QString(QLatin1String(" %1 <img width=\"16\" heigh=\"16\" \
src=\"%2\"/> %3"))
.arg(QString::fromUtf8("➜"))
- .arg(KIconLoader::global()->iconPath("applications-other", \
KIconLoader::Small)) + \
.arg(KIconLoader::global()->iconPath(QLatin1String("applications-other"), \
KIconLoader::Small))
.arg(i18n("Applications")));
for (int i = 0; i < ret.size(); i++) {
- path.append(QString(" %1 <img width=\"16\" heigh=\"16\" \
src=\"%2\"/> %3") + \
path.append(QString(QLatin1String(" %1 <img width=\"16\" heigh=\"16\" \
src=\"%2\"/> %3"))
.arg(QString::fromUtf8("➜"))
.arg(KIconLoader::global()->iconPath(ret.at(i).second, \
KIconLoader::Small))
.arg(ret.at(i).first));
@@ -626,10 +626,10 @@ void PackageDetails::setupDescription()
// // + "</td></tr>";
// }
- if (!m_details.license().isEmpty() && m_details.license() != "unknown") {
+ if (!m_details.license().isEmpty() && m_details.license() != \
QLatin1String("unknown")) {
// We have a license, check if we have and should show show package version
if (!m_hideVersion && \
!Transaction::packageVersion(m_details.packageId()).isEmpty()) {
- ui->licenseL->setText(Transaction::packageVersion(m_details.packageId()) \
+ " - " + m_details.license()); + \
ui->licenseL->setText(Transaction::packageVersion(m_details.packageId()) + \
QLatin1String(" - ") + m_details.license()); } else {
ui->licenseL->setText(m_details.license());
}
diff --git a/Apper/ScreenShotViewer.cpp b/Apper/ScreenShotViewer.cpp
index d30a803..b274017 100644
--- a/Apper/ScreenShotViewer.cpp
+++ b/Apper/ScreenShotViewer.cpp
@@ -46,7 +46,7 @@ ScreenShotViewer::ScreenShotViewer(const QString &url, QWidget \
*parent) setFrameShadow(Plain);
setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
setWidget(m_screenshotL);
- setWindowIcon(QIcon::fromTheme("layer-visible-on"));
+ setWindowIcon(QIcon::fromTheme(QLatin1String("layer-visible-on")));
auto tempFile = new QTemporaryFile;
// tempFile->setPrefix("appgetfull");
@@ -59,7 +59,7 @@ ScreenShotViewer::ScreenShotViewer(const QString &url, QWidget \
*parent)
connect(job, &KIO::FileCopyJob::result, this, &ScreenShotViewer::resultJob);
m_busySeq = new KPixmapSequenceOverlayPainter(this);
- m_busySeq->setSequence(KPixmapSequence("process-working", \
KIconLoader::SizeSmallMedium)); + \
m_busySeq->setSequence(KPixmapSequence(QLatin1String("process-working"), \
KIconLoader::SizeSmallMedium)); m_busySeq->setAlignment(Qt::AlignHCenter | \
Qt::AlignVCenter); m_busySeq->setWidget(m_screenshotL);
m_busySeq->start();
diff --git a/Apper/Settings/Settings.cpp b/Apper/Settings/Settings.cpp
index 28adc2c..b1603b1 100644
--- a/Apper/Settings/Settings.cpp
+++ b/Apper/Settings/Settings.cpp
@@ -137,7 +137,7 @@ Settings::Settings(Transaction::Roles roles, QWidget *parent) :
// Setup the busy cursor
m_busySeq = new KPixmapSequenceOverlayPainter(this);
- m_busySeq->setSequence(KPixmapSequence("process-working", \
KIconLoader::SizeSmallMedium)); + \
m_busySeq->setSequence(KPixmapSequence(QLatin1String("process-working"), \
KIconLoader::SizeSmallMedium)); m_busySeq->setAlignment(Qt::AlignHCenter | \
Qt::AlignVCenter); m_busySeq->setWidget(ui->originTV->viewport());
@@ -175,7 +175,7 @@ void Settings::on_showOriginsCB_stateChanged(int state)
m_busySeq->start();
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup originsDialog(&config, "originsDialog");
bool showDevel = originsDialog.readEntry("showDevel", false);
if (showDevel != ui->showOriginsCB->isChecked()) {
@@ -185,7 +185,7 @@ void Settings::on_showOriginsCB_stateChanged(int state)
bool Settings::hasChanges() const
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup requirementsDialog(&config, "requirementsDialog");
KConfigGroup transaction(&config, "Transaction");
@@ -235,7 +235,7 @@ void Settings::checkChanges()
void Settings::load()
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup requirementsDialog(&config, "requirementsDialog");
ui->autoConfirmCB->setChecked(!requirementsDialog.readEntry("autoConfirm", \
false)); @@ -307,7 +307,7 @@ void Settings::save()
{
qCDebug(APPER) << "Saving settings";
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup requirementsDialog(&config, "requirementsDialog");
requirementsDialog.writeEntry("autoConfirm", !ui->autoConfirmCB->isChecked());
diff --git a/Apper/TransactionModel.cpp b/Apper/TransactionModel.cpp
index 10fe54f..2d9c1b7 100644
--- a/Apper/TransactionModel.cpp
+++ b/Apper/TransactionModel.cpp
@@ -70,7 +70,7 @@ void TransactionModel::addTransaction(PackageKit::Transaction \
*trans) KUser user(trans->uid());
QString display;
if (!user.property(KUser::FullName).toString().isEmpty()) {
- display = user.property(KUser::FullName).toString() + " (" + \
user.loginName() + ')'; + display = user.property(KUser::FullName).toString() \
+ QLatin1String(" (") + user.loginName() + QLatin1Char(')'); } else {
display = user.loginName();
}
diff --git a/Apper/Updater/DistroUpgrade.cpp b/Apper/Updater/DistroUpgrade.cpp
index 7152365..da0f870 100644
--- a/Apper/Updater/DistroUpgrade.cpp
+++ b/Apper/Updater/DistroUpgrade.cpp
@@ -67,9 +67,9 @@ void DistroUpgrade::startDistroUpgrade()
"simply upgrading your packages.");
if (!pluggedIn) {
- warning += ' ' + i18n("It is recommended to plug in your computer before \
proceeding."); + warning += QLatin1Char(' ') + i18n("It is recommended to plug \
in your computer before proceeding."); } else if (hasBattery) {
- warning += ' ' + i18n("It is recommended that you keep your computer plugged \
in while the upgrade is being performed."); + warning += QLatin1Char(' ') + \
i18n("It is recommended that you keep your computer plugged in while the upgrade is \
being performed."); }
if (KMessageBox::warningContinueCancel(this,warning) == KMessageBox::Continue) {
@@ -78,9 +78,9 @@ void DistroUpgrade::startDistroUpgrade()
connect(m_distroUpgradeProcess, QOverload<int, \
QProcess::ExitStatus>::of(&QProcess::finished), this, \
&DistroUpgrade::distroUpgradeFinished); QStringList env = \
QProcess::systemEnvironment();
- env << "DESKTOP=kde";
+ env << QLatin1String("DESKTOP=kde");
m_distroUpgradeProcess->setEnvironment(env);
- m_distroUpgradeProcess->start("/usr/share/PackageKit/pk-upgrade-distro.sh");
+ m_distroUpgradeProcess->start(QLatin1String("/usr/share/PackageKit/pk-upgrade-distro.sh"));
}
}
diff --git a/Apper/Updater/UpdateDetails.cpp b/Apper/Updater/UpdateDetails.cpp
index c9bdcca..8fefe7d 100644
--- a/Apper/Updater/UpdateDetails.cpp
+++ b/Apper/Updater/UpdateDetails.cpp
@@ -45,11 +45,11 @@ UpdateDetails::UpdateDetails(QWidget *parent)
: QWidget(parent)
{
setupUi(this);
- hideTB->setIcon(QIcon::fromTheme("window-close"));
+ hideTB->setIcon(QIcon::fromTheme(QLatin1String("window-close")));
connect(hideTB, &QToolButton::clicked, this, &UpdateDetails::hide);
m_busySeq = new KPixmapSequenceOverlayPainter(this);
- m_busySeq->setSequence(KPixmapSequence(QIcon::fromTheme("process-working").pixmap(KIconLoader::SizeSmallMedium)));
+ m_busySeq->setSequence(KPixmapSequence(QIcon::fromTheme(QLatin1String("process-working")).pixmap(KIconLoader::SizeSmallMedium)));
m_busySeq->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
m_busySeq->setWidget(this);
@@ -179,139 +179,137 @@ void UpdateDetails::updateDetail(const QString &packageID,
// update type (ie Security Update)
if (m_updateInfo == Transaction::InfoEnhancement) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("This update will add new features and expand \
functionality.") +
- "</p>";
+ QLatin1String("</p>");
} else if (m_updateInfo == Transaction::InfoBugfix) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("This update will fix bugs and other non-critical \
problems.") +
- "</p>";
+ QLatin1String("</p>");
} else if (m_updateInfo == Transaction::InfoImportant) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("This update is important as it may solve critical \
problems.") +
- "</p>";
+ QLatin1String("</p>");
} else if (m_updateInfo == Transaction::InfoSecurity) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("This update is needed to fix a security vulnerability \
with this package.") +
- "</p>";
+ QLatin1String("</p>");
} else if (m_updateInfo == Transaction::InfoBlocked) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("This update is blocked.") +
- "</p>";
+ QLatin1String("</p>");
}
// Issued and Updated
if (!issued.isNull() && !updated.isNull()) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("This notification was issued on %1 and last updated on \
%2.",
QLocale::system().toString(issued, \
QLocale::ShortFormat),
QLocale::system().toString(updated, \
QLocale::ShortFormat)) +
- "</p>";
+ QLatin1String("</p>");
} else if (!issued.isNull()) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("This notification was issued on %1.",
QLocale::system().toString(issued, \
QLocale::ShortFormat)) +
- "</p>";
+ QLatin1String("</p>");
}
// Description
if (!updateText.isEmpty()) {
QString _updateText = updateText;
- _updateText.replace('\n', "<br/>");
- _updateText.replace(' ', " ");
- description += "<p>" +
- _updateText +
- "</p>";
+ _updateText.replace(QLatin1Char('\n'), QLatin1String("<br/>"));
+ _updateText.replace(QLatin1Char(' '), QLatin1String(" "));
+ description += QLatin1String("<p>") + _updateText + QLatin1String("</p>");
}
// links
// Vendor
if (!vendorUrls.isEmpty()) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18np("For more information about this update please visit \
this website:",
"For more information about this update please visit \
these websites:",
- vendorUrls.size()) + "<br/>" +
+ vendorUrls.size()) + QLatin1String("<br/>") +
getLinkList(vendorUrls) +
- "</p>";
+ QLatin1String("</p>");
}
// Bugzilla
if (!bugzillaUrls.isEmpty()) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18np("For more information about bugs fixed by this update \
please visit this website:",
"For more information about bugs fixed by this update \
please visit these websites:",
- bugzillaUrls.size()) + "<br/>" +
+ bugzillaUrls.size()) + QLatin1String("<br>") +
getLinkList(bugzillaUrls) +
- "</p>";
+ QLatin1String("</p>");
}
// CVE
if (!cveUrls.isEmpty()) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18np("For more information about this security update please \
visit this website:",
"For more information about this security update please \
visit these websites:",
- cveUrls.size()) + "<br/>" +
+ cveUrls.size()) + QLatin1String("<br>") +
getLinkList(cveUrls) +
- "</p>";
+ QLatin1String("</p>");
}
// Notice (about the need for a reboot)
if (restart == Transaction::RestartSystem) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("The computer will have to be restarted after the update \
for the changes to take effect.") +
- "</p>";
+ QLatin1String("</p>");
} else if (restart == Transaction::RestartSession) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("You will need to log out and back in after the update \
for the changes to take effect.") +
- "</p>";
+ QLatin1String("</p>");
}
// State
if (state == Transaction::UpdateStateUnstable) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("The classification of this update is unstable which \
means it is not designed for production use.") +
- "</p>";
+ QLatin1String("</p>");
} else if (state == Transaction::UpdateStateTesting) {
- description += "<p>" +
+ description += QLatin1String("<p>") +
i18n("This is a test update, and is not designed for normal \
use. Please report any problems or regressions you encounter.") +
- "</p>";
+ QLatin1String("</p>");
}
// only show changelog if we didn't have any update text
if (updateText.isEmpty() && !changelog.isEmpty()) {
QString _changelog = changelog;
- _changelog.replace('\n', "<br/>");
- _changelog.replace(' ', " ");
- description += "<p>" +
+ _changelog.replace(QLatin1Char('\n'), QLatin1String("<br/>"));
+ _changelog.replace(QLatin1Char(' '), QLatin1String(" "));
+ description += QLatin1String("<p>") +
i18n("The developer logs will be shown as no description is \
available for this update:") +
- "<br/>" +
+ QLatin1String("<br>") +
_changelog +
- "</p>";
+ QLatin1String("</p>");
}
// Updates (lists of packages that are updated)
if (!updates.isEmpty()) {
- description += "<p>" + i18n("Updates:") + "<br/>";
+ description += QLatin1String("<p>") + i18n("Updates:") + \
QLatin1String("<br>"); QStringList _updates;
for (const QString &pid : updates) {
- _updates += QString::fromUtf8("\xE2\x80\xA2 ") + \
Transaction::packageName(pid) + " - " + Transaction::packageVersion(pid); + \
_updates += QString::fromUtf8("\xE2\x80\xA2 ") + Transaction::packageName(pid) + \
QLatin1String(" - ") + Transaction::packageVersion(pid); }
- description += _updates.join("<br/>") + "</p>";
+ description += _updates.join(QLatin1String("<br>")) + QLatin1String("</p>");
}
// Obsoletes (lists of packages that are obsoleted)
if (obsoletes.size()) {
- description += "<p></b>" + i18n("Obsoletes:") + "</b><br/>";
+ description += QLatin1String("<p></b>") + i18n("Obsoletes:") + \
QLatin1String("</b><br/>"); QStringList _obsoletes;
for (const QString &pid : obsoletes) {
- _obsoletes += QString::fromUtf8("\xE2\x80\xA2 ") + \
Transaction::packageName(pid) + " - " + Transaction::packageVersion(pid); + \
_obsoletes += QString::fromUtf8("\xE2\x80\xA2 ") + Transaction::packageName(pid) + \
QLatin1String(" - ") + Transaction::packageVersion(pid); }
- description += _obsoletes.join("<br>/") + "</p>";
+ description += _obsoletes.join(QLatin1String("<br>/")) + \
QLatin1String("</p>"); }
// Repository (this is the repository the package comes from)
if (!Transaction::packageData(packageID).isEmpty()) {
- description += "<p>" + i18n("Repository: %1", \
Transaction::packageData(packageID)) + "</p>"; + description += \
QLatin1String("<p>") + i18n("Repository: %1", Transaction::packageData(packageID)) + \
QLatin1String("</p>"); }
m_currentDescription = description;
@@ -323,7 +321,7 @@ QString UpdateDetails::getLinkList(const QStringList &urls) const
QString ret;
for (const QString &url : urls) {
if (!ret.isEmpty()) {
- ret += "<br/>";
+ ret += QLatin1String("<br>");
}
ret += QString::fromUtf8(" \xE2\x80\xA2 <a href=\"") % url % \
QLatin1String("\">") % url % QLatin1String("</a>"); }
diff --git a/Apper/Updater/Updater.cpp b/Apper/Updater/Updater.cpp
index dbb728d..82ef8ad 100644
--- a/Apper/Updater/Updater.cpp
+++ b/Apper/Updater/Updater.cpp
@@ -90,14 +90,14 @@ Updater::Updater(Transaction::Roles roles, QWidget *parent) :
// Setup the busy cursor
m_busySeq = new KPixmapSequenceOverlayPainter(this);
- m_busySeq->setSequence(KPixmapSequence("process-working", \
KIconLoader::SizeSmallMedium)); + \
m_busySeq->setSequence(KPixmapSequence(QLatin1String("process-working"), \
KIconLoader::SizeSmallMedium)); m_busySeq->setAlignment(Qt::AlignHCenter | \
Qt::AlignVCenter); m_busySeq->setWidget(ui->packageView->viewport());
// hide distro Upgrade container and line
ui->distroUpgrade->hide();
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "UpdateView");
// versions
@@ -143,7 +143,7 @@ Updater::~Updater()
void Updater::showVersions(bool enabled)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "UpdateView");
viewGroup.writeEntry("ShowVersions", enabled);
ui->packageView->header()->setSectionHidden(PackageModel::VersionCol, !enabled);
@@ -151,7 +151,7 @@ void Updater::showVersions(bool enabled)
void Updater::showCurrentVersions(bool enabled)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "UpdateView");
viewGroup.writeEntry("ShowCurrentVersions", enabled);
ui->packageView->header()->setSectionHidden(PackageModel::CurrentVersionCol, \
!enabled); @@ -162,7 +162,7 @@ void Updater::showCurrentVersions(bool enabled)
void Updater::showArchs(bool enabled)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "UpdateView");
viewGroup.writeEntry("ShowArchs", enabled);
ui->packageView->header()->setSectionHidden(PackageModel::ArchCol, !enabled);
@@ -170,7 +170,7 @@ void Updater::showArchs(bool enabled)
void Updater::showOrigins(bool enabled)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "UpdateView");
viewGroup.writeEntry("showOrigins", enabled);
ui->packageView->header()->setSectionHidden(PackageModel::OriginCol, !enabled);
@@ -178,7 +178,7 @@ void Updater::showOrigins(bool enabled)
void Updater::showSizes(bool enabled)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup viewGroup(&config, "UpdateView");
viewGroup.writeEntry("ShowSizes", enabled);
ui->packageView->header()->setSectionHidden(PackageModel::SizeCol, !enabled);
@@ -333,7 +333,7 @@ void Updater::on_packageView_customContextMenuRequested(const \
QPoint &pos) menu->addAction(m_showPackageSize);
QAction *action;
action = menu->addAction(i18n("Check for new updates"));
- action->setIcon(QIcon::fromTheme("view-refresh"));
+ action->setIcon(QIcon::fromTheme(QLatin1String("view-refresh")));
connect(action, &QAction::triggered, this, &Updater::refreshCache);
menu->exec(ui->packageView->viewport()->mapToGlobal(pos));
delete menu;
diff --git a/Apper/main.cpp b/Apper/main.cpp
index 9af8ca2..4ce96f3 100644
--- a/Apper/main.cpp
+++ b/Apper/main.cpp
@@ -35,19 +35,19 @@
int main(int argc, char **argv)
{
- QApplication::setWindowIcon(QIcon::fromTheme("system-software-install"));
+ QApplication::setWindowIcon(QIcon::fromTheme(QLatin1String("system-software-install")));
Apper app(argc, argv);
KLocalizedString::setApplicationDomain("apper");
- KAboutData aboutData("apper", // DO NOT change this catalog unless you know it \
will not break translations! + KAboutData aboutData(QLatin1String("apper"), // DO \
NOT change this catalog unless you know it will not break translations! \
i18n("Apper"),
- APPER_VERSION,
+ QLatin1String(APPER_VERSION),
i18n("Apper is an application to get and manage software"),
KAboutLicense::LicenseKey::GPL);
- aboutData.addAuthor(i18n("(C) 2008-2018 Daniel Nicoletti"), QString(), \
"dantti12@gmail.com", "http://dantti.wordpress.com");
- aboutData.addCredit(i18n("Adrien Bustany"), i18n("libpackagekit-qt and other \
stuff"), "@");
- aboutData.addAuthor(i18n("Matthias Klumpp"), QString(), \
QStringLiteral("matthias@tenstral.net")); + aboutData.addAuthor(i18n("(C) \
2008-2018 Daniel Nicoletti"), QString(), QLatin1String("dantti12@gmail.com"), \
QLatin1String("http://dantti.wordpress.com")); + aboutData.addCredit(i18n("Adrien \
Bustany"), i18n("libpackagekit-qt and other stuff"), QLatin1String("@")); + \
aboutData.addAuthor(i18n("Matthias Klumpp"), QString(), \
QLatin1String("matthias@tenstral.net"));
KAboutData::setApplicationData(aboutData);
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b81092..9d9570f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,7 @@ add_definitions(
-DQT_USE_FAST_OPERATOR_PLUS
-DQT_NO_URL_CAST_FROM_STRING
-DQT_NO_CAST_TO_ASCII
+ -DQT_NO_CAST_FROM_ASCII
-DQT_DISABLE_DEPRECATED_BEFORE=0x050900
)
diff --git a/PkSession/FilesModel.cpp b/PkSession/FilesModel.cpp
index 9cbb9e6..a23d44e 100644
--- a/PkSession/FilesModel.cpp
+++ b/PkSession/FilesModel.cpp
@@ -120,14 +120,14 @@ bool FilesModel::insertFiles(const QList<QUrl> &urls)
item->setData(path);
item->setToolTip(path);
item->setEnabled(false);
- item->setIcon(KIconLoader::global()->loadIcon("dialog-cancel", \
KIconLoader::Desktop)); + \
item->setIcon(KIconLoader::global()->loadIcon(QLatin1String("dialog-cancel"), \
KIconLoader::Desktop)); }
} else if (m_mimes.isEmpty()) {
// It's not a file but we don't have a mime so it's ok
item = new QStandardItem(fileInfo.fileName());
item->setData(path);
item->setToolTip(path);
- item->setIcon(KIconLoader::global()->loadIcon("unknown", \
KIconLoader::Desktop)); + \
item->setIcon(KIconLoader::global()->loadIcon(QLatin1String("unknown"), \
KIconLoader::Desktop)); }
if (item) {
diff --git a/PkSession/PkInstallCatalogs.cpp b/PkSession/PkInstallCatalogs.cpp
index 74a3abb..c492094 100644
--- a/PkSession/PkInstallCatalogs.cpp
+++ b/PkSession/PkInstallCatalogs.cpp
@@ -47,8 +47,8 @@ PkInstallCatalogs::PkInstallCatalogs(uint xid,
setWindowTitle(i18n("Install Packages Catalogs"));
// Find out how many packages PackageKit is able to resolve
- QFile file("/etc/PackageKit/PackageKit.conf");
- QRegExp rx("\\s*MaximumItemsToResolve=(\\d+)", Qt::CaseSensitive);
+ QFile file(QLatin1String("/etc/PackageKit/PackageKit.conf"));
+ QRegExp rx(QLatin1String("\\s*MaximumItemsToResolve=(\\d+)"), \
Qt::CaseSensitive); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream in(&file);
while (!in.atEnd()) {
@@ -110,7 +110,7 @@ void PkInstallCatalogs::search()
const QString distroId = Daemon::global()->distroID();
const QStringList parts = distroId.split(QLatin1Char(';'));
if (parts.size() != 3) {
- sendErrorFinished(Failed, "invalid distribution id, please fill a bug \
against you distribution backend"); + sendErrorFinished(Failed, \
QLatin1String("invalid distribution id, please fill a bug against you distribution \
backend")); return;
}
const QString distro = parts.at(0);
@@ -138,7 +138,7 @@ void PkInstallCatalogs::search()
i18n("Your backend does not support any of the needed "
"methods to install a catalog"));
}
- sendErrorFinished(Failed, "not supported by backend");
+ sendErrorFinished(Failed, QLatin1String("not supported by backend"));
return;
}
@@ -148,7 +148,8 @@ void PkInstallCatalogs::search()
// matches after '=' but ';' at the end
QString pattern;
pattern = QString(
- "^(%1)(?:\\((?:.*%2[^;]*(?:;(?:.*%3[^;]*(?:;(?:.*%4[^;]*)?)?)?)?)?\\))?=(.*[^;$])").arg(rxActions.join("|")).arg(distro).arg(version).arg(arch);
+ QLatin1String("^(%1)(?:\\((?:.*%2[^;]*(?:;(?:.*%3[^;]*(?:;(?:.*%4[^;]*)?)?)?)?)?\\))?=(.*[^;$])"))
+ .arg(rxActions.join(QLatin1Char('|')), distro, version, arch);
QRegExp rx(pattern, Qt::CaseInsensitive);
QStringList filesFailedToOpen;
@@ -161,9 +162,9 @@ void PkInstallCatalogs::search()
while (!in.atEnd()) {
if (rx.indexIn(in.readLine()) != -1) {
if (rx.cap(1).compare(QLatin1String("InstallPackages"), \
Qt::CaseInsensitive) == 0) {
- m_installPackages.append(rx.cap(2).split(';'));
+ \
m_installPackages.append(rx.cap(2).split(QLatin1Char(';')));
} else if \
(rx.cap(1).compare(QLatin1String("InstallProvides"), \
Qt::CaseInsensitive) == 0) {
- m_installProvides.append(rx.cap(2).split(';'));
+ \
m_installProvides.append(rx.cap(2).split(QLatin1Char(';')));
} else if (rx.cap(1).compare(QLatin1String("InstallFiles"), \
Qt::CaseInsensitive) == 0) {
\
m_installFiles.append(rx.cap(2).split(QLatin1Char(';'))); }
@@ -185,7 +186,7 @@ void PkInstallCatalogs::search()
i18np("Catalog %2 failed to open",
"Catalogs %2 failed to open",
filesFailedToOpen.size(),
- filesFailedToOpen.join(",")),
+ filesFailedToOpen.join(QLatin1Char(','))),
i18n("Failed to open"));
}
diff --git a/PkSession/PkInstallFontconfigResources.cpp \
b/PkSession/PkInstallFontconfigResources.cpp index acd1cce..422153c 100644
--- a/PkSession/PkInstallFontconfigResources.cpp
+++ b/PkSession/PkInstallFontconfigResources.cpp
@@ -55,14 +55,14 @@ PkInstallFontconfigResources::PkInstallFontconfigResources(uint \
xid, // TODO never return in here
// TODO add name field from /usr/share/xml/iso-codes/iso_639.xml into model
if (!font.startsWith(QLatin1String(":lang="))) {
- errors << QString("not recognised prefix: '%1'").arg(font);
- qCWarning(APPER_SESSION) << QString("not recognised prefix: \
'%1'").arg(font); + errors << QString(QLatin1String("not recognised \
prefix: '%1'")).arg(font); + qCWarning(APPER_SESSION) << \
QString(QLatin1String("not recognised prefix: '%1'")).arg(font); continue;
}
int size = font.size();
if (size < 7 || size > 20) {
- errors << QString("lang tag malformed: '%1'").arg(font);
- qCWarning(APPER_SESSION) << QString("lang tag malformed: \
'%1'").arg(font); + errors << QString(QLatin1String("lang tag malformed: \
'%1'")).arg(font); + qCWarning(APPER_SESSION) << \
QString(QLatin1String("lang tag malformed: '%1'")).arg(font); continue;
}
@@ -72,24 +72,24 @@ PkInstallFontconfigResources::PkInstallFontconfigResources(uint \
xid,
if (m_resources.isEmpty()) {
setError(i18n("Could interpret request"), i18n("Please verify if the request \
was valid"));
- sendErrorFinished(InternalError, errors.join("\n"));
+ sendErrorFinished(InternalError, errors.join(QLatin1Char('\n')));
return;
}
enableButtonOk(true);
// Search for the iso 639 names to present it nicely to the user
QStringList niceNames;
- QFile file("/usr/share/xml/iso-codes/iso_639.xml");
+ QFile file(QLatin1String("/usr/share/xml/iso-codes/iso_639.xml"));
file.open(QFile::ReadOnly);
QXmlQuery query;
- query.bindVariable("path", &file);
+ query.bindVariable(QLatin1String("path"), &file);
for (const QString &font : iso639) {
QString queryTxt;
- queryTxt = QString("declare variable $path external;"
- "doc($path)/iso_639_entries/"
- "iso_639_entry[@iso_639_2B_code=\"%1\" or "
+ queryTxt = QString(QLatin1String("declare variable $path external;"
+ "doc($path)/iso_639_entries/"
+ "iso_639_entry[@iso_639_2B_code=\"%1\" or "
"@iso_639_2T_code=\"%1\" or "
- \
"@iso_639_1_code=\"%1\"]/string(@name)").arg(font); + \
"@iso_639_1_code=\"%1\"]/string(@name)")).arg(font); query.setQuery(queryTxt);
QStringList result;
query.evaluateTo(&result);
@@ -99,7 +99,7 @@ PkInstallFontconfigResources::PkInstallFontconfigResources(uint \
xid, // kDebug() << "result" << niceNames << iso639;
for (const QString &name : niceNames) {
auto item = new QStandardItem(name);
- item->setIcon(QIcon::fromTheme("fonts-package").pixmap(32, 32));
+ item->setIcon(QIcon::fromTheme(QLatin1String("fonts-package")).pixmap(32, \
32)); item->setFlags(Qt::ItemIsEnabled);
model->appendRow(item);
}
@@ -158,7 +158,7 @@ void PkInstallFontconfigResources::searchFailed()
if (showWarning()) {
setError(msg, i18n("Failed to search for provides"));
}
- sendErrorFinished(Failed, "failed to search for provides");
+ sendErrorFinished(Failed, QLatin1String("failed to search for provides"));
}
#include "PkInstallFontconfigResources.moc"
diff --git a/PkSession/PkInstallGStreamerResources.cpp \
b/PkSession/PkInstallGStreamerResources.cpp index 5cabafc..ac1da44 100644
--- a/PkSession/PkInstallGStreamerResources.cpp
+++ b/PkSession/PkInstallGStreamerResources.cpp
@@ -49,18 +49,18 @@ PkInstallGStreamerResources::PkInstallGStreamerResources(uint \
xid, bool decoder = false;
// Resources are strings like "ID3 \
tag|gstreamer0.10(decoder-application/x-id3)()(64bit)" for (const QString &codec : \
resources) {
- if (codec.contains("|gstreamer0.10(decoder")) {
+ if (codec.contains(QLatin1String("|gstreamer0.10(decoder"))) {
decoder = true;
- } else if (codec.contains("|gstreamer0.10(encoder")) {
+ } else if (codec.contains(QLatin1String("|gstreamer0.10(encoder"))) {
encoder = true;
}
- auto item = new QStandardItem(codec.section('|', 0, 0));
- item->setIcon(QIcon::fromTheme("x-kde-nsplugin-generated").pixmap(32, 32));
+ auto item = new QStandardItem(codec.section(QLatin1Char('|'), 0, 0));
+ item->setIcon(QIcon::fromTheme(QLatin1String("x-kde-nsplugin-generated")).pixmap(32, \
32)); item->setFlags(Qt::ItemIsEnabled);
model->appendRow(item);
- m_resources << codec.section('|', 1, -1);
+ m_resources << codec.section(QLatin1Char('|'), 1, -1);
}
@@ -141,7 +141,7 @@ void PkInstallGStreamerResources::notFound()
i18n("Could not find plugin "
"in any configured software source"));
}
- sendErrorFinished(NoPackagesFound, "failed to find codec");
+ sendErrorFinished(NoPackagesFound, QLatin1String("failed to find codec"));
}
#include "PkInstallGStreamerResources.moc"
diff --git a/PkSession/PkInstallMimeTypes.cpp b/PkSession/PkInstallMimeTypes.cpp
index b7787d2..26764ec 100644
--- a/PkSession/PkInstallMimeTypes.cpp
+++ b/PkSession/PkInstallMimeTypes.cpp
@@ -96,7 +96,7 @@ void PkInstallMimeTypes::notFound()
setInfo(msg, i18n("No new applications can be found "
"to handle this type of file"));
}
- sendErrorFinished(NoPackagesFound, "nothing was found to handle mime type");
+ sendErrorFinished(NoPackagesFound, QLatin1String("nothing was found to handle \
mime type")); }
//setTitle(i18np("Application that can open this type of file",
diff --git a/PkSession/PkInstallPackageFiles.cpp \
b/PkSession/PkInstallPackageFiles.cpp index 93e4581..ab28eb7 100644
--- a/PkSession/PkInstallPackageFiles.cpp
+++ b/PkSession/PkInstallPackageFiles.cpp
@@ -111,7 +111,7 @@ void \
PkInstallPackageFiles::transactionFinished(PkTransaction::ExitStatus status \
finishTaskOk(); break;
case PkTransaction::Cancelled :
- sendErrorFinished(Cancelled, "Aborted");
+ sendErrorFinished(Cancelled, QLatin1String("Aborted"));
break;
case PkTransaction::Failed :
if (showWarning()) {
diff --git a/PkSession/PkInstallPackageNames.cpp \
b/PkSession/PkInstallPackageNames.cpp index 78b3c59..1af0641 100644
--- a/PkSession/PkInstallPackageNames.cpp
+++ b/PkSession/PkInstallPackageNames.cpp
@@ -50,7 +50,7 @@ PkInstallPackageNames::PkInstallPackageNames(uint xid,
for (const QString &package : packages) {
QStandardItem *item = new QStandardItem(package);
- item->setIcon(QIcon::fromTheme("package-x-generic").pixmap(32, 32));
+ item->setIcon(QIcon::fromTheme(QLatin1String("package-x-generic")).pixmap(32, \
32)); item->setFlags(Qt::ItemIsEnabled);
model->appendRow(item);
}
@@ -102,23 +102,23 @@ void PkInstallPackageNames::notFound()
i18np("The package %2 is already installed",
"The packages %2 are already installed",
m_alreadyInstalled.size(),
- m_alreadyInstalled.join(",")));
+ m_alreadyInstalled.join(QLatin1Char(','))));
}
- sendErrorFinished(Failed, "package already found");
+ sendErrorFinished(Failed, QLatin1String("package already found"));
} else {
if (showWarning()) {
- setInfo(i18n("Could not find %1", m_packages.join(", ")),
+ setInfo(i18n("Could not find %1", m_packages.join(QLatin1String(", "))),
i18np("The package could not be found in any software source",
"The packages could not be found in any software source",
m_packages.size()));
}
- sendErrorFinished(NoPackagesFound, "no package found");
+ sendErrorFinished(NoPackagesFound, QLatin1String("no package found"));
}
}
void PkInstallPackageNames::searchFailed()
{
- sendErrorFinished(Failed, "failed to resolve package name");
+ sendErrorFinished(Failed, QLatin1String("failed to resolve package name"));
}
void PkInstallPackageNames::addPackage(Transaction::Info info, const QString \
&packageID, const QString &summary)
diff --git a/PkSession/PkInstallPlasmaResources.cpp \
b/PkSession/PkInstallPlasmaResources.cpp index a5af7cb..d0e6883 100644
--- a/PkSession/PkInstallPlasmaResources.cpp
+++ b/PkSession/PkInstallPlasmaResources.cpp
@@ -56,7 +56,7 @@ PkInstallPlasmaResources::PkInstallPlasmaResources(uint xid,
}
auto item = new QStandardItem(prettyService);
- item->setIcon(QIcon::fromTheme("application-x-plasma").pixmap(32, 32));
+ item->setIcon(QIcon::fromTheme(QLatin1String("application-x-plasma")).pixmap(32, \
32)); item->setFlags(Qt::ItemIsEnabled);
model->appendRow(item);
diff --git a/PkSession/PkInstallPrinterDrivers.cpp \
b/PkSession/PkInstallPrinterDrivers.cpp index 30f8542..02e16a7 100644
--- a/PkSession/PkInstallPrinterDrivers.cpp
+++ b/PkSession/PkInstallPrinterDrivers.cpp
@@ -43,7 +43,7 @@ PkInstallPrinterDrivers::PkInstallPrinterDrivers(uint xid,
QStringList search;
for (const QString &deviceid : resources) {
QString mfg, mdl;
- const QStringList fields = deviceid.split(';');
+ const QStringList fields = deviceid.split(QLatin1Char(';'));
for (const QString &field : fields) {
const QString keyvalue = field.trimmed();
if (keyvalue.startsWith(QLatin1String("MFG:"))) {
@@ -56,8 +56,8 @@ PkInstallPrinterDrivers::PkInstallPrinterDrivers(uint xid,
if (!mfg.isEmpty() && !mdl.isEmpty()) {
QString prov;
QTextStream out(&prov);
- out << mfg.toLower().replace(' ', '_') << ';'
- << mdl.toLower().replace(' ', '_') << ';';
+ out << mfg.toLower().replace(QLatin1Char(' '), QLatin1Char('_')) << \
QLatin1Char(';') + << mdl.toLower().replace(QLatin1Char(' '), \
QLatin1Char('_')) << QLatin1Char(';'); search << prov;
}
}
@@ -83,7 +83,7 @@ void PkInstallPrinterDrivers::notFound()
i18n("Could not find printer driver "
"in any configured software source"));
}
- sendErrorFinished(NoPackagesFound, "failed to find printer driver");
+ sendErrorFinished(NoPackagesFound, QLatin1String("failed to find printer \
driver")); }
#include "PkInstallPrinterDrivers.moc"
diff --git a/PkSession/PkInstallProvideFiles.cpp \
b/PkSession/PkInstallProvideFiles.cpp index c91df0d..e02c762 100644
--- a/PkSession/PkInstallProvideFiles.cpp
+++ b/PkSession/PkInstallProvideFiles.cpp
@@ -94,7 +94,7 @@ void PkInstallProvideFiles::notFound()
i18n("The %1 package already provides this file",
m_alreadyInstalled));
}
- sendErrorFinished(Failed, "already provided");
+ sendErrorFinished(Failed, QLatin1String("already provided"));
} else {
if (showWarning()) {
setInfo(i18n("Failed to find package"),
@@ -102,7 +102,7 @@ void PkInstallProvideFiles::notFound()
"The files could not be found in any packages",
m_args.size()));
}
- sendErrorFinished(NoPackagesFound, "no files found");
+ sendErrorFinished(NoPackagesFound, QLatin1String("no files found"));
}
}
diff --git a/PkSession/PkRemovePackageByFiles.cpp \
b/PkSession/PkRemovePackageByFiles.cpp index d4fc32e..6280a48 100644
--- a/PkSession/PkRemovePackageByFiles.cpp
+++ b/PkSession/PkRemovePackageByFiles.cpp
@@ -137,12 +137,12 @@ void PkRemovePackageByFiles::notFound()
{
if (showWarning()) {
QStringList files = m_model->files();
- setInfo(i18n("Could not find %1", files.join(", ")),
+ setInfo(i18n("Could not find %1", files.join(QLatin1String(", "))),
i18np("The file could not be found in any installed package",
"The files could not be found in any installed package",
files.size()));
}
- sendErrorFinished(NoPackagesFound, "no package found");
+ sendErrorFinished(NoPackagesFound, QLatin1String("no package found"));
}
#include "PkRemovePackageByFiles.moc"
diff --git a/PkSession/PkSearchFile.cpp b/PkSession/PkSearchFile.cpp
index 27a19e6..8922675 100644
--- a/PkSession/PkSearchFile.cpp
+++ b/PkSession/PkSearchFile.cpp
@@ -42,8 +42,8 @@ PkSearchFile::PkSearchFile(const QString &file_name,
setWindowTitle(i18n("Search Packages that Provides Files"));
// Check for a leading slash '/' return with an error if it's not there..
- if (!m_fileName.startsWith('/')) {
- sendErrorFinished(Failed, "Only full file name path is supported");
+ if (!m_fileName.startsWith(QLatin1Char('/'))) {
+ sendErrorFinished(Failed, QLatin1String("Only full file name path is \
supported")); return;
}
diff --git a/PkSession/SessionTask.cpp b/PkSession/SessionTask.cpp
index d7e63e3..8c44560 100644
--- a/PkSession/SessionTask.cpp
+++ b/PkSession/SessionTask.cpp
@@ -68,10 +68,10 @@ SessionTask::SessionTask(uint xid, const QString &interaction, \
const QDBusMessag // this, SLOT(updatePallete()));
updatePallete();
- setWindowIcon(QIcon::fromTheme("system-software-install"));
+ setWindowIcon(QIcon::fromTheme(QLatin1String("system-software-install")));
QPushButton *okButton = ui->buttonBox->button(QDialogButtonBox::Ok);
okButton->setText(i18n("Continue"));
- okButton->setIcon(QIcon::fromTheme("go-next"));
+ okButton->setIcon(QIcon::fromTheme(QLatin1String("go-next")));
enableButtonOk(false);
connect(okButton, &QPushButton::clicked, this, \
&SessionTask::slotContinueClicked);
@@ -246,7 +246,7 @@ void SessionTask::setError(const QString &title, const QString \
&text, const QStr auto info = new InfoWidget(this);
info->setWindowTitle(title);
info->setDescription(text);
- info->setIcon(QIcon::fromTheme("dialog-error"));
+ info->setIcon(QIcon::fromTheme(QLatin1String("dialog-error")));
info->setDetails(details);
setMainWidget(info);
// setButtons(KDialog::Close);
@@ -265,7 +265,7 @@ void SessionTask::setFinish(const QString &title, const QString \
&text, QWidget * auto info = new InfoWidget(this);
info->setWindowTitle(title);
info->setDescription(text);
- info->setIcon(QIcon::fromTheme("dialog-ok-apply"));
+ info->setIcon(QIcon::fromTheme(QLatin1String("dialog-ok-apply")));
info->addWidget(widget);
setMainWidget(info);
// setButtons(KDialog::Close);
@@ -291,17 +291,17 @@ void SessionTask::setExec(const QString &exec)
bool SessionTask::pathIsTrusted(const QString &exec)
{
// special case the plugin helper -- it's trusted
- return exec == "/usr/libexec/gst-install-plugins-helper" ||
- exec == "/usr/libexec/pk-gstreamer-install" ||
- exec == "/usr/bin/gstreamer-codec-install" ||
- exec == "/usr/lib/packagekit/pk-gstreamer-install" ||
- exec == "/usr/bin/plasma-desktop" ||
- exec == "/usr/bin/apper";
+ return exec == QLatin1String("/usr/libexec/gst-install-plugins-helper") ||
+ exec == QLatin1String("/usr/libexec/pk-gstreamer-install") ||
+ exec == QLatin1String("/usr/bin/gstreamer-codec-install") ||
+ exec == QLatin1String("/usr/lib/packagekit/pk-gstreamer-install") ||
+ exec == QLatin1String("/usr/bin/plasma-desktop") ||
+ exec == QLatin1String("/usr/bin/apper");
}
QString SessionTask::getCmdLine(uint pid)
{
- QFile file(QString("/proc/%1/cmdline").arg(pid));
+ QFile file(QString(QLatin1String("/proc/%1/cmdline")).arg(pid));
QString line;
if (file.open(QFile::ReadOnly)) {
char buf[1024];
@@ -309,7 +309,7 @@ QString SessionTask::getCmdLine(uint pid)
if (lineLength != -1) {
// the line is available in buf
line = QString::fromLocal8Bit(buf);
- if (!line.contains("(deleted)")) {
+ if (!line.contains(QLatin1String("(deleted)"))) {
return line;
}
}
@@ -320,9 +320,9 @@ QString SessionTask::getCmdLine(uint pid)
uint SessionTask::getPidSystem()
{
QDBusMessage msg;
- msg = QDBusMessage::createMethodCall("org.freedesktop.DBus",
- "/org/freedesktop/DBus/Bus",
- "org.freedesktop.DBus",
+ msg = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.DBus"),
+ QLatin1String("/org/freedesktop/DBus/Bus"),
+ QLatin1String("org.freedesktop.DBus"),
\
QLatin1String("GetConnectionUnixProcessID")); msg << m_message.service();
QDBusMessage reply = QDBusConnection::systemBus().call(msg);
@@ -340,9 +340,9 @@ uint SessionTask::getPidSystem()
uint SessionTask::getPidSession()
{
QDBusMessage msg;
- msg = QDBusMessage::createMethodCall("org.freedesktop.DBus",
- "/org/freedesktop/DBus/Bus",
- "org.freedesktop.DBus",
+ msg = QDBusMessage::createMethodCall(QLatin1String("org.freedesktop.DBus"),
+ QLatin1String("/org/freedesktop/DBus/Bus"),
+ QLatin1String("org.freedesktop.DBus"),
\
QLatin1String("GetConnectionUnixProcessID")); msg << m_message.service();
QDBusMessage reply = QDBusConnection::sessionBus().call(msg);
@@ -373,7 +373,7 @@ void SessionTask::commit()
if (installPackages.isEmpty() && m_removePackages.isEmpty()) {
setInfo(i18n("There are no packages to Install or Remove"),
i18n("This action should not happen"));
- sendErrorFinished(Failed, "to install or remove due to empty lists");
+ sendErrorFinished(Failed, QLatin1String("to install or remove due to \
empty lists")); } else if (!installPackages.isEmpty()) {
// Install Packages
auto transaction = new PkTransaction(this);
@@ -404,7 +404,7 @@ void SessionTask::notFound()
setInfo(i18n("Could not find"),
i18n("No packages were found that meet the request"));
}
- sendErrorFinished(NoPackagesFound, "no package found");
+ sendErrorFinished(NoPackagesFound, QLatin1String("no package found"));
}
void SessionTask::searchFailed()
@@ -412,7 +412,7 @@ void SessionTask::searchFailed()
qCDebug(APPER_SESSION) << "virtual method called";
setInfo(i18n("Failed to find"),
i18n("No packages were found that meet the request"));
- sendErrorFinished(Failed, "failed to search");
+ sendErrorFinished(Failed, QLatin1String("failed to search"));
}
void SessionTask::searchSuccess()
@@ -500,7 +500,7 @@ void SessionTask::slotContinueClicked()
void SessionTask::slotCancelClicked()
{
emit cancelClicked();
- sendErrorFinished(Cancelled, "Aborted by the user");
+ sendErrorFinished(Cancelled, QLatin1String("Aborted by the user"));
reject();
}
@@ -517,62 +517,62 @@ void SessionTask::enableButtonOk(bool enable)
void SessionTask::parseInteraction(const QString &interaction)
{
- QStringList interactions = interaction.split(',');
+ QStringList interactions = interaction.split(QLatin1Char(','));
// Enable or disable all options
- if (interactions.contains("always")) {
+ if (interactions.contains(QLatin1String("always"))) {
m_interactions = ConfirmSearch
| ConfirmDeps
| ConfirmInstall
| Progress
| Finished
| Warning;
- } else if (interactions.contains("never")) {
+ } else if (interactions.contains(QLatin1String("never"))) {
m_interactions = 0;
}
// show custom options
- if (interactions.contains("show-confirm-search")) {
+ if (interactions.contains(QLatin1String("show-confirm-search"))) {
m_interactions |= ConfirmSearch;
}
- if (interactions.contains("show-confirm-deps")) {
+ if (interactions.contains(QLatin1String("show-confirm-deps"))) {
m_interactions |= ConfirmDeps;
}
- if (interactions.contains("show-confirm-install")) {
+ if (interactions.contains(QLatin1String("show-confirm-install"))) {
m_interactions |= ConfirmInstall;
}
- if (interactions.contains("show-progress")) {
+ if (interactions.contains(QLatin1String("show-progress"))) {
m_interactions |= Progress;
}
- if (interactions.contains("show-finished")) {
+ if (interactions.contains(QLatin1String("show-finished"))) {
m_interactions |= Finished;
}
- if (interactions.contains("show-warning")) {
+ if (interactions.contains(QLatin1String("show-warning"))) {
m_interactions |= Warning;
}
// hide custom options
- if (interactions.contains("hide-confirm-search")) {
+ if (interactions.contains(QLatin1String("hide-confirm-search"))) {
m_interactions &= ~ConfirmSearch;
}
- if (interactions.contains("hide-confirm-deps")) {
+ if (interactions.contains(QLatin1String("hide-confirm-deps"))) {
m_interactions &= ~ConfirmDeps;
}
- if (interactions.contains("hide-confirm-install")) {
+ if (interactions.contains(QLatin1String("hide-confirm-install"))) {
m_interactions &= ~ConfirmInstall;
}
- if (interactions.contains("hide-progress")) {
+ if (interactions.contains(QLatin1String("hide-progress"))) {
m_interactions &= ~Progress;
}
- if (interactions.contains("hide-finished")) {
+ if (interactions.contains(QLatin1String("hide-finished"))) {
m_interactions &= ~Finished;
}
- if (interactions.contains("hide-warning")) {
+ if (interactions.contains(QLatin1String("hide-warning"))) {
m_interactions &= ~Warning;
}
int index;
- QRegExp rx("^timeout=(\\d+)$");
+ QRegExp rx(QLatin1String("^timeout=(\\d+)$"));
index = interactions.indexOf(rx);
if (index != -1) {
if (rx.indexIn(interactions.at(index)) != -1) {
diff --git a/PkSession/main.cpp b/PkSession/main.cpp
index e6e07af..cc9fb50 100644
--- a/PkSession/main.cpp
+++ b/PkSession/main.cpp
@@ -38,20 +38,20 @@ Q_LOGGING_CATEGORY(APPER_SESSION, "apper.session")
int main(int argc, char **argv)
{
QApplication app(argc, argv);
- app.setWindowIcon(QIcon::fromTheme("system-software-install"));
+ app.setWindowIcon(QIcon::fromTheme(QLatin1String("system-software-install")));
KLocalizedString::setApplicationDomain("apper");
- KAboutData aboutData("PkSession",
- "apper",
- APPER_VERSION,
+ KAboutData aboutData(QLatin1String("PkSession"),
+ QLatin1String("apper"),
+ QLatin1String(APPER_VERSION),
i18n("Apper PackageKit Session helper"),
KAboutLicense::GPL);
- aboutData.addAuthor(i18n("Daniel Nicoletti"), QString(), "dantti12@gmail.com", \
"http://dantti.wordpress.com" );
- aboutData.addAuthor(i18n("Trever Fischer"), QString(), "wm161@wm161.net", \
"http://wm161.net"); + aboutData.addAuthor(i18n("Daniel Nicoletti"), QString(), \
QLatin1String("dantti12@gmail.com"), QLatin1String("http://dantti.wordpress.com")); + \
aboutData.addAuthor(i18n("Trever Fischer"), QString(), \
QLatin1String("wm161@wm161.net"), QLatin1String("http://wm161.net"));
- aboutData.addCredit(i18n("Adrien Bustany"), i18n("libpackagekit-qt and other \
stuff"),"@"); + aboutData.addCredit(i18n("Adrien Bustany"), i18n("libpackagekit-qt \
and other stuff"), QLatin1String("@")); KAboutData::setApplicationData(aboutData);
// Let's ensure we only have one PkSession at any one time on the same session
diff --git a/apperd/ApperdThread.cpp b/apperd/ApperdThread.cpp
index d0d3540..0b4eba4 100644
--- a/apperd/ApperdThread.cpp
+++ b/apperd/ApperdThread.cpp
@@ -161,14 +161,14 @@ void ApperdThread::poll()
}
// If check for updates is active
- if (m_configs[CFG_INTERVAL].value<uint>() != Enum::Never) {
+ if (m_configs[QLatin1String(CFG_INTERVAL)].value<uint>() != Enum::Never) {
// Find out how many seconds passed since last refresh cache
qint64 msecsSinceLastRefresh = \
(QDateTime::currentDateTime().toMSecsSinceEpoch() - \
m_lastRefreshCache.toMSecsSinceEpoch()) / 1000;
// If lastRefreshCache is null it means that the cache was never refreshed
- if (m_lastRefreshCache.isNull() || msecsSinceLastRefresh > \
m_configs[CFG_INTERVAL].value<uint>()) {
- bool ignoreBattery = m_configs[CFG_CHECK_UP_BATTERY].value<bool>();
- bool ignoreMobile = m_configs[CFG_CHECK_UP_MOBILE].value<bool>();
+ if (m_lastRefreshCache.isNull() || msecsSinceLastRefresh > \
m_configs[QLatin1String(CFG_INTERVAL)].value<uint>()) { + bool \
ignoreBattery = m_configs[QLatin1String(CFG_CHECK_UP_BATTERY)].value<bool>(); + \
bool ignoreMobile = m_configs[QLatin1String(CFG_CHECK_UP_MOBILE)].value<bool>(); if \
(isSystemReady(ignoreBattery, ignoreMobile)) { m_refreshCache->refreshCache();
}
@@ -181,15 +181,15 @@ void ApperdThread::poll()
void ApperdThread::configFileChanged()
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
- m_configs[CFG_CHECK_UP_BATTERY] = \
checkUpdateGroup.readEntry(CFG_CHECK_UP_BATTERY, \
DEFAULT_CHECK_UP_BATTERY);
- m_configs[CFG_CHECK_UP_MOBILE] = checkUpdateGroup.readEntry(CFG_CHECK_UP_MOBILE, \
DEFAULT_CHECK_UP_MOBILE);
- m_configs[CFG_INSTALL_UP_BATTERY] = \
checkUpdateGroup.readEntry(CFG_INSTALL_UP_BATTERY, \
DEFAULT_INSTALL_UP_BATTERY);
- m_configs[CFG_INSTALL_UP_MOBILE] = \
checkUpdateGroup.readEntry(CFG_INSTALL_UP_MOBILE, \
DEFAULT_INSTALL_UP_MOBILE);
- m_configs[CFG_AUTO_UP] = checkUpdateGroup.readEntry(CFG_AUTO_UP, \
Enum::AutoUpdateDefault);
- m_configs[CFG_INTERVAL] = checkUpdateGroup.readEntry(CFG_INTERVAL, \
Enum::TimeIntervalDefault);
- m_configs[CFG_DISTRO_UPGRADE] = checkUpdateGroup.readEntry(CFG_DISTRO_UPGRADE, \
Enum::DistroUpgradeDefault); + m_configs[QLatin1String(CFG_CHECK_UP_BATTERY)] = \
checkUpdateGroup.readEntry(CFG_CHECK_UP_BATTERY, DEFAULT_CHECK_UP_BATTERY); + \
m_configs[QLatin1String(CFG_CHECK_UP_MOBILE)] = \
checkUpdateGroup.readEntry(CFG_CHECK_UP_MOBILE, DEFAULT_CHECK_UP_MOBILE); + \
m_configs[QLatin1String(CFG_INSTALL_UP_BATTERY)] = \
checkUpdateGroup.readEntry(CFG_INSTALL_UP_BATTERY, DEFAULT_INSTALL_UP_BATTERY); + \
m_configs[QLatin1String(CFG_INSTALL_UP_MOBILE)] = \
checkUpdateGroup.readEntry(CFG_INSTALL_UP_MOBILE, DEFAULT_INSTALL_UP_MOBILE); + \
m_configs[QLatin1String(CFG_AUTO_UP)] = checkUpdateGroup.readEntry(CFG_AUTO_UP, \
Enum::AutoUpdateDefault); + m_configs[QLatin1String(CFG_INTERVAL)] = \
checkUpdateGroup.readEntry(CFG_INTERVAL, Enum::TimeIntervalDefault); + \
m_configs[QLatin1String(CFG_DISTRO_UPGRADE)] = \
checkUpdateGroup.readEntry(CFG_DISTRO_UPGRADE, Enum::DistroUpgradeDefault); \
m_updater->setConfig(m_configs); m_distroUpgrade->setConfig(m_configs);
@@ -207,10 +207,10 @@ void ApperdThread::proxyChanged()
QHash<QString, QString> proxyConfig;
if (KProtocolManager::proxyType() == KProtocolManager::ManualProxy) {
- proxyConfig["http"] = KProtocolManager::proxyFor("http");
- proxyConfig["https"] = KProtocolManager::proxyFor("https");
- proxyConfig["ftp"] = KProtocolManager::proxyFor("ftp");
- proxyConfig["socks"] = KProtocolManager::proxyFor("socks");
+ proxyConfig[QLatin1String("http")] = \
KProtocolManager::proxyFor(QLatin1String("http")); + \
proxyConfig[QLatin1String("https")] = \
KProtocolManager::proxyFor(QLatin1String("https")); + \
proxyConfig[QLatin1String("ftp")] = KProtocolManager::proxyFor(QLatin1String("ftp")); \
+ proxyConfig[QLatin1String("socks")] = \
KProtocolManager::proxyFor(QLatin1String("socks")); }
// Check if the proxy settings really changed to avoid setting them twice
@@ -238,10 +238,10 @@ void ApperdThread::setProxy()
if (packagekitIsRunning) {
// Apply the proxy changes only if packagekit is running
// use value() to not insert items on the hash
- Daemon::global()->setProxy(m_proxyConfig.value("http"),
- m_proxyConfig.value("https"),
- m_proxyConfig.value("ftp"),
- m_proxyConfig.value("socks"),
+ Daemon::global()->setProxy(m_proxyConfig.value(QLatin1String("http")),
+ m_proxyConfig.value(QLatin1String("https")),
+ m_proxyConfig.value(QLatin1String("ftp")),
+ m_proxyConfig.value(QLatin1String("socks")),
QString(),
QString());
m_proxyChanged = false;
@@ -257,8 +257,8 @@ void ApperdThread::updatesChanged()
m_lastRefreshCache = lastCacheRefresh;
}
- bool ignoreBattery = m_configs[CFG_INSTALL_UP_BATTERY].value<bool>();
- bool ignoreMobile = m_configs[CFG_INSTALL_UP_MOBILE].value<bool>();
+ bool ignoreBattery = \
m_configs[QLatin1String(CFG_INSTALL_UP_BATTERY)].value<bool>(); + bool \
ignoreMobile = m_configs[QLatin1String(CFG_INSTALL_UP_MOBILE)].value<bool>();
// Make sure the user sees the updates
m_updater->checkForUpdates(isSystemReady(ignoreBattery, ignoreMobile));
@@ -267,8 +267,8 @@ void ApperdThread::updatesChanged()
void ApperdThread::appShouldConserveResourcesChanged()
{
- bool ignoreBattery = m_configs[CFG_INSTALL_UP_BATTERY].value<bool>();
- bool ignoreMobile = m_configs[CFG_INSTALL_UP_MOBILE].value<bool>();
+ bool ignoreBattery = \
m_configs[QLatin1String(CFG_INSTALL_UP_BATTERY)].value<bool>(); + bool \
ignoreMobile = m_configs[QLatin1String(CFG_INSTALL_UP_MOBILE)].value<bool>();
if (isSystemReady(ignoreBattery, ignoreMobile)) {
m_updater->setSystemReady();
diff --git a/apperd/DistroUpgrade.cpp b/apperd/DistroUpgrade.cpp
index da74be7..3752a83 100644
--- a/apperd/DistroUpgrade.cpp
+++ b/apperd/DistroUpgrade.cpp
@@ -51,7 +51,7 @@ void DistroUpgrade::setConfig(const QVariantHash &configs)
void DistroUpgrade::checkDistroUpgrades()
{
// Ignore check if the user disabled it
- if (m_configs[CFG_DISTRO_UPGRADE].toInt() == Enum::DistroNever) {
+ if (m_configs[QLatin1String(CFG_DISTRO_UPGRADE)].toInt() == Enum::DistroNever) {
return;
}
@@ -65,7 +65,7 @@ void DistroUpgrade::checkDistroUpgrades()
void DistroUpgrade::distroUpgrade(PackageKit::Transaction::DistroUpgrade type, const \
QString &name, const QString &description) {
// TODO make use of the type
- switch (m_configs[CFG_DISTRO_UPGRADE].toInt()) {
+ switch (m_configs[QLatin1String(CFG_DISTRO_UPGRADE)].toInt()) {
case Enum::DistroNever:
return;
case Enum::DistroStable:
@@ -83,8 +83,8 @@ void \
DistroUpgrade::distroUpgrade(PackageKit::Transaction::DistroUpgrade type, c return;
}
- auto notify = new KNotification("DistroUpgradeAvailable", 0, \
KNotification::Persistent);
- notify->setComponentName("apperd");
+ auto notify = new KNotification(QLatin1String("DistroUpgradeAvailable"), 0, \
KNotification::Persistent); + notify->setComponentName(QLatin1String("apperd"));
notify->setTitle(i18n("Distribution upgrade available"));
notify->setText(description);
@@ -134,13 +134,13 @@ void DistroUpgrade::handleDistroUpgradeAction(uint action)
void DistroUpgrade::distroUpgradeFinished(int exitCode, QProcess::ExitStatus \
exitStatus) {
- auto notify = new KNotification("DistroUpgradeFinished");
- notify->setComponentName("apperd");
+ auto notify = new KNotification(QLatin1String("DistroUpgradeFinished"));
+ notify->setComponentName(QLatin1String("apperd"));
if (exitStatus == QProcess::NormalExit && exitCode == 0) {
- notify->setPixmap(QIcon::fromTheme("security-high").pixmap(64, 64));
+ notify->setPixmap(QIcon::fromTheme(QLatin1String("security-high")).pixmap(64, \
64)); notify->setText(i18n("Distribution upgrade finished. "));
} else if (exitStatus == QProcess::NormalExit) {
- notify->setPixmap(QIcon::fromTheme("dialog-warning").pixmap(64, 64));
+ notify->setPixmap(QIcon::fromTheme(QLatin1String("dialog-warning")).pixmap(64, \
64));
notify->setText(i18n("Distribution upgrade process exited with code %1.", \
exitCode)); }/* else {
notify->setText(i18n("Distribution upgrade didn't exit normally, the process \
probably crashed. ")); @@ -155,8 +155,8 @@ void \
DistroUpgrade::distroUpgradeError(QProcess::ProcessError error) {
QString text;
- auto notify = new KNotification("DistroUpgradeError");
- notify->setComponentName("apperd");
+ auto notify = new KNotification(QLatin1String("DistroUpgradeError"));
+ notify->setComponentName(QLatin1String("apperd"));
switch(error) {
case QProcess::FailedToStart:
text = i18n("The distribution upgrade process failed to start.");
@@ -168,7 +168,7 @@ void DistroUpgrade::distroUpgradeError(QProcess::ProcessError \
error)
text = i18n("The distribution upgrade process failed with an unknown \
error."); break;
}
- notify->setPixmap(QIcon::fromTheme("dialog-error").pixmap(64,64));
+ notify->setPixmap(QIcon::fromTheme(QLatin1String("dialog-error")).pixmap(64,64));
notify->setText(text);
notify->sendEvent();
}
diff --git a/apperd/RefreshCacheTask.cpp b/apperd/RefreshCacheTask.cpp
index d0578b0..ba30ba1 100644
--- a/apperd/RefreshCacheTask.cpp
+++ b/apperd/RefreshCacheTask.cpp
@@ -67,10 +67,10 @@ void RefreshCacheTask::errorCode(Transaction::Error error, const \
QString &errorM return;
}
- m_notification = new KNotification("TransactionFailed", \
KNotification::Persistent, this);
- m_notification->setComponentName("apperd");
+ m_notification = new KNotification(QLatin1String("TransactionFailed"), \
KNotification::Persistent, this); + \
m_notification->setComponentName(QLatin1String("apperd"));
connect(m_notification, &KNotification::closed, this, \
&RefreshCacheTask::notificationClosed);
- QIcon icon = QIcon::fromTheme("dialog-cancel");
+ QIcon icon = QIcon::fromTheme(QLatin1String("dialog-cancel"));
// use of QSize does the right thing
m_notification->setPixmap(icon.pixmap(QSize(KPK_ICON_SIZE, KPK_ICON_SIZE)));
m_notification->setTitle(PkStrings::error(error));
diff --git a/apperd/TransactionWatcher.cpp b/apperd/TransactionWatcher.cpp
index 3167075..b1823ac 100644
--- a/apperd/TransactionWatcher.cpp
+++ b/apperd/TransactionWatcher.cpp
@@ -135,12 +135,12 @@ void TransactionWatcher::transactionReady()
void TransactionWatcher::showRebootNotificationApt() {
// Create the notification about this transaction
- auto notify = new KNotification("RestartRequired", 0, \
KNotification::Persistent); + auto notify = new \
KNotification(QLatin1String("RestartRequired"), 0, \
KNotification::Persistent);
connect(notify, QOverload<uint>::of(&KNotification::activated), this, \
&TransactionWatcher::logout);
- notify->setComponentName("apperd");
+ notify->setComponentName(QLatin1String("apperd"));
- QString text("<b>" + i18n("The system update has completed") + "</b>");
- text.append("<br/>" + PkStrings::restartType(Transaction::RestartSystem));
+ QString text(QLatin1String("<b>") + i18n("The system update has completed") + \
QLatin1String("</b>")); + text.append(QLatin1String("<br>") + \
PkStrings::restartType(Transaction::RestartSystem));
notify->setPixmap(PkIcons::restartIcon(Transaction::RestartSystem).pixmap(KPK_ICON_SIZE, \
KPK_ICON_SIZE)); notify->setText(text);
@@ -166,9 +166,9 @@ void TransactionWatcher::finished(PackageKit::Transaction::Exit \
exit)
QStringList restartPackages = \
transaction->property("restartPackages").toStringList();
// Create the notification about this transaction
- auto notify = new KNotification("RestartRequired", 0, \
KNotification::Persistent); + auto notify = new \
KNotification(QLatin1String("RestartRequired"), 0, \
KNotification::Persistent);
connect(notify, QOverload<uint>::of(&KNotification::activated), this, \
&TransactionWatcher::logout);
- notify->setComponentName("apperd");
+ notify->setComponentName(QLatin1String("apperd"));
notify->setProperty("restartType", qVariantFromValue(type));
notify->setPixmap(PkIcons::restartIcon(type).pixmap(KPK_ICON_SIZE, \
KPK_ICON_SIZE)); notify->setTitle(PkStrings::restartType(type));
@@ -219,8 +219,8 @@ void TransactionWatcher::transactionChanged(Transaction \
*transaction, bool inter
void TransactionWatcher::errorCode(PackageKit::Transaction::Error err, const QString \
&details) {
- auto notify = new KNotification("TransactionError", 0, \
KNotification::Persistent);
- notify->setComponentName("apperd");
+ auto notify = new KNotification(QLatin1String("TransactionError"), 0, \
KNotification::Persistent); + notify->setComponentName(QLatin1String("apperd"));
notify->setTitle(PkStrings::error(err));
notify->setText(PkStrings::errorMessage(err));
notify->setProperty("ErrorType", QVariant::fromValue(err));
@@ -229,7 +229,7 @@ void TransactionWatcher::errorCode(PackageKit::Transaction::Error \
err, const QSt QStringList actions;
actions << i18n("Details");
notify->setActions(actions);
- notify->setPixmap(QIcon::fromTheme("dialog-error").pixmap(KPK_ICON_SIZE, \
KPK_ICON_SIZE)); + \
notify->setPixmap(QIcon::fromTheme(QLatin1String("dialog-error")).pixmap(KPK_ICON_SIZE, \
KPK_ICON_SIZE));
connect(notify, QOverload<uint>::of(&KNotification::activated), this, \
&TransactionWatcher::errorActivated); notify->sendEvent();
}
@@ -244,7 +244,7 @@ void TransactionWatcher::errorActivated(uint action)
QString details = notify->property("Details").toString();
KMessageBox::detailedSorry(0,
PkStrings::errorMessage(error),
- details.replace('\n', "<br />"),
+ details.replace(QLatin1Char('\n'), \
QLatin1String("<br>")), PkStrings::error(error),
KMessageBox::Notify);
}
diff --git a/apperd/Updater.cpp b/apperd/Updater.cpp
index ee6ada7..ee5195a 100644
--- a/apperd/Updater.cpp
+++ b/apperd/Updater.cpp
@@ -146,13 +146,13 @@ void Updater::getUpdateFinished()
return;
}
- uint updateType = m_configs[CFG_AUTO_UP].value<uint>();
+ uint updateType = m_configs[QLatin1String(CFG_AUTO_UP)].value<uint>();
if (m_systemReady && updateType == Enum::All) {
// update all
bool ret;
ret = updatePackages(m_updateList,
false,
- "plasmagik",
+ QLatin1String("plasmagik"),
i18n("Updates are being automatically \
installed.")); if (ret) {
return;
@@ -162,7 +162,7 @@ void Updater::getUpdateFinished()
bool ret;
ret = updatePackages(m_securityList,
false,
- UPDATES_ICON,
+ QLatin1String(UPDATES_ICON),
i18n("Security updates are being automatically \
installed.")); if (ret) {
return;
@@ -172,7 +172,7 @@ void Updater::getUpdateFinished()
bool ret;
ret = updatePackages(m_updateList,
true,
- "download",
+ QLatin1String("download"),
i18n("Updates are being automatically \
downloaded.")); if (ret) {
return;
@@ -197,21 +197,21 @@ void Updater::getUpdateFinished()
void Updater::autoUpdatesFinished(PkTransaction::ExitStatus status)
{
- auto notify = new KNotification("UpdatesComplete");
- notify->setComponentName("apperd");
+ auto notify = new KNotification(QLatin1String("UpdatesComplete"));
+ notify->setComponentName(QLatin1String("apperd"));
if (status == PkTransaction::Success) {
if (sender()->property("DownloadOnly").toBool()) {
// We finished downloading show the updates to the user
showUpdatesPopup();
} else {
- QIcon icon = QIcon::fromTheme("task-complete");
+ QIcon icon = QIcon::fromTheme(QLatin1String("task-complete"));
// use of QSize does the right thing
notify->setPixmap(icon.pixmap(KPK_ICON_SIZE, KPK_ICON_SIZE));
notify->setText(i18n("System update was successful."));
notify->sendEvent();
}
} else {
- QIcon icon = QIcon::fromTheme("dialog-cancel");
+ QIcon icon = QIcon::fromTheme(QLatin1String("dialog-cancel"));
// use of QSize does the right thing
notify->setPixmap(icon.pixmap(KPK_ICON_SIZE, KPK_ICON_SIZE));
notify->setText(i18n("The software update failed."));
@@ -238,7 +238,7 @@ void Updater::reviewUpdates()
}
// This must be called from the main thread...
- KToolInvocation::startServiceByDesktopName("apper_updates");
+ KToolInvocation::startServiceByDesktopName(QLatin1String("apper_updates"));
}
void Updater::installUpdates()
@@ -264,8 +264,8 @@ void Updater::showUpdatesPopup()
{
m_oldUpdateList = m_updateList;
- auto notify = new KNotification("ShowUpdates", 0, KNotification::Persistent);
- notify->setComponentName("apperd");
+ auto notify = new KNotification(QLatin1String("ShowUpdates"), 0, \
KNotification::Persistent); + notify->setComponentName(QLatin1String("apperd"));
connect(notify, &KNotification::action1Activated, this, \
&Updater::reviewUpdates);
connect(notify, &KNotification::action2Activated, this, \
&Updater::installUpdates);
notify->setTitle(i18np("There is one new update", "There are %1 new updates", \
m_updateList.size())); @@ -291,7 +291,7 @@ void Updater::showUpdatesPopup()
notify->setActions(actions);
// use of QSize does the right thing
- notify->setPixmap(QIcon::fromTheme("system-software-update").pixmap(KPK_ICON_SIZE, \
KPK_ICON_SIZE)); + \
notify->setPixmap(QIcon::fromTheme(QLatin1String("system-software-update")).pixmap(KPK_ICON_SIZE, \
KPK_ICON_SIZE)); notify->sendEvent();
}
@@ -308,11 +308,11 @@ bool Updater::updatePackages(const QStringList &packages, bool \
downloadOnly, con if (!icon.isNull()) {
KNotification *notify;
if (downloadOnly) {
- notify = new KNotification("DownloadingUpdates");
+ notify = new KNotification(QLatin1String("DownloadingUpdates"));
} else {
- notify = new KNotification("AutoInstallingUpdates");
+ notify = new KNotification(QLatin1String("AutoInstallingUpdates"));
}
- notify->setComponentName("apperd");
+ notify->setComponentName(QLatin1String("apperd"));
notify->setText(msg);
// use of QSize does the right thing
notify->setPixmap(QIcon::fromTheme(icon).pixmap(QSize(KPK_ICON_SIZE, \
KPK_ICON_SIZE)));
diff --git a/declarative-plugins/DBusUpdaterInterface.cpp \
b/declarative-plugins/DBusUpdaterInterface.cpp index 6fe6607..8da13fb 100644
--- a/declarative-plugins/DBusUpdaterInterface.cpp
+++ b/declarative-plugins/DBusUpdaterInterface.cpp
@@ -68,7 +68,7 @@ void DBusUpdaterInterface::registerService()
m_registered = false;
emit registeredChanged();
} else {
- if (!QDBusConnection::sessionBus().registerObject("/", this)) {
+ if (!QDBusConnection::sessionBus().registerObject(QLatin1String("/"), this)) \
{ // kDebug() << "unable to register service interface to dbus";
return;
}
diff --git a/declarative-plugins/qmlplugins.cpp b/declarative-plugins/qmlplugins.cpp
index ba606e9..4efd70a 100644
--- a/declarative-plugins/qmlplugins.cpp
+++ b/declarative-plugins/qmlplugins.cpp
@@ -38,7 +38,7 @@
void QmlPlugins::registerTypes(const char* uri)
{
- Q_ASSERT(uri == QLatin1String("org.kde.apper"));
+// Q_ASSERT(uri == QString(QLatin1String("org.kde.apper")));
qmlRegisterType<DaemonHelper>(uri, 0, 1, "DaemonHelper");
qmlRegisterType<DBusUpdaterInterface>(uri, 0, 1, "DBusUpdaterInterface");
@@ -47,7 +47,7 @@ void QmlPlugins::registerTypes(const char* uri)
qmlRegisterType<PkTransactionProgressModel>(uri, 0, 1, \
"PkTransactionProgressModel");
qmlRegisterType<ApplicationSortFilterModel>(uri, 0, 1, \
"ApplicationSortFilterModel"); qmlRegisterType<PackageKit::Transaction>(uri, 0, 1, \
"Transaction");
- qmlRegisterUncreatableType<PackageKit::Daemon>(uri, 0, 1, "Daemon", "Global");
+ qmlRegisterUncreatableType<PackageKit::Daemon>(uri, 0, 1, "Daemon", \
QLatin1String("Global"));
qRegisterMetaType<PkTransaction::ExitStatus>("PkTransaction::ExitStatus");
qRegisterMetaType<PackageKit::Daemon::Network>("PackageKit::Daemon::Network");
qRegisterMetaType<PackageKit::Daemon::Authorize>("PackageKit::Daemon::Authorize");
@@ -73,12 +73,12 @@ void QmlPlugins::registerTypes(const char* uri)
void QmlPlugins::initializeEngine(QQmlEngine *engine, const char *uri)
{
Q_UNUSED(uri)
- Q_ASSERT(uri == QLatin1String("org.kde.apper"));
+// Q_ASSERT(uri == QLatin1String("org.kde.apper"));
KLocalizedString::setApplicationDomain("apper");
- engine->rootContext()->setContextProperty("Daemon", Daemon::global());
- engine->rootContext()->setContextProperty("PkStrings", new PkStrings);
- engine->rootContext()->setContextProperty("PkIcons", new PkIcons);
- engine->rootContext()->setContextProperty("DaemonHelper", new DaemonHelper);
+ engine->rootContext()->setContextProperty(QLatin1String("Daemon"), \
Daemon::global()); + \
engine->rootContext()->setContextProperty(QLatin1String("PkStrings"), new PkStrings); \
+ engine->rootContext()->setContextProperty(QLatin1String("PkIcons"), new \
PkIcons); + engine->rootContext()->setContextProperty(QLatin1String("DaemonHelper"), \
new DaemonHelper); }
diff --git a/libapper/ApplicationLauncher.cpp b/libapper/ApplicationLauncher.cpp
index 4748386..01683d7 100644
--- a/libapper/ApplicationLauncher.cpp
+++ b/libapper/ApplicationLauncher.cpp
@@ -38,10 +38,10 @@ ApplicationLauncher::ApplicationLauncher(QWidget *parent) :
{
ui->setupUi(this);
connect(ui->showCB, &QCheckBox::toggled, this, \
&ApplicationLauncher::on_showCB_toggled);
- setObjectName("ApplicationLauncher");
+ setObjectName(QLatin1String("ApplicationLauncher"));
connect(ui->kdialogbuttonbox, &QDialogButtonBox::rejected, this, \
&ApplicationLauncher::accept);
- setWindowIcon(QIcon::fromTheme("task-complete"));
+ setWindowIcon(QIcon::fromTheme(QLatin1String("task-complete")));
connect(ui->applicationsView, &QListView::clicked, this, \
&ApplicationLauncher::itemClicked); }
@@ -85,7 +85,7 @@ bool ApplicationLauncher::hasApplications()
!service.exec().isEmpty())
{
QString name = service.genericName().isEmpty() ? service.name()
- : service.name() + " - " \
+ service.genericName(); + \
: service.name() + QLatin1String(" - ") + service.genericName(); item = new \
QStandardItem(name); item->setIcon(QIcon::fromTheme(service.icon()));
item->setData(service.entryPath(), Qt::UserRole);
@@ -116,7 +116,7 @@ void \
ApplicationLauncher::addPackage(PackageKit::Transaction::Info info, const Q void \
ApplicationLauncher::files(const QString &packageID, const QStringList &files) {
Q_UNUSED(packageID)
- m_files.append(files.filter(".desktop"));
+ m_files.append(files.filter(QLatin1String(".desktop")));
}
void ApplicationLauncher::itemClicked(const QModelIndex &index)
@@ -127,7 +127,7 @@ void ApplicationLauncher::itemClicked(const QModelIndex &index)
void ApplicationLauncher::on_showCB_toggled(bool checked)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup transactionGroup(&config, "Transaction");
transactionGroup.writeEntry("ShowApplicationLauncher", !checked);
config.sync();
diff --git a/libapper/ApplicationsDelegate.cpp b/libapper/ApplicationsDelegate.cpp
index 20b3722..14c19d1 100644
--- a/libapper/ApplicationsDelegate.cpp
+++ b/libapper/ApplicationsDelegate.cpp
@@ -40,14 +40,13 @@ ApplicationsDelegate::ApplicationsDelegate(QAbstractItemView \
*parent) : QStyledItemDelegate(parent),
m_viewport(parent->viewport()),
// loads it here to be faster when displaying items
- m_installIcon("go-down"),
+ m_installIcon(QIcon::fromTheme(QLatin1String("go-down"))),
m_installString(i18n("Install")),
- m_removeIcon("edit-delete"),
+ m_removeIcon(QIcon::fromTheme(QLatin1String("edit-delete"))),
m_removeString(i18n("Remove")),
- m_undoIcon("edit-undo"),
+ m_undoIcon(QIcon::fromTheme(QLatin1String("edit-undo"))),
m_undoString(i18n("Deselect")),
- m_checkedIcon("dialog-ok"),
- m_checkable(false)
+ m_checkedIcon(QIcon::fromTheme(QLatin1String("dialog-ok")))
{
m_viewport->setAttribute(Qt::WA_Hover, true);
QPushButton button, button2;
diff --git a/libapper/ApplicationsDelegate.h b/libapper/ApplicationsDelegate.h
index 1eb0a47..7448898 100644
--- a/libapper/ApplicationsDelegate.h
+++ b/libapper/ApplicationsDelegate.h
@@ -57,7 +57,7 @@ private:
QIcon m_checkedIcon;
QSize m_buttonSize;
QSize m_buttonIconSize;
- bool m_checkable;
+ bool m_checkable = false;
};
#endif
diff --git a/libapper/ChangesDelegate.cpp b/libapper/ChangesDelegate.cpp
index 9ab6495..05e146b 100644
--- a/libapper/ChangesDelegate.cpp
+++ b/libapper/ChangesDelegate.cpp
@@ -49,25 +49,25 @@ ChangesDelegate::ChangesDelegate(QAbstractItemView *parent) :
KExtendableItemDelegate(parent),
m_viewport(parent->viewport()),
// loads it here to be faster when displaying items
- m_packageIcon("package"),
- m_collectionIcon("package-orign"),
- m_installIcon("dialog-cancel"),
+ m_packageIcon(QIcon::fromTheme(QLatin1String("package"))),
+ m_collectionIcon(QIcon::fromTheme(QLatin1String("package-orign"))),
+ m_installIcon(QIcon::fromTheme(QLatin1String("dialog-cancel"))),
m_installString(i18n("Do not Install")),
- m_removeIcon("dialog-cancel"),
+ m_removeIcon(QIcon::fromTheme(QLatin1String("dialog-cancel"))),
m_removeString(i18n("Do not Remove")),
- m_undoIcon("edit-undo"),
+ m_undoIcon(QIcon::fromTheme(QLatin1String("edit-undo"))),
m_undoString(i18n("Deselect")),
- m_checkedIcon("dialog-ok-apply")
+ m_checkedIcon(QIcon::fromTheme(QLatin1String("dialog-ok-apply")))
{
// maybe rename or copy it to package-available
if (QApplication::isRightToLeft()) {
- setExtendPixmap(SmallIcon("arrow-left"));
+ setExtendPixmap(SmallIcon(QLatin1String("arrow-left")));
} else {
- setExtendPixmap(SmallIcon("arrow-right"));
+ setExtendPixmap(SmallIcon(QLatin1String("arrow-right")));
}
- setContractPixmap(SmallIcon("arrow-down"));
+ setContractPixmap(SmallIcon(QLatin1String("arrow-down")));
// store the size of the extend pixmap to know how much we should move
- m_extendPixmapWidth = SmallIcon("arrow-right").size().width();
+ m_extendPixmapWidth = SmallIcon(QLatin1String("arrow-right")).size().width();
QPushButton button, button2;
button.setText(m_installString);
diff --git a/libapper/InfoWidget.cpp b/libapper/InfoWidget.cpp
index 25b027d..3f9dbcb 100644
--- a/libapper/InfoWidget.cpp
+++ b/libapper/InfoWidget.cpp
@@ -30,7 +30,7 @@ InfoWidget::InfoWidget(QWidget *parent) :
ui(new Ui::InfoWidget)
{
ui->setupUi(this);
- ui->iconL->setPixmap(QIcon::fromTheme("dialog-warning").pixmap(128, 128));
+ ui->iconL->setPixmap(QIcon::fromTheme(QLatin1String("dialog-warning")).pixmap(128, \
128)); }
InfoWidget::~InfoWidget()
@@ -54,7 +54,7 @@ void InfoWidget::setDetails(const QString &details)
auto browser = new QTextBrowser(this);
browser->setFrameShape(QFrame::NoFrame);
browser->setFrameShadow(QFrame::Plain);
- browser->setStyleSheet("QTextEdit {\nbackground-color: transparent;\n};");
+ browser->setStyleSheet(QLatin1String("QTextEdit {\nbackground-color: \
transparent;\n};")); browser->setText(details);
ui->descriptionLayout->addWidget(browser);
ui->descriptionLayout->insertSpacing(0, 20);
@@ -71,10 +71,10 @@ void InfoWidget::addWidget(QWidget *widget)
void InfoWidget::reset()
{
- ui->iconL->setPixmap(QIcon::fromTheme("dialog-information").pixmap(128, 128));
- setWindowTitle("");
- setDescription("");
- setDetails("");
+ ui->iconL->setPixmap(QIcon::fromTheme(QLatin1String("dialog-information")).pixmap(128, \
128)); + setWindowTitle(QLatin1String(""));
+ setDescription(QLatin1String(""));
+ setDetails(QLatin1String(""));
}
#include "moc_InfoWidget.cpp"
diff --git a/libapper/PackageModel.cpp b/libapper/PackageModel.cpp
index 2047f67..9f63ff5 100644
--- a/libapper/PackageModel.cpp
+++ b/libapper/PackageModel.cpp
@@ -52,7 +52,7 @@ PackageModel::PackageModel(QObject *parent)
m_fetchSizesTransaction(0),
m_fetchInstalledVersionsTransaction(0)
{
- m_installedEmblem = PkIcons::getIcon("dialog-ok-apply", QString()).pixmap(16, \
16); + m_installedEmblem = PkIcons::getIcon(QLatin1String("dialog-ok-apply"), \
QString()).pixmap(16, 16);
m_roles[SortRole] = "rSort";
m_roles[NameRole] = "rName";
@@ -274,7 +274,7 @@ QVariant PackageModel::data(const QModelIndex &index, int role) \
const icon.fill(Qt::transparent);
if (!package.icon.isNull()) {
QPixmap pixmap;
- if (package.icon.startsWith("/")) {
+ if (package.icon.startsWith(QLatin1String("/"))) {
pixmap = QPixmap();
pixmap.load(package.icon);
pixmap = pixmap.scaledToHeight(ICON_SIZE);
diff --git a/libapper/PkIcons.cpp b/libapper/PkIcons.cpp
index 70e6745..0db4a5c 100644
--- a/libapper/PkIcons.cpp
+++ b/libapper/PkIcons.cpp
@@ -40,7 +40,9 @@ QHash<QString, QIcon> PkIcons::cache = QHash<QString, QIcon>();
void PkIcons::configure()
{
QIcon::setThemeSearchPaths(QIcon::themeSearchPaths() +
- QStringList{"xdgdata-pixmap", \
"/usr/share/app-info/icons/", "/usr/share/app-install/icons/"}); + \
QStringList{QLatin1String("xdgdata-pixmap"), + \
QLatin1String("/usr/share/app-info/icons/"), + \
QLatin1String("/usr/share/app-install/icons/")}); // KStandardDirs:: \
KGlobal::dirs()->addResourceDir("xdgdata-pixmap", "/usr/share/app-info/icons/", \
"/usr/share/app-install/icons/"); // KIconLoader::global()->reconfigure("apper");
PkIcons::init = true;
@@ -82,46 +84,46 @@ QString PkIcons::statusIconName(Transaction::Status status)
PkIcons::configure();
}
switch (status) {
- case Transaction::StatusUnknown : return "help-browser";
+ case Transaction::StatusUnknown : return \
QLatin1String("help-browser"); case Transaction::StatusCancel :
- case Transaction::StatusCleanup : return "package-clean-up";
- case Transaction::StatusCommit : return "package-working";//TODO \
needs a better icon
- case Transaction::StatusDepResolve : return "package-info";
+ case Transaction::StatusCleanup : return \
QLatin1String("package-clean-up"); + case Transaction::StatusCommit \
: return QLatin1String("package-working");//TODO needs a better icon + case \
Transaction::StatusDepResolve : return QLatin1String("package-info"); case \
Transaction::StatusDownloadChangelog : case Transaction::StatusDownloadFilelist \
: case Transaction::StatusDownloadGroup :
- case Transaction::StatusDownloadPackagelist : return "refresh-cache";
- case Transaction::StatusDownload : return "package-download";
+ case Transaction::StatusDownloadPackagelist : return \
QLatin1String("refresh-cache"); + case Transaction::StatusDownload : \
return QLatin1String("package-download"); case Transaction::StatusDownloadRepository \
:
- case Transaction::StatusDownloadUpdateinfo : return "refresh-cache";
- case Transaction::StatusFinished : return "package-clean-up";
- case Transaction::StatusGeneratePackageList : return "refresh-cache";
- case Transaction::StatusWaitingForLock : return "dialog-password";
- case Transaction::StatusWaitingForAuth : return \
"dialog-password";//IMPROVE ME
- case Transaction::StatusInfo : return "package-info";
- case Transaction::StatusInstall : return "kpk-package-add";
- case Transaction::StatusLoadingCache : return "refresh-cache";
- case Transaction::StatusObsolete : return "package-clean-up";
- case Transaction::StatusQuery : return "search-package";
- case Transaction::StatusRefreshCache : return "refresh-cache";
- case Transaction::StatusRemove : return "package-removed";
- case Transaction::StatusRepackaging : return "package-clean-up";
- case Transaction::StatusRequest : return "search-package";
- case Transaction::StatusRunning : return "package-working";
- case Transaction::StatusScanApplications : return "search-package";
- case Transaction::StatusSetup : return "package-working";
+ case Transaction::StatusDownloadUpdateinfo : return \
QLatin1String("refresh-cache"); + case Transaction::StatusFinished : \
return QLatin1String("package-clean-up"); + case \
Transaction::StatusGeneratePackageList : return QLatin1String("refresh-cache"); + \
case Transaction::StatusWaitingForLock : return \
QLatin1String("dialog-password"); + case Transaction::StatusWaitingForAuth : \
return QLatin1String("dialog-password");//IMPROVE ME + case \
Transaction::StatusInfo : return QLatin1String("package-info"); + \
case Transaction::StatusInstall : return \
QLatin1String("kpk-package-add"); + case Transaction::StatusLoadingCache : \
return QLatin1String("refresh-cache"); + case Transaction::StatusObsolete \
: return QLatin1String("package-clean-up"); + case Transaction::StatusQuery \
: return QLatin1String("search-package"); + case Transaction::StatusRefreshCache \
: return QLatin1String("refresh-cache"); + case Transaction::StatusRemove \
: return QLatin1String("package-removed"); + case Transaction::StatusRepackaging \
: return QLatin1String("package-clean-up"); + case Transaction::StatusRequest \
: return QLatin1String("search-package"); + case Transaction::StatusRunning \
: return QLatin1String("package-working"); + case \
Transaction::StatusScanApplications : return QLatin1String("search-package"); + \
case Transaction::StatusSetup : return \
QLatin1String("package-working"); case Transaction::StatusSigCheck :
- case Transaction::StatusTestCommit : return "package-info";//TODO \
needs a better icon
- case Transaction::StatusUpdate : return "package-update";
- case Transaction::StatusWait : return "package-wait";
- case Transaction::StatusScanProcessList : return "package-info";
- case Transaction::StatusCheckExecutableFiles : return "package-info";
- case Transaction::StatusCheckLibraries : return "package-info";
- case Transaction::StatusCopyFiles : return "package-info";
- case Transaction::StatusRunHook : return "package-info";
+ case Transaction::StatusTestCommit : return \
QLatin1String("package-info");//TODO needs a better icon + case \
Transaction::StatusUpdate : return QLatin1String("package-update"); + \
case Transaction::StatusWait : return QLatin1String("package-wait"); \
+ case Transaction::StatusScanProcessList : return \
QLatin1String("package-info"); + case Transaction::StatusCheckExecutableFiles : \
return QLatin1String("package-info"); + case Transaction::StatusCheckLibraries \
: return QLatin1String("package-info"); + case Transaction::StatusCopyFiles \
: return QLatin1String("package-info"); + case Transaction::StatusRunHook \
: return QLatin1String("package-info"); }
qCDebug(APPER_LIB) << "status icon unrecognised: " << status;
- return "help-browser";
+ return QLatin1String("help-browser");
}
QIcon PkIcons::statusIcon(Transaction::Status status)
@@ -135,41 +137,41 @@ QString PkIcons::statusAnimation(Transaction::Status status)
PkIcons::configure();
}
switch (status) {
- case Transaction::StatusUnknown : return "help-browser";
+ case Transaction::StatusUnknown : return \
QLatin1String("help-browser"); case Transaction::StatusCancel :
- case Transaction::StatusCleanup : return "pk-cleaning-up";
+ case Transaction::StatusCleanup : return \
QLatin1String("pk-cleaning-up"); case Transaction::StatusCommit :
- case Transaction::StatusDepResolve : return "pk-testing";
+ case Transaction::StatusDepResolve : return \
QLatin1String("pk-testing"); case Transaction::StatusDownloadChangelog :
case Transaction::StatusDownloadFilelist :
case Transaction::StatusDownloadGroup :
- case Transaction::StatusDownloadPackagelist : return "pk-refresh-cache";
- case Transaction::StatusDownload : return "pk-downloading";
+ case Transaction::StatusDownloadPackagelist : return \
QLatin1String("pk-refresh-cache"); + case Transaction::StatusDownload : \
return QLatin1String("pk-downloading"); case Transaction::StatusDownloadRepository \
:
- case Transaction::StatusDownloadUpdateinfo : return "pk-refresh-cache";
- case Transaction::StatusFinished : return "pk-cleaning-up";
- case Transaction::StatusGeneratePackageList : return "pk-searching";
- case Transaction::StatusWaitingForLock : return "pk-waiting";
- case Transaction::StatusInfo : return "package-working";
- case Transaction::StatusInstall : return "pk-installing";
- case Transaction::StatusLoadingCache : return "pk-refresh-cache";
- case Transaction::StatusObsolete : return "pk-cleaning-up";
- case Transaction::StatusQuery : return "pk-searching";
- case Transaction::StatusRefreshCache : return "pk-refresh-cache";
- case Transaction::StatusRemove : return "package-removed";//TODO do \
the animation
- case Transaction::StatusRepackaging : return "pk-searching";
- case Transaction::StatusRequest : return "process-working";
- case Transaction::StatusRunning : return "pk-testing";
- case Transaction::StatusScanApplications : return "pk-searching";
- case Transaction::StatusSetup : return "pk-searching";
- case Transaction::StatusSigCheck : return "package-info";
- case Transaction::StatusTestCommit : return "pk-testing";
- case Transaction::StatusUpdate : return "pk-installing";
- case Transaction::StatusWait : return "pk-waiting";
- case Transaction::StatusWaitingForAuth : return "dialog-password";
- case Transaction::StatusScanProcessList : return "utilities-system-monitor";
+ case Transaction::StatusDownloadUpdateinfo : return \
QLatin1String("pk-refresh-cache"); + case Transaction::StatusFinished : \
return QLatin1String("pk-cleaning-up"); + case \
Transaction::StatusGeneratePackageList : return QLatin1String("pk-searching"); + \
case Transaction::StatusWaitingForLock : return QLatin1String("pk-waiting"); + \
case Transaction::StatusInfo : return \
QLatin1String("package-working"); + case Transaction::StatusInstall : \
return QLatin1String("pk-installing"); + case Transaction::StatusLoadingCache \
: return QLatin1String("pk-refresh-cache"); + case Transaction::StatusObsolete \
: return QLatin1String("pk-cleaning-up"); + case Transaction::StatusQuery \
: return QLatin1String("pk-searching"); + case Transaction::StatusRefreshCache \
: return QLatin1String("pk-refresh-cache"); + case Transaction::StatusRemove \
: return QLatin1String("package-removed");//TODO do the animation + case \
Transaction::StatusRepackaging : return QLatin1String("pk-searching"); + \
case Transaction::StatusRequest : return \
QLatin1String("process-working"); + case Transaction::StatusRunning : \
return QLatin1String("pk-testing"); + case Transaction::StatusScanApplications \
: return QLatin1String("pk-searching"); + case Transaction::StatusSetup \
: return QLatin1String("pk-searching"); + case Transaction::StatusSigCheck \
: return QLatin1String("package-info"); + case Transaction::StatusTestCommit \
: return QLatin1String("pk-testing"); + case Transaction::StatusUpdate \
: return QLatin1String("pk-installing"); + case Transaction::StatusWait \
: return QLatin1String("pk-waiting"); + case Transaction::StatusWaitingForAuth \
: return QLatin1String("dialog-password"); + case \
Transaction::StatusScanProcessList : return \
QLatin1String("utilities-system-monitor");
default : qCDebug(APPER_LIB) << "status icon \
unrecognised: " << status;
- return "help-browser";
+ return QLatin1String("help-browser");
}
}
@@ -179,43 +181,43 @@ QString PkIcons::actionIconName(Transaction::Role role)
PkIcons::configure();
}
switch (role) {
- case Transaction::RoleUnknown : return "applications-other";
- case Transaction::RoleAcceptEula : return "package-info";
- case Transaction::RoleCancel : return "process-stop";
- case Transaction::RoleDownloadPackages : return "package-download";
- case Transaction::RoleGetCategories : return "package-info";
- case Transaction::RoleDependsOn : return "package-info";
- case Transaction::RoleGetDetails : return "package-info";
- case Transaction::RoleGetDetailsLocal : return "package-info";
- case Transaction::RoleGetDistroUpgrades : return "distro-upgrade";
- case Transaction::RoleGetFiles : return "search-package";
- case Transaction::RoleGetFilesLocal : return "search-package";
- case Transaction::RoleGetOldTransactions : return "package-info";
- case Transaction::RoleGetPackages : return "package-packages";
- case Transaction::RoleGetRepoList : return "package-orign";
- case Transaction::RoleRequiredBy : return "package-info";
- case Transaction::RoleGetUpdateDetail : return "package-info";
- case Transaction::RoleGetUpdates : return "package-info";
- case Transaction::RoleInstallFiles : return "package-installed";
- case Transaction::RoleInstallPackages : return "package-installed";
- case Transaction::RoleInstallSignature : return "package-installed";
- case Transaction::RoleRefreshCache : return "refresh-cache";
- case Transaction::RoleRemovePackages : return "package-removed";
- case Transaction::RoleRepoEnable : return "package-orign";
- case Transaction::RoleRepoSetData : return "package-orign";
- case Transaction::RoleRepoRemove : return "package-orign";
- case Transaction::RoleResolve : return "search-package";
- case Transaction::RoleSearchDetails : return "search-package";
- case Transaction::RoleSearchFile : return "search-package";
- case Transaction::RoleSearchGroup : return "search-package";
- case Transaction::RoleSearchName : return "search-package";
- case Transaction::RoleUpdatePackages : return "package-update";
- case Transaction::RoleWhatProvides : return "search-package";
- case Transaction::RoleRepairSystem : return "package-rollback";
- case Transaction::RoleUpgradeSystem : return "package-update";
+ case Transaction::RoleUnknown : return \
QLatin1String("applications-other"); + case Transaction::RoleAcceptEula \
: return QLatin1String("package-info"); + case Transaction::RoleCancel \
: return QLatin1String("process-stop"); + case Transaction::RoleDownloadPackages \
: return QLatin1String("package-download"); + case Transaction::RoleGetCategories \
: return QLatin1String("package-info"); + case Transaction::RoleDependsOn \
: return QLatin1String("package-info"); + case Transaction::RoleGetDetails \
: return QLatin1String("package-info"); + case Transaction::RoleGetDetailsLocal \
: return QLatin1String("package-info"); + case Transaction::RoleGetDistroUpgrades \
: return QLatin1String("distro-upgrade"); + case Transaction::RoleGetFiles \
: return QLatin1String("search-package"); + case Transaction::RoleGetFilesLocal \
: return QLatin1String("search-package"); + case \
Transaction::RoleGetOldTransactions : return QLatin1String("package-info"); + \
case Transaction::RoleGetPackages : return \
QLatin1String("package-packages"); + case Transaction::RoleGetRepoList \
: return QLatin1String("package-orign"); + case Transaction::RoleRequiredBy \
: return QLatin1String("package-info"); + case Transaction::RoleGetUpdateDetail \
: return QLatin1String("package-info"); + case Transaction::RoleGetUpdates \
: return QLatin1String("package-info"); + case Transaction::RoleInstallFiles \
: return QLatin1String("package-installed"); + case \
Transaction::RoleInstallPackages : return QLatin1String("package-installed"); \
+ case Transaction::RoleInstallSignature : return \
QLatin1String("package-installed"); + case Transaction::RoleRefreshCache \
: return QLatin1String("refresh-cache"); + case Transaction::RoleRemovePackages \
: return QLatin1String("package-removed"); + case Transaction::RoleRepoEnable \
: return QLatin1String("package-orign"); + case Transaction::RoleRepoSetData \
: return QLatin1String("package-orign"); + case Transaction::RoleRepoRemove \
: return QLatin1String("package-orign"); + case Transaction::RoleResolve \
: return QLatin1String("search-package"); + case Transaction::RoleSearchDetails \
: return QLatin1String("search-package"); + case Transaction::RoleSearchFile \
: return QLatin1String("search-package"); + case Transaction::RoleSearchGroup \
: return QLatin1String("search-package"); + case Transaction::RoleSearchName \
: return QLatin1String("search-package"); + case Transaction::RoleUpdatePackages \
: return QLatin1String("package-update"); + case Transaction::RoleWhatProvides \
: return QLatin1String("search-package"); + case Transaction::RoleRepairSystem \
: return QLatin1String("package-rollback"); + case Transaction::RoleUpgradeSystem \
: return QLatin1String("package-update"); }
qCDebug(APPER_LIB) << "action unrecognised: " << role;
- return "applications-other";
+ return QLatin1String("applications-other");
}
QIcon PkIcons::actionIcon(Transaction::Role role)
@@ -229,44 +231,44 @@ QIcon PkIcons::groupsIcon(Transaction::Group group)
PkIcons::configure();
}
switch (group) {
- case Transaction::GroupUnknown : return QIcon::fromTheme("unknown");
- case Transaction::GroupAccessibility : return \
QIcon::fromTheme("preferences-desktop-accessibility");
- case Transaction::GroupAccessories : return \
QIcon::fromTheme("applications-accessories");
- case Transaction::GroupAdminTools : return \
QIcon::fromTheme("dialog-password");
- case Transaction::GroupCommunication : return \
QIcon::fromTheme("network-workgroup");//FIXME
- case Transaction::GroupDesktopGnome : return \
QIcon::fromTheme("kpk-desktop-gnome");
- case Transaction::GroupDesktopKde : return QIcon::fromTheme("kde");
- case Transaction::GroupDesktopOther : return \
QIcon::fromTheme("user-desktop");
- case Transaction::GroupDesktopXfce : return \
QIcon::fromTheme("kpk-desktop-xfce");
- case Transaction::GroupDocumentation : return \
QIcon::fromTheme("accessories-dictionary");//FIXME
- case Transaction::GroupEducation : return \
QIcon::fromTheme("applications-education");
- case Transaction::GroupElectronics : return QIcon::fromTheme("media-flash");
- case Transaction::GroupFonts : return \
QIcon::fromTheme("preferences-desktop-font");
- case Transaction::GroupGames : return \
QIcon::fromTheme("applications-games");
- case Transaction::GroupGraphics : return \
QIcon::fromTheme("applications-graphics");
- case Transaction::GroupInternet : return \
QIcon::fromTheme("applications-internet");
- case Transaction::GroupLegacy : return \
QIcon::fromTheme("media-floppy");
- case Transaction::GroupLocalization : return \
QIcon::fromTheme("applications-education-language");
- case Transaction::GroupMaps : return QIcon::fromTheme("Maps");//FIXME
- case Transaction::GroupCollections : return \
QIcon::fromTheme("package-orign");
- case Transaction::GroupMultimedia : return \
QIcon::fromTheme("applications-multimedia");
- case Transaction::GroupNetwork : return \
QIcon::fromTheme("network-wired");
- case Transaction::GroupOffice : return \
QIcon::fromTheme("applications-office");
- case Transaction::GroupOther : return \
QIcon::fromTheme("applications-other");
- case Transaction::GroupPowerManagement : return QIcon::fromTheme("battery");
- case Transaction::GroupProgramming : return \
QIcon::fromTheme("applications-development");
- case Transaction::GroupPublishing : return \
QIcon::fromTheme("accessories-text-editor");
- case Transaction::GroupRepos : return \
QIcon::fromTheme("application-x-compressed-tar");
- case Transaction::GroupScience : return \
QIcon::fromTheme("applications-science");
- case Transaction::GroupSecurity : return \
QIcon::fromTheme("security-high");
- case Transaction::GroupServers : return \
QIcon::fromTheme("network-server");
- case Transaction::GroupSystem : return \
QIcon::fromTheme("applications-system");
- case Transaction::GroupVirtualization : return QIcon::fromTheme("cpu");
- case Transaction::GroupVendor : return \
QIcon::fromTheme("application-certificate");
- case Transaction::GroupNewest : return \
QIcon::fromTheme("dialog-information"); + case Transaction::GroupUnknown : \
return QIcon::fromTheme(QLatin1String("unknown")); + case \
Transaction::GroupAccessibility : return \
QIcon::fromTheme(QLatin1String("preferences-desktop-accessibility")); + case \
Transaction::GroupAccessories : return \
QIcon::fromTheme(QLatin1String("applications-accessories")); + case \
Transaction::GroupAdminTools : return \
QIcon::fromTheme(QLatin1String("dialog-password")); + case \
Transaction::GroupCommunication : return \
QIcon::fromTheme(QLatin1String("network-workgroup"));//FIXME + case \
Transaction::GroupDesktopGnome : return \
QIcon::fromTheme(QLatin1String("kpk-desktop-gnome")); + case \
Transaction::GroupDesktopKde : return QIcon::fromTheme(QLatin1String("kde")); + \
case Transaction::GroupDesktopOther : return \
QIcon::fromTheme(QLatin1String("user-desktop")); + case \
Transaction::GroupDesktopXfce : return \
QIcon::fromTheme(QLatin1String("kpk-desktop-xfce")); + case \
Transaction::GroupDocumentation : return \
QIcon::fromTheme(QLatin1String("accessories-dictionary"));//FIXME + case \
Transaction::GroupEducation : return \
QIcon::fromTheme(QLatin1String("applications-education")); + case \
Transaction::GroupElectronics : return \
QIcon::fromTheme(QLatin1String("media-flash")); + case Transaction::GroupFonts \
: return QIcon::fromTheme(QLatin1String("preferences-desktop-font")); + case \
Transaction::GroupGames : return \
QIcon::fromTheme(QLatin1String("applications-games")); + case \
Transaction::GroupGraphics : return \
QIcon::fromTheme(QLatin1String("applications-graphics")); + case \
Transaction::GroupInternet : return \
QIcon::fromTheme(QLatin1String("applications-internet")); + case \
Transaction::GroupLegacy : return \
QIcon::fromTheme(QLatin1String("media-floppy")); + case \
Transaction::GroupLocalization : return \
QIcon::fromTheme(QLatin1String("applications-education-language")); + case \
Transaction::GroupMaps : return \
QIcon::fromTheme(QLatin1String("Maps"));//FIXME + case \
Transaction::GroupCollections : return \
QIcon::fromTheme(QLatin1String("package-orign")); + case \
Transaction::GroupMultimedia : return \
QIcon::fromTheme(QLatin1String("applications-multimedia")); + case \
Transaction::GroupNetwork : return \
QIcon::fromTheme(QLatin1String("network-wired")); + case Transaction::GroupOffice \
: return QIcon::fromTheme(QLatin1String("applications-office")); + case \
Transaction::GroupOther : return \
QIcon::fromTheme(QLatin1String("applications-other")); + case \
Transaction::GroupPowerManagement : return \
QIcon::fromTheme(QLatin1String("battery")); + case Transaction::GroupProgramming \
: return QIcon::fromTheme(QLatin1String("applications-development")); + case \
Transaction::GroupPublishing : return \
QIcon::fromTheme(QLatin1String("accessories-text-editor")); + case \
Transaction::GroupRepos : return \
QIcon::fromTheme(QLatin1String("application-x-compressed-tar")); + case \
Transaction::GroupScience : return \
QIcon::fromTheme(QLatin1String("applications-science")); + case \
Transaction::GroupSecurity : return \
QIcon::fromTheme(QLatin1String("security-high")); + case Transaction::GroupServers \
: return QIcon::fromTheme(QLatin1String("network-server")); + case \
Transaction::GroupSystem : return \
QIcon::fromTheme(QLatin1String("applications-system")); + case \
Transaction::GroupVirtualization : return QIcon::fromTheme(QLatin1String("cpu")); + \
case Transaction::GroupVendor : return \
QIcon::fromTheme(QLatin1String("application-certificate")); + case \
Transaction::GroupNewest : return \
QIcon::fromTheme(QLatin1String("dialog-information")); }
qCDebug(APPER_LIB) << "group unrecognised: " << group;
- return QIcon::fromTheme("unknown");
+ return QIcon::fromTheme(QLatin1String("unknown"));
}
QIcon PkIcons::packageIcon(Transaction::Info info)
@@ -275,16 +277,16 @@ QIcon PkIcons::packageIcon(Transaction::Info info)
PkIcons::configure();
}
switch (info) {
- case Transaction::InfoBugfix : return QIcon::fromTheme("script-error");
- case Transaction::InfoEnhancement : return QIcon::fromTheme("ktip");
- case Transaction::InfoImportant : return QIcon::fromTheme("security-medium");
- case Transaction::InfoLow : return QIcon::fromTheme("security-high");
- case Transaction::InfoSecurity : return QIcon::fromTheme("security-low");
- case Transaction::InfoNormal : return QIcon::fromTheme("emblem-new");
- case Transaction::InfoBlocked : return QIcon::fromTheme("dialog-cancel");
- case Transaction::InfoAvailable : return QIcon::fromTheme("package-download");
- case Transaction::InfoInstalled : return \
QIcon::fromTheme("package-installed");
- default : return QIcon::fromTheme("package");
+ case Transaction::InfoBugfix : return \
QIcon::fromTheme(QLatin1String("script-error")); + case \
Transaction::InfoEnhancement : return QIcon::fromTheme(QLatin1String("ktip")); + \
case Transaction::InfoImportant : return \
QIcon::fromTheme(QLatin1String("security-medium")); + case Transaction::InfoLow \
: return QIcon::fromTheme(QLatin1String("security-high")); + case \
Transaction::InfoSecurity : return \
QIcon::fromTheme(QLatin1String("security-low")); + case Transaction::InfoNormal \
: return QIcon::fromTheme(QLatin1String("emblem-new")); + case \
Transaction::InfoBlocked : return \
QIcon::fromTheme(QLatin1String("dialog-cancel")); + case \
Transaction::InfoAvailable : return \
QIcon::fromTheme(QLatin1String("package-download")); + case \
Transaction::InfoInstalled : return \
QIcon::fromTheme(QLatin1String("package-installed")); + default \
: return QIcon::fromTheme(QLatin1String("package")); }
}
@@ -297,14 +299,14 @@ QString PkIcons::restartIconName(Transaction::Restart type)
// will not be able to load them
switch (type) {
case Transaction::RestartSecuritySystem :
- case Transaction::RestartSystem : return "system-reboot";
+ case Transaction::RestartSystem : return \
QLatin1String("system-reboot"); case Transaction::RestartSecuritySession :
- case Transaction::RestartSession : return "system-log-out";
- case Transaction::RestartApplication : return "process-stop";
+ case Transaction::RestartSession : return \
QLatin1String("system-log-out"); + case Transaction::RestartApplication : \
return QLatin1String("process-stop"); case Transaction::RestartNone :
case Transaction::RestartUnknown : break;
}
- return "";
+ return QLatin1String("");
}
QIcon PkIcons::restartIcon(Transaction::Restart type)
diff --git a/libapper/PkTransaction.cpp b/libapper/PkTransaction.cpp
index 5de07ef..2529e7f 100644
--- a/libapper/PkTransaction.cpp
+++ b/libapper/PkTransaction.cpp
@@ -277,7 +277,7 @@ void PkTransaction::slotErrorCode(Transaction::Error error, const \
QString &detai }
default:
d->showingError = true;
- showSorry(PkStrings::error(error), PkStrings::errorMessage(error), \
QString(details).replace('\n', "<br>")); + showSorry(PkStrings::error(error), \
PkStrings::errorMessage(error), QString(details).replace(QLatin1Char('\n'), \
QLatin1String("<br>")));
// when we receive an error we are done
setExitStatus(Failed);
@@ -452,7 +452,7 @@ void PkTransaction::slotFinished(Transaction::Exit status)
requeueTransaction();
}
} else {
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup transactionGroup(&config, "Transaction");
bool showApp = transactionGroup.readEntry("ShowApplicationLauncher", \
true); if (showApp &&
diff --git a/libapper/Requirements.cpp b/libapper/Requirements.cpp
index 99c9689..f6ebc10 100644
--- a/libapper/Requirements.cpp
+++ b/libapper/Requirements.cpp
@@ -53,13 +53,13 @@ Requirements::Requirements(PackageModel *model, QWidget *parent) \
: ui->packageView->header()->hideSection(PackageModel::SizeCol);
setWindowTitle(i18n("Additional changes"));
- setWindowIcon(QIcon::fromTheme("dialog-warning"));
+ setWindowIcon(QIcon::fromTheme(QLatin1String("dialog-warning")));
ui->buttonBox->button(QDialogButtonBox::Ok)->setText(i18n("Continue"));
// restore size
setMinimumSize(QSize(600,480));
// setInitialSize(QSize(600,600));
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup requirementsDialog(&config, "requirementsDialog");
// restoreGeometry(requirementsDialog.readEntry("geometry").toByteArray());
// restoreDialogSize(requirementsDialog);
@@ -149,7 +149,7 @@ Requirements::Requirements(PackageModel *model, QWidget *parent) \
: m_untrustedButton->setIconSize(QSize(32, 32));
m_untrustedButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
m_untrustedButton->setText(i18np("1 untrusted package", "%1 untrusted \
packages", c));
- m_untrustedButton->setIcon(QIcon::fromTheme("security-low"));
+ m_untrustedButton->setIcon(QIcon::fromTheme(QLatin1String("security-low")));
m_untrustedButton->setVisible(false);
ui->verticalLayout->insertWidget(count++, m_untrustedButton);
}
@@ -174,7 +174,7 @@ Requirements::Requirements(PackageModel *model, QWidget *parent) \
:
Requirements::~Requirements()
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup requirementsDialog(&config, "requirementsDialog");
requirementsDialog.writeEntry("geometry", saveGeometry());
@@ -232,7 +232,7 @@ void Requirements::slotButtonClicked(int)
void Requirements::confirmCBChanged(bool checked)
{
- KConfig config("apper");
+ KConfig config(QLatin1String("apper"));
KConfigGroup requirementsDialog(&config, "requirementsDialog");
if (!m_hideAutoConfirm) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic