core/dictionary.cpp: use readLines() from file.h

src/core/dictionary.cpp

@@ -3,6 +3,7 @@
 #include <cstdio>
 #include <iterator>
 #include <algorithm>
+#include "file.h"
 #include "string.h"
 #include "dictionary.h"
 
@@ -22,26 +23,21 @@ struct StringContains {
 
 bool Dictionary::loadFromFile(const std::string& filename)
 {
-	FILE *fd;
+	strlist_t lines;
-	char buf[1024];
-
-	fd = fopen(filename.c_str(), "r");
-	if (!fd) {
-		return false;
-	}
 
 	// Clear before adding.
 	clear();
 
-	// Read each line and add to the dictionary.
+	if (readLines(filename, lines)) {
-	while(fgets(buf, sizeof(buf), fd) != NULL) {
-		std::string word(buf);
-		add(trim(word));
-	}
 
-	fclose(fd);
+		// Read each line and add to the dictionary.
+		for(auto it = lines.begin(); it != lines.end(); it++) {
+			add(*it);
+		}
 		return true;
 	}
+	return false;
+}
 
 void Dictionary::add(const std::string& word)
 {