generic: adjust to Katie changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

dolphin/src/dolphincontextmenu.cpp

@@ -145,7 +145,7 @@ void DolphinContextMenu::openTrashContextMenu()
 
     QAction* emptyTrashAction = new QAction(KIcon("trash-empty"), i18nc("@action:inmenu", "Empty Trash"), this);
     KSettings trashConfig("trashrc", KSettings::SimpleConfig);
-    emptyTrashAction->setEnabled(!trashConfig.value("Status/Empty", true).toBool());
+    emptyTrashAction->setEnabled(!trashConfig.boolean("Status/Empty", true));
     addAction(emptyTrashAction);
 
     addCustomActions();

dolphin/src/panels/places/placesitem.cpp

@@ -270,7 +270,7 @@ void PlacesItem::onTrashConfigChange(const QString &config)
     Q_ASSERT(url().protocol() == QLatin1String("trash"));
 
     KSettings trashConfig("trashrc", KSettings::SimpleConfig);
-    const bool isTrashEmpty = trashConfig.value("Status/Empty", true).toBool();
+    const bool isTrashEmpty = trashConfig.boolean("Status/Empty", true);
     setIcon(isTrashEmpty ? "user-trash" : "user-trash-full");
 }
 

kcontrol/krdb/main.cpp

@@ -112,9 +112,9 @@ static void applyQtColors(QSettings &settings, QPalette&newPal)
         discg << newPal.color(QPalette::Disabled, (QPalette::ColorRole) i).name();
     }
 
-    settings.setValue("Qt/Palette/active", actcg);
+    settings.setStringList("Qt/Palette/active", actcg);
-    settings.setValue("Qt/Palette/inactive", inactcg);
+    settings.setStringList("Qt/Palette/inactive", inactcg);
-    settings.setValue("Qt/Palette/disabled", discg);
+    settings.setStringList("Qt/Palette/disabled", discg);
 }
 
 // -----------------------------------------------------------------------------
@@ -124,7 +124,7 @@ static void applyQtSettings(KSharedConfigPtr kglobalcfg, QSettings &settings)
     /* export font settings */
     KConfigGroup fontgrp(kglobalcfg, "General");
     QString font = fontgrp.readEntry("font", KGlobalSettings::generalFont().toString());
-    settings.setValue("Qt/font", font);
+    settings.setString("Qt/font", font);
 
     /* export effects settings */
     KConfigGroup guigrp(kglobalcfg, "KDE-Global GUI Settings");
@@ -145,7 +145,7 @@ static void applyQtSettings(KSharedConfigPtr kglobalcfg, QSettings &settings)
         guieffects << QString("none");
     }
 
-    settings.setValue("Qt/GUIEffects", guieffects);
+    settings.setStringList("Qt/GUIEffects", guieffects);
 }
 
 // -----------------------------------------------------------------------------
@@ -438,7 +438,7 @@ int main(int argc, char *argv[])
     /* Katie exports */
     if (exportQtColors || exportQtSettings) {
         {
-            QSettings settings(QLatin1String("Katie"), QSettings::NativeFormat);
+            QSettings settings(QLatin1String("Katie"));
 
             if (exportQtColors) {
                 applyQtColors(settings, newPal); // For kcmcolors

kcontrol/mediaplayer/kcmplayer.cpp

@@ -241,9 +241,9 @@ void KCMPlayer::load()
         const QString medianame = service->name();
         const QStringList mediaids = service->property("X-KDE-MediaPlayer", QVariant::StringList).toStringList();
         foreach (const QString &id, mediaids) {
-            const QString output = ksettings.value(id + "/audiooutput", s_kmediaoutput).toString();
+            const QString output = ksettings.string(id + "/audiooutput", s_kmediaoutput);
-            const bool mute = ksettings.value(id + "/mute", s_kmediamute).toBool();
+            const bool mute = ksettings.boolean(id + "/mute", s_kmediamute);
-            const int volume = ksettings.value(id + "/volume", s_kmediavolume).toInt();
+            const int volume = ksettings.integer(id + "/volume", s_kmediavolume);
             KMediaBox* mediabox = new KMediaBox(
                 this,
                 id, medianame,
@@ -265,9 +265,9 @@ void KCMPlayer::save()
     KSettings ksettings("kmediaplayer", KSettings::FullConfig);
     foreach (const KMediaBox* mediabox, m_mediaboxes) {
         const QString id = mediabox->id();
-        ksettings.setValue(id + "/audiooutput", mediabox->output());
+        ksettings.setString(id + "/audiooutput", mediabox->output());
-        ksettings.setValue(id + "/mute", mediabox->mute());
+        ksettings.setBoolean(id + "/mute", mediabox->mute());
-        ksettings.setValue(id + "/volume", mediabox->volume());
+        ksettings.setInteger(id + "/volume", mediabox->volume());
     }
     emit changed(false);
 }

kgreeter/kcm/kgreeterconfig.cpp

@@ -90,7 +90,7 @@ KCMGreeter::KCMGreeter(QWidget* parent, const QVariantList& args)
     colorsbox->addItem(i18n("Default"), QVariant(QString::fromLatin1("default")));
     const QStringList kcolorschemes = KGlobal::dirs()->findAllResources("data", "color-schemes/*.colors");
     foreach (const QString &kcolorscheme, kcolorschemes) {
-        const QString kcolorschemename = QSettings(kcolorscheme, QSettings::IniFormat).value("General/Name").toString();
+        const QString kcolorschemename = QSettings(kcolorscheme).string("General/Name");
         const QString kcolorschemebasename = QFileInfo(kcolorscheme).baseName();
         colorsbox->addItem(kcolorschemename, QVariant(kcolorschemebasename));
     }
@@ -99,7 +99,7 @@ KCMGreeter::KCMGreeter(QWidget* parent, const QVariantList& args)
     cursorbox->addItem(i18n("Default"), QVariant(QString::fromLatin1("default")));
     const QStringList cursorthemes = KGlobal::dirs()->findAllResources("icon", "*/index.theme");
     foreach (const QString &cursortheme, cursorthemes) {
-        const QString cursorthemename = QSettings(cursortheme, QSettings::IniFormat).value("Icon Theme/Name").toString();
+        const QString cursorthemename = QSettings(cursortheme).string("Icon Theme/Name");
         QDir cursorthemedir(cursortheme);
         cursorthemedir.cdUp();
         if (!cursorthemedir.exists(QString::fromLatin1("cursors"))) {
@@ -135,13 +135,13 @@ KCMGreeter::~KCMGreeter()
 
 void KCMGreeter::load()
 {
-    QSettings kgreetersettings(KDE_SYSCONFDIR "/lightdm/lightdm-kgreeter-greeter.conf", QSettings::IniFormat);
+    QSettings kgreetersettings(KDE_SYSCONFDIR "/lightdm/lightdm-kgreeter-greeter.conf");
-    const QString kgreeterfontstring = kgreetersettings.value("greeter/font").toString();
+    const QString kgreeterfontstring = kgreetersettings.string("greeter/font");
-    const QString kgreeterstyle = kgreetersettings.value("greeter/style", KGreeterDefaultStyle()).toString();
+    const QString kgreeterstyle = kgreetersettings.string("greeter/style", KGreeterDefaultStyle());
-    const QString kgreetercolor = kgreetersettings.value("greeter/colorscheme").toString();
+    const QString kgreetercolor = kgreetersettings.string("greeter/colorscheme");
-    const QString kgreetercursortheme = kgreetersettings.value("greeter/cursortheme", KGreeterDefaultCursorTheme()).toString();
+    const QString kgreetercursortheme = kgreetersettings.string("greeter/cursortheme", KGreeterDefaultCursorTheme());
-    const QString kgreeterbackground = kgreetersettings.value("greeter/background", KGreeterDefaultBackground()).toString();
+    const QString kgreeterbackground = kgreetersettings.string("greeter/background", KGreeterDefaultBackground());
-    const QString kgreeterrectangle = kgreetersettings.value("greeter/rectangle", KGreeterDefaultRectangle()).toString();
+    const QString kgreeterrectangle = kgreetersettings.string("greeter/rectangle", KGreeterDefaultRectangle());
     loadSettings(
         kgreeterfontstring,
         kgreeterstyle,

kgreeter/kcm/kgreeterhelper.cpp

@@ -45,13 +45,13 @@ int KGreeterHelper::save(const QVariantMap &parameters)
         cursortheme = QString();
     }
 
-    QSettings kgreetersettings(KDE_SYSCONFDIR "/lightdm/lightdm-kgreeter-greeter.conf", QSettings::IniFormat);
+    QSettings kgreetersettings(KDE_SYSCONFDIR "/lightdm/lightdm-kgreeter-greeter.conf");
-    kgreetersettings.setValue("greeter/font", parameters.value("font"));
+    kgreetersettings.setString("greeter/font", parameters.value("font").toString());
-    kgreetersettings.setValue("greeter/style", parameters.value("style"));
+    kgreetersettings.setString("greeter/style", parameters.value("style").toString());
-    kgreetersettings.setValue("greeter/colorscheme", colorscheme);
+    kgreetersettings.setString("greeter/colorscheme", colorscheme);
-    kgreetersettings.setValue("greeter/cursortheme", cursortheme);
+    kgreetersettings.setString("greeter/cursortheme", cursortheme);
-    kgreetersettings.setValue("greeter/background", parameters.value("background"));
+    kgreetersettings.setString("greeter/background", parameters.value("background").toString());
-    kgreetersettings.setValue("greeter/rectangle", parameters.value("rectangle"));
+    kgreetersettings.setString("greeter/rectangle", parameters.value("rectangle").toString());
     if (kgreetersettings.status() != QSettings::NoError) {
         kWarning() << "Could not save settings";
         return KAuthorization::HelperError;

kgreeter/kgreeter.cpp

@@ -40,7 +40,7 @@
 static const int gliblooppolltime = 400;
 static GMainLoop *glibloop = NULL;
 
-static QSettings kgreetersettings(KDE_SYSCONFDIR "/lightdm/lightdm-kgreeter-greeter.conf", QSettings::IniFormat);
+static QSettings kgreetersettings(KDE_SYSCONFDIR "/lightdm/lightdm-kgreeter-greeter.conf");
 
 static QString glibErrorString(const GError *const gliberror)
 {
@@ -114,8 +114,8 @@ KGreeter::KGreeter(QWidget *parent)
 
     m_ui.setupUi(this);
 
-    m_background = QImage(kgreetersettings.value("greeter/background", KGreeterDefaultBackground()).toString());
+    m_background = QImage(kgreetersettings.string("greeter/background", KGreeterDefaultBackground()));
-    m_rectangle = QImage(kgreetersettings.value("greeter/rectangle", KGreeterDefaultRectangle()).toString());
+    m_rectangle = QImage(kgreetersettings.string("greeter/rectangle", KGreeterDefaultRectangle()));
 
     m_ldmgreeter = lightdm_greeter_new();
 
@@ -187,11 +187,11 @@ KGreeter::KGreeter(QWidget *parent)
     }
 
     QSettings kgreeterstate("lightdm-kgreeter-state");
-    const QString lastuser = kgreeterstate.value("state/lastuser").toString();
+    const QString lastuser = kgreeterstate.string("state/lastuser");
     if (!lastuser.isEmpty()) {
         setUser(lastuser);
     }
-    const QString lastsession = kgreeterstate.value("state/lastsession").toString();
+    const QString lastsession = kgreeterstate.string("state/lastsession");
     if (!lastsession.isEmpty()) {
         setSession(lastsession);
     }
@@ -493,8 +493,8 @@ void KGreeter::slotLogin()
     // the trick is to save before lightdm_greeter_authenticate()
     {
         QSettings kgreeterstate("lightdm-kgreeter-state");
-        kgreeterstate.setValue("state/lastsession", kgreetersession);
+        kgreeterstate.setString("state/lastsession", kgreetersession);
-        kgreeterstate.setValue("state/lastuser", kgreeterusername);
+        kgreeterstate.setString("state/lastuser", kgreeterusername);
     }
 
     g_autoptr(GError) gliberror = NULL;
@@ -542,7 +542,7 @@ int main(int argc, char**argv)
 
     QApplication app(argc, argv);
 
-    const QString kgreeterfontstring = kgreetersettings.value("greeter/font").toString();
+    const QString kgreeterfontstring = kgreetersettings.string("greeter/font");
     QFont kgreeterfont;
     if (!kgreeterfont.fromString(kgreeterfontstring)) {
         kgreeterfont = KGreeterDefaultFont();
@@ -555,10 +555,10 @@ int main(int argc, char**argv)
         app.addPluginPath(path);
     }
 
-    const QString kgreeterstyle = kgreetersettings.value("greeter/style", KGreeterDefaultStyle()).toString();
+    const QString kgreeterstyle = kgreetersettings.string("greeter/style", KGreeterDefaultStyle());
     app.setStyle(kgreeterstyle);
 
-    const QString kgreetercolorscheme = kgreetersettings.value("greeter/colorscheme").toString();
+    const QString kgreetercolorscheme = kgreetersettings.string("greeter/colorscheme");
     if (!kgreetercolorscheme.isEmpty()) {
         KSharedConfigPtr kcolorschemeconfig = KSharedConfig::openConfig(
             QString::fromLatin1("color-schemes/%1.colors").arg(kgreetercolorscheme),
@@ -569,7 +569,7 @@ int main(int argc, char**argv)
         app.setPalette(KGlobalSettings::createApplicationPalette());
     }
 
-    const QString kgreetercursortheme = kgreetersettings.value("greeter/cursortheme", KGreeterDefaultCursorTheme()).toString();
+    const QString kgreetercursortheme = kgreetersettings.string("greeter/cursortheme", KGreeterDefaultCursorTheme());
     if (!kgreetercursortheme.isEmpty()) {
         const QByteArray xcursorthemebytes = kgreetercursortheme.toAscii();
         ::setenv("XCURSOR_THEME", xcursorthemebytes.constData(), 1);

libs/konq/konq_popupmenu.cpp

@@ -328,7 +328,7 @@ void KonqPopupMenuPrivate::init(KonqPopupMenu::Flags kpf, KParts::BrowserExtensi
         act->setIcon( KIcon("trash-empty") );
         act->setText( i18n( "&Empty Trash Bin" ) );
         KSettings trashConfig("trashrc", KSettings::SimpleConfig);
-        act->setEnabled( !trashConfig.value("Status/Empty", true).toBool() );
+        act->setEnabled( !trashConfig.boolean("Status/Empty", true) );
         QObject::connect(act, SIGNAL(triggered()), q, SLOT(slotPopupEmptyTrashBin()));
         q->addAction(act);
     }