Browse Source

Update generated files

Neal Wilson 7 years ago
parent
commit
50f1318b65

+ 5
- 5
src/abouttypica.cpp View File

@@ -1,9 +1,9 @@
1
-/*287:*/
1
+/*288:*/
2 2
 #line 33 "./abouttypica.w"
3 3
 
4 4
 #include "abouttypica.h"
5 5
 
6
-/*288:*/
6
+/*289:*/
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 6811 "./typica.w"
20
+#line 6851 "./typica.w"
21 21
 
22
-/*:288*/
22
+/*:289*/
23 23
 #line 36 "./abouttypica.w"
24 24
 
25 25
 
26
-/*:287*/
26
+/*:288*/

+ 2
- 2
src/abouttypica.h View File

@@ -1,4 +1,4 @@
1
-/*286:*/
1
+/*287:*/
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
-/*:286*/
20
+/*:287*/

+ 19
- 19
src/daterangeselector.cpp View File

@@ -1,4 +1,4 @@
1
-/*695:*/
1
+/*696:*/
2 2
 #line 70 "./daterangeselector.w"
3 3
 
4 4
 #include <QCalendarWidget> 
@@ -11,7 +11,7 @@
11 11
 
12 12
 #include "daterangeselector.h"
13 13
 
14
-/*697:*/
14
+/*698:*/
15 15
 #line 115 "./daterangeselector.w"
16 16
 
17 17
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
@@ -55,7 +55,7 @@ outerLayout->addLayout(buttonLayout);
55 55
 setLayout(outerLayout);
56 56
 }
57 57
 
58
-/*:697*//*698:*/
58
+/*:698*//*699:*/
59 59
 #line 163 "./daterangeselector.w"
60 60
 
61 61
 void CustomDateRangePopup::hideEvent(QHideEvent*)
@@ -63,7 +63,7 @@ void CustomDateRangePopup::hideEvent(QHideEvent*)
63 63
 emit hidingPopup();
64 64
 }
65 65
 
66
-/*:698*//*699:*/
66
+/*:699*//*700:*/
67 67
 #line 172 "./daterangeselector.w"
68 68
 
69 69
 void CustomDateRangePopup::applyRange()
@@ -78,7 +78,7 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
78 78
 hide();
79 79
 }
80 80
 
81
-/*:699*//*700:*/
81
+/*:700*//*701:*/
82 82
 #line 189 "./daterangeselector.w"
83 83
 
84 84
 void CustomDateRangePopup::validateRange()
@@ -93,10 +93,10 @@ applyButton->setEnabled(true);
93 93
 }
94 94
 }
95 95
 
96
-/*:700*/
96
+/*:701*/
97 97
 #line 81 "./daterangeselector.w"
98 98
 
99
-/*701:*/
99
+/*702:*/
100 100
 #line 207 "./daterangeselector.w"
101 101
 
102 102
 DateRangeSelector::DateRangeSelector(QWidget*parent):
@@ -108,7 +108,7 @@ connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int
108 108
 QDate currentDate= QDate::currentDate();
109 109
 
110 110
 QHBoxLayout*layout= new QHBoxLayout;
111
-/*702:*/
111
+/*703:*/
112 112
 #line 236 "./daterangeselector.w"
113 113
 
114 114
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
@@ -188,7 +188,7 @@ quickSelector->insertSeparator(quickSelector->count());
188 188
 quickSelector->addItem("Lifetime");
189 189
 quickSelector->addItem("Custom");
190 190
 
191
-/*:702*/
191
+/*:703*/
192 192
 #line 217 "./daterangeselector.w"
193 193
 
194 194
 QToolButton*customButton= new QToolButton;
@@ -201,7 +201,7 @@ setLayout(layout);
201 201
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
202 202
 }
203 203
 
204
-/*:701*//*703:*/
204
+/*:702*//*704:*/
205 205
 #line 319 "./daterangeselector.w"
206 206
 
207 207
 void DateRangeSelector::updateRange(int index)
@@ -217,7 +217,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
217 217
 }
218 218
 }
219 219
 
220
-/*:703*//*704:*/
220
+/*:704*//*705:*/
221 221
 #line 336 "./daterangeselector.w"
222 222
 
223 223
 void DateRangeSelector::popupHidden()
@@ -227,7 +227,7 @@ customRangeSelector= NULL;
227 227
 quickSelector->setCurrentIndex(lastIndex);
228 228
 }
229 229
 
230
-/*:704*//*705:*/
230
+/*:705*//*706:*/
231 231
 #line 347 "./daterangeselector.w"
232 232
 
233 233
 void DateRangeSelector::setCustomRange(QVariant range)
@@ -238,7 +238,7 @@ lastIndex= quickSelector->count()-1;
238 238
 quickSelector->setCurrentIndex(lastIndex);
239 239
 }
240 240
 
241
-/*:705*//*706:*/
241
+/*:706*//*707:*/
242 242
 #line 362 "./daterangeselector.w"
243 243
 
244 244
 void DateRangeSelector::toggleCustom()
@@ -279,7 +279,7 @@ customRangeSelector= NULL;
279 279
 }
280 280
 }
281 281
 
282
-/*:706*//*707:*/
282
+/*:707*//*708:*/
283 283
 #line 404 "./daterangeselector.w"
284 284
 
285 285
 QVariant DateRangeSelector::currentRange()
@@ -287,7 +287,7 @@ QVariant DateRangeSelector::currentRange()
287 287
 return quickSelector->itemData(lastIndex);
288 288
 }
289 289
 
290
-/*:707*//*708:*/
290
+/*:708*//*709:*/
291 291
 #line 412 "./daterangeselector.w"
292 292
 
293 293
 void DateRangeSelector::setCurrentIndex(int index)
@@ -300,7 +300,7 @@ int DateRangeSelector::currentIndex()
300 300
 return quickSelector->currentIndex();
301 301
 }
302 302
 
303
-/*:708*//*709:*/
303
+/*:709*//*710:*/
304 304
 #line 432 "./daterangeselector.w"
305 305
 
306 306
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
@@ -309,7 +309,7 @@ quickSelector->setItemData(quickSelector->count()-2,
309 309
 QVariant(QStringList()<<startDate<<endDate));
310 310
 }
311 311
 
312
-/*:709*//*710:*/
312
+/*:710*//*711:*/
313 313
 #line 442 "./daterangeselector.w"
314 314
 
315 315
 void DateRangeSelector::removeIndex(int index)
@@ -317,7 +317,7 @@ void DateRangeSelector::removeIndex(int index)
317 317
 quickSelector->removeItem(index);
318 318
 }
319 319
 
320
-/*:710*/
320
+/*:711*/
321 321
 #line 82 "./daterangeselector.w"
322 322
 
323 323
 
@@ -325,4 +325,4 @@ quickSelector->removeItem(index);
325 325
 #include "moc_daterangeselector.cpp"
326 326
 #endif
327 327
 
328
-/*:695*/
328
+/*:696*/

+ 4
- 4
src/daterangeselector.h View File

@@ -1,4 +1,4 @@
1
-/*694:*/
1
+/*695:*/
2 2
 #line 30 "./daterangeselector.w"
3 3
 
4 4
 
@@ -9,7 +9,7 @@
9 9
 #ifndef TypicaDateRangeSelectorHeader
10 10
 #define TypicaDateRangeSelectorHeader
11 11
 
12
-/*696:*/
12
+/*697:*/
13 13
 #line 91 "./daterangeselector.w"
14 14
 
15 15
 class CustomDateRangePopup:public QWidget
@@ -31,7 +31,7 @@ QCalendarWidget*endDateSelector;
31 31
 QPushButton*applyButton;
32 32
 };
33 33
 
34
-/*:696*/
34
+/*:697*/
35 35
 #line 39 "./daterangeselector.w"
36 36
 
37 37
 
@@ -62,4 +62,4 @@ int lastIndex;
62 62
 
63 63
 #endif
64 64
 
65
-/*:694*/
65
+/*:695*/

+ 2
- 2
src/draglabel.cpp View File

@@ -1,4 +1,4 @@
1
-/*1086:*/
1
+/*1087:*/
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
-/*:1086*/
29
+/*:1087*/

+ 2
- 2
src/draglabel.h View File

@@ -1,4 +1,4 @@
1
-/*1085:*/
1
+/*1086:*/
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
-/*:1085*/
20
+/*:1086*/

+ 7
- 7
src/helpmenu.cpp View File

@@ -1,11 +1,11 @@
1
-/*207:*/
1
+/*208:*/
2 2
 #line 36 "./helpmenu.w"
3 3
 
4 4
 #include "helpmenu.h"
5 5
 #include "abouttypica.h"
6 6
 #include "licensewindow.h"
7 7
 
8
-/*208:*/
8
+/*209:*/
9 9
 #line 46 "./helpmenu.w"
10 10
 
11 11
 HelpMenu::HelpMenu():QMenu()
@@ -24,7 +24,7 @@ connect(licenseAction,SIGNAL(triggered()),this,SLOT(displayLicenseWindow()));
24 24
 
25 25
 }
26 26
 
27
-/*:208*//*209:*/
27
+/*:209*//*210:*/
28 28
 #line 66 "./helpmenu.w"
29 29
 
30 30
 void HelpMenu::displayAboutTypica()
@@ -33,7 +33,7 @@ AboutTypica*aboutBox= new AboutTypica;
33 33
 aboutBox->show();
34 34
 }
35 35
 
36
-/*:209*//*210:*/
36
+/*:210*//*211:*/
37 37
 #line 76 "./helpmenu.w"
38 38
 
39 39
 void HelpMenu::displayLicenseWindow()
@@ -42,11 +42,11 @@ LicenseWindow*window= new LicenseWindow;
42 42
 window->show();
43 43
 }
44 44
 
45
-#line 4868 "./typica.w"
45
+#line 4895 "./typica.w"
46 46
 
47 47
 #line 1 "./licensewindow.w"
48
-/*:210*/
48
+/*:211*/
49 49
 #line 41 "./helpmenu.w"
50 50
 
51 51
 
52
-/*:207*/
52
+/*:208*/

+ 2
- 2
src/helpmenu.h View File

@@ -1,4 +1,4 @@
1
-/*206:*/
1
+/*207:*/
2 2
 #line 16 "./helpmenu.w"
3 3
 
4 4
 #include <QMenu> 
@@ -18,4 +18,4 @@ void displayLicenseWindow();
18 18
 
19 19
 #endif
20 20
 
21
-/*:206*/
21
+/*:207*/

+ 10
- 10
src/licensewindow.cpp View File

@@ -1,7 +1,7 @@
1
-/*212:*/
1
+/*213:*/
2 2
 #line 36 "./licensewindow.w"
3 3
 
4
-/*216:*/
4
+/*217:*/
5 5
 #line 99 "./licensewindow.w"
6 6
 
7 7
 #include "licensewindow.h"
@@ -11,12 +11,12 @@
11 11
 #include <QVariant> 
12 12
 #include <QUrl> 
13 13
 
14
-#line 4870 "./typica.w"
14
+#line 4897 "./typica.w"
15 15
 
16
-/*:216*/
16
+/*:217*/
17 17
 #line 37 "./licensewindow.w"
18 18
 
19
-/*213:*/
19
+/*214:*/
20 20
 #line 43 "./licensewindow.w"
21 21
 
22 22
 LicenseWindow::LicenseWindow()
@@ -25,7 +25,7 @@ LicenseWindow::LicenseWindow()
25 25
 QSplitter*split= new QSplitter;
26 26
 QListWidget*projects= new QListWidget;
27 27
 
28
-/*215:*/
28
+/*216:*/
29 29
 #line 79 "./licensewindow.w"
30 30
 
31 31
 QListWidgetItem*item= new QListWidgetItem("Typica",projects);
@@ -45,7 +45,7 @@ item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qrcode-sv
45 45
 item= new QListWidgetItem("Qt",projects);
46 46
 item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
47 47
 
48
-/*:215*/
48
+/*:216*/
49 49
 #line 50 "./licensewindow.w"
50 50
 
51 51
 connect(projects,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
@@ -56,7 +56,7 @@ split->addWidget(view);
56 56
 setCentralWidget(split);
57 57
 }
58 58
 
59
-/*:213*//*214:*/
59
+/*:214*//*215:*/
60 60
 #line 64 "./licensewindow.w"
61 61
 
62 62
 void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
@@ -64,8 +64,8 @@ void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
64 64
 view->load(current->data(Qt::UserRole).toUrl());
65 65
 }
66 66
 
67
-/*:214*/
67
+/*:215*/
68 68
 #line 38 "./licensewindow.w"
69 69
 
70 70
 
71
-/*:212*/
71
+/*:213*/

+ 2
- 2
src/licensewindow.h View File

@@ -1,4 +1,4 @@
1
-/*211:*/
1
+/*212:*/
2 2
 #line 13 "./licensewindow.w"
3 3
 
4 4
 #include <QMainWindow> 
@@ -21,4 +21,4 @@ QWebView*view;
21 21
 
22 22
 #endif
23 23
 
24
-/*:211*/
24
+/*:212*/

+ 2
- 2
src/moc_abouttypica.cpp View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** Meta object code from reading C++ file 'abouttypica.h'
3 3
 **
4
-** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
4
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
5 5
 **
6 6
 ** WARNING! All changes made in this file will be lost!
7 7
 *****************************************************************************/
@@ -10,7 +10,7 @@
10 10
 #if !defined(Q_MOC_OUTPUT_REVISION)
11 11
 #error "The header file 'abouttypica.h' doesn't include <QObject>."
12 12
 #elif Q_MOC_OUTPUT_REVISION != 63
13
-#error "This file was generated using the moc from 4.8.6. It"
13
+#error "This file was generated using the moc from 4.8.7. It"
14 14
 #error "cannot be used with the include files from this version of Qt."
15 15
 #error "(The moc has changed too much.)"
16 16
 #endif

+ 2
- 2
src/moc_daterangeselector.cpp View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** Meta object code from reading C++ file 'daterangeselector.h'
3 3
 **
4
-** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
4
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
5 5
 **
6 6
 ** WARNING! All changes made in this file will be lost!
7 7
 *****************************************************************************/
@@ -10,7 +10,7 @@
10 10
 #if !defined(Q_MOC_OUTPUT_REVISION)
11 11
 #error "The header file 'daterangeselector.h' doesn't include <QObject>."
12 12
 #elif Q_MOC_OUTPUT_REVISION != 63
13
-#error "This file was generated using the moc from 4.8.6. It"
13
+#error "This file was generated using the moc from 4.8.7. It"
14 14
 #error "cannot be used with the include files from this version of Qt."
15 15
 #error "(The moc has changed too much.)"
16 16
 #endif

+ 2
- 2
src/moc_draglabel.cpp View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** Meta object code from reading C++ file 'draglabel.h'
3 3
 **
4
-** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
4
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
5 5
 **
6 6
 ** WARNING! All changes made in this file will be lost!
7 7
 *****************************************************************************/
@@ -10,7 +10,7 @@
10 10
 #if !defined(Q_MOC_OUTPUT_REVISION)
11 11
 #error "The header file 'draglabel.h' doesn't include <QObject>."
12 12
 #elif Q_MOC_OUTPUT_REVISION != 63
13
-#error "This file was generated using the moc from 4.8.6. It"
13
+#error "This file was generated using the moc from 4.8.7. It"
14 14
 #error "cannot be used with the include files from this version of Qt."
15 15
 #error "(The moc has changed too much.)"
16 16
 #endif

+ 2
- 2
src/moc_helpmenu.cpp View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** Meta object code from reading C++ file 'helpmenu.h'
3 3
 **
4
-** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
4
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
5 5
 **
6 6
 ** WARNING! All changes made in this file will be lost!
7 7
 *****************************************************************************/
@@ -10,7 +10,7 @@
10 10
 #if !defined(Q_MOC_OUTPUT_REVISION)
11 11
 #error "The header file 'helpmenu.h' doesn't include <QObject>."
12 12
 #elif Q_MOC_OUTPUT_REVISION != 63
13
-#error "This file was generated using the moc from 4.8.6. It"
13
+#error "This file was generated using the moc from 4.8.7. It"
14 14
 #error "cannot be used with the include files from this version of Qt."
15 15
 #error "(The moc has changed too much.)"
16 16
 #endif

+ 2
- 2
src/moc_scale.cpp View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** Meta object code from reading C++ file 'scale.h'
3 3
 **
4
-** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
4
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
5 5
 **
6 6
 ** WARNING! All changes made in this file will be lost!
7 7
 *****************************************************************************/
@@ -10,7 +10,7 @@
10 10
 #if !defined(Q_MOC_OUTPUT_REVISION)
11 11
 #error "The header file 'scale.h' doesn't include <QObject>."
12 12
 #elif Q_MOC_OUTPUT_REVISION != 63
13
-#error "This file was generated using the moc from 4.8.6. It"
13
+#error "This file was generated using the moc from 4.8.7. It"
14 14
 #error "cannot be used with the include files from this version of Qt."
15 15
 #error "(The moc has changed too much.)"
16 16
 #endif

+ 2
- 2
src/moc_units.cpp View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** Meta object code from reading C++ file 'units.h'
3 3
 **
4
-** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
4
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
5 5
 **
6 6
 ** WARNING! All changes made in this file will be lost!
7 7
 *****************************************************************************/
@@ -10,7 +10,7 @@
10 10
 #if !defined(Q_MOC_OUTPUT_REVISION)
11 11
 #error "The header file 'units.h' doesn't include <QObject>."
12 12
 #elif Q_MOC_OUTPUT_REVISION != 63
13
-#error "This file was generated using the moc from 4.8.6. It"
13
+#error "This file was generated using the moc from 4.8.7. It"
14 14
 #error "cannot be used with the include files from this version of Qt."
15 15
 #error "(The moc has changed too much.)"
16 16
 #endif

+ 2
- 2
src/moc_webelement.cpp View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** Meta object code from reading C++ file 'webelement.h'
3 3
 **
4
-** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
4
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
5 5
 **
6 6
 ** WARNING! All changes made in this file will be lost!
7 7
 *****************************************************************************/
@@ -10,7 +10,7 @@
10 10
 #if !defined(Q_MOC_OUTPUT_REVISION)
11 11
 #error "The header file 'webelement.h' doesn't include <QObject>."
12 12
 #elif Q_MOC_OUTPUT_REVISION != 63
13
-#error "This file was generated using the moc from 4.8.6. It"
13
+#error "This file was generated using the moc from 4.8.7. It"
14 14
 #error "cannot be used with the include files from this version of Qt."
15 15
 #error "(The moc has changed too much.)"
16 16
 #endif

+ 23
- 20
src/moc_webview.cpp View File

@@ -1,7 +1,7 @@
1 1
 /****************************************************************************
2 2
 ** Meta object code from reading C++ file 'webview.h'
3 3
 **
4
-** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
4
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
5 5
 **
6 6
 ** WARNING! All changes made in this file will be lost!
7 7
 *****************************************************************************/
@@ -10,7 +10,7 @@
10 10
 #if !defined(Q_MOC_OUTPUT_REVISION)
11 11
 #error "The header file 'webview.h' doesn't include <QObject>."
12 12
 #elif Q_MOC_OUTPUT_REVISION != 63
13
-#error "This file was generated using the moc from 4.8.6. It"
13
+#error "This file was generated using the moc from 4.8.7. It"
14 14
 #error "cannot be used with the include files from this version of Qt."
15 15
 #error "(The moc has changed too much.)"
16 16
 #endif
@@ -22,7 +22,7 @@ static const uint qt_meta_data_TypicaWebView[] = {
22 22
        6,       // revision
23 23
        0,       // classname
24 24
        0,    0, // classinfo
25
-      10,   14, // methods
25
+      11,   14, // methods
26 26
        0,    0, // properties
27 27
        0,    0, // enums/sets
28 28
        0,    0, // constructors
@@ -37,13 +37,14 @@ static const uint qt_meta_data_TypicaWebView[] = {
37 37
 
38 38
  // methods: signature, parameters, type, tag, flags
39 39
       70,   47,   14,   14, 0x02,
40
-      84,   14,   14,   14, 0x02,
41
-     105,   92,   14,   14, 0x02,
42
-     132,  127,   14,   14, 0x22,
43
-     156,  149,   14,   14, 0x02,
44
-     187,   14,  179,   14, 0x02,
45
-     209,   14,  197,   14, 0x02,
46
-     236,  227,  197,   14, 0x02,
40
+      96,   84,   14,   14, 0x02,
41
+     111,   14,   14,   14, 0x22,
42
+     132,  119,   14,   14, 0x02,
43
+     159,  154,   14,   14, 0x22,
44
+     183,  176,   14,   14, 0x02,
45
+     214,   14,  206,   14, 0x02,
46
+     236,   14,  224,   14, 0x02,
47
+     263,  254,  224,   14, 0x02,
47 48
 
48 49
        0        // eod
49 50
 };
@@ -51,7 +52,8 @@ static const uint qt_meta_data_TypicaWebView[] = {
51 52
 static const char qt_meta_stringdata_TypicaWebView[] = {
52 53
     "TypicaWebView\0\0link\0scriptLinkClicked(QString)\0"
53 54
     "url\0linkDelegate(QUrl)\0load(QString)\0"
54
-    "print()\0html,baseUrl\0setHtml(QString,QUrl)\0"
55
+    "printerName\0print(QString)\0print()\0"
56
+    "html,baseUrl\0setHtml(QString,QUrl)\0"
55 57
     "html\0setHtml(QString)\0device\0"
56 58
     "setContent(QIODevice*)\0QString\0saveXml()\0"
57 59
     "QWebElement\0documentElement()\0selector\0"
@@ -67,15 +69,16 @@ void TypicaWebView::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _i
67 69
         case 0: _t->scriptLinkClicked((*reinterpret_cast< const QString(*)>(_a[1]))); break;
68 70
         case 1: _t->linkDelegate((*reinterpret_cast< const QUrl(*)>(_a[1]))); break;
69 71
         case 2: _t->load((*reinterpret_cast< const QString(*)>(_a[1]))); break;
70
-        case 3: _t->print(); break;
71
-        case 4: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1])),(*reinterpret_cast< const QUrl(*)>(_a[2]))); break;
72
-        case 5: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1]))); break;
73
-        case 6: _t->setContent((*reinterpret_cast< QIODevice*(*)>(_a[1]))); break;
74
-        case 7: { QString _r = _t->saveXml();
72
+        case 3: _t->print((*reinterpret_cast< const QString(*)>(_a[1]))); break;
73
+        case 4: _t->print(); break;
74
+        case 5: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1])),(*reinterpret_cast< const QUrl(*)>(_a[2]))); break;
75
+        case 6: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1]))); break;
76
+        case 7: _t->setContent((*reinterpret_cast< QIODevice*(*)>(_a[1]))); break;
77
+        case 8: { QString _r = _t->saveXml();
75 78
             if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
76
-        case 8: { QWebElement _r = _t->documentElement();
79
+        case 9: { QWebElement _r = _t->documentElement();
77 80
             if (_a[0]) *reinterpret_cast< QWebElement*>(_a[0]) = _r; }  break;
78
-        case 9: { QWebElement _r = _t->findFirstElement((*reinterpret_cast< const QString(*)>(_a[1])));
81
+        case 10: { QWebElement _r = _t->findFirstElement((*reinterpret_cast< const QString(*)>(_a[1])));
79 82
             if (_a[0]) *reinterpret_cast< QWebElement*>(_a[0]) = _r; }  break;
80 83
         default: ;
81 84
         }
@@ -114,9 +117,9 @@ int TypicaWebView::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
114 117
     if (_id < 0)
115 118
         return _id;
116 119
     if (_c == QMetaObject::InvokeMetaMethod) {
117
-        if (_id < 10)
120
+        if (_id < 11)
118 121
             qt_static_metacall(this, _c, _id, _a);
119
-        _id -= 10;
122
+        _id -= 11;
120 123
     }
121 124
     return _id;
122 125
 }

+ 4
- 4
src/printerselector.cpp View File

@@ -1,9 +1,9 @@
1
-/*590:*/
1
+/*591:*/
2 2
 #line 45 "./printerselector.w"
3 3
 
4 4
 #include "printerselector.h"
5 5
 
6
-/*591:*/
6
+/*592:*/
7 7
 #line 53 "./printerselector.w"
8 8
 
9 9
 PrinterSelector::PrinterSelector():QComboBox(NULL)
@@ -15,8 +15,8 @@ addItem(info.printerName());
15 15
 }
16 16
 }
17 17
 
18
-/*:591*/
18
+/*:592*/
19 19
 #line 48 "./printerselector.w"
20 20
 
21 21
 
22
-/*:590*/
22
+/*:591*/

+ 2
- 2
src/printerselector.h View File

@@ -1,4 +1,4 @@
1
-/*588:*/
1
+/*589:*/
2 2
 #line 22 "./printerselector.w"
3 3
 
4 4
 #include <QPrinterInfo> 
@@ -16,4 +16,4 @@ PrinterSelector();
16 16
 
17 17
 #endif
18 18
 
19
-/*:588*/
19
+/*:589*/

+ 6
- 6
src/scale.cpp View File

@@ -1,4 +1,4 @@
1
-/*1092:*/
1
+/*1093:*/
2 2
 #line 135 "./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
-/*:1092*//*1093:*/
13
+/*:1093*//*1094:*/
14 14
 #line 153 "./scales.w"
15 15
 
16 16
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
24 24
 }
25 25
 else
26 26
 {
27
-/*1094:*/
27
+/*1095:*/
28 28
 #line 193 "./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
-/*:1094*/
56
+/*:1095*/
57 57
 #line 165 "./scales.w"
58 58
 
59 59
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
61 61
 }
62 62
 }
63 63
 
64
-/*:1093*//*1095:*/
64
+/*:1094*//*1096:*/
65 65
 #line 224 "./scales.w"
66 66
 
67 67
 void SerialScale::tare()
@@ -96,4 +96,4 @@ commandTerminator= "\x0A";
96 96
 }
97 97
 }
98 98
 
99
-/*:1095*/
99
+/*:1096*/

+ 2
- 2
src/scale.h View File

@@ -1,4 +1,4 @@
1
-/*1091:*/
1
+/*1092:*/
2 2
 #line 103 "./scales.w"
3 3
 
4 4
 #ifndef TypicaScaleInclude
@@ -29,4 +29,4 @@ QByteArray commandTerminator;
29 29
 
30 30
 #endif
31 31
 
32
-/*:1091*/
32
+/*:1092*/

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


+ 6
- 6
src/units.cpp View File

@@ -1,10 +1,10 @@
1
-/*291:*/
1
+/*292:*/
2 2
 #line 42 "./units.w"
3 3
 
4 4
 #include "units.h"
5 5
 #include <QtDebug> 
6 6
 
7
-/*:291*//*292:*/
7
+/*:292*//*293:*/
8 8
 #line 53 "./units.w"
9 9
 
10 10
 bool Units::isTemperatureUnit(Unit unit)
@@ -15,7 +15,7 @@ unit==Kelvin||
15 15
 unit==Rankine);
16 16
 }
17 17
 
18
-/*:292*//*293:*/
18
+/*:293*//*294:*/
19 19
 #line 71 "./units.w"
20 20
 
21 21
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -113,7 +113,7 @@ break;
113 113
 return 0;
114 114
 }
115 115
 
116
-/*:293*//*294:*/
116
+/*:294*//*295:*/
117 117
 #line 169 "./units.w"
118 118
 
119 119
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -211,7 +211,7 @@ break;
211 211
 return 0;
212 212
 }
213 213
 
214
-/*:294*//*295:*/
214
+/*:295*//*296:*/
215 215
 #line 267 "./units.w"
216 216
 
217 217
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
@@ -316,4 +316,4 @@ unit==Ounce||
316 316
 unit==Gram);
317 317
 }
318 318
 
319
-/*:295*/
319
+/*:296*/

+ 2
- 2
src/units.h View File

@@ -1,4 +1,4 @@
1
-/*290:*/
1
+/*291:*/
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
-/*:290*/
35
+/*:291*/

+ 5
- 5
src/webelement.cpp View File

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

+ 2
- 2
src/webelement.h View File

@@ -1,4 +1,4 @@
1
-/*579:*/
1
+/*580:*/
2 2
 #line 263 "./webview.w"
3 3
 
4 4
 #include <QWebElement> 
@@ -27,4 +27,4 @@ QWebElement e;
27 27
 
28 28
 #endif
29 29
 
30
-/*:579*/
30
+/*:580*/

+ 12
- 12
src/webview.cpp View File

@@ -1,9 +1,9 @@
1
-/*563:*/
1
+/*564:*/
2 2
 #line 50 "./webview.w"
3 3
 
4 4
 #include "webview.h"
5 5
 
6
-/*564:*/
6
+/*565:*/
7 7
 #line 57 "./webview.w"
8 8
 
9 9
 TypicaWebView::TypicaWebView():QWebView()
@@ -12,7 +12,7 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
12 12
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
13 13
 }
14 14
 
15
-/*:564*//*565:*/
15
+/*:565*//*566:*/
16 16
 #line 73 "./webview.w"
17 17
 
18 18
 void TypicaWebView::linkDelegate(const QUrl&url)
@@ -20,7 +20,7 @@ void TypicaWebView::linkDelegate(const QUrl&url)
20 20
 if(url.scheme()=="typica")
21 21
 {
22 22
 QString address(url.toEncoded());
23
-/*566:*/
23
+/*567:*/
24 24
 #line 91 "./webview.w"
25 25
 
26 26
 if(address=="typica://aboutqt")
@@ -29,10 +29,10 @@ QMessageBox::aboutQt(this);
29 29
 return;
30 30
 }
31 31
 
32
-/*:566*/
32
+/*:567*/
33 33
 #line 79 "./webview.w"
34 34
 
35
-/*567:*/
35
+/*568:*/
36 36
 #line 100 "./webview.w"
37 37
 
38 38
 if(address.startsWith("typica://script/"))
@@ -41,7 +41,7 @@ emit scriptLinkClicked(address.remove(0,16));
41 41
 return;
42 42
 }
43 43
 
44
-/*:567*/
44
+/*:568*/
45 45
 #line 80 "./webview.w"
46 46
 
47 47
 }
@@ -51,7 +51,7 @@ QDesktopServices::openUrl(url);
51 51
 }
52 52
 }
53 53
 
54
-/*:565*//*568:*/
54
+/*:566*//*569:*/
55 55
 #line 112 "./webview.w"
56 56
 
57 57
 void TypicaWebView::load(const QString&url)
@@ -78,7 +78,7 @@ QString TypicaWebView::saveXml()
78 78
 return page()->currentFrame()->documentElement().toOuterXml();
79 79
 }
80 80
 
81
-/*:568*//*569:*/
81
+/*:569*//*570:*/
82 82
 #line 144 "./webview.w"
83 83
 
84 84
 void TypicaWebView::print(const QString&printerName)
@@ -98,7 +98,7 @@ QWebView::print(printer);
98 98
 }
99 99
 }
100 100
 
101
-/*:569*//*575:*/
101
+/*:570*//*576:*/
102 102
 #line 220 "./webview.w"
103 103
 
104 104
 QWebElement TypicaWebView::documentElement()
@@ -111,8 +111,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
111 111
 return page()->mainFrame()->findFirstElement(selector);
112 112
 }
113 113
 
114
-/*:575*/
114
+/*:576*/
115 115
 #line 53 "./webview.w"
116 116
 
117 117
 
118
-/*:563*/
118
+/*:564*/

+ 2
- 2
src/webview.h View File

@@ -1,4 +1,4 @@
1
-/*562:*/
1
+/*563:*/
2 2
 #line 14 "./webview.w"
3 3
 
4 4
 #include <QWebView> 
@@ -34,4 +34,4 @@ void linkDelegate(const QUrl&url);
34 34
 
35 35
 #endif
36 36
 
37
-/*:562*/
37
+/*:563*/

Loading…
Cancel
Save