From: Samir Benmendil <me@rmz.io>
Date: Mon, 20 Jun 2016 10:11:46 +0000 (+0100)
Subject: vim: update qt snippets
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/bd9ffe699d9e56b0ce82979abd8ee4560ea85026?ds=sidebyside

vim: update qt snippets

* `w` to instanciate a new QWidget type and setObjectName
* `connectl` to connect object to lambda
* update `widget` to take the class name from the filename
---

diff --git a/vim/ultisnips/cpp.snippets b/vim/ultisnips/cpp.snippets
index 93d6618..c98a71b 100644
--- a/vim/ultisnips/cpp.snippets
+++ b/vim/ultisnips/cpp.snippets
@@ -58,28 +58,37 @@ endsnippet
 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
-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