X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2Fplpbus%2FBusMessage.hh;h=3a2cd093cd083118a3845fe5d7ef4fada2459ea3;hb=db8faefedaf3d3e94865002485d8b5fa491ce4c5;hp=2436d8b5fe638f2a40d82657ca0e78ff312b7bc4;hpb=a4cadd50e661871c819f9f253f3595cfba647aed;p=libplpbus.git

diff --git a/src/plpbus/BusMessage.hh b/src/plpbus/BusMessage.hh
index 2436d8b..3a2cd09 100644
--- a/src/plpbus/BusMessage.hh
+++ b/src/plpbus/BusMessage.hh
@@ -8,28 +8,38 @@
 #ifndef BUSMESSAGE_H_
 #define BUSMESSAGE_H_
 
-#include <iostream>
-#include <omniORB4/CORBA.h>
+#include <string>
 
 #include "RequestResponseBus.hh"
 
+using namespace plpbus_orb;
+
 namespace plpbus {
 	class BusMessage
 	{
 		public:
-			plpbus_orb::DataItemSequence	_dataItemSeq;
+			DataItemSequence	*_dataItemSeq;
 
-			BusMessage();
-			BusMessage(const char *name_param, const char *string_value_param);
+			BusMessage(long type_param);
+			BusMessage(long type_param, const char *arg_name_param, const char *arg_string_value_param);
 			virtual ~BusMessage();
-			int add_string_parameter(const char *name_param, const char *string_value_param);
-			int add_long_parameter(const char *name_param, long value_param);
-			int add_int_parameter(const char *name_param, int value_param);
-			int add_double_parameter(const char *name_param, double value_param);
-			int add_float_parameter(const char *name_param, float value_param);
+			int add_cstring_parameter(const char *arg_name_param, const char *value_param);
+			int add_string_parameter(std::string arg_name_param, std::string value_param);
+			int add_long_parameter(std::string arg_name_param, long value_param);
+			int add_int_parameter(std::string arg_name_param, int value_param);
+			int add_double_parameter(std::string arg_name_param, double value_param);
+			int add_float_parameter(std::string arg_name_param, float value_param);
+			long get_type(int *err_flg);
+			std::string get_string_parameter(std::string arg_name_param, int *err_flg);
+			long get_long_parameter(std::string arg_name_param, int *err_flg);
+			int get_int_parameter(std::string arg_name_param, int *err_flg);
+			double get_double_parameter(std::string arg_name_param, int *err_flg);
+			float get_float_parameter(std::string arg_name_param, int *err_flg);
+			unsigned long get_parameter_count();
 			void printout();
-		private:
-			void printout_dataitem(long index, plpbus_orb::DataItem *item);
+		protected:
+			BusMessage();
+			void printout_dataitem(long index, void *item);
 	};
 }