aboutsummaryrefslogtreecommitdiff
path: root/launcher/FileSystem.h
diff options
context:
space:
mode:
authorOldWorldOrdr <joey.t.reinhart@gmail.com>2022-06-20 11:02:40 -0400
committerGitHub <noreply@github.com>2022-06-20 11:02:40 -0400
commit6103d86a47039521c3d4c31a4716c1d48962a8f1 (patch)
tree95112ac7e3a583fc740eec845b2bbc3126a816fb /launcher/FileSystem.h
parent843c860d98dab5a438374ab136b28d409184ec81 (diff)
parentb8899a534d9679aace828f9c15a9a3083685f680 (diff)
downloadPrismLauncher-6103d86a47039521c3d4c31a4716c1d48962a8f1.tar.gz
PrismLauncher-6103d86a47039521c3d4c31a4716c1d48962a8f1.tar.bz2
PrismLauncher-6103d86a47039521c3d4c31a4716c1d48962a8f1.zip
Merge branch 'PolyMC:develop' into develop
Diffstat (limited to 'launcher/FileSystem.h')
-rw-r--r--launcher/FileSystem.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/launcher/FileSystem.h b/launcher/FileSystem.h
index 8f6e8b48..bc942ab3 100644
--- a/launcher/FileSystem.h
+++ b/launcher/FileSystem.h
@@ -124,4 +124,8 @@ QString getDesktopDir();
// call it *name* and assign it the icon *icon*
// return true if operation succeeded
bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation);
+
+// Overrides one folder with the contents of another, preserving items exclusive to the first folder
+// Equivalent to doing QDir::rename, but allowing for overrides
+bool overrideFolder(QString overwritten_path, QString override_path);
}