Update conditional moc inclusion for date range selector

src/daterangeselector.cpp

@@ -12,7 +12,7 @@
 #include "daterangeselector.h"
 
 /*697:*/
-#line 117 "./daterangeselector.w"
+#line 115 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
 QWidget(parent,Qt::Popup),startDateSelector(new QCalendarWidget),
@@ -56,7 +56,7 @@ setLayout(outerLayout);
 }
 
 /*:697*//*698:*/
-#line 165 "./daterangeselector.w"
+#line 163 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
 {
@@ -64,7 +64,7 @@ emit hidingPopup();
 }
 
 /*:698*//*699:*/
-#line 174 "./daterangeselector.w"
+#line 172 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
 {
@@ -79,7 +79,7 @@ hide();
 }
 
 /*:699*//*700:*/
-#line 191 "./daterangeselector.w"
+#line 189 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
 {
@@ -97,7 +97,7 @@ applyButton->setEnabled(true);
 #line 81 "./daterangeselector.w"
 
 /*701:*/
-#line 209 "./daterangeselector.w"
+#line 207 "./daterangeselector.w"
 
 DateRangeSelector::DateRangeSelector(QWidget*parent):
 QWidget(parent),quickSelector(new QComboBox(this)),
@@ -109,7 +109,7 @@ QDate currentDate= QDate::currentDate();
 
 QHBoxLayout*layout= new QHBoxLayout;
 /*702:*/
-#line 238 "./daterangeselector.w"
+#line 236 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
 currentDate.addDays(-1).toString(Qt::ISODate)));
@@ -189,7 +189,7 @@ quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
 /*:702*/
-#line 219 "./daterangeselector.w"
+#line 217 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
 customButton->setIcon(QIcon::fromTheme("office-calendar",
@@ -202,7 +202,7 @@ connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
 /*:701*//*703:*/
-#line 321 "./daterangeselector.w"
+#line 319 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
 {
@@ -218,7 +218,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 
 /*:703*//*704:*/
-#line 338 "./daterangeselector.w"
+#line 336 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
 {
@@ -228,7 +228,7 @@ quickSelector->setCurrentIndex(lastIndex);
 }
 
 /*:704*//*705:*/
-#line 349 "./daterangeselector.w"
+#line 347 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
 {
@@ -239,7 +239,7 @@ quickSelector->setCurrentIndex(lastIndex);
 }
 
 /*:705*//*706:*/
-#line 364 "./daterangeselector.w"
+#line 362 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
 {
@@ -280,7 +280,7 @@ customRangeSelector= NULL;
 }
 
 /*:706*//*707:*/
-#line 406 "./daterangeselector.w"
+#line 404 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
 {
@@ -288,7 +288,7 @@ return quickSelector->itemData(lastIndex);
 }
 
 /*:707*//*708:*/
-#line 414 "./daterangeselector.w"
+#line 412 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
 {
@@ -301,7 +301,7 @@ return quickSelector->currentIndex();
 }
 
 /*:708*//*709:*/
-#line 434 "./daterangeselector.w"
+#line 432 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
 {
@@ -310,7 +310,7 @@ QVariant(QStringList()<<startDate<<endDate));
 }
 
 /*:709*//*710:*/
-#line 444 "./daterangeselector.w"
+#line 442 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
 {
@@ -321,10 +321,8 @@ quickSelector->removeItem(index);
 #line 82 "./daterangeselector.w"
 
 
-#ifdef __unix__
-#ifndef __linux__
+#if __APPLE__
 #include "moc_daterangeselector.cpp"
 #endif
-#endif
 
 /*:695*/

src/daterangeselector.h

@@ -10,7 +10,7 @@
 #define TypicaDateRangeSelectorHeader
 
 /*696:*/
-#line 93 "./daterangeselector.w"
+#line 91 "./daterangeselector.w"
 
 class CustomDateRangePopup:public QWidget
 {

src/daterangeselector.w

@@ -81,11 +81,9 @@ class DateRangeSelector : public QWidget
 @<CustomDateRangePopup implementation@>
 @<DateRangeSelector implementation@>
 
-#ifdef __unix__
-#ifndef __linux__
+#if __APPLE__
 #include "moc_daterangeselector.cpp"
 #endif
-#endif
 
 @ The custom range pop up is represented as a separate class which is not to be
 instantiated except by |DateRangeSelector|.

src/typica.cpp

@@ -47,7 +47,7 @@
 #include "printerselector.h"
 
 /*:589*//*714:*/
-#line 489 "./daterangeselector.w"
+#line 487 "./daterangeselector.w"
 
 #include "daterangeselector.h"
 #line 14571 "./typica.w"
@@ -3407,7 +3407,7 @@ void setQTextEditProperties(QScriptValue value,QScriptEngine*engine);
 QScriptValue QTextEdit_print(QScriptContext*context,QScriptEngine*engine);
 
 /*:685*//*713:*/
-#line 482 "./daterangeselector.w"
+#line 480 "./daterangeselector.w"
 
 void addDateRangeToLayout(QDomElement element,
 QStack<QWidget*> *widgetStack,
@@ -20591,7 +20591,7 @@ addPrinterSelectorToLayout(currentElement,widgetStack,layoutStack);
 #line 12811 "./typica.w"
 
 /*:596*//*711:*/
-#line 453 "./daterangeselector.w"
+#line 451 "./daterangeselector.w"
 
 else if(currentElement.tagName()=="daterange")
 {
@@ -22801,7 +22801,7 @@ value.setProperty("print",engine->newFunction(QTextEdit_print));
 
 #line 1 "./plugins.w"
 /*:687*//*712:*/
-#line 463 "./daterangeselector.w"
+#line 461 "./daterangeselector.w"
 
 void addDateRangeToLayout(QDomElement element,QStack<QWidget*> *,
 QStack<QLayout*> *layoutStack)