Merge remote-tracking branch 'satoshi/qtui'

Conflicts (resolved by copying files from remote branch):
	.gitignore
	src/cryptopp/cpu.cpp
	src/cryptopp/cpu.h
	src/cryptopp/cryptlib.h
	src/cryptopp/iterhash.h
	src/cryptopp/misc.h
	src/cryptopp/secblock.h
	src/cryptopp/sha.cpp
	src/cryptopp/sha.h
	src/cryptopp/smartptr.h
	src/json/json_spirit_reader.cpp
	src/json/json_spirit_value.cpp
	src/json/json_spirit_writer.cpp

1 files changed, 41 insertions, 0 deletions

diff --git a/doc/coding.txt b/doc/coding.txt
new file mode 100644
index 000000000..470747669
--- /dev/null
+++ b/doc/coding.txt
@@ -0,0 +1,41 @@
+Please be consistent with the existing coding style.

+

+Block style:

+

+bool Function(char* psz, int n)

+{

+    // Comment summarising what this section of code does

+    for (int i = 0; i < n; i++)

+    {

+        // When something fails, return early

+        if (!Something())

+            return false;

+        ...

+    }

+

+    // Success return is usually at the end

+    return true;

+}

+

+- ANSI/Allman block style

+- 4 space indenting, no tabs

+- No extra spaces inside parenthesis; please don't do ( this )

+- No space after function names, one space after if, for and while

+

+Variable names begin with the type in lowercase, like nSomeVariable.

+Please don't put the first word of the variable name in lowercase like

+someVariable.

+

+Common types:

+n       integer number: short, unsigned short, int, unsigned int,

+            int64, uint64, sometimes char if used as a number

+d       double, float

+f       flag

+hash    uint256

+p       pointer or array, one p for each level of indirection

+psz     pointer to null terminated string

+str     string object

+v       vector or similar list objects

+map     map or multimap

+set     set or multiset

+bn      CBigNum