livedisplay: Fully qualify STL types in headers
* It's usually good practice to fully qualify your namespaces in header
files, especially so for STL types.
Change-Id: I3bc0481a514eb21791cff3277b9926071189db67
diff --git a/livedisplay/1.0/default/controller/SDMController.cpp b/livedisplay/1.0/default/controller/SDMController.cpp
index d1e1949..1d6cc0d 100644
--- a/livedisplay/1.0/default/controller/SDMController.cpp
+++ b/livedisplay/1.0/default/controller/SDMController.cpp
@@ -62,8 +62,8 @@
}
}
-shared_ptr<void> SDMController::openlib() {
- shared_ptr<void> handle(dlopen(kFilename, RTLD_NOW), [this](void* p) {
+std::shared_ptr<void> SDMController::openlib() {
+ std::shared_ptr<void> handle(dlopen(kFilename, RTLD_NOW), [this](void* p) {
FOR_EACH_FUNCTION(CLOSE_SDM_FUNCTION)
if (p != nullptr) {
int err = dlclose(p);
diff --git a/livedisplay/1.0/default/impl/SDM.cpp b/livedisplay/1.0/default/impl/SDM.cpp
index ea0ccdb..f0c09e6 100644
--- a/livedisplay/1.0/default/impl/SDM.cpp
+++ b/livedisplay/1.0/default/impl/SDM.cpp
@@ -107,7 +107,7 @@
}
sp<disp_mode> SDM::getDisplayModeById(int32_t id) {
- vector<sp<disp_mode>> profiles;
+ std::vector<sp<disp_mode>> profiles;
status_t rc = getDisplayModes(profiles);
if (rc == OK) {
for (const auto& mode : profiles) {
@@ -144,7 +144,7 @@
return BAD_VALUE;
}
-status_t SDM::getDisplayModes(vector<sp<disp_mode>>& profiles) {
+status_t SDM::getDisplayModes(std::vector<sp<disp_mode>>& profiles) {
status_t rc = OK;
uint32_t count = getNumDisplayModes();
diff --git a/livedisplay/1.0/default/include/ColorBackend.h b/livedisplay/1.0/default/include/ColorBackend.h
index 2bf4f9f..77769c1 100644
--- a/livedisplay/1.0/default/include/ColorBackend.h
+++ b/livedisplay/1.0/default/include/ColorBackend.h
@@ -30,8 +30,6 @@
using ::android::sp;
using ::android::status_t;
-using std::vector;
-
class ColorBackend : public android::RefBase {
public:
virtual status_t setAdaptiveBacklightEnabled(bool enabled) = 0;
@@ -44,7 +42,7 @@
virtual status_t setColorBalance(int32_t balance) = 0;
virtual int32_t getColorBalance() = 0;
- virtual status_t getDisplayModes(vector<sp<disp_mode>>& profiles) = 0;
+ virtual status_t getDisplayModes(std::vector<sp<disp_mode>>& profiles) = 0;
virtual status_t setDisplayMode(int32_t modeID, bool makeDefault) = 0;
virtual sp<disp_mode> getCurrentDisplayMode() = 0;
virtual sp<disp_mode> getDefaultDisplayMode() = 0;
diff --git a/livedisplay/1.0/default/include/Types.h b/livedisplay/1.0/default/include/Types.h
index e2db6d7..4a6f39d 100644
--- a/livedisplay/1.0/default/include/Types.h
+++ b/livedisplay/1.0/default/include/Types.h
@@ -27,14 +27,12 @@
namespace V1_0 {
namespace implementation {
-using std::string;
-
struct disp_mode : public android::RefBase {
int32_t id;
- string name;
+ std::string name;
uint32_t privFlags;
- string privData;
+ std::string privData;
disp_mode() : id(-1) {
}
diff --git a/livedisplay/1.0/default/include/controller/SDMController.h b/livedisplay/1.0/default/include/controller/SDMController.h
index d3557b9..f521c57 100644
--- a/livedisplay/1.0/default/include/controller/SDMController.h
+++ b/livedisplay/1.0/default/include/controller/SDMController.h
@@ -26,8 +26,6 @@
namespace V1_0 {
namespace implementation {
-using ::std::shared_ptr;
-
class SDMController {
private:
SDMController();
@@ -40,7 +38,7 @@
return reinterpret_cast<Function>(fn);
}
- shared_ptr<void> openlib();
+ std::shared_ptr<void> openlib();
public:
static SDMController& getInstance();
@@ -90,7 +88,7 @@
typedef int32_t (*disp_api_get_feature_version)(uint64_t, uint32_t, void*, uint32_t*);
static const char kFilename[];
- shared_ptr<void> mHandle;
+ std::shared_ptr<void> mHandle;
disp_api_init mFn_init;
disp_api_deinit mFn_deinit;
disp_api_get_global_color_balance_range mFn_get_global_color_balance_range;
diff --git a/livedisplay/1.0/default/include/impl/SDM.h b/livedisplay/1.0/default/include/impl/SDM.h
index 469aab3..9e42e17 100644
--- a/livedisplay/1.0/default/include/impl/SDM.h
+++ b/livedisplay/1.0/default/include/impl/SDM.h
@@ -21,6 +21,8 @@
#include "ColorBackend.h"
#include "controller/SDMController.h"
+#include <vector>
+
namespace vendor {
namespace lineage {
namespace livedisplay {
@@ -60,7 +62,7 @@
class SDM : public ColorBackend {
public:
- virtual status_t getDisplayModes(vector<sp<disp_mode>>& profiles) override;
+ virtual status_t getDisplayModes(std::vector<sp<disp_mode>>& profiles) override;
virtual sp<disp_mode> getCurrentDisplayMode() override;
virtual sp<disp_mode> getDefaultDisplayMode() override;
virtual status_t setDisplayMode(int32_t modeID, bool makeDefault) override;
diff --git a/livedisplay/1.0/default/src/Color.cpp b/livedisplay/1.0/default/src/Color.cpp
index 0345ecd..a6080ba 100644
--- a/livedisplay/1.0/default/src/Color.cpp
+++ b/livedisplay/1.0/default/src/Color.cpp
@@ -122,7 +122,7 @@
Mutex::Autolock _l(mLock);
if (check(Feature::DISPLAY_MODES)) {
- vector<sp<disp_mode>> spProfiles;
+ std::vector<sp<disp_mode>> spProfiles;
rc = mBackend->getDisplayModes(spProfiles);
if (rc != OK) {
error("Unable to fetch display modes!");