X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fandroidmanifestgenerator.cpp;h=8268bb80984d0ff075f89d2a6539b86803357315;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=a7cda0428dea4ce95954fbccd1cb2ca6ea347358;hpb=e3ba0e44173bd373d1111fc6d87fc4e61faebf9f;p=builder.git

diff --git a/source/androidmanifestgenerator.cpp b/source/androidmanifestgenerator.cpp
index a7cda04..8268bb8 100644
--- a/source/androidmanifestgenerator.cpp
+++ b/source/androidmanifestgenerator.cpp
@@ -9,11 +9,7 @@
 using namespace std;
 using namespace Msp;
 
-AndroidManifestGenerator::AndroidManifestGenerator(Builder &b):
-	Tool(b, "AMG")
-{ }
-
-Target *AndroidManifestGenerator::create_target(const list<Target *> &, const string &)
+Target *AndroidManifestGenerator::create_target(const vector<Target *> &, const string &)
 {
 	throw logic_error("not implemented");
 }
@@ -26,10 +22,6 @@ Task *AndroidManifestGenerator::run(const Target &target) const
 }
 
 
-AndroidManifestGenerator::Worker::Worker(const AndroidManifestFile &m):
-	manifest(m)
-{ }
-
 void AndroidManifestGenerator::Worker::main()
 {
 	const Component &comp = *manifest.get_component();
@@ -60,9 +52,8 @@ void AndroidManifestGenerator::Worker::main()
 		out.write("\t\t</activity>\n");
 	}
 	out.write("\t</application>\n");
-	const set<string> &permissions = manifest.get_permissions();
-	for(set<string>::const_iterator i=permissions.begin(); i!=permissions.end(); ++i)
-		IO::print(out, "\t<uses-permission android:name=\"%s\" />\n", *i);
+	for(const string &p: manifest.get_permissions())
+		IO::print(out, "\t<uses-permission android:name=\"%s\" />\n", p);
 	out.write("</manifest>\n");
 
 	status = Task::SUCCESS;