tastytea
/
xdgcfg
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Changed get_filepath() from string to filesystem::path

This commit is contained in:
tastytea 2018-08-11 07:10:53 +02:00
parent f4ab842787
commit bae3f09ed2
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.7) cmake_minimum_required (VERSION 3.7)
project(xdgcfg project(xdgcfg
VERSION 0.1.0 VERSION 0.2.0
LANGUAGES CXX LANGUAGES CXX
) )

17
src/xdgcfg.cpp
View File

@ -2,21 +2,10 @@
* Author: tastytea <tastytea@tastytea.de> * Author: tastytea <tastytea@tastytea.de>
*/ */
#if __cplusplus >= 201703L
#include <filesystem>
#else
#include <experimental/filesystem>
#endif
#include <iostream> #include <iostream>
#include <basedir.h> #include <basedir.h>
#include "xdgcfg.hpp" #include "xdgcfg.hpp"
#if __cplusplus >= 201703L
namespace fs = std::filesystem;
#else
namespace fs = std::experimental::filesystem;
#endif
using std::cerr; using std::cerr;
using std::endl; using std::endl;
@ -31,13 +20,13 @@ xdgcfg::xdgcfg(const string &filename, const string &subdir)
if (!subdir.empty()) if (!subdir.empty())
{ {
_filepath += '/' + subdir; _filepath /= subdir;
if (!fs::exists(_filepath)) if (!fs::exists(_filepath))
{ {
fs::create_directory(_filepath); fs::create_directory(_filepath);
} }
} }
_filepath += '/' + filename; _filepath /= filename;
} }
const uint_fast8_t xdgcfg::read() const uint_fast8_t xdgcfg::read()
@ -92,7 +81,7 @@ libconfig::Config &xdgcfg::get_cfg()
return _cfg; return _cfg;
} }
const string xdgcfg::get_filepath() const const fs::path xdgcfg::get_filepath() const
{ {
return _filepath; return _filepath;
} }

14
src/xdgcfg.hpp
View File

@ -5,10 +5,20 @@
#ifndef XDGCFG_HPP #ifndef XDGCFG_HPP
#define XDGCFG_HPP #define XDGCFG_HPP
#if __cplusplus >= 201703L
#include <filesystem>
#else
#include <experimental/filesystem>
#endif
#include <string> #include <string>
#include <cstdint> #include <cstdint>
#include <libconfig.h++> #include <libconfig.h++>
#if __cplusplus >= 201703L
namespace fs = std::filesystem;
#else
namespace fs = std::experimental::filesystem;
#endif
using std::string; using std::string;
using std::uint_fast8_t; using std::uint_fast8_t;
@ -55,7 +65,7 @@ public:
/*! /*!
* @brief Returns the complete filepath * @brief Returns the complete filepath
*/ */
const string get_filepath() const; const fs::path get_filepath() const;
/*! /*!
* @brief Sets verbosity * @brief Sets verbosity
@ -76,7 +86,7 @@ private:
/*! /*!
* Complete filepath * Complete filepath
*/ */
string _filepath; fs::path _filepath;
/*! /*!
* Print out error messages if true * Print out error messages if true