From 9afa3f9deab5cf043bfa8b68f81c274553d231ee Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 1 Feb 2020 14:58:22 +0000 Subject: [PATCH] polkit-kde-kcmmodules-1: adjust to Katie changes Signed-off-by: Ivailo Monev --- polkit-kde-kcmodules-1/CMakeLists.txt | 3 +++ polkit-kde-kcmodules-1/common/identitywidget.h | 2 ++ .../helper/policy-gen/policy-gen.cpp | 5 +++++ polkit-kde-kcmodules-1/helper/polkitkde1helper.cpp | 13 ++++++------- .../polkitactions/ActionWidget.cpp | 3 +-- polkit-kde-kcmodules-1/polkitactions/ActionWidget.h | 8 ++++++-- .../polkitactions/PoliciesModel.cpp | 4 ++-- .../polkitactions/PolkitActionsKCM.h | 4 +++- .../polkitactions/explicitauthorizationdialog.h | 5 ++++- .../polkitconfig/kcmpolkitconfig.cpp | 5 ++--- .../polkitconfig/kcmpolkitconfig.h | 3 +++ 11 files changed, 37 insertions(+), 18 deletions(-) diff --git a/polkit-kde-kcmodules-1/CMakeLists.txt b/polkit-kde-kcmodules-1/CMakeLists.txt index 32079d66..85ca63a4 100644 --- a/polkit-kde-kcmodules-1/CMakeLists.txt +++ b/polkit-kde-kcmodules-1/CMakeLists.txt @@ -5,6 +5,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") find_package(KDE4 REQUIRED) include(KDE4Defaults) +include_directories(${KDE4_INCLUDES}) +add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) + function(dbus_add_activation_system_service _sources) pkg_search_module( DBUS dbus-1 ) foreach (_i ${_sources}) diff --git a/polkit-kde-kcmodules-1/common/identitywidget.h b/polkit-kde-kcmodules-1/common/identitywidget.h index b5177b61..1bc3eefc 100644 --- a/polkit-kde-kcmodules-1/common/identitywidget.h +++ b/polkit-kde-kcmodules-1/common/identitywidget.h @@ -15,9 +15,11 @@ #include +QT_BEGIN_NAMESPACE namespace Ui { class IdentityWidget; } +QT_END_NAMESPACE class KDE_EXPORT IdentityWidget : public QWidget { diff --git a/polkit-kde-kcmodules-1/helper/policy-gen/policy-gen.cpp b/polkit-kde-kcmodules-1/helper/policy-gen/policy-gen.cpp index cf7bad83..5f3e537e 100644 --- a/polkit-kde-kcmodules-1/helper/policy-gen/policy-gen.cpp +++ b/polkit-kde-kcmodules-1/helper/policy-gen/policy-gen.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -41,7 +42,11 @@ int main(int argc, char **argv) } QSettings ini(argv[1], QSettings::IniFormat); +#ifndef QT_KATIE // Katie uses C-strings codec which is UTF-8 ini.setIniCodec("UTF-8"); +#else + QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); +#endif if (ini.status()) { qCritical("Error loading file: %s", argv[1]); return 1; diff --git a/polkit-kde-kcmodules-1/helper/polkitkde1helper.cpp b/polkit-kde-kcmodules-1/helper/polkitkde1helper.cpp index 4d37f701..8be03830 100644 --- a/polkit-kde-kcmodules-1/helper/polkitkde1helper.cpp +++ b/polkit-kde-kcmodules-1/helper/polkitkde1helper.cpp @@ -12,14 +12,15 @@ #include "helperadaptor.h" +#include +#include #include #include +#include #include - #include #include -#include #include bool orderByPriorityLessThan(const PKLAEntry &e1, const PKLAEntry &e2) @@ -75,10 +76,9 @@ void PolkitKde1Helper::saveGlobalConfiguration(const QString& adminIdentities, i // Ok, let's see what we have to save here. QSettings kdesettings("/etc/polkit-1/polkit-kde-1.conf", QSettings::IniFormat); - kdesettings.beginGroup("General"); - kdesettings.setValue("ConfigPriority", systemPriority); - kdesettings.setValue("PoliciesPriority", policiesPriority); + kdesettings.setValue("General/ConfigPriority", systemPriority); + kdesettings.setValue("General/PoliciesPriority", policiesPriority); QString contents = QString("[Configuration]\nAdminIdentities=%1\n").arg(adminIdentities); @@ -316,10 +316,9 @@ void PolkitKde1Helper::writePolicy(const QList& policy) qSort(entries.begin(), entries.end(), orderByPriorityLessThan); QSettings kdesettings("/etc/polkit-1/polkit-kde-1.conf", QSettings::IniFormat); - kdesettings.beginGroup("General"); QString pathName = QString("/var/lib/polkit-1/localauthority/%1-polkitkde.d/") - .arg(kdesettings.value("PoliciesPriority",75).toInt()); + .arg(kdesettings.value("General/PoliciesPriority",75).toInt()); foreach(const PKLAEntry &entry, entries) { QString fullPath; diff --git a/polkit-kde-kcmodules-1/polkitactions/ActionWidget.cpp b/polkit-kde-kcmodules-1/polkitactions/ActionWidget.cpp index 1674f142..c780600a 100644 --- a/polkit-kde-kcmodules-1/polkitactions/ActionWidget.cpp +++ b/polkit-kde-kcmodules-1/polkitactions/ActionWidget.cpp @@ -339,8 +339,7 @@ void ActionWidget::addNewPKLAEntry(const PKLAEntry& entry) PKLAEntry toInsert(entry); // Match it to the current config value QSettings settings("/etc/polkit-1/polkit-kde-1.conf", QSettings::IniFormat); - settings.beginGroup("General"); - toInsert.filePriority = settings.value("PoliciesPriority", 75).toInt(); + toInsert.filePriority = settings.value("General/PoliciesPriority", 75).toInt(); // If there's no file order, append it to the end of the current entries if (toInsert.fileOrder < 0) { diff --git a/polkit-kde-kcmodules-1/polkitactions/ActionWidget.h b/polkit-kde-kcmodules-1/polkitactions/ActionWidget.h index 56789a3e..514906da 100644 --- a/polkit-kde-kcmodules-1/polkitactions/ActionWidget.h +++ b/polkit-kde-kcmodules-1/polkitactions/ActionWidget.h @@ -12,14 +12,18 @@ #define ACTIONWIDGET_H #include -#include "PKLAEntry.h" +#include #include +#include "PKLAEntry.h" + class KComboBox; -#include + +QT_BEGIN_NAMESPACE namespace Ui { class ActionWidget; } +QT_END_NAMESPACE namespace PolkitKde { diff --git a/polkit-kde-kcmodules-1/polkitactions/PoliciesModel.cpp b/polkit-kde-kcmodules-1/polkitactions/PoliciesModel.cpp index 2d18a931..1637bfa2 100644 --- a/polkit-kde-kcmodules-1/polkitactions/PoliciesModel.cpp +++ b/polkit-kde-kcmodules-1/polkitactions/PoliciesModel.cpp @@ -224,7 +224,7 @@ void PoliciesModel::insertOrUpdate(const QStringList &actionPath, const PolkitQt QString path = actionPath.join("."); PolicyItem *action = 0; for (int i = 0; i < parent->childCount(); i++) { - if (!parent->child(i)->isGroup() && path == parent->child(i)->data(PathRole)) { + if (!parent->child(i)->isGroup() && path == parent->child(i)->data(PathRole).toString()) { action = parent->child(i); break; } @@ -253,7 +253,7 @@ void PoliciesModel::insertOrUpdate(const QStringList &actionPath, const PolkitQt QString path = actionPath.at(level); PolicyItem *group = 0; for (int i = 0; i < parent->childCount(); i++) { - if (parent->child(i)->isGroup() && path == parent->child(i)->data(PathRole)) { + if (parent->child(i)->isGroup() && path == parent->child(i)->data(PathRole).toString()) { group = parent->child(i); break; } diff --git a/polkit-kde-kcmodules-1/polkitactions/PolkitActionsKCM.h b/polkit-kde-kcmodules-1/polkitactions/PolkitActionsKCM.h index 45ad3faf..9650fae9 100644 --- a/polkit-kde-kcmodules-1/polkitactions/PolkitActionsKCM.h +++ b/polkit-kde-kcmodules-1/polkitactions/PolkitActionsKCM.h @@ -14,17 +14,19 @@ #include #include #include +#include -#include namespace PolkitKde { class PoliciesModel; class AuthorizationsFilterModel; class ActionWidget; } +QT_BEGIN_NAMESPACE namespace Ui { class PolkitActionsMainView; } +QT_END_NAMESPACE class PolkitActionsKCM : public KCModule { diff --git a/polkit-kde-kcmodules-1/polkitactions/explicitauthorizationdialog.h b/polkit-kde-kcmodules-1/polkitactions/explicitauthorizationdialog.h index 20508b9c..94c977aa 100644 --- a/polkit-kde-kcmodules-1/polkitactions/explicitauthorizationdialog.h +++ b/polkit-kde-kcmodules-1/polkitactions/explicitauthorizationdialog.h @@ -11,13 +11,16 @@ #ifndef EXPLICITAUTHORIZATIONDIALOG_H #define EXPLICITAUTHORIZATIONDIALOG_H +#include #include + #include "PKLAEntry.h" +QT_BEGIN_NAMESPACE namespace Ui { class ExplicitAuthorizationWidget; } -#include +QT_END_NAMESPACE namespace PolkitKde { diff --git a/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.cpp b/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.cpp index 8d9793c6..d0da4dbe 100644 --- a/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.cpp +++ b/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.cpp @@ -79,9 +79,8 @@ void KCMPolkitConfig::load() { // Load the first tab QSettings settings("/etc/polkit-1/polkit-kde-1.conf", QSettings::IniFormat); - settings.beginGroup("General"); - int priority = settings.value("ConfigPriority", 75).toInt(); + int priority = settings.value("General/ConfigPriority", 75).toInt(); int highestPriority = -1; QString highestFilename; @@ -134,7 +133,7 @@ void KCMPolkitConfig::load() // Set up the other tab m_ui->configPrioritySpin->setValue(priority); - m_ui->policyPrioritySpin->setValue(settings.value("PoliciesPriority", 75).toInt()); + m_ui->policyPrioritySpin->setValue(settings.value("General/PoliciesPriority", 75).toInt()); } void KCMPolkitConfig::save() diff --git a/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.h b/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.h index 2e9a4168..5bea2c84 100644 --- a/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.h +++ b/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.h @@ -14,9 +14,12 @@ #include #include + +QT_BEGIN_NAMESPACE namespace Ui { class PolkitConfig; } +QT_END_NAMESPACE class KCMPolkitConfig : public KCModule {