From f487f1ce78ccb837d3b9cbfc327109cdc4f44884 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 2 Mar 2016 08:27:06 -0500
Subject: [PATCH] init: initializeDatabase becomes initializeData, as
 configuration is added

---
 src/init.cpp  | 3 ++-
 src/timew.cpp | 6 ++++--
 src/timew.h   | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index d800d786..75d06794 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -25,6 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
+#include <Configuration.h>
 #include <Database.h>
 #include <Rules.h>
 #include <common.h>
@@ -34,7 +35,7 @@
 #include <iostream> // TODO Remove
 
 ////////////////////////////////////////////////////////////////////////////////
-void initializeDatabase (Database& database)
+void initializeData (Configuration& configuration, Database& database)
 {
 }
 
diff --git a/src/timew.cpp b/src/timew.cpp
index 68cec721..8e7e5ea9 100644
--- a/src/timew.cpp
+++ b/src/timew.cpp
@@ -25,9 +25,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
-//#include <Grammar.h>
+#include <Configuration.h>
 #include <Database.h>
 #include <Rules.h>
+//#include <Grammar.h>
 #include <common.h>
 #include <commands.h>
 #include <timew.h>
@@ -52,8 +53,9 @@ int main (int argc, const char** argv)
     try
     {
       // TODO Load configuration ~/.timewrc || $TIMEWRC.
+      Configuration configuration;
       Database database;
-      initializeDatabase (database);
+      initializeData (configuration, database);
 
       // TODO Arrange the following to minimize memory use.
       // TODO Load CLI grammar.
diff --git a/src/timew.h b/src/timew.h
index 31b434f8..9b3dce11 100644
--- a/src/timew.h
+++ b/src/timew.h
@@ -27,11 +27,12 @@
 #ifndef INCLUDED_TIMEW
 #define INCLUDED_TIMEW
 
+#include <Configuration.h>
 #include <Database.h>
 #include <Rules.h>
 
 // init.cpp
-void initializeDatabase (Database&);
+void initializeData (Configuration&, Database&);
 int dispatchCommand (int, const char**, Rules&);
 
 #endif