The code is compiling again, but it's far from being able to run yet.

1 files changed, 21 insertions, 53 deletions

diff --git a/config.h b/config.h
index 3bb8ed0d..39404e19 100644
--- a/config.h
+++ b/config.h
@@ -2,38 +2,33 @@
 #define _CONFIG_H
 
 #include "ledger.h"
-#include "timing.h"
-
-#include <iostream>
-#include <memory>
-#include <list>
 
 namespace ledger {
 
 class config_t
 {
  public:
-  std::string init_file;
-  std::string data_file;
-  std::string cache_file;
-  std::string price_db;
-
-  std::string balance_format;
-  std::string register_format;
-  std::string wide_register_format;
-  std::string plot_amount_format;
-  std::string plot_total_format;
-  std::string print_format;
-  std::string write_hdr_format;
-  std::string write_xact_format;
-  std::string equity_format;
-  std::string prices_format;
-  std::string pricesdb_format;
-
-  std::string date_input_format;
-
-  std::string account;
-  std::string pager;
+  path init_file;
+  path data_file;
+  path cache_file;
+  path price_db;
+
+  string balance_format;
+  string register_format;
+  string wide_register_format;
+  string plot_amount_format;
+  string plot_total_format;
+  string print_format;
+  string write_hdr_format;
+  string write_xact_format;
+  string equity_format;
+  string prices_format;
+  string pricesdb_format;
+
+  string date_input_format;
+
+  string account;
+  string pager;
 
   unsigned long pricing_leeway;
 
@@ -47,33 +42,6 @@ class config_t
   config_t();
 };
 
-//////////////////////////////////////////////////////////////////////
-
-std::string resolve_path(const std::string& path);
-
-//////////////////////////////////////////////////////////////////////
-
-void trace(const std::string& cat, const std::string& str);
-void trace_push(const std::string& cat, const std::string& str,
-		timing_t& timer);
-void trace_pop(const std::string& cat, const std::string& str,
-	       timing_t& timer);
-
-#define TRACE(cat, msg) if (config.trace_mode) trace(#cat, msg)
-#define TRACE_(cat, msg) if (trace_mode) trace(#cat, msg)
-
-#define TRACE_PUSH(cat, msg)					\
-  timing_t timer_ ## cat(#cat);					\
-  if (config.trace_mode) trace_push(#cat, msg, timer_ ## cat)
-#define TRACE_PUSH_(cat, msg)					\
-  timing_t timer_ ## cat(#cat);					\
-  if (trace_mode) trace_push(#cat, msg, timer_ ## cat)
-
-#define TRACE_POP(cat, msg)					\
-  if (config.trace_mode) trace_pop(#cat, msg, timer_ ## cat)
-#define TRACE_POP_(cat, msg)					\
-  if (trace_mode) trace_pop(#cat, msg, timer_ ## cat)
-
 } // namespace ledger
 
 #endif // _CONFIG_H