vim: update qt snippets

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

diff --git a/vim/ultisnips/cpp.snippets b/vim/ultisnips/cpp.snippets
index 3a3b30bcc3cc8974fd4693d05d8cc02223ef519f..c98a71b6c2f3406ee5c213b497f905d84427846b 100644 (file)
--- a/vim/ultisnips/cpp.snippets
+++ b/vim/ultisnips/cpp.snippets
@@ -1,7 +1,15 @@
 # replace snippets of parent ft
 priority 1
 
 # replace snippets of parent ft
 priority 1
 

-snippet cl "class .. (class)"
+snippet inc "#include <>" b
+#include <${1:iostream}>
+endsnippet
+
+snippet Inc "#include \'\'" b
+#include "${1:`!p snip.rv = snip.basename+".h"`}"
+endsnippet
+
+snippet cl "class .. (class)" b

 class ${1:`!p snip.rv = snip.basename or "name"`}
 {
 public:
 class ${1:`!p snip.rv = snip.basename or "name"`}
 {
 public:


@@ -34,32 +42,61 @@ for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
 }
 endsnippet
 
 }
 endsnippet
 

+snippet cplat "Cross platform pre processor split" b
+#if defined(__GNUC__) && defined(__unix__)
+${1}
+#elif defined(__APPLE__)
+${2}
+#elif defined(WIN32)
+${3}
+#endif
+endsnippet
+

 #
 # Qt
 #
 snippet connect "Qt connect()" b
 connect(${1:this}, SIGNAL(${2:signal()}),
         ${3:this}, SLOT(${4:slot()}));
 #
 # Qt
 #
 snippet connect "Qt connect()" b
 connect(${1:this}, SIGNAL(${2:signal()}),
         ${3:this}, SLOT(${4:slot()}));

+endsnippet
+
+snippet connectl "Qt connect() lambda" b
+connect(${1:this}, &${2:class::function},
+        [=](${3:void}) { ${4} });
+${0}
+endsnippet
+
+snippet w "Define a new QWidget" b
+auto ${1:widget} = new ${2:QWidget};
+$1->setObjectName("${3:$1}");

 ${0}
 endsnippet
 
 snippet widget "Qt Widget Class" b
 ${0}
 endsnippet
 
 snippet widget "Qt Widget Class" b

-class ${1:WidgetClass} : public QWidget
+class ${1:`!p snip.rv = snip.basename or "WidgetClass"`} : public QWidget

 {
        Q_OBJECT
 
 public:
        explicit $1(${2}QWidget *parent = 0);
 {
        Q_OBJECT
 
 public:
        explicit $1(${2}QWidget *parent = 0);

-       ~$1();
+       ~$1() = default;

 
 

+       $0

 public slots:
 public slots:

-       ${3}

 
 signals:
 
 signals:

-       ${4}

 
 private:
 
 private:

-       ${5}

 
 

-};
+}; // class${1/.+/ $0/m}
+endsnippet
+
+# http://stackoverflow.com/a/9864472
+snippet alias "Function alias" b
+template <typename... Args>
+auto ${1:alias}(Args&&... args)
+       -> decltype($2(std::forward<Args>(args)...))
+{
+       return ${2:function}(std::forward<Args>(args)...);
+}

 endsnippet
 endsnippet