summaryrefslogtreecommitdiffstats
path: root/src/libs/7zip/unix
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2013-01-21 12:52:13 +0100
committerTim Jenssen <tim.jenssen@digia.com>2013-01-23 13:58:27 +0100
commit01cbce9e057a1ca951d99558feaea5b6f7620541 (patch)
treed0fd5fc5bc0b13f923d7a0099dd6e85c04477102 /src/libs/7zip/unix
parent590457501a6edbc732a3a6243305b61bf5dbaf08 (diff)
Fix some warnings in our code after Idcfec77.
Change-Id: Ied8ffad416ae058a45fa2d46f8ff304ff5b4a392 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs/7zip/unix')
-rw-r--r--src/libs/7zip/unix/CPP/7zip/UI/Common/Update.h4
-rw-r--r--src/libs/7zip/unix/CPP/Common/Wildcard.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/7zip/unix/CPP/7zip/UI/Common/Update.h b/src/libs/7zip/unix/CPP/7zip/UI/Common/Update.h
index 49af0092a..ade001303 100644
--- a/src/libs/7zip/unix/CPP/7zip/UI/Common/Update.h
+++ b/src/libs/7zip/unix/CPP/7zip/UI/Common/Update.h
@@ -116,11 +116,11 @@ struct CUpdateOptions
CUpdateOptions():
UpdateArchiveItself(true),
SfxMode(false),
+ OpenShareForWrite(false),
StdInMode(false),
StdOutMode(false),
EMailMode(false),
- EMailRemoveAfter(false),
- OpenShareForWrite(false)
+ EMailRemoveAfter(false)
{};
void SetAddActionCommand()
diff --git a/src/libs/7zip/unix/CPP/Common/Wildcard.h b/src/libs/7zip/unix/CPP/Common/Wildcard.h
index 6d4cbcece..2aa33c496 100644
--- a/src/libs/7zip/unix/CPP/Common/Wildcard.h
+++ b/src/libs/7zip/unix/CPP/Common/Wildcard.h
@@ -33,7 +33,7 @@ class CCensorNode
bool CheckPath(UStringVector &pathParts, bool isFile, bool &include) const;
public:
CCensorNode(): Parent(0) { };
- CCensorNode(const UString &name, CCensorNode *parent): Name(name), Parent(parent) { };
+ CCensorNode(const UString &name, CCensorNode *parent): Parent(parent), Name(name) { };
UString Name;
CObjectVector<CCensorNode> SubNodes;
CObjectVector<CItem> IncludeItems;