[prev in list] [next in list] [prev in thread] [next in thread] 

List:       prelude-cvslog
Subject:    [prelude-cvslog] r10567 - in lmledit/trunk: . ruleset-parser
From:       noreply () prelude-ids ! org
Date:       2008-05-05 19:49:10
Message-ID: 20080505194910.CAD288A0085 () inferno ! prelude-ids ! com
[Download RAW message or body]

Author: pollux
Date: 2008-05-05 21:49:10 +0200 (Mon, 05 May 2008)
New Revision: 10567

Modified:
   lmledit/trunk/mainwindow.cpp
   lmledit/trunk/ruleset-parser/parser.cpp
   lmledit/trunk/ruleset-parser/parser.h
Log:
Check if file was successfully loaded, and warn user if not.


Modified: lmledit/trunk/mainwindow.cpp
===================================================================
--- lmledit/trunk/mainwindow.cpp	2008-05-05 19:42:05 UTC (rev 10566)
+++ lmledit/trunk/mainwindow.cpp	2008-05-05 19:49:10 UTC (rev 10567)
@@ -130,12 +130,16 @@
 	QApplication::setOverrideCursor(Qt::WaitCursor);
 
 	RulesetParser parser(fileName);
-	//QMessageBox::warning(this, tr("Application"),
-	//		tr("Rules: %1")
-	//		.arg(parser.rulesNumber())
-	//		);
 	QApplication::restoreOverrideCursor();
 
+	if (!parser.isValid()) {
+		QMessageBox::warning(this, tr("Application"),
+			tr("Could not load ruleset file: %1")
+			.arg(fileName)
+			);
+		return;
+	}
+
 	if (parser.rulesNumber() == 0) {
 		statusBar()->showMessage(tr("Empty ruleset (loading failed ?)"), 4000);
 		return;

Modified: lmledit/trunk/ruleset-parser/parser.cpp
===================================================================
--- lmledit/trunk/ruleset-parser/parser.cpp	2008-05-05 19:42:05 UTC (rev 10566)
+++ lmledit/trunk/ruleset-parser/parser.cpp	2008-05-05 19:49:10 UTC (rev 10567)
@@ -7,6 +7,7 @@
 #include "parser.h"
 
 RulesetParser::RulesetParser(const QString &filename)
+	: _is_valid(false)
 {
 	int ret;
 	QFile file(filename);
@@ -33,6 +34,7 @@
 		}
 		line = in.readLine();
 	}
+	_is_valid = true;
 }
 
 int RulesetParser::process_line(QString &input)

Modified: lmledit/trunk/ruleset-parser/parser.h
===================================================================
--- lmledit/trunk/ruleset-parser/parser.h	2008-05-05 19:42:05 UTC (rev 10566)
+++ lmledit/trunk/ruleset-parser/parser.h	2008-05-05 19:49:10 UTC (rev 10567)
@@ -12,6 +12,8 @@
 	RulesetParser();
 	RulesetParser(const QString &filename);
 
+	bool isValid() const { return _is_valid; }
+
 	int rulesNumber() { return _rules_list.size(); }
 
 	const Rule * operator[](int index);
@@ -26,6 +28,7 @@
 	QString _buffer;
 	QString _raw_buffer;
 	QList<Rule*> _rules_list;
+	bool _is_valid;
 };
 
 #endif /* __RULESET_PARSER__ */


[prev in list] [next in list] [prev in thread] [next in thread]