Browse Source

Update generated source files

Neal Wilson 11 years ago
parent
commit
1f100d2de1
15 changed files with 2824 additions and 2398 deletions
  1. 5
    5
      src/abouttypica.cpp
  2. 2
    2
      src/abouttypica.h
  3. 2
    2
      src/draglabel.cpp
  4. 2
    2
      src/draglabel.h
  5. 6
    6
      src/helpmenu.cpp
  6. 2
    2
      src/helpmenu.h
  7. 6
    6
      src/scale.cpp
  8. 2
    2
      src/scale.h
  9. 2744
    2310
      src/typica.cpp
  10. 15
    23
      src/units.cpp
  11. 2
    2
      src/units.h
  12. 9
    9
      src/webelement.cpp
  13. 3
    3
      src/webelement.h
  14. 21
    21
      src/webview.cpp
  15. 3
    3
      src/webview.h

+ 5
- 5
src/abouttypica.cpp View File

@@ -1,9 +1,9 @@
1
-/*231:*/
1
+/*222:*/
2 2
 #line 33 "./abouttypica.w"
3 3
 
4 4
 #include "abouttypica.h"
5 5
 
6
-/*232:*/
6
+/*223:*/
7 7
 #line 42 "./abouttypica.w"
8 8
 
9 9
 AboutTypica::AboutTypica():QMainWindow(NULL)
@@ -17,10 +17,10 @@ aboutFile.close();
17 17
 setCentralWidget(banner);
18 18
 }
19 19
 
20
-#line 5770 "./typica.w"
20
+#line 5640 "./typica.w"
21 21
 
22
-/*:232*/
22
+/*:223*/
23 23
 #line 36 "./abouttypica.w"
24 24
 
25 25
 
26
-/*:231*/
26
+/*:222*/

+ 2
- 2
src/abouttypica.h View File

@@ -1,4 +1,4 @@
1
-/*230:*/
1
+/*221:*/
2 2
 #line 14 "./abouttypica.w"
3 3
 
4 4
 #include <QMainWindow> 
@@ -17,4 +17,4 @@ AboutTypica();
17 17
 
18 18
 #endif
19 19
 
20
-/*:230*/
20
+/*:221*/

+ 2
- 2
src/draglabel.cpp View File

@@ -1,4 +1,4 @@
1
-/*848:*/
1
+/*842:*/
2 2
 #line 33 "./scales.w"
3 3
 
4 4
 #include "draglabel.h"
@@ -26,4 +26,4 @@ drag->exec();
26 26
 }
27 27
 }
28 28
 
29
-/*:848*/
29
+/*:842*/

+ 2
- 2
src/draglabel.h View File

@@ -1,4 +1,4 @@
1
-/*847:*/
1
+/*841:*/
2 2
 #line 13 "./scales.w"
3 3
 
4 4
 #ifndef TypicaDragLabelInclude
@@ -17,4 +17,4 @@ void mousePressEvent(QMouseEvent*event);
17 17
 
18 18
 #endif
19 19
 
20
-/*:847*/
20
+/*:841*/

+ 6
- 6
src/helpmenu.cpp View File

@@ -1,10 +1,10 @@
1
-/*175:*/
1
+/*163:*/
2 2
 #line 35 "./helpmenu.w"
3 3
 
4 4
 #include "helpmenu.h"
5 5
 #include "abouttypica.h"
6 6
 
7
-/*176:*/
7
+/*164:*/
8 8
 #line 47 "./helpmenu.w"
9 9
 
10 10
 HelpMenu::HelpMenu():QMenu()
@@ -17,7 +17,7 @@ addAction(aboutTypicaAction);
17 17
 connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
18 18
 }
19 19
 
20
-/*:176*//*177:*/
20
+/*:164*//*165:*/
21 21
 #line 61 "./helpmenu.w"
22 22
 
23 23
 void HelpMenu::displayAboutTypica()
@@ -26,10 +26,10 @@ AboutTypica*aboutBox= new AboutTypica;
26 26
 aboutBox->show();
27 27
 }
28 28
 
29
-#line 4138 "./typica.w"
29
+#line 3946 "./typica.w"
30 30
 
31
-/*:177*/
31
+/*:165*/
32 32
 #line 39 "./helpmenu.w"
33 33
 
34 34
 
35
-/*:175*/
35
+/*:163*/

+ 2
- 2
src/helpmenu.h View File

@@ -1,4 +1,4 @@
1
-/*174:*/
1
+/*162:*/
2 2
 #line 16 "./helpmenu.w"
3 3
 
4 4
 #include <QMenu> 
@@ -17,4 +17,4 @@ void displayAboutTypica();
17 17
 
18 18
 #endif
19 19
 
20
-/*:174*/
20
+/*:162*/

+ 6
- 6
src/scale.cpp View File

@@ -1,4 +1,4 @@
1
-/*854:*/
1
+/*848:*/
2 2
 #line 131 "./scales.w"
3 3
 
4 4
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
10 10
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
11 11
 }
12 12
 
13
-/*:854*//*855:*/
13
+/*:848*//*849:*/
14 14
 #line 149 "./scales.w"
15 15
 
16 16
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
24 24
 }
25 25
 else
26 26
 {
27
-/*856:*/
27
+/*850:*/
28 28
 #line 189 "./scales.w"
29 29
 
30 30
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
53 53
 }
54 54
 emit newMeasurement(weight,unit);
55 55
 
56
-/*:856*/
56
+/*:850*/
57 57
 #line 161 "./scales.w"
58 58
 
59 59
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
61 61
 }
62 62
 }
63 63
 
64
-/*:855*//*857:*/
64
+/*:849*//*851:*/
65 65
 #line 220 "./scales.w"
66 66
 
67 67
 void SerialScale::tare()
@@ -74,4 +74,4 @@ void SerialScale::weigh()
74 74
 write("!KP\x0D");
75 75
 }
76 76
 
77
-/*:857*/
77
+/*:851*/

+ 2
- 2
src/scale.h View File

@@ -1,4 +1,4 @@
1
-/*853:*/
1
+/*847:*/
2 2
 #line 103 "./scales.w"
3 3
 
4 4
 #ifndef TypicaScaleInclude
@@ -25,4 +25,4 @@ QByteArray responseBuffer;
25 25
 
26 26
 #endif
27 27
 
28
-/*:853*/
28
+/*:847*/

+ 2744
- 2310
src/typica.cpp
File diff suppressed because it is too large
View File


+ 15
- 23
src/units.cpp View File

@@ -1,29 +1,25 @@
1
-/*235:*/
1
+/*226:*/
2 2
 #line 42 "./units.w"
3 3
 
4 4
 #include "units.h"
5 5
 
6
-/*:235*//*236:*/
6
+/*:226*//*227:*/
7 7
 #line 52 "./units.w"
8 8
 
9 9
 bool Units::isTemperatureUnit(Unit unit)
10 10
 {
11
-if(unit==Fahrenheit||
11
+return(unit==Fahrenheit||
12 12
 unit==Celsius||
13 13
 unit==Kelvin||
14
-unit==Rankine)
15
-{
16
-return true;
17
-}
18
-return false;
14
+unit==Rankind);
19 15
 }
20 16
 
21
-/*:236*//*237:*/
22
-#line 74 "./units.w"
17
+/*:227*//*228:*/
18
+#line 70 "./units.w"
23 19
 
24 20
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
25 21
 {
26
-if(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)==false)
22
+if(!(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)))
27 23
 {
28 24
 return 0;
29 25
 }
@@ -104,12 +100,12 @@ break;
104 100
 return 0;
105 101
 }
106 102
 
107
-/*:237*//*238:*/
108
-#line 160 "./units.w"
103
+/*:228*//*229:*/
104
+#line 156 "./units.w"
109 105
 
110 106
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
111 107
 {
112
-if(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)==false)
108
+if(!(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)))
113 109
 {
114 110
 return 0;
115 111
 }
@@ -202,8 +198,8 @@ break;
202 198
 return 0;
203 199
 }
204 200
 
205
-/*:238*//*239:*/
206
-#line 258 "./units.w"
201
+/*:229*//*230:*/
202
+#line 254 "./units.w"
207 203
 
208 204
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
209 205
 {
@@ -301,14 +297,10 @@ return 0;
301 297
 
302 298
 bool Units::isWeightUnit(Unit unit)
303 299
 {
304
-if(unit==Pound||
300
+return(unit==Pound||
305 301
 unit==Kilogram||
306 302
 unit==Ounce||
307
-unit==Gram)
308
-{
309
-return true;
310
-}
311
-return false;
303
+unit==gram);
312 304
 }
313 305
 
314
-/*:239*/
306
+/*:230*/

+ 2
- 2
src/units.h View File

@@ -1,4 +1,4 @@
1
-/*234:*/
1
+/*225:*/
2 2
 #line 8 "./units.w"
3 3
 
4 4
 #include <QObject> 
@@ -32,4 +32,4 @@ static bool isWeightUnit(Unit unit);
32 32
 
33 33
 #endif
34 34
 
35
-/*:234*/
35
+/*:225*/

+ 9
- 9
src/webelement.cpp View File

@@ -1,18 +1,18 @@
1
-/*522:*/
2
-#line 363 "./webview.w"
1
+/*513:*/
2
+#line 365 "./webview.w"
3 3
 
4 4
 #include "webelement.h"
5 5
 
6
-/*520:*/
7
-#line 306 "./webview.w"
6
+/*511:*/
7
+#line 308 "./webview.w"
8 8
 
9 9
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
10 10
 {
11 11
 
12 12
 }
13 13
 
14
-/*:520*//*521:*/
15
-#line 315 "./webview.w"
14
+/*:511*//*512:*/
15
+#line 317 "./webview.w"
16 16
 
17 17
 void TypicaWebElement::appendInside(const QString&markup)
18 18
 {
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
59 59
 e.setPlainText(text);
60 60
 }
61 61
 
62
-/*:521*/
63
-#line 366 "./webview.w"
62
+/*:512*/
63
+#line 368 "./webview.w"
64 64
 
65 65
 
66
-/*:522*/
66
+/*:513*/

+ 3
- 3
src/webelement.h View File

@@ -1,5 +1,5 @@
1
-/*515:*/
2
-#line 243 "./webview.w"
1
+/*506:*/
2
+#line 245 "./webview.w"
3 3
 
4 4
 #include <QWebElement> 
5 5
 #include <QObject> 
@@ -27,4 +27,4 @@ QWebElement e;
27 27
 
28 28
 #endif
29 29
 
30
-/*:515*/
30
+/*:506*/

+ 21
- 21
src/webview.cpp View File

@@ -1,10 +1,10 @@
1
-/*500:*/
2
-#line 47 "./webview.w"
1
+/*491:*/
2
+#line 49 "./webview.w"
3 3
 
4 4
 #include "webview.h"
5 5
 
6
-/*501:*/
7
-#line 54 "./webview.w"
6
+/*492:*/
7
+#line 56 "./webview.w"
8 8
 
9 9
 TypicaWebView::TypicaWebView():QWebView()
10 10
 {
@@ -12,16 +12,16 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
12 12
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
13 13
 }
14 14
 
15
-/*:501*//*502:*/
16
-#line 70 "./webview.w"
15
+/*:492*//*493:*/
16
+#line 72 "./webview.w"
17 17
 
18 18
 void TypicaWebView::linkDelegate(const QUrl&url)
19 19
 {
20 20
 if(url.scheme()=="typica")
21 21
 {
22 22
 QString address(url.toEncoded());
23
-/*503:*/
24
-#line 88 "./webview.w"
23
+/*494:*/
24
+#line 90 "./webview.w"
25 25
 
26 26
 if(address=="typica://aboutqt")
27 27
 {
@@ -29,11 +29,11 @@ QMessageBox::aboutQt(this);
29 29
 return;
30 30
 }
31 31
 
32
-/*:503*/
33
-#line 76 "./webview.w"
32
+/*:494*/
33
+#line 78 "./webview.w"
34 34
 
35
-/*504:*/
36
-#line 97 "./webview.w"
35
+/*495:*/
36
+#line 99 "./webview.w"
37 37
 
38 38
 if(address.startsWith("typica://script/"))
39 39
 {
@@ -41,8 +41,8 @@ emit scriptLinkClicked(address.remove(0,16));
41 41
 return;
42 42
 }
43 43
 
44
-/*:504*/
45
-#line 77 "./webview.w"
44
+/*:495*/
45
+#line 79 "./webview.w"
46 46
 
47 47
 }
48 48
 else
@@ -51,8 +51,8 @@ QDesktopServices::openUrl(url);
51 51
 }
52 52
 }
53 53
 
54
-/*:502*//*505:*/
55
-#line 109 "./webview.w"
54
+/*:493*//*496:*/
55
+#line 111 "./webview.w"
56 56
 
57 57
 void TypicaWebView::load(const QString&url)
58 58
 {
@@ -86,8 +86,8 @@ QString TypicaWebView::saveXml()
86 86
 return page()->currentFrame()->documentElement().toOuterXml();
87 87
 }
88 88
 
89
-/*:505*//*511:*/
90
-#line 200 "./webview.w"
89
+/*:496*//*502:*/
90
+#line 202 "./webview.w"
91 91
 
92 92
 QWebElement TypicaWebView::documentElement()
93 93
 {
@@ -99,8 +99,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
99 99
 return page()->mainFrame()->findFirstElement(selector);
100 100
 }
101 101
 
102
-/*:511*/
103
-#line 50 "./webview.w"
102
+/*:502*/
103
+#line 52 "./webview.w"
104 104
 
105 105
 
106
-/*:500*/
106
+/*:491*/

+ 3
- 3
src/webview.h View File

@@ -1,5 +1,5 @@
1
-/*499:*/
2
-#line 12 "./webview.w"
1
+/*490:*/
2
+#line 14 "./webview.w"
3 3
 
4 4
 #include <QWebView> 
5 5
 #include <QFile> 
@@ -33,4 +33,4 @@ void linkDelegate(const QUrl&url);
33 33
 
34 34
 #endif
35 35
 
36
-/*:499*/
36
+/*:490*/

Loading…
Cancel
Save