Merge branch 'PrismLauncher:develop' into add-startmenu-shortcut
This commit is contained in:
commit
14a78d55b0
723 changed files with 20113 additions and 10156 deletions
|
@ -115,7 +115,7 @@ class copy : public QObject {
|
|||
m_followSymlinks = follow;
|
||||
return *this;
|
||||
}
|
||||
copy& matcher(const IPathMatcher* filter)
|
||||
copy& matcher(IPathMatcher::Ptr filter)
|
||||
{
|
||||
m_matcher = filter;
|
||||
return *this;
|
||||
|
@ -147,7 +147,7 @@ class copy : public QObject {
|
|||
|
||||
private:
|
||||
bool m_followSymlinks = true;
|
||||
const IPathMatcher* m_matcher = nullptr;
|
||||
IPathMatcher::Ptr m_matcher = nullptr;
|
||||
bool m_whitelist = false;
|
||||
bool m_overwrite = false;
|
||||
QDir m_src;
|
||||
|
@ -209,7 +209,7 @@ class create_link : public QObject {
|
|||
m_useHardLinks = useHard;
|
||||
return *this;
|
||||
}
|
||||
create_link& matcher(const IPathMatcher* filter)
|
||||
create_link& matcher(IPathMatcher::Ptr filter)
|
||||
{
|
||||
m_matcher = filter;
|
||||
return *this;
|
||||
|
@ -260,7 +260,7 @@ class create_link : public QObject {
|
|||
|
||||
private:
|
||||
bool m_useHardLinks = false;
|
||||
const IPathMatcher* m_matcher = nullptr;
|
||||
IPathMatcher::Ptr m_matcher = nullptr;
|
||||
bool m_whitelist = false;
|
||||
bool m_recursive = true;
|
||||
|
||||
|
@ -491,7 +491,7 @@ class clone : public QObject {
|
|||
m_src.setPath(src);
|
||||
m_dst.setPath(dst);
|
||||
}
|
||||
clone& matcher(const IPathMatcher* filter)
|
||||
clone& matcher(IPathMatcher::Ptr filter)
|
||||
{
|
||||
m_matcher = filter;
|
||||
return *this;
|
||||
|
@ -517,7 +517,7 @@ class clone : public QObject {
|
|||
bool operator()(const QString& offset, bool dryRun = false);
|
||||
|
||||
private:
|
||||
const IPathMatcher* m_matcher = nullptr;
|
||||
IPathMatcher::Ptr m_matcher = nullptr;
|
||||
bool m_whitelist = false;
|
||||
QDir m_src;
|
||||
QDir m_dst;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue