[WIP] Push all of the ultrahaptics changes!

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

diff --git a/vim/ultisnips/cpp.snippets b/vim/ultisnips/cpp.snippets
index 93d66183add0f92fb0dab33924b36aaab666f769..4159d065aa5b3472ffe51cbad789dae1a4d13fd0 100644 (file)
--- a/vim/ultisnips/cpp.snippets
+++ b/vim/ultisnips/cpp.snippets
@@ -6,7 +6,7 @@ snippet inc "#include <>" b
 endsnippet
 
 snippet Inc "#include \'\'" b
 endsnippet
 
 snippet Inc "#include \'\'" b

-#include "${1:`!p snip.rv = snip.basename+".h"`}"
+#include "${1:`!p snip.rv = snip.basename+".hpp"`}"

 endsnippet
 
 snippet cl "class .. (class)" b
 endsnippet
 
 snippet cl "class .. (class)" b


@@ -58,28 +58,37 @@ endsnippet
 snippet connect "Qt connect()" b
 connect(${1:this}, SIGNAL(${2:signal()}),
         ${3:this}, SLOT(${4:slot()}));
 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
 endsnippet
 
 # http://stackoverflow.com/a/9864472


@@ -91,3 +100,9 @@ auto ${1:alias}(Args&&... args)
        return ${2:function}(std::forward<Args>(args)...);
 }
 endsnippet
        return ${2:function}(std::forward<Args>(args)...);
 }
 endsnippet

+
+snippet uhc "Ultrahaptics Copyright" b
+/******************************************************************************
+ *     Copyright           :     `date +%Y` Ultrahaptics                            *
+ ******************************************************************************/
+endsnippet