put configuration related functions into appropriate structs

2010-02-17 00:15:15 +01:00
parent d45e3b382f
commit a24736475e
3 changed files with 464 additions and 460 deletions
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -223,12 +223,12 @@ namespace
 int main(int argc, char *argv[])
 {
 	setlocale(LC_ALL, "");
-	
 	CreateConfigDir();
-	DefaultConfiguration(Config);
-	DefaultKeys(Key);
-	ReadConfiguration(Config);
-	ReadKeys(Key);
+	
+	Config.SetDefaults();
+	Key.SetDefaults();
+	Config.Read();
+	Key.Read();
 	
 	if (getenv("MPD_HOST"))
 		Mpd.SetHostname(getenv("MPD_HOST"));