anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Add move constructor and move assignment operator for FileName class"

Browse Source 
For now, since it's causing problems on OSX particularly.

This reverts commit 854c9de8fa.
This commit is contained in:
Richard Kimberly Heck 2021-01-14 03:07:33 -05:00
parent 81af5ac742
commit fcea6c471c
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/support/FileName.cpp
View File

@ -158,13 +158,6 @@ FileName::FileName(FileName const & rhs) : d(new Private)
}
FileName::FileName(FileName && rhs) noexcept
: d(rhs.d)
{
rhs.d = nullptr;
}
FileName::FileName(FileName const & rhs, string const & suffix) : d(new Private)
{
set(rhs, suffix);
@ -181,15 +174,6 @@ FileName & FileName::operator=(FileName const & rhs)
}
FileName & FileName::operator=(FileName && rhs) noexcept
{
auto temp = rhs.d;
rhs.d = d;
d = temp;
return *this;
}
bool FileName::empty() const
{
return d->name.empty();

14
src/support/FileName.h
View File

@ -42,21 +42,15 @@ public:
*/
explicit FileName(std::string const & abs_filename);
/// copy constructor
/// copy constructor.
FileName(FileName const &);
/// move constructor
FileName(FileName &&) noexcept;
/// constructor with base name and suffix
/// constructor with base name and suffix.
FileName(FileName const & fn, std::string const & suffix);
/// copy assign
///
FileName & operator=(FileName const &);
/// move assign
FileName & operator=(FileName &&) noexcept;
virtual ~FileName();
/** Set a new filename.
* \param filename the file in question. Must have an absolute path.
@ -225,7 +219,7 @@ private:
bool copyTo(FileName const &, bool, FileNameSet &) const;
///
struct Private;
Private * d;
Private * const d;
};