X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fplainfile.cpp;h=5b560c8effbb91a2c1e32f0c11364a2cfb827974;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=07361aadb53cc05212c17652c7b5c57441490577;hpb=f47e8cf4cde2ba5465106e219c803e6424a4f177;p=metaproxy-moved-to-github.git

diff --git a/src/plainfile.cpp b/src/plainfile.cpp
index 07361aa..5b560c8 100644
--- a/src/plainfile.cpp
+++ b/src/plainfile.cpp
@@ -1,8 +1,20 @@
-/* $Id: plainfile.cpp,v 1.1 2006-01-25 11:27:19 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
-%LICENSE%
- */
+Metaproxy 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 2, or (at your option) any later
+version.
+
+Metaproxy 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 "config.hpp"
 
@@ -11,11 +23,13 @@
 #include <iostream>
 #include <fstream>
 
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 
 #define PLAINFILE_MAX_LINE 256
 
-namespace yp2 {
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1 {
     class PlainFile::Rep {
         friend class PlainFile;
         Rep();
@@ -25,28 +39,28 @@ namespace yp2 {
     };
 }
 
-yp2::PlainFile::Rep::Rep() : lineno(1)
+mp::PlainFile::Rep::Rep() : lineno(1)
 {
     fh = 0;
 }
 
-yp2::PlainFile::PlainFile() : m_p(new Rep)
+mp::PlainFile::PlainFile() : m_p(new Rep)
 {
 }
 
-void yp2::PlainFile::Rep::close()
+void mp::PlainFile::Rep::close()
 {
     delete fh;
     fh = 0;
     lineno = 0;
 }
 
-yp2::PlainFile::~PlainFile()
+mp::PlainFile::~PlainFile()
 {
     m_p->close();
 }
 
-bool yp2::PlainFile::open(const std::string &fname)
+bool mp::PlainFile::open(const std::string &fname)
 {
     m_p->close();
 
@@ -60,7 +74,7 @@ bool yp2::PlainFile::open(const std::string &fname)
     return true;
 }
 
-bool yp2::PlainFile::getline(std::vector<std::string> &args)
+bool mp::PlainFile::getline(std::vector<std::string> &args)
 {
     args.clear();
 
@@ -75,7 +89,7 @@ bool yp2::PlainFile::getline(std::vector<std::string> &args)
             m_p->close();   // might as well close it now
             return false;
         }
-        
+
         m_p->lineno++;
         m_p->fh->getline(line_cstr, PLAINFILE_MAX_LINE-1);
         char first = line_cstr[0];
@@ -103,8 +117,9 @@ bool yp2::PlainFile::getline(std::vector<std::string> &args)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+