diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2011-12-22 17:27:16 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2011-12-23 01:36:59 +0100 |
| commit | 4f74d6e303c58326fe75ee75e1c92cf9263f800d (patch) | |
| tree | da2c725f7cbad20e35169476b801066689a382a2 /PluginCommandInterfaceDbus/src | |
| parent | 4618280b6d777ac7bf3bb5cf5b0ea3f0d9e4b2b7 (diff) | |
| download | audiomanager-4f74d6e303c58326fe75ee75e1c92cf9263f800d.tar.gz | |
* rework of buildsystem
* now everything depends on a toplevel CMakefile
* cleanup of makefiles and compiler options
Diffstat (limited to 'PluginCommandInterfaceDbus/src')
| -rw-r--r-- | PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp | 3 | ||||
| -rw-r--r-- | PluginCommandInterfaceDbus/src/DBusCommandSender.cpp | 5 | ||||
| -rw-r--r-- | PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp index c7885a3..6999bc1 100644 --- a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp +++ b/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp @@ -23,7 +23,6 @@ * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ - #include <audiomanagertypes.h> #include <string> #include <fstream> @@ -385,7 +384,7 @@ void CommandReceiverShadow::sendIntrospection(DBusConnection *conn, DBusMessage // create a reply from the message reply = dbus_message_new_method_return(msg); - std::ifstream in(INTROSPECTION_XML_FILE); + std::ifstream in(INTROSPECTION_COMMAND_XML_FILE); assert(in!=NULL); std::string introspect((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>()); const char* string = introspect.c_str(); diff --git a/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp b/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp index 09d204f..e58422d 100644 --- a/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp +++ b/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp @@ -23,10 +23,11 @@ * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ + +#include <command/CommandReceiveInterface.h> +#include <dbus/DBusWrapper.h> #include "DBusCommandSender.h" #include "DBusMessageHandler.h" -#include "DBusWrapper.h" -#include "command/CommandReceiveInterface.h" #include <dlt/dlt.h> #include <algorithm> #include <string> diff --git a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp index 33b0191..856dbd0 100644 --- a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp +++ b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp @@ -22,9 +22,9 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ +#include <config.h> #include "DBusMessageHandler.h" #include "DBusCommandSender.h" -#include "DBusConfiguration.h" #include <stdlib.h> #include <assert.h> |