vim: remove vimwiki, mainly just using vim-orgmode now

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

diff --git a/vim/ultisnips/cpp.snippets b/vim/ultisnips/cpp.snippets
index 90cd84d5d6d421c4e4735d769604d833680c37b5..5530263852979d17c32701eda3080674c3ec67c4 100644 (file)
--- a/vim/ultisnips/cpp.snippets
+++ b/vim/ultisnips/cpp.snippets
@@ -2,7 +2,7 @@
 priority 1
 
 # disable horrible one word snippets
-clearsnippets pri pro pub fr mu
+clearsnippets pri pro pub fr mu t
 
 snippet inc "#include <>" b
 #include <${1:iostream}>
@@ -16,7 +16,7 @@ snippet cl "class .. (class)" b
 class ${1:`!p snip.rv = snip.basename or "name"`}
 {
 public:
-       ${1/(\w+).*/$1/}(${2:arguments}) = default;
+       ${1/(\w+).*/$1/}(${2}) = default;
        virtual ~${1/(\w+).*/$1/}() = default;
 
 private:
@@ -34,9 +34,9 @@ $1 &operator=($1 &&) = default;
 endsnippet
 
 snippet ns "namespace .. (namespace)"
-namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`} {
+namespace${1/.+/ /m}${1} {
 ${VISUAL}${0}
-}${1/.+/ \/\/ namespace $0/m}
+}  // namespace${1/.+/ $0/m}
 endsnippet
 
 snippet mfun "Member Function" b
@@ -47,7 +47,7 @@ ${4:void} ${1:`!p snip.rv = snip.basename or "name"`}::${2:memberFunction}(${3})
 endsnippet
 
 snippet for "for loop (for)"
-for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 {
        ${VISUAL}${0}
 }
@@ -153,3 +153,18 @@ inline std::ostream & operator<<(std::ostream &os, ${1:Type} const & rhs)
        return os;
 }
 endsnippet
+
+snippet pragma-ignore "ignore diagnostics"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-W${1}"
+${VISUAL}${0}
+#pragma GCC diagnostic pop
+endsnippet
+
+snippet FPP "FPP Copyright" b
+// Copyright © Focal Point Positioning Limited 2020. All Rights Reserved.
+// This code is the copyright of Focal Point Positioning Limited and
+// cannot be used, copied or distributed without the express written
+// permission of Focal Point Positioning Limited.
+${0}
+endsnippet