From 3c8046db92fea519d31a36c09904e1368cfec8b8 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Tue, 21 Jun 2011 00:16:15 +0000 Subject: - Rework a number of protocol defintions when refactoring to fix IB compilation warnings --- Interfaces/English.lproj/DBView.xib | 1158 ++++++++++++++++++++++++- Interfaces/English.lproj/FieldEditorSheet.xib | 723 ++++++++++++++- Source/SPContentFilterManager.h | 5 +- Source/SPCustomQuery.h | 5 +- Source/SPFieldEditorController.h | 5 +- Source/SPIndexesController.h | 5 +- Source/SPQueryFavoriteManager.h | 5 +- Source/SPTableContent.h | 5 +- Source/SPTableStructure.h | 5 +- 9 files changed, 1847 insertions(+), 69 deletions(-) diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 2c4f6761..20f7a9bd 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -2,10 +2,10 @@ 1050 - 10J567 + 10J869 851 1038.35 - 462.00 + 461.00 YES @@ -7488,8 +7488,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES YES - , - . + . + , NO YES NO @@ -10695,7 +10695,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA {600, 127} {260, 127} - + 256 YES @@ -10704,7 +10704,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 266 {{17, 93}, {225, 14}} - YES 67239488 @@ -10721,7 +10720,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 266 {{19, 67}, {220, 18}} - YES -1804468671 @@ -10739,7 +10737,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 289 {{150, 13}, {94, 28}} - 1 YES @@ -10763,7 +10760,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 292 {{14, 13}, {99, 28}} - YES 67239424 @@ -10785,7 +10781,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 266 {{18, 43}, {224, 18}} - YES 67239424 @@ -10805,8 +10800,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA {260, 127} - - {{0, 0}, {1680, 1028}} {260, 149} @@ -26977,6 +26970,395 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + YES + + YES + affectedRowsText + autohelpMenuItem + autoindentMenuItem + autopairMenuItem + autouppercaseKeywordsMenuItem + clearHistoryMenuItem + commentCurrentQueryMenuItem + commentLineOrSelectionMenuItem + completionListMenuItem + copyHistoryMenuItem + customQueryScrollView + customQueryView + editorFontMenuItem + encodingPopUp + errorText + errorTextScrollView + helpNavigator + helpSearchField + helpSearchFieldCell + helpTargetSelector + helpWebView + helpWebViewWindow + multipleLineEditingButton + nextHistoryMenuItem + previousHistoryMenuItem + queryFavoriteNameTextField + queryFavoritesButton + queryFavoritesSaveAllMenuItem + queryFavoritesSaveAsMenuItem + queryFavoritesSearchField + queryFavoritesSearchFieldView + queryFavoritesSearchMenuItem + queryFavoritesSheet + queryHistoryButton + queryHistorySearchField + queryHistorySearchFieldView + queryHistorySearchMenuItem + queryInfoButton + queryInfoPaneSplitView + runAllButton + runAllMenuItem + runSelectionButton + runSelectionMenuItem + saveHistoryMenuItem + saveQueryFavoriteButton + saveQueryFavoriteGlobal + shiftLeftMenuItem + shiftRightMenuItem + tableDocumentInstance + tablesListInstance + textView + valueSheet + valueTextField + + + YES + id + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSScrollView + SPCopyTable + NSMenuItem + NSPopUpButton + id + NSScrollView + NSSegmentedControl + NSSearchField + NSSearchFieldCell + NSSegmentedControl + WebView + NSWindow + id + NSMenuItem + NSMenuItem + NSTextField + id + NSMenuItem + NSMenuItem + NSSearchField + id + NSMenuItem + NSWindow + id + NSSearchField + id + NSMenuItem + NSButton + NSSplitView + id + NSMenuItem + id + NSMenuItem + NSMenuItem + NSButton + NSButton + NSMenuItem + NSMenuItem + id + id + SPTextView + id + id + + + + YES + + YES + affectedRowsText + autohelpMenuItem + autoindentMenuItem + autopairMenuItem + autouppercaseKeywordsMenuItem + clearHistoryMenuItem + commentCurrentQueryMenuItem + commentLineOrSelectionMenuItem + completionListMenuItem + copyHistoryMenuItem + customQueryScrollView + customQueryView + editorFontMenuItem + encodingPopUp + errorText + errorTextScrollView + helpNavigator + helpSearchField + helpSearchFieldCell + helpTargetSelector + helpWebView + helpWebViewWindow + multipleLineEditingButton + nextHistoryMenuItem + previousHistoryMenuItem + queryFavoriteNameTextField + queryFavoritesButton + queryFavoritesSaveAllMenuItem + queryFavoritesSaveAsMenuItem + queryFavoritesSearchField + queryFavoritesSearchFieldView + queryFavoritesSearchMenuItem + queryFavoritesSheet + queryHistoryButton + queryHistorySearchField + queryHistorySearchFieldView + queryHistorySearchMenuItem + queryInfoButton + queryInfoPaneSplitView + runAllButton + runAllMenuItem + runSelectionButton + runSelectionMenuItem + saveHistoryMenuItem + saveQueryFavoriteButton + saveQueryFavoriteGlobal + shiftLeftMenuItem + shiftRightMenuItem + tableDocumentInstance + tablesListInstance + textView + valueSheet + valueTextField + + + YES + + affectedRowsText + id + + + autohelpMenuItem + NSMenuItem + + + autoindentMenuItem + NSMenuItem + + + autopairMenuItem + NSMenuItem + + + autouppercaseKeywordsMenuItem + NSMenuItem + + + clearHistoryMenuItem + NSMenuItem + + + commentCurrentQueryMenuItem + NSMenuItem + + + commentLineOrSelectionMenuItem + NSMenuItem + + + completionListMenuItem + NSMenuItem + + + copyHistoryMenuItem + NSMenuItem + + + customQueryScrollView + NSScrollView + + + customQueryView + SPCopyTable + + + editorFontMenuItem + NSMenuItem + + + encodingPopUp + NSPopUpButton + + + errorText + id + + + errorTextScrollView + NSScrollView + + + helpNavigator + NSSegmentedControl + + + helpSearchField + NSSearchField + + + helpSearchFieldCell + NSSearchFieldCell + + + helpTargetSelector + NSSegmentedControl + + + helpWebView + WebView + + + helpWebViewWindow + NSWindow + + + multipleLineEditingButton + id + + + nextHistoryMenuItem + NSMenuItem + + + previousHistoryMenuItem + NSMenuItem + + + queryFavoriteNameTextField + NSTextField + + + queryFavoritesButton + id + + + queryFavoritesSaveAllMenuItem + NSMenuItem + + + queryFavoritesSaveAsMenuItem + NSMenuItem + + + queryFavoritesSearchField + NSSearchField + + + queryFavoritesSearchFieldView + id + + + queryFavoritesSearchMenuItem + NSMenuItem + + + queryFavoritesSheet + NSWindow + + + queryHistoryButton + id + + + queryHistorySearchField + NSSearchField + + + queryHistorySearchFieldView + id + + + queryHistorySearchMenuItem + NSMenuItem + + + queryInfoButton + NSButton + + + queryInfoPaneSplitView + NSSplitView + + + runAllButton + id + + + runAllMenuItem + NSMenuItem + + + runSelectionButton + id + + + runSelectionMenuItem + NSMenuItem + + + saveHistoryMenuItem + NSMenuItem + + + saveQueryFavoriteButton + NSButton + + + saveQueryFavoriteGlobal + NSButton + + + shiftLeftMenuItem + NSMenuItem + + + shiftRightMenuItem + NSMenuItem + + + tableDocumentInstance + id + + + tablesListInstance + id + + + textView + SPTextView + + + valueSheet + id + + + valueTextField + id + + + IBProjectSource Source/SPCustomQuery.h @@ -29233,35 +29615,214 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA - - IBProjectSource - Source/SPIndexesController.h - - - - SPProcessListController - NSWindowController - + YES YES - closeSheet: - copy: - killProcessConnection: - killProcessQuery: - refreshProcessList: - saveServerProcesses: - setAutoRefreshInterval: - setCustomAutoRefreshInterval: - toggeleShowFullProcessList: - toggleProcessListAutoRefresh: - toggleShowProcessID: + addIndexButton + addIndexedColumnButton + anchoredButtonBar + confirmAddIndexButton + dbDocument + indexAdvancedOptionsView + indexAdvancedOptionsViewButton + indexAdvancedOptionsViewLabelButton + indexKeyBlockSizeTextField + indexNameLabel + indexNameTextField + indexSizeTableColumn + indexStorageTypePopUpButton + indexTypeLabel + indexTypePopUpButton + indexedColumnsScrollView + indexedColumnsTableView + indexesTableView + removeIndexButton + removeIndexedColumnButton + tableData + tableStructure + tablesList YES - id - id - id + NSButton + NSButton + BWAnchoredButtonBar + NSButton + SPDatabaseDocument + NSView + NSButton + NSButton + NSTextField + NSTextField + NSTextField + NSTableColumn + NSPopUpButton + NSTextField + NSPopUpButton + NSScrollView + NSTableView + SPTableView + NSButton + NSButton + SPTableData + SPTableStructure + SPTablesList + + + + YES + + YES + addIndexButton + addIndexedColumnButton + anchoredButtonBar + confirmAddIndexButton + dbDocument + indexAdvancedOptionsView + indexAdvancedOptionsViewButton + indexAdvancedOptionsViewLabelButton + indexKeyBlockSizeTextField + indexNameLabel + indexNameTextField + indexSizeTableColumn + indexStorageTypePopUpButton + indexTypeLabel + indexTypePopUpButton + indexedColumnsScrollView + indexedColumnsTableView + indexesTableView + removeIndexButton + removeIndexedColumnButton + tableData + tableStructure + tablesList + + + YES + + addIndexButton + NSButton + + + addIndexedColumnButton + NSButton + + + anchoredButtonBar + BWAnchoredButtonBar + + + confirmAddIndexButton + NSButton + + + dbDocument + SPDatabaseDocument + + + indexAdvancedOptionsView + NSView + + + indexAdvancedOptionsViewButton + NSButton + + + indexAdvancedOptionsViewLabelButton + NSButton + + + indexKeyBlockSizeTextField + NSTextField + + + indexNameLabel + NSTextField + + + indexNameTextField + NSTextField + + + indexSizeTableColumn + NSTableColumn + + + indexStorageTypePopUpButton + NSPopUpButton + + + indexTypeLabel + NSTextField + + + indexTypePopUpButton + NSPopUpButton + + + indexedColumnsScrollView + NSScrollView + + + indexedColumnsTableView + NSTableView + + + indexesTableView + SPTableView + + + removeIndexButton + NSButton + + + removeIndexedColumnButton + NSButton + + + tableData + SPTableData + + + tableStructure + SPTableStructure + + + tablesList + SPTablesList + + + + + IBProjectSource + Source/SPIndexesController.h + + + + SPProcessListController + NSWindowController + + YES + + YES + closeSheet: + copy: + killProcessConnection: + killProcessQuery: + refreshProcessList: + saveServerProcesses: + setAutoRefreshInterval: + setCustomAutoRefreshInterval: + toggeleShowFullProcessList: + toggleProcessListAutoRefresh: + toggleShowProcessID: + + + YES + id + id + id id id id @@ -29839,6 +30400,318 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + YES + + YES + addButton + argumentField + betweenTextField + compareField + contentFilterManager + contentViewPane + copyButton + countText + fieldField + filterButton + filterTableClearButton + filterTableDistinctMenuItem + filterTableFilterButton + filterTableGearLookAllFields + filterTableLiveSearchCheckbox + filterTableNegateCheckbox + filterTableSetDefaultOperatorSheet + filterTableSetDefaultOperatorValue + filterTableView + filterTableWhereClause + filterTableWindow + firstBetweenField + limitRowsButton + limitRowsField + limitRowsStepper + multipleLineEditingButton + paginationButton + paginationNextButton + paginationPageField + paginationPageStepper + paginationPreviousButton + paginationView + reloadButton + removeButton + secondBetweenField + spHistoryControllerInstance + tableContentView + tableDataInstance + tableDocumentInstance + tableInfoInstance + tableSourceInstance + tablesListInstance + + + YES + id + id + id + id + id + NSView + id + id + NSPopUpButton + id + NSButton + NSMenuItem + NSButton + NSMenuItem + NSButton + NSButton + NSPanel + NSComboBox + SPCopyTable + SPTextView + NSPanel + id + id + id + id + id + NSButton + NSButton + NSTextField + NSStepper + NSButton + NSView + id + id + id + SPHistoryController + SPCopyTable + SPTableData + SPDatabaseDocument + SPTableInfo + id + id + + + + YES + + YES + addButton + argumentField + betweenTextField + compareField + contentFilterManager + contentViewPane + copyButton + countText + fieldField + filterButton + filterTableClearButton + filterTableDistinctMenuItem + filterTableFilterButton + filterTableGearLookAllFields + filterTableLiveSearchCheckbox + filterTableNegateCheckbox + filterTableSetDefaultOperatorSheet + filterTableSetDefaultOperatorValue + filterTableView + filterTableWhereClause + filterTableWindow + firstBetweenField + limitRowsButton + limitRowsField + limitRowsStepper + multipleLineEditingButton + paginationButton + paginationNextButton + paginationPageField + paginationPageStepper + paginationPreviousButton + paginationView + reloadButton + removeButton + secondBetweenField + spHistoryControllerInstance + tableContentView + tableDataInstance + tableDocumentInstance + tableInfoInstance + tableSourceInstance + tablesListInstance + + + YES + + addButton + id + + + argumentField + id + + + betweenTextField + id + + + compareField + id + + + contentFilterManager + id + + + contentViewPane + NSView + + + copyButton + id + + + countText + id + + + fieldField + NSPopUpButton + + + filterButton + id + + + filterTableClearButton + NSButton + + + filterTableDistinctMenuItem + NSMenuItem + + + filterTableFilterButton + NSButton + + + filterTableGearLookAllFields + NSMenuItem + + + filterTableLiveSearchCheckbox + NSButton + + + filterTableNegateCheckbox + NSButton + + + filterTableSetDefaultOperatorSheet + NSPanel + + + filterTableSetDefaultOperatorValue + NSComboBox + + + filterTableView + SPCopyTable + + + filterTableWhereClause + SPTextView + + + filterTableWindow + NSPanel + + + firstBetweenField + id + + + limitRowsButton + id + + + limitRowsField + id + + + limitRowsStepper + id + + + multipleLineEditingButton + id + + + paginationButton + NSButton + + + paginationNextButton + NSButton + + + paginationPageField + NSTextField + + + paginationPageStepper + NSStepper + + + paginationPreviousButton + NSButton + + + paginationView + NSView + + + reloadButton + id + + + removeButton + id + + + secondBetweenField + id + + + spHistoryControllerInstance + SPHistoryController + + + tableContentView + SPCopyTable + + + tableDataInstance + SPTableData + + + tableDocumentInstance + SPDatabaseDocument + + + tableInfoInstance + SPTableInfo + + + tableSourceInstance + id + + + tablesListInstance + id + + + IBProjectSource Source/SPTableContent.h @@ -30262,6 +31135,213 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + YES + + YES + addFieldButton + addIndexButton + chooseKeyButton + copyFieldButton + databaseDataInstance + editTableButton + encodingPopupCell + extendedTableInfoInstance + indexesController + indexesShowButton + indexesTableView + keySheet + refreshIndexesButton + reloadFieldsButton + removeFieldButton + removeIndexButton + resetAutoIncrementLine + resetAutoIncrementSheet + resetAutoIncrementValue + structureGrabber + tableDataInstance + tableDocumentInstance + tableInfoInstance + tableSourceView + tablesIndexesSplitView + tablesListInstance + viewColumnsMenu + + + YES + id + id + id + id + SPDatabaseData + id + NSPopUpButtonCell + id + SPIndexesController + NSButton + SPTableView + id + id + id + id + id + id + id + id + id + SPTableData + SPDatabaseDocument + id + SPTableView + NSSplitView + SPTablesList + id + + + + YES + + YES + addFieldButton + addIndexButton + chooseKeyButton + copyFieldButton + databaseDataInstance + editTableButton + encodingPopupCell + extendedTableInfoInstance + indexesController + indexesShowButton + indexesTableView + keySheet + refreshIndexesButton + reloadFieldsButton + removeFieldButton + removeIndexButton + resetAutoIncrementLine + resetAutoIncrementSheet + resetAutoIncrementValue + structureGrabber + tableDataInstance + tableDocumentInstance + tableInfoInstance + tableSourceView + tablesIndexesSplitView + tablesListInstance + viewColumnsMenu + + + YES + + addFieldButton + id + + + addIndexButton + id + + + chooseKeyButton + id + + + copyFieldButton + id + + + databaseDataInstance + SPDatabaseData + + + editTableButton + id + + + encodingPopupCell + NSPopUpButtonCell + + + extendedTableInfoInstance + id + + + indexesController + SPIndexesController + + + indexesShowButton + NSButton + + + indexesTableView + SPTableView + + + keySheet + id + + + refreshIndexesButton + id + + + reloadFieldsButton + id + + + removeFieldButton + id + + + removeIndexButton + id + + + resetAutoIncrementLine + id + + + resetAutoIncrementSheet + id + + + resetAutoIncrementValue + id + + + structureGrabber + id + + + tableDataInstance + SPTableData + + + tableDocumentInstance + SPDatabaseDocument + + + tableInfoInstance + id + + + tableSourceView + SPTableView + + + tablesIndexesSplitView + NSSplitView + + + tablesListInstance + SPTablesList + + + viewColumnsMenu + id + + + IBProjectSource Source/SPTableStructure.h @@ -31853,6 +32933,14 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA AppKit.framework/Headers/NSSplitView.h + + NSStepper + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSStepper.h + + NSTabView NSView diff --git a/Interfaces/English.lproj/FieldEditorSheet.xib b/Interfaces/English.lproj/FieldEditorSheet.xib index d909b674..cd2e4b51 100644 --- a/Interfaces/English.lproj/FieldEditorSheet.xib +++ b/Interfaces/English.lproj/FieldEditorSheet.xib @@ -2,18 +2,18 @@ 1050 - 10J567 + 10J869 851 1038.35 - 462.00 + 461.00 com.apple.InterfaceBuilder.CocoaPlugin 851 YES - - + + YES @@ -670,7 +670,7 @@ BIT Editor NSPanel - {411, 218} + {439, 218} {411, 218} @@ -2762,7 +2762,7 @@ {{0, 0}, {1920, 1058}} {411, 240} - {411, 240} + {439, 240} @@ -6978,13 +6978,13 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{905, 169}, {667, 428}} + {{374, 169}, {667, 428}} com.apple.InterfaceBuilder.CocoaPlugin - {{905, 169}, {667, 428}} + {{374, 169}, {667, 428}} - - {3.40282e+38, 3.40282e+38} + + {667, 428} {560, 200} com.apple.InterfaceBuilder.CocoaPlugin @@ -7525,15 +7525,15 @@ P4AAAL+AAABDyIAAwhAAAA - {{535, 705}, {439, 218}} + {{535, 638}, {439, 218}} com.apple.InterfaceBuilder.CocoaPlugin - {{535, 705}, {439, 218}} + {{535, 638}, {439, 218}} {196, 240} {{357, 418}, {480, 270}} - {411, 218} + {439, 218} {411, 218} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -8009,6 +8009,703 @@ + + YES + + YES + bitSheet + bitSheetBitButton0 + bitSheetBitButton1 + bitSheetBitButton10 + bitSheetBitButton11 + bitSheetBitButton12 + bitSheetBitButton13 + bitSheetBitButton14 + bitSheetBitButton15 + bitSheetBitButton16 + bitSheetBitButton17 + bitSheetBitButton18 + bitSheetBitButton19 + bitSheetBitButton2 + bitSheetBitButton20 + bitSheetBitButton21 + bitSheetBitButton22 + bitSheetBitButton23 + bitSheetBitButton24 + bitSheetBitButton25 + bitSheetBitButton26 + bitSheetBitButton27 + bitSheetBitButton28 + bitSheetBitButton29 + bitSheetBitButton3 + bitSheetBitButton30 + bitSheetBitButton31 + bitSheetBitButton32 + bitSheetBitButton33 + bitSheetBitButton34 + bitSheetBitButton35 + bitSheetBitButton36 + bitSheetBitButton37 + bitSheetBitButton38 + bitSheetBitButton39 + bitSheetBitButton4 + bitSheetBitButton40 + bitSheetBitButton41 + bitSheetBitButton42 + bitSheetBitButton43 + bitSheetBitButton44 + bitSheetBitButton45 + bitSheetBitButton46 + bitSheetBitButton47 + bitSheetBitButton48 + bitSheetBitButton49 + bitSheetBitButton5 + bitSheetBitButton50 + bitSheetBitButton51 + bitSheetBitButton52 + bitSheetBitButton53 + bitSheetBitButton54 + bitSheetBitButton55 + bitSheetBitButton56 + bitSheetBitButton57 + bitSheetBitButton58 + bitSheetBitButton59 + bitSheetBitButton6 + bitSheetBitButton60 + bitSheetBitButton61 + bitSheetBitButton62 + bitSheetBitButton63 + bitSheetBitButton7 + bitSheetBitButton8 + bitSheetBitButton9 + bitSheetBitLabel0 + bitSheetBitLabel16 + bitSheetBitLabel24 + bitSheetBitLabel32 + bitSheetBitLabel40 + bitSheetBitLabel48 + bitSheetBitLabel56 + bitSheetBitLabel8 + bitSheetCloseButton + bitSheetFieldName + bitSheetHexTextField + bitSheetIntegerTextField + bitSheetNULLButton + bitSheetOctalTextField + bitSheetOkButton + callerInstance + editImage + editSheet + editSheetCancelButton + editSheetFieldName + editSheetIsNotEditableCancelButton + editSheetOkButton + editSheetOpenButton + editSheetProgressBar + editSheetQuickLookButton + editSheetSegmentControl + editTextScrollView + editTextView + hexTextScrollView + hexTextView + sheetEditData + usedSheet + + + YES + id + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSButton + NSTextField + NSTextField + NSTextField + NSTextField + NSTextField + NSTextField + NSTextField + NSTextField + NSButton + NSTextField + NSTextField + NSTextField + NSButton + NSTextField + NSButton + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + bitSheet + bitSheetBitButton0 + bitSheetBitButton1 + bitSheetBitButton10 + bitSheetBitButton11 + bitSheetBitButton12 + bitSheetBitButton13 + bitSheetBitButton14 + bitSheetBitButton15 + bitSheetBitButton16 + bitSheetBitButton17 + bitSheetBitButton18 + bitSheetBitButton19 + bitSheetBitButton2 + bitSheetBitButton20 + bitSheetBitButton21 + bitSheetBitButton22 + bitSheetBitButton23 + bitSheetBitButton24 + bitSheetBitButton25 + bitSheetBitButton26 + bitSheetBitButton27 + bitSheetBitButton28 + bitSheetBitButton29 + bitSheetBitButton3 + bitSheetBitButton30 + bitSheetBitButton31 + bitSheetBitButton32 + bitSheetBitButton33 + bitSheetBitButton34 + bitSheetBitButton35 + bitSheetBitButton36 + bitSheetBitButton37 + bitSheetBitButton38 + bitSheetBitButton39 + bitSheetBitButton4 + bitSheetBitButton40 + bitSheetBitButton41 + bitSheetBitButton42 + bitSheetBitButton43 + bitSheetBitButton44 + bitSheetBitButton45 + bitSheetBitButton46 + bitSheetBitButton47 + bitSheetBitButton48 + bitSheetBitButton49 + bitSheetBitButton5 + bitSheetBitButton50 + bitSheetBitButton51 + bitSheetBitButton52 + bitSheetBitButton53 + bitSheetBitButton54 + bitSheetBitButton55 + bitSheetBitButton56 + bitSheetBitButton57 + bitSheetBitButton58 + bitSheetBitButton59 + bitSheetBitButton6 + bitSheetBitButton60 + bitSheetBitButton61 + bitSheetBitButton62 + bitSheetBitButton63 + bitSheetBitButton7 + bitSheetBitButton8 + bitSheetBitButton9 + bitSheetBitLabel0 + bitSheetBitLabel16 + bitSheetBitLabel24 + bitSheetBitLabel32 + bitSheetBitLabel40 + bitSheetBitLabel48 + bitSheetBitLabel56 + bitSheetBitLabel8 + bitSheetCloseButton + bitSheetFieldName + bitSheetHexTextField + bitSheetIntegerTextField + bitSheetNULLButton + bitSheetOctalTextField + bitSheetOkButton + callerInstance + editImage + editSheet + editSheetCancelButton + editSheetFieldName + editSheetIsNotEditableCancelButton + editSheetOkButton + editSheetOpenButton + editSheetProgressBar + editSheetQuickLookButton + editSheetSegmentControl + editTextScrollView + editTextView + hexTextScrollView + hexTextView + sheetEditData + usedSheet + + + YES + + bitSheet + id + + + bitSheetBitButton0 + NSButton + + + bitSheetBitButton1 + NSButton + + + bitSheetBitButton10 + NSButton + + + bitSheetBitButton11 + NSButton + + + bitSheetBitButton12 + NSButton + + + bitSheetBitButton13 + NSButton + + + bitSheetBitButton14 + NSButton + + + bitSheetBitButton15 + NSButton + + + bitSheetBitButton16 + NSButton + + + bitSheetBitButton17 + NSButton + + + bitSheetBitButton18 + NSButton + + + bitSheetBitButton19 + NSButton + + + bitSheetBitButton2 + NSButton + + + bitSheetBitButton20 + NSButton + + + bitSheetBitButton21 + NSButton + + + bitSheetBitButton22 + NSButton + + + bitSheetBitButton23 + NSButton + + + bitSheetBitButton24 + NSButton + + + bitSheetBitButton25 + NSButton + + + bitSheetBitButton26 + NSButton + + + bitSheetBitButton27 + NSButton + + + bitSheetBitButton28 + NSButton + + + bitSheetBitButton29 + NSButton + + + bitSheetBitButton3 + NSButton + + + bitSheetBitButton30 + NSButton + + + bitSheetBitButton31 + NSButton + + + bitSheetBitButton32 + NSButton + + + bitSheetBitButton33 + NSButton + + + bitSheetBitButton34 + NSButton + + + bitSheetBitButton35 + NSButton + + + bitSheetBitButton36 + NSButton + + + bitSheetBitButton37 + NSButton + + + bitSheetBitButton38 + NSButton + + + bitSheetBitButton39 + NSButton + + + bitSheetBitButton4 + NSButton + + + bitSheetBitButton40 + NSButton + + + bitSheetBitButton41 + NSButton + + + bitSheetBitButton42 + NSButton + + + bitSheetBitButton43 + NSButton + + + bitSheetBitButton44 + NSButton + + + bitSheetBitButton45 + NSButton + + + bitSheetBitButton46 + NSButton + + + bitSheetBitButton47 + NSButton + + + bitSheetBitButton48 + NSButton + + + bitSheetBitButton49 + NSButton + + + bitSheetBitButton5 + NSButton + + + bitSheetBitButton50 + NSButton + + + bitSheetBitButton51 + NSButton + + + bitSheetBitButton52 + NSButton + + + bitSheetBitButton53 + NSButton + + + bitSheetBitButton54 + NSButton + + + bitSheetBitButton55 + NSButton + + + bitSheetBitButton56 + NSButton + + + bitSheetBitButton57 + NSButton + + + bitSheetBitButton58 + NSButton + + + bitSheetBitButton59 + NSButton + + + bitSheetBitButton6 + NSButton + + + bitSheetBitButton60 + NSButton + + + bitSheetBitButton61 + NSButton + + + bitSheetBitButton62 + NSButton + + + bitSheetBitButton63 + NSButton + + + bitSheetBitButton7 + NSButton + + + bitSheetBitButton8 + NSButton + + + bitSheetBitButton9 + NSButton + + + bitSheetBitLabel0 + NSTextField + + + bitSheetBitLabel16 + NSTextField + + + bitSheetBitLabel24 + NSTextField + + + bitSheetBitLabel32 + NSTextField + + + bitSheetBitLabel40 + NSTextField + + + bitSheetBitLabel48 + NSTextField + + + bitSheetBitLabel56 + NSTextField + + + bitSheetBitLabel8 + NSTextField + + + bitSheetCloseButton + NSButton + + + bitSheetFieldName + NSTextField + + + bitSheetHexTextField + NSTextField + + + bitSheetIntegerTextField + NSTextField + + + bitSheetNULLButton + NSButton + + + bitSheetOctalTextField + NSTextField + + + bitSheetOkButton + NSButton + + + callerInstance + id + + + editImage + id + + + editSheet + id + + + editSheetCancelButton + id + + + editSheetFieldName + id + + + editSheetIsNotEditableCancelButton + id + + + editSheetOkButton + id + + + editSheetOpenButton + id + + + editSheetProgressBar + id + + + editSheetQuickLookButton + id + + + editSheetSegmentControl + id + + + editTextScrollView + id + + + editTextView + id + + + hexTextScrollView + id + + + hexTextView + id + + + sheetEditData + id + + + usedSheet + id + + + IBProjectSource Source/SPFieldEditorController.h diff --git a/Source/SPContentFilterManager.h b/Source/SPContentFilterManager.h index ec23afe6..dda8995c 100644 --- a/Source/SPContentFilterManager.h +++ b/Source/SPContentFilterManager.h @@ -31,10 +31,9 @@ @end -#ifndef SP_REFACTOR /* ivars */ @interface SPContentFilterManager : NSWindowController -#else -@interface SPContentFilterManager : NSWindowController +#ifdef SP_REFACTOR /* ivars */ + #endif { #ifndef SP_REFACTOR /* ivars */ diff --git a/Source/SPCustomQuery.h b/Source/SPCustomQuery.h index 16aaca14..8d289f70 100644 --- a/Source/SPCustomQuery.h +++ b/Source/SPCustomQuery.h @@ -52,10 +52,9 @@ @class SPCopyTable, SPQueryFavoriteManager, SPDataStorage, NSSplitView, SPFieldEditorController; #endif -#ifndef SP_REFACTOR @interface SPCustomQuery : NSObject -#else -@interface SPCustomQuery : NSObject +#ifdef SP_REFACTOR + #endif { IBOutlet id tableDocumentInstance; diff --git a/Source/SPFieldEditorController.h b/Source/SPFieldEditorController.h index e2cc3195..29d4c445 100644 --- a/Source/SPFieldEditorController.h +++ b/Source/SPFieldEditorController.h @@ -32,10 +32,9 @@ * This class offers a sheet for editing different kind of data such as text, blobs (including images) as * editSheet and bit fields as bitSheet. */ -#ifndef SP_REFACTOR @interface SPFieldEditorController : NSWindowController -#else -@interface SPFieldEditorController : NSWindowController +#ifdef SP_REFACTOR + #endif { IBOutlet id editSheetProgressBar; diff --git a/Source/SPIndexesController.h b/Source/SPIndexesController.h index 6b755bcc..b91481bc 100644 --- a/Source/SPIndexesController.h +++ b/Source/SPIndexesController.h @@ -29,10 +29,9 @@ @class SPDatabaseDocument, SPTablesList, SPTableData, SPTableStructure, MCPConnection, SPTableView; #endif -#ifndef SP_REFACTOR @interface SPIndexesController : NSWindowController -#else -@interface SPIndexesController : NSWindowController +#ifdef SP_REFACTOR + #endif { // Controllers diff --git a/Source/SPQueryFavoriteManager.h b/Source/SPQueryFavoriteManager.h index 0ebdc837..66d43778 100644 --- a/Source/SPQueryFavoriteManager.h +++ b/Source/SPQueryFavoriteManager.h @@ -31,10 +31,9 @@ @end -#ifndef SP_REFACTOR @interface SPQueryFavoriteManager : NSWindowController -#else -@interface SPQueryFavoriteManager : NSWindowController +#ifdef SP_REFACTOR + #endif { #ifndef SP_REFACTOR /* ivars */ diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h index 9220b21d..4b7def6f 100644 --- a/Source/SPTableContent.h +++ b/Source/SPTableContent.h @@ -31,10 +31,9 @@ @class SPTableData, SPDatabaseDocument, SPTablesList, SPTableStructure, SPTableList; -#ifndef SP_REFACTOR @interface SPTableContent : NSObject -#else -@interface SPTableContent : NSObject +#ifdef SP_REFACTOR + #endif { IBOutlet SPDatabaseDocument *tableDocumentInstance; diff --git a/Source/SPTableStructure.h b/Source/SPTableStructure.h index b8657273..9b09b847 100644 --- a/Source/SPTableStructure.h +++ b/Source/SPTableStructure.h @@ -27,10 +27,9 @@ @class SPDatabaseDocument, SPTableFieldValidation, SPTableData, SPDatabaseData, SPTablesList, SPIndexesController, SPTableView; -#ifndef SP_REFACTOR @interface SPTableStructure : NSObject -#else -@interface SPTableStructure : NSObject +#ifdef SP_REFACTOR + #endif { IBOutlet SPTablesList* tablesListInstance; -- cgit v1.2.3