#
#
# patch "src/util/Settings.cpp"
#  from [f7018e2041710b4e9759f18b27ac9dab49363956]
#    to [9cf93066e0b4925188cea8ad17e68095e491e6aa]
#
============================================================
--- src/util/Settings.cpp	f7018e2041710b4e9759f18b27ac9dab49363956
+++ src/util/Settings.cpp	9cf93066e0b4925188cea8ad17e68095e491e6aa
@@ -25,40 +25,44 @@ Settings* Settings::singleton()
 
 Settings* Settings::singleton()
 {
-	if (!instance)
-	{
-		instance = new Settings();
-	}
-	return instance;		
+    if (!instance)
+    {
+        instance = new Settings();
+    }
+    return instance;
 }
 
 Settings::Settings() : QSettings() {}
 
 Settings::~Settings() {}
 
-void Settings::setBool(const QString &name, bool value)
-{	
-	singleton()->setValue(name, value);
+void Settings::setBool(const QString & name, bool value)
+{
+    I(!name.isEmpty());
+    singleton()->setValue(name, value);
 }
 
-bool Settings::getBool(const QString &name, bool defaultVal)
+bool Settings::getBool(const QString & name, bool defaultVal)
 {
-	return singleton()->value(name, defaultVal).toBool();
+    I(!name.isEmpty());
+    return singleton()->value(name, defaultVal).toBool();
 }
 
 void Settings::setWindowGeometry(const QByteArray & data, const QString & name)
 {
+    I(!name.isEmpty());
     singleton()->setValue(name, data);
 }
 
 QByteArray Settings::getWindowGeometry(const QString & name)
 {
+    I(!name.isEmpty());
     return singleton()->value(name).toByteArray();
 }
 
 void Settings::sync()
 {
-	singleton()->QSettings::sync();
+    singleton()->QSettings::sync();
 }
 
 QString Settings::getMtnBinaryPath()
@@ -104,6 +108,7 @@ void Settings::saveHeaderViewState(QHead
 
 void Settings::saveHeaderViewState(QHeaderView *view, QString name)
 {
+    I(!name.isEmpty());
     QStringList cols;
     for (int i=0, j=view->count(); i<j; i++)
     {
@@ -119,20 +124,21 @@ void Settings::restoreHeaderViewState(QH
 
 void Settings::restoreHeaderViewState(QHeaderView *view, QString name)
 {
+    I(!name.isEmpty());
     QString colConfig(singleton()->value(name).toString());
     QStringList cols = colConfig.split(",", QString::SkipEmptyParts);
-    
+
     int colCount = cols.size();
     if (colCount == 0) return;
-    
+
     int curColCount = view->count();
-    
+
     for (int i=0; i < colCount && i < curColCount; i++)
     {
         QStringList parts = cols.at(i).split(":", QString::SkipEmptyParts);
-        
+
         I(parts.size() == 2);
-        
+
         view->resizeSection(i, parts.at(0).toInt());
         view->moveSection(view->visualIndex(i), parts.at(1).toInt());
     }
@@ -140,33 +146,37 @@ QByteArray Settings::getSplitterState(QS
 
 QByteArray Settings::getSplitterState(QString name)
 {
-	return singleton()->value(name).toByteArray();
+    I(!name.isEmpty());
+    return singleton()->value(name).toByteArray();
 }
 
 void Settings::setSplitterState(const QByteArray & byteArray, QString name)
 {
-	Settings *settings = singleton();
-	settings->setValue(name, byteArray);
+    I(!name.isEmpty());
+    Settings *settings = singleton();
+    settings->setValue(name, byteArray);
 }
 
 void Settings::setItemList(const QString & name, const QStringList & items)
 {
+    I(!name.isEmpty());
     Settings *settings = singleton();
-	settings->setValue(name, items);
+    settings->setValue(name, items);
 }
 
 QStringList Settings::getItemList(const QString & name)
 {
+    I(!name.isEmpty());
     return singleton()->value(name).toStringList();
 }
 
 void Settings::addItemToList(const QString & name, const QString & item, int maxItems)
 {
     QStringList list = getItemList(name);
-    
-	// move an already recorded item to the front
+
+    // move an already recorded item to the front
     int pos = list.indexOf(item);
-	if (pos > -1) 
+    if (pos > -1)
     {
         list.move(pos, 0);
     }
@@ -178,15 +188,15 @@ void Settings::addItemToList(const QStri
         }
         list.prepend(item);
     }
-	setItemList(name, list);	
+    setItemList(name, list);
 }
 
 void Settings::removeItemFromList(const QString & name, const QString & item)
 {
     QStringList list = getItemList(name);
-	int pos = list.indexOf(item);
-	if (pos == -1) return;
-	list.removeAt(pos);
-	setItemList(name, list);
+    int pos = list.indexOf(item);
+    if (pos == -1) return;
+    list.removeAt(pos);
+    setItemList(name, list);
 }