sync with upstream

1 files changed, 10 insertions, 21 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
index b089da3..3df6cec 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/Filesystem.h
@@ -1,24 +1,13 @@
-#pragma once
 /*
- *      Copyright (C) 2005-2017 Team Kodi
- *      http://kodi.tv
- *
- *  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, 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 Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
+ *  Copyright (C) 2005-2018 Team Kodi
+ *  This file is part of Kodi - https://kodi.tv
  *
+ *  SPDX-License-Identifier: GPL-2.0-or-later
+ *  See LICENSES/README.md for more information.
  */
 
+#pragma once
+
 #include "AddonBase.h"
 
 #include <map>
@@ -40,7 +29,7 @@
   #define _SSIZE_T_DEFINED
 #endif // !_SSIZE_T_DEFINED
 #endif
-  
+
 #ifndef S_ISDIR
   #define S_ISDIR(mode)  ((((mode)) & 0170000) == (0040000))
 #endif
@@ -895,7 +884,7 @@ namespace vfs
     return strReturn;
   }
   //----------------------------------------------------------------------------
-  
+
   //============================================================================
   ///
   /// @ingroup cpp_kodi_vfs
@@ -1231,7 +1220,7 @@ namespace vfs
     /// @ingroup cpp_kodi_vfs_CFile
     /// @brief Construct a new, unopened file
     ///
-    CFile() : m_file(nullptr) { }
+    CFile() = default;
     //--------------------------------------------------------------------------
 
     //==========================================================================
@@ -1637,7 +1626,7 @@ namespace vfs
     //--------------------------------------------------------------------------
 
   private:
-    void* m_file;
+    void* m_file = nullptr;
   };
   //@}
   //----------------------------------------------------------------------------