Split wx_filename out of common

common/CMakeLists.txt

@@ -389,6 +389,7 @@ set( COMMON_SRCS
     wildcards_and_files_ext.cpp
     page_layout/ws_painter.cpp
     wxdataviewctrl_helpers.cpp
+    wx_filename.cpp
     xnode.cpp
     )
 

common/common.cpp

@@ -431,71 +431,6 @@ std::ostream& operator<<( std::ostream& out, const wxPoint& pt )
  * SIGNIFICANT performance benefits.
  */
 
-/**
- * WX_FILENAME
- *
- * A wrapper around a wxFileName which avoids expensive calls to wxFileName::SplitPath()
- * and string concatenations by caching the path and filename locally and only resolving
- * the wxFileName when it has to.
- */
-WX_FILENAME::WX_FILENAME( const wxString& aPath, const wxString& aFilename ) :
-        m_fn( aPath, aFilename ),
-        m_path( aPath ),
-        m_fullName( aFilename )
-{ }
-
-
-void WX_FILENAME::SetFullName( const wxString& aFileNameAndExtension )
-{
-    m_fullName = aFileNameAndExtension;
-}
-
-
-wxString WX_FILENAME::GetName() const
-{
-    size_t dot = m_fullName.find_last_of( wxT( '.' ) );
-    return m_fullName.substr( 0, dot );
-}
-
-
-wxString WX_FILENAME::GetFullName() const
-{
-    return m_fullName;
-}
-
-
-wxString WX_FILENAME::GetPath() const
-{
-    return m_path;
-}
-
-
-wxString WX_FILENAME::GetFullPath() const
-{
-    return m_path + wxT( '/' ) + m_fullName;
-}
-
-
-// Write locally-cached values to the wxFileName.  MUST be called before using m_fn.
-void WX_FILENAME::resolve()
-{
-    size_t dot = m_fullName.find_last_of( wxT( '.' ) );
-    m_fn.SetName( m_fullName.substr( 0, dot ) );
-    m_fn.SetExt( m_fullName.substr( dot + 1 ) );
-}
-
-
-long long WX_FILENAME::GetTimestamp()
-{
-    resolve();
-
-    if( m_fn.FileExists() )
-        return m_fn.GetModificationTime().GetValue().GetValue();
-
-    return 0;
-}
-
-
 /**
  * A copy of wxMatchWild(), which wxWidgets attributes to Douglas A. Lewis
  * <dalewis@cs.Buffalo.EDU> and ircII's reg.c.

common/wx_filename.cpp

@@ -0,0 +1,81 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * 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 2
+ * 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, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <wx_filename.h>
+
+
+WX_FILENAME::WX_FILENAME( const wxString& aPath, const wxString& aFilename )
+        : m_fn( aPath, aFilename ), m_path( aPath ), m_fullName( aFilename )
+{
+}
+
+
+void WX_FILENAME::SetFullName( const wxString& aFileNameAndExtension )
+{
+    m_fullName = aFileNameAndExtension;
+}
+
+
+wxString WX_FILENAME::GetName() const
+{
+    size_t dot = m_fullName.find_last_of( wxT( '.' ) );
+    return m_fullName.substr( 0, dot );
+}
+
+
+wxString WX_FILENAME::GetFullName() const
+{
+    return m_fullName;
+}
+
+
+wxString WX_FILENAME::GetPath() const
+{
+    return m_path;
+}
+
+
+wxString WX_FILENAME::GetFullPath() const
+{
+    return m_path + wxT( '/' ) + m_fullName;
+}
+
+
+// Write locally-cached values to the wxFileName.  MUST be called before using m_fn.
+void WX_FILENAME::resolve()
+{
+    size_t dot = m_fullName.find_last_of( wxT( '.' ) );
+    m_fn.SetName( m_fullName.substr( 0, dot ) );
+    m_fn.SetExt( m_fullName.substr( dot + 1 ) );
+}
+
+
+long long WX_FILENAME::GetTimestamp()
+{
+    resolve();
+
+    if( m_fn.FileExists() )
+        return m_fn.GetModificationTime().GetValue().GetValue();
+
+    return 0;
+}

include/common.h

@@ -196,38 +196,7 @@ std::ostream& operator<<( std::ostream& out, const wxSize& size );
  */
 std::ostream& operator<<( std::ostream& out, const wxPoint& pt );
 
-
-/**
- * A wrapper around a wxFileName which is much more performant with a subset of the API.
- */
-class WX_FILENAME
-{
-public:
-    WX_FILENAME( const wxString& aPath, const wxString& aFilename );
-
-    void SetFullName( const wxString& aFileNameAndExtension );
-
-    wxString GetName() const;
-    wxString GetFullName() const;
-    wxString GetPath() const;
-    wxString GetFullPath() const;
-
-    // Avoid multiple calls to stat() on POSIX kernels.
-    long long GetTimestamp();
-
-private:
-    // Write cached values to the wrapped wxFileName.  MUST be called before using m_fn.
-    void resolve();
-
-    wxFileName m_fn;
-    wxString   m_path;
-    wxString   m_fullName;
-};
-
-
 long long TimestampDir( const wxString& aDirPath, const wxString& aFilespec );
 
 
-
-
 #endif  // INCLUDE__COMMON_H_

include/wx_filename.h

@@ -0,0 +1,60 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * 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 2
+ * 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, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef WX_FILENAME_H
+#define WX_FILENAME_H
+
+#include <wx/filename.h>
+
+/**
+ * WX_FILENAME - A wrapper around a wxFileName which is much more performant with a subset of the API.
+ *
+ * A wrapper around a wxFileName which avoids expensive calls to wxFileName::SplitPath()
+ * and string concatenations by caching the path and filename locally and only resolving
+ * the wxFileName when it has to.
+ */
+class WX_FILENAME
+{
+public:
+    WX_FILENAME( const wxString& aPath, const wxString& aFilename );
+
+    void SetFullName( const wxString& aFileNameAndExtension );
+
+    wxString GetName() const;
+    wxString GetFullName() const;
+    wxString GetPath() const;
+    wxString GetFullPath() const;
+
+    // Avoid multiple calls to stat() on POSIX kernels.
+    long long GetTimestamp();
+
+private:
+    // Write cached values to the wrapped wxFileName.  MUST be called before using m_fn.
+    void resolve();
+
+    wxFileName m_fn;
+    wxString   m_path;
+    wxString   m_fullName;
+};
+
+#endif // WX_FILENAME_H

pcbnew/plugins/geda/gpcb_plugin.cpp

@@ -39,6 +39,7 @@
 #include <pcb_shape.h>
 #include <fp_shape.h>
 #include <plugins/geda/gpcb_plugin.h>
+#include <wx_filename.h>
 
 #include <wx/dir.h>
 #include <wx/filename.h>

pcbnew/plugins/kicad/kicad_plugin.cpp

@@ -45,6 +45,7 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <convert_basic_shapes_to_polygon.h>    // for enum RECT_CHAMFER_POSITIONS definition
 #include <kiface_i.h>
+#include <wx_filename.h>
 
 using namespace PCB_KEYS_T;
 

qa/common/test_wx_filename.cpp

@@ -29,7 +29,7 @@
 #include <unit_test_utils/unit_test_utils.h>
 
 // Code under test
-#include <common.h>
+#include <wx_filename.h>
 
 /**
  * Declare the test suite