summaryrefslogtreecommitdiffstats
path: root/cpp/sca/samples
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/sca/samples')
-rw-r--r--cpp/sca/samples/store/cart.hpp14
-rw-r--r--cpp/sca/samples/store/catalog.hpp14
-rw-r--r--cpp/sca/samples/store/currency-composite.hpp9
-rw-r--r--cpp/sca/samples/store/currency.hpp14
-rw-r--r--cpp/sca/samples/store/item.hpp12
-rw-r--r--cpp/sca/samples/store/store-composite.hpp7
-rw-r--r--cpp/sca/samples/store/store-solution.hpp7
-rw-r--r--cpp/sca/samples/store/store-test.cpp16
-rw-r--r--cpp/sca/samples/store/store-ui.hpp11
9 files changed, 37 insertions, 67 deletions
diff --git a/cpp/sca/samples/store/cart.hpp b/cpp/sca/samples/store/cart.hpp
index 55e8409959..fe0aa0d81f 100644
--- a/cpp/sca/samples/store/cart.hpp
+++ b/cpp/sca/samples/store/cart.hpp
@@ -22,15 +22,13 @@
#ifndef store_cart_hpp
#define store_cart_hpp
-#include <string.h>
+#include <string>
#include "tuscany/function.hpp"
#include "tuscany/list.hpp"
#include "currency.hpp"
#include "item.hpp"
#include "catalog.hpp"
-using namespace tuscany;
-
namespace store
{
@@ -40,7 +38,7 @@ const double accum(const double total, const Item& item) {
class ShoppingCart {
public:
- virtual const list<Item> getAll() const = 0;
+ virtual const tuscany::list<Item> getAll() const = 0;
virtual const bool post(const Item& item) = 0;
@@ -51,9 +49,9 @@ public:
class ShoppingCartImpl : public ShoppingCart {
public:
- list<Item> cart;
+ tuscany::list<Item> cart;
- virtual const list<Item> getAll() const {
+ virtual const tuscany::list<Item> getAll() const {
return cart;
}
@@ -63,12 +61,12 @@ public:
}
virtual const bool deleteAll() {
- cart = list<Item>();
+ cart = tuscany::list<Item>();
return true;
}
virtual const double getTotal() const {
- lambda<double(double, Item)> a(accum);
+ tuscany::lambda<double(double, Item)> a(accum);
return reduce(a, 0.0, cart);
}
};
diff --git a/cpp/sca/samples/store/catalog.hpp b/cpp/sca/samples/store/catalog.hpp
index 6578dd71ed..da63ab593a 100644
--- a/cpp/sca/samples/store/catalog.hpp
+++ b/cpp/sca/samples/store/catalog.hpp
@@ -22,13 +22,11 @@
#ifndef store_catalog_hpp
#define store_catalog_hpp
-#include <string.h>
+#include <string>
#include "tuscany/list.hpp"
#include "currency.hpp"
#include "item.hpp"
-using namespace tuscany;
-
namespace store
{
@@ -37,13 +35,13 @@ public:
virtual const double convert(const double price) const = 0;
- virtual const list<Item> get() const = 0;
+ virtual const tuscany::list<Item> get() const = 0;
};
class CatalogImpl : public Catalog {
public:
- const string currencyCode;
+ const std::string currencyCode;
const CurrencyConverter& currencyConverter;
CatalogImpl(const CurrencyConverter& currencyConverter) :
@@ -54,9 +52,9 @@ public:
return currencyConverter.convert("USD", currencyCode, price);
}
- virtual const list<Item> get() const {
- const string currencySymbol = currencyConverter.getSymbol(currencyCode);
- return makeList(
+ virtual const tuscany::list<Item> get() const {
+ const std::string currencySymbol = currencyConverter.getSymbol(currencyCode);
+ return tuscany::makeList(
Item("Apple", currencyCode, currencySymbol, convert(2.99)),
Item("Orange", currencyCode, currencySymbol, convert(3.55)),
Item("Pear", currencyCode, currencySymbol, convert(1.55)));
diff --git a/cpp/sca/samples/store/currency-composite.hpp b/cpp/sca/samples/store/currency-composite.hpp
index a135ca660b..94b52b461e 100644
--- a/cpp/sca/samples/store/currency-composite.hpp
+++ b/cpp/sca/samples/store/currency-composite.hpp
@@ -22,12 +22,9 @@
#ifndef store_currencycomposite_hpp
#define store_currencycomposite_hpp
-#include <string.h>
-#include <math.h>
+#include <string>
#include "currency.hpp"
-using namespace tuscany;
-
namespace store
{
@@ -41,11 +38,11 @@ public:
CurrencyImpl() : currencyConverter(CurrencyConverterImpl()) {
}
- virtual const double convert(const string& fromCurrencyCode, const string& toCurrencyCode, const double amount) const {
+ virtual const double convert(const std::string& fromCurrencyCode, const std::string& toCurrencyCode, const double amount) const {
return currencyConverter.convert(fromCurrencyCode, toCurrencyCode, amount);
}
- virtual const string getSymbol(const string& currencyCode) const {
+ virtual const std::string getSymbol(const std::string& currencyCode) const {
return currencyConverter.getSymbol(currencyCode);
}
};
diff --git a/cpp/sca/samples/store/currency.hpp b/cpp/sca/samples/store/currency.hpp
index de4c8f72c0..a8228ea51c 100644
--- a/cpp/sca/samples/store/currency.hpp
+++ b/cpp/sca/samples/store/currency.hpp
@@ -22,11 +22,8 @@
#ifndef store_currency_hpp
#define store_currency_hpp
-#include <string.h>
#include <math.h>
-
-using std::string;
-using namespace tuscany;
+#include <string>
namespace store
{
@@ -34,15 +31,14 @@ namespace store
class CurrencyConverter {
public:
- virtual const double convert(const string& fromCurrencyCode, const string& toCurrencyCode, const double amount) const = 0;
-
- virtual const string getSymbol(const string& currencyCode) const = 0;
+ virtual const double convert(const std::string& fromCurrencyCode, const std::string& toCurrencyCode, const double amount) const = 0;
+ virtual const std::string getSymbol(const std::string& currencyCode) const = 0;
};
class CurrencyConverterImpl : public CurrencyConverter {
public:
- virtual const double convert(const string& fromCurrencyCode, const string& toCurrencyCode, const double amount) const {
+ virtual const double convert(const std::string& fromCurrencyCode, const std::string& toCurrencyCode, const double amount) const {
if(toCurrencyCode == "USD")
return amount;
if(toCurrencyCode == "EUR")
@@ -50,7 +46,7 @@ public:
return amount;
}
- virtual const string getSymbol(const string& currencyCode) const {
+ virtual const std::string getSymbol(const std::string& currencyCode) const {
if(currencyCode == "USD")
return "$";
if(currencyCode == "EUR")
diff --git a/cpp/sca/samples/store/item.hpp b/cpp/sca/samples/store/item.hpp
index 64b99c9b39..ab8e52769b 100644
--- a/cpp/sca/samples/store/item.hpp
+++ b/cpp/sca/samples/store/item.hpp
@@ -22,24 +22,22 @@
#ifndef store_item_hpp
#define store_item_hpp
-#include <string.h>
-
-using namespace tuscany;
+#include <string>
namespace store
{
class Item {
public:
- string name;
+ std::string name;
double price;
- string currencyCode;
- string currencySymbol;
+ std::string currencyCode;
+ std::string currencySymbol;
Item() {
}
- Item(const string& name, const string& currencyCode, const string& currencySymbol, const double price) :
+ Item(const std::string& name, const std::string& currencyCode, const std::string& currencySymbol, const double price) :
name(name), price(price), currencyCode(currencyCode), currencySymbol(currencySymbol) {
}
diff --git a/cpp/sca/samples/store/store-composite.hpp b/cpp/sca/samples/store/store-composite.hpp
index 7cbaa62561..1d5c993c3f 100644
--- a/cpp/sca/samples/store/store-composite.hpp
+++ b/cpp/sca/samples/store/store-composite.hpp
@@ -22,7 +22,6 @@
#ifndef store_storecomposite_hpp
#define store_storecomposite_hpp
-#include <string.h>
#include "tuscany/list.hpp"
#include "currency.hpp"
#include "currency-composite.hpp"
@@ -31,8 +30,6 @@
#include "cart.hpp"
#include "store-ui.hpp"
-using namespace tuscany;
-
namespace store
{
@@ -49,11 +46,11 @@ public:
catalog(CatalogImpl(currency)), cart(ShoppingCartImpl()), storeUI(StoreUIImpl(catalog, cart)) {
}
- virtual const list<Item> getCatalog() const {
+ virtual const tuscany::list<Item> getCatalog() const {
return storeUI.getCatalog();
}
- virtual const list<Item> getCart() const {
+ virtual const tuscany::list<Item> getCart() const {
return storeUI.getCart();
}
diff --git a/cpp/sca/samples/store/store-solution.hpp b/cpp/sca/samples/store/store-solution.hpp
index ba36829718..73ddccafbe 100644
--- a/cpp/sca/samples/store/store-solution.hpp
+++ b/cpp/sca/samples/store/store-solution.hpp
@@ -22,13 +22,10 @@
#ifndef store_storesolution_hpp
#define store_storesolution_hpp
-#include <string.h>
#include "tuscany/list.hpp"
#include "store-composite.hpp"
#include "currency-composite.hpp"
-using namespace tuscany;
-
namespace store
{
@@ -44,11 +41,11 @@ public:
currency(CurrencyImpl()), store(StoreImpl(currency)) {
}
- virtual const list<Item> getCatalog() const {
+ virtual const tuscany::list<Item> getCatalog() const {
return store.getCatalog();
}
- virtual const list<Item> getCart() const {
+ virtual const tuscany::list<Item> getCart() const {
return store.getCart();
}
diff --git a/cpp/sca/samples/store/store-test.cpp b/cpp/sca/samples/store/store-test.cpp
index 98be2a3037..bfbf5459ac 100644
--- a/cpp/sca/samples/store/store-test.cpp
+++ b/cpp/sca/samples/store/store-test.cpp
@@ -23,16 +23,10 @@
* Store Test case.
*/
-#include <iostream>
-#include <string>
#include <assert.h>
+#include <iostream>
#include "store-solution.hpp"
-using std::cout;
-using std::endl;
-
-using namespace tuscany;
-
namespace store
{
@@ -49,12 +43,10 @@ bool testComponentAssembly() {
}
int main() {
- using namespace store;
-
- cout << "Testing..." << endl;
+ std::cout << "Testing..." << std::endl;
- testComponentAssembly();
- cout << "OK" << endl;
+ store::testComponentAssembly();
+ std::cout << "OK" << std::endl;
return 0;
}
diff --git a/cpp/sca/samples/store/store-ui.hpp b/cpp/sca/samples/store/store-ui.hpp
index 251924e67c..3dea169cae 100644
--- a/cpp/sca/samples/store/store-ui.hpp
+++ b/cpp/sca/samples/store/store-ui.hpp
@@ -22,24 +22,21 @@
#ifndef store_storeui_hpp
#define store_storeui_hpp
-#include <string.h>
#include "tuscany/list.hpp"
#include "currency.hpp"
#include "item.hpp"
#include "catalog.hpp"
#include "cart.hpp"
-using namespace tuscany;
-
namespace store
{
class StoreUI {
public:
- virtual const list<Item> getCatalog() const =0;
+ virtual const tuscany::list<Item> getCatalog() const =0;
- virtual const list<Item> getCart() const = 0;
+ virtual const tuscany::list<Item> getCart() const = 0;
virtual const double getTotal() const =0;
@@ -54,11 +51,11 @@ public:
StoreUIImpl(const Catalog& catalog, ShoppingCart& cart) : catalog(catalog), cart(cart) {
}
- virtual const list<Item> getCatalog() const {
+ virtual const tuscany::list<Item> getCatalog() const {
return catalog.get();
}
- virtual const list<Item> getCart() const {
+ virtual const tuscany::list<Item> getCart() const {
return cart.getAll();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 23:57:48 +0000