Put constructor helper functions next to the constructors

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index a27c067b6a881f8735124ccc7aae71a7b63f41d7..7db1b2d647939ac6456d48a0b8f12954ba56718c 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -17,6 +17,18 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
        add_depend(&source);
 }
 
+FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
+{
+       const SourcePackage &pkg = comp.get_package();
+       string fn = FS::basepart(src)+".o";
+       if(!fn.compare(0, 2, "./"))
+               fn.erase(0, 2);
+       for(string::iterator i=fn.begin(); i!=fn.end(); ++i)
+               if(*i=='/')
+                       *i = '_';
+       return pkg.get_temp_dir()/comp.get_name()/fn;
+}
+
 void ObjectFile::find_depends()
 {
        for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
@@ -26,7 +38,6 @@ void ObjectFile::find_depends()
        }
 }
 
-
 void ObjectFile::find_depends(FileTarget *tgt)
 {
        FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
@@ -61,15 +72,3 @@ void ObjectFile::find_depends(FileTarget *tgt)
                if(find(depends.begin(), depends.end(), *i)==depends.end())
                        add_depend(*i);
 }
-
-FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
-{
-       const SourcePackage &pkg = comp.get_package();
-       string fn = FS::basepart(src)+".o";
-       if(!fn.compare(0, 2, "./"))
-               fn.erase(0, 2);
-       for(string::iterator i=fn.begin(); i!=fn.end(); ++i)
-               if(*i=='/')
-                       *i = '_';
-       return pkg.get_temp_dir()/comp.get_name()/fn;
-}