Added a Config derivative.

5 files changed, 38 insertions, 45 deletions

diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index df1de8d..6807544 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -282,2 +282,3 @@ KateDocument::~KateDocument()
   m_highlight->release();
+  writeConfig();
 
@@ -598,3 +599,3 @@ void KateDocument::readConfig()
 {
-  KConfig *config = KGlobal::config();
+  KateConfig *config = KGlobal::config();
   config->setGroup("Kate Document");
@@ -610,8 +611,8 @@ void KateDocument::readConfig()
   myEncoding = config->readEntry("Encoding", QString::fromLatin1(QTextCodec::codecForLocale()->name()));
-  setFont (config->readFontEntry("Font", &myFont));
+  setFont (config->readFontEntry("Font", myFont));
 
-  colors[0] = config->readColorEntry("Color Background", &colors[0]);
-  colors[1] = config->readColorEntry("Color Selected", &colors[1]);
+  colors[0] = config->readColorEntry("Color Background", colors[0]);
+  colors[1] = config->readColorEntry("Color Selected", colors[1]);
   
-  config->sync();
+//  config->sync();
 }
@@ -620,6 +621,5 @@ void KateDocument::writeConfig()
 {
-  KConfig *config = KGlobal::config();
+  KateConfig *config = KGlobal::config();
   config->setGroup("Kate Document");
-#if 0
-  cofig->writeEntry("Word Wrap On", myWordWrap);
+  config->writeEntry("Word Wrap On", myWordWrap);
   config->writeEntry("Word Wrap At", myWordWrapAt);
@@ -632,7 +632,6 @@ void KateDocument::writeConfig()
   config->writeEntry("Color Selected", colors[1]);
-#endif
-  config->sync();
+//  config->sync();
 }
 
-void KateDocument::readSessionConfig(KConfig *config)
+void KateDocument::readSessionConfig(KateConfig *config)
 {
@@ -650,3 +649,3 @@ void KateDocument::readSessionConfig(KConfig *config)
 
-void KateDocument::writeSessionConfig(KConfig *config)
+void KateDocument::writeSessionConfig(KateConfig *config)
 {
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.h b/noncore/apps/tinykate/libkate/document/katedocument.h
index 356541f..9d8ec6a 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.h
+++ b/noncore/apps/tinykate/libkate/document/katedocument.h
@@ -231,4 +231,4 @@ class KateDocument: public Kate::Document
     void writeConfig();
-    void readSessionConfig(KConfig *);
-    void writeSessionConfig(KConfig *);
+    void readSessionConfig(KateConfig *);
+    void writeSessionConfig(KateConfig *);
 
diff --git a/noncore/apps/tinykate/libkate/document/katehighlight.cpp b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
index 797968b..0d2c283 100644
--- a/noncore/apps/tinykate/libkate/document/katehighlight.cpp
+++ b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
@@ -651,4 +651,4 @@ int Highlight::doHighlight(int ctxNum, TextLine *textLine)
 
-KConfig *Highlight::getKConfig() {
-  KConfig *config;
+KateConfig *Highlight::getKateConfig() {
+  KateConfig *config;
   config=KGlobal::config();
@@ -659,5 +659,5 @@ KConfig *Highlight::getKConfig() {
 QString Highlight::getWildcards() {
-  KConfig *config;
+  KateConfig *config;
 
-  config = getKConfig();
+  config = getKateConfig();
 
@@ -669,5 +669,5 @@ QString Highlight::getWildcards() {
 QString Highlight::getMimetypes() {
-  KConfig *config;
+  KateConfig *config;
 
-  config = getKConfig();
+  config = getKateConfig();
 
@@ -678,6 +678,6 @@ QString Highlight::getMimetypes() {
 HlData *Highlight::getData() {
-  KConfig *config;
+  KateConfig *config;
   HlData *hlData;
 
-  config = getKConfig();
+  config = getKateConfig();
 
@@ -695,5 +695,5 @@ HlData *Highlight::getData() {
 void Highlight::setData(HlData *hlData) {
-  KConfig *config;
+  KateConfig *config;
 
-  config = getKConfig();
+  config = getKateConfig();
 
@@ -709,5 +709,5 @@ void Highlight::setData(HlData *hlData) {
 void Highlight::getItemDataList(ItemDataList &list) {
-  KConfig *config;
+  KateConfig *config;
 
-  config = getKConfig();
+  config = getKateConfig();
   getItemDataList(list, config);
@@ -715,3 +715,3 @@ void Highlight::getItemDataList(ItemDataList &list) {
 
-void Highlight::getItemDataList(ItemDataList &list, KConfig *config) {
+void Highlight::getItemDataList(ItemDataList &list, KateConfig *config) {
   ItemData *p;
@@ -741,3 +741,3 @@ void Highlight::getItemDataList(ItemDataList &list, KConfig *config) {
                         *                                        items should be saved
-                        *        KConfig *config                :Pointer KDE configuration
+                        *        KateConfig *config                :Pointer KDE configuration
                         *                                        class, which should be used
@@ -750,3 +750,3 @@ void Highlight::getItemDataList(ItemDataList &list, KConfig *config) {
 
-void Highlight::setItemDataList(ItemDataList &list, KConfig *config) {
+void Highlight::setItemDataList(ItemDataList &list, KateConfig *config) {
   ItemData *p;
@@ -1268,3 +1268,3 @@ Highlight *HlManager::getHl(int n) {
 int HlManager::defaultHl() {
-  KConfig *config;
+  KateConfig *config;
   config = KGlobal::config();
@@ -1376,3 +1376,3 @@ QString HlManager::defaultStyleName(int n)
 void HlManager::getDefaults(ItemStyleList &list) {
-  KConfig *config;
+  KateConfig *config;
   int z;
@@ -1412,3 +1412,3 @@ void HlManager::getDefaults(ItemStyleList &list) {
 void HlManager::setDefaults(ItemStyleList &list) {
-  KConfig *config;
+  KateConfig *config;
   int z;
diff --git a/noncore/apps/tinykate/libkate/document/katehighlight.h b/noncore/apps/tinykate/libkate/document/katehighlight.h
index 1baddcc..fddf585 100644
--- a/noncore/apps/tinykate/libkate/document/katehighlight.h
+++ b/noncore/apps/tinykate/libkate/document/katehighlight.h
@@ -238,3 +238,3 @@ typedef QList<HlData> HlDataList;
 class HlManager;
-class KConfig;
+class KateConfig;
 
@@ -260,3 +260,3 @@ class Highlight
 
-    KConfig *getKConfig();
+    KateConfig *getKateConfig();
     QString getWildcards();
@@ -266,4 +266,4 @@ class Highlight
     void getItemDataList(ItemDataList &);
-    void getItemDataList(ItemDataList &, KConfig *);
-    void setItemDataList(ItemDataList &, KConfig *);
+    void getItemDataList(ItemDataList &, KateConfig *);
+    void setItemDataList(ItemDataList &, KateConfig *);
     QString name() {return iName;}
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index e45daa4..844f27d 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -18,2 +18,3 @@
 #include "katesyntaxdocument.h"
+#include <kateconfig.h>
 #include <qfile.h>
@@ -24,3 +25,2 @@
 #include <qstringlist.h>
-#include <kconfig.h>
 #include <kglobal.h>
@@ -53,3 +53,3 @@ void SyntaxDocument::setupModeList(bool force)
 
-  KConfig *config=KGlobal::config();
+  KateConfig *config=KGlobal::config();
   KStandardDirs *dirs = KGlobal::dirs();
@@ -65,3 +65,2 @@ void SyntaxDocument::setupModeList(bool force)
     QString Group="Highlighting_Cache"+path+*it;
-
     if ((config->hasGroup(Group)) && (!force))
@@ -98,4 +97,2 @@ void SyntaxDocument::setupModeList(bool force)
             mli->identifier = path+(*it);
-#warning fixme
-/*
             config->setGroup(Group);
@@ -105,3 +102,2 @@ void SyntaxDocument::setupModeList(bool force)
             config->writeEntry("extension",mli->extension);
-*/
             myModeList.append(mli);
@@ -109,6 +105,4 @@ void SyntaxDocument::setupModeList(bool force)
         }
-      }
     }
-//  }
-
+  }
 //  config->sync();