Update generated source files

src/abouttypica.cpp

-/*231:*/
+/*222:*/
 #line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*232:*/
+/*223:*/
 #line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
 setCentralWidget(banner);
 }
 
-#line 5770 "./typica.w"
+#line 5640 "./typica.w"
 
-/*:232*/
+/*:223*/
 #line 36 "./abouttypica.w"
 
 
-/*:231*/
+/*:222*/

src/abouttypica.h

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

src/draglabel.cpp

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

src/draglabel.h

-/*847:*/
+/*841:*/
 #line 13 "./scales.w"
 
 #ifndef TypicaDragLabelInclude
 
 #endif
 
-/*:847*/
+/*:841*/

src/helpmenu.cpp

-/*175:*/
+/*163:*/
 #line 35 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
 
-/*176:*/
+/*164:*/
 #line 47 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
 connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
 }
 
-/*:176*//*177:*/
+/*:164*//*165:*/
 #line 61 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
 aboutBox->show();
 }
 
-#line 4138 "./typica.w"
+#line 3946 "./typica.w"
 
-/*:177*/
+/*:165*/
 #line 39 "./helpmenu.w"
 
 
-/*:175*/
+/*:163*/

src/helpmenu.h

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

src/scale.cpp

-/*854:*/
+/*848:*/
 #line 131 "./scales.w"
 
 #include "scale.h"
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:854*//*855:*/
+/*:848*//*849:*/
 #line 149 "./scales.w"
 
 void SerialScale::dataAvailable()
 }
 else
 {
-/*856:*/
+/*850:*/
 #line 189 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
 }
 emit newMeasurement(weight,unit);
 
-/*:856*/
+/*:850*/
 #line 161 "./scales.w"
 
 responseBuffer.clear();
 }
 }
 
-/*:855*//*857:*/
+/*:849*//*851:*/
 #line 220 "./scales.w"
 
 void SerialScale::tare()
 write("!KP\x0D");
 }
 
-/*:857*/
+/*:851*/

src/scale.h

-/*853:*/
+/*847:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
 
 #endif
 
-/*:853*/
+/*:847*/

src/units.cpp

-/*235:*/
+/*226:*/
 #line 42 "./units.w"
 
 #include "units.h"
 
-/*:235*//*236:*/
+/*:226*//*227:*/
 #line 52 "./units.w"
 
 bool Units::isTemperatureUnit(Unit unit)
 {
-if(unit==Fahrenheit||
+return(unit==Fahrenheit||
 unit==Celsius||
 unit==Kelvin||
-unit==Rankine)
-{
-return true;
-}
-return false;
+unit==Rankind);
 }
 
-/*:236*//*237:*/
-#line 74 "./units.w"
+/*:227*//*228:*/
+#line 70 "./units.w"
 
 double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
 {
-if(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)==false)
+if(!(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)))
 {
 return 0;
 }
 return 0;
 }
 
-/*:237*//*238:*/
-#line 160 "./units.w"
+/*:228*//*229:*/
+#line 156 "./units.w"
 
 double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
 {
-if(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)==false)
+if(!(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)))
 {
 return 0;
 }
 return 0;
 }
 
-/*:238*//*239:*/
-#line 258 "./units.w"
+/*:229*//*230:*/
+#line 254 "./units.w"
 
 double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
 {
 
 bool Units::isWeightUnit(Unit unit)
 {
-if(unit==Pound||
+return(unit==Pound||
 unit==Kilogram||
 unit==Ounce||
-unit==Gram)
-{
-return true;
-}
-return false;
+unit==gram);
 }
 
-/*:239*/
+/*:230*/

src/units.h

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

src/webelement.cpp

-/*522:*/
-#line 363 "./webview.w"
+/*513:*/
+#line 365 "./webview.w"
 
 #include "webelement.h"
 
-/*520:*/
-#line 306 "./webview.w"
+/*511:*/
+#line 308 "./webview.w"
 
 TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
 {
 
 }
 
-/*:520*//*521:*/
-#line 315 "./webview.w"
+/*:511*//*512:*/
+#line 317 "./webview.w"
 
 void TypicaWebElement::appendInside(const QString&markup)
 {
 e.setPlainText(text);
 }
 
-/*:521*/
-#line 366 "./webview.w"
+/*:512*/
+#line 368 "./webview.w"
 
 
-/*:522*/
+/*:513*/

src/webelement.h

-/*515:*/
-#line 243 "./webview.w"
+/*506:*/
+#line 245 "./webview.w"
 
 #include <QWebElement> 
 #include <QObject> 
 
 #endif
 
-/*:515*/
+/*:506*/

src/webview.cpp

-/*500:*/
-#line 47 "./webview.w"
+/*491:*/
+#line 49 "./webview.w"
 
 #include "webview.h"
 
-/*501:*/
-#line 54 "./webview.w"
+/*492:*/
+#line 56 "./webview.w"
 
 TypicaWebView::TypicaWebView():QWebView()
 {
 connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
 }
 
-/*:501*//*502:*/
-#line 70 "./webview.w"
+/*:492*//*493:*/
+#line 72 "./webview.w"
 
 void TypicaWebView::linkDelegate(const QUrl&url)
 {
 if(url.scheme()=="typica")
 {
 QString address(url.toEncoded());
-/*503:*/
-#line 88 "./webview.w"
+/*494:*/
+#line 90 "./webview.w"
 
 if(address=="typica://aboutqt")
 {
 return;
 }
 
-/*:503*/
-#line 76 "./webview.w"
+/*:494*/
+#line 78 "./webview.w"
 
-/*504:*/
-#line 97 "./webview.w"
+/*495:*/
+#line 99 "./webview.w"
 
 if(address.startsWith("typica://script/"))
 {
 return;
 }
 
-/*:504*/
-#line 77 "./webview.w"
+/*:495*/
+#line 79 "./webview.w"
 
 }
 else
 }
 }
 
-/*:502*//*505:*/
-#line 109 "./webview.w"
+/*:493*//*496:*/
+#line 111 "./webview.w"
 
 void TypicaWebView::load(const QString&url)
 {
 return page()->currentFrame()->documentElement().toOuterXml();
 }
 
-/*:505*//*511:*/
-#line 200 "./webview.w"
+/*:496*//*502:*/
+#line 202 "./webview.w"
 
 QWebElement TypicaWebView::documentElement()
 {
 return page()->mainFrame()->findFirstElement(selector);
 }
 
-/*:511*/
-#line 50 "./webview.w"
+/*:502*/
+#line 52 "./webview.w"
 
 
-/*:500*/
+/*:491*/

src/webview.h

-/*499:*/
-#line 12 "./webview.w"
+/*490:*/
+#line 14 "./webview.w"
 
 #include <QWebView> 
 #include <QFile> 
 
 #endif
 
-/*:499*/
+/*:490*/