qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bloody gcc deciding #import isn't good enough :P

This commit is contained in:
Bill Currie 2003-05-06 21:52:58 +00:00
parent a4abf526e8
commit 4dcc29a136
48 changed files with 182 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/Forge/BundleController.h
View File

@ -28,18 +28,21 @@
Boston, MA 02111-1307, USA
*/
#ifndef BundleController_h
#define BundleController_h
#ifdef HAVE_CONFIG_H
# include "Config.h"
#endif
#import <Foundation/NSArray.h>
#import <Foundation/NSBundle.h>
#import <Foundation/NSObject.h>
#include <Foundation/NSArray.h>
#include <Foundation/NSBundle.h>
#include <Foundation/NSObject.h>
#import <AppKit/NSNibDeclarations.h>
#include <AppKit/NSNibDeclarations.h>
#import "PrefsController.h"
#import "PrefsView.h"
#include "PrefsController.h"
#include "PrefsView.h"
/*
Bundle Delegate protocol
@ -92,3 +95,5 @@
- (NSArray *) loadedBundles;
@end
#endif//BundleController_h

12
tools/Forge/BundleController.m
View File

@ -34,14 +34,14 @@ static const char rcsid[] =
# include "Config.h"
#endif
#import <Foundation/NSDebug.h>
#import <Foundation/NSFileManager.h>
#import <Foundation/NSPathUtilities.h>
#import <Foundation/NSUserDefaults.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSFileManager.h>
#include <Foundation/NSPathUtilities.h>
#include <Foundation/NSUserDefaults.h>
#import <AppKit/NSPanel.h>
#include <AppKit/NSPanel.h>
#import "BundleController.h"
#include "BundleController.h"
@interface BundleController (Private)

11
tools/Forge/Bundles/MainPrefs/MainPrefs.h
View File

@ -28,14 +28,17 @@
Boston, MA 02111-1307, USA
*/
#ifndef MainPrefs_h
#define MainPrefs_h
#ifdef HAVE_CONFIG_H
# include "Config.h"
#endif
#import <AppKit/NSNibDeclarations.h>
#include <AppKit/NSNibDeclarations.h>
#import "BundleController.h"
#import "PrefsView.h"
#include "BundleController.h"
#include "PrefsView.h"
@interface MainPrefs: NSObject <PrefsViewController, ForgeBundle>
{
@ -58,3 +61,5 @@
- (IBAction) projectPathFindButtonClicked: (id) sender;
@end
#endif//MainPrefs_h

20
tools/Forge/Bundles/MainPrefs/MainPrefs.m
View File

@ -34,18 +34,18 @@ static const char rcsid[] =
# include "Config.h"
#endif
#import <Foundation/NSDebug.h>
#import <Foundation/NSPathUtilities.h>
#import <Foundation/NSUserDefaults.h>
#import <Foundation/NSValue.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSPathUtilities.h>
#include <Foundation/NSUserDefaults.h>
#include <Foundation/NSValue.h>
#import <AppKit/NSButton.h>
#import <AppKit/NSImage.h>
#import <AppKit/NSNibLoading.h>
#import <AppKit/NSOpenPanel.h>
#include <AppKit/NSButton.h>
#include <AppKit/NSImage.h>
#include <AppKit/NSNibLoading.h>
#include <AppKit/NSOpenPanel.h>
#import "PrefsController.h"
#import "MainPrefs.h"
#include "PrefsController.h"
#include "MainPrefs.h"
@interface MainPrefs (Private)

11
tools/Forge/Bundles/MapEdit/Brush.h
View File

@ -1,6 +1,9 @@
#import <AppKit/AppKit.h>
#import "SetBrush.h"
#import "EditWindow.h"
#ifndef Brush_h
#define Brush_h
#include <AppKit/AppKit.h>
#include "SetBrush.h"
#include "EditWindow.h"
extern id brush_i;
@ -52,4 +55,4 @@ extern BOOL brushdraw; // YES when drawing cutbrushes and ents
@end
#define Brush_h

6
tools/Forge/Bundles/MapEdit/CameraView.h
View File

@ -1,6 +1,6 @@
#import <AppKit/AppKit.h>
#import "mathlib.h"
#import "SetBrush.h"
#include <AppKit/AppKit.h>
#include "mathlib.h"
#include "SetBrush.h"
extern id cameraview_i;

2
tools/Forge/Bundles/MapEdit/CameraView.m
View File

@ -1,4 +1,4 @@
#import "qedefs.h"
#include "qedefs.h"
id cameraview_i;

4
tools/Forge/Bundles/MapEdit/Clipper.m
View File

@ -1,8 +1,8 @@
#include "qedefs.h"
#import <AppKit/NSGraphics.h>
#import <AppKit/DPSOperators.h>
#include <AppKit/NSGraphics.h>
#include <AppKit/DPSOperators.h>
id clipper_i;

2
tools/Forge/Bundles/MapEdit/Dict.h
View File

@ -1,5 +1,5 @@
#import <AppKit/AppKit.h>
#include <AppKit/AppKit.h>
typedef struct
{

2
tools/Forge/Bundles/MapEdit/Dict.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
@implementation Dict

2
tools/Forge/Bundles/MapEdit/DictList.h
View File

@ -1,5 +1,5 @@
#import <AppKit/AppKit.h>
#include <AppKit/AppKit.h>
@interface DictList:List
{

2
tools/Forge/Bundles/MapEdit/DictList.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
@implementation DictList

4
tools/Forge/Bundles/MapEdit/EntityClass.h
View File

@ -1,5 +1,5 @@
#import <AppKit/AppKit.h>
#import "mathlib.h"
#include <AppKit/AppKit.h>
#include "mathlib.h"
typedef enum {esize_model, esize_fixed} esize_t;

2
tools/Forge/Bundles/MapEdit/EntityClass.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
@implementation EntityClass

2
tools/Forge/Bundles/MapEdit/InspectorControl.h
View File

@ -1,5 +1,5 @@
#import <AppKit/AppKit.h>
#include <AppKit/AppKit.h>
#define MINIWINICON "DoomEdIcon"

8
tools/Forge/Bundles/MapEdit/InspectorControl.m
View File

@ -1,10 +1,10 @@
#import "qedefs.h"
#include "qedefs.h"
// Add .h-files here for new inspectors
#import "Things.h"
#import "TexturePalette.h"
#import "Preferences.h"
#include "Things.h"
#include "TexturePalette.h"
#include "Preferences.h"
id inspcontrol_i;

2
tools/Forge/Bundles/MapEdit/KeypairView.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
id keypairview_i;

2
tools/Forge/Bundles/MapEdit/PopScrollView.h
View File

@ -1,4 +1,4 @@
#import <AppKit/AppKit.h>
#include <AppKit/AppKit.h>
@interface PopScrollView : NSScrollView
{

2
tools/Forge/Bundles/MapEdit/PopScrollView.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
@implementation PopScrollView

2
tools/Forge/Bundles/MapEdit/Preferences.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
id preferences_i;

2
tools/Forge/Bundles/MapEdit/Project.h
View File

@ -1,5 +1,5 @@
#import <AppKit/AppKit.h>
#include <AppKit/AppKit.h>
#include <sys/stat.h>
#define BASEPATHKEY "basepath"

2
tools/Forge/Bundles/MapEdit/Project.m
View File

@ -4,7 +4,7 @@
//
//======================================
#import "qedefs.h"
#include "qedefs.h"
id project_i;

2
tools/Forge/Bundles/MapEdit/QuakeEd.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
id quakeed_i;
id entclasses_i;

2
tools/Forge/Bundles/MapEdit/QuakeEd_main.m
View File

@ -2,7 +2,7 @@
NOTE: Do NOT change this file -- Project Builder maintains it.
*/
#import <appkit/appkit.h>
#include <appkit/appkit.h>
void main(int argc, char *argv[]) {

2
tools/Forge/Bundles/MapEdit/SetBrush.m
View File

@ -1,4 +1,4 @@
#import "qedefs.h"
#include "qedefs.h"
@implementation SetBrush

2
tools/Forge/Bundles/MapEdit/TexturePalette.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
id texturepalette_i;

2
tools/Forge/Bundles/MapEdit/TextureView.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
/*

2
tools/Forge/Bundles/MapEdit/Things.h
View File

@ -1,5 +1,5 @@
#import <AppKit/AppKit.h>
#include <AppKit/AppKit.h>
extern id things_i;

2
tools/Forge/Bundles/MapEdit/Things.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
id things_i;

4
tools/Forge/Bundles/MapEdit/UserPath.h
View File

@ -30,8 +30,8 @@
* which reference objective C methods.
*/
#import <objc/objc.h>
#import <AppKit/NSGraphicsContext.h>
#include <objc/objc.h>
#include <AppKit/NSGraphicsContext.h>
typedef struct _UP {
float *points;

12
tools/Forge/Bundles/MapEdit/UserPath.m
View File

@ -7,12 +7,12 @@
*
*/
#import "UserPath.h"
#import <mach/mach_init.h>
#import <appkit/graphics.h>
#import <appkit/errors.h>
#import <math.h>
#import <libc.h>
#include "UserPath.h"
#include <mach/mach_init.h>
#include <appkit/graphics.h>
#include <appkit/errors.h>
#include <math.h>
#include <libc.h>
static NSZone *upZone = NULL;

6
tools/Forge/Bundles/MapEdit/XYView.h
View File

@ -1,7 +1,7 @@
#import <AppKit/AppKit.h>
#import "mathlib.h"
#import "SetBrush.h"
#include <AppKit/AppKit.h>
#include "mathlib.h"
#include "SetBrush.h"
extern id xyview_i;

2
tools/Forge/Bundles/MapEdit/XYView.m
View File

@ -1,4 +1,4 @@
#import "qedefs.h"
#include "qedefs.h"
id xyview_i;

2
tools/Forge/Bundles/MapEdit/ZScrollView.h
View File

@ -1,4 +1,4 @@
#import <AppKit/AppKit.h>
#include <AppKit/AppKit.h>
@interface ZScrollView : NSScrollView
{

2
tools/Forge/Bundles/MapEdit/ZScrollView.m
View File

@ -1,4 +1,4 @@
#import "qedefs.h"
#include "qedefs.h"
@implementation ZScrollView

4
tools/Forge/Bundles/MapEdit/ZView.h
View File

@ -1,6 +1,6 @@
#import <AppKit/AppKit.h>
#import "mathlib.h"
#include <AppKit/AppKit.h>
#include "mathlib.h"
extern id zview_i;

2
tools/Forge/Bundles/MapEdit/ZView.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
id zview_i;

58
tools/Forge/Bundles/MapEdit/qedefs.h
View File

@ -1,36 +1,36 @@
#import <AppKit/AppKit.h>
#import <ctype.h>
#import <sys/types.h>
#import <sys/dir.h>
#import <math.h>
#import <unistd.h>
#import <sys/fcntl.h>
#include <AppKit/AppKit.h>
#include <ctype.h>
#include <sys/types.h>
#include <sys/dir.h>
#include <math.h>
#include <unistd.h>
#include <sys/fcntl.h>
#import "UserPath.h"
#import "cmdlib.h"
#import "mathlib.h"
#include "UserPath.h"
#include "cmdlib.h"
#include "mathlib.h"
#import "EntityClass.h"
#import "Project.h"
#import "QuakeEd.h"
#import "Map.h"
#import "TexturePalette.h"
#import "SetBrush.h"
#import "render.h"
#import "Entity.h"
#include "EntityClass.h"
#include "Project.h"
#include "QuakeEd.h"
#include "Map.h"
#include "TexturePalette.h"
#include "SetBrush.h"
#include "render.h"
#include "Entity.h"
#import "XYView.h"
#import "CameraView.h"
#import "ZView.h"
#import "ZScrollView.h"
#import "Preferences.h"
#import "InspectorControl.h"
#import "PopScrollView.h"
#import "KeypairView.h"
#import "Things.h"
#import "TextureView.h"
#import "Clipper.h"
#include "XYView.h"
#include "CameraView.h"
#include "ZView.h"
#include "ZScrollView.h"
#include "Preferences.h"
#include "InspectorControl.h"
#include "PopScrollView.h"
#include "KeypairView.h"
#include "Things.h"
#include "TextureView.h"
#include "Clipper.h"
void PrintRect (NSRect *r);

2
tools/Forge/Bundles/MapEdit/render.m
View File

@ -1,5 +1,5 @@
#import "qedefs.h"
#include "qedefs.h"
//define NOLIGHT

19
tools/Forge/Controller.h
View File

@ -27,18 +27,21 @@
Boston, MA 02111-1307, USA
*/
#ifndef Controller_h
#define Controller_h
#ifdef HAVE_CONFIG_H
# include "Config.h"
#endif
#import <Foundation/NSObject.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSString.h>
#import <AppKit/NSApplication.h>
#import <AppKit/NSNibDeclarations.h>
#include <Foundation/NSObject.h>
#include <Foundation/NSNotification.h>
#include <Foundation/NSString.h>
#include <AppKit/NSApplication.h>
#include <AppKit/NSNibDeclarations.h>
#import "BundleController.h"
#import "PrefsController.h"
#include "BundleController.h"
#include "PrefsController.h"
typedef enum {CNoMode = 0, COpenMode, CCreateMode} CMode;
@ -71,3 +74,5 @@ typedef enum {CNoMode = 0, COpenMode, CCreateMode} CMode;
- (CMode) fileMode;
- (NSString *) fileName;
@end
#endif//Controller_h

14
tools/Forge/Controller.m
View File

@ -33,15 +33,15 @@ static const char rcsid[] =
# include "Config.h"
#endif
#import <Foundation/NSDebug.h>
#include <Foundation/NSDebug.h>
#import <AppKit/NSApplication.h>
#import <AppKit/NSNibLoading.h>
#import <AppKit/NSMenu.h>
#import <AppKit/NSWindow.h>
#include <AppKit/NSApplication.h>
#include <AppKit/NSNibLoading.h>
#include <AppKit/NSMenu.h>
#include <AppKit/NSWindow.h>
#import "Controller.h"
#import "PrefsController.h"
#include "Controller.h"
#include "PrefsController.h"
@implementation Controller

2
tools/Forge/Documentation/Template.m
View File

@ -34,4 +34,4 @@ static const char rcsid[] =
# include "Config.h"
#endif
#import "Template.h"
#include "Template.h"

17
tools/Forge/PrefsController.h
View File

@ -27,18 +27,21 @@
Boston, MA 02111-1307, USA
*/
#ifndef PrefsController_h
#define PrefsController_h
#ifdef HAVE_CONFIG_H
# include "Config.h"
#endif
#import <Foundation/NSObject.h>
#include <Foundation/NSObject.h>
#import <AppKit/NSBox.h>
#import <AppKit/NSMatrix.h>
#import <AppKit/NSScrollView.h>
#import <AppKit/NSNibDeclarations.h>
#include <AppKit/NSBox.h>
#include <AppKit/NSMatrix.h>
#include <AppKit/NSScrollView.h>
#include <AppKit/NSNibDeclarations.h>
#import "PrefsView.h"
#include "PrefsView.h"
@interface PrefsController: NSObject
{
@ -68,3 +71,5 @@
- (NSBox *) prefsViewBox;
@end
#endif//PrefsController_h

12
tools/Forge/PrefsController.m
View File

@ -33,14 +33,14 @@ static const char rcsid[] =
# include "Config.h"
#endif
#import <Foundation/NSDebug.h>
#import <Foundation/NSUserDefaults.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSUserDefaults.h>
#import <AppKit/NSApplication.h>
#import <AppKit/NSWindow.h>
#include <AppKit/NSApplication.h>
#include <AppKit/NSWindow.h>
#import "PrefsController.h"
#import "PrefsView.h"
#include "PrefsController.h"
#include "PrefsView.h"
@implementation PrefsController

11
tools/Forge/PrefsView.h
View File

@ -27,13 +27,16 @@
Boston, MA 02111-1307, USA
*/
#ifndef PrefsView_h
#define PrefsView_h
#ifdef HAVE_CONFIG_H
# include "Config.h"
#endif
#import <Foundation/NSObject.h>
#import <AppKit/NSView.h>
#import <AppKit/NSButtonCell.h>
#include <Foundation/NSObject.h>
#include <AppKit/NSView.h>
#include <AppKit/NSButtonCell.h>
// size of a PrefsView
#define PrefsRect NSMakeRect (0, 0, 486, 228)
@ -50,3 +53,5 @@
- (NSView *) view;
@end
#endif//PrefsView_h

9
tools/Forge/Project.h
View File

@ -27,13 +27,16 @@
Boston, MA 02111-1307, USA
*/
#ifndef Project_h
#define Project_h
#ifdef HAVE_CONFIG_H
# include "Config.h"
#endif
#import <Foundation/NSObject.h>
#include <Foundation/NSObject.h>
#import <AppKit/NSNibDeclarations.h>
#include <AppKit/NSNibDeclarations.h>
@interface Project: NSObject
{
@ -50,3 +53,5 @@
- (void) closeProject: (id) sender;
@end
#endif//Project_h

18
tools/Forge/Project.m
View File

@ -33,17 +33,17 @@ static const char rcsid[] =
# include "Config.h"
#endif
#import <Foundation/NSFileManager.h>
#import <Foundation/NSString.h>
#import <Foundation/NSUserDefaults.h>
#include <Foundation/NSFileManager.h>
#include <Foundation/NSString.h>
#include <Foundation/NSUserDefaults.h>
#import <AppKit/NSBrowser.h>
#import <AppKit/NSBrowserCell.h>
#import <AppKit/NSOpenPanel.h>
#import <AppKit/NSSavePanel.h>
#include <AppKit/NSBrowser.h>
#include <AppKit/NSBrowserCell.h>
#include <AppKit/NSOpenPanel.h>
#include <AppKit/NSSavePanel.h>
#import "Controller.h"
#import "Project.h"
#include "Controller.h"
#include "Project.h"
@implementation Project

2
tools/Forge/main.m
View File

@ -1,4 +1,4 @@
#import <AppKit/NSApplication.h>
#include <AppKit/NSApplication.h>
#define APP_NAME @"Forge"