* DBModeler/*.[h,m]: Fix includes for OS X.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26508 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Matt Rice 2008-05-09 20:21:17 +00:00
parent 82d27b5e48
commit 2d624f0ec5
36 changed files with 261 additions and 3 deletions

View file

@ -1,3 +1,7 @@
2008-05-09 Blake Nicholson <blaken@umich.edu>
* DBModeler/*.[h,m]: Fix includes for OS X.
2008-05-03 Matt Rice <ratmice@gmail.com>
* EOAccess/EOEntity.m (-[isValidPrimaryKeyAttribute:],

View file

@ -25,6 +25,9 @@
#include "AdaptorsPanel.h"
#include <AppKit/AppKit.h>
#include <GNUstepBase/GNUstep.h>
static NSArray *_adaptorNames;
@implementation AdaptorsPanel

View file

@ -25,8 +25,12 @@
#ifndef __ATTRIBUTE_CELL_H
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSCell.h>
#include <AppKit/NSTextFieldCell.h>
#endif
@class NSImageCell;

View file

@ -24,10 +24,17 @@
**/
#include "AttributeCell.h"
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSTextFieldCell.h>
#include <AppKit/NSImageCell.h>
#include <AppKit/NSImage.h>
#include <AppKit/NSGraphics.h>
#endif
#include <GNUstepBase/GNUstep.h>
@implementation TitleCell
- (void) setShowsFirstResponder:(BOOL)flag

View file

@ -23,7 +23,11 @@
</license>
**/
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSObject.h>
#endif
@class NSNotification;

View file

@ -35,7 +35,11 @@
#include <EOAccess/EOModel.h>
#include <EOAccess/EORelationship.h>
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSNotification.h>
#endif
#define MY_PRETTY NSMutableAttributedString \
mutableAttributedStringWithBoldSubstitutionsWithFormat

View file

@ -23,9 +23,17 @@
</license>
**/
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSObject.h>
#endif
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSNibDeclarations.h>
#endif
@class NSPanel;
@class NSButton;

View file

@ -26,12 +26,16 @@
#include <ConsistencyResults.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSApplication.h>
#include <AppKit/NSButton.h>
#include <AppKit/NSNibLoading.h>
#include <AppKit/NSPanel.h>
#include <AppKit/NSTextView.h>
#include <AppKit/NSTextStorage.h>
#endif
static ConsistencyResults *_sharedResults;

View file

@ -31,7 +31,11 @@
#include <EOInterface/EOColumnAssociation.h>
#include <EOAccess/EOAttribute.h>
#include <EOAccess/EOEntity.h>
#include <EOAccess/EORelationship.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSTableColumn.h>
#include <AppKit/NSTableHeaderCell.h>
#include <AppKit/NSCell.h>
@ -39,8 +43,15 @@
#include <AppKit/NSButtonCell.h>
#include <AppKit/NSTableView.h>
#include <AppKit/NSImage.h>
#endif
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSDictionary.h>
#endif
#include <GNUstepBase/GNUstep.h>
#define DICTSIZE(dict) (sizeof(dict) / sizeof(dict[0]))

View file

@ -28,8 +28,15 @@
#include <EOModeler/EOModelerDocument.h>
#include <EOAccess/EOModel.h>
#include <EOAccess/EOEntity.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSScrollView.h>
#include <AppKit/NSClipView.h>
#endif
#include <GNUstepBase/GNUstep.h>
@implementation DiagramEditor
- (void) dealloc

View file

@ -24,7 +24,13 @@
**/
#ifndef __DIAGRAM_VIEW_H
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSView.h>
#endif
@class NSColor;
@class NSMutableDictionary;
@class EOModel;

View file

@ -27,18 +27,32 @@
#include "DiagramView.h"
#include "EntityView.h"
#include "AttributeCell.h"
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSSet.h>
#endif
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSColor.h>
#include <AppKit/NSScrollView.h>
#include <AppKit/NSEvent.h>
#include <AppKit/NSGraphics.h>
#include <AppKit/NSBezierPath.h>
#include <AppKit/NSPasteboard.h>
#include <AppKit/NSDragging.h>
#endif
#include <EOAccess/EOModel.h>
#include <EOAccess/EOAttribute.h>
#include <EOAccess/EORelationship.h>
#include <EOModeler/EOModelExtensions.h>
#include <GNUstepBase/GNUstep.h>
@implementation DiagramView
- (id) initWithFrame:(NSRect)frameRect
{

View file

@ -27,8 +27,14 @@
#include <EOAccess/EOEntity.h>
#include <EOAccess/EORelationship.h>
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSArray.h>
#include <Foundation/NSValue.h>
#endif
#include <GNUstepBase/GNUstep.h>
/* this is all stuff for key value coding.. */
static inline NSNumber * isClassProperty(id self)

View file

@ -25,7 +25,12 @@
#ifndef _ENTITY_VIEW_H
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSView.h>
#endif
#include <EOAccess/EOEntity.h>
#include "AttributeCell.h"

View file

@ -27,7 +27,14 @@
#include "DiagramView.h"
#include "AttributeCell.h"
#include "NSView+Additions.h"
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSApplication.h>
#include <AppKit/NSColor.h>
#include <AppKit/NSFont.h>
#include <AppKit/NSGraphics.h>
#include <AppKit/NSTextFieldCell.h>
#include <AppKit/NSMatrix.h>
@ -36,8 +43,9 @@
#include <AppKit/NSImageCell.h>
#include <AppKit/NSImage.h>
#include <AppKit/NSScrollView.h>
#endif
#include <GNUstepBase/GNUstep.h>
@interface AttributeMatrix : NSMatrix
@end

View file

@ -20,7 +20,13 @@
along with DBModeler; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSNibDeclarations.h>
#endif
#include <EOModeler/EOMInspector.h>
@class NSButton;

View file

@ -25,9 +25,19 @@
#include <EOModeler/EOMInspector.h>
#include <EOAccess/EOEntity.h>
#include <EOAccess/EOModel.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSButton.h>
#include <AppKit/NSTableView.h>
#endif
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSValue.h>
#endif
@implementation AdvancedEntityInspector
- (NSString *)displayName

View file

@ -25,11 +25,20 @@
#include <EOAccess/EOAttribute.h>
#include <EOModeler/EOMInspector.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSBox.h>
#include <AppKit/NSTextField.h>
#include <AppKit/NSPopUpButton.h>
#include <AppKit/NSNibDeclarations.h>
#endif
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSDictionary.h>
#endif
@interface AttributeInspector : EOMInspector

View file

@ -22,7 +22,15 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "AttributeInspector.h"
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSObjCRuntime.h>
#endif
#include <GNUstepBase/GNUstep.h>
#include <GNUstepBase/GSCategories.h>
#define NO_ZEROS(x, i) i ? [x setIntValue:i] : [x setStringValue:@""];

View file

@ -23,7 +23,12 @@
*/
#include <EOModeler/EOMInspector.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/AppKit.h>
#endif
@class EOModel;
@class EOEntity;

View file

@ -32,7 +32,11 @@
#include <EOModeler/EOModelerApp.h>
#include <EOModeler/EOModelerDocument.h>
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSArray.h>
#endif
@implementation RelationshipInspector

View file

@ -30,11 +30,18 @@
#include <EOControl/EOClassDescription.h>
#include <EOControl/EOEditingContext.h>
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSCoder.h>
#include <Foundation/NSArray.h>
#include <Foundation/NSException.h>
#endif
#include "KVDataSource.h"
#include <GNUstepBase/GNUstep.h>
@implementation KVDataSource
- (id) initWithClassDescription: (EOClassDescription *)classDescription

View file

@ -26,9 +26,13 @@
#include <EOModeler/EOModelerEditor.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSOutlineView.h>
#include <AppKit/NSWindow.h>
#include <AppKit/NSSplitView.h>
#endif
@interface MainModelEditor : EOModelerCompoundEditor
{

View file

@ -23,7 +23,12 @@
</license>
**/
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSRunLoop.h>
#include <Foundation/NSNotification.h>
#endif
#include "MainModelEditor.h"
#include "ModelerEntityEditor.h"
@ -36,11 +41,16 @@
#include <EOAccess/EOModel.h>
#include <EOAccess/EOEntity.h>
#include <EOAccess/EOAttribute.h>
#include <EOAccess/EORelationship.h>
#include <EOControl/EOObserver.h>
#include <EOControl/EOEditingContext.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSPanel.h>
#include <AppKit/NSBox.h>
#include <AppKit/NSImage.h>
#include <AppKit/NSOutlineView.h>
#include <AppKit/NSPasteboard.h>
@ -48,8 +58,11 @@
#include <AppKit/NSSplitView.h>
#include <AppKit/NSTableColumn.h>
#include <AppKit/NSView.h>
#include <AppKit/NSWindowController.h>
#endif
#include <GNUstepBase/GNUstep.h>
#include <Foundation/NSNotification.h>
#define DEBUG_STUFF 0
@interface ModelerOutlineView : NSOutlineView

View file

@ -24,7 +24,11 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSObject.h>
#endif
@class NSObject;

View file

@ -44,10 +44,21 @@
#include <EOControl/EOObserver.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSOpenPanel.h>
#endif
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSObject.h>
#include <Foundation/NSFileManager.h>
#endif
#include <GNUstepBase/GNUstep.h>
@interface DebugObserver : NSObject <EOObserving>
{

View file

@ -28,6 +28,9 @@
#include "ModelerEntityEditor.h"
#include "KVDataSource.h"
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSImage.h>
#include <AppKit/NSTableView.h>
#include <AppKit/NSTableColumn.h>
@ -35,8 +38,11 @@
#include <AppKit/NSPopUpButtonCell.h>
#include <AppKit/NSScrollView.h>
#include <AppKit/NSSplitView.h>
#endif
#include <EOAccess/EOAttribute.h>
#include <EOAccess/EOEntity.h>
#include <EOAccess/EORelationship.h>
#include <EOControl/EOEditingContext.h>
@ -45,8 +51,14 @@
#include <EOInterface/EODisplayGroup.h>
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSRunLoop.h>
#endif
#include <GNUstepBase/GNUstep.h>
@interface NSArray (EOMAdditions)
- (id) firstSelectionOfClass:(Class) aClass;
@end

View file

@ -31,11 +31,15 @@
#include <EOInterface/EODisplayGroup.h>
#include <EOAccess/EOEntity.h>
#include <EOAccess/EOModel.h>
#include <EOControl/EOEditingContext.h>
#include <EOControl/EOObserver.h>
#include <EOModeler/EOModelerApp.h>
#include <EOModeler/EOModelerDocument.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSImage.h>
#include <AppKit/NSSplitView.h>
#include <AppKit/NSScrollView.h>
@ -45,6 +49,9 @@
#include <AppKit/NSMenuItem.h>
#include <AppKit/NSPopUpButton.h>
#include <AppKit/NSPopUpButtonCell.h>
#endif
#include <GNUstepBase/GNUstep.h>
@interface EOModelerDocument (asdf)
-(void)_setDisplayGroup:(id)displayGroup;

View file

@ -25,7 +25,13 @@
*/
#include <EOModeler/EOModelerEditor.h>
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSMenuItem.h>
#endif
@class EODisplayGroup;
@class NSPopUpButton;
@class NSTableView;

View file

@ -26,16 +26,23 @@
#include "ModelerTableEmbedibleEditor.h"
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSMenuItem.h>
#include <AppKit/NSPopUpButton.h>
#include <AppKit/NSTableColumn.h>
#include <AppKit/NSTableView.h>
#include <AppKit/NSScrollView.h>
#include <AppKit/NSImage.h>
#endif
#include <EOInterface/EODisplayGroup.h>
#include <EOInterface/EOAssociation.h>
#include "EOModeler/EOModelerApp.h"
#include <GNUstepBase/GNUstep.h>
/* base class with some methods shared among default embedible editors */
@implementation ModelerTableEmbedibleEditor : EOModelerEmbedibleEditor
- (void) setupCornerView:(NSPopUpButton *)cornerView

View file

@ -22,7 +22,12 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
</license>
**/
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSView.h>
#endif
@interface NSView (Additions)
- (void) orderViewFront:(NSView *)v;

View file

@ -23,9 +23,19 @@
</license>
**/
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSObject.h>
#include <AppKit/NSNibDeclarations.h>
#endif
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSNibDeclarations.h>
#endif
@class NSArray;
@class NSWindow;
@class NSButton;
@class NSTableView;

View file

@ -26,14 +26,22 @@
#include "Preferences.h"
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSInvocation.h>
#include <Foundation/NSUserDefaults.h>
#endif
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSNibLoading.h>
#include <AppKit/NSWindow.h>
#include <AppKit/NSButton.h>
#include <AppKit/NSTableView.h>
#include <AppKit/NSMatrix.h>
#endif
#define DisableAttributeDetailsCheck @"DisableAttributeDetailsCheck"
#define DisableEntityStoredProcedureCheck @"DisableEntityStoredProcedureCheck"

View file

@ -24,8 +24,17 @@
**/
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSObject.h>
#endif
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSNibDeclarations.h>
#endif
@class NSWindow;
@class NSButton;

View file

@ -26,14 +26,23 @@
#include "SQLGenerator.h"
#include "Modeler.h"
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSException.h>
#include <Foundation/NSDictionary.h>
#endif
#ifdef NeXT_GUI_LIBRARY
#include <AppKit/AppKit.h>
#else
#include <AppKit/NSNibLoading.h>
#include <AppKit/NSButton.h>
#include <AppKit/NSTextView.h>
#include <AppKit/NSSavePanel.h>
#include <AppKit/NSWindow.h>
#endif
#include <EOAccess/EOAdaptor.h>
#include <EOAccess/EOAdaptorChannel.h>
@ -44,6 +53,8 @@
#include <EOModeler/EOModelerApp.h>
#include <EOModeler/EOModelerDocument.h>
#include <GNUstepBase/GNUstep.h>
static SQLGenerator *sharedGenerator;
static BOOL loadedNib;
static BOOL goodToGo;

View file

@ -24,10 +24,17 @@
**/
#ifdef NeXT_Foundation_LIBRARY
#include <Foundation/Foundation.h>
#else
#include <Foundation/NSAutoreleasePool.h>
#endif
#include <EOModeler/EOModelerApp.h>
#include "Modeler.h"
#include <GNUstepBase/GNUstep.h>
int main (int argc, const char **argv)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];