diff options
Diffstat (limited to 'tools/intergen/cppgen/include')
3 files changed, 2 insertions, 94 deletions
diff --git a/tools/intergen/cppgen/include/cppgen/generator_preferences.h b/tools/intergen/cppgen/include/cppgen/generator_preferences.h index 5278a24417..d0a58950e2 100644 --- a/tools/intergen/cppgen/include/cppgen/generator_preferences.h +++ b/tools/intergen/cppgen/include/cppgen/generator_preferences.h @@ -43,18 +43,15 @@ struct TypePreferences { int minimum_interger_size; bool avoid_unsigned; bool generate_json; - bool generate_dbus; TypePreferences(int minimum_interger_size, bool avoid_unsigned, - bool generate_json, - bool generate_dbus); + bool generate_json); }; struct Preferences { Preferences(int minimum_interger_size, bool avoid_unsigned, bool generate_json, - bool generate_dbus, const std::set<std::string>& requested_interfaces); TypePreferences type_preferences; std::set<std::string> requested_interfaces; diff --git a/tools/intergen/cppgen/include/cppgen/message_factory_function.h b/tools/intergen/cppgen/include/cppgen/message_factory_function.h index da63b4453a..aa8a0ab6c4 100644 --- a/tools/intergen/cppgen/include/cppgen/message_factory_function.h +++ b/tools/intergen/cppgen/include/cppgen/message_factory_function.h @@ -46,8 +46,7 @@ class Interface; class MessageFactoryFunction: public CppFunction { public: enum SerializationType { - kJson, - kDbus + kJson }; // Methods diff --git a/tools/intergen/cppgen/include/cppgen/struct_type_dbus_serializer.h b/tools/intergen/cppgen/include/cppgen/struct_type_dbus_serializer.h deleted file mode 100644 index 64872f3265..0000000000 --- a/tools/intergen/cppgen/include/cppgen/struct_type_dbus_serializer.h +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (c) 2014, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef CPPGEN_STRUCT_TYPE_DBUS_SERIALIZER_H -#define CPPGEN_STRUCT_TYPE_DBUS_SERIALIZER_H - -#include "cppgen/cpp_function.h" - -namespace codegen { -class Interface; -class Struct; -class TypePreferences; - -class StructTypeDbusMessageSignatureMethod: public CppFunction { - public: - StructTypeDbusMessageSignatureMethod(const TypePreferences* preferences, - const Struct* strct, - bool substructure); - ~StructTypeDbusMessageSignatureMethod(); - private: - // CppFunction interface - void DefineBody(std::ostream* os) const; - private: - const TypePreferences* preferences_; - bool substructure_; - const Struct* strct_; -}; - -class StructTypeFromDbusReaderConstructor : public CppStructConstructor { - public: - StructTypeFromDbusReaderConstructor(const TypePreferences* preferences, - const Struct* strct, - bool substructure, - const std::string& base_class_name); - ~StructTypeFromDbusReaderConstructor(); - private: - // CppFunction interface - void DefineBody(std::ostream* os) const; - private: - const TypePreferences* preferences_; - bool substructure_; - const Struct* strct_; -}; - -class StructTypeToDbusWriterMethod : public CppFunction { - public: - StructTypeToDbusWriterMethod(const Struct* strct, - bool substructure); - ~StructTypeToDbusWriterMethod(); - private: - // CppFunction interface - void DefineBody(std::ostream* os) const; - private: - bool substructure_; - const Struct* strct_; -}; - -} // namespace codegen - -#endif // CPPGEN_STRUCT_TYPE_DBUS_SERIALIZER_H |