#import fix

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@16503 72102866-910b-0410-8b05-ffd578937521
2025-02-20 18:32:17 +00:00 · 2003-04-21 14:53:10 +00:00 · 2003-04-21 14:53:10 +00:00 · cbda1249f8
commit cbda1249f8
parent de8c1ba781
32 changed files with 144 additions and 71 deletions
--- a/PCBundleProj/ChangeLog
+++ b/PCBundleProj/ChangeLog
@ -1,3 +1,9 @@
+2003-04-21 Serg Stoyan <stoyan@hologr.com>
+
+	* GNUmakefile: Set BUNDLE_INSTALL_DIR to GNUSTEP_SYSTEM_ROOT.
+
+	* .h, .m: Replace #import with #include and add #ifndefs.
+
 2002-11-27 15:45  probert

        * Mac OS X port using Cocoa
--- a/PCBundleProj/GNUmakefile
+++ b/PCBundleProj/GNUmakefile
@ -21,11 +21,11 @@ include $(GNUSTEP_MAKEFILES)/common.make
 # Bundle
 #

-PACKAGE_NAME=PCBundleProj
-BUNDLE_NAME=PCBundleProj
-BUNDLE_EXTENSION=.bundle
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter
-PCBundleProj_PRINCIPAL_CLASS=PCBundleProj
+PACKAGE_NAME = PCBundleProj
+BUNDLE_NAME = PCBundleProj
+BUNDLE_EXTENSION = .bundle
+BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/ProjectCenter
+PCBundleProj_PRINCIPAL_CLASS = PCBundleProj


 #
--- a/PCBundleProj/PCBundleProj.h
+++ b/PCBundleProj/PCBundleProj.h
@ -24,8 +24,11 @@
   $Id$
 */

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/ProjectCenter.h>
+#ifndef _PCBUNDLEPROJ_H
+#define _PCBUNDLEPROJ_H
+
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/ProjectCenter.h>

@interface PCBundleProj : NSObject <ProjectType>
 {
@ -47,3 +50,4 @@

@end

+#endif
--- a/PCBundleProj/PCBundleProj.m
+++ b/PCBundleProj/PCBundleProj.m
@ -31,8 +31,8 @@

 */

-#import "PCBundleProj.h"
-#import "PCBundleProject.h"
+#include "PCBundleProj.h"
+#include "PCBundleProject.h"

@implementation PCBundleProj

--- a/PCBundleProj/PCBundleProject.h
+++ b/PCBundleProj/PCBundleProject.h
@ -32,9 +32,12 @@
 get copied to the right place.

 */
+ 
+#ifndef _PCBUNDLEPROJECT_H
+#define _PCBUNDLEPROJECT_H

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/PCProject.h>
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/PCProject.h>

@interface PCBundleProject : PCProject
 {
@ -68,3 +71,4 @@

@end

+#endif
--- a/PCBundleProj/PCBundleProject.m
+++ b/PCBundleProj/PCBundleProject.m
@ -24,12 +24,12 @@
   $Id$
 */

-#import "PCBundleProject.h"
-#import "PCBundleProj.h"
+#include "PCBundleProject.h"
+#include "PCBundleProj.h"

-#import <ProjectCenter/PCMakefileFactory.h>
+#include <ProjectCenter/PCMakefileFactory.h>

-#import <ProjectCenter/ProjectCenter.h>
+#include <ProjectCenter/ProjectCenter.h>

 //#define BUNDLE_INSTALL @"$(GNUSTEP_LOCAL_ROOT)/Library/Bundles/"
 #define BUNDLE_INSTALL @"$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/"
--- a/PCGormProj/ChangeLog
+++ b/PCGormProj/ChangeLog
@ -1,3 +1,9 @@
+2003-04-21 Serg Stoyan <stoyan@hologr.com>
+
+	* GNUmakefile: Set BUNDLE_INSTALL_DIR to GNUSTEP_SYSTEM_ROOT.
+
+	* .h, .m: Replace #import with #include and add #ifndefs.
+
 2002-11-27 15:45  probert

        * Mac OS X port using Cocoa
--- a/PCGormProj/GNUmakefile
+++ b/PCGormProj/GNUmakefile
@ -21,11 +21,11 @@ include $(GNUSTEP_MAKEFILES)/common.make
 # Bundle
 #

-PACKAGE_NAME=PCGormProj
-BUNDLE_NAME=PCGormProj
-BUNDLE_EXTENSION=.bundle
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter
-PCGormProj_PRINCIPAL_CLASS=PCGormProj
+PACKAGE_NAME = PCGormProj
+BUNDLE_NAME = PCGormProj
+BUNDLE_EXTENSION = .bundle
+BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/ProjectCenter
+PCGormProj_PRINCIPAL_CLASS = PCGormProj


 #
--- a/PCGormProj/PCGormProj.h
+++ b/PCGormProj/PCGormProj.h
@ -22,8 +22,11 @@
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/ProjectCenter.h>
+#ifndef _PCGORMPROJ_H
+#define _PCGORMPROJ_H
+
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/ProjectCenter.h>

@interface PCGormProj : NSObject <ProjectType>
 {
@ -44,3 +47,5 @@
 - (PCProject *)openProjectAt:(NSString *)path;

@end
+
+#endif
--- a/PCGormProj/PCGormProj.m
+++ b/PCGormProj/PCGormProj.m
@ -31,8 +31,8 @@

 */

-#import "PCGormProj.h"
-#import "PCGormProject.h"
+#include "PCGormProj.h"
+#include "PCGormProject.h"

@implementation PCGormProj

--- a/PCGormProj/PCGormProject.h
+++ b/PCGormProj/PCGormProject.h
@ -30,9 +30,12 @@
 get copied to the right place.

 */
+ 
+#ifndef _PCGORMPROJECT_H
+#define _PCGORMPROJECT_H

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/PCProject.h>
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/PCProject.h>

@interface PCGormProject : PCProject
 {
@ -78,4 +81,4 @@

@end

-
+#endif
--- a/PCGormProj/PCGormProject.m
+++ b/PCGormProj/PCGormProject.m
@ -22,10 +22,10 @@
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */

-#import "PCGormProject.h"
-#import "PCGormProj.h"
+#include "PCGormProject.h"
+#include "PCGormProj.h"

-#import <ProjectCenter/PCMakefileFactory.h>
+#include <ProjectCenter/PCMakefileFactory.h>

@interface PCGormProject (CreateUI)

--- a/PCGormProj/h.template
+++ b/PCGormProj/h.template
@ -1,7 +1,7 @@
 $$
 /* $FILENAME$ created by $USERNAME$ on $DATE$ */

-#import <AppKit/AppKit.h>
+#include <AppKit/AppKit.h>

@interface $FILENAMESANSEXTENSION$ : NSObject
 {
--- a/PCGormProj/main.m
+++ b/PCGormProj/main.m
@ -1,4 +1,4 @@
-#import <AppKit/AppKit.h>
+#include <AppKit/AppKit.h>

 #define APP_NAME @"GNUstep"

--- a/PCLibProj/ChangeLog
+++ b/PCLibProj/ChangeLog
@ -1,3 +1,9 @@
+2003-04-21 Serg Stoyan <stoyan@hologr.com>
+
+	* GNUmakefile: Set BUNDLE_INSTALL_DIR to GNUSTEP_SYSTEM_ROOT.
+
+	* .h, .m: Replace #import with #include and add #ifndefs.
+
 2002-11-27 15:45  probert

        * Mac OS X port using Cocoa
--- a/PCLibProj/GNUmakefile
+++ b/PCLibProj/GNUmakefile
@ -21,11 +21,11 @@ include $(GNUSTEP_MAKEFILES)/common.make
 # Bundle
 #

-PACKAGE_NAME=PCLibProj
-BUNDLE_NAME=PCLibProj
-BUNDLE_EXTENSION=.bundle
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter
-PCLibProj_PRINCIPAL_CLASS=PCLibProj
+PACKAGE_NAME = PCLibProj
+BUNDLE_NAME = PCLibProj
+BUNDLE_EXTENSION = .bundle
+BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/ProjectCenter
+PCLibProj_PRINCIPAL_CLASS = PCLibProj


 #
--- a/PCLibProj/PCLibProj.h
+++ b/PCLibProj/PCLibProj.h
@ -24,8 +24,11 @@
   $Id$
 */

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/ProjectCenter.h>
+#ifndef _PCLIBPROJ_H
+#define _PCLIBPROJ_H
+
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/ProjectCenter.h>

@interface PCLibProj : NSObject <ProjectType>
 {
@ -46,3 +49,5 @@
 - (PCProject *)openProjectAt:(NSString *)path;

@end
+
+#endif
--- a/PCLibProj/PCLibProj.m
+++ b/PCLibProj/PCLibProj.m
@ -31,8 +31,8 @@

 */

-#import "PCLibProj.h"
-#import "PCLibProject.h"
+#include "PCLibProj.h"
+#include "PCLibProject.h"

@implementation PCLibProj

--- a/PCLibProj/PCLibProject.h
+++ b/PCLibProj/PCLibProject.h
@ -31,9 +31,12 @@
 use PCLibProj for doing this. Otherwise needed files don't get copied to the right place.

 */
+ 
+#ifndef _PCLIBPROJECT_H
+#define _PCLIBPROJECT_H

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/PCProject.h>
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/PCProject.h>

@interface PCLibProject : PCProject
 {
@ -63,3 +66,5 @@
 - (void)updateValuesFromProjectDict;

@end
+
+#endif
--- a/PCLibProj/PCLibProject.m
+++ b/PCLibProj/PCLibProject.m
@ -24,10 +24,10 @@
   $Id$
 */

-#import "PCLibProject.h"
-#import "PCLibProj.h"
+#include "PCLibProject.h"
+#include "PCLibProj.h"

-#import <ProjectCenter/PCMakefileFactory.h>
+#include <ProjectCenter/PCMakefileFactory.h>

@interface PCLibProject (CreateUI)

--- a/PCRenaissanceProj/ChangeLog
+++ b/PCRenaissanceProj/ChangeLog
@ -1,3 +1,9 @@
+2003-04-21 Serg Stoyan <stoyan@hologr.com>
+
+	* GNUmakefile: Set BUNDLE_INSTALL_DIR to GNUSTEP_SYSTEM_ROOT.
+
+	* .h, .m: Replace #import with #include and add #ifndefs.
+
 Sun Feb  2 06:02:50 2003  Nicola Pero  <n.pero@mi.flashnet.it>
                          Daniel Luederwald <das_flip@gmx.de>
 	
--- a/PCRenaissanceProj/PCRenaissanceProj.h
+++ b/PCRenaissanceProj/PCRenaissanceProj.h
@ -23,8 +23,11 @@
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/ProjectCenter.h>
+#ifndef _PCRENAISSANCEPROJ_H
+#define _PCRENAISSANCEPROJ_H
+
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/ProjectCenter.h>

@interface PCRenaissanceProj : NSObject <ProjectType>
 {
@ -45,3 +48,5 @@
 - (PCProject *)openProjectAt:(NSString *)path;

@end
+
+#endif
--- a/PCRenaissanceProj/PCRenaissanceProj.m
+++ b/PCRenaissanceProj/PCRenaissanceProj.m
@ -33,8 +33,8 @@

 */

-#import "PCRenaissanceProj.h"
-#import "PCRenaissanceProject.h"
+#include "PCRenaissanceProj.h"
+#include "PCRenaissanceProject.h"

@implementation PCRenaissanceProj

--- a/PCRenaissanceProj/PCRenaissanceProject.h
+++ b/PCRenaissanceProj/PCRenaissanceProject.h
@ -31,9 +31,12 @@
 get copied to the right place.

 */
+ 
+#ifndef _PCRENAISSANCEPROJECT_H
+#define _PCRENAISSANCEPROJECT_H

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/PCProject.h>
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/PCProject.h>

@interface PCRenaissanceProject : PCProject
 {
@ -79,4 +82,4 @@

@end

-
+#endif
--- a/PCRenaissanceProj/PCRenaissanceProject.m
+++ b/PCRenaissanceProj/PCRenaissanceProject.m
@ -23,10 +23,10 @@
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */

-#import "PCRenaissanceProject.h"
-#import "PCRenaissanceProj.h"
+#include "PCRenaissanceProject.h"
+#include "PCRenaissanceProj.h"

-#import <ProjectCenter/PCMakefileFactory.h>
+#include <ProjectCenter/PCMakefileFactory.h>

@interface PCRenaissanceProject (CreateUI)

--- a/PCToolProj/ChangeLog
+++ b/PCToolProj/ChangeLog
@ -1,3 +1,9 @@
+2003-04-21 Serg Stoyan <stoyan@hologr.com>
+
+	* GNUmakefile: Set BUNDLE_INSTALL_DIR to GNUSTEP_SYSTEM_ROOT.
+
+	* .h, .m: Replace #import with #include and add #ifndefs.
+
 2002-11-27 15:45  probert

        * Mac OS X port using Cocoa
--- a/PCToolProj/GNUmakefile
+++ b/PCToolProj/GNUmakefile
@ -21,11 +21,11 @@ include $(GNUSTEP_MAKEFILES)/common.make
 # Bundle
 #

-PACKAGE_NAME=PCToolProj
-BUNDLE_NAME=PCToolProj
-BUNDLE_EXTENSION=.bundle
-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter
-PCToolProj_PRINCIPAL_CLASS=PCToolProj
+PACKAGE_NAME = PCToolProj
+BUNDLE_NAME = PCToolProj
+BUNDLE_EXTENSION = .bundle
+BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Library/ProjectCenter
+PCToolProj_PRINCIPAL_CLASS = PCToolProj


 #
--- a/PCToolProj/PCToolProj.h
+++ b/PCToolProj/PCToolProj.h
@ -24,8 +24,11 @@
   $Id$
 */

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/ProjectCenter.h>
+#ifndef _PCTOOLPROJ_H
+#define _PCTOOLPROJ_H
+
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/ProjectCenter.h>

@interface PCToolProj : NSObject <ProjectType>
 {
@ -46,3 +49,5 @@
 - (PCProject *)openProjectAt:(NSString *)path;

@end
+
+#endif
--- a/PCToolProj/PCToolProj.m
+++ b/PCToolProj/PCToolProj.m
@ -31,8 +31,8 @@

 */

-#import "PCToolProj.h"
-#import "PCToolProject.h"
+#include "PCToolProj.h"
+#include "PCToolProject.h"

@implementation PCToolProj

--- a/PCToolProj/PCToolProject.h
+++ b/PCToolProj/PCToolProject.h
@ -32,9 +32,12 @@
 get copied to the right place.

 */
+ 
+#ifndef _PCTOOLPROJECT_H
+#define _PCTOOLPROJECT_H

-#import <AppKit/AppKit.h>
-#import <ProjectCenter/PCProject.h>
+#include <AppKit/AppKit.h>
+#include <ProjectCenter/PCProject.h>

@interface PCToolProject : PCProject
 {
@ -67,3 +70,4 @@

@end

+#endif
--- a/PCToolProj/PCToolProject.m
+++ b/PCToolProj/PCToolProject.m
@ -24,10 +24,10 @@
   $Id$
 */

-#import "PCToolProject.h"
-#import "PCToolProj.h"
+#include "PCToolProject.h"
+#include "PCToolProj.h"

-#import <ProjectCenter/PCMakefileFactory.h>
+#include <ProjectCenter/PCMakefileFactory.h>

@interface PCToolProject (CreateUI)

--- a/PCToolProj/main.m
+++ b/PCToolProj/main.m
@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#include <Foundation/Foundation.h>

 int main(int argc, const char *argv[]) {
  id pool = [[NSAutoreleasePool alloc] init];