Use format() when creating strings from more than two parts

[builder.git] / source / androidmanifestgenerator.cpp

diff --git a/source/androidmanifestgenerator.cpp b/source/androidmanifestgenerator.cpp
index 156dfb35fd9abcdbca33710c5ce4f70b2edf71a0..1d2f330da0f6dbf75ea8053c7fc2e3e27e9bceae 100644 (file)
--- a/source/androidmanifestgenerator.cpp
+++ b/source/androidmanifestgenerator.cpp
@@ -47,7 +47,11 @@ void AndroidManifestGenerator::Worker::main()
        IO::print(out, "\t<application android:icon=\"@drawable/icon\" android:label=\"%s\" android:hasCode=\"false\" android:debuggable=\"%s\">\n", pkg.get_label(), debuggable);
        if(SharedLibrary *native_lib = manifest.get_native_library())
        {
-               out.write("\t\t<activity android:name=\"android.app.NativeActivity\">\n");
+               out.write("\t\t<activity android:name=\"android.app.NativeActivity\"");
+               const string &orientation = manifest.get_orientation();
+               if(!orientation.empty())
+                       IO::print(out, " android:screenOrientation=\"%s\"", orientation);
+               out.write(">\n");
                IO::print(out, "\t\t\t<meta-data android:name=\"android.app.lib_name\" android:value=\"%s\" />\n", native_lib->get_libname());
                out.write("\t\t\t<intent-filter>\n");
                out.write("\t\t\t\t<action android:name=\"android.intent.action.MAIN\" />\n");
@@ -56,9 +60,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;