From 1a2cc4e2baca53022b14c06dba6dbe00d47ec700 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 29 Jul 2023 19:56:45 +0300
Subject: [PATCH] keditbookmars: use KConfig instance to save column sizes

no functional change, no reason to use kcfg files for it either

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 keditbookmarks/CMakeLists.txt       |  2 --
 keditbookmarks/bookmarklistview.cpp | 25 ++++++++++-------
 keditbookmarks/keditbookmarks.kcfg  | 42 -----------------------------
 keditbookmarks/settings.kcfgc       |  4 ---
 keditbookmarks/toplevel.cpp         |  1 -
 5 files changed, 15 insertions(+), 59 deletions(-)
 delete mode 100644 keditbookmarks/keditbookmarks.kcfg
 delete mode 100644 keditbookmarks/settings.kcfgc

diff --git a/keditbookmarks/CMakeLists.txt b/keditbookmarks/CMakeLists.txt
index 26d80c84..1eeac781 100644
--- a/keditbookmarks/CMakeLists.txt
+++ b/keditbookmarks/CMakeLists.txt
@@ -45,8 +45,6 @@ qt4_add_dbus_interface(keditbookmarks_SRCS
     favicon_interface
 )
 
-kde4_add_kcfg_files(keditbookmarks_SRCS settings.kcfgc)
-
 add_executable(keditbookmarks ${keditbookmarks_SRCS})
 
 target_link_libraries(keditbookmarks
diff --git a/keditbookmarks/bookmarklistview.cpp b/keditbookmarks/bookmarklistview.cpp
index 3a8e2439..fc7eec17 100644
--- a/keditbookmarks/bookmarklistview.cpp
+++ b/keditbookmarks/bookmarklistview.cpp
@@ -21,7 +21,6 @@
 #include "globalbookmarkmanager.h"
 #include "kbookmarkmodel/model.h"
 #include "toplevel.h" // for KEBApp
-#include "settings.h"
 #include "kbookmarkmodel/commands.h"
 
 #include <QHeaderView>
@@ -31,8 +30,12 @@
 #include <QBrush>
 #include <QPalette>
 
+#include <kglobal.h>
+#include <kconfiggroup.h>
 #include <kdebug.h>
 
+static const int s_defaultcolumnsize = 300;
+
 BookmarkFolderView::BookmarkFolderView( BookmarkListView * view, QWidget * parent )
     : KBookmarkView(parent), mview(view)
 {
@@ -131,19 +134,21 @@ void BookmarkListView::contextMenuEvent ( QContextMenuEvent * e )
 
 void BookmarkListView::loadColumnSetting()
 {
-    header()->resizeSection(KEBApp::NameColumn, KEBSettings::name());
-    header()->resizeSection(KEBApp::UrlColumn, KEBSettings::uRL());
-    header()->resizeSection(KEBApp::CommentColumn, KEBSettings::comment());
-    header()->resizeSection(KEBApp::StatusColumn, KEBSettings::status());
+    KConfigGroup columngroup = KConfigGroup(KGlobal::config(), "Column");
+    header()->resizeSection(KEBApp::NameColumn, columngroup.readEntry("Name", s_defaultcolumnsize));
+    header()->resizeSection(KEBApp::UrlColumn, columngroup.readEntry("URL", s_defaultcolumnsize));
+    header()->resizeSection(KEBApp::CommentColumn, columngroup.readEntry("Comment", s_defaultcolumnsize));
+    header()->resizeSection(KEBApp::StatusColumn, columngroup.readEntry("Status", s_defaultcolumnsize));
 }
 
 void BookmarkListView::saveColumnSetting()
 {
-    KEBSettings::setName( header()->sectionSize(KEBApp::NameColumn));
-    KEBSettings::setURL( header()->sectionSize(KEBApp::UrlColumn));
-    KEBSettings::setComment( header()->sectionSize(KEBApp::CommentColumn));
-    KEBSettings::setStatus( header()->sectionSize(KEBApp::StatusColumn));
-    KEBSettings::self()->writeConfig();
+    KConfigGroup columngroup = KConfigGroup(KGlobal::config(), "Column");
+    columngroup.writeEntry("Name", header()->sectionSize(KEBApp::NameColumn));
+    columngroup.writeEntry("URL", header()->sectionSize(KEBApp::UrlColumn));
+    columngroup.writeEntry("Comment", header()->sectionSize(KEBApp::CommentColumn));
+    columngroup.writeEntry("Status", header()->sectionSize(KEBApp::StatusColumn));
+    KGlobal::config()->sync();
 }
 
 /************/
diff --git a/keditbookmarks/keditbookmarks.kcfg b/keditbookmarks/keditbookmarks.kcfg
deleted file mode 100644
index 60c5f593..00000000
--- a/keditbookmarks/keditbookmarks.kcfg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 
-                          http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="keditbookmarksrc" />
-  
-  <group name="Columns">
-    <entry key="Name" type="Int">
-      <default>300</default>
-      <label></label>
-      <whatsthis></whatsthis>
-    </entry>
-    <entry key="URL" type="Int">
-      <default>300</default>
-      <label></label>
-      <whatsthis></whatsthis>
-    </entry>
-    <entry key="Comment" type="Int">
-      <default>300</default>
-      <label></label>
-      <whatsthis></whatsthis>
-    </entry>
-    <entry key="Status" type="Int">
-      <default>300</default>
-      <label></label>
-      <whatsthis></whatsthis>
-    </entry>
-    <entry key="Address" type="Int">
-      <default>300</default>
-      <label></label>
-      <whatsthis></whatsthis>
-    </entry>
-  </group>
-  <group name="General">
-    <entry name="SaveOnClose" key="Save On Close" type="Bool">
-      <label></label>
-      <whatsthis></whatsthis>
-    </entry>
-  </group> 
-
-</kcfg>
diff --git a/keditbookmarks/settings.kcfgc b/keditbookmarks/settings.kcfgc
deleted file mode 100644
index bd21f5c0..00000000
--- a/keditbookmarks/settings.kcfgc
+++ /dev/null
@@ -1,4 +0,0 @@
-File=keditbookmarks.kcfg
-ClassName=KEBSettings
-Singleton=true 
-Mutators=true
diff --git a/keditbookmarks/toplevel.cpp b/keditbookmarks/toplevel.cpp
index 0189bfd3..d6a2687a 100644
--- a/keditbookmarks/toplevel.cpp
+++ b/keditbookmarks/toplevel.cpp
@@ -26,7 +26,6 @@
 
 #include "bookmarkinfowidget.h"
 #include "actionsimpl.h"
-#include "settings.h"
 #include "kbookmarkmodel/commands.h"
 #include "kbookmarkmodel/commandhistory.h"
 #include "kebsearchline.h"