Style fixes, including:

[r2c2.git] / source / libmarklin / layout.cpp

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index 28d2eeb862ad85862e8cd45baab8291061d9261a..a197b35af596002a4ed7a202a24a77ea54537c10 100644 (file)
--- a/source/libmarklin/layout.cpp
+++ b/source/libmarklin/layout.cpp
@@ -14,6 +14,12 @@ Layout::Layout(Catalogue &c):
        catalogue(c)
 { }
 
+Layout::~Layout()
+{
+       for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               delete *i;
+}
+
 void Layout::add_track(Track &t)
 {
        if(tracks.insert(&t).second)
@@ -63,7 +69,7 @@ int Layout::save(const string &fn)
 
        filename=fn;
 
-       if(base.size())
+       if(!base.empty())
                out<<"base \""<<base<<"\";\n";
        for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
@@ -90,15 +96,6 @@ int Layout::save(const string &fn)
        return 0;
 }
 
-Layout::~Layout()
-{
-       for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               delete *i;
-}
-
-/*******************
-** Layout::Loader
-*/
 
 Layout::Loader::Loader(Layout &l):
        layout(l)