aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/GenerateThumbnailForURL.m2
-rw-r--r--Source/QLPreviewPanel.h2
-rw-r--r--Source/SPAlertSheets.m9
-rw-r--r--Source/SPColorAdditions.h3
-rw-r--r--Source/SPColorAdditions.m1
-rw-r--r--Source/SPColorWellCell.h7
-rw-r--r--Source/SPColorWellCell.m3
-rw-r--r--Source/SPConnectionController.h2
-rw-r--r--Source/SPConstants.h2
-rw-r--r--Source/SPDatabaseCopy.m1
-rw-r--r--Source/SPDocumentController.h5
-rw-r--r--Source/SPDocumentController.m2
-rw-r--r--Source/SPFavoriteTextFieldCell.m103
-rw-r--r--Source/SPFileManagerAdditions.h2
-rw-r--r--Source/SPFileManagerAdditions.m1
-rw-r--r--Source/SPImageView.m2
-rw-r--r--Source/SPKeychain.h2
-rw-r--r--Source/SPNavigatorOutlineView.h2
-rw-r--r--Source/SPNavigatorOutlineView.m9
-rw-r--r--Source/SPOutlineView.m4
-rw-r--r--Source/SPPrintAccessory.m5
-rw-r--r--Source/SPTextViewAdditions.m1
-rw-r--r--Source/SPWindowAdditions.m22
-rw-r--r--Source/main.c5
24 files changed, 67 insertions, 130 deletions
diff --git a/Source/GenerateThumbnailForURL.m b/Source/GenerateThumbnailForURL.m
index 4267c2c0..dbc1f42c 100644
--- a/Source/GenerateThumbnailForURL.m
+++ b/Source/GenerateThumbnailForURL.m
@@ -25,8 +25,6 @@
#include <CoreFoundation/CoreFoundation.h>
#include <CoreServices/CoreServices.h>
#include <QuickLook/QuickLook.h>
-#import <Cocoa/Cocoa.h>
-
/* -----------------------------------------------------------------------------
Generate a thumbnail for file
diff --git a/Source/QLPreviewPanel.h b/Source/QLPreviewPanel.h
index c72b0fa2..ef8f3fe7 100644
--- a/Source/QLPreviewPanel.h
+++ b/Source/QLPreviewPanel.h
@@ -23,8 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Cocoa/Cocoa.h>
-
// As the QuickLook framework is private we have to make
// these methods public to avoid warnings while compiling
@interface QLPreviewPanel : NSPanel
diff --git a/Source/SPAlertSheets.m b/Source/SPAlertSheets.m
index bcaea921..8f6a21fd 100644
--- a/Source/SPAlertSheets.m
+++ b/Source/SPAlertSheets.m
@@ -42,8 +42,8 @@ void SPBeginAlertSheet(
id modalDelegate,
SEL didEndSelector,
void *contextInfo,
- NSString *msg
-) {
+ NSString *msg)
+{
NSButton *aButton;
// Set up an NSAlert with the supplied details
@@ -95,8 +95,8 @@ void SPBeginWaitingAlertSheet(
void *contextInfo,
NSString *msg,
NSString *infoText,
- NSInteger *returnCode
-) {
+ NSInteger *returnCode)
+{
NSButton *aButton;
@@ -160,6 +160,7 @@ void SPBeginWaitingAlertSheet(
beforeDate:[NSDate distantFuture]];
}
+
[NSApp endModalSession:session];
[NSApp endSheet:[alert window]];
}
diff --git a/Source/SPColorAdditions.h b/Source/SPColorAdditions.h
index 58508f62..48ea1986 100644
--- a/Source/SPColorAdditions.h
+++ b/Source/SPColorAdditions.h
@@ -22,9 +22,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Cocoa/Cocoa.h>
-
-
@interface NSColor (SPColorAdditions)
+ (NSColor *)colorWithRGBHexString:(NSString *)hexString ignoreAlpha:(BOOL)ignoreAlpha;
diff --git a/Source/SPColorAdditions.m b/Source/SPColorAdditions.m
index e2e22c16..d6dc8056 100644
--- a/Source/SPColorAdditions.m
+++ b/Source/SPColorAdditions.m
@@ -24,7 +24,6 @@
#import "SPColorAdditions.h"
-
@implementation NSColor (SPColorAdditions)
/*
diff --git a/Source/SPColorWellCell.h b/Source/SPColorWellCell.h
index 9be65828..0f248e27 100644
--- a/Source/SPColorWellCell.h
+++ b/Source/SPColorWellCell.h
@@ -22,11 +22,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Cocoa/Cocoa.h>
-
-
-@interface SPColorWellCell : NSActionCell {
-
-}
+@interface SPColorWellCell : NSActionCell
@end
diff --git a/Source/SPColorWellCell.m b/Source/SPColorWellCell.m
index 18d392b9..ce47ef83 100644
--- a/Source/SPColorWellCell.m
+++ b/Source/SPColorWellCell.m
@@ -24,12 +24,10 @@
#import "SPColorWellCell.h"
-
@implementation SPColorWellCell
- (void) drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView
{
-
// Set initial inset from cellFrame
NSRect rect = NSInsetRect (cellFrame, 0.5, 0.5);
@@ -59,7 +57,6 @@
// Draw the actual color as rect
[(NSColor*) [self objectValue] set];
NSRectFillUsingOperation(NSInsetRect (rect, insetFactor, insetFactor), NSCompositeSourceOver);
-
}
@end
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index 73622f40..6c5863b9 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -1,5 +1,5 @@
//
-// $Id
+// $Id$
//
// SPConnectionController.h
// sequel-pro
diff --git a/Source/SPConstants.h b/Source/SPConstants.h
index 9b89deb3..00fc0607 100644
--- a/Source/SPConstants.h
+++ b/Source/SPConstants.h
@@ -23,8 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Foundation/Foundation.h>
-
// View modes
typedef enum {
SPStructureViewMode = 1,
diff --git a/Source/SPDatabaseCopy.m b/Source/SPDatabaseCopy.m
index cd7d1584..40192156 100644
--- a/Source/SPDatabaseCopy.m
+++ b/Source/SPDatabaseCopy.m
@@ -101,5 +101,4 @@
[dbInfo release], dbInfo = nil;
}
-
@end \ No newline at end of file
diff --git a/Source/SPDocumentController.h b/Source/SPDocumentController.h
index 237e71a3..5f1de335 100644
--- a/Source/SPDocumentController.h
+++ b/Source/SPDocumentController.h
@@ -24,9 +24,6 @@
#import <Cocoa/Cocoa.h>
-
-@interface SPDocumentController : NSDocument {
-
-}
+@interface SPDocumentController : NSDocument
@end
diff --git a/Source/SPDocumentController.m b/Source/SPDocumentController.m
index baec776b..1c842fa3 100644
--- a/Source/SPDocumentController.m
+++ b/Source/SPDocumentController.m
@@ -22,10 +22,8 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-
#import "SPDocumentController.h"
-
@implementation SPDocumentController
/**
diff --git a/Source/SPFavoriteTextFieldCell.m b/Source/SPFavoriteTextFieldCell.m
index f9025f63..e4d2622f 100644
--- a/Source/SPFavoriteTextFieldCell.m
+++ b/Source/SPFavoriteTextFieldCell.m
@@ -38,9 +38,9 @@
@implementation SPFavoriteTextFieldCell
-// -------------------------------------------------------------------------------
-// init
-// -------------------------------------------------------------------------------
+/**
+ * Init.
+ */
- (id)init
{
if ((self = [super init])) {
@@ -53,9 +53,6 @@
return self;
}
-// -------------------------------------------------------------------------------
-// copyWithZone:
-// -------------------------------------------------------------------------------
- (id)copyWithZone:(NSZone *)zone
{
SPFavoriteTextFieldCell *cell = (SPFavoriteTextFieldCell *)[super copyWithZone:zone];
@@ -69,21 +66,17 @@
return cell;
}
-// -------------------------------------------------------------------------------
-// favoriteName
-//
-// Get the cell's favorite name.
-// -------------------------------------------------------------------------------
+/**
+ * Get the cell's favorite name.
+ */
- (NSString *)favoriteName
{
return favoriteName;
}
-// -------------------------------------------------------------------------------
-// setFavoriteName:
-//
-// Set the cell's favorite name to the supplied name.
-// -------------------------------------------------------------------------------
+/**
+ * Set the cell's favorite name to the supplied name.
+ */
- (void)setFavoriteName:(NSString *)name
{
if (favoriteName != name) {
@@ -92,21 +85,17 @@
}
}
-// -------------------------------------------------------------------------------
-// favoriteHost
-//
-// Get the cell's favorite host.
-// -------------------------------------------------------------------------------
+/**
+ * Get the cell's favorite host.
+ */
- (NSString *)favoriteHost
{
return favoriteHost;
}
-// -------------------------------------------------------------------------------
-// setFavoriteHost:
-//
-// Set the cell's favorite host to the supplied name.
-// -------------------------------------------------------------------------------
+/**
+ * Set the cell's favorite host to the supplied name.
+ */
- (void)setFavoriteHost:(NSString *)host
{
if (favoriteHost != host) {
@@ -115,11 +104,9 @@
}
}
-// -------------------------------------------------------------------------------
-// drawInteriorWithFrame:inView:
-//
-// Draws the actual cell.
-// -------------------------------------------------------------------------------
+/**
+ * Draws the actual cell.
+ */
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
{
(([self isHighlighted]) && (![[self highlightColorWithFrame:cellFrame inView:controlView] isEqualTo:[NSColor secondarySelectedControlColor]])) ? [self invertFontColors] : [self restoreFontColors];
@@ -186,31 +173,27 @@
return cellSize;
}
-// -------------------------------------------------------------------------------
-// invertFontColors
-//
-// Inverts the displayed font colors when the cell is selected.
-// -------------------------------------------------------------------------------
+/**
+ * Inverts the displayed font colors when the cell is selected.
+ *
- (void)invertFontColors
{
mainStringColor = [NSColor whiteColor];
subStringColor = [NSColor whiteColor];
}
-// -------------------------------------------------------------------------------
-// restoreFontColors
-//
-// Restores the displayed font colors once the cell is no longer selected.
-// -------------------------------------------------------------------------------
+/**
+ * Restores the displayed font colors once the cell is no longer selected.
+ */
- (void)restoreFontColors
{
mainStringColor = [NSColor blackColor];
subStringColor = [NSColor grayColor];
}
-// -------------------------------------------------------------------------------
-// dealloc
-// -------------------------------------------------------------------------------
+/**
+ * Dealloc.
+ */
- (void)dealloc
{
[favoriteName release], favoriteName = nil;
@@ -223,41 +206,33 @@
@implementation SPFavoriteTextFieldCell (PrivateAPI)
-// -------------------------------------------------------------------------------
-// constructSubStringAttributedString
-//
-// Constructs the attributed string to be used as the cell's substring.
-// -------------------------------------------------------------------------------
+/**
+ * Constructs the attributed string to be used as the cell's substring.
+ */
- (NSAttributedString *)constructSubStringAttributedString
{
return [[[NSAttributedString alloc] initWithString:favoriteHost attributes:[self subStringAttributedStringAttributes]] autorelease];
}
-// -------------------------------------------------------------------------------
-// attributedStringForFavoriteName
-//
-// Constructs the attributed string for the cell's favorite name.
-// -------------------------------------------------------------------------------
+/**
+ * Constructs the attributed string for the cell's favorite name.
+ */
- (NSAttributedString *)attributedStringForFavoriteName
{
return [[[NSAttributedString alloc] initWithString:favoriteName attributes:[self mainStringAttributedStringAttributes]] autorelease];
}
-// -------------------------------------------------------------------------------
-// mainStringAttributedStringAttributes
-//
-// Returns the attributes of the cell's main string.
-// -------------------------------------------------------------------------------
+/**
+ * Returns the attributes of the cell's main string.
+ */
- (NSDictionary *)mainStringAttributedStringAttributes
{
return [NSDictionary dictionaryWithObjectsAndKeys:mainStringColor, NSForegroundColorAttributeName, [NSFont systemFontOfSize:FAVORITE_NAME_FONT_SIZE], NSFontAttributeName, nil];
}
-// -------------------------------------------------------------------------------
-// subStringAttributedStringAttributes
-//
-// Returns the attributes of the cell's sub string.
-// -------------------------------------------------------------------------------
+/**
+ * Returns the attributes of the cell's sub string.
+ */
- (NSDictionary *)subStringAttributedStringAttributes
{
return [NSDictionary dictionaryWithObjectsAndKeys:subStringColor, NSForegroundColorAttributeName, [NSFont systemFontOfSize:[NSFont smallSystemFontSize]], NSFontAttributeName, nil];
diff --git a/Source/SPFileManagerAdditions.h b/Source/SPFileManagerAdditions.h
index 70de36f0..9155952f 100644
--- a/Source/SPFileManagerAdditions.h
+++ b/Source/SPFileManagerAdditions.h
@@ -27,6 +27,6 @@
@interface NSFileManager (SPFileManagerAdditions)
-- (NSString*)applicationSupportDirectoryForSubDirectory:(NSString*)subDirectory error:(NSError **)errorOut;
+- (NSString *)applicationSupportDirectoryForSubDirectory:(NSString*)subDirectory error:(NSError **)errorOut;
@end
diff --git a/Source/SPFileManagerAdditions.m b/Source/SPFileManagerAdditions.m
index 179f33d7..dec4bd3f 100644
--- a/Source/SPFileManagerAdditions.m
+++ b/Source/SPFileManagerAdditions.m
@@ -22,7 +22,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-
#import "SPFileManagerAdditions.h"
enum
diff --git a/Source/SPImageView.m b/Source/SPImageView.m
index 08f39980..5af2ec6f 100644
--- a/Source/SPImageView.m
+++ b/Source/SPImageView.m
@@ -27,7 +27,7 @@
@implementation SPImageView
-/*
+/**
* On a drag and drop, read in dragged files and convert dragged images before passing
* them to the delegate for further processing
*/
diff --git a/Source/SPKeychain.h b/Source/SPKeychain.h
index 24400938..c1984be1 100644
--- a/Source/SPKeychain.h
+++ b/Source/SPKeychain.h
@@ -23,8 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Foundation/Foundation.h>
-
@interface SPKeychain : NSObject
- (void)addPassword:(NSString *)password forName:(NSString *)name account:(NSString *)account;
diff --git a/Source/SPNavigatorOutlineView.h b/Source/SPNavigatorOutlineView.h
index 2ae634fd..6d40edee 100644
--- a/Source/SPNavigatorOutlineView.h
+++ b/Source/SPNavigatorOutlineView.h
@@ -23,8 +23,6 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import <Foundation/Foundation.h>
-
@interface SPNavigatorOutlineView : NSOutlineView
- (id)selectedItem;
diff --git a/Source/SPNavigatorOutlineView.m b/Source/SPNavigatorOutlineView.m
index 812d0732..0962e44c 100644
--- a/Source/SPNavigatorOutlineView.m
+++ b/Source/SPNavigatorOutlineView.m
@@ -38,20 +38,21 @@
// Enter or Return selects in active document the chosen item
if ([self numberOfSelectedRows] == 1 && ([theEvent keyCode] == 36 || [theEvent keyCode] == 76)) {
[[self delegate] selectInActiveDocumentItem:[self itemAtRow:[self selectedRow]] fromView:self];
+
return;
}
[super keyDown:theEvent];
}
-/*
- * Return the data source item of the selected row, if no or multiple selections
- * return nil
+/**
+ * Return the data source item of the selected row, if no or multiple selections return nil.
*/
- (id)selectedItem
{
- if([self numberOfSelectedRows] == 1)
+ if ([self numberOfSelectedRows] == 1) {
return [self itemAtRow:[self selectedRow]];
+ }
return nil;
}
diff --git a/Source/SPOutlineView.m b/Source/SPOutlineView.m
index cfbb0cc2..8eb55630 100644
--- a/Source/SPOutlineView.m
+++ b/Source/SPOutlineView.m
@@ -33,8 +33,8 @@
- (void)keyDown:(NSEvent *)theEvent
{
- if ([self numberOfSelectedRows] == 1 && ([theEvent keyCode] == 36 || [theEvent keyCode] == 76))
- {
+ if ([self numberOfSelectedRows] == 1 && ([theEvent keyCode] == 36 || [theEvent keyCode] == 76)) {
+
[self editColumn:0 row:[self selectedRow] withEvent:nil select:YES];
}
else {
diff --git a/Source/SPPrintAccessory.m b/Source/SPPrintAccessory.m
index f4b68574..e1084fee 100644
--- a/Source/SPPrintAccessory.m
+++ b/Source/SPPrintAccessory.m
@@ -60,9 +60,8 @@
}
}
-/*
- * Set the print view that the print accessory controls; set initial
- * preferences based on user defaults.
+/**
+ * Set the print view that the print accessory controls; set initial preferences based on user defaults.
*/
- (void)setPrintView:(WebView *)theWebView
{
diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m
index b3f68000..3e561682 100644
--- a/Source/SPTextViewAdditions.m
+++ b/Source/SPTextViewAdditions.m
@@ -443,7 +443,6 @@
[self makeTextSizeLarger];
else if([anEvent deltaZ]<-5.0)
[self makeTextSizeSmaller];
-
}
@end
diff --git a/Source/SPWindowAdditions.m b/Source/SPWindowAdditions.m
index f5c77919..90a7ce79 100644
--- a/Source/SPWindowAdditions.m
+++ b/Source/SPWindowAdditions.m
@@ -28,11 +28,9 @@
@implementation NSWindow (SPWindowAdditions)
-// -------------------------------------------------------------------------------
-// toolbarHeight
-//
-// Returns the height of the currently visible toolbar.
-// -------------------------------------------------------------------------------
+/**
+ * Returns the height of the currently visible toolbar.
+ */
- (CGFloat)toolbarHeight
{
NSRect windowFrame;
@@ -47,11 +45,9 @@
return toolbarHeight;
}
-// -------------------------------------------------------------------------------
-// resizeForContentView:titleBarVisible
-//
-// Resizes this window to the size of the supplied view.
-// -------------------------------------------------------------------------------
+/**
+ * Resizes this window to the size of the supplied view.
+ */
- (void)resizeForContentView:(NSView *)view titleBarVisible:(BOOL)visible
{
NSSize viewSize = [view frame].size;
@@ -76,9 +72,9 @@
[self setFrame:frame display:YES animate:YES];
}
-// -------------------------------------------------------------------------------
-// Three finger multi-touch right/left swipe event to go back/forward in table history.
-// -------------------------------------------------------------------------------
+/**
+ * Three finger multi-touch right/left swipe event to go back/forward in table history.
+ */
- (void)swipeWithEvent:(NSEvent *)anEvent
{
if([[self delegate] isKindOfClass:[SPDatabaseDocument class]]
diff --git a/Source/main.c b/Source/main.c
index ae199979..2c497dbe 100644
--- a/Source/main.c
+++ b/Source/main.c
@@ -7,11 +7,6 @@
//
//==============================================================================
-
-
-
-
-
#include <CoreFoundation/CoreFoundation.h>
#include <CoreFoundation/CFPlugInCOM.h>
#include <CoreServices/CoreServices.h>