Browse Source

update generated files

Neal Wilson 7 years ago
parent
commit
3cc098120d
4 changed files with 22 additions and 17 deletions
  1. 16
    11
      src/typica.cpp
  2. 4
    4
      src/webelement.cpp
  3. 1
    1
      src/webelement.h
  4. 1
    1
      src/webview.cpp

+ 16
- 11
src/typica.cpp View File

@@ -30,12 +30,12 @@
30 30
 
31 31
 #line 1 "./measurement.w"
32 32
 /*:304*//*575:*/
33
-#line 212 "./webview.w"
33
+#line 217 "./webview.w"
34 34
 
35 35
 #include "webview.h"
36 36
 
37 37
 /*:575*//*588:*/
38
-#line 390 "./webview.w"
38
+#line 395 "./webview.w"
39 39
 
40 40
 #include "webelement.h"
41 41
 
@@ -3637,7 +3637,7 @@ QScriptValue constructXMLInput(QScriptContext*context,QScriptEngine*engine);
3637 3637
 QScriptValue XMLInput_input(QScriptContext*context,QScriptEngine*engine);
3638 3638
 
3639 3639
 /*:555*//*574:*/
3640
-#line 204 "./webview.w"
3640
+#line 209 "./webview.w"
3641 3641
 
3642 3642
 QScriptValue constructWebView(QScriptContext*context,QScriptEngine*engine);
3643 3643
 void setQWebViewProperties(QScriptValue value,QScriptEngine*engine);
@@ -3645,13 +3645,13 @@ void addWebViewToLayout(QDomElement element,QStack<QWidget*> *widgetStack,
3645 3645
 QStack<QLayout*> *layoutStack);
3646 3646
 
3647 3647
 /*:574*//*577:*/
3648
-#line 234 "./webview.w"
3648
+#line 239 "./webview.w"
3649 3649
 
3650 3650
 QScriptValue QWebElement_toScriptValue(QScriptEngine*engine,const QWebElement&element);
3651 3651
 void QWebElement_fromScriptValue(const QScriptValue&value,QWebElement&element);
3652 3652
 
3653 3653
 /*:577*//*581:*/
3654
-#line 292 "./webview.w"
3654
+#line 297 "./webview.w"
3655 3655
 
3656 3656
 QScriptValue constructWebElement(QScriptContext*context,
3657 3657
 QScriptEngine*engine);
@@ -23678,16 +23678,21 @@ void addWebViewToLayout(QDomElement element,QStack<QWidget*> *,
23678 23678
 QStack<QLayout*> *layoutStack)
23679 23679
 {
23680 23680
 TypicaWebView*view= new TypicaWebView;
23681
+int stretch= 0;
23681 23682
 if(element.hasAttribute("id"))
23682 23683
 {
23683 23684
 view->setObjectName(element.attribute("id"));
23684 23685
 }
23686
+if(element.hasAttribute("stretch"))
23687
+{
23688
+stretch= element.attribute("stretch").toInt();
23689
+}
23685 23690
 QBoxLayout*layout= qobject_cast<QBoxLayout*> (layoutStack->top());
23686
-layout->addWidget(view);
23691
+layout->addWidget(view,stretch);
23687 23692
 }
23688 23693
 
23689 23694
 /*:573*//*578:*/
23690
-#line 240 "./webview.w"
23695
+#line 245 "./webview.w"
23691 23696
 
23692 23697
 QScriptValue QWebElement_toScriptValue(QScriptEngine*engine,const QWebElement&element)
23693 23698
 {
@@ -23703,7 +23708,7 @@ element= value.toVariant().value<QWebElement> ();
23703 23708
 }
23704 23709
 
23705 23710
 /*:578*//*583:*/
23706
-#line 305 "./webview.w"
23711
+#line 310 "./webview.w"
23707 23712
 
23708 23713
 template<> QWebElement argument(int arg,QScriptContext*context)
23709 23714
 {
@@ -23711,7 +23716,7 @@ return qscriptvalue_cast<QWebElement> (context->argument(arg));
23711 23716
 }
23712 23717
 
23713 23718
 /*:583*//*584:*/
23714
-#line 314 "./webview.w"
23719
+#line 319 "./webview.w"
23715 23720
 
23716 23721
 QScriptValue constructWebElement(QScriptContext*context,
23717 23722
 QScriptEngine*engine)
@@ -25338,12 +25343,12 @@ value= engine->newQMetaObject(&TypicaWebView::staticMetaObject,constructor);
25338 25343
 engine->globalObject().setProperty("WebView",value);
25339 25344
 
25340 25345
 /*:571*//*579:*/
25341
-#line 256 "./webview.w"
25346
+#line 261 "./webview.w"
25342 25347
 
25343 25348
 qScriptRegisterMetaType(engine,QWebElement_toScriptValue,QWebElement_fromScriptValue);
25344 25349
 
25345 25350
 /*:579*//*582:*/
25346
-#line 298 "./webview.w"
25351
+#line 303 "./webview.w"
25347 25352
 
25348 25353
 constructor= engine->newFunction(constructWebElement);
25349 25354
 engine->globalObject().setProperty("WebElement",constructor);

+ 4
- 4
src/webelement.cpp View File

@@ -1,10 +1,10 @@
1 1
 /*587:*/
2
-#line 383 "./webview.w"
2
+#line 388 "./webview.w"
3 3
 
4 4
 #include "webelement.h"
5 5
 
6 6
 /*585:*/
7
-#line 326 "./webview.w"
7
+#line 331 "./webview.w"
8 8
 
9 9
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
10 10
 {
@@ -12,7 +12,7 @@ TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
12 12
 }
13 13
 
14 14
 /*:585*//*586:*/
15
-#line 335 "./webview.w"
15
+#line 340 "./webview.w"
16 16
 
17 17
 void TypicaWebElement::appendInside(const QString&markup)
18 18
 {
@@ -60,7 +60,7 @@ e.setPlainText(text);
60 60
 }
61 61
 
62 62
 /*:586*/
63
-#line 386 "./webview.w"
63
+#line 391 "./webview.w"
64 64
 
65 65
 
66 66
 /*:587*/

+ 1
- 1
src/webelement.h View File

@@ -1,5 +1,5 @@
1 1
 /*580:*/
2
-#line 263 "./webview.w"
2
+#line 268 "./webview.w"
3 3
 
4 4
 #include <QWebElement> 
5 5
 #include <QObject> 

+ 1
- 1
src/webview.cpp View File

@@ -99,7 +99,7 @@ QWebView::print(printer);
99 99
 }
100 100
 
101 101
 /*:570*//*576:*/
102
-#line 220 "./webview.w"
102
+#line 225 "./webview.w"
103 103
 
104 104
 QWebElement TypicaWebView::documentElement()
105 105
 {

Loading…
Cancel
Save