Use default member initializers and constructor delegation

[builder.git] / source / androidmanifestfile.cpp

diff --git a/source/androidmanifestfile.cpp b/source/androidmanifestfile.cpp
index d20be983167cd7e6e492e786c67443e2e542a86f..2dd1c969e54dcc202ab5002f788d5e59d8d20f40 100644 (file)
--- a/source/androidmanifestfile.cpp
+++ b/source/androidmanifestfile.cpp
@@ -1,13 +1,14 @@
+#include <msp/core/algorithm.h>
 #include "androidapplicationcomponent.h"
 #include "androidmanifestfile.h"
 #include "builder.h"
 #include "sourcepackage.h"
 
 using namespace std;
+using namespace Msp;
 
 AndroidManifestFile::AndroidManifestFile(Builder &b, const AndroidApplicationComponent &a):
-       FileTarget(b, a.get_package(), a.get_package().get_temp_directory()/a.get_name()/"AndroidManifest.xml"),
-       native_lib(0)
+       FileTarget(b, a.get_package(), a.get_package().get_temp_directory()/a.get_name()/"AndroidManifest.xml")
 {
        component = &a;
        tool = &builder.get_toolchain().get_tool("AMG");
@@ -27,5 +28,6 @@ void AndroidManifestFile::set_orientation(const string &ori)
 
 void AndroidManifestFile::add_permission(const string &perm)
 {
-       permissions.insert(perm);
+       if(!any_equals(permissions, perm))
+               permissions.push_back(perm);
 }