diff options
author | Max <post@wickenrode.com> | 2018-01-20 03:09:01 +0100 |
---|---|---|
committer | Max <post@wickenrode.com> | 2018-01-20 03:09:01 +0100 |
commit | d403528b2e2be083fe80f5a915d1f6867ec9074e (patch) | |
tree | cd4daf91b4dc49c46a07d9223576995c48aaeadd /Source/SPFavoritesOutlineView.m | |
parent | ef21bc5c3749756c21804d1592f3a3fe2faf7cab (diff) | |
parent | b04243d4d7befb33383d434fe05ea3d7915ef27d (diff) | |
download | sequelpro-d403528b2e2be083fe80f5a915d1f6867ec9074e.tar.gz sequelpro-d403528b2e2be083fe80f5a915d1f6867ec9074e.tar.bz2 sequelpro-d403528b2e2be083fe80f5a915d1f6867ec9074e.zip |
Merge remote-tracking branch 'origin/mergeclasses'
Conflicts:
Source/SPQueryControllerInitializer.m
Source/SPQueryDocumentsController.m
Source/SPQueryFavoriteManager.m
Diffstat (limited to 'Source/SPFavoritesOutlineView.m')
-rw-r--r-- | Source/SPFavoritesOutlineView.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/SPFavoritesOutlineView.m b/Source/SPFavoritesOutlineView.m index 8dbec5da..6a64cca1 100644 --- a/Source/SPFavoritesOutlineView.m +++ b/Source/SPFavoritesOutlineView.m @@ -29,7 +29,7 @@ // More info at <https://github.com/sequelpro/sequelpro> #import "SPFavoritesOutlineView.h" -#import "SPConnectionControllerDelegate.h" +#import "SPConnectionController.h" @interface SPFavoritesOutlineView () @@ -191,12 +191,12 @@ static NSUInteger SPFavoritesOutlineViewUnindent = 6; /** - * If the delegate is a SPConnectionControllerDelegate, and editing is currently in + * If the delegate is a SPConnectionController, and editing is currently in * progress, draw a custom highlight. */ - (void)highlightSelectionInClipRect:(NSRect)clipRect { - // Only proceed if a the delegate is a SPConnectionControllerDelegate and a favoruite being edited + // Only proceed if a the delegate is a SPConnectionController and a favorite being edited if ([[self delegate] isKindOfClass:[SPConnectionController class]] && [(SPConnectionController *)[self delegate] isEditingConnection] && [(SPConnectionController *)[self delegate] selectedFavorite]) |