Update generated files

src/abouttypica.cpp

@@ -1,9 +1,9 @@
-/*249:*/
+/*260:*/
 #line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*250:*/
+/*261:*/
 #line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
@@ -17,10 +17,10 @@ aboutFile.close();
 setCentralWidget(banner);
 }
 
-#line 5992 "./typica.w"
+#line 6340 "./typica.w"
 
-/*:250*/
+/*:261*/
 #line 36 "./abouttypica.w"
 
 
-/*:249*/
+/*:260*/

src/abouttypica.h

@@ -1,4 +1,4 @@
-/*248:*/
+/*259:*/
 #line 14 "./abouttypica.w"
 
 #include <QMainWindow> 
@@ -17,4 +17,4 @@ AboutTypica();
 
 #endif
 
-/*:248*/
+/*:259*/

src/daterangeselector.cpp

@@ -1,4 +1,4 @@
-/*639:*/
+/*650:*/
 #line 68 "./daterangeselector.w"
 
 #include <QCalendarWidget> 
@@ -11,7 +11,7 @@
 
 #include "daterangeselector.h"
 
-/*641:*/
+/*652:*/
 #line 111 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
@@ -55,7 +55,7 @@ outerLayout->addLayout(buttonLayout);
 setLayout(outerLayout);
 }
 
-/*:641*//*642:*/
+/*:652*//*653:*/
 #line 159 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
@@ -63,7 +63,7 @@ void CustomDateRangePopup::hideEvent(QHideEvent*)
 emit hidingPopup();
 }
 
-/*:642*//*643:*/
+/*:653*//*654:*/
 #line 168 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
@@ -78,7 +78,7 @@ endDateSelector->selectedDate().toString(Qt::ISODate)));
 hide();
 }
 
-/*:643*//*644:*/
+/*:654*//*655:*/
 #line 185 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
@@ -93,10 +93,10 @@ applyButton->setEnabled(true);
 }
 }
 
-/*:644*/
+/*:655*/
 #line 79 "./daterangeselector.w"
 
-/*645:*/
+/*656:*/
 #line 203 "./daterangeselector.w"
 
 DateRangeSelector::DateRangeSelector(QWidget*parent):
@@ -108,7 +108,7 @@ connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int
 QDate currentDate= QDate::currentDate();
 
 QHBoxLayout*layout= new QHBoxLayout;
-/*646:*/
+/*657:*/
 #line 232 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
@@ -188,7 +188,7 @@ quickSelector->insertSeparator(quickSelector->count());
 quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
-/*:646*/
+/*:657*/
 #line 213 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
@@ -201,7 +201,7 @@ setLayout(layout);
 connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
-/*:645*//*647:*/
+/*:656*//*658:*/
 #line 315 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
@@ -217,7 +217,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 }
 
-/*:647*//*648:*/
+/*:658*//*659:*/
 #line 332 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
@@ -227,7 +227,7 @@ customRangeSelector= NULL;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:648*//*649:*/
+/*:659*//*660:*/
 #line 343 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
@@ -238,7 +238,7 @@ lastIndex= quickSelector->count()-1;
 quickSelector->setCurrentIndex(lastIndex);
 }
 
-/*:649*//*650:*/
+/*:660*//*661:*/
 #line 358 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
@@ -279,7 +279,7 @@ customRangeSelector= NULL;
 }
 }
 
-/*:650*//*651:*/
+/*:661*//*662:*/
 #line 400 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
@@ -287,7 +287,7 @@ QVariant DateRangeSelector::currentRange()
 return quickSelector->itemData(lastIndex);
 }
 
-/*:651*//*652:*/
+/*:662*//*663:*/
 #line 408 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
@@ -295,7 +295,7 @@ void DateRangeSelector::setCurrentIndex(int index)
 quickSelector->setCurrentIndex(index);
 }
 
-/*:652*//*653:*/
+/*:663*//*664:*/
 #line 423 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
@@ -304,7 +304,7 @@ quickSelector->setItemData(quickSelector->count()-2,
 QVariant(QStringList()<<startDate<<endDate));
 }
 
-/*:653*//*654:*/
+/*:664*//*665:*/
 #line 433 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
@@ -312,10 +312,10 @@ void DateRangeSelector::removeIndex(int index)
 quickSelector->removeItem(index);
 }
 
-/*:654*/
+/*:665*/
 #line 80 "./daterangeselector.w"
 
 
 #include "moc_daterangeselector.cpp"
 
-/*:639*/
+/*:650*/

src/daterangeselector.h

@@ -1,4 +1,4 @@
-/*638:*/
+/*649:*/
 #line 30 "./daterangeselector.w"
 
 
@@ -9,7 +9,7 @@
 #ifndef TypicaDateRangeSelectorHeader
 #define TypicaDateRangeSelectorHeader
 
-/*640:*/
+/*651:*/
 #line 87 "./daterangeselector.w"
 
 class CustomDateRangePopup:public QWidget
@@ -31,7 +31,7 @@ QCalendarWidget*endDateSelector;
 QPushButton*applyButton;
 };
 
-/*:640*/
+/*:651*/
 #line 39 "./daterangeselector.w"
 
 
@@ -60,4 +60,4 @@ int lastIndex;
 
 #endif
 
-/*:638*/
+/*:649*/

src/draglabel.cpp

@@ -1,4 +1,4 @@
-/*958:*/
+/*972:*/
 #line 33 "./scales.w"
 
 #include "draglabel.h"
@@ -26,4 +26,4 @@ drag->exec();
 }
 }
 
-/*:958*/
+/*:972*/

src/draglabel.h

@@ -1,4 +1,4 @@
-/*957:*/
+/*971:*/
 #line 13 "./scales.w"
 
 #ifndef TypicaDragLabelInclude
@@ -17,4 +17,4 @@ void mousePressEvent(QMouseEvent*event);
 
 #endif
 
-/*:957*/
+/*:971*/

src/helpmenu.cpp

@@ -1,12 +1,11 @@
-/*182:*/
-#line 36 "./helpmenu.w"
+/*194:*/
+#line 35 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
-#include "feedback.h"
 
-/*183:*/
-#line 49 "./helpmenu.w"
+/*195:*/
+#line 47 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
 {
@@ -16,14 +15,10 @@ QAction*aboutTypicaAction= new QAction(tr("About Typica"),this);
 aboutTypicaAction->setObjectName("aboutTypicaAction");
 addAction(aboutTypicaAction);
 connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
-QAction*sendFeedbackAction= new QAction(tr("Send Feedback"),this);
-sendFeedbackAction->setObjectName("sendFeedback");
-addAction(sendFeedbackAction);
-connect(sendFeedbackAction,SIGNAL(triggered()),this,SLOT(displayFeedbackWizard()));
 }
 
-/*:183*//*184:*/
-#line 67 "./helpmenu.w"
+/*:195*//*196:*/
+#line 61 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
 {
@@ -31,20 +26,11 @@ AboutTypica*aboutBox= new AboutTypica;
 aboutBox->show();
 }
 
-/*:184*//*185:*/
-#line 76 "./helpmenu.w"
-
-void HelpMenu::displayFeedbackWizard()
-{
-FeedbackWizard*window= new FeedbackWizard;
-window->show();
-}
-
-#line 4266 "./typica.w"
+#line 4614 "./typica.w"
 
 #line 1 "./feedback.w"
-/*:185*/
-#line 41 "./helpmenu.w"
+/*:196*/
+#line 39 "./helpmenu.w"
 
 
-/*:182*/
+/*:194*/

src/helpmenu.h

@@ -1,4 +1,4 @@
-/*181:*/
+/*193:*/
 #line 16 "./helpmenu.w"
 
 #include <QMenu> 
@@ -13,9 +13,8 @@ public:
 HelpMenu();
 public slots:
 void displayAboutTypica();
-void displayFeedbackWizard();
 };
 
 #endif
 
-/*:181*/
+/*:193*/

src/moc_helpmenu.cpp

@@ -22,7 +22,7 @@ static const uint qt_meta_data_HelpMenu[] = {
        6,       // revision
        0,       // classname
        0,    0, // classinfo
-       2,   14, // methods
+       1,   14, // methods
        0,    0, // properties
        0,    0, // enums/sets
        0,    0, // constructors
@@ -31,14 +31,12 @@ static const uint qt_meta_data_HelpMenu[] = {
 
  // slots: signature, parameters, type, tag, flags
       10,    9,    9,    9, 0x0a,
-      31,    9,    9,    9, 0x0a,
 
        0        // eod
 };
 
 static const char qt_meta_stringdata_HelpMenu[] = {
     "HelpMenu\0\0displayAboutTypica()\0"
-    "displayFeedbackWizard()\0"
 };
 
 void HelpMenu::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
@@ -48,7 +46,6 @@ void HelpMenu::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, vo
         HelpMenu *_t = static_cast<HelpMenu *>(_o);
         switch (_id) {
         case 0: _t->displayAboutTypica(); break;
-        case 1: _t->displayFeedbackWizard(); break;
         default: ;
         }
     }
@@ -87,9 +84,9 @@ int HelpMenu::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
     if (_id < 0)
         return _id;
     if (_c == QMetaObject::InvokeMetaMethod) {
-        if (_id < 2)
+        if (_id < 1)
             qt_static_metacall(this, _c, _id, _a);
-        _id -= 2;
+        _id -= 1;
     }
     return _id;
 }

src/scale.cpp

@@ -1,4 +1,4 @@
-/*964:*/
+/*978:*/
 #line 131 "./scales.w"
 
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:964*//*965:*/
+/*:978*//*979:*/
 #line 149 "./scales.w"
 
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
 }
 else
 {
-/*966:*/
+/*980:*/
 #line 189 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
-/*:966*/
+/*:980*/
 #line 161 "./scales.w"
 
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
 }
 }
 
-/*:965*//*967:*/
+/*:979*//*981:*/
 #line 220 "./scales.w"
 
 void SerialScale::tare()
@@ -74,4 +74,4 @@ void SerialScale::weigh()
 write("!KP\x0D");
 }
 
-/*:967*/
+/*:981*/

src/scale.h

@@ -1,4 +1,4 @@
-/*963:*/
+/*977:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
@@ -25,4 +25,4 @@ QByteArray responseBuffer;
 
 #endif
 
-/*:963*/
+/*:977*/

src/units.cpp

@@ -1,9 +1,9 @@
-/*253:*/
+/*264:*/
 #line 42 "./units.w"
 
 #include "units.h"
 
-/*:253*//*254:*/
+/*:264*//*265:*/
 #line 52 "./units.w"
 
 bool Units::isTemperatureUnit(Unit unit)
@@ -14,7 +14,7 @@ unit==Kelvin||
 unit==Rankine);
 }
 
-/*:254*//*255:*/
+/*:265*//*266:*/
 #line 70 "./units.w"
 
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -100,7 +100,7 @@ break;
 return 0;
 }
 
-/*:255*//*256:*/
+/*:266*//*267:*/
 #line 156 "./units.w"
 
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
@@ -198,7 +198,7 @@ break;
 return 0;
 }
 
-/*:256*//*257:*/
+/*:267*//*268:*/
 #line 254 "./units.w"
 
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
@@ -303,4 +303,4 @@ unit==Ounce||
 unit==Gram);
 }
 
-/*:257*/
+/*:268*/

src/units.h

@@ -1,4 +1,4 @@
-/*252:*/
+/*263:*/
 #line 8 "./units.w"
 
 #include <QObject> 
@@ -32,4 +32,4 @@ static bool isWeightUnit(Unit unit);
 
 #endif
 
-/*:252*/
+/*:263*/

src/webelement.cpp

@@ -1,9 +1,9 @@
-/*546:*/
+/*557:*/
 #line 368 "./webview.w"
 
 #include "webelement.h"
 
-/*544:*/
+/*555:*/
 #line 311 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
@@ -11,7 +11,7 @@ TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 
 }
 
-/*:544*//*545:*/
+/*:555*//*556:*/
 #line 320 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
@@ -59,8 +59,8 @@ void TypicaWebElement::setPlainText(const QString&text)
 e.setPlainText(text);
 }
 
-/*:545*/
+/*:556*/
 #line 371 "./webview.w"
 
 
-/*:546*/
+/*:557*/

src/webelement.h

@@ -1,4 +1,4 @@
-/*539:*/
+/*550:*/
 #line 248 "./webview.w"
 
 #include <QWebElement> 
@@ -27,4 +27,4 @@ QWebElement e;
 
 #endif
 
-/*:539*/
+/*:550*/

src/webview.cpp

@@ -1,9 +1,9 @@
-/*524:*/
+/*535:*/
 #line 50 "./webview.w"
 
 #include "webview.h"
 
-/*525:*/
+/*536:*/
 #line 57 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
@@ -12,7 +12,7 @@ page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:525*//*526:*/
+/*:536*//*537:*/
 #line 73 "./webview.w"
 
 void TypicaWebView::linkDelegate(const QUrl&url)
@@ -20,7 +20,7 @@ void TypicaWebView::linkDelegate(const QUrl&url)
 if(url.scheme()=="typica")
 {
 QString address(url.toEncoded());
-/*527:*/
+/*538:*/
 #line 91 "./webview.w"
 
 if(address=="typica://aboutqt")
@@ -29,10 +29,10 @@ QMessageBox::aboutQt(this);
 return;
 }
 
-/*:527*/
+/*:538*/
 #line 79 "./webview.w"
 
-/*528:*/
+/*539:*/
 #line 100 "./webview.w"
 
 if(address.startsWith("typica://script/"))
@@ -41,7 +41,7 @@ emit scriptLinkClicked(address.remove(0,16));
 return;
 }
 
-/*:528*/
+/*:539*/
 #line 80 "./webview.w"
 
 }
@@ -51,7 +51,7 @@ QDesktopServices::openUrl(url);
 }
 }
 
-/*:526*//*529:*/
+/*:537*//*540:*/
 #line 112 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
@@ -88,7 +88,7 @@ QString TypicaWebView::saveXml()
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:529*//*535:*/
+/*:540*//*546:*/
 #line 205 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
@@ -101,8 +101,8 @@ QWebElement TypicaWebView::findFirstElement(const QString&selector)
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:535*/
+/*:546*/
 #line 53 "./webview.w"
 
 
-/*:524*/
+/*:535*/

src/webview.h

@@ -1,4 +1,4 @@
-/*523:*/
+/*534:*/
 #line 14 "./webview.w"
 
 #include <QWebView> 
@@ -34,4 +34,4 @@ void linkDelegate(const QUrl&url);
 
 #endif
 
-/*:523*/
+/*:534*/