vim: open brace on new line

[dotfiles.git] / vim / ultisnips / cpp.snippets

diff --git a/vim/ultisnips/cpp.snippets b/vim/ultisnips/cpp.snippets
index 769f986c297671789e02b1d84e2f5d820db50b1f..7dfff3b3aa68d1403ea3d1a0bdafdeab235b7913 100644 (file)
--- a/vim/ultisnips/cpp.snippets
+++ b/vim/ultisnips/cpp.snippets
@@ -1,16 +1,5 @@
-priority -50
-
-extends c
-
-# We want to overwrite everything in parent ft.
-priority -49
-
-###########################################################################
-#                            TextMate Snippets                            #
-###########################################################################
-snippet beginend "$1.begin(), $1.end() (beginend)"
-${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
-endsnippet
+# replace snippets of parent ft
+priority 1
 
 snippet cl "class .. (class)"
 class ${1:`!p snip.rv = snip.basename or "name"`}
@@ -28,30 +17,19 @@ snippet ns "namespace .. (namespace)"
 namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
 {
 ${VISUAL}${0}
-} // namespace${1/.+/ $0/m}
+}${1/.+/ \/\/ namespace $0/m}
 endsnippet
 
-snippet readfile "read file (readF)"
-std::vector<char> v;
-if (FILE *fp = fopen(${1:"filename"}, "r"))
+snippet mfun "Member Function" b
+${4:void} ${1:`!p snip.rv = snip.basename or "name"`}::${2:memberFunction}(${3})
 {
-       char buf[1024];
-       while(size_t len = fread(buf, 1, sizeof(buf), fp))
-               v.insert(v.end(), buf, buf + len);
-       fclose(fp);
+       ${0}
 }
 endsnippet
 
-snippet map "std::map (map)"
-std::map<${1:key}, ${2:value}> map$0;
-endsnippet
-
-snippet vector "std::vector (v)"
-std::vector<${1:char}> v$0;
-endsnippet
-
-snippet tp "template <typename ..> (template)"
-template <typename ${1:_InputIter}>
+snippet for "for loop (for)"
+for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+{
+       ${VISUAL}${0}
+}
 endsnippet
-
-# vim:ft=snippets: