Browse Source

Update conditional moc inclusion for date range selector

Neal Wilson 7 years ago
parent
commit
6c77bb2969
4 changed files with 22 additions and 26 deletions
  1. 16
    18
      src/daterangeselector.cpp
  2. 1
    1
      src/daterangeselector.h
  3. 1
    3
      src/daterangeselector.w
  4. 4
    4
      src/typica.cpp

+ 16
- 18
src/daterangeselector.cpp View File

@@ -12,7 +12,7 @@
12 12
 #include "daterangeselector.h"
13 13
 
14 14
 /*697:*/
15
-#line 117 "./daterangeselector.w"
15
+#line 115 "./daterangeselector.w"
16 16
 
17 17
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
18 18
 QWidget(parent,Qt::Popup),startDateSelector(new QCalendarWidget),
@@ -56,7 +56,7 @@ setLayout(outerLayout);
56 56
 }
57 57
 
58 58
 /*:697*//*698:*/
59
-#line 165 "./daterangeselector.w"
59
+#line 163 "./daterangeselector.w"
60 60
 
61 61
 void CustomDateRangePopup::hideEvent(QHideEvent*)
62 62
 {
@@ -64,7 +64,7 @@ emit hidingPopup();
64 64
 }
65 65
 
66 66
 /*:698*//*699:*/
67
-#line 174 "./daterangeselector.w"
67
+#line 172 "./daterangeselector.w"
68 68
 
69 69
 void CustomDateRangePopup::applyRange()
70 70
 {
@@ -79,7 +79,7 @@ hide();
79 79
 }
80 80
 
81 81
 /*:699*//*700:*/
82
-#line 191 "./daterangeselector.w"
82
+#line 189 "./daterangeselector.w"
83 83
 
84 84
 void CustomDateRangePopup::validateRange()
85 85
 {
@@ -97,7 +97,7 @@ applyButton->setEnabled(true);
97 97
 #line 81 "./daterangeselector.w"
98 98
 
99 99
 /*701:*/
100
-#line 209 "./daterangeselector.w"
100
+#line 207 "./daterangeselector.w"
101 101
 
102 102
 DateRangeSelector::DateRangeSelector(QWidget*parent):
103 103
 QWidget(parent),quickSelector(new QComboBox(this)),
@@ -109,7 +109,7 @@ QDate currentDate= QDate::currentDate();
109 109
 
110 110
 QHBoxLayout*layout= new QHBoxLayout;
111 111
 /*702:*/
112
-#line 238 "./daterangeselector.w"
112
+#line 236 "./daterangeselector.w"
113 113
 
114 114
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
115 115
 currentDate.addDays(-1).toString(Qt::ISODate)));
@@ -189,7 +189,7 @@ quickSelector->addItem("Lifetime");
189 189
 quickSelector->addItem("Custom");
190 190
 
191 191
 /*:702*/
192
-#line 219 "./daterangeselector.w"
192
+#line 217 "./daterangeselector.w"
193 193
 
194 194
 QToolButton*customButton= new QToolButton;
195 195
 customButton->setIcon(QIcon::fromTheme("office-calendar",
@@ -202,7 +202,7 @@ connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
202 202
 }
203 203
 
204 204
 /*:701*//*703:*/
205
-#line 321 "./daterangeselector.w"
205
+#line 319 "./daterangeselector.w"
206 206
 
207 207
 void DateRangeSelector::updateRange(int index)
208 208
 {
@@ -218,7 +218,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
218 218
 }
219 219
 
220 220
 /*:703*//*704:*/
221
-#line 338 "./daterangeselector.w"
221
+#line 336 "./daterangeselector.w"
222 222
 
223 223
 void DateRangeSelector::popupHidden()
224 224
 {
@@ -228,7 +228,7 @@ quickSelector->setCurrentIndex(lastIndex);
228 228
 }
229 229
 
230 230
 /*:704*//*705:*/
231
-#line 349 "./daterangeselector.w"
231
+#line 347 "./daterangeselector.w"
232 232
 
233 233
 void DateRangeSelector::setCustomRange(QVariant range)
234 234
 {
@@ -239,7 +239,7 @@ quickSelector->setCurrentIndex(lastIndex);
239 239
 }
240 240
 
241 241
 /*:705*//*706:*/
242
-#line 364 "./daterangeselector.w"
242
+#line 362 "./daterangeselector.w"
243 243
 
244 244
 void DateRangeSelector::toggleCustom()
245 245
 {
@@ -280,7 +280,7 @@ customRangeSelector= NULL;
280 280
 }
281 281
 
282 282
 /*:706*//*707:*/
283
-#line 406 "./daterangeselector.w"
283
+#line 404 "./daterangeselector.w"
284 284
 
285 285
 QVariant DateRangeSelector::currentRange()
286 286
 {
@@ -288,7 +288,7 @@ return quickSelector->itemData(lastIndex);
288 288
 }
289 289
 
290 290
 /*:707*//*708:*/
291
-#line 414 "./daterangeselector.w"
291
+#line 412 "./daterangeselector.w"
292 292
 
293 293
 void DateRangeSelector::setCurrentIndex(int index)
294 294
 {
@@ -301,7 +301,7 @@ return quickSelector->currentIndex();
301 301
 }
302 302
 
303 303
 /*:708*//*709:*/
304
-#line 434 "./daterangeselector.w"
304
+#line 432 "./daterangeselector.w"
305 305
 
306 306
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
307 307
 {
@@ -310,7 +310,7 @@ QVariant(QStringList()<<startDate<<endDate));
310 310
 }
311 311
 
312 312
 /*:709*//*710:*/
313
-#line 444 "./daterangeselector.w"
313
+#line 442 "./daterangeselector.w"
314 314
 
315 315
 void DateRangeSelector::removeIndex(int index)
316 316
 {
@@ -321,10 +321,8 @@ quickSelector->removeItem(index);
321 321
 #line 82 "./daterangeselector.w"
322 322
 
323 323
 
324
-#ifdef __unix__
325
-#ifndef __linux__
324
+#if __APPLE__
326 325
 #include "moc_daterangeselector.cpp"
327 326
 #endif
328
-#endif
329 327
 
330 328
 /*:695*/

+ 1
- 1
src/daterangeselector.h View File

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

+ 1
- 3
src/daterangeselector.w View File

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

+ 4
- 4
src/typica.cpp View File

@@ -47,7 +47,7 @@
47 47
 #include "printerselector.h"
48 48
 
49 49
 /*:589*//*714:*/
50
-#line 489 "./daterangeselector.w"
50
+#line 487 "./daterangeselector.w"
51 51
 
52 52
 #include "daterangeselector.h"
53 53
 #line 14571 "./typica.w"
@@ -3407,7 +3407,7 @@ void setQTextEditProperties(QScriptValue value,QScriptEngine*engine);
3407 3407
 QScriptValue QTextEdit_print(QScriptContext*context,QScriptEngine*engine);
3408 3408
 
3409 3409
 /*:685*//*713:*/
3410
-#line 482 "./daterangeselector.w"
3410
+#line 480 "./daterangeselector.w"
3411 3411
 
3412 3412
 void addDateRangeToLayout(QDomElement element,
3413 3413
 QStack<QWidget*> *widgetStack,
@@ -20591,7 +20591,7 @@ addPrinterSelectorToLayout(currentElement,widgetStack,layoutStack);
20591 20591
 #line 12811 "./typica.w"
20592 20592
 
20593 20593
 /*:596*//*711:*/
20594
-#line 453 "./daterangeselector.w"
20594
+#line 451 "./daterangeselector.w"
20595 20595
 
20596 20596
 else if(currentElement.tagName()=="daterange")
20597 20597
 {
@@ -22801,7 +22801,7 @@ value.setProperty("print",engine->newFunction(QTextEdit_print));
22801 22801
 
22802 22802
 #line 1 "./plugins.w"
22803 22803
 /*:687*//*712:*/
22804
-#line 463 "./daterangeselector.w"
22804
+#line 461 "./daterangeselector.w"
22805 22805
 
22806 22806
 void addDateRangeToLayout(QDomElement element,QStack<QWidget*> *,
22807 22807
 QStack<QLayout*> *layoutStack)

Loading…
Cancel
Save