diff --git a/Classes/MBSliderButton.m b/Classes/MBSliderButton.m index 7a41782..fe31772 100644 --- a/Classes/MBSliderButton.m +++ b/Classes/MBSliderButton.m @@ -50,6 +50,7 @@ -(void)setDelegate:(id)d #import "MBSliderButton.h" +#import "mongoPref.h" @implementation MDBMBSliderButton @@ -244,4 +245,4 @@ -(IBAction)moveRight:(id)sender [[self window] invalidateCursorRectsForView:self]; } -@end \ No newline at end of file +@end diff --git a/English.lproj/mongoPref.xib b/English.lproj/mongoPref.xib index cfe033e..54c681e 100644 --- a/English.lproj/mongoPref.xib +++ b/English.lproj/mongoPref.xib @@ -1,8 +1,9 @@ - - + + - - + + + @@ -16,11 +17,11 @@ - + - + @@ -69,7 +70,7 @@ - + @@ -84,12 +85,9 @@ - + - - - @@ -108,11 +106,11 @@ - + - + @@ -164,7 +162,6 @@ - - - diff --git a/Lib/DaemonController/DaemonController.h b/Lib/DaemonController/DaemonController.h index b48ce7c..930274a 100644 --- a/Lib/DaemonController/DaemonController.h +++ b/Lib/DaemonController/DaemonController.h @@ -11,9 +11,9 @@ #import typedef void (^DaemonStarted)(NSNumber *); -typedef void (^DaemonStopped)(); -typedef void (^DaemonIsStarting)(); -typedef void (^DaemonIsStopping)(); +typedef void (^DaemonStopped)(void); +typedef void (^DaemonIsStarting)(void); +typedef void (^DaemonIsStopping)(void); typedef void (^DaemonFailedToStart)(NSString *); typedef void (^DaemonFailedToStop)(NSString *); diff --git a/MongoDB.prefPane.xcodeproj/project.pbxproj b/MongoDB.prefPane.xcodeproj/project.pbxproj index 75922c9..e0d11a7 100644 --- a/MongoDB.prefPane.xcodeproj/project.pbxproj +++ b/MongoDB.prefPane.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 51; objects = { /* Begin PBXAggregateTarget section */ @@ -260,7 +260,7 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0620; + LastUpgradeCheck = 1010; ORGANIZATIONNAME = "Helmut K. C. Tessarek"; TargetAttributes = { 0EB5C3641B252FB100FB9A19 = { @@ -269,7 +269,7 @@ }; }; buildConfigurationList = 1DBD214C08BA80EA00186707 /* Build configuration list for PBXProject "MongoDB.prefPane" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 10.0"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -368,6 +368,8 @@ 0EB5C3661B252FB200FB9A19 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + PRODUCT_BUNDLE_IDENTIFIER = "cx.evermeet.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -375,6 +377,8 @@ 0EB5C3671B252FB200FB9A19 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; + PRODUCT_BUNDLE_IDENTIFIER = "cx.evermeet.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -382,7 +386,7 @@ 1DBD214908BA80EA00186707 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -391,13 +395,13 @@ "\"$(SRCROOT)/Lib\"", ); GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Classes/MongoDB-Prefix.pch"; INFOPLIST_FILE = Resources/Info.plist; INSTALL_PATH = "$(HOME)/Library/PreferencePanes"; MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_BUNDLE_IDENTIFIER = "cx.evermeet.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = MongoDB; SDKROOT = macosx; VALID_ARCHS = x86_64; @@ -409,7 +413,7 @@ 1DBD214A08BA80EA00186707 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( @@ -422,6 +426,7 @@ INFOPLIST_FILE = Resources/Info.plist; INSTALL_PATH = "$(HOME)/Library/PreferencePanes"; MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_BUNDLE_IDENTIFIER = "cx.evermeet.${PRODUCT_NAME:identifier}"; PRODUCT_NAME = MongoDB; SDKROOT = macosx; VALID_ARCHS = x86_64; @@ -432,17 +437,39 @@ 1DBD214D08BA80EA00186707 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = Classes/InfoPlist.h; INFOPLIST_PREPROCESS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; SDKROOT = macosx; VALID_ARCHS = x86_64; }; @@ -451,16 +478,37 @@ 1DBD214E08BA80EA00186707 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; GENERATE_PKGINFO_FILE = YES; INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = Classes/InfoPlist.h; INFOPLIST_PREPROCESS = YES; - MACOSX_DEPLOYMENT_TARGET = 10.6; - PREBINDING = NO; + MACOSX_DEPLOYMENT_TARGET = 10.9; SDKROOT = macosx; VALID_ARCHS = x86_64; }; diff --git a/Resources/Info.plist b/Resources/Info.plist index 41f6a75..33807c4 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile mongo.icns CFBundleIdentifier - cx.evermeet.${PRODUCT_NAME:identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -18,12 +18,14 @@ BNDL CFBundleShortVersionString VERSION_INFO + CFBundleSignature + ???? CFBundleVersion REVISION_INFO GitHash GIT_HASH_INFO - CFBundleSignature - ???? + NSHumanReadableCopyright + © Helmut K. C. Tessarek, 2015-2018 NSMainNibFile mongoPref NSPrefPaneIconFile @@ -32,7 +34,5 @@ MongoDB NSPrincipalClass mongoPref - NSHumanReadableCopyright - © Helmut K. C. Tessarek, 2015