aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <post@wickenrode.com>2015-10-10 05:54:30 +0200
committerMax <post@wickenrode.com>2015-10-10 05:54:30 +0200
commit44af78202545ec911de052c5eec361f2296afc28 (patch)
tree3cc3d154b99a63c34e1d724c7dca56c8b18a1ad4
parent01ef3ad33d260119ee61b949414f038be2c8d00e (diff)
downloadsequelpro-44af78202545ec911de052c5eec361f2296afc28.tar.gz
sequelpro-44af78202545ec911de052c5eec361f2296afc28.tar.bz2
sequelpro-44af78202545ec911de052c5eec361f2296afc28.zip
Rename a variable that was desperately trying to cause coding errors
-rw-r--r--Interfaces/English.lproj/ExportDialog.xib8
-rw-r--r--Source/SPExportController.h2
-rw-r--r--Source/SPExportFilenameUtilities.m4
3 files changed, 7 insertions, 7 deletions
diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib
index 3c3d6a2f..2f39243b 100644
--- a/Interfaces/English.lproj/ExportDialog.xib
+++ b/Interfaces/English.lproj/ExportDialog.xib
@@ -3309,7 +3309,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">exportCustomFilenameTokensField</string>
+ <string key="label">exportCustomFilenameTokenPool</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="844630128"/>
</object>
@@ -7351,7 +7351,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
<string key="exportCSVLinesTerminatedField">NSComboBox</string>
<string key="exportCSVNULLValuesAsTextField">NSTextField</string>
<string key="exportCustomFilenameTokenField">NSTokenField</string>
- <string key="exportCustomFilenameTokensField">NSTokenField</string>
+ <string key="exportCustomFilenameTokenPool">NSTokenField</string>
<string key="exportCustomFilenameView">NSView</string>
<string key="exportCustomFilenameViewButton">NSButton</string>
<string key="exportCustomFilenameViewLabelButton">NSButton</string>
@@ -7451,8 +7451,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
<string key="name">exportCustomFilenameTokenField</string>
<string key="candidateClassName">NSTokenField</string>
</object>
- <object class="IBToOneOutletInfo" key="exportCustomFilenameTokensField">
- <string key="name">exportCustomFilenameTokensField</string>
+ <object class="IBToOneOutletInfo" key="exportCustomFilenameTokenPool">
+ <string key="name">exportCustomFilenameTokenPool</string>
<string key="candidateClassName">NSTokenField</string>
</object>
<object class="IBToOneOutletInfo" key="exportCustomFilenameView">
diff --git a/Source/SPExportController.h b/Source/SPExportController.h
index 188642f4..bc706f46 100644
--- a/Source/SPExportController.h
+++ b/Source/SPExportController.h
@@ -92,7 +92,7 @@
IBOutlet NSButton *exportCustomFilenameViewLabelButton;
IBOutlet NSView *exportCustomFilenameView;
IBOutlet NSTokenField *exportCustomFilenameTokenField;
- IBOutlet NSTokenField *exportCustomFilenameTokensField;
+ IBOutlet NSTokenField *exportCustomFilenameTokenPool;
// SQL
IBOutlet NSButton *exportSQLIncludeStructureCheck;
diff --git a/Source/SPExportFilenameUtilities.m b/Source/SPExportFilenameUtilities.m
index a65b8e53..d8f1198f 100644
--- a/Source/SPExportFilenameUtilities.m
+++ b/Source/SPExportFilenameUtilities.m
@@ -121,7 +121,7 @@
}
}
- [exportCustomFilenameTokensField setStringValue:[exportTokens componentsJoinedByString:@","]];
+ [exportCustomFilenameTokenPool setStringValue:[exportTokens componentsJoinedByString:@","]];
}
/**
@@ -130,7 +130,7 @@
*/
- (id)tokenObjectForString:(NSString *)stringToTokenize
{
- if ([[exportCustomFilenameTokensField objectValue] containsObject:stringToTokenize]) {
+ if ([[exportCustomFilenameTokenPool objectValue] containsObject:stringToTokenize]) {
SPExportFileNameTokenObject *newToken = [[SPExportFileNameTokenObject alloc] init];
[newToken setTokenContent:stringToTokenize];