diff --git a/ChangeLog b/ChangeLog index 8f0c3c1..cdbe57c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,94 @@ +2008-12-30 Richard frith-Macdonald + + * PCMenuController.m: + * Framework/PCProjectManager.m: + * Framework/PCBundleManager.m: + * Framework/PCMakefileFactory.m: + * Framework/PCProject.m: + * Framework/PCProjectLauncherPanel.m: + * Framework/PCFileManager.m: + * Framework/PCButton.m: + * Framework/PCProjectBuilder.m: + * Framework/PCProjectLoadedFilesPanel.m: + * Framework/PCFileNameField.m: + * Framework/PCSplitView.m: + * Framework/PCProjectLauncher.m: + * Framework/PCAddFilesPanel.m: + * Framework/Resources/class.template: + * Framework/Resources/header.template: + * Framework/Resources/cfile.template: + * Framework/PCProjectBuilderPanel.m: + * Framework/PCFileCreator.m: + * PCAppController.m: + * PCFindController.m: + * ProjectCenter_main.m: + * Modules/Parsers/ProjectCenter/ObjCMethodHandler.h: + * Modules/Parsers/ProjectCenter/ObjCCommentHandler.h: + * Modules/Parsers/ProjectCenter/PCParser.h: + * Modules/Parsers/ProjectCenter/ObjCClassHandler.h: + * Modules/Parsers/ProjectCenter/ObjCMethodHandler.m: + * Modules/Parsers/ProjectCenter/ObjCCommentHandler.m: + * Modules/Parsers/ProjectCenter/CodeHandler.h: + * Modules/Debuggers/ProjectCenter/PCDebugger.m: + * Modules/Debuggers/ProjectCenter/PTYView.m: + * Modules/Debuggers/ProjectCenter/PCDebuggerView.h: + * Modules/Debuggers/ProjectCenter/PCDebugger.h: + * Modules/Debuggers/ProjectCenter/PCDebuggerView.m: + * Modules/Debuggers/ProjectCenter/PTYView.h: + * Modules/Projects/Application/PCAppProject.h: + * Modules/Projects/Application/PCAppProject+Inspector.h: + * Modules/Projects/Application/PCAppProject.m: + * Modules/Projects/Application/PCAppProject+Inspector.m: + * Modules/Projects/Application/Resources/AppController.m: + * Modules/Projects/Application/Resources/main.m: + * Modules/Projects/Application/Resources/AppController.h: + * Modules/Projects/ResourceSet/PCResourceSetProject.h: + * Modules/Projects/ResourceSet/PCResourceSetProject.m: + * Modules/Projects/Library/PCLibProject.h: + * Modules/Projects/Library/PCLibProject.m: + * Modules/Projects/Aggregate/PCAggregateProject.h: + * Modules/Projects/Aggregate/PCAggregateProject.m: + * Modules/Projects/Bundle/PCBundleProject.h: + * Modules/Projects/Bundle/PCBundleProject.m: + * Modules/Projects/Framework/PCFrameworkProject.m: + * Modules/Projects/Framework/PCFrameworkProject.h: + * Modules/Projects/Tool/PCToolProject.m: + * Modules/Projects/Tool/Resources/main.m: + * Modules/Projects/Tool/PCToolProject.h: + * Headers/PCMenuController.h: + * Headers/Protocols/CodeDebugger.h: + * Headers/Protocols/CodeEditor.h: + * Headers/Protocols/CodeParser.h: + * Headers/Protocols/ProjectType.h: + * Headers/ProjectCenter/PCProject.h: + * Headers/ProjectCenter/PCProjectLauncherPanel.h: + * Headers/ProjectCenter/PCProjectBrowser.h: + * Headers/ProjectCenter/PCFileManager.h: + * Headers/ProjectCenter/PCButton.h: + * Headers/ProjectCenter/PCProjectBuilder.h: + * Headers/ProjectCenter/PCDefines.h: + * Headers/ProjectCenter/PCProjectEditor.h: + * Headers/ProjectCenter/PCEditorManager.h: + * Headers/ProjectCenter/PCProjectLoadedFilesPanel.h: + * Headers/ProjectCenter/ProjectCenter.h: + * Headers/ProjectCenter/PCLogController.h: + * Headers/ProjectCenter/PCSplitView.h: + * Headers/ProjectCenter/PCProjectLauncher.h: + * Headers/ProjectCenter/PCAddFilesPanel.h: + * Headers/ProjectCenter/PCProjectBuilderPanel.h: + * Headers/ProjectCenter/PCProjectInspector.h: + * Headers/ProjectCenter/PCFileCreator.h: + * Headers/ProjectCenter/PCPrefController.h: + * Headers/ProjectCenter/PCProjectManager.h: + * Headers/ProjectCenter/PCProjectLoadedFiles.h: + * Headers/ProjectCenter/PCBundleManager.h: + * Headers/ProjectCenter/PCMakefileFactory.h: + * Headers/PCInfoController.h: + * Headers/PCAppController.h: + * PCInfoController.m: + Update to use #import rather than #include now that it is no longer + deprecated and is the officially preferred mechanism. + 2008-12-29 22:29-EST Gregory John Casamento * Modules/Debuggers/ProjectCenter/Resources/continue_button.png: diff --git a/Framework/PCAddFilesPanel.m b/Framework/PCAddFilesPanel.m index 8ed8b8f..cb0bac1 100644 --- a/Framework/PCAddFilesPanel.m +++ b/Framework/PCAddFilesPanel.m @@ -22,8 +22,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include +#import +#import static PCAddFilesPanel *addFilesPanel = nil; diff --git a/Framework/PCBundleManager.m b/Framework/PCBundleManager.m index 6419186..a30add5 100644 --- a/Framework/PCBundleManager.m +++ b/Framework/PCBundleManager.m @@ -31,10 +31,10 @@ // - GNUSTEP_SYSTEM_LIBRARY/Bundles/ProjectCenter // (NSApplicationSupportDirectory) -#include -#include +#import +#import -#include +#import @implementation PCBundleManager diff --git a/Framework/PCButton.m b/Framework/PCButton.m index e2d1697..cf1db44 100644 --- a/Framework/PCButton.m +++ b/Framework/PCButton.m @@ -22,11 +22,11 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include +#import +#import -#include -#include +#import +#import @implementation PCButton diff --git a/Framework/PCFileCreator.m b/Framework/PCFileCreator.m index 001a88c..c9d4e58 100644 --- a/Framework/PCFileCreator.m +++ b/Framework/PCFileCreator.m @@ -23,12 +23,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include -#include +#import +#import +#import +#import -#include +#import static PCFileCreator *_creator = nil; static NSDictionary *dict = nil; diff --git a/Framework/PCFileManager.m b/Framework/PCFileManager.m index e154ecc..7251838 100644 --- a/Framework/PCFileManager.m +++ b/Framework/PCFileManager.m @@ -23,15 +23,15 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import -#include +#import @implementation PCFileManager diff --git a/Framework/PCFileNameField.m b/Framework/PCFileNameField.m index dd0cec4..26b357d 100644 --- a/Framework/PCFileNameField.m +++ b/Framework/PCFileNameField.m @@ -22,9 +22,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import -#include +#import NSString *PCFileNameFieldNoFiles = @"No files selected"; diff --git a/Framework/PCMakefileFactory.m b/Framework/PCMakefileFactory.m index e140938..1edb0cd 100644 --- a/Framework/PCMakefileFactory.m +++ b/Framework/PCMakefileFactory.m @@ -23,9 +23,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include +#import +#import +#import #define COMMENT_HEADERS @"\n\n#\n# Header files\n#\n" #define COMMENT_RESOURCES @"\n\n#\n# Resource files\n#\n" diff --git a/Framework/PCProject.m b/Framework/PCProject.m index e3d0c44..25bb1b0 100644 --- a/Framework/PCProject.m +++ b/Framework/PCProject.m @@ -27,23 +27,23 @@ // TODO: Take care of Libraries(gnustep-gui, gnustep-base) // and Non Project Files -#include -#include -#include -#include +#import +#import +#import +#import -#include -#include -#include +#import +#import +#import -#include -#include -#include -#include +#import +#import +#import +#import -#include +#import -#include +#import NSString *PCProjectDictDidChangeNotification = @"PCProjectDictDidChangeNotification"; diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m index 3eeb2e9..14ab5e8 100644 --- a/Framework/PCProjectBuilder.m +++ b/Framework/PCProjectBuilder.m @@ -23,24 +23,24 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import -#include -#include -#include +#import +#import +#import -#include +#import -#include -#include -#include -#include +#import +#import +#import +#import -#include -#include +#import +#import -#include -#include +#import +#import #ifndef IMAGE #define IMAGE(X) [NSImage imageNamed: X] diff --git a/Framework/PCProjectBuilderPanel.m b/Framework/PCProjectBuilderPanel.m index 0bd0a67..c17d8ee 100644 --- a/Framework/PCProjectBuilderPanel.m +++ b/Framework/PCProjectBuilderPanel.m @@ -22,12 +22,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include -#include +#import +#import +#import +#import -#include +#import @implementation PCProjectBuilderPanel diff --git a/Framework/PCProjectLauncher.m b/Framework/PCProjectLauncher.m index 2b50bad..9a20424 100644 --- a/Framework/PCProjectLauncher.m +++ b/Framework/PCProjectLauncher.m @@ -23,15 +23,15 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import #ifndef NOTIFICATION_CENTER #define NOTIFICATION_CENTER [NSNotificationCenter defaultCenter] diff --git a/Framework/PCProjectLauncherPanel.m b/Framework/PCProjectLauncherPanel.m index 9582f03..3827260 100644 --- a/Framework/PCProjectLauncherPanel.m +++ b/Framework/PCProjectLauncherPanel.m @@ -22,12 +22,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include -#include +#import +#import +#import +#import -#include +#import @implementation PCProjectLauncherPanel diff --git a/Framework/PCProjectLoadedFilesPanel.m b/Framework/PCProjectLoadedFilesPanel.m index b245fb6..dfa167b 100644 --- a/Framework/PCProjectLoadedFilesPanel.m +++ b/Framework/PCProjectLoadedFilesPanel.m @@ -22,12 +22,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include -#include +#import +#import +#import +#import -#include +#import @implementation PCProjectLoadedFilesPanel diff --git a/Framework/PCProjectManager.m b/Framework/PCProjectManager.m index 2b0e069..244ba14 100644 --- a/Framework/PCProjectManager.m +++ b/Framework/PCProjectManager.m @@ -23,27 +23,27 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include +#import +#import +#import -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import -#include "Protocols/ProjectType.h" -#include "Protocols/CodeEditor.h" +#import "Protocols/ProjectType.h" +#import "Protocols/CodeEditor.h" NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange"; diff --git a/Framework/PCSplitView.m b/Framework/PCSplitView.m index 7710936..4637492 100644 --- a/Framework/PCSplitView.m +++ b/Framework/PCSplitView.m @@ -23,7 +23,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import @implementation PCSplitView diff --git a/Framework/Resources/cfile.template b/Framework/Resources/cfile.template index 8592f97..1b43842 100644 --- a/Framework/Resources/cfile.template +++ b/Framework/Resources/cfile.template @@ -22,4 +22,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include "$FILENAME$.h" +#import "$FILENAME$.h" diff --git a/Framework/Resources/class.template b/Framework/Resources/class.template index 5a4a5ff..a344639 100644 --- a/Framework/Resources/class.template +++ b/Framework/Resources/class.template @@ -22,7 +22,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include "$FILENAME$.h" +#import "$FILENAME$.h" @implementation $FILENAME$ diff --git a/Framework/Resources/header.template b/Framework/Resources/header.template index a9ff2b4..8e9b7ab 100644 --- a/Framework/Resources/header.template +++ b/Framework/Resources/header.template @@ -25,7 +25,7 @@ #ifndef _$UCFILENAME$_H_ #define _$UCFILENAME$_H_ -#include +#import @interface $FILENAME$ : NSObject { diff --git a/Headers/PCAppController.h b/Headers/PCAppController.h index 268d32c..1d49827 100644 --- a/Headers/PCAppController.h +++ b/Headers/PCAppController.h @@ -23,7 +23,7 @@ #ifndef _PCAPPCONTROLLER_H #define _PCAPPCONTROLLER_H -#include +#import @class PCProjectManager; @class PCFileManager; diff --git a/Headers/PCInfoController.h b/Headers/PCInfoController.h index 7747222..27dc8f0 100644 --- a/Headers/PCInfoController.h +++ b/Headers/PCInfoController.h @@ -23,7 +23,7 @@ #ifndef _PCINFOCONTROLLER_H #define _PCINFOCONTROLLER_H -#include +#import @interface PCInfoController : NSObject { diff --git a/Headers/PCMenuController.h b/Headers/PCMenuController.h index 0e6023a..214e1c2 100644 --- a/Headers/PCMenuController.h +++ b/Headers/PCMenuController.h @@ -23,7 +23,7 @@ #ifndef _PCMENUCONTROLLER_H #define _PCMENUCONTROLLER_H -#include +#import @class PCProjectManager; @class PCFileManager; diff --git a/Headers/ProjectCenter/PCAddFilesPanel.h b/Headers/ProjectCenter/PCAddFilesPanel.h index 47f96b6..347a5ae 100644 --- a/Headers/ProjectCenter/PCAddFilesPanel.h +++ b/Headers/ProjectCenter/PCAddFilesPanel.h @@ -25,8 +25,8 @@ #ifndef _PCAddFilesPanel_h_ #define _PCAddFilesPanel_h_ -//#include -#include +//#import +#import @interface PCAddFilesPanel : NSOpenPanel { diff --git a/Headers/ProjectCenter/PCBundleManager.h b/Headers/ProjectCenter/PCBundleManager.h index 43c85a6..489cfee 100644 --- a/Headers/ProjectCenter/PCBundleManager.h +++ b/Headers/ProjectCenter/PCBundleManager.h @@ -26,7 +26,7 @@ #ifndef _PCBundleManager_h_ #define _PCBundleManager_h_ -#include +#import @interface PCBundleManager : NSObject { diff --git a/Headers/ProjectCenter/PCButton.h b/Headers/ProjectCenter/PCButton.h index d9428ff..4ed1bb5 100644 --- a/Headers/ProjectCenter/PCButton.h +++ b/Headers/ProjectCenter/PCButton.h @@ -25,7 +25,7 @@ #ifndef _PCButton_h_ #define _PCButton_h_ -#include +#import /* * Button diff --git a/Headers/ProjectCenter/PCDefines.h b/Headers/ProjectCenter/PCDefines.h index 6d73cab..da4a605 100644 --- a/Headers/ProjectCenter/PCDefines.h +++ b/Headers/ProjectCenter/PCDefines.h @@ -141,7 +141,7 @@ typedef int PCProjInfoBits; // ==== Project keys //============================================================================= -#include +#import static NSString * const PCLastEditing = @"LAST_EDITING"; diff --git a/Headers/ProjectCenter/PCEditorManager.h b/Headers/ProjectCenter/PCEditorManager.h index c417cc2..174edea 100644 --- a/Headers/ProjectCenter/PCEditorManager.h +++ b/Headers/ProjectCenter/PCEditorManager.h @@ -26,10 +26,10 @@ #ifndef _PCEditorManager_h_ #define _PCEditorManager_h_ -#include +#import -#include -#include +#import +#import @class PCProjectManager; diff --git a/Headers/ProjectCenter/PCFileCreator.h b/Headers/ProjectCenter/PCFileCreator.h index 83e781e..f6e3ae5 100644 --- a/Headers/ProjectCenter/PCFileCreator.h +++ b/Headers/ProjectCenter/PCFileCreator.h @@ -26,7 +26,7 @@ #ifndef _PCFileCreator_h_ #define _PCFileCreator_h_ -#include +#import #define ProtocolFile @"Objective-C Protocol" #define ObjCClass @"Objective-C Class" diff --git a/Headers/ProjectCenter/PCFileManager.h b/Headers/ProjectCenter/PCFileManager.h index d9ca203..bd102bb 100644 --- a/Headers/ProjectCenter/PCFileManager.h +++ b/Headers/ProjectCenter/PCFileManager.h @@ -26,8 +26,8 @@ #ifndef _PCFileManager_h_ #define _PCFileManager_h_ -//#include -#include +//#import +#import @class PCProject; @class PCProjectManager; diff --git a/Headers/ProjectCenter/PCLogController.h b/Headers/ProjectCenter/PCLogController.h index 623433a..74ad14c 100644 --- a/Headers/ProjectCenter/PCLogController.h +++ b/Headers/ProjectCenter/PCLogController.h @@ -23,7 +23,7 @@ #ifndef _PCLOGCONTROLLER_H #define _PCLOGCONTROLLER_H -#include +#import #define INFO 0 #define STATUS 1 diff --git a/Headers/ProjectCenter/PCMakefileFactory.h b/Headers/ProjectCenter/PCMakefileFactory.h index bda3c77..ac747bd 100644 --- a/Headers/ProjectCenter/PCMakefileFactory.h +++ b/Headers/ProjectCenter/PCMakefileFactory.h @@ -26,7 +26,7 @@ #ifndef _PCMakefileFactory_h_ #define _PCMakefileFactory_h_ -#include +#import @class PCProject; diff --git a/Headers/ProjectCenter/PCPrefController.h b/Headers/ProjectCenter/PCPrefController.h index f645714..dea6639 100644 --- a/Headers/ProjectCenter/PCPrefController.h +++ b/Headers/ProjectCenter/PCPrefController.h @@ -23,7 +23,7 @@ #ifndef _PCPREFCONTROLLER_H #define _PCPREFCONTROLLER_H -#include +#import #define PCSavePeriodDidChangeNotification @"PCSavePeriodDidChangeNotification" #define PCPreferencesDidChangeNotification @"PCPreferencesDidChangeNotification" diff --git a/Headers/ProjectCenter/PCProject.h b/Headers/ProjectCenter/PCProject.h index 491d2cd..a0b9869 100644 --- a/Headers/ProjectCenter/PCProject.h +++ b/Headers/ProjectCenter/PCProject.h @@ -26,7 +26,7 @@ #ifndef _PCProject_h_ #define _PCProject_h_ -#include +#import @class PCProjectManager; @class PCProjectWindow; diff --git a/Headers/ProjectCenter/PCProjectBrowser.h b/Headers/ProjectCenter/PCProjectBrowser.h index a09c536..832fa64 100644 --- a/Headers/ProjectCenter/PCProjectBrowser.h +++ b/Headers/ProjectCenter/PCProjectBrowser.h @@ -26,7 +26,7 @@ #ifndef _PCProjectBrowser_h_ #define _PCProjectBrowser_h_ -#include +#import extern NSString *PCBrowserDidSetPathNotification; diff --git a/Headers/ProjectCenter/PCProjectBuilder.h b/Headers/ProjectCenter/PCProjectBuilder.h index e40e9ac..bb52037 100644 --- a/Headers/ProjectCenter/PCProjectBuilder.h +++ b/Headers/ProjectCenter/PCProjectBuilder.h @@ -26,7 +26,7 @@ #ifndef _PCProjectBuilder_h_ #define _PCProjectBuilder_h_ -#include +#import @class PCProject; @class PCButton; diff --git a/Headers/ProjectCenter/PCProjectBuilderPanel.h b/Headers/ProjectCenter/PCProjectBuilderPanel.h index 52e7d88..bf85628 100644 --- a/Headers/ProjectCenter/PCProjectBuilderPanel.h +++ b/Headers/ProjectCenter/PCProjectBuilderPanel.h @@ -25,7 +25,7 @@ #ifndef _PCProjectBuilderPanel_h_ #define _PCProjectBuilderPanel_h_ -#include +#import @class PCProjectManager; diff --git a/Headers/ProjectCenter/PCProjectEditor.h b/Headers/ProjectCenter/PCProjectEditor.h index 80c686a..fbe67ce 100644 --- a/Headers/ProjectCenter/PCProjectEditor.h +++ b/Headers/ProjectCenter/PCProjectEditor.h @@ -26,12 +26,12 @@ #ifndef _PCProjectEditor_h_ #define _PCProjectEditor_h_ -#include +#import -#include -#include +#import +#import -#include +#import @class PCProject; diff --git a/Headers/ProjectCenter/PCProjectInspector.h b/Headers/ProjectCenter/PCProjectInspector.h index 8d1026c..742d8a0 100644 --- a/Headers/ProjectCenter/PCProjectInspector.h +++ b/Headers/ProjectCenter/PCProjectInspector.h @@ -26,8 +26,8 @@ #ifndef _PCProjectInspector_h_ #define _PCProjectInspector_h_ -#include -#include +#import +#import @class PCProjectManager; @class PCProjectBrowser; diff --git a/Headers/ProjectCenter/PCProjectLauncher.h b/Headers/ProjectCenter/PCProjectLauncher.h index 934a318..2b8c741 100644 --- a/Headers/ProjectCenter/PCProjectLauncher.h +++ b/Headers/ProjectCenter/PCProjectLauncher.h @@ -26,8 +26,8 @@ #ifndef _PCProjectDebugger_h_ #define _PCProjectDebugger_h_ -#include -#include +#import +#import @class PCProject; @class PCButton; diff --git a/Headers/ProjectCenter/PCProjectLauncherPanel.h b/Headers/ProjectCenter/PCProjectLauncherPanel.h index 7fe54c3..0e01237 100644 --- a/Headers/ProjectCenter/PCProjectLauncherPanel.h +++ b/Headers/ProjectCenter/PCProjectLauncherPanel.h @@ -25,7 +25,7 @@ #ifndef _PCLaunchPanel_h_ #define _PCLaunchPanel_h_ -#include +#import @class PCProjectManager; diff --git a/Headers/ProjectCenter/PCProjectLoadedFiles.h b/Headers/ProjectCenter/PCProjectLoadedFiles.h index ccf63a6..1d0e53f 100644 --- a/Headers/ProjectCenter/PCProjectLoadedFiles.h +++ b/Headers/ProjectCenter/PCProjectLoadedFiles.h @@ -26,7 +26,7 @@ #ifndef _PCProjectLoadedFiles_h_ #define _PCProjectLoadedFiles_h_ -#include +#import @class PCProject; diff --git a/Headers/ProjectCenter/PCProjectLoadedFilesPanel.h b/Headers/ProjectCenter/PCProjectLoadedFilesPanel.h index b5cf987..9984850 100644 --- a/Headers/ProjectCenter/PCProjectLoadedFilesPanel.h +++ b/Headers/ProjectCenter/PCProjectLoadedFilesPanel.h @@ -25,7 +25,7 @@ #ifndef _PCLoadedFilesPanel_h_ #define _PCLoadedFilesPanel_h_ -#include +#import @class PCProjectManager; diff --git a/Headers/ProjectCenter/PCProjectManager.h b/Headers/ProjectCenter/PCProjectManager.h index c49f4c8..5bbd86a 100644 --- a/Headers/ProjectCenter/PCProjectManager.h +++ b/Headers/ProjectCenter/PCProjectManager.h @@ -26,7 +26,7 @@ #ifndef _PCProjectManager_h_ #define _PCProjectManager_h_ -#include +#import @class PCBundleManager; @class PCFileManager; diff --git a/Headers/ProjectCenter/PCSplitView.h b/Headers/ProjectCenter/PCSplitView.h index 8c37ba4..179b045 100644 --- a/Headers/ProjectCenter/PCSplitView.h +++ b/Headers/ProjectCenter/PCSplitView.h @@ -26,7 +26,7 @@ #ifndef _PCSplitView_h_ #define _PCSplitView_h_ -#include +#import @interface PCSplitView : NSSplitView { diff --git a/Headers/ProjectCenter/ProjectCenter.h b/Headers/ProjectCenter/ProjectCenter.h index 055b12f..4e78481 100644 --- a/Headers/ProjectCenter/ProjectCenter.h +++ b/Headers/ProjectCenter/ProjectCenter.h @@ -25,20 +25,20 @@ #ifndef _ProjectCenter_h_ #define _ProjectCenter_h_ -#include -#include -#include -#include +#import +#import +#import +#import -#include -#include -#include -#include -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import +#import +#import +#import +#import #endif diff --git a/Headers/Protocols/CodeDebugger.h b/Headers/Protocols/CodeDebugger.h index 482a1a8..79d282d 100644 --- a/Headers/Protocols/CodeDebugger.h +++ b/Headers/Protocols/CodeDebugger.h @@ -25,8 +25,8 @@ #ifndef _CodeDebugger_h_ #define _CodeDebugger_h_ -#include -#include +#import +#import @protocol CodeDebugger diff --git a/Headers/Protocols/CodeEditor.h b/Headers/Protocols/CodeEditor.h index 98266e0..2314354 100644 --- a/Headers/Protocols/CodeEditor.h +++ b/Headers/Protocols/CodeEditor.h @@ -25,8 +25,8 @@ #ifndef _CodeEditor_h_ #define _CodeEditor_h_ -#include -#include +#import +#import @protocol CodeEditor diff --git a/Headers/Protocols/CodeParser.h b/Headers/Protocols/CodeParser.h index 35f11d9..21e76c6 100644 --- a/Headers/Protocols/CodeParser.h +++ b/Headers/Protocols/CodeParser.h @@ -25,7 +25,7 @@ #ifndef _CodeParserProtocol_h_ #define _CodeParserProtocol_h_ -#include +#import @class PCEditor; diff --git a/Headers/Protocols/ProjectType.h b/Headers/Protocols/ProjectType.h index 0755b48..de371d8 100644 --- a/Headers/Protocols/ProjectType.h +++ b/Headers/Protocols/ProjectType.h @@ -31,7 +31,7 @@ and therefore PC remains open for future extensions! */ -#include +#import @class PCProject; diff --git a/Modules/Debuggers/ProjectCenter/PCDebugger.h b/Modules/Debuggers/ProjectCenter/PCDebugger.h index 1d583fc..99b5c49 100644 --- a/Modules/Debuggers/ProjectCenter/PCDebugger.h +++ b/Modules/Debuggers/ProjectCenter/PCDebugger.h @@ -20,7 +20,7 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include +#import #import #import diff --git a/Modules/Debuggers/ProjectCenter/PCDebugger.m b/Modules/Debuggers/ProjectCenter/PCDebugger.m index c7e284d..80b41aa 100644 --- a/Modules/Debuggers/ProjectCenter/PCDebugger.m +++ b/Modules/Debuggers/ProjectCenter/PCDebugger.m @@ -20,9 +20,9 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include "PCDebugger.h" -#include "PCDebuggerView.h" +#import +#import "PCDebugger.h" +#import "PCDebuggerView.h" #ifndef NOTIFICATION_CENTER #define NOTIFICATION_CENTER [NSNotificationCenter defaultCenter] diff --git a/Modules/Debuggers/ProjectCenter/PCDebuggerView.h b/Modules/Debuggers/ProjectCenter/PCDebuggerView.h index 93cb6cb..7ce9c23 100644 --- a/Modules/Debuggers/ProjectCenter/PCDebuggerView.h +++ b/Modules/Debuggers/ProjectCenter/PCDebuggerView.h @@ -20,7 +20,7 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "PTYView.h" +#import "PTYView.h" @class PCDebugger; @class NSString; diff --git a/Modules/Debuggers/ProjectCenter/PCDebuggerView.m b/Modules/Debuggers/ProjectCenter/PCDebuggerView.m index 89bc34c..e3a244e 100644 --- a/Modules/Debuggers/ProjectCenter/PCDebuggerView.m +++ b/Modules/Debuggers/ProjectCenter/PCDebuggerView.m @@ -20,14 +20,14 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "PCDebuggerView.h" -#include "PCDebugger.h" +#import "PCDebuggerView.h" +#import "PCDebugger.h" -#include -#include +#import +#import -#include -#include +#import +#import #ifndef NOTIFICATION_CENTER #define NOTIFICATION_CENTER [NSNotificationCenter defaultCenter] diff --git a/Modules/Debuggers/ProjectCenter/PTYView.h b/Modules/Debuggers/ProjectCenter/PTYView.h index 0f26b26..6e89130 100644 --- a/Modules/Debuggers/ProjectCenter/PTYView.h +++ b/Modules/Debuggers/ProjectCenter/PTYView.h @@ -20,8 +20,8 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include +#import +#import @interface PTYView : NSTextView { diff --git a/Modules/Debuggers/ProjectCenter/PTYView.m b/Modules/Debuggers/ProjectCenter/PTYView.m index d542edc..d1aee82 100644 --- a/Modules/Debuggers/ProjectCenter/PTYView.m +++ b/Modules/Debuggers/ProjectCenter/PTYView.m @@ -20,12 +20,12 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include +#import -#include -#include -#include -#include +#import +#import +#import +#import #ifndef NOTIFICATION_CENTER #define NOTIFICATION_CENTER [NSNotificationCenter defaultCenter] diff --git a/Modules/Parsers/ProjectCenter/CodeHandler.h b/Modules/Parsers/ProjectCenter/CodeHandler.h index 9e69c1c..26144fc 100644 --- a/Modules/Parsers/ProjectCenter/CodeHandler.h +++ b/Modules/Parsers/ProjectCenter/CodeHandler.h @@ -23,8 +23,8 @@ #ifndef _CodeHandler_H_ #define _CodeHandler_H_ -#include -#include +#import +#import typedef enum _CommentType { NoComment, diff --git a/Modules/Parsers/ProjectCenter/ObjCClassHandler.h b/Modules/Parsers/ProjectCenter/ObjCClassHandler.h index d7ae347..6c46880 100644 --- a/Modules/Parsers/ProjectCenter/ObjCClassHandler.h +++ b/Modules/Parsers/ProjectCenter/ObjCClassHandler.h @@ -23,9 +23,9 @@ #ifndef _ObjCClassHandler_H_ #define _ObjCClassHandler_H_ -#include "CodeHandler.h" +#import "CodeHandler.h" -#include "ObjCCommentHandler.h" +#import "ObjCCommentHandler.h" /** * ClassStart ClassSymbol ClassName ClassSuper ClassProto | ClassCategory diff --git a/Modules/Parsers/ProjectCenter/ObjCCommentHandler.h b/Modules/Parsers/ProjectCenter/ObjCCommentHandler.h index 35463d1..5f48a8b 100644 --- a/Modules/Parsers/ProjectCenter/ObjCCommentHandler.h +++ b/Modules/Parsers/ProjectCenter/ObjCCommentHandler.h @@ -25,8 +25,8 @@ #define EQUAL(str) ([element isEqualToString: str]) -#include -#include +#import +#import @class NSString; diff --git a/Modules/Parsers/ProjectCenter/ObjCCommentHandler.m b/Modules/Parsers/ProjectCenter/ObjCCommentHandler.m index 964fa56..05dc219 100644 --- a/Modules/Parsers/ProjectCenter/ObjCCommentHandler.m +++ b/Modules/Parsers/ProjectCenter/ObjCCommentHandler.m @@ -20,9 +20,9 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include +#import -#include "ObjCCommentHandler.h" +#import "ObjCCommentHandler.h" @implementation ObjCCommentHandler diff --git a/Modules/Parsers/ProjectCenter/ObjCMethodHandler.h b/Modules/Parsers/ProjectCenter/ObjCMethodHandler.h index e6176ad..238be7c 100644 --- a/Modules/Parsers/ProjectCenter/ObjCMethodHandler.h +++ b/Modules/Parsers/ProjectCenter/ObjCMethodHandler.h @@ -23,9 +23,9 @@ #ifndef _ObjCMethodHandler_H_ #define _ObjCMethodHandler_H_ -#include "CodeHandler.h" +#import "CodeHandler.h" -#include "ObjCCommentHandler.h" +#import "ObjCCommentHandler.h" /** * MethodStart MethodSymbol MethodReturnValue MethodName MethodEnd diff --git a/Modules/Parsers/ProjectCenter/ObjCMethodHandler.m b/Modules/Parsers/ProjectCenter/ObjCMethodHandler.m index d09fdbd..0faa1d1 100644 --- a/Modules/Parsers/ProjectCenter/ObjCMethodHandler.m +++ b/Modules/Parsers/ProjectCenter/ObjCMethodHandler.m @@ -20,9 +20,9 @@ ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include +#import -#include "ObjCMethodHandler.h" +#import "ObjCMethodHandler.h" @implementation ObjCMethodHandler diff --git a/Modules/Parsers/ProjectCenter/PCParser.h b/Modules/Parsers/ProjectCenter/PCParser.h index 7789539..eb9b17a 100644 --- a/Modules/Parsers/ProjectCenter/PCParser.h +++ b/Modules/Parsers/ProjectCenter/PCParser.h @@ -23,13 +23,13 @@ #ifndef _CodeParser_H_ #define _CodeParser_H_ -#include -#include +#import +#import -#include +#import -#include "CodeHandler.h" -#include "ObjCMethodHandler.h" +#import "CodeHandler.h" +#import "ObjCMethodHandler.h" @interface PCParser : NSObject { diff --git a/Modules/Projects/Aggregate/PCAggregateProject.h b/Modules/Projects/Aggregate/PCAggregateProject.h index cd11f5e..9c3e0b9 100644 --- a/Modules/Projects/Aggregate/PCAggregateProject.h +++ b/Modules/Projects/Aggregate/PCAggregateProject.h @@ -25,9 +25,9 @@ #ifndef _PCAggregateProject_h #define _PCAggregateProject_h -#include -#include -#include +#import +#import +#import @class PCMakefileFactory; diff --git a/Modules/Projects/Aggregate/PCAggregateProject.m b/Modules/Projects/Aggregate/PCAggregateProject.m index b462a37..7f2a48c 100644 --- a/Modules/Projects/Aggregate/PCAggregateProject.m +++ b/Modules/Projects/Aggregate/PCAggregateProject.m @@ -22,11 +22,11 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include +#import +#import +#import -#include "PCAggregateProject.h" +#import "PCAggregateProject.h" @implementation PCAggregateProject diff --git a/Modules/Projects/Application/PCAppProject+Inspector.h b/Modules/Projects/Application/PCAppProject+Inspector.h index 696a58b..072ff07 100644 --- a/Modules/Projects/Application/PCAppProject+Inspector.h +++ b/Modules/Projects/Application/PCAppProject+Inspector.h @@ -25,7 +25,7 @@ #ifndef _PCAppProject_Inspector_h_ #define _PCAppProject_Inspector_h_ -#include "PCAppProject.h" +#import "PCAppProject.h" @interface PCAppProject (Inspector) diff --git a/Modules/Projects/Application/PCAppProject+Inspector.m b/Modules/Projects/Application/PCAppProject+Inspector.m index 8f99c61..f6310b3 100644 --- a/Modules/Projects/Application/PCAppProject+Inspector.m +++ b/Modules/Projects/Application/PCAppProject+Inspector.m @@ -22,9 +22,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import -#include "PCAppProject+Inspector.h" +#import "PCAppProject+Inspector.h" // ---------------------------------------------------------------------------- // --- Customized text field diff --git a/Modules/Projects/Application/PCAppProject.h b/Modules/Projects/Application/PCAppProject.h index f7f2c2f..5a48dba 100644 --- a/Modules/Projects/Application/PCAppProject.h +++ b/Modules/Projects/Application/PCAppProject.h @@ -30,12 +30,12 @@ #ifndef _PCAppProject_h_ #define _PCAppProject_h_ -#include -#include -#include -#include +#import +#import +#import +#import -#include +#import @interface PCAppTextField : NSTextField { diff --git a/Modules/Projects/Application/PCAppProject.m b/Modules/Projects/Application/PCAppProject.m index f001f56..90a800c 100644 --- a/Modules/Projects/Application/PCAppProject.m +++ b/Modules/Projects/Application/PCAppProject.m @@ -23,13 +23,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include -#include +#import +#import +#import +#import -#include "PCAppProject.h" -#include "PCAppProject+Inspector.h" +#import "PCAppProject.h" +#import "PCAppProject+Inspector.h" @implementation PCAppProject diff --git a/Modules/Projects/Application/Resources/AppController.h b/Modules/Projects/Application/Resources/AppController.h index 3eca33b..0df500e 100644 --- a/Modules/Projects/Application/Resources/AppController.h +++ b/Modules/Projects/Application/Resources/AppController.h @@ -27,9 +27,9 @@ #ifndef _PCAPPPROJ_APPCONTROLLER_H #define _PCAPPPROJ_APPCONTROLLER_H -#include +#import // Uncomment if your application is Renaissance-based -//#include +//#import @interface AppController : NSObject { diff --git a/Modules/Projects/Application/Resources/AppController.m b/Modules/Projects/Application/Resources/AppController.m index 0486d84..02599b9 100644 --- a/Modules/Projects/Application/Resources/AppController.m +++ b/Modules/Projects/Application/Resources/AppController.m @@ -24,7 +24,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include "AppController.h" +#import "AppController.h" @implementation AppController diff --git a/Modules/Projects/Application/Resources/main.m b/Modules/Projects/Application/Resources/main.m index 24b700b..32fd18c 100644 --- a/Modules/Projects/Application/Resources/main.m +++ b/Modules/Projects/Application/Resources/main.m @@ -22,7 +22,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import int main(int argc, const char *argv[]) diff --git a/Modules/Projects/Bundle/PCBundleProject.h b/Modules/Projects/Bundle/PCBundleProject.h index 06a2bed..3e6a3aa 100644 --- a/Modules/Projects/Bundle/PCBundleProject.h +++ b/Modules/Projects/Bundle/PCBundleProject.h @@ -30,9 +30,9 @@ #ifndef _PCBundleProject_h #define _PCBundleProject_h -#include -#include -#include +#import +#import +#import @class PCMakefileFactory; diff --git a/Modules/Projects/Bundle/PCBundleProject.m b/Modules/Projects/Bundle/PCBundleProject.m index 939ed6a..6af903d 100644 --- a/Modules/Projects/Bundle/PCBundleProject.m +++ b/Modules/Projects/Bundle/PCBundleProject.m @@ -23,12 +23,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include -#include +#import +#import +#import +#import -#include "PCBundleProject.h" +#import "PCBundleProject.h" @implementation PCBundleProject diff --git a/Modules/Projects/Framework/PCFrameworkProject.h b/Modules/Projects/Framework/PCFrameworkProject.h index 2d5b95b..b554f40 100644 --- a/Modules/Projects/Framework/PCFrameworkProject.h +++ b/Modules/Projects/Framework/PCFrameworkProject.h @@ -30,9 +30,9 @@ #ifndef _PCFrameworkProject_h #define _PCFrameworkProject_h -#include -#include -#include +#import +#import +#import @class PCMakefileFactory; diff --git a/Modules/Projects/Framework/PCFrameworkProject.m b/Modules/Projects/Framework/PCFrameworkProject.m index 6f09758..a5caf36 100644 --- a/Modules/Projects/Framework/PCFrameworkProject.m +++ b/Modules/Projects/Framework/PCFrameworkProject.m @@ -22,13 +22,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include -#include -#include +#import +#import +#import +#import +#import -#include "PCFrameworkProject.h" +#import "PCFrameworkProject.h" @implementation PCFrameworkProject diff --git a/Modules/Projects/Library/PCLibProject.h b/Modules/Projects/Library/PCLibProject.h index 920988d..22af55a 100644 --- a/Modules/Projects/Library/PCLibProject.h +++ b/Modules/Projects/Library/PCLibProject.h @@ -26,10 +26,10 @@ #ifndef _PCLibProject_h #define _PCLibProject_h -#include -#include -#include -#include +#import +#import +#import +#import @class PCMakefileFactory; diff --git a/Modules/Projects/Library/PCLibProject.m b/Modules/Projects/Library/PCLibProject.m index 6e3627a..2489937 100644 --- a/Modules/Projects/Library/PCLibProject.m +++ b/Modules/Projects/Library/PCLibProject.m @@ -23,12 +23,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include -#include +#import +#import +#import +#import -#include "PCLibProject.h" +#import "PCLibProject.h" @implementation PCLibProject diff --git a/Modules/Projects/ResourceSet/PCResourceSetProject.h b/Modules/Projects/ResourceSet/PCResourceSetProject.h index 87f7793..71d531f 100644 --- a/Modules/Projects/ResourceSet/PCResourceSetProject.h +++ b/Modules/Projects/ResourceSet/PCResourceSetProject.h @@ -25,11 +25,11 @@ #ifndef _PCResourceSetProject_h #define _PCResourceSetProject_h -#include -#include -#include +#import +#import +#import -#include +#import @class PCMakefileFactory; diff --git a/Modules/Projects/ResourceSet/PCResourceSetProject.m b/Modules/Projects/ResourceSet/PCResourceSetProject.m index b94fe2f..5413f36 100644 --- a/Modules/Projects/ResourceSet/PCResourceSetProject.m +++ b/Modules/Projects/ResourceSet/PCResourceSetProject.m @@ -22,9 +22,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import -#include "PCResourceSetProject.h" +#import "PCResourceSetProject.h" @implementation PCResourceSetProject diff --git a/Modules/Projects/Tool/PCToolProject.h b/Modules/Projects/Tool/PCToolProject.h index cc772f5..83b3769 100644 --- a/Modules/Projects/Tool/PCToolProject.h +++ b/Modules/Projects/Tool/PCToolProject.h @@ -30,11 +30,11 @@ #ifndef _PCToolProject_h #define _PCToolProject_h -#include -#include -#include +#import +#import +#import -#include +#import @class PCMakefileFactory; diff --git a/Modules/Projects/Tool/PCToolProject.m b/Modules/Projects/Tool/PCToolProject.m index 474e18d..91c3778 100644 --- a/Modules/Projects/Tool/PCToolProject.m +++ b/Modules/Projects/Tool/PCToolProject.m @@ -23,11 +23,11 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include +#import +#import +#import -#include "PCToolProject.h" +#import "PCToolProject.h" @implementation PCToolProject diff --git a/Modules/Projects/Tool/Resources/main.m b/Modules/Projects/Tool/Resources/main.m index 06eaf80..45c5a3a 100644 --- a/Modules/Projects/Tool/Resources/main.m +++ b/Modules/Projects/Tool/Resources/main.m @@ -22,7 +22,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import int main(int argc, const char *argv[]) diff --git a/PCAppController.m b/PCAppController.m index 5acd6a2..1f49f84 100644 --- a/PCAppController.m +++ b/PCAppController.m @@ -19,15 +19,15 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include +#import +#import +#import -#include "PCAppController.h" -#include "PCMenuController.h" -#include "PCInfoController.h" +#import "PCAppController.h" +#import "PCMenuController.h" +#import "PCInfoController.h" -#include +#import @implementation PCAppController diff --git a/PCFindController.m b/PCFindController.m index 863f889..1517328 100644 --- a/PCFindController.m +++ b/PCFindController.m @@ -23,7 +23,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include "PCFindController.h" +#import "PCFindController.h" @implementation PCFindController diff --git a/PCInfoController.m b/PCInfoController.m index 5afc358..db6af4f 100644 --- a/PCInfoController.m +++ b/PCInfoController.m @@ -20,9 +20,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import -#include "PCInfoController.h" +#import "PCInfoController.h" @implementation PCInfoController diff --git a/PCMenuController.m b/PCMenuController.m index 5aeebf9..3084b14 100644 --- a/PCMenuController.m +++ b/PCMenuController.m @@ -19,15 +19,15 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include -#include -#include +#import +#import +#import -#include +#import -#include "PCAppController.h" -#include "PCMenuController.h" -#include "PCInfoController.h" +#import "PCAppController.h" +#import "PCMenuController.h" +#import "PCInfoController.h" #import "TextFinder.h" diff --git a/ProjectCenter_main.m b/ProjectCenter_main.m index 571065f..fe16b2c 100644 --- a/ProjectCenter_main.m +++ b/ProjectCenter_main.m @@ -20,7 +20,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. */ -#include +#import int main(int argc, const char **argv)