From d7e813476d49f3b9296b94c3c57a495b7f237885 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Fri, 7 Aug 2009 22:19:52 +0000 Subject: Source tidy up and missing SVN properties. --- Source/CMImageView.h | 5 ++--- Source/CMImageView.m | 2 -- Source/SPPrintAccessory.h | 2 +- Source/SPPrintAccessory.m | 2 +- Source/SPSSHTunnel.h | 2 ++ Source/SPSSHTunnel.m | 2 ++ Source/SPTableInfo.m | 1 - Source/SPTableView.m | 2 +- Source/SequelProTunnelAssistant.m | 2 ++ Source/TableDump.h | 12 ++++-------- Source/TableDump.m | 31 ++++++++++++++++--------------- Source/TableSource.h | 1 - Source/TablesList.h | 4 ++-- 13 files changed, 33 insertions(+), 35 deletions(-) diff --git a/Source/CMImageView.h b/Source/CMImageView.h index 0982debd..84ffe041 100644 --- a/Source/CMImageView.h +++ b/Source/CMImageView.h @@ -32,10 +32,9 @@ @end -@interface CMImageView : NSImageView { - +@interface CMImageView : NSImageView +{ IBOutlet id delegate; - } - (BOOL)performDragOperation:(id )sender; diff --git a/Source/CMImageView.m b/Source/CMImageView.m index 505921f7..31eb9c60 100644 --- a/Source/CMImageView.m +++ b/Source/CMImageView.m @@ -106,7 +106,6 @@ - (void)paste:(id)sender { - // [super paste:sender]; id delegateForUse = nil; @@ -122,7 +121,6 @@ } if (delegateForUse) [delegateForUse processPasteImageData]; - } @end \ No newline at end of file diff --git a/Source/SPPrintAccessory.h b/Source/SPPrintAccessory.h index d1b8498d..4c780f28 100644 --- a/Source/SPPrintAccessory.h +++ b/Source/SPPrintAccessory.h @@ -34,6 +34,6 @@ WebView *printWebView; } -- (void) setPrintView:(WebView *)theWebView; +- (void)setPrintView:(WebView *)theWebView; @end diff --git a/Source/SPPrintAccessory.m b/Source/SPPrintAccessory.m index 4237acbf..302d7deb 100644 --- a/Source/SPPrintAccessory.m +++ b/Source/SPPrintAccessory.m @@ -64,7 +64,7 @@ * Set the print view that the print accessory controls; set initial * preferences based on user defaults. */ -- (void) setPrintView:(WebView *)theWebView +- (void)setPrintView:(WebView *)theWebView { printWebView = theWebView; [[printWebView preferences] setShouldPrintBackgrounds:[[defaultsController valueForKeyPath:@"values.PrintBackground"] boolValue]]; diff --git a/Source/SPSSHTunnel.h b/Source/SPSSHTunnel.h index e9b06cb6..8d05396e 100644 --- a/Source/SPSSHTunnel.h +++ b/Source/SPSSHTunnel.h @@ -1,4 +1,6 @@ // +// $Id$ +// // SPSSHTunnel.h // sequel-pro // diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m index 60260f8d..d086c8ce 100644 --- a/Source/SPSSHTunnel.m +++ b/Source/SPSSHTunnel.m @@ -1,4 +1,6 @@ // +// $Id$ +// // SPSSHTunnel.m // sequel-pro // diff --git a/Source/SPTableInfo.m b/Source/SPTableInfo.m index 5b369207..2cb14bf2 100644 --- a/Source/SPTableInfo.m +++ b/Source/SPTableInfo.m @@ -1,5 +1,4 @@ // -// // $Id$ // // SPTableInfo.m diff --git a/Source/SPTableView.m b/Source/SPTableView.m index a338d506..46f491ad 100644 --- a/Source/SPTableView.m +++ b/Source/SPTableView.m @@ -32,7 +32,6 @@ */ - (NSMenu *)menuForEvent:(NSEvent *)event { - // If more than one row is selected only returns the default contextual menu if([self numberOfSelectedRows] > 1) return [self menu]; @@ -43,6 +42,7 @@ [self selectRow:row byExtendingSelection:NO]; [[self window] makeFirstResponder:self]; } + return [self menu]; } diff --git a/Source/SequelProTunnelAssistant.m b/Source/SequelProTunnelAssistant.m index 7859eaf7..462d9a6d 100644 --- a/Source/SequelProTunnelAssistant.m +++ b/Source/SequelProTunnelAssistant.m @@ -1,4 +1,6 @@ // +// $Id$ +// // SequelProTunnelAssistant.m // sequel-pro // diff --git a/Source/TableDump.h b/Source/TableDump.h index bb4c0284..d32cddea 100644 --- a/Source/TableDump.h +++ b/Source/TableDump.h @@ -101,19 +101,19 @@ BOOL progressCancelled; } -//IBAction methods +// IBAction methods - (IBAction)reloadTables:(id)sender; - (IBAction)selectTables:(id)sender; - (IBAction)closeSheet:(id)sender; - (IBAction)stepRow:(id)sender; - (IBAction)cancelProgressBar:(id)sender; -//export methods +// Export methods - (void)export; - (void)exportFile:(int)tag; - (void)savePanelDidEnd:(NSSavePanel *)sheet returnCode:(int)returnCode contextInfo:(NSString *)contextInfo; -//import methods +// Import methods - (void)importFile; - (IBAction)changeFormat:(id)sender; - (IBAction)changeTable:(id)sender; @@ -146,14 +146,10 @@ - (IBAction)switchTab:(id)sender; - (IBAction)switchInput:(id)sender; -//additional methods +// Additional methods - (void)setConnection:(MCPConnection *)theConnection; // Import/export delegate notifications - (void)panelSelectionDidChange:(id)sender; -//last but not least -- (id)init; -- (void)dealloc; - @end diff --git a/Source/TableDump.m b/Source/TableDump.m index 3d742b6f..24f76a42 100644 --- a/Source/TableDump.m +++ b/Source/TableDump.m @@ -36,14 +36,15 @@ #import "SPArrayAdditions.h" #import "RegexKitLite.h" - @implementation TableDump -//IBAction methods -- (IBAction)reloadTables:(id)sender -/* - get the tables in db +#pragma mark - +#pragma mark IBAction methods + +/** + * Get the tables in db */ +- (IBAction)reloadTables:(id)sender { MCPResult *queryResult; int i; @@ -75,10 +76,10 @@ [exportMultipleXMLTableView reloadData]; } -- (IBAction)selectTables:(id)sender -/* - selects or deselects all tables +/** + * Selects or deselects all tables */ +- (IBAction)selectTables:(id)sender { NSEnumerator *enumerator; id theObject; @@ -99,7 +100,7 @@ [exportMultipleXMLTableView reloadData]; } -/* +/** * Common method for ending modal sessions */ - (IBAction)closeSheet:(id)sender @@ -108,7 +109,7 @@ } #pragma mark - -#pragma mark export methods +#pragma mark Export methods - (void)export { @@ -360,7 +361,7 @@ } #pragma mark - -#pragma mark import methods +#pragma mark Import methods - (void)importFile /* @@ -848,8 +849,7 @@ } #pragma mark - -#pragma mark format methods - +#pragma mark Format methods /* Dump the selected tables to a file handle in SQL format. @@ -2325,7 +2325,7 @@ } #pragma mark - -#pragma mark tableView datasource methods +#pragma mark Table view datasource methods - (int)numberOfRowsInTableView:(NSTableView *)aTableView; { @@ -2442,7 +2442,7 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn #pragma mark - -#pragma mark other +#pragma mark Other - (void)awakeFromNib { @@ -2493,6 +2493,7 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn return items; } +#pragma mark - #pragma mark New Export methods - (IBAction)switchTab:(id)sender diff --git a/Source/TableSource.h b/Source/TableSource.h index 5d32e334..539216aa 100644 --- a/Source/TableSource.h +++ b/Source/TableSource.h @@ -61,7 +61,6 @@ NSUserDefaults *prefs; } - //table methods - (void)loadTable:(NSString *)aTable; - (IBAction)reloadTable:(id)sender; diff --git a/Source/TablesList.h b/Source/TablesList.h index 250f451f..390e7ee7 100644 --- a/Source/TablesList.h +++ b/Source/TablesList.h @@ -36,13 +36,13 @@ enum sp_table_types SP_TABLETYPE_FUNC = 3 }; -@class CMMCResult, MCPConnection; - @interface NSObject (NSSplitView) + - (NSView *)collapsibleSubview; - (IBAction)toggleCollapse:(id)sender; - (BOOL)collapsibleSubviewIsCollapsed; - (void)setCollapsibleSubviewCollapsed:(BOOL)flag; + @end @interface TablesList : NSObject -- cgit v1.2.3