[Gnash-commit] /srv/bzr/gnash/trunk r10590: Added licensing + code refactoring(Vitaly liked structs, I prefer pure C++-classes)

[Markus Gothe]

------------------------------------------------------------
revno: 10590
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Mon 2009-02-16 00:47:01 +0100
message:
  Added licensing + code refactoring(Vitaly liked structs, I prefer pure 
C++-classes)
modified:
  libbase/NamingPolicy.cpp
  libbase/NamingPolicy.h

=== modified file 'libbase/NamingPolicy.cpp'
--- a/libbase/NamingPolicy.cpp  2009-02-09 10:08:23 +0000
+++ b/libbase/NamingPolicy.cpp  2009-02-15 23:47:01 +0000
@@ -1,10 +1,26 @@
+// 
+//   Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
 #include "NamingPolicy.h"
-#include "gnashconfig.h"
-#include "URL.h"
 #include "GnashFileUtilities.h"
 #include "rc.h"
 #include "log.h"
+#include "URL.h"
 
 #include <sstream>
 #include <string>

=== modified file 'libbase/NamingPolicy.h'
--- a/libbase/NamingPolicy.h    2009-02-09 10:08:23 +0000
+++ b/libbase/NamingPolicy.h    2009-02-15 23:47:01 +0000
@@ -1,18 +1,39 @@
-
-
+// 
+//   Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
 #ifndef GNASH_NAMINGPOLICY_H
 #define GNASH_NAMINGPOLICY_H
 
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h"
+#endif
+
 #include "URL.h"
+#include "dsodefs.h"
 
 #include <string>
 
 namespace gnash {
 
 
-struct NamingPolicy
+class NamingPolicy
 {
+public:
     NamingPolicy() {}
     virtual ~NamingPolicy() {}
     virtual std::string operator()(const URL&) const
@@ -24,17 +45,20 @@
 
 /// Make a non-unique cachefile name from the supplied name.
 /// If the directory cannot be created, return an empty string.
-struct OverwriteExisting : public NamingPolicy
+class OverwriteExisting : public NamingPolicy
 {
+public:
     virtual std::string operator()(const URL&) const;
 };
 
 /// Make a unique cachefile name from the supplied name.
 /// If all possible filenames are taken, return an empty string.
-struct IncrementalRename : public NamingPolicy
+class DSOEXPORT IncrementalRename : public NamingPolicy
 {
+public:
     IncrementalRename(const URL& baseURL);
     virtual std::string operator()(const URL& url) const;
+    
 private:
     const URL _baseURL;
 };