Browse Source

Fix the build

Neal Wilson 11 years ago
parent
commit
40995bcd09
4 changed files with 547 additions and 541 deletions
  1. 537
    534
      src/typica.cpp
  2. 6
    3
      src/typica.w
  3. 2
    2
      src/units.cpp
  4. 2
    2
      src/units.w

+ 537
- 534
src/typica.cpp
File diff suppressed because it is too large
View File


+ 6
- 3
src/typica.w View File

9334
 	{
9334
 	{
9335
 		return QVariant(row->at(index.column()));
9335
 		return QVariant(row->at(index.column()));
9336
 	}
9336
 	}
9337
-	if[role == Qt::DisplayRole || role == Qt::EditRole)
9337
+	if(role == Qt::DisplayRole || role == Qt::EditRole)
9338
 	{
9338
 	{
9339
 		if(index.column() > row->size())
9339
 		if(index.column() > row->size())
9340
 		{
9340
 		{
9363
 					{
9363
 					{
9364
 						if(v.value("relative").toBool())
9364
 						if(v.value("relative").toBool())
9365
 						{
9365
 						{
9366
-							return QVariant(QString("%1").@|arg(Units::convertRelativeTemperature(v.value("measurement").toDouble(),@| (Units::Unit)(v.value("unit").toInt()), unit)));
9366
+							return QVariant(QString("%1").@|arg(Units::convertRelativeTemperature(v.value("measurement").
9367
+							toDouble(),@| (Units::Unit)(v.value("unit").toInt()), unit)));
9367
 						}
9368
 						}
9368
 					}
9369
 					}
9369
-					return QVariant(QString("%1")@|.arg(Units::convertTemperature(v.value("measurement").toDouble(),@| (Units::Unit)(v.value("unit").toInt()), unit)));
9370
+					return QVariant(QString("%1").@|
9371
+					arg(Units::convertTemperature(v.value("measurement").toDouble(),@|
9372
+					(Units::Unit)(v.value("unit").toInt()), unit)));
9370
 				}
9373
 				}
9371
 			}
9374
 			}
9372
 			return QVariant(row->at(index.column()).toString());
9375
 			return QVariant(row->at(index.column()).toString());

+ 2
- 2
src/units.cpp View File

11
 return(unit==Fahrenheit||
11
 return(unit==Fahrenheit||
12
 unit==Celsius||
12
 unit==Celsius||
13
 unit==Kelvin||
13
 unit==Kelvin||
14
-unit==Rankind);
14
+unit==Rankine);
15
 }
15
 }
16
 
16
 
17
 /*:227*//*228:*/
17
 /*:227*//*228:*/
300
 return(unit==Pound||
300
 return(unit==Pound||
301
 unit==Kilogram||
301
 unit==Kilogram||
302
 unit==Ounce||
302
 unit==Ounce||
303
-unit==gram);
303
+unit==Gram);
304
 }
304
 }
305
 
305
 
306
 /*:230*/
306
 /*:230*/

+ 2
- 2
src/units.w View File

55
 	return (unit == Fahrenheit ||
55
 	return (unit == Fahrenheit ||
56
 	        unit == Celsius ||
56
 	        unit == Celsius ||
57
 	        unit == Kelvin ||
57
 	        unit == Kelvin ||
58
-	        unit == Rankind);
58
+	        unit == Rankine);
59
 }
59
 }
60
 
60
 
61
 @ Temperature conversions can be performed by the |Units| class and should
61
 @ Temperature conversions can be performed by the |Units| class and should
351
 	return (unit == Pound ||
351
 	return (unit == Pound ||
352
 	        unit == Kilogram ||
352
 	        unit == Kilogram ||
353
 	        unit == Ounce ||
353
 	        unit == Ounce ||
354
-	        unit == gram);
354
+	        unit == Gram);
355
 }
355
 }
356
 
356
 
357
 @ This class is exposed to the host environment. Note the lack of constructor.
357
 @ This class is exposed to the host environment. Note the lack of constructor.

Loading…
Cancel
Save