X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=src%2Fkernel%2Fkernel.cpp;h=c6a9d1795d252fd286c8ca2266cb406fa141bf01;hb=0584aeb7c0bebaa46738dc1cc81a3a7dc463fd17;hp=d67acede310ea76508526958845534f70152c89c;hpb=bff1b59055aaba5927b1e2fc0c53f72d0b43a2df;p=vlp.git

diff --git a/src/kernel/kernel.cpp b/src/kernel/kernel.cpp
index d67aced..c6a9d17 100644
--- a/src/kernel/kernel.cpp
+++ b/src/kernel/kernel.cpp
@@ -71,6 +71,8 @@
 #include "kill_interpreter_dialog.h"
 #include "connect_dialog.h"
 
+#include "vlp/config.h"
+
 /* File resides in top directory (where are Makefiles)*/
 #include "../../config.h"
 
@@ -196,93 +198,19 @@ void QKernel::loadConfig(const QString & fname)
  */
 void QKernel::loadConfig(const char * fname)
 {
-	config_t cfg;
-	config_setting_t *setting;
+	loglan::vlp::Config config;
+	if(config.load(fname)) {
+		NodeNumber = config.getNodeNumber();
+		ConType = config.getConnectionType();
 
-	/* Hack for checking if file exists without using external libs.*/
 
-	FILE * file = fopen(fname, "rt");
-	if (!file) {
-		fprintf(stderr, "Error: Cannot load configuration file: %s!\n", 
-									fname);
-		exit(3);
-	}
-	/* File exists, so file has been locked. Release it. */
-
-	config_init(&cfg);
-
-	/* Read the file. If there is an error, report it and exit. */
-	if (!config_read(&cfg, file)) {
-		fprintf(stderr, "%s! In file %s, line %d\n", 
-			config_error_text(&cfg), 
-			config_error_file(&cfg), 
-			config_error_line(&cfg));
-		config_destroy(&cfg);
-		fclose(file);
-		exit(3);
-	}
-
-	setting = config_lookup(&cfg, "node_number");
-	if (setting) {
-		NodeNumber = config_setting_get_int(setting);
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-					"Warning", fname, "node_number");
-		config_destroy(&cfg);
-		fclose(file);
-		exit(3);
-	}
-
-	setting = config_lookup(&cfg, "type");
-	if (setting) {
-		/* same as strcmp(..) == 0 */
-		if (!strcmp(config_setting_get_string(setting), "explicit")) {
-			ConType = 1;
-		} else {
-			ConType = 2;
+		std::vector<std::string> hosts = config.getHosts();
+		for (unsigned int i = 0; i < hosts.size(); i++) {
+			ConnectList.append(new ConnectEntry(hosts[i].c_str()));
 		}
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "type");
-	}
 
-	setting = config_lookup(&cfg, "host");
-	if (setting) {
-		switch(config_setting_type(setting)) {
-		/* TODO: Deprecated. Made for back compatibility. */
-		case CONFIG_TYPE_STRING:
-			ConnectList.append(new ConnectEntry((char*)
-					config_setting_get_string(setting)));
-			break;
-		case CONFIG_TYPE_ARRAY: {
-			int size = config_setting_length(setting);
-			for (int i = 0; i < size; i++) {
-				ConnectList.append(new ConnectEntry((char*)
-					config_setting_get_string_elem(setting,
-									i)));
-			}
-			break;
-		}
-		default:
-			fprintf(stderr, "%s! In file %s, bad entry type for %s."
-							" Will not be read.\n", 
-							"Error", fname, "host");
-		}
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "host");
+		strncpy(progdir, config.getProgramDir(), 256);
 	}
-
-	setting = config_lookup(&cfg, "progdir");
-	if (setting){
-		strncpy(progdir, config_setting_get_string(setting), 256);
-	} else {
-		fprintf(stderr, "%s! In file %s, '%s' was not found.\n", 
-						"Warning", fname, "progdir");
-	}
-
-	config_destroy(&cfg);
-	fclose(file);
 }
 
 /**
@@ -376,8 +304,6 @@ void QKernel::on_actionHelp_triggered()
  */
 void QKernel::RunGraphModule(char *sk)
 {
-	char cmd[255];
-
 	QString program = getHomeDir();
 	program += "/modules/loggraph";
 
@@ -806,12 +732,12 @@ void QKernel::IntMessage(int sock)
  * Writes message to kernel logger.
  * @parame msg String with message to log
  */
-void QKernel::WriteMessage(char *msg)
+void QKernel::WriteMessage(const char *msg)
 {
 	int x;
-	int y;
+// 	int y;
 	x = desktop->textCursor().blockNumber();
-	y = desktop->textCursor().columnNumber();
+// 	y = desktop->textCursor().columnNumber();
 
 	if (x > 100) {
 		desktop->clear();