Merge lp:~thumper/nux/replace-nfilename into lp:nux

[Tim Penhey]

Now that we are looking to use boost::filesystem, we can remove the special NFileName class. This is also desirable as we want to remove NString and replace it with std::string.

There were some changes that were made that didn't cause any recompilation. It appears that there are several files in the tree that aren't being compiled into the libraries at the moment.

[Jay Taoko (jaytaoko)]

The files in NuxMesh are no longer compiled with Nux.

review: Approve

[Neil J. Patel (njpatel)]

Are we still wanting a dep on boost-filesystem now that it's a lib and not just a magic header?

review: Needs Information

[Tim Penhey (thumper)]

On Thu, 21 Jul 2011 23:03:30 you wrote:
> Review: Needs Information
> Are we still wanting a dep on boost-filesystem now that it's a lib and not
> just a magic header?

Yes. This branch won't merge until we get boost-filesystem.

Unmerged revisions

402. By Tim Penhey on 2011-06-23

Remove the now unneeded files.

401. By Tim Penhey on 2011-06-23

Added note about broken code, but it isn't being compiled either.

400. By Tim Penhey on 2011-06-23

fixed other reference in that file too.

399. By Tim Penhey on 2011-06-23

Updated, but this file isn't currently compiled.

398. By Tim Penhey on 2011-06-23

Replace NFileName with boost::filesystem::path.

=== modified file 'Nux/FolderTreeItem.cpp'
--- Nux/FolderTreeItem.cpp	2011-05-26 21:08:18 +0000
+++ Nux/FolderTreeItem.cpp	2011-06-23 02:52:27 +0000
@@ -27,13 +27,15 @@
 namespace nux
 {
 
-  FolderTreeItem::FolderTreeItem (const TCHAR *name, const TCHAR *Path, bool Searchable, NodeParameterType type)
-    :   TreeItem (name, type)
+  FolderTreeItem::FolderTreeItem(const TCHAR *name,
+                                 const TCHAR *Path,
+                                 bool Searchable,
+                                 NodeParameterType type)
+    : TreeItem(name, type)
+    , m_Path(Path)
+    , m_Synchronize(false)
+    , m_Searchable(Searchable)
   {
-    m_Synchronize   = false;
-    m_Path          = Path;
-    m_Searchable    = Searchable;
-
     TableItem::SetAlwaysShowOpeningButton (true);
 
     NString IconPath = NUX_FINDRESOURCELOCATION (TEXT ("Icons/FolderOpen-16x16.png") );

=== modified file 'Nux/FolderTreeItem.h'
--- Nux/FolderTreeItem.h	2011-04-06 21:54:09 +0000
+++ Nux/FolderTreeItem.h	2011-06-23 02:52:27 +0000
@@ -23,6 +23,9 @@
 #ifndef FOLDERTREEITEM_H
 #define FOLDERTREEITEM_H
 
+#include <string>
+#include <boost/filesystem.hpp>
+
 #include "TreeControl.h"
 
 namespace nux
@@ -35,15 +38,22 @@
     FolderTreeItem (const TCHAR *name, const TCHAR *Path, bool Searchable = true, NodeParameterType type = NODE_TYPE_STATICTEXT);
     virtual ~FolderTreeItem();
 
-    virtual void DrawProperty (GraphicsEngine &GfxContext, TableCtrl *table, bool force_draw, Geometry geo, const BasePainter &Painter, RowHeader *row, const std::vector<ColumnHeader>& column_vector, Color ItemBackgroundColor = Color (0x0) );
+    virtual void DrawProperty(GraphicsEngine& GfxContext,
+                              TableCtrl *table,
+                              bool force_draw,
+                              Geometry geo,
+                              const BasePainter &Painter,
+                              RowHeader *row,
+                              const std::vector<ColumnHeader>& column_vector,
+                              Color ItemBackgroundColor = Color (0x0) );
 
-    const TCHAR *GetPathName()
+    std::string GetPathName()
     {
-      return m_Path.GetTCharPtr();
+      return m_Path.string();
     }
-    const TCHAR *GetCleanFilename()
+    std::string GetFilename()
     {
-      return m_Path.GetCleanFilename().GetTCharPtr();
+      return m_Path.filename();
     }
 
     void SetSynchronize (bool b)
@@ -72,17 +82,13 @@
     BaseTexture* FolderOpenIcon;
     BaseTexture* FolderClosedIcon;
 
-    NFileName m_Path;
+    boost::filesystem::path m_Path;
     NString m_FolderName;
     bool m_Synchronize; // synchronize with windows explorer
-    // True if this is a real directory that can be explorer. False if this is just a decoration item.
+    // True if this is a real directory that can be explorer.
+    // False if this is just a decoration item.
     // Non searchable folders must always be at the top of the tree;
     bool m_Searchable;
-
-    //virtual long ProcessPropertyEvent(IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
-    //virtual void DrawProperty(GraphicsEngine& GfxContext, TableCtrl* table, bool force_draw, Geometry geo, const BasePainter& Painter, RowHeader* row, const std::vector<ColumnHeader>& column_vector, Color ItemBackgroundColor = 0x0);
-    //virtual void ComputePropertyLayout(int x, int y, RowHeader* row, const std::vector<ColumnHeader>& column_vector);
-    //virtual int GetItemBestHeight();
   };
 
 }

=== removed file 'NuxCore/FileName.cpp'
--- NuxCore/FileName.cpp	2011-04-06 21:54:09 +0000
+++ NuxCore/FileName.cpp	1970-01-01 00:00:00 +0000
@@ -1,237 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#include "NuxCore.h"
-#include "FileName.h"
-#include "Math/MathUtility.h"
-
-namespace nux
-{
-
-  NString NFileName::GetDrive() const
-  {
-    t_size Pos = FindFirstOccurence (NUX_BACKSLASH_CHAR);
-
-    if (Pos == tstring::npos)
-    {
-      Pos = FindFirstOccurence ("\\");
-
-      if (Pos != tstring::npos)
-      {
-        return GetSubString (Pos);
-      }
-    }
-
-    return TEXT ("");
-  }
-
-  NString NFileName::GetExtension() const
-  {
-    t_size Pos = FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos + 1, Length() - Pos - 1);
-    }
-
-    return TEXT ("");
-  }
-
-// Returns the base filename without the path
-  NString NFileName::GetCleanFilename() const
-  {
-    t_size Pos = FindLastOccurence (NUX_BACKSLASH_CHAR);
-    Pos = Max<t_size> (Pos, FindLastOccurence (TEXT ("/") ) ); // in case we are using slash and the NUX_BACKSLASH_CHAR is different.
-    Pos = Max<t_size> (Pos, FindLastOccurence (TEXT ("\\") ) ); // in case we are using backslash and the NUX_BACKSLASH_CHAR is different.
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos + 1, Length() - Pos - 1);
-    }
-
-    return *this;
-  }
-
-  NString NFileName::GetFilenameNoExtension() const
-  {
-    t_size Pos = FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos);
-    }
-
-    return *this;
-  }
-
-// Returns the base filename without the path and without the extension
-  NString NFileName::GetBaseFilename() const
-  {
-    NString Wk = GetCleanFilename();
-
-    t_size Pos = Wk.FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
-    {
-      return Wk.GetSubString (Pos);
-    }
-
-    return Wk;
-  }
-
-// Returns the path in front of the filename
-
-  NString NFileName::GetDirectoryPath() const
-  {
-    t_size Pos = FindLastOccurence (NUX_BACKSLASH_CHAR);
-    Pos = Max<t_size> (Pos, FindLastOccurence (TEXT ("/") ) ); // in case we are using slash and the NUX_BACKSLASH_CHAR is different.
-    Pos = Max<t_size> (Pos, FindLastOccurence (TEXT ("\\") ) ); // in case we are using backslash and the NUX_BACKSLASH_CHAR is different.
-
-    if (Pos != tstring::npos)
-    {
-      return GetSubString (Pos);
-    }
-
-    return *this;
-  }
-
-  void NFileName::ChangeFileExtension (const TCHAR *ext)
-  {
-    t_size Pos = FindLastOccurence (TEXT (".") );
-
-    if (Pos != tstring::npos)
-    {
-      (*this) = GetSubString (Pos) + NString (TEXT (".") ) + NString (ext);
-    }
-    else
-    {
-      (*this) = (*this) + NString (TEXT (".") ) + NString (ext);
-    }
-  }
-
-  void NFileName::ConvertSlashToBackslash()
-  {
-    t_size Pos = tstring::npos;
-    Pos = FindFirstOccurence (TEXT ('/') );
-
-    while (Pos != tstring::npos)
-    {
-      Replace (Pos, 1, 1, TEXT ('\\') );
-    }
-  }
-
-
-  void NFileName::ConvertBackslashToSlash()
-  {
-    t_size Pos = tstring::npos;
-    Pos = FindFirstOccurence (TEXT ('\\') );
-
-    while (Pos != tstring::npos)
-    {
-      Replace (Pos, 1, 1, TEXT ('/') );
-    }
-  }
-
-  void NFileName::AddSlashAtEnd()
-  {
-    if (GetLastChar() != TEXT ('/') )
-      *this += TEXT ('/');
-  }
-
-  void NFileName::AddBackSlashAtEnd()
-  {
-    if (GetLastChar() != TEXT ('\\') )
-      *this += TEXT ('\\');
-  }
-
-  void NFileName::AddSlashAtStart()
-  {
-    if (GetFirstChar() != TEXT ('/') )
-      Insert (0, 1, TEXT ('/') );
-  }
-
-  void NFileName::AddBackSlashAtStart()
-  {
-    if (GetFirstChar() != TEXT ('\\') )
-      Insert (0, 1, TEXT ('\\') );
-  }
-
-  void NFileName::RemoveSlashAtEnd()
-  {
-    RemoveSuffix (TEXT ('/') );
-  }
-
-  void NFileName::RemoveBackSlashAtEnd()
-  {
-    RemoveSuffix (TEXT ('\\') );
-  }
-
-  void NFileName::RemoveSlashAtStart()
-  {
-    RemovePrefix (TEXT ('/') );
-  }
-
-  void NFileName::RemoveBackSlashAtStart()
-  {
-    RemovePrefix (TEXT ('\\') );
-  }
-
-  void NFileName::ConvertToCleanSlash()
-  {
-    ConvertBackslashToSlash();
-
-    t_size size = Size();
-
-    for (t_size i = 0; i < size; )
-    {
-      if ( (i < size - 1) && (operator[] (i) == TEXT ('/') ) && (operator[] (i + 1) == TEXT ('/') ) )
-      {
-        Erase (i + 1, 1);
-        --size;
-      }
-      else
-      {
-        i++;
-      }
-    }
-  }
-
-  void NFileName::ConvertToCleanBackslash()
-  {
-    ConvertSlashToBackslash();
-
-    t_size size = Size();
-
-    for (t_size i = 0; i < size; )
-    {
-      if ( (i < size - 1) && (operator[] (i) == TEXT ('\\') ) && (operator[] (i + 1) == TEXT ('\\') ) )
-      {
-        Erase (i + 1, 1);
-      }
-      else
-      {
-        i++;
-      }
-    }
-  }
-
-}

=== removed file 'NuxCore/FileName.h'
--- NuxCore/FileName.h	2011-04-06 21:54:09 +0000
+++ NuxCore/FileName.h	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright 2010 Inalogic® Inc.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, as
- * published by the  Free Software Foundation; either version 2.1 or 3.0
- * of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the applicable version of the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of both the GNU Lesser General Public
- * License along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- * Authored by: Jay Taoko <[e-mail]>
- *
- */
-
-
-#ifndef NFILENAME_H
-#define NFILENAME_H
-
-#include "TextString.h"
-
-namespace nux
-{
-
-  class NFileName : public NString
-  {
-  public:
-    NFileName()
-      : NString()
-    {}
-    NFileName ( const NFileName &Filename )
-      : NString ( Filename.GetTCharPtr() )
-    {}
-
-    NFileName ( const NString &str )
-      : NString ( str )
-    {}
-
-    NFileName ( const ANSICHAR *str )
-      : NString ( str )
-    {}
-    NFileName ( const UNICHAR *str )
-      : NString ( str )
-    {}
-
-    //! Replace all slash with backslash.
-    void ConvertSlashToBackslash();
-    //! Replace all backslash with slash.
-    void ConvertBackslashToSlash();
-    //! Add slash at the end if there isn't one already.
-    void AddSlashAtEnd();
-    //! Add backslash at the end if there isn't one already.
-    void AddBackSlashAtEnd();
-    //! Add slash at the start if there isn't one already.
-    void AddSlashAtStart();
-    //! Add backslash at the start if there isn't one already.
-    void AddBackSlashAtStart();
-    //! Remove slash at the end if there is one.
-    void RemoveSlashAtEnd();
-    //! Remove backslash at the end if there is one.
-    void RemoveBackSlashAtEnd();
-    //! Remove slash at the start if there is one.
-    void RemoveSlashAtStart();
-    //! Remove backslash at the start if there is one.
-    void RemoveBackSlashAtStart();
-
-    //! Replace all backslash with slash. Replace multiple consecutive slash with one slash.
-    void ConvertToCleanSlash();
-    //! Replace all slash with backslash. Replace multiple consecutive backslash with one backslash.
-    void ConvertToCleanBackslash();
-
-    NString GetDrive() const;
-    //! Returns the text following the last period.
-    NString GetExtension() const;
-    //! Returns the base filename, minus any path information.
-    NString GetCleanFilename() const;
-    //! Returns the base filename, without the extension (keep the path)
-    NString GetFilenameNoExtension() const;
-
-    //! Returns the same thing as GetCleanFilename, but without the extension
-    NString GetBaseFilename() const;
-    //! Returns the path in front of the filename
-    NString GetDirectoryPath() const;
-    //! Change the file extension. Do not start ext with a dot character '.'.
-    //! ie ext = "com"
-    void ChangeFileExtension (const TCHAR *ext);
-  };
-
-}
-
-#endif // NFILENAME_H

=== modified file 'NuxCore/Makefile.am'
--- NuxCore/Makefile.am	2011-06-23 02:52:27 +0000
+++ NuxCore/Makefile.am	2011-06-23 02:52:27 +0000
@@ -45,7 +45,6 @@
   $(srcdir)/Character/NUnicode.cpp \
   $(srcdir)/Color.cpp \
   $(srcdir)/Colors.cpp \
-  $(srcdir)/FileName.cpp \
   $(srcdir)/ThreadGNU.cpp \
   $(srcdir)/Parsing.cpp \
   $(srcdir)/CPU.cpp \
@@ -147,7 +146,6 @@
   $(srcdir)/Error.h \
   $(srcdir)/SystemGNU.h \
   $(srcdir)/NuxCore.h \
-  $(srcdir)/FileName.h \
   $(srcdir)/OutputDevice.h \
   $(srcdir)/Process.h \
   $(srcdir)/ObjectType.h \

=== modified file 'NuxCore/NuxCore.h'
--- NuxCore/NuxCore.h	2011-05-27 04:08:01 +0000
+++ NuxCore/NuxCore.h	2011-06-23 02:52:27 +0000
@@ -755,7 +755,6 @@
 
 #include "FileIO.h"
 #include "ObjectType.h"
-#include "FileName.h"
 #include "Color.h"
 #include "Colors.h"
 #include "Object.h"

=== modified file 'NuxImage/NITX.cpp'
--- NuxImage/NITX.cpp	2011-04-06 21:54:09 +0000
+++ NuxImage/NITX.cpp	2011-06-23 02:52:27 +0000
@@ -428,6 +428,7 @@
 
   void TextureArchiveGetInfo_ver_0_0_1 (NSerializer *FileStream, TextureArchiveInfo_ver_0_0_1 &TextureArchiveInfo)
   {
+    // NOTE: This is severely broken as the struct contains an object.
     Memset (&TextureArchiveInfo, 0, sizeof (TextureArchiveInfo_ver_0_0_1) );
 
     t_u32 texturenamesize = 0;

=== modified file 'NuxMesh/NMeshArchiver_ver_0_0_1.h'
--- NuxMesh/NMeshArchiver_ver_0_0_1.h	2011-04-06 21:54:09 +0000
+++ NuxMesh/NMeshArchiver_ver_0_0_1.h	2011-06-23 02:52:27 +0000
@@ -23,27 +23,29 @@
 #ifndef NMESHARCHIVER_VER_0_0_1_H
 #define NMESHARCHIVER_VER_0_0_1_H
 
+#include <boost/filesystem.hpp>
+
 namespace nux
 {
   class NMeshObject;
 
-  typedef enum
+  enum MeshIndexType
   {
     MESHINDEX_UNKNOWN = 0,
     MESHINDEX_SHORT,
     MESHINDEX_INT,
     FORCE_MESHINDEXTYPE = 0x7fffffff
-  }  MeshIndexType;
+  };
 
-  typedef enum
+  enum MeshBufferType
   {
     MESHBUFFER_UNKNOWN = 0,
     MESHBUFFER_INDEXBUFFER,
     MESHBUFFER_VERTEXBUFFER,
     FORCE_MESHBUFFER = 0x7fffffff
-  }  MeshBufferType;
+  };
 
-  typedef enum
+  enum MeshPolygonType
   {
     POLYGONTYPE_UNKNOWN = 0,
     POLYGONTYPE_TRIANGLE,
@@ -56,9 +58,9 @@
     POLYGONTYPE_LINESTRIP,
     POLYGONTYPE_POINT,
     FORCE_POLYGONTYPE = 0x7fffffff
-  }  MeshPolygonType;
+  };
 
-  typedef enum
+  enum VertexAttribType
   {
     VERTEXATTRIB_UNKNOWN = 0,
     VERTEXATTRIB_FLOAT,
@@ -72,9 +74,9 @@
     VERTEXATTRIB_SHORT_N,    // the short component should be divided by 32767.0 to get the normalized value in the range [-1.0, 1.0].
     VERTEXATTRIB_USHORT_N,   // the short component should be divided by 65535.0 to get the normalized value in the range [0.0, 1.0].
     FORCE_VERTEXATTRIB = 0x7fffffff
-  }  VertexAttribType;
+  };
 
-  typedef enum
+  enum VertexBufferSemantic
   {
     VBSEMANTIC_UNKNOWN = 0,
     VBSEMANTIC_POSITION,
@@ -92,12 +94,12 @@
     VBSEMANTIC_TEXCOORD6,
     VBSEMANTIC_TEXCOORD7,
     FORCE_VBSEMANTIC = 0x7fffffff
-  }  VertexBufferSemantic;
+  };
 
-  typedef struct
+  struct MeshDataInfo_ver_0_0_1
   {
     nux::t_s64 FilePointer;
-    NFileName Name;
+    boost::filesystem::path Name;
     unsigned int Type;
     unsigned int Format;
     unsigned int Width;
@@ -106,11 +108,14 @@
     unsigned int NumMipmap;
     unsigned int Size;
 
-  } MeshDataInfo_ver_0_0_1;
+  };
 
-  bool SaveMeshObject_ver_0_0_1 (nux::NSerializer *FileStream, NMeshObject *);
-  NMeshObject *LoadMeshObject_ver_0_0_1 (nux::NSerializer *FileStream, unsigned int Offset);
-  void MeshDataGetInfo_ver_0_0_1 (nux::NSerializer *FileStream, MeshDataInfo_ver_0_0_1 &TextureArchiveInfo);
+  bool SaveMeshObject_ver_0_0_1(nux::NSerializer* FileStream,
+                                NMeshObject*);
+  NMeshObject* LoadMeshObject_ver_0_0_1(nux::NSerializer* FileStream,
+                                        unsigned int Offset);
+  void MeshDataGetInfo_ver_0_0_1(nux::NSerializer* FileStream,
+                                 MeshDataInfo_ver_0_0_1& TextureArchiveInfo);
 
 }
 

=== modified file 'NuxMesh/NTextureArchiveManager.cpp'
--- NuxMesh/NTextureArchiveManager.cpp	2011-04-06 21:54:09 +0000
+++ NuxMesh/NTextureArchiveManager.cpp	2011-06-23 02:52:27 +0000
@@ -18,7 +18,7 @@
  * Authored by: Jay Taoko <[e-mail]>
  *
  */
-
+#include <boost/filesystem.hpp>
 
 #include "NuxCore/NuxCore.h"
 
@@ -107,7 +107,8 @@
 //      <Image Name="Stroke_4pxrad_2px.tga" type="Stroke" style="eSTROKE_CORNER_ROUND4" border_left="4" border_right="4" border_top="4" border_bottom="4" border_only="true" />
 //  </PaintData>
 
-  bool LoadXMLUITextures (const char *XMLUIFile, std::vector<ArchiveTextureData *>& ArchTexArray)
+  bool LoadXMLUITextures(const char *XMLUIFile,
+                         std::vector<ArchiveTextureData *>& ArchTexArray)
   {
     FilePath m_FilePath;
     m_FilePath.AddSearchPath (TEXT ("") ); // for case where fully qualified path is given
@@ -246,12 +247,12 @@
     for (int i = 0; i < numtexture; i++)
     {
 #ifdef NUX_OS_LINUX
-      NFileName Filename (TEXT (PKGDATADIR"/UITextures") );
+      boost::filesystem::path Filename(PKGDATADIR"/UITextures");
 #else
-      NFileName Filename (TEXT ("../../Data/UITextures/") );
+      boost::filesystem::path Filename("../../Data/UITextures");
 #endif
-      Filename += ArchTexArray[i]->SourceFile.GetTCharPtr();
-      NBitmapData *BaseTexture = LoadImageFile (Filename.GetTCharPtr() );
+      Filename /= ArchTexArray[i]->SourceFile.GetTCharPtr();
+      NBitmapData *BaseTexture = LoadImageFile(Filename.string().c_str() );
 
       if (BaseTexture)
       {
@@ -478,18 +479,15 @@
       return false;
     }
 
-    NFileName Filename;
+    boost::filesystem::path Filename;
 
     if ( (SourceFolder != 0) && (NString (SourceFolder) != NString (TEXT ("") ) ) )
     {
       Filename = SourceFolder;
-      Filename.RemoveBackSlashAtEnd();
-      Filename.RemoveSlashAtEnd();
-      Filename.AddSlashAtEnd();
     }
 
-    Filename += TextureFilename;
-    NBitmapData *BaseTexture = LoadImageFile (Filename.GetTCharPtr() );
+    Filename /= TextureFilename;
+    NBitmapData *BaseTexture = LoadImageFile(Filename.string().c_str());
 
     if (BaseTexture == 0)
       return false;