Use default member initializers and constructor delegation

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 64cec87f15e48803e349ab2b5a242470d7cc4f56..10c2db01d307c47a357b790ef3dd73cda87c980e 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -1,6 +1,4 @@
-#include <msp/io/print.h>
-#include <msp/strings/lexicalcast.h>
-#include <msp/strings/utils.h>
+#include <msp/strings/format.h>
 #include "builder.h"
 #include "package.h"
 
@@ -10,9 +8,7 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
-       label(string(1, toupper(n[0]))+n.substr(1)),
-       prepared(false),
-       use_pkgconfig(true)
+       label(string(1, toupper(n[0]))+n.substr(1))
 {
        builder.get_package_manager().add_package(this);
 }
@@ -22,8 +18,8 @@ void Package::prepare()
        if(prepared)
                return;
 
-       for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
-               (*i)->prepare();
+       for(Package *r: requires)
+               r->prepare();
 
        do_prepare();
        prepared = true;