gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make the signatures of methods consistent between headers and implementation files.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29687 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2010-02-20 13:21:57 +00:00
parent 2a6b182109
commit 4b1472cf8a
11 changed files with 62 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,17 @@
2010-02-20 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSAttributedString.h,
* Source/NSAttributedString.m,
* Source/GSNibLoading.m,
* Headers/AppKit/NSScroller.h,
* Source/NSScroller.m,
* Headers/Additions/GNUstepGUI/GSGormLoading.h,
* Source/GSGormLoading.m,
* Source/NSSearchField.m,
* Headers/Additions/GNUstepGUI/GSLayoutManager.h,
* Source/NSColor.m: Make the signatures of methods consistent
between headers and implementation files.
2010-02-20 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSGuiPrivate.h: Include preface.h from base.
@ -4540,7 +4554,7 @@
was causing a crash due to issues in NSToolbar described
in bug#24601.
2008-10-18 Riccardo Mottola <rmottola@users.sf.net>>
2008-10-18 Riccardo Mottola <rmottola@users.sf.net>
* Source/NSWorkspace.m: Removed c99-ism

20
Headers/Additions/GNUstepGUI/GSGormLoading.h
View file

@ -28,14 +28,9 @@
#ifndef _GNUstep_H_GSNibTemplates
#define _GNUstep_H_GSNibTemplates
#include <Foundation/NSObject.h>
#include <AppKit/NSWindow.h>
#include <AppKit/NSMenu.h>
#include <AppKit/NSView.h>
#include <AppKit/NSText.h>
#include <AppKit/NSTextView.h>
#include <AppKit/NSControl.h>
#include "GNUstepGUI/GSNibContainer.h"
#import <Foundation/NSObject.h>
#import "GNUstepGUI/GSNibContainer.h"
// version of the nib container and the templates.
#define GNUSTEP_NIB_VERSION 2
@ -48,10 +43,11 @@
#define GSMENUT_VERSION 0
#define GSOBJECTT_VERSION 0
@class NSString;
@class NSDictionary;
@class NSMutableDictionary;
@class NSMutableSet;
@class NSString;
@class NSDictionary;
@class NSMutableDictionary;
@class NSMutableSet;
@class NSWindow;
/** Window template autopositioning constants */
enum {

4
Headers/Additions/GNUstepGUI/GSLayoutManager.h
View file

@ -295,9 +295,9 @@ invalidation.)
- (NSTextContainer *) textContainerForGlyphAtIndex: (NSUInteger)glyphIndex
effectiveRange: (NSRange *)effectiveRange;
- (NSRect) lineFragmentRectForGlyphAtIndex: (unsigned int)glyphIndex
- (NSRect) lineFragmentRectForGlyphAtIndex: (NSUInteger)glyphIndex
effectiveRange: (NSRange *)effectiveGlyphRange;
- (NSRect) lineFragmentUsedRectForGlyphAtIndex: (unsigned int)glyphIndex
- (NSRect) lineFragmentUsedRectForGlyphAtIndex: (NSUInteger)glyphIndex
effectiveRange: (NSRange *)effectiveGlyphRange;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
- (NSTextContainer *) textContainerForGlyphAtIndex: (NSUInteger)glyphIndex

12
Headers/AppKit/NSAttributedString.h
View file

@ -190,10 +190,10 @@ enum
- (BOOL) containsAttachments;
- (NSDictionary*) fontAttributesInRange: (NSRange)range;
- (NSDictionary*) rulerAttributesInRange: (NSRange)range;
- (unsigned) lineBreakBeforeIndex: (NSUInteger)location
withinRange: (NSRange)aRange;
- (NSRange) doubleClickAtIndex: (unsigned)location;
- (unsigned) nextWordFromIndex: (unsigned)location forward: (BOOL)isForward;
- (NSUInteger) lineBreakBeforeIndex: (NSUInteger)location
withinRange: (NSRange)aRange;
- (NSRange) doubleClickAtIndex: (NSUInteger)location;
- (NSUInteger) nextWordFromIndex: (NSUInteger)location forward: (BOOL)isForward;
- (id) initWithRTF: (NSData*)data documentAttributes: (NSDictionary**)dict;
- (id) initWithRTFD: (NSData*)data documentAttributes: (NSDictionary**)dict;
@ -232,8 +232,8 @@ enum
options: (NSDictionary *)options
documentAttributes: (NSDictionary **)dict;
- (unsigned) lineBreakByHyphenatingBeforeIndex: (NSUInteger)location
withinRange: (NSRange)aRange;
- (NSUInteger) lineBreakByHyphenatingBeforeIndex: (NSUInteger)location
withinRange: (NSRange)aRange;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (NSData *) dataFromRange: (NSRange)range

4
Headers/AppKit/NSScroller.h
View file

@ -70,8 +70,8 @@ typedef enum _NSScrollerArrow {
@interface NSScroller : NSControl <NSCoding>
{
double _doubleValue;
float _knobProportion;
float _pendingKnobProportion;
CGFloat _knobProportion;
CGFloat _pendingKnobProportion;
id _target;
SEL _action;
NSScrollerPart _hitPart;

45
Source/GSGormLoading.m
View file

@ -26,34 +26,23 @@
Boston, MA 02110-1301, USA.
*/
#include <Foundation/NSArray.h>
#include <Foundation/NSBundle.h>
#include <Foundation/NSCoder.h>
#include <Foundation/NSData.h>
#include <Foundation/NSDictionary.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSEnumerator.h>
#include <Foundation/NSException.h>
#include <Foundation/NSInvocation.h>
#include <Foundation/NSObjCRuntime.h>
#include <Foundation/NSPathUtilities.h>
#include <Foundation/NSFileManager.h>
#include <Foundation/NSString.h>
#include <Foundation/NSUserDefaults.h>
#include <Foundation/NSKeyValueCoding.h>
#include <Foundation/NSNotification.h>
#include <Foundation/NSArchiver.h>
#include <Foundation/NSSet.h>
#include <AppKit/NSMenu.h>
#include <AppKit/NSView.h>
#include <AppKit/NSTextView.h>
#include <AppKit/NSWindow.h>
#include <AppKit/NSNibLoading.h>
#include <AppKit/NSNibConnector.h>
#include <AppKit/NSApplication.h>
#include <AppKit/NSScreen.h>
#include <GNUstepBase/GSObjCRuntime.h>
#include <GNUstepGUI/GSGormLoading.h>
#import <Foundation/NSCoder.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSDebug.h>
#import <Foundation/NSException.h>
#import <Foundation/NSString.h>
#import <Foundation/NSKeyValueCoding.h>
#import <Foundation/NSNotification.h>
#import <Foundation/NSArchiver.h>
#import "AppKit/NSApplication.h"
#import "AppKit/NSControl.h"
#import "AppKit/NSMenu.h"
#import "AppKit/NSNibLoading.h"
#import "AppKit/NSNibConnector.h"
#import "AppKit/NSTextView.h"
#import "AppKit/NSView.h"
#import "AppKit/NSWindow.h"
#import "GNUstepGUI/GSGormLoading.h"
static const int currentVersion = 1; // GSNibItem version number...

2
Source/GSNibLoading.m
View file

@ -2227,7 +2227,7 @@ static BOOL _isInInterfaceBuilder = NO;
NSDecimalNumber *dn = nil;
if ([coder allowsKeyedCoding])
{
unsigned int len = 0;
NSUInteger len = 0;
short exponent = (short)[coder decodeIntForKey: @"NS.exponent"];
NSByteOrder bo = [coder decodeIntForKey: @"NS.mantissa.bo"];
BOOL negative = [coder decodeBoolForKey: @"NS.negative"];

4
Source/NSAttributedString.m
View file

@ -449,7 +449,7 @@ create_error(int code, NSString* desc)
}
}
- (NSRange) doubleClickAtIndex: (unsigned)location
- (NSRange) doubleClickAtIndex: (NSUInteger)location
{
NSString *str = [self string];
unsigned length = [str length];
@ -555,7 +555,7 @@ create_error(int code, NSString* desc)
return NSMakeRange (location, length);
}
- (unsigned) nextWordFromIndex: (unsigned)location
- (NSUInteger) nextWordFromIndex: (NSUInteger)location
forward: (BOOL)isForward
{
NSString *str = [self string];

6
Source/NSColor.m
View file

@ -1405,7 +1405,7 @@ systemColorWithName(NSString *name)
if ((colorSpace == 1) || (colorSpace == 2))
{
unsigned length;
NSUInteger length;
const uint8_t *data;
float red = 0.0;
float green = 0.0;
@ -1445,7 +1445,7 @@ systemColorWithName(NSString *name)
}
else if ((colorSpace == 3) || (colorSpace == 4))
{
unsigned length;
NSUInteger length;
const uint8_t *data;
float white = 0.0;
float alpha = 1.0;
@ -1477,7 +1477,7 @@ systemColorWithName(NSString *name)
}
else if (colorSpace == 5)
{
unsigned length;
NSUInteger length;
const uint8_t *data;
float cyan = 0.0;
float yellow = 0.0;

10
Source/NSScroller.m
View file

@ -66,7 +66,7 @@ static NSCell *horizontalKnobCell = nil;
static NSCell *verticalKnobCell = nil;
static NSCell *horizontalKnobSlotCell = nil;
static NSCell *verticalKnobSlotCell = nil;
static float scrollerWidth = 0.0;
static CGFloat scrollerWidth = 0.0;
/* This is the distance by which buttons are offset inside the scroller slot.
*/
@ -107,12 +107,12 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
<p>Subclasses can override this to provide different scrollbar width. But
you may need to also override -drawParts .</p>
*/
+ (float) scrollerWidth
+ (CGFloat) scrollerWidth
{
return [self scrollerWidthForControlSize: NSRegularControlSize];
}
+ (float) scrollerWidthForControlSize: (NSControlSize)controlSize
+ (CGFloat) scrollerWidthForControlSize: (NSControlSize)controlSize
{
// FIXME
if (scrollerWidth == 0.0)
@ -159,7 +159,7 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
/**<p>Returns a float value ( between 0.0 and 1.0 ) indicating the ratio
between the NSScroller length and the knob length</p>
*/
- (float) knobProportion
- (CGFloat) knobProportion
{
return _knobProportion;
}
@ -1226,7 +1226,7 @@ static float buttonsOffset = 1.0; // buttonsWidth = sw - 2*buttonsOffset
{
case NSScrollerKnob:
{
float knobHeight, knobPosition, slotHeight;
CGFloat knobHeight, knobPosition, slotHeight;
if (usableParts == NSNoScrollerParts
|| usableParts == NSOnlyScrollerArrows)

2
Source/NSSearchField.m
View file

@ -114,7 +114,7 @@ static Class usedCellClass;
[[self cell] setSendsSearchStringImmediately: flag];
}
- (void) setMaximumRecents: (int)max
- (void) setMaximumRecents: (NSInteger)max
{
[[self cell] setMaximumRecents: max];
}