From 757be9aeba67d609942c54c1bbe0461e120a392e Mon Sep 17 00:00:00 2001 From: Avery Pierce Date: Tue, 17 Jan 2017 20:36:01 -0600 Subject: OLMKit: Change OLMKitVersionString from a C function to an Obj-C static method --- xcode/OLMKit/OLMKit.h | 11 +++++++---- xcode/OLMKit/OLMKit.m | 10 +++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/xcode/OLMKit/OLMKit.h b/xcode/OLMKit/OLMKit.h index e23a9f1..455d11b 100644 --- a/xcode/OLMKit/OLMKit.h +++ b/xcode/OLMKit/OLMKit.h @@ -18,10 +18,6 @@ #import - -//! Project version string for OLMKit, the same as libolm. -NSString *OLMKitVersionString(); - // In this header, you should import all the public headers of your framework using statements like #import #import @@ -30,3 +26,10 @@ NSString *OLMKitVersionString(); #import #import #import + +@interface OLMKit : NSObject + +//! Project version string for OLMKit, the same as libolm. ++ (NSString*)versionString; + +@end diff --git a/xcode/OLMKit/OLMKit.m b/xcode/OLMKit/OLMKit.m index e7bfd25..c383650 100644 --- a/xcode/OLMKit/OLMKit.m +++ b/xcode/OLMKit/OLMKit.m @@ -19,11 +19,15 @@ #include "olm/olm.h" -NSString *OLMKitVersionString() +@implementation OLMKit + ++ (NSString*)versionString { uint8_t major, minor, patch; - + olm_get_library_version(&major, &minor, &patch); - + return [NSString stringWithFormat:@"%tu.%tu.%tu", major, minor, patch]; } + +@end -- cgit v1.2.3