Update generated files

src/abouttypica.cpp

-/*287:*/
+/*288:*/
 #line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*288:*/
+/*289:*/
 #line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
 setCentralWidget(banner);
 }
 
-#line 6811 "./typica.w"
+#line 6851 "./typica.w"
 
-/*:288*/
+/*:289*/
 #line 36 "./abouttypica.w"
 
 
-/*:287*/
+/*:288*/

src/abouttypica.h

-/*286:*/
+/*287:*/
 #line 14 "./abouttypica.w"
 
 #include <QMainWindow> 
 
 #endif
 
-/*:286*/
+/*:287*/

src/daterangeselector.cpp

-/*695:*/
+/*696:*/
 #line 70 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
 
 #include "daterangeselector.h"
 
-/*697:*/
+/*698:*/
 #line 115 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
 setLayout(outerLayout);
 }
 
-/*:697*//*698:*/
+/*:698*//*699:*/
 #line 163 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
 emit hidingPopup();
 }
 
-/*:698*//*699:*/
+/*:699*//*700:*/
 #line 172 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
 hide();
 }
 
-/*:699*//*700:*/
+/*:700*//*701:*/
 #line 189 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
 }
 }
 
-/*:700*/
+/*:701*/
 #line 81 "./daterangeselector.w"
 
-/*701:*/
+/*702:*/
 #line 207 "./daterangeselector.w"
 
 DateRangeSelector::DateRangeSelector(QWidget*parent):
 QDate currentDate= QDate::currentDate();
 
 QHBoxLayout*layout= new QHBoxLayout;
-/*702:*/
+/*703:*/
 #line 236 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:702*/
+/*:703*/
 #line 217 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:701*//*703:*/
+/*:702*//*704:*/
 #line 319 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
 }
 }
 
-/*:703*//*704:*/
+/*:704*//*705:*/
 #line 336 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:704*//*705:*/
+/*:705*//*706:*/
 #line 347 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:705*//*706:*/
+/*:706*//*707:*/
 #line 362 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
 }
 }
 
-/*:706*//*707:*/
+/*:707*//*708:*/
 #line 404 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
 return quickSelector->itemData(lastIndex);
 }
 
-/*:707*//*708:*/
+/*:708*//*709:*/
 #line 412 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
 return quickSelector->currentIndex();
 }
 
-/*:708*//*709:*/
+/*:709*//*710:*/
 #line 432 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:709*//*710:*/
+/*:710*//*711:*/
 #line 442 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
 quickSelector->removeItem(index);
 }
 
-/*:710*/
+/*:711*/
 #line 82 "./daterangeselector.w"
 
 
 #include "moc_daterangeselector.cpp"
 #endif
 
-/*:695*/
+/*:696*/

src/daterangeselector.h

-/*694:*/
+/*695:*/
 #line 30 "./daterangeselector.w"
 
 
 #ifndef TypicaDateRangeSelectorHeader
 #define TypicaDateRangeSelectorHeader
 
-/*696:*/
+/*697:*/
 #line 91 "./daterangeselector.w"
 
 class CustomDateRangePopup:public QWidget
 QPushButton*applyButton;
 };
 
-/*:696*/
+/*:697*/
 #line 39 "./daterangeselector.w"
 
 
 
 #endif
 
-/*:694*/
+/*:695*/

src/draglabel.cpp

-/*1086:*/
+/*1087:*/
 #line 33 "./scales.w"
 
 #include "draglabel.h"
 }
 }
 
-/*:1086*/
+/*:1087*/

src/draglabel.h

-/*1085:*/
+/*1086:*/
 #line 13 "./scales.w"
 
 #ifndef TypicaDragLabelInclude
 
 #endif
 
-/*:1085*/
+/*:1086*/

src/helpmenu.cpp

-/*207:*/
+/*208:*/
 #line 36 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
 #include "licensewindow.h"
 
-/*208:*/
+/*209:*/
 #line 46 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
 
 }
 
-/*:208*//*209:*/
+/*:209*//*210:*/
 #line 66 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
 aboutBox->show();
 }
 
-/*:209*//*210:*/
+/*:210*//*211:*/
 #line 76 "./helpmenu.w"
 
 void HelpMenu::displayLicenseWindow()
 window->show();
 }
 
-#line 4868 "./typica.w"
+#line 4895 "./typica.w"
 
 #line 1 "./licensewindow.w"
-/*:210*/
+/*:211*/
 #line 41 "./helpmenu.w"
 
 
-/*:207*/
+/*:208*/

src/helpmenu.h

-/*206:*/
+/*207:*/
 #line 16 "./helpmenu.w"
 
 #include <QMenu> 
 
 #endif
 
-/*:206*/
+/*:207*/

src/licensewindow.cpp

-/*212:*/
+/*213:*/
 #line 36 "./licensewindow.w"
 
-/*216:*/
+/*217:*/
 #line 99 "./licensewindow.w"
 
 #include "licensewindow.h"
 #include <QVariant> 
 #include <QUrl> 
 
-#line 4870 "./typica.w"
+#line 4897 "./typica.w"
 
-/*:216*/
+/*:217*/
 #line 37 "./licensewindow.w"
 
-/*213:*/
+/*214:*/
 #line 43 "./licensewindow.w"
 
 LicenseWindow::LicenseWindow()
 QSplitter*split= new QSplitter;
 QListWidget*projects= new QListWidget;
 
-/*215:*/
+/*216:*/
 #line 79 "./licensewindow.w"
 
 QListWidgetItem*item= new QListWidgetItem("Typica",projects);
 item= new QListWidgetItem("Qt",projects);
 item->setData(Qt::UserRole,QVariant(QUrl("qrc:/resources/html/licenses/qt.html")));
 
-/*:215*/
+/*:216*/
 #line 50 "./licensewindow.w"
 
 connect(projects,SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
 setCentralWidget(split);
 }
 
-/*:213*//*214:*/
+/*:214*//*215:*/
 #line 64 "./licensewindow.w"
 
 void LicenseWindow::setWebView(QListWidgetItem*current,QListWidgetItem*)
 view->load(current->data(Qt::UserRole).toUrl());
 }
 
-/*:214*/
+/*:215*/
 #line 38 "./licensewindow.w"
 
 
-/*:212*/
+/*:213*/

src/licensewindow.h

-/*211:*/
+/*212:*/
 #line 13 "./licensewindow.w"
 
 #include <QMainWindow> 
 
 #endif
 
-/*:211*/
+/*:212*/

src/moc_abouttypica.cpp

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

src/moc_daterangeselector.cpp

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

src/moc_draglabel.cpp

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

src/moc_helpmenu.cpp

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

src/moc_scale.cpp

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

src/moc_units.cpp

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

src/moc_webelement.cpp

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

src/moc_webview.cpp

 /****************************************************************************
 ** Meta object code from reading C++ file 'webview.h'
 **
-** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.6)
+** Created by: The Qt Meta Object Compiler version 63 (Qt 4.8.7)
 **
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
 #if !defined(Q_MOC_OUTPUT_REVISION)
 #error "The header file 'webview.h' doesn't include <QObject>."
 #elif Q_MOC_OUTPUT_REVISION != 63
-#error "This file was generated using the moc from 4.8.6. It"
+#error "This file was generated using the moc from 4.8.7. It"
 #error "cannot be used with the include files from this version of Qt."
 #error "(The moc has changed too much.)"
 #endif
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-      10,   14, // methods
+      11,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
 
  // methods: signature, parameters, type, tag, flags
       70,   47,   14,   14, 0x02,
-      84,   14,   14,   14, 0x02,
-     105,   92,   14,   14, 0x02,
-     132,  127,   14,   14, 0x22,
-     156,  149,   14,   14, 0x02,
-     187,   14,  179,   14, 0x02,
-     209,   14,  197,   14, 0x02,
-     236,  227,  197,   14, 0x02,
+      96,   84,   14,   14, 0x02,
+     111,   14,   14,   14, 0x22,
+     132,  119,   14,   14, 0x02,
+     159,  154,   14,   14, 0x22,
+     183,  176,   14,   14, 0x02,
+     214,   14,  206,   14, 0x02,
+     236,   14,  224,   14, 0x02,
+     263,  254,  224,   14, 0x02,
 
        0        // eod
 };
 static const char qt_meta_stringdata_TypicaWebView[] = {
     "TypicaWebView\0\0link\0scriptLinkClicked(QString)\0"
     "url\0linkDelegate(QUrl)\0load(QString)\0"
-    "print()\0html,baseUrl\0setHtml(QString,QUrl)\0"
+    "printerName\0print(QString)\0print()\0"
+    "html,baseUrl\0setHtml(QString,QUrl)\0"
     "html\0setHtml(QString)\0device\0"
     "setContent(QIODevice*)\0QString\0saveXml()\0"
     "QWebElement\0documentElement()\0selector\0"
         case 0: _t->scriptLinkClicked((*reinterpret_cast< const QString(*)>(_a[1]))); break;
         case 1: _t->linkDelegate((*reinterpret_cast< const QUrl(*)>(_a[1]))); break;
         case 2: _t->load((*reinterpret_cast< const QString(*)>(_a[1]))); break;
-        case 3: _t->print(); break;
-        case 4: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1])),(*reinterpret_cast< const QUrl(*)>(_a[2]))); break;
-        case 5: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1]))); break;
-        case 6: _t->setContent((*reinterpret_cast< QIODevice*(*)>(_a[1]))); break;
-        case 7: { QString _r = _t->saveXml();
+        case 3: _t->print((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 4: _t->print(); break;
+        case 5: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1])),(*reinterpret_cast< const QUrl(*)>(_a[2]))); break;
+        case 6: _t->setHtml((*reinterpret_cast< const QString(*)>(_a[1]))); break;
+        case 7: _t->setContent((*reinterpret_cast< QIODevice*(*)>(_a[1]))); break;
+        case 8: { QString _r = _t->saveXml();
             if (_a[0]) *reinterpret_cast< QString*>(_a[0]) = _r; }  break;
-        case 8: { QWebElement _r = _t->documentElement();
+        case 9: { QWebElement _r = _t->documentElement();
             if (_a[0]) *reinterpret_cast< QWebElement*>(_a[0]) = _r; }  break;
-        case 9: { QWebElement _r = _t->findFirstElement((*reinterpret_cast< const QString(*)>(_a[1])));
+        case 10: { QWebElement _r = _t->findFirstElement((*reinterpret_cast< const QString(*)>(_a[1])));
             if (_a[0]) *reinterpret_cast< QWebElement*>(_a[0]) = _r; }  break;
         default: ;
         }
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 10)
+        if (_id < 11)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 10;
+        _id -= 11;
     }
     return _id;
 }

src/printerselector.cpp

-/*590:*/
+/*591:*/
 #line 45 "./printerselector.w"
 
 #include "printerselector.h"
 
-/*591:*/
+/*592:*/
 #line 53 "./printerselector.w"
 
 PrinterSelector::PrinterSelector():QComboBox(NULL)
 }
 }
 
-/*:591*/
+/*:592*/
 #line 48 "./printerselector.w"
 
 
-/*:590*/
+/*:591*/

src/printerselector.h

-/*588:*/
+/*589:*/
 #line 22 "./printerselector.w"
 
 #include <QPrinterInfo> 
 
 #endif
 
-/*:588*/
+/*:589*/

src/scale.cpp

-/*1092:*/
+/*1093:*/
 #line 135 "./scales.w"
 
 #include "scale.h"
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:1092*//*1093:*/
+/*:1093*//*1094:*/
 #line 153 "./scales.w"
 
 void SerialScale::dataAvailable()
 }
 else
 {
-/*1094:*/
+/*1095:*/
 #line 193 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
 }
 emit newMeasurement(weight,unit);
 
-/*:1094*/
+/*:1095*/
 #line 165 "./scales.w"
 
 responseBuffer.clear();
 }
 }
 
-/*:1093*//*1095:*/
+/*:1094*//*1096:*/
 #line 224 "./scales.w"
 
 void SerialScale::tare()
 }
 }
 
-/*:1095*/
+/*:1096*/

src/scale.h

-/*1091:*/
+/*1092:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
 
 #endif
 
-/*:1091*/
+/*:1092*/

src/units.cpp

-/*291:*/
+/*292:*/
 #line 42 "./units.w"
 
 #include "units.h"
 #include <QtDebug> 
 
-/*:291*//*292:*/
+/*:292*//*293:*/
 #line 53 "./units.w"
 
 bool Units::isTemperatureUnit(Unit unit)
 unit==Rankine);
 }
 
-/*:292*//*293:*/
+/*:293*//*294:*/
 #line 71 "./units.w"
 
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
 return 0;
 }
 
-/*:293*//*294:*/
+/*:294*//*295:*/
 #line 169 "./units.w"
 
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
 return 0;
 }
 
-/*:294*//*295:*/
+/*:295*//*296:*/
 #line 267 "./units.w"
 
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
 unit==Gram);
 }
 
-/*:295*/
+/*:296*/

src/units.h

-/*290:*/
+/*291:*/
 #line 8 "./units.w"
 
 #include <QObject> 
 
 #endif
 
-/*:290*/
+/*:291*/

src/webelement.cpp

-/*586:*/
+/*587:*/
 #line 383 "./webview.w"
 
 #include "webelement.h"
 
-/*584:*/
+/*585:*/
 #line 326 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 
 }
 
-/*:584*//*585:*/
+/*:585*//*586:*/
 #line 335 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
 e.setPlainText(text);
 }
 
-/*:585*/
+/*:586*/
 #line 386 "./webview.w"
 
 
-/*:586*/
+/*:587*/

src/webelement.h

-/*579:*/
+/*580:*/
 #line 263 "./webview.w"
 
 #include <QWebElement> 
 
 #endif
 
-/*:579*/
+/*:580*/

src/webview.cpp

-/*563:*/
+/*564:*/
 #line 50 "./webview.w"
 
 #include "webview.h"
 
-/*564:*/
+/*565:*/
 #line 57 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:564*//*565:*/
+/*:565*//*566:*/
 #line 73 "./webview.w"
 
 void TypicaWebView::linkDelegate(const QUrl&url)
 if(url.scheme()=="typica")
 {
 QString address(url.toEncoded());
-/*566:*/
+/*567:*/
 #line 91 "./webview.w"
 
 if(address=="typica://aboutqt")
 return;
 }
 
-/*:566*/
+/*:567*/
 #line 79 "./webview.w"
 
-/*567:*/
+/*568:*/
 #line 100 "./webview.w"
 
 if(address.startsWith("typica://script/"))
 return;
 }
 
-/*:567*/
+/*:568*/
 #line 80 "./webview.w"
 
 }
 }
 }
 
-/*:565*//*568:*/
+/*:566*//*569:*/
 #line 112 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:568*//*569:*/
+/*:569*//*570:*/
 #line 144 "./webview.w"
 
 void TypicaWebView::print(const QString&printerName)
 }
 }
 
-/*:569*//*575:*/
+/*:570*//*576:*/
 #line 220 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:575*/
+/*:576*/
 #line 53 "./webview.w"
 
 
-/*:563*/
+/*:564*/

src/webview.h

-/*562:*/
+/*563:*/
 #line 14 "./webview.w"
 
 #include <QWebView> 
 
 #endif
 
-/*:562*/
+/*:563*/