diff options
| author | Mirian Margiani <mixosaurus+ichthyo@pm.me> | 2020-12-21 10:34:52 +0100 |
|---|---|---|
| committer | Mirian Margiani <mixosaurus+ichthyo@pm.me> | 2020-12-21 10:42:22 +0100 |
| commit | 4dc894d809d83ca6fbf1879bfc03da472e5f58db (patch) | |
| tree | 57f3fd12fca1c498a8ab88e08d801adb7adf5673 | |
| parent | 737a8c2f626740ccbbbe504fbc3fdc480fbc594f (diff) | |
Use complete filename when moving (to) a directory
QFileInfo::baseName removes the path plus the complete suffix.
We want to remove only the ".gpg" suffix manually, though.
| -rw-r--r-- | src/imitatepass.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imitatepass.cpp b/src/imitatepass.cpp index ed926ba0..82be1d91 100644 --- a/src/imitatepass.cpp +++ b/src/imitatepass.cpp @@ -350,6 +350,7 @@ void ImitatePass::Move(const QString src, const QString dest, QFileInfo srcFileInfo(src); QFileInfo destFileInfo(dest); QString destFile; + QString srcFileBaseName = srcFileInfo.fileName(); if (srcFileInfo.isFile()) { if (destFileInfo.isFile()) { @@ -360,7 +361,7 @@ void ImitatePass::Move(const QString src, const QString dest, return; } } else if (destFileInfo.isDir()) { - destFile = QDir(dest).filePath(srcFileInfo.baseName()); + destFile = QDir(dest).filePath(srcFileBaseName); } else { destFile = dest; } @@ -370,7 +371,7 @@ void ImitatePass::Move(const QString src, const QString dest, } else if (srcFileInfo.isDir()) { if (destFileInfo.isDir()) { - destFile = QDir(dest).filePath(srcFileInfo.baseName()); + destFile = QDir(dest).filePath(srcFileBaseName); } else if (destFileInfo.isFile()) { #ifdef QT_DEBUG dbg() << "Destination is a file"; @@ -379,7 +380,6 @@ void ImitatePass::Move(const QString src, const QString dest, } else { destFile = dest; } - } else { #ifdef QT_DEBUG dbg() << "Source file does not exist"; |