From 0759f5093f6bbef70209626103ac4b225221d68f Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 30 Oct 2003 00:23:23 +0000 Subject: [PATCH] Make private symbols actually private (1/n). git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@18007 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 10 ++++++++++ Source/NSImage.m | 6 +++--- Source/NSPrintInfo.m | 6 +++--- Source/NSProgressIndicator.m | 4 ++-- Source/NSStepperCell.m | 8 ++++---- 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e8dd7dde..8270e08a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-10-30 00:38 Alexander Malmberg + + * Source/NSImage.m (iterate_reps_for_types, repd_for_rep): Make + static. + * Source/NSStepperCell.m (DrawUpButton, DrawDownButton, + HighlightUpButton, HighlightDownButton): Idem. + + * Source/NSPrintInfo.m: Make the "class variables" static. + * Source/NSProgressIndicator.m: Idem. + 2003-10-29 Bjorn Giesler * Source/externs.m: New MacOS 10.3 pasteboard types diff --git a/Source/NSImage.m b/Source/NSImage.m index 3df4a59da..daa376e44 100644 --- a/Source/NSImage.m +++ b/Source/NSImage.m @@ -115,10 +115,10 @@ static NSColor *clearColor = nil; static Class cachedClass = 0; static Class bitmapClass = 0; -NSArray *iterate_reps_for_types(NSArray *imageReps, SEL method); +static NSArray *iterate_reps_for_types(NSArray *imageReps, SEL method); /* Find the GSRepData object holding a representation */ -GSRepData* +static GSRepData* repd_for_rep(NSArray *_reps, NSImageRep *rep) { NSEnumerator *enumerator = [_reps objectEnumerator]; @@ -1309,7 +1309,7 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep) array of objects. Add these together, with duplicates weeded out. Used by imageUnfilteredPasteboardTypes, imageUnfilteredFileTypes, etc. */ -NSArray * +static NSArray * iterate_reps_for_types(NSArray* imageReps, SEL method) { NSImageRep *rep; diff --git a/Source/NSPrintInfo.m b/Source/NSPrintInfo.m index d1897ee5d..8837b2639 100644 --- a/Source/NSPrintInfo.m +++ b/Source/NSPrintInfo.m @@ -45,9 +45,9 @@ // FIXME: retain/release of dictionary with retain/release of printInfo? // Class variables: -NSPrintInfo *sharedPrintInfoObject = nil; -NSMutableDictionary *printInfoDefaults = nil; -NSDictionary *paperSizes = nil; +static NSPrintInfo *sharedPrintInfoObject = nil; +static NSMutableDictionary *printInfoDefaults = nil; +static NSDictionary *paperSizes = nil; @interface NSPrintInfo (private) + initPrintInfoDefaults; diff --git a/Source/NSProgressIndicator.m b/Source/NSProgressIndicator.m index 9b2fc0638..67ff276ee 100644 --- a/Source/NSProgressIndicator.m +++ b/Source/NSProgressIndicator.m @@ -30,9 +30,9 @@ @implementation NSProgressIndicator -NSColor *fillColour = nil; +static NSColor *fillColour = nil; #define maxCount 1 -NSImage *images[maxCount]; +static NSImage *images[maxCount]; + (void) initialize { diff --git a/Source/NSStepperCell.m b/Source/NSStepperCell.m index e8b3be9db..37bc4c5e5 100644 --- a/Source/NSStepperCell.m +++ b/Source/NSStepperCell.m @@ -124,7 +124,7 @@ return c; } -inline void DrawUpButton(NSRect aRect) +static inline void DrawUpButton(NSRect aRect) { NSRectEdge up_sides[] = {NSMinXEdge, NSMaxYEdge, NSMaxXEdge, NSMinYEdge}; @@ -154,7 +154,7 @@ inline void DrawUpButton(NSRect aRect) PSstroke(); } -inline void HighlightUpButton(NSRect aRect) +static inline void HighlightUpButton(NSRect aRect) { NSRectEdge up_sides[] = {NSMinXEdge, NSMaxYEdge, NSMaxXEdge, NSMinYEdge}; @@ -184,7 +184,7 @@ inline void HighlightUpButton(NSRect aRect) PSstroke(); } -inline void DrawDownButton(NSRect aRect) +static inline void DrawDownButton(NSRect aRect) { NSRectEdge up_sides[] = {NSMinXEdge, NSMaxYEdge, NSMaxXEdge, NSMinYEdge}; @@ -215,7 +215,7 @@ inline void DrawDownButton(NSRect aRect) PSstroke(); } -inline void HighlightDownButton(NSRect aRect) +static inline void HighlightDownButton(NSRect aRect) { NSRectEdge up_sides[] = {NSMinXEdge, NSMaxYEdge, NSMaxXEdge, NSMinYEdge};