9 files changed, 19 insertions, 20 deletions
diff --git a/Source/CustomQuery.h b/Source/CustomQuery.h
index 829083fe..f4299db0 100644
--- a/Source/CustomQuery.h
+++ b/Source/CustomQuery.h
@@ -28,7 +28,7 @@
 #import <WebKit/WebKit.h>
 
 #import "CMCopyTable.h"
-#import "CMTextView.h"
+#import "SPTextView.h"
 #import "RegexKitLite.h"
 
 #define SP_HELP_TOC_SEARCH_STRING @"contents"
@@ -75,7 +75,7 @@
 	IBOutlet NSMenuItem *copyHistoryMenuItem;
 	IBOutlet NSPopUpButton *encodingPopUp;
 	
-	IBOutlet CMTextView *textView;
+	IBOutlet SPTextView *textView;
 	IBOutlet CMCopyTable *customQueryView;
 	IBOutlet NSScrollView *customQueryScrollView;
 	IBOutlet id errorText;
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
index ac9bef86..de2564b1 100644
--- a/Source/SPContentFilterManager.m
+++ b/Source/SPContentFilterManager.m
@@ -208,7 +208,7 @@
 }
 
 /**
- * This method is only implemented to be compatible with CMTextView.
+ * This method is only implemented to be compatible with SPTextView.
  */
 - (id)customQueryInstance
 {
diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h
index f6187d48..266986f4 100644
--- a/Source/SPFieldMapperController.h
+++ b/Source/SPFieldMapperController.h
@@ -25,7 +25,7 @@
 #import <Cocoa/Cocoa.h>
 #import <MCPKit/MCPKit.h>
 
-@class CMTextView;
+@class SPTextView;
 
 @interface SPFieldMapperController : NSWindowController 
 {
@@ -64,7 +64,7 @@
 	IBOutlet id lowPriorityUpdateCheckBox;
 	IBOutlet id highPriorityCheckBox;
 	IBOutlet id skipexistingRowsCheckBox;
-	IBOutlet CMTextView *onupdateTextView;
+	IBOutlet SPTextView *onupdateTextView;
 
 	IBOutlet id advancedButton;
 
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index 0a51e20f..8ba0ebbb 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -30,7 +30,7 @@
 #import "SPStringAdditions.h"
 #import "SPConstants.h"
 #import "SPNotLoaded.h"
-#import "CMTextView.h"
+#import "SPTextView.h"
 
 @implementation SPFieldMapperController
 
diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m
index 668e01c1..eaa3c43c 100644
--- a/Source/SPNarrowDownCompletion.m
+++ b/Source/SPNarrowDownCompletion.m
@@ -36,7 +36,7 @@
 #import "SPConstants.h"
 #import "SPQueryController.h"
 #import "RegexKitLite.h"
-#import "CMTextView.h"
+#import "SPTextView.h"
 #import "SPConstants.h"
 
 
diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h
index c3b93ab5..e62244ef 100644
--- a/Source/SPQueryFavoriteManager.h
+++ b/Source/SPQueryFavoriteManager.h
@@ -25,7 +25,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class BWAnchoredButtonBar, CMTextView, TableDocument;
+@class BWAnchoredButtonBar, SPTextView, TableDocument;
 
 @interface NSObject (SPQueryFavoriteManagerDelegate)
 
@@ -43,7 +43,7 @@
 	IBOutlet NSTableView *favoritesTableView;
 	IBOutlet NSTextField *favoriteNameTextField;
 	IBOutlet NSTextField *favoriteTabTriggerTextField;
-	IBOutlet CMTextView  *favoriteQueryTextView;
+	IBOutlet SPTextView  *favoriteQueryTextView;
 	IBOutlet NSButton *removeButton;
 	IBOutlet BWAnchoredButtonBar *splitViewButtonBar;
 
diff --git a/Source/SPQueryFavoriteManager.m b/Source/SPQueryFavoriteManager.m
index 40648f91..3840bd1e 100644
--- a/Source/SPQueryFavoriteManager.m
+++ b/Source/SPQueryFavoriteManager.m
@@ -30,7 +30,7 @@
 #import "SPConstants.h"
 #import "SPConnectionController.h"
 #import "RegexKitLite.h"
-#import "CMTextView.h"
+#import "SPTextView.h"
 
 #define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"[multiple selection]")
 #define SP_NO_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[no selection]", @"[no selection]")
@@ -178,7 +178,7 @@
 }
 
 /**
- * This method is only implemented to be compatible with CMTextView.
+ * This method is only implemented to be compatible with SPTextView.
  */
 - (id)customQueryInstance
 {
diff --git a/Source/CMTextView.h b/Source/SPTextView.h
index 51f2153d..2964845a 100644
--- a/Source/CMTextView.h
+++ b/Source/SPTextView.h
@@ -1,7 +1,7 @@
 //
-//  $Id$
+//  $Id: CMTextView.h 2240 2010-05-23 21:44:59Z rowanb $
 //
-//  CMTextView.h
+//  SPTextView.h
 //  sequel-pro
 //
 //  Created by Carsten Blüm.
@@ -27,13 +27,12 @@
 
 #import "NoodleLineNumberView.h"
 #import "CMCopyTable.h"
-#import "CMTextView.h"
 
 #define SP_TEXT_SIZE_TRIGGER_FOR_PARTLY_PARSING 10000
 
 @class SPNarrowDownCompletion, TableDocument, TablesList, CustomQuery;
 
-@interface CMTextView : NSTextView 
+@interface SPTextView : NSTextView 
 {
 	IBOutlet TableDocument *tableDocumentInstance;
 	IBOutlet TablesList *tablesListInstance;
diff --git a/Source/CMTextView.m b/Source/SPTextView.m
index 55c759a0..5a096b93 100644
--- a/Source/CMTextView.m
+++ b/Source/SPTextView.m
@@ -1,7 +1,7 @@
 //
 //  $Id$
 //
-//  CMTextView.m
+//  SPTextView.m
 //  sequel-pro
 //
 //  Created by Carsten Blüm.
@@ -22,7 +22,7 @@
 //
 //  More info at <http://code.google.com/p/sequel-pro/>
 
-#import "CMTextView.h"
+#import "SPTextView.h"
 #import "CustomQuery.h"
 #import "TableDocument.h"
 #import "SPStringAdditions.h"
@@ -86,7 +86,7 @@ static inline CGFloat SPRectRight(NSRect rectangle) { return rectangle.origin.x+
 static inline CGFloat SPPointDistance(NSPoint a, NSPoint b) { return sqrt( (a.x-b.x)*(a.x-b.x) + (a.y-b.y)*(a.y-b.y) ); }
 static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NSMakePoint(a.x*(1.-t) + b.x*t, a.y*(1.-t) + b.y*t); }
 
-@implementation CMTextView
+@implementation SPTextView
 
 @synthesize queryHiliteColor;
 @synthesize queryEditorBackgroundColor;
@@ -802,7 +802,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
 
 
 /*
- * Returns the associated line number for a character position inside of the CMTextView
+ * Returns the associated line number for a character position inside of the SPTextView
  */
 - (NSUInteger) getLineNumberForCharacterIndex:(NSUInteger)anIndex
 {
@@ -2028,7 +2028,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
 		return;
 	}
 
-	// Check for {SHIFT}TAB to try to insert query favorite via TAB trigger if CMTextView belongs to CustomQuery
+	// Check for {SHIFT}TAB to try to insert query favorite via TAB trigger if SPTextView belongs to CustomQuery
 	if ([theEvent keyCode] == 48 && [self isEditable] && [[self delegate] isKindOfClass:[CustomQuery class]]){
 		NSRange targetRange = [self getRangeForCurrentWord];
 		NSString *tabTrigger = [[self string] substringWithRange:targetRange];