mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-11 00:30:49 +00:00
Remove uneeded <NSCoding> declarations
This commit is contained in:
parent
645fa0c094
commit
19c305c06c
3 changed files with 30 additions and 31 deletions
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
/* Definition of class NSMeasurement
|
/* Definition of class NSMeasurement
|
||||||
Copyright (C) 2019 Free Software Foundation, Inc.
|
Copyright (C) 2019 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
@ -44,7 +43,7 @@ extern "C" {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Creating Measurements
|
// Creating Measurements
|
||||||
- (instancetype)initWithDoubleValue: (double)doubleValue
|
- (instancetype) initWithDoubleValue: (double)doubleValue
|
||||||
unit: (NSUnit *)unit;
|
unit: (NSUnit *)unit;
|
||||||
|
|
||||||
|
|
||||||
|
@ -56,12 +55,12 @@ extern "C" {
|
||||||
// Conversion
|
// Conversion
|
||||||
- (BOOL) canBeConvertedToUnit: (NSUnit *)unit;
|
- (BOOL) canBeConvertedToUnit: (NSUnit *)unit;
|
||||||
|
|
||||||
- (NSMeasurement *)measurementByConvertingToUnit:(NSUnit *)unit;
|
- (NSMeasurement *) measurementByConvertingToUnit: (NSUnit *)unit;
|
||||||
|
|
||||||
// Operating
|
// Operating
|
||||||
- (NSMeasurement *)measurementByAddingMeasurement:(NSMeasurement *)measurement;
|
- (NSMeasurement *) measurementByAddingMeasurement: (NSMeasurement *)measurement;
|
||||||
|
|
||||||
- (NSMeasurement *)measurementBySubtractingMeasurement:(NSMeasurement *)measurement;
|
- (NSMeasurement *) measurementBySubtractingMeasurement: (NSMeasurement *)measurement;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ extern "C" {
|
||||||
@end
|
@end
|
||||||
|
|
||||||
// Predefined....
|
// Predefined....
|
||||||
@interface NSUnitAcceleration : NSDimension <NSCoding>
|
@interface NSUnitAcceleration : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - metersPerSecondSquared
|
Base unit - metersPerSecondSquared
|
||||||
*/
|
*/
|
||||||
|
@ -88,7 +88,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitAngle : NSDimension <NSCoding>
|
@interface NSUnitAngle : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - degrees
|
Base unit - degrees
|
||||||
*/
|
*/
|
||||||
|
@ -102,7 +102,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitArea : NSDimension <NSCoding>
|
@interface NSUnitArea : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - squareMeters
|
Base unit - squareMeters
|
||||||
*/
|
*/
|
||||||
|
@ -124,7 +124,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitConcentrationMass : NSDimension <NSCoding>
|
@interface NSUnitConcentrationMass : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - gramsPerLiter
|
Base unit - gramsPerLiter
|
||||||
*/
|
*/
|
||||||
|
@ -136,7 +136,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitDispersion : NSDimension <NSCoding>
|
@interface NSUnitDispersion : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - partsPerMillion
|
Base unit - partsPerMillion
|
||||||
*/
|
*/
|
||||||
|
@ -144,7 +144,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitDuration : NSDimension <NSCoding>
|
@interface NSUnitDuration : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - seconds
|
Base unit - seconds
|
||||||
*/
|
*/
|
||||||
|
@ -155,7 +155,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitElectricCharge : NSDimension <NSCoding>
|
@interface NSUnitElectricCharge : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - coulombs
|
Base unit - coulombs
|
||||||
*/
|
*/
|
||||||
|
@ -169,7 +169,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitElectricCurrent : NSDimension <NSCoding>
|
@interface NSUnitElectricCurrent : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - amperes
|
Base unit - amperes
|
||||||
*/
|
*/
|
||||||
|
@ -182,7 +182,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitElectricPotentialDifference : NSDimension <NSCoding>
|
@interface NSUnitElectricPotentialDifference : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - volts
|
Base unit - volts
|
||||||
*/
|
*/
|
||||||
|
@ -195,7 +195,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitElectricResistance : NSDimension <NSCoding>
|
@interface NSUnitElectricResistance : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - ohms
|
Base unit - ohms
|
||||||
*/
|
*/
|
||||||
|
@ -208,7 +208,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitEnergy : NSDimension <NSCoding>
|
@interface NSUnitEnergy : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - joules
|
Base unit - joules
|
||||||
*/
|
*/
|
||||||
|
@ -221,7 +221,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitFrequency : NSDimension <NSCoding>
|
@interface NSUnitFrequency : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - hertz
|
Base unit - hertz
|
||||||
*/
|
*/
|
||||||
|
@ -237,7 +237,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitFuelEfficiency : NSDimension <NSCoding>
|
@interface NSUnitFuelEfficiency : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - litersPer100Kilometers
|
Base unit - litersPer100Kilometers
|
||||||
*/
|
*/
|
||||||
|
@ -248,7 +248,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitLength : NSDimension <NSCoding>
|
@interface NSUnitLength : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - meters
|
Base unit - meters
|
||||||
*/
|
*/
|
||||||
|
@ -278,7 +278,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitIlluminance : NSDimension <NSCoding>
|
@interface NSUnitIlluminance : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - lux
|
Base unit - lux
|
||||||
*/
|
*/
|
||||||
|
@ -287,7 +287,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitMass : NSDimension <NSCoding>
|
@interface NSUnitMass : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - kilograms
|
Base unit - kilograms
|
||||||
*/
|
*/
|
||||||
|
@ -311,7 +311,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitPower : NSDimension <NSCoding>
|
@interface NSUnitPower : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - watts
|
Base unit - watts
|
||||||
*/
|
*/
|
||||||
|
@ -330,7 +330,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitPressure : NSDimension <NSCoding>
|
@interface NSUnitPressure : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - newtonsPerMetersSquared (equivalent to 1 pascal)
|
Base unit - newtonsPerMetersSquared (equivalent to 1 pascal)
|
||||||
*/
|
*/
|
||||||
|
@ -348,7 +348,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitSpeed : NSDimension <NSCoding>
|
@interface NSUnitSpeed : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - metersPerSecond
|
Base unit - metersPerSecond
|
||||||
*/
|
*/
|
||||||
|
@ -360,7 +360,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitTemperature : NSDimension <NSCoding>
|
@interface NSUnitTemperature : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - kelvin
|
Base unit - kelvin
|
||||||
*/
|
*/
|
||||||
|
@ -371,7 +371,7 @@ extern "C" {
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface NSUnitVolume : NSDimension <NSCoding>
|
@interface NSUnitVolume : NSDimension
|
||||||
/*
|
/*
|
||||||
Base unit - liters
|
Base unit - liters
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
|
|
||||||
/* Implementation of class NSMeasurement
|
/* Implementation of class NSMeasurement
|
||||||
Copyright (C) 2019 Free Software Foundation, Inc.
|
Copyright (C) 2019 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
@ -67,7 +66,7 @@
|
||||||
[unit respondsToSelector: @selector(converter)]);
|
[unit respondsToSelector: @selector(converter)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSMeasurement *)measurementByConvertingToUnit:(NSUnit *)unit
|
- (NSMeasurement *) measurementByConvertingToUnit: (NSUnit *)unit
|
||||||
{
|
{
|
||||||
NSMeasurement *result = nil;
|
NSMeasurement *result = nil;
|
||||||
double val = 0.0;
|
double val = 0.0;
|
||||||
|
@ -88,7 +87,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// Operating
|
// Operating
|
||||||
- (NSMeasurement *)measurementByAddingMeasurement:(NSMeasurement *)measurement
|
- (NSMeasurement *) measurementByAddingMeasurement: (NSMeasurement *)measurement
|
||||||
{
|
{
|
||||||
NSMeasurement *newMeasurement = [measurement measurementByConvertingToUnit: _unit];
|
NSMeasurement *newMeasurement = [measurement measurementByConvertingToUnit: _unit];
|
||||||
NSMeasurement *result = nil;
|
NSMeasurement *result = nil;
|
||||||
|
@ -101,7 +100,7 @@
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSMeasurement *)measurementBySubtractingMeasurement:(NSMeasurement *)measurement
|
- (NSMeasurement *) measurementBySubtractingMeasurement: (NSMeasurement *)measurement
|
||||||
{
|
{
|
||||||
NSMeasurement *newMeasurement = [measurement measurementByConvertingToUnit: _unit];
|
NSMeasurement *newMeasurement = [measurement measurementByConvertingToUnit: _unit];
|
||||||
NSMeasurement *result = nil;
|
NSMeasurement *result = nil;
|
||||||
|
@ -126,6 +125,7 @@
|
||||||
{
|
{
|
||||||
if([coder allowsKeyedCoding])
|
if([coder allowsKeyedCoding])
|
||||||
{
|
{
|
||||||
|
// Verify that this is the correct encoding...
|
||||||
[coder encodeObject: _unit forKey: @"unit"];
|
[coder encodeObject: _unit forKey: @"unit"];
|
||||||
[coder encodeDouble: _doubleValue forKey: @"doubleValue"];
|
[coder encodeDouble: _doubleValue forKey: @"doubleValue"];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue