From 389b86985d977f81f840112249da5e3e278921e2 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sun, 1 Apr 2012 20:39:57 +0000 Subject: Tidy up. --- Resources/English.lproj/InfoPlist.strings | 4 +- Resources/German.lproj/Credits.rtf | 38 ++++++--- Resources/Plists/Info.plist | 2 +- Resources/ru.lproj/Credits.rtf | 30 +++++--- Source/DeepMutableCopy.h | 10 --- Source/MGTemplateEngine.m | 3 +- Source/SPExportInterfaceController.h | 7 ++ Source/SPLogger.m | 3 +- UnitTests/MCPKitTest.h | 46 ----------- UnitTests/MCPKitTest.m | 123 ------------------------------ sequel-pro.xcodeproj/project.pbxproj | 38 +++------ 11 files changed, 73 insertions(+), 231 deletions(-) delete mode 100644 Source/DeepMutableCopy.h delete mode 100644 UnitTests/MCPKitTest.h delete mode 100644 UnitTests/MCPKitTest.m diff --git a/Resources/English.lproj/InfoPlist.strings b/Resources/English.lproj/InfoPlist.strings index 697fd814..c2750ad4 100644 --- a/Resources/English.lproj/InfoPlist.strings +++ b/Resources/English.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ /* Localized versions of Info.plist keys */ -CFBundleGetInfoString = "Sequel Pro version 0.9.9.1, Copyright 2002-2011 Sequel Pro and CocoaMySQL team."; -NSHumanReadableCopyright = "Copyright 2002-2011 Sequel Pro and CocoaMySQL team."; \ No newline at end of file +CFBundleGetInfoString = "Sequel Pro version 0.9.9.1, Copyright 2002-2012 Sequel Pro and CocoaMySQL team."; +NSHumanReadableCopyright = "Copyright 2002-2012 Sequel Pro and CocoaMySQL team."; \ No newline at end of file diff --git a/Resources/German.lproj/Credits.rtf b/Resources/German.lproj/Credits.rtf index 450373d0..2144aef8 100755 --- a/Resources/German.lproj/Credits.rtf +++ b/Resources/German.lproj/Credits.rtf @@ -1,10 +1,13 @@ {\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} {\colortbl;\red255\green255\blue255;\red25\green25\blue25;\red0\green27\blue199;} -\vieww19540\viewh14660\viewkind0 +\vieww9000\viewh8400\viewkind0 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\f0\b\fs30 \cf2 Aktuelle Entwickler +\fs22 \ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural -\f0\b\fs22 \cf2 Aktuelle Entwickler \b0 \cf0 \ {\field{\*\fldinst{HYPERLINK "http://www.abhibeckert.com/"}}{\fldrslt Abhi Beckert}}\ {\field{\*\fldinst{HYPERLINK "http://mattlangtree.com.au/"}}{\fldrslt Matt Langtree}}\ @@ -24,10 +27,14 @@ Jim Knight\ \ \pard\pardeftab720\qc -\b \cf0 \'dcbersetzungen -\b0 \ +\b\fs30 \cf0 \'dcbersetzungen +\fs22 \ +\pard\pardeftab720\qc -\b Deutsch +\b0 \cf0 \ +\pard\pardeftab720\qc + +\b \cf0 Deutsch \b0 \ Max Lohrmann\ Mit Hilfe von\ @@ -49,9 +56,13 @@ Mit Hilfe von\ Lorenz Textor \ Jeff Skrysak\ \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural -\b Zus\'e4tzlicher Code -\b0 \ +\b\fs30 \cf0 Zus\'e4tzlicher Code +\fs22 \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b0 \cf0 \ Serge Cohen und\ Bertrand Mansion\ (SMySQL framework)\ @@ -76,8 +87,9 @@ Matt Gallagher\ (NSFileManagerAddition)\ Aaron Linville\ \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural -\b RegexKitLite +\b \cf0 RegexKitLite \b0 \ \pard\pardeftab720\qc \cf0 Copyright (c) 2008-2010\ @@ -134,13 +146,17 @@ Copyright (c) 2006-2010\ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural \b0 \cf0 Copyright \'a9 2006\ -{\field{\*\fldinst{HYPERLINK "http://sparkle.andymatuschak.org/"}}{\fldrslt Andy Matuschak}}\ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural +{\field{\*\fldinst{HYPERLINK "http://sparkle.andymatuschak.org/"}}{\fldrslt \cf0 Andy Matuschak}}\ Alle Rechte vorbehalten.\ \ \pard\pardeftab720\qc -\b \cf0 Grafiken -\b0 \ +\b\fs30 \cf0 Grafiken +\fs22 \ +\pard\pardeftab720\qc + +\b0 \cf0 \ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural \cf0 Icon von {\field{\*\fldinst{HYPERLINK "http://nadesign.net/"}}{\fldrslt Na Wong}} und {\field{\*\fldinst{HYPERLINK "http://www.benperry.com.au/"}}{\fldrslt Ben Perry}}\ GUI-Design vom {\field{\*\fldinst{HYPERLINK "http://www.sequelpro.com/"}}{\fldrslt Sequel Pro}}-Team.\ diff --git a/Resources/Plists/Info.plist b/Resources/Plists/Info.plist index a2fb1aed..0930e9ce 100644 --- a/Resources/Plists/Info.plist +++ b/Resources/Plists/Info.plist @@ -159,7 +159,7 @@ NSAppleScriptEnabled NSHumanReadableCopyright - Copyright 2002-2011 Sequel Pro and CocoaMySQL team. + Copyright 2002-2012 Sequel Pro and CocoaMySQL team. NSMainNibFile MainMenu NSPrincipalClass diff --git a/Resources/ru.lproj/Credits.rtf b/Resources/ru.lproj/Credits.rtf index 26d06081..fa432efb 100755 --- a/Resources/ru.lproj/Credits.rtf +++ b/Resources/ru.lproj/Credits.rtf @@ -1,10 +1,12 @@ -{\rtf1\ansi\ansicpg1251\cocoartf1038\cocoasubrtf360 +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fmodern\fcharset0 Courier;} {\colortbl;\red255\green255\blue255;\red25\green25\blue25;\red0\green27\blue199;} -\vieww8580\viewh12860\viewkind0 +\vieww9000\viewh8400\viewkind0 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural -\f0\b\fs22 \cf2 \uc0\u1056 \u1072 \u1079 \u1088 \u1072 \u1073 \u1086 \u1090 \u1095 \u1080 \u1082 \u1080 +\f0\b\fs30 \cf2 \uc0\u1056 \u1072 \u1079 \u1088 \u1072 \u1073 \u1086 \u1090 \u1095 \u1080 \u1082 \u1080 +\fs22 \cf2 \ + \b0 \cf0 \ {\field{\*\fldinst{HYPERLINK "http://www.abhibeckert.com/"}}{\fldrslt \uc0\u1040 \u1073 \u1093 \u1080 \u1041 \u1077 \u1082 \u1077 \u1088 \u1090 }} (Abhi Beckert)\ {\field{\*\fldinst{HYPERLINK "http://mattlangtree.com.au/"}}{\fldrslt \uc0\u1052 \u1101 \u1090 \u1051 \u1101 \u1085 \u1075 \u1090 \u1088 \u1080 }} (Matt Langtree)\ @@ -24,10 +26,14 @@ \ \pard\pardeftab720\qc -\b \cf0 \uc0\u1055 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076 \u1099 : -\b0 \ +\b\fs30 \cf0 \uc0\u1055 \u1077 \u1088 \u1077 \u1074 \u1086 \u1076 \u1099 : +\fs22 \ +\pard\pardeftab720\qc + +\b0 \cf0 \ +\pard\pardeftab720\qc -\b \uc0\u1053 \u1077 \u1084 \u1077 \u1094 \u1082 \u1080 \u1081 \u1103 \u1079 \u1099 \u1082 +\b \cf0 \uc0\u1053 \u1077 \u1084 \u1077 \u1094 \u1082 \u1080 \u1081 \u1103 \u1079 \u1099 \u1082 \b0 \ \uc0\u1052 \u1072 \u1082 \u1089 \u1051 \u1086 \u1088 \u1084 \u1072 \u1085 (Max Lohrmann)\ \uc0\u1087 \u1086 \u1084 \u1086 \u1075 \u1072 \u1083 \ @@ -49,8 +55,11 @@ \uc0\u1051 \u1086 \u1088 \u1077 \u1085 \u1089 \u1058 \u1077 \u1082 \u1089 \u1090 \u1086 \u1088 (Lorenz Textor) \ \uc0\u1044 \u1078 \u1077 \u1092 \u1057 \u1082 \u1088 \u1080 \u1089 \u1072 \u1082 (Jeff Skrysak)\ \ +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural + +\b\fs30 \cf2 \uc0\u1056 \u1072 \u1079 \u1088 \u1072 \u1073 \u1086 \u1090 \u1095 \u1080 \u1082 \u1080 \cf0 \uc0\u1076 \u1086 \u1087 \u1086 \u1083 \u1085 \u1077 \u1085 \u1080 \u1081 +\fs22 \ -\b \cf2 \uc0\u1056 \u1072 \u1079 \u1088 \u1072 \u1073 \u1086 \u1090 \u1095 \u1080 \u1082 \u1080 \cf0 \uc0\u1076 \u1086 \u1087 \u1086 \u1083 \u1085 \u1077 \u1085 \u1080 \u1081 \b0 \ \uc0\u1057 \u1077 \u1088 \u1078 \u1050 \u1086 \u1093 \u1077 \u1085 (Serge Cohen)\ \uc0\u1080 \u1041 \u1077 \u1088 \u1085 \u1072 \u1088 \u1076 \u1052 \u1101 \u1085 \u1096 \u1085 (Bertrand Mansion)\ @@ -161,8 +170,11 @@ Joachim M\'e5rtensson, Allan Odgaard\ \ \pard\pardeftab720\qc -\b \cf0 \uc0\u1054 \u1092 \u1086 \u1088 \u1084 \u1083 \u1077 \u1085 \u1080 \u1077 -\b0 \ +\b\fs30 \cf0 \uc0\u1054 \u1092 \u1086 \u1088 \u1084 \u1083 \u1077 \u1085 \u1080 \u1077 +\fs22 \ +\pard\pardeftab720\qc + +\b0 \cf0 \ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural \cf0 \uc0\u1048 \u1082 \u1086 \u1085 \u1082 \u1080 \u1085 \u1072 \u1088 \u1080 \u1089 \u1086 \u1074 \u1072 \u1085 \u1099 {\field{\*\fldinst{HYPERLINK "http://nadesign.net/"}}{\fldrslt \uc0\u1053 \u1072 \u1042 \u1086 \u1085 \u1075 \u1086 \u1084 }} (Na Wong)\ \uc0\u1080 {\field{\*\fldinst{HYPERLINK "http://www.benperry.com.au/"}}{\fldrslt \uc0\u1041 \u1101 \u1085 \u1086 \u1084 \u1055 \u1101 \u1088 \u1080 }} (Ben Perry)\ diff --git a/Source/DeepMutableCopy.h b/Source/DeepMutableCopy.h deleted file mode 100644 index a1c92e21..00000000 --- a/Source/DeepMutableCopy.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * DeepMutableCopy.h - * - * Created by Matt Gemmell on 02/05/2008. - * Copyright 2008 Instinctive Code. All rights reserved. - * - */ - -#import "NSArray_DeepMutableCopy.h" -#import "NSDictionary_DeepMutableCopy.h" diff --git a/Source/MGTemplateEngine.m b/Source/MGTemplateEngine.m index 1cf483f8..b735e939 100644 --- a/Source/MGTemplateEngine.m +++ b/Source/MGTemplateEngine.m @@ -8,7 +8,8 @@ #import "MGTemplateEngine.h" #import "MGTemplateStandardMarkers.h" #import "MGTemplateStandardFilters.h" -#import "DeepMutableCopy.h" +#import "NSArray_DeepMutableCopy.h" +#import "NSDictionary_DeepMutableCopy.h" #define DEFAULT_MARKER_START @"{%" diff --git a/Source/SPExportInterfaceController.h b/Source/SPExportInterfaceController.h index 8a4e5188..dfcf8448 100644 --- a/Source/SPExportInterfaceController.h +++ b/Source/SPExportInterfaceController.h @@ -32,6 +32,13 @@ #import "SPExportController.h" +/** + * @category SPExportInterfaceController SPExportInterfaceController.h + * + * @author Stuart Connolly http://stuconnolly.com/ + * + * Export interface category. + */ @interface SPExportController (SPExportInterfaceController) @end diff --git a/Source/SPLogger.m b/Source/SPLogger.m index 40bcaa69..8b808d39 100644 --- a/Source/SPLogger.m +++ b/Source/SPLogger.m @@ -33,10 +33,11 @@ static SPLogger *logger = nil; -@interface SPLogger (PrivateAPI) +@interface SPLogger () - (void)_initLogFile; - (void)_outputTimeString; + int _isSPLeaksLog(struct direct *entry); @end diff --git a/UnitTests/MCPKitTest.h b/UnitTests/MCPKitTest.h deleted file mode 100644 index 926780fa..00000000 --- a/UnitTests/MCPKitTest.h +++ /dev/null @@ -1,46 +0,0 @@ -// -// $Id$ -// -// MCPKitTest.h -// sequel-pro -// -// Created by J Knight on 17/05/09. -// Copyright 2009 J Knight. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at - -#import - -@class MCPConnection; - -/** - * @class MCPKitTest MCPKitTest.h - * - * MCPKit test case class. - * - * Note that this test case class uses the 'sakila' database to perform it's tests. It is available from: - * - * http://downloads.mysql.com/docs/sakila-db.zip - * - * You must also create a user called 'sp_tester' with no password and all permissions on the database 'sakila'. - */ -@interface MCPKitTest : SenTestCase -{ - MCPConnection *connection; -} - -@end diff --git a/UnitTests/MCPKitTest.m b/UnitTests/MCPKitTest.m deleted file mode 100644 index 559a1407..00000000 --- a/UnitTests/MCPKitTest.m +++ /dev/null @@ -1,123 +0,0 @@ -// -// $Id$ -// -// MCPKitTest.m -// sequel-pro -// -// Created by J Knight on 17/05/09. -// Copyright 2009 J Knight. All rights reserved. -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// More info at - -#import - -#import "MCPKitTest.h" - -static NSString *SPTestDatabaseHost = @"127.0.0.1"; -static NSString *SPTestDatabaseName = @"sakila"; -static NSString *SPTestDatabaseUser = @"sp_tester"; -static NSString *SPTestDatabasePassword = @""; - -static const NSInteger SPTestDatabasePort = 3306; - -@implementation MCPKitTest - -#pragma mark - -#pragma mark Setup & tear down - -/** - * Sets up the connection for use in the test cases. - */ -- (void)setUp -{ - connection = [[MCPConnection alloc] initToHost:SPTestDatabaseHost withLogin:SPTestDatabaseUser usingPort:SPTestDatabasePort]; - - [connection setPassword:SPTestDatabasePassword]; - - [connection setConnectionTimeout:10]; - [connection setUseKeepAlive:1]; - [connection setKeepAliveInterval:60]; - - [connection connect]; - - if (![connection isConnected]) { - [connection release], connection = nil; - - STFail(@"Error connecting to database server. No tests were run."); - } - else { - if (![connection selectDB:SPTestDatabaseName]) { - [connection release], connection = nil; - - STFail(@"Error selecting database '%@'. No tests were run.", SPTestDatabaseName); - } - } -} - -/** - * Disconnects the connection if connected. - */ -- (void)tearDown -{ - if (connection && [connection isConnected]) { - [connection disconnect]; - } - - [connection release], connection = nil; -} - -#pragma mark - -#pragma mark Tests - -/** - * Tests the connection's major version number. - */ -- (void)testServerMajorVersion -{ - if ((!connection) || (![connection isConnected])) return; - - STAssertTrue(([connection serverMajorVersion] != 0), @"server major version"); -} - -/** - * Tests the connection's version string. - */ -- (void)testServerVersionString -{ - if ((!connection) || (![connection isConnected])) return; - - STAssertTrue(([[connection serverVersionString] length] > 0), @"server version string"); -} - -/** - * Tests the connection query execution. - */ -- (void)testQueryExexution -{ - if ((!connection) || (![connection isConnected])) return; - - MCPResult *result = [connection queryString:@"SELECT * FROM actor"]; - - if ([connection queryErrored]) { - STFail(@"Query execution failed with error: %@", [connection getLastErrorMessage]); - } - else { - STAssertEquals([result numOfRows], (my_ulonglong)200, @"'actors' table count"); - } -} - -@end diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index fbb5a5c2..a1dcecb2 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -166,7 +166,6 @@ 29A1B7E50FD1293A000B88E8 /* SPPrintAccessory.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A1B7E40FD1293A000B88E8 /* SPPrintAccessory.m */; }; 29FA88231114619E00D1AF3D /* SPTableTriggers.m in Sources */ = {isa = PBXBuildFile; fileRef = 29FA88221114619E00D1AF3D /* SPTableTriggers.m */; }; 380F4EF50FC0B68F00B0BFD7 /* SPStringAdditionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 380F4EF40FC0B68F00B0BFD7 /* SPStringAdditionsTest.m */; }; - 380F4F250FC0C3D300B0BFD7 /* MCPKitTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 380F4F240FC0C3D300B0BFD7 /* MCPKitTest.m */; }; 384582C40FB95FF800DDACB6 /* func-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 384582C30FB95FF800DDACB6 /* func-small.png */; }; 384582C70FB9603600DDACB6 /* proc-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 384582C60FB9603600DDACB6 /* proc-small.png */; }; 387BBBA80FBCB6CB00B31746 /* SPTableRelations.m in Sources */ = {isa = PBXBuildFile; fileRef = 387BBBA70FBCB6CB00B31746 /* SPTableRelations.m */; }; @@ -846,7 +845,6 @@ 296DC8A70F909194002A3258 /* MGTemplateEngine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGTemplateEngine.m; sourceTree = ""; }; 296DC8A80F909194002A3258 /* MGTemplateEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGTemplateEngine.h; sourceTree = ""; }; 296DC8A90F909194002A3258 /* ICUTemplateMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICUTemplateMatcher.h; sourceTree = ""; }; - 296DC8AA0F909194002A3258 /* DeepMutableCopy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeepMutableCopy.h; sourceTree = ""; }; 296DC8AB0F909194002A3258 /* RegexKitLite.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegexKitLite.m; sourceTree = ""; }; 296DC8AC0F909194002A3258 /* ICUTemplateMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICUTemplateMatcher.m; sourceTree = ""; }; 296DC8AD0F909194002A3258 /* MGTemplateStandardMarkers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MGTemplateStandardMarkers.m; sourceTree = ""; }; @@ -869,8 +867,6 @@ 380F4ED90FC0B50500B0BFD7 /* Unit Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Unit Tests.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; 380F4EF30FC0B68F00B0BFD7 /* SPStringAdditionsTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPStringAdditionsTest.h; sourceTree = ""; }; 380F4EF40FC0B68F00B0BFD7 /* SPStringAdditionsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPStringAdditionsTest.m; sourceTree = ""; }; - 380F4F230FC0C3D300B0BFD7 /* MCPKitTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCPKitTest.h; sourceTree = ""; }; - 380F4F240FC0C3D300B0BFD7 /* MCPKitTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MCPKitTest.m; sourceTree = ""; }; 384582C30FB95FF800DDACB6 /* func-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "func-small.png"; sourceTree = ""; }; 384582C60FB9603600DDACB6 /* proc-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "proc-small.png"; sourceTree = ""; }; 387BBBA60FBCB6CB00B31746 /* SPTableRelations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableRelations.h; sourceTree = ""; }; @@ -1679,6 +1675,15 @@ path = Scripts; sourceTree = ""; }; + 177486451528EE820036121C /* RegexKitLite */ = { + isa = PBXGroup; + children = ( + 296DC8B00F909194002A3258 /* RegexKitLite.h */, + 296DC8AB0F909194002A3258 /* RegexKitLite.m */, + ); + name = RegexKitLite; + sourceTree = ""; + }; 1792C28910AE1C7200ABE758 /* Controller Categories */ = { isa = PBXGroup; children = ( @@ -1784,6 +1789,7 @@ 584192A0101E57BB0089807F /* NSMutableArray-MultipleSort.m */, 17DC8826126B22F200E9AAEC /* Views */, 58B909A111C3B8EC000826E5 /* Localization */, + 177486451528EE820036121C /* RegexKitLite */, 296DC8A40F90914B002A3258 /* MGTemplateEngine */, ); name = "Third Party"; @@ -1835,15 +1841,6 @@ name = "Text Views"; sourceTree = ""; }; - 17DC885B126B36CF00E9AAEC /* MCPKit */ = { - isa = PBXGroup; - children = ( - 380F4F230FC0C3D300B0BFD7 /* MCPKitTest.h */, - 380F4F240FC0C3D300B0BFD7 /* MCPKitTest.m */, - ); - name = MCPKit; - sourceTree = ""; - }; 17DC886A126B378A00E9AAEC /* Category Additions */ = { isa = PBXGroup; children = ( @@ -2210,14 +2207,6 @@ name = Model; sourceTree = ""; }; - 17FC366814141A4B00AC3602 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 17DC885B126B36CF00E9AAEC /* MCPKit */, - ); - name = Frameworks; - sourceTree = ""; - }; 17FC36AE141425D600AC3602 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -2260,9 +2249,6 @@ 296DC8A70F909194002A3258 /* MGTemplateEngine.m */, 296DC8A90F909194002A3258 /* ICUTemplateMatcher.h */, 296DC8AC0F909194002A3258 /* ICUTemplateMatcher.m */, - 296DC8AA0F909194002A3258 /* DeepMutableCopy.h */, - 296DC8B00F909194002A3258 /* RegexKitLite.h */, - 296DC8AB0F909194002A3258 /* RegexKitLite.m */, 296DC8AF0F909194002A3258 /* NSArray_DeepMutableCopy.h */, 296DC8AE0F909194002A3258 /* NSArray_DeepMutableCopy.m */, 296DC8B20F909194002A3258 /* NSDictionary_DeepMutableCopy.h */, @@ -2302,7 +2288,6 @@ 380F4EF20FC0B67A00B0BFD7 /* Unit Tests */ = { isa = PBXGroup; children = ( - 17FC366814141A4B00AC3602 /* Frameworks */, 1198F5B41174EDDE00670590 /* Database Actions */, 17DC886A126B378A00E9AAEC /* Category Additions */, ); @@ -2323,9 +2308,9 @@ 584754CC120A05660057631F /* QuickLook Plugin */ = { isa = PBXGroup; children = ( + 584754D2120A05910057631F /* main.c */, 584754D0120A05910057631F /* GeneratePreviewForURL.m */, 584754D1120A05910057631F /* GenerateThumbnailForURL.m */, - 584754D2120A05910057631F /* main.c */, ); name = "QuickLook Plugin"; sourceTree = ""; @@ -3023,7 +3008,6 @@ 115D63E3117CBC5900419057 /* SPDatabaseInfo.m in Sources */, 1198F7541174FFCF00670590 /* SPDatabaseCopy.m in Sources */, 380F4EF50FC0B68F00B0BFD7 /* SPStringAdditionsTest.m in Sources */, - 380F4F250FC0C3D300B0BFD7 /* MCPKitTest.m in Sources */, 1760599F1336199D0098E162 /* SPMenuAdditionsTests.m in Sources */, 176059B713361D380098E162 /* SPDatabaseRenameTest.m in Sources */, 176059B813361D380098E162 /* SPDatabaseInfoTest.m in Sources */, -- cgit v1.2.3