1 files changed, 16 insertions, 16 deletions
diff --git a/fluid/io/Project_Reader.cxx b/fluid/io/Project_Reader.cxx
index 54baa9a85..043aebcfa 100644
--- a/fluid/io/Project_Reader.cxx
+++ b/fluid/io/Project_Reader.cxx
@@ -44,7 +44,7 @@
 // This file contains code to read and write .fl files.
 
 /// If set, we read an old fdesign file and widget y coordinates need to be flipped.
-int fld::io::fdesign_flip = 0;
+int fdesign_flip = 0;
 
 /** \brief Read a .fl project file.
 
@@ -56,7 +56,7 @@ int fld::io::fdesign_flip = 0;
  \param[in] strategy add new nodes after current or as last child
  \return 0 if the operation failed, 1 if it succeeded
  */
-int fld::io::read_file(Project &proj, const char *filename, int merge, Strategy strategy) {
+int read_file(Project &proj, const char *filename, int merge, Strategy strategy) {
   Project_Reader f(proj);
   strategy.source(Strategy::FROM_FILE);
   return f.read_project(filename, merge, strategy);
@@ -82,7 +82,7 @@ static int hexdigit(int x) {
  Oh how I wish sometimes we would upgrade to modern C++.
  \param[in] length minimum length in bytes
  */
-void fld::io::Project_Reader::expand_buffer(int length) {
+void Project_Reader::expand_buffer(int length) {
   if (length >= buflen) {
     if (!buflen) {
       buflen = length+1;
@@ -96,13 +96,13 @@ void fld::io::Project_Reader::expand_buffer(int length) {
 }
 
 /** \brief Construct local project reader. */
-fld::io::Project_Reader::Project_Reader(Project &proj)
+Project_Reader::Project_Reader(Project &proj)
 : proj_(proj)
 {
 }
 
 /** \brief Release project reader resources. */
-fld::io::Project_Reader::~Project_Reader()
+Project_Reader::~Project_Reader()
 {
   // fname is not copied, so do not free it
   if (buffer)
@@ -114,7 +114,7 @@ fld::io::Project_Reader::~Project_Reader()
  \param[in] s filename, if 0, read from stdin instead
  \return 0 if the operation failed, 1 if it succeeded
  */
-int fld::io::Project_Reader::open_read(const char *s) {
+int Project_Reader::open_read(const char *s) {
   lineno = 1;
   if (!s) {
     fin = stdin;
@@ -133,7 +133,7 @@ int fld::io::Project_Reader::open_read(const char *s) {
  Close the .fl file.
  \return 0 if the operation failed, 1 if it succeeded
  */
-int fld::io::Project_Reader::close_read() {
+int Project_Reader::close_read() {
   if (fin != stdin) {
     int x = fclose(fin);
     fin = 0;
@@ -146,7 +146,7 @@ int fld::io::Project_Reader::close_read() {
  Return the name part of the current filename and path.
  \return a pointer into a string that is not owned by this class
  */
-const char *fld::io::Project_Reader::filename_name() {
+const char *Project_Reader::filename_name() {
   return fl_filename_name(fname);
 }
 
@@ -156,7 +156,7 @@ const char *fld::io::Project_Reader::filename_name() {
  values, and \\o### octal values.
  \return a character in the ASCII range
  */
-int fld::io::Project_Reader::read_quoted() {      // read whatever character is after a \ .
+int Project_Reader::read_quoted() {      // read whatever character is after a \ .
   int c,d,x;
   switch(c = nextchar()) {
     case '\n': lineno++; return -1;
@@ -201,7 +201,7 @@ int fld::io::Project_Reader::read_quoted() {      // read whatever character is
  a previous call, and there is no need to waste time searching for them.
  \return the last node that was created
  */
-Node *fld::io::Project_Reader::read_children(Node *p, int merge, Strategy strategy, char skip_options) {
+Node *Project_Reader::read_children(Node *p, int merge, Strategy strategy, char skip_options) {
   Fluid.proj.tree.current = p;
   Node *last_child_read = 0;
   Node *t = 0;
@@ -385,7 +385,7 @@ Node *fld::io::Project_Reader::read_children(Node *p, int merge, Strategy strate
  \param[in] strategy add new nodes after current or as last child
  \return 0 if the operation failed, 1 if it succeeded
  */
-int fld::io::Project_Reader::read_project(const char *filename, int merge, Strategy strategy) {
+int Project_Reader::read_project(const char *filename, int merge, Strategy strategy) {
   Node *o;
   proj_.undo.suspend();
   read_version = 0.0;
@@ -435,7 +435,7 @@ int fld::io::Project_Reader::read_project(const char *filename, int merge, Strat
        operations.
  \param[in] format printf style format string, followed by an argument list
  */
-void fld::io::Project_Reader::read_error(const char *format, ...) {
+void Project_Reader::read_error(const char *format, ...) {
   va_list args;
   va_start(args, format);
   if (!fin) { // FIXME: this line suppresses any error messages in interactive mode
@@ -468,7 +468,7 @@ void fld::io::Project_Reader::read_error(const char *format, ...) {
     overwrite this buffer. If wantbrace is not set, but we read a leading '{',
     the returned string will be stripped of its leading and trailing braces.
  */
-const char *fld::io::Project_Reader::read_word(int wantbrace) {
+const char *Project_Reader::read_word(int wantbrace) {
   int x;
 
   // skip all the whitespace before it:
@@ -538,7 +538,7 @@ const char *fld::io::Project_Reader::read_word(int wantbrace) {
 /** Read a word and interpret it as an integer value.
  \return integer value, or 0 if the word is not an integer
  */
-int fld::io::Project_Reader::read_int() {
+int Project_Reader::read_int() {
   const char *word = read_word();
   if (word) {
     return atoi(word);
@@ -554,7 +554,7 @@ int fld::io::Project_Reader::read_int() {
  \param[out] value string
  \return 0 if end of file, else 1
  */
-int fld::io::Project_Reader::read_fdesign_line(const char*& name, const char*& value) {
+int Project_Reader::read_fdesign_line(const char*& name, const char*& value) {
   int length = 0;
   int x;
   // find a colon:
@@ -681,7 +681,7 @@ static void forms_end(Fl_Group *g, int flip) {
  FLTK widgets.
  \see http://xforms-toolkit.org
  */
-void fld::io::Project_Reader::read_fdesign() {
+void Project_Reader::read_fdesign() {
   int fdesign_magic = atoi(read_word());
   fdesign_flip = (fdesign_magic < 13000);
   Widget_Node *window = 0;