From: Bocklage, Jens Date: Wed, 16 Nov 2016 05:35:02 +0000 (+0100) Subject: Use std::vector instead of std::list. X-Git-Tag: v0.6.3~11 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2FHomeScreen.git;a=commitdiff_plain;h=5eee2e3e4b208ab8287e3fc2625d2055e67473fa Use std::vector instead of std::list. Signed-off-by: Bocklage, Jens --- diff --git a/SampleHomeScreenInterfaceApp/src/sampleclass.cpp b/SampleHomeScreenInterfaceApp/src/sampleclass.cpp index b2a6f7b..a5e1fac 100644 --- a/SampleHomeScreenInterfaceApp/src/sampleclass.cpp +++ b/SampleHomeScreenInterfaceApp/src/sampleclass.cpp @@ -11,7 +11,7 @@ SampleClass::~SampleClass() delete mp_libHomeScreen; } -std::list SampleClass::getAllSurfacesOfProcess(int pid) +std::vector SampleClass::getAllSurfacesOfProcess(int pid) { return mp_libHomeScreen->getAllSurfacesOfProcess(pid); } diff --git a/SampleHomeScreenInterfaceApp/src/sampleclass.hpp b/SampleHomeScreenInterfaceApp/src/sampleclass.hpp index 44a88a2..fd00afe 100644 --- a/SampleHomeScreenInterfaceApp/src/sampleclass.hpp +++ b/SampleHomeScreenInterfaceApp/src/sampleclass.hpp @@ -2,7 +2,7 @@ #define SAMPLECLASS_HPP #include "libhomescreen.hpp" -#include +#include class SampleClass { @@ -10,7 +10,7 @@ public: SampleClass(); ~SampleClass(); - std::list getAllSurfacesOfProcess(int pid); + std::vector getAllSurfacesOfProcess(int pid); int getSurfaceStatus(int surfaceId); void hardKeyPressed(int key); void renderSurfaceToArea(int surfaceId, int layoutArea); diff --git a/libhomescreen/include/libhomescreen.hpp b/libhomescreen/include/libhomescreen.hpp index 841196b..6baa805 100644 --- a/libhomescreen/include/libhomescreen.hpp +++ b/libhomescreen/include/libhomescreen.hpp @@ -1,7 +1,7 @@ #ifndef LIBHOMESCREEN_HPP #define LIBHOMESCREEN_HPP -#include +#include // forward declarations struct _LibHomeScreenHomescreen; @@ -22,7 +22,7 @@ public: ~LibHomeScreen(); // these are representing the D-Bus methods: - std::list getAllSurfacesOfProcess(int pid); + std::vector getAllSurfacesOfProcess(int pid); int getSurfaceStatus(int surfaceId); void hardKeyPressed(int key); void renderSurfaceToArea(int surfaceId, int layoutArea); diff --git a/libhomescreen/src/libhomescreen.cpp b/libhomescreen/src/libhomescreen.cpp index 5cdabc9..ae8f563 100644 --- a/libhomescreen/src/libhomescreen.cpp +++ b/libhomescreen/src/libhomescreen.cpp @@ -29,9 +29,9 @@ LibHomeScreen::~LibHomeScreen() g_object_unref(mp_libHomeScreenHomescreen_Proxy); } -std::list LibHomeScreen::getAllSurfacesOfProcess(int pid) +std::vector LibHomeScreen::getAllSurfacesOfProcess(int pid) { - std::list result; + std::vector result; GError *err = NULL;