From dc53f9a44b0bf07d0df0ac8939c875c08d3e1a3c Mon Sep 17 00:00:00 2001
From: Jaroslav Barton <djaara@djaara.net>
Date: Mon, 27 Apr 2009 10:33:24 +0200
Subject: [PATCH] Changes in configuration file structure.

---
 src/FingerManagerWindow.cpp | 20 ++++++++------------
 src/FingerManagerWindow.h   |  1 -
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/FingerManagerWindow.cpp b/src/FingerManagerWindow.cpp
index ef8a072..56ccff2 100644
--- a/src/FingerManagerWindow.cpp
+++ b/src/FingerManagerWindow.cpp
@@ -164,25 +164,21 @@ void FingerManagerWindow::loadConfig(KConfig *settings) {
 
 	// Load checkboxes
 	cfgGroup = settings->group("fingers");
-	fingersCount = cfgGroup.readEntry("count", 0);
-	for (int i = 0; i < fingersCount && i < MAX_FINGERS; i++) {
+	for (int i = 0; i < MAX_FINGERS; i++) {
 		QString name;
 		
 		name.sprintf("%d/x", i+1);
 		int x = cfgGroup.readEntry(name, 0);
-
+		
 		name.sprintf("%d/y", i+1);
 		int y = cfgGroup.readEntry(name, 0);
 		
-		name.sprintf("%d/idx", i+1);
-		unsigned int idx = cfgGroup.readEntry(name, i);
-		
-		if (x && y && idx < MAX_FINGERS) {
-			qDebug("Adding new checkbox[%d]", idx);
-			fingers[idx] = createCheckBox(idx, x, y);
+		if (x && y) {
+			qDebug("Adding new checkbox[%d]", i);
+			fingers[i] = createCheckBox(i, x, y);
 		} else {
-			qDebug("Checkbox[%d] skipped", idx);
-			fingers[idx] = 0;
+			qDebug("Checkbox[%d] skipped", i);
+			fingers[i] = 0;
 		}
 	}
 
@@ -318,7 +314,7 @@ void FingerManagerWindow::initComponents() {
  */
 FingerManagerWindow::~FingerManagerWindow() {
 	if (user) delete user;
-	for (int i = 0; i < fingersCount; i++) {
+	for (int i = 0; i < MAX_FINGERS; i++) {
 		if (fingers[i]) delete fingers[i];
 	}
 	if (dbc) dbc->releaseConn();
diff --git a/src/FingerManagerWindow.h b/src/FingerManagerWindow.h
index c2d7d0e..cf666a6 100644
--- a/src/FingerManagerWindow.h
+++ b/src/FingerManagerWindow.h
@@ -52,7 +52,6 @@ class FingerManagerWindow : public KCModule {
 		KSeparator	*separator;
 		QGroupBox	*box;
 		FMDbusConn	*dbc;
-		int		fingersCount;
 		QString		login;
 		KUser		*user;
 		
-- 
2.11.4.GIT