diff --git a/helper/generate.lisp b/helper/generate.lisp index 9b13bba..da1bc70 100644 --- a/helper/generate.lisp +++ b/helper/generate.lisp @@ -319,9 +319,12 @@ "")) (defun add-namespace (name class) - (let ((class* (if (equal "QAbstractItemView" class) ; "protected enum" problem (clang only) - (x:cc "L" (subseq class 1)) - class))) + (let ((class* (when class + ;; "protected enum" problem (clang only) + (if (and (string= "QAbstractItemView" class) + (string= "State" name)) + (x:cc "L" (subseq class 1)) + class)))) (if (string= "FunctorOrLambda" name) "FunctorOrLambda" (unless (empty-string name) @@ -340,7 +343,7 @@ (if templ (format nil "~A~A::~A" (subseq name 0 templ) - class* + class (subseq name templ)) (if-it (and (not (search "()" name)) (position #\( name)) diff --git a/src/eql.cpp b/src/eql.cpp index 446cccd..716e195 100644 --- a/src/eql.cpp +++ b/src/eql.cpp @@ -7,7 +7,7 @@ #include #include -const char EQL::version[] = "17.3.5"; // Mar 2017 +const char EQL::version[] = "17.4.1"; // Apr 2017 extern "C" void ini_EQL(cl_object); diff --git a/src/gen/_main_q_methods.h b/src/gen/_main_q_methods.h index aeb6636..26107e9 100644 --- a/src/gen/_main_q_methods.h +++ b/src/gen/_main_q_methods.h @@ -4868,7 +4868,7 @@ public: Q_INVOKABLE QAbstractItemModel* Mmodel(QAbstractItemView* o) const { return o->model(); } Q_INVOKABLE void MopenPersistentEditor(QAbstractItemView* o, const QModelIndex& x1) { o->openPersistentEditor(x1); } Q_INVOKABLE QModelIndex MrootIndex(QAbstractItemView* o) const { return o->rootIndex(); } - Q_INVOKABLE void MscrollTo(QAbstractItemView* o, const QModelIndex& x1, LAbstractItemView::ScrollHint x2 = LAbstractItemView::EnsureVisible) { o->scrollTo(x1, x2); } + Q_INVOKABLE void MscrollTo(QAbstractItemView* o, const QModelIndex& x1, QAbstractItemView::ScrollHint x2 = QAbstractItemView::EnsureVisible) { o->scrollTo(x1, x2); } Q_INVOKABLE int MselectionBehavior(QAbstractItemView* o) const { return o->selectionBehavior(); } Q_INVOKABLE int MselectionMode(QAbstractItemView* o) const { return o->selectionMode(); } Q_INVOKABLE QItemSelectionModel* MselectionModel(QAbstractItemView* o) const { return o->selectionModel(); } @@ -4876,12 +4876,12 @@ public: Q_INVOKABLE void MsetAutoScroll(QAbstractItemView* o, bool x1) { o->setAutoScroll(x1); } Q_INVOKABLE void MsetAutoScrollMargin(QAbstractItemView* o, int x1) { o->setAutoScrollMargin(x1); } Q_INVOKABLE void MsetDefaultDropAction(QAbstractItemView* o, Qt::DropAction x1) { o->setDefaultDropAction(x1); } - Q_INVOKABLE void MsetDragDropMode(QAbstractItemView* o, LAbstractItemView::DragDropMode x1) { o->setDragDropMode(x1); } + Q_INVOKABLE void MsetDragDropMode(QAbstractItemView* o, QAbstractItemView::DragDropMode x1) { o->setDragDropMode(x1); } Q_INVOKABLE void MsetDragDropOverwriteMode(QAbstractItemView* o, bool x1) { o->setDragDropOverwriteMode(x1); } Q_INVOKABLE void MsetDragEnabled(QAbstractItemView* o, bool x1) { o->setDragEnabled(x1); } Q_INVOKABLE void MsetDropIndicatorShown(QAbstractItemView* o, bool x1) { o->setDropIndicatorShown(x1); } - Q_INVOKABLE void MsetEditTriggers(QAbstractItemView* o, LAbstractItemView::EditTriggers x1) { o->setEditTriggers(x1); } - Q_INVOKABLE void MsetHorizontalScrollMode(QAbstractItemView* o, LAbstractItemView::ScrollMode x1) { o->setHorizontalScrollMode(x1); } + Q_INVOKABLE void MsetEditTriggers(QAbstractItemView* o, QAbstractItemView::EditTriggers x1) { o->setEditTriggers(x1); } + Q_INVOKABLE void MsetHorizontalScrollMode(QAbstractItemView* o, QAbstractItemView::ScrollMode x1) { o->setHorizontalScrollMode(x1); } Q_INVOKABLE void MsetIconSize(QAbstractItemView* o, const QSize& x1) { o->setIconSize(x1); } Q_INVOKABLE void MsetIndexWidget(QAbstractItemView* o, const QModelIndex& x1, QWidget* x2) { o->setIndexWidget(x1, x2); } Q_INVOKABLE void MsetItemDelegate(QAbstractItemView* o, QAbstractItemDelegate* x1) { o->setItemDelegate(x1); } @@ -4893,7 +4893,7 @@ public: Q_INVOKABLE void MsetSelectionModel(QAbstractItemView* o, QItemSelectionModel* x1) { o->setSelectionModel(x1); } Q_INVOKABLE void MsetTabKeyNavigation(QAbstractItemView* o, bool x1) { o->setTabKeyNavigation(x1); } Q_INVOKABLE void MsetTextElideMode(QAbstractItemView* o, Qt::TextElideMode x1) { o->setTextElideMode(x1); } - Q_INVOKABLE void MsetVerticalScrollMode(QAbstractItemView* o, LAbstractItemView::ScrollMode x1) { o->setVerticalScrollMode(x1); } + Q_INVOKABLE void MsetVerticalScrollMode(QAbstractItemView* o, QAbstractItemView::ScrollMode x1) { o->setVerticalScrollMode(x1); } Q_INVOKABLE bool MshowDropIndicator(QAbstractItemView* o) const { return o->showDropIndicator(); } Q_INVOKABLE int MsizeHintForColumn(QAbstractItemView* o, int x1) const { return o->sizeHintForColumn(x1); } Q_INVOKABLE QSize MsizeHintForIndex(QAbstractItemView* o, const QModelIndex& x1) const { return o->sizeHintForIndex(x1); }