From fa7cd5369b7d9f947b0b26ca681e94b81068a3ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Feb 2016 14:48:42 +0100
Subject: StoreAPI -> Store

Calling a class an API is a bit redundant...
---
 src/libexpr/common-opts.hh | 2 +-
 src/libexpr/eval.cc        | 2 +-
 src/libexpr/eval.hh        | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/libexpr')

diff --git a/src/libexpr/common-opts.hh b/src/libexpr/common-opts.hh
index 0500b0a832a3..cb2732d6fe7e 100644
--- a/src/libexpr/common-opts.hh
+++ b/src/libexpr/common-opts.hh
@@ -4,7 +4,7 @@
 
 namespace nix {
 
-class StoreAPI;
+class Store;
 
 /* Some common option parsing between nix-env and nix-instantiate. */
 bool parseAutoArgs(Strings::iterator & i,
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 702b12ee48ff..de945442224d 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -244,7 +244,7 @@ static Strings parseNixPath(const string & in)
 }
 
 
-EvalState::EvalState(const Strings & _searchPath, ref<StoreAPI> store)
+EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
     : sWith(symbols.create("<with>"))
     , sOutPath(symbols.create("outPath"))
     , sDrvPath(symbols.create("drvPath"))
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index a4286ce1f065..cf2d578644e1 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -16,7 +16,7 @@
 namespace nix {
 
 
-class StoreAPI;
+class Store;
 class EvalState;
 
 
@@ -83,7 +83,7 @@ public:
 
     Value vEmptySet;
 
-    const ref<StoreAPI> store;
+    const ref<Store> store;
 
 private:
     SrcToStore srcToStore;
@@ -100,7 +100,7 @@ private:
 
 public:
 
-    EvalState(const Strings & _searchPath, ref<StoreAPI> store);
+    EvalState(const Strings & _searchPath, ref<Store> store);
     ~EvalState();
 
     void addToSearchPath(const string & s, bool warn = false);
-- 
cgit 1.4.1