From fa56dbf819b165349dd191ca65175687fd8fae80 Mon Sep 17 00:00:00 2001
From: koldo <koldo@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 1 Mar 2011 22:40:43 +0000
Subject: [PATCH] .Functions4U_Demo: Changed StaticPlugin demo classes names

git-svn-id: svn://ultimatepp.org/upp/trunk@3255 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 bazaar/Functions4U_Demo/Excel.cpp       |  4 ++--
 bazaar/Functions4U_Demo/Open.cpp        |  4 ++--
 bazaar/Functions4U_Demo/Spreadsheet.cpp | 10 +++++-----
 bazaar/Functions4U_Demo/Spreadsheet.h   | 10 +++++-----
 bazaar/Functions4U_Demo/init            |  1 +
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/bazaar/Functions4U_Demo/Excel.cpp b/bazaar/Functions4U_Demo/Excel.cpp
index c337bdf5e..68bb40189 100644
--- a/bazaar/Functions4U_Demo/Excel.cpp
+++ b/bazaar/Functions4U_Demo/Excel.cpp
@@ -4,12 +4,12 @@ using namespace Upp;
 
 #include "Spreadsheet.h"
 
-class ExcelSpreadsheet : public SpreadsheetPlugin {
+class ExcelSpreadsheet : public SpreadsheetAPI {
 private:
 	String filename;
 	
 public:
-	Spreadsheet_METHOD_LIST
+	Spreadsheet_API
 	ExcelSpreadsheet() {
 		puts("ExcelSpreadsheet new");
 	}
diff --git a/bazaar/Functions4U_Demo/Open.cpp b/bazaar/Functions4U_Demo/Open.cpp
index 7b947946f..7212c244a 100644
--- a/bazaar/Functions4U_Demo/Open.cpp
+++ b/bazaar/Functions4U_Demo/Open.cpp
@@ -4,12 +4,12 @@ using namespace Upp;
 
 #include "Spreadsheet.h"
 
-class OpenSpreadsheet : public SpreadsheetPlugin {
+class OpenSpreadsheet : public SpreadsheetAPI {
 private:
 	String filename;
 	
 public:
-	Spreadsheet_METHOD_LIST
+	Spreadsheet_API
 	OpenSpreadsheet() {
 		puts("OpenSpreadsheet new");
 	}
diff --git a/bazaar/Functions4U_Demo/Spreadsheet.cpp b/bazaar/Functions4U_Demo/Spreadsheet.cpp
index 3fd5b9218..09dd179b6 100644
--- a/bazaar/Functions4U_Demo/Spreadsheet.cpp
+++ b/bazaar/Functions4U_Demo/Spreadsheet.cpp
@@ -6,14 +6,14 @@ using namespace Upp;
 #include "Spreadsheet.h"
 
 
-bool SpreadsheetPlugin::Open(const char *filename) 				{return false;};
-void SpreadsheetPlugin::SetData(int row, int col, Value val) 	{};
+bool SpreadsheetAPI::Open(const char *filename) 				{return false;};
+void SpreadsheetAPI::SetData(int row, int col, Value val) 	{};
 
 
-bool Spreadsheet::Open(const char *filename) 			{return (static_cast<SpreadsheetPlugin *>(GetData()))->Open(filename);}
-void Spreadsheet::SetData(int row, int col, Value val)	{return (static_cast<SpreadsheetPlugin *>(GetData()))->SetData(row, col, val);}
+bool Spreadsheet::Open(const char *filename) 			{return (static_cast<SpreadsheetAPI *>(GetData()))->Open(filename);}
+void Spreadsheet::SetData(int row, int col, Value val)	{return (static_cast<SpreadsheetAPI *>(GetData()))->SetData(row, col, val);}
 
 
 INITBLOCK {
-	PluginRegister(Spreadsheet, SpreadsheetPlugin, "");
+	PluginRegister(Spreadsheet, SpreadsheetAPI, "");
 }
\ No newline at end of file
diff --git a/bazaar/Functions4U_Demo/Spreadsheet.h b/bazaar/Functions4U_Demo/Spreadsheet.h
index 58d16f8c0..0394195e7 100644
--- a/bazaar/Functions4U_Demo/Spreadsheet.h
+++ b/bazaar/Functions4U_Demo/Spreadsheet.h
@@ -3,20 +3,20 @@
 
 #include <Functions4U/Functions4U.h>
 
-#define Spreadsheet_METHOD_LIST					\
+#define Spreadsheet_API							\
 	virtual bool Open(const char *filename);	\
 	virtual void SetData(int row, int col, Value val);	
 	
 	
-class SpreadsheetPlugin {
+class SpreadsheetAPI {
 public:
-	Spreadsheet_METHOD_LIST
+	Spreadsheet_API
 };
 
 
-class Spreadsheet : public SpreadsheetPlugin, public StaticPlugin {
+class Spreadsheet : public SpreadsheetAPI, public StaticPlugin {
 public:
-	Spreadsheet_METHOD_LIST
+	Spreadsheet_API
 };
 
 
diff --git a/bazaar/Functions4U_Demo/init b/bazaar/Functions4U_Demo/init
index e86956df1..1ae13dc92 100644
--- a/bazaar/Functions4U_Demo/init
+++ b/bazaar/Functions4U_Demo/init
@@ -2,4 +2,5 @@
 #define _Functions4U_Demo_icpp_init_stub
 #include "Core/init"
 #include "Functions4U/init"
+#include "OfficeAutomation/init"
 #endif