Skip to content

Commit

Permalink
Fix all warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@franciscolourenco
franciscolourenco committed Jun 4, 2020
1 parent 068ad5e commit 4bf466b
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 171 deletions.
38 changes: 25 additions & 13 deletions octopus.xcodeproj/project.pbxproj
View file
Expand Up @@ -17,8 +17,6 @@
CE8CEAFB1E646B2C00E3B034 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE8CEAFA1E646B2C00E3B034 /* Assets.xcassets */; };
CE8CEAFE1E646B2D00E3B034 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE8CEAFC1E646B2D00E3B034 /* MainMenu.xib */; };
CEA25A931E68A227008FB6A6 /* KeyCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA25A921E68A227008FB6A6 /* KeyCode.swift */; };
CEF932C71E869C4E00C4839F /* Metrics.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEF932C61E869C4E00C4839F /* Metrics.swift */; };
CEF932C91E86A46600C4839F /* OutputString.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEF932C81E86A46600C4839F /* OutputString.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -34,8 +32,6 @@
CE8CEAFD1E646B2D00E3B034 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
CE8CEAFF1E646B2D00E3B034 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
CEA25A921E68A227008FB6A6 /* KeyCode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyCode.swift; sourceTree = "<group>"; };
CEF932C61E869C4E00C4839F /* Metrics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Metrics.swift; sourceTree = "<group>"; };
CEF932C81E86A46600C4839F /* OutputString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OutputString.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -74,9 +70,7 @@
CE6CFE971E771C9B0024C8EE /* KeyToKey.swift */,
CE6CFE951E771C840024C8EE /* KeyOverlaidModifier.swift */,
CE6CFE911E771C0D0024C8EE /* Modal.swift */,
CEF932C61E869C4E00C4839F /* Metrics.swift */,
CE6CFE931E771C5C0024C8EE /* KeyEvent.swift */,
CEF932C81E86A46600C4839F /* OutputString.swift */,
CE6CFE991E7721440024C8EE /* CaplockMonitor.swift */,
CE8CEAFA1E646B2C00E3B034 /* Assets.xcassets */,
CE8CEAFC1E646B2D00E3B034 /* MainMenu.xib */,
Expand Down Expand Up @@ -112,7 +106,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0810;
LastUpgradeCheck = 0820;
LastUpgradeCheck = 1150;
ORGANIZATIONNAME = Betafabric;
TargetAttributes = {
CE8CEAF41E646B2C00E3B034 = {
Expand Down Expand Up @@ -158,11 +152,9 @@
buildActionMask = 2147483647;
files = (
CE6CFE9A1E7721440024C8EE /* CaplockMonitor.swift in Sources */,
CEF932C91E86A46600C4839F /* OutputString.swift in Sources */,
CE6CFE981E771C9B0024C8EE /* KeyToKey.swift in Sources */,
CE6CFE9C1E7721750024C8EE /* Keyboard.swift in Sources */,
CE6CFE941E771C5C0024C8EE /* KeyEvent.swift in Sources */,
CEF932C71E869C4E00C4839F /* Metrics.swift in Sources */,
CEA25A931E68A227008FB6A6 /* KeyCode.swift in Sources */,
CE6CFE921E771C0D0024C8EE /* Modal.swift in Sources */,
CE8CEAF91E646B2C00E3B034 /* AppDelegate.swift in Sources */,
Expand Down Expand Up @@ -193,15 +185,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = 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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
Expand All @@ -225,12 +225,13 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -243,15 +244,23 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
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_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = 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_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
Expand All @@ -269,23 +278,25 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 5.0;
};
name = Release;
};
CE8CEB031E646B2D00E3B034 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = octopus/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.betafabric.octopus;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
};
name = Debug;
Expand All @@ -294,12 +305,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = octopus/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.betafabric.octopus;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 5.0;
};
name = Release;
Expand Down
14 changes: 3 additions & 11 deletions octopus/AppDelegate.swift
View file
Expand Up @@ -28,11 +28,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
var launchbar: KeyToKey?
var launchbarShift: KeyToKey?
var capsLockMonitor: CapsLockMonitor?
var metrics: Metrics?

func applicationDidFinishLaunching(_ aNotification: Notification) {

statusItem.title = "Octopus"
statusItem.button?.title = "Octopus"
statusItem.menu = statusMenu
// Insert code here to initialize your application
// func acquirePrivileges() -> Bool {
Expand Down Expand Up @@ -67,15 +66,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
func startTapping () {
class TabMode: Modal {

override var redZone: Double {
get {
return 0.0
}
set {
self.redZone = 0.0
}
}

override func entered () {
super.entered()
Keyboard.keyDown(key: .command)
Expand All @@ -89,6 +79,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {

self.tabMode = TabMode(
name: "Tabmode",
redZone: 0.0,
statusIndicator: tabmodeIndicator,
trigger: KeyEvent(key: .tab, modifiers: []),
bindings: [
Expand Down Expand Up @@ -122,6 +113,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {

self.homerowMode = Modal(
name: "HomerowMode",
redZone: 0.05,
statusIndicator: homerowmodeIndicator,
trigger: KeyEvent(key: .space, modifiers: []),
bindings: [
Expand Down
6 changes: 3 additions & 3 deletions octopus/KeyOverlaidModifier.swift
View file
Expand Up @@ -14,10 +14,10 @@ class KeyOverlaidModifier: Hashable {
var triggerPressedTimestamp = Date().timeIntervalSince1970
var wasUsed = false

var hashValue: Int {
return overlay.rawValue.hashValue ^ to.hashValue
func hash(into hasher: inout Hasher) {
hasher.combine(overlay.rawValue)
hasher.combine(to)
}

static func == (lhs: KeyOverlaidModifier, rhs: KeyOverlaidModifier) -> Bool {
return lhs.overlay == rhs.overlay && lhs.to == rhs.to
}
Expand Down
94 changes: 0 additions & 94 deletions octopus/Metrics.swift
View file

This file was deleted.

5 changes: 3 additions & 2 deletions octopus/Modal.swift
View file
Expand Up @@ -107,13 +107,14 @@ class Modal {
fieldsString = fieldsString + "| eventSourceStateID: " + String(event.getIntegerValueField(.eventSourceStateID))
return fieldsString
}
init(name: String, statusIndicator: NSButton? = nil, trigger: KeyEvent, bindings: [KeyEvent: KeyEvent], overlaidModifiers: [KeyEvent: KeyOverlaidModifier] = [:]) {
init(name: String, redZone: Double, statusIndicator: NSButton? = nil, trigger: KeyEvent, bindings: [KeyEvent: KeyEvent], overlaidModifiers: [KeyEvent: KeyOverlaidModifier] = [:]) {
self.name = name
self.trigger = trigger
self.bindings = bindings
self.overlaidModifiers = overlaidModifiers
self.statusIndicator = statusIndicator

self.redZone = redZone

func myCGEventCallback(proxy: CGEventTapProxy, type: CGEventType, event: CGEvent, userInfo: UnsafeMutableRawPointer?) -> Unmanaged<CGEvent>? {
let keyCode = event.getIntegerValueField(.keyboardEventKeycode)
let thisModal = Unmanaged<Modal>.fromOpaque(userInfo!).takeUnretainedValue()
Expand Down
48 changes: 0 additions & 48 deletions octopus/OutputString.swift
View file

This file was deleted.

0 comments on commit 4bf466b

Please sign in to comment.