X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/40bf56c5fffd581908407412c5b945522433cf82..53ec838a524643a830dba9fc81c21c1627f6b2ae:/vim/ultisnips/cpp.snippets

diff --git a/vim/ultisnips/cpp.snippets b/vim/ultisnips/cpp.snippets
index 93d6618..a2a4180 100644
--- a/vim/ultisnips/cpp.snippets
+++ b/vim/ultisnips/cpp.snippets
@@ -6,7 +6,7 @@ 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
@@ -55,31 +55,47 @@ endsnippet
 #
 # Qt
 #
+global !p
+def align(base, a, pad=' '):
+	amount = abs(len(base) - len(a))
+	return amount * pad if len(base) < len(a) else ''
+endglobal
+
 snippet connect "Qt connect()" b
-connect(${1:this}, SIGNAL(${2:signal()}),
-        ${3:this}, SLOT(${4:slot()}));
+connect(${1:this}, `!p snip.rv = align(t[1],t[3])`&${2:class::function},
+        ${3:this}, `!p snip.rv = align(t[3],t[1])`&${4:class::function});
+${0}
+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
-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);
-	~$1();
+	~$1() = default;
 
+	$0
 public slots:
-	${3}
 
 signals:
-	${4}
 
 private:
-	${5}
 
-};
+}; // class${1/.+/ $0/m}
 endsnippet
 
 # http://stackoverflow.com/a/9864472