소스 검색

Add "Use Calc Charset" preference. Simplify handling of preferences.

git-svn-id: file:///var/svn/tigccpp/trunk@526 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 18 년 전
부모
커밋
c6671499c4
2개의 변경된 파일7개의 추가작업 그리고 26개의 파일을 삭제
  1. 6 25
      ktigcc/preferences.cxx
  2. 1 1
      ktigcc/preferences.h

+ 6 - 25
ktigcc/preferences.cxx

@@ -82,7 +82,7 @@ int syn_XMLStrList(FILE *f,const QString &name,const QStringList &clist)
 }
 
 //returns 0 on success,-1 on file couldn't be created, and 1 if file couldn't be written to correctly.
-int SynToXML(Syn_SettingsForDoc &syn,const QString &destFileName)
+int SynToXML(Syn_SettingsForDoc &syn __attribute__((unused)),const QString &destFileName)
 {
     FILE *f=fopen(destFileName,"wb");
     if (!f)
@@ -1140,37 +1140,18 @@ void defaultSynHighlight(TIGCCPrefs *prefs)
 
 void loadPreferences(TIGCCPrefs *prefs,KConfig *cfg)
 {
-    if (!cfg->hasGroup("Preferences")) {
-      defaultPreferences(prefs);
-      return;
-    }
     cfg->setGroup("Preferences");
-    
-    if (cfg->hasKey("Lazy Loading"))
-        prefs->lazyLoading=cfg->readBoolEntry("Lazy Loading");
-    else
-        prefs->lazyLoading=true;
-    if (cfg->hasKey("Tab Width Asm"))
-        prefs->tabWidthAsm=cfg->readUnsignedNumEntry("Tab Width Asm");
-    else
-        prefs->tabWidthAsm=8;
-    if (cfg->hasKey("Tab Width C"))
-        prefs->tabWidthC=cfg->readUnsignedNumEntry("Tab Width C");
-    else
-        prefs->tabWidthC=2;
+    prefs->lazyLoading=cfg->readBoolEntry("Lazy Loading",true);
+    prefs->tabWidthAsm=cfg->readUnsignedNumEntry("Tab Width Asm",8);
+    prefs->tabWidthC=cfg->readUnsignedNumEntry("Tab Width C",2);
+    prefs->useCalcCharset=cfg->readBoolEntry("Use Calc Charset",true);
 }
 
 void savePreferences(TIGCCPrefs *prefs,KConfig *cfg)
 {
     cfg->setGroup("Preferences");
     cfg->writeEntry("Lazy Loading",(bool)prefs->lazyLoading);
+    cfg->writeEntry("Use Calc Charset",(bool)prefs->useCalcCharset);
     cfg->writeEntry("Tab Width Asm",(unsigned short)prefs->tabWidthAsm);
     cfg->writeEntry("Tab Width C",(unsigned short)prefs->tabWidthC);
 }
-
-void defaultPreferences(TIGCCPrefs *prefs)
-{
-    prefs->lazyLoading=true;
-    prefs->tabWidthC=2;
-    prefs->tabWidthAsm=8;
-}

+ 1 - 1
ktigcc/preferences.h

@@ -78,6 +78,7 @@ typedef struct
   bool lazyLoading;
   unsigned short tabWidthC;
   unsigned short tabWidthAsm;
+  bool useCalcCharset;
   Syn_SettingsForDoc synC;
   Syn_SettingsForDoc synS;
   Syn_SettingsForDoc synASM;
@@ -86,4 +87,3 @@ typedef struct
 
 void loadPreferences(TIGCCPrefs *prefs,KConfig *cfg);
 void savePreferences(TIGCCPrefs *prefs,KConfig *cfg);
-void defaultPreferences(TIGCCPrefs *prefs);