Skip to content

Commit

Permalink
Merge pull request #199 from gnustep/warningfix
Browse files Browse the repository at this point in the history
Warning Fix
  • Loading branch information
rmottola authored Sep 18, 2023
2 parents 0b2f0a4 + 9faf904 commit 14baf92
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 41 deletions.
15 changes: 1 addition & 14 deletions Source/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -683,20 +683,7 @@ GSWindowDecorationView.h \
GSXibElement.h \
GSXibLoading.h \
GSXibKeyedUnarchiver.h \
GSHelpAttachment.h \
GSAutoLayoutVFLParser.h \
GSAutoLayoutEngine.h \
GSCassowarySolver.h \
GSCSConstraint.h \
GSCSVariable.h \
GSCSFloatComparator.h \
GSCSSolution.h \
GSCSLinearExpression.h \
GSCSConstraintOperator.h \
GSCSStrength.h \
GSCSEditVariableManager.h \
GSCSEditInfo.h \
GSCSTableau.h
GSHelpAttachment.h

libgnustep-gui_HEADER_FILES = ${GUI_HEADERS}

Expand Down
4 changes: 2 additions & 2 deletions Source/GSAutocompleteWindow.m
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ - (void) updateTextViewWithMovement: (NSInteger)movement
if ( (flag) ||
(movement == NSCancelTextMovement) )
{
ASSIGN(_originalWord, nil);
ASSIGN(_words, nil);
DESTROY(_originalWord);
DESTROY(_words);
}
}

Expand Down
4 changes: 2 additions & 2 deletions Source/GSServicesManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ - (id) self;
object: listenerConnection];
DESTROY(listenerConnection);
}
ASSIGN(servicesProvider, nil);
ASSIGN(providerName, nil);
DESTROY(servicesProvider);
DESTROY(providerName);
}

/**
Expand Down
20 changes: 0 additions & 20 deletions Source/NSAnimation.m
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,6 @@
return b->a[0] + t * (b->a[1] + t * (b->a[2] + t * b->a[3]));
}

static inline float
_GSBezierDerivEval(_GSBezierDesc *b, float t)
{
if (!b->areCoefficientsComputed)
_GSBezierComputeCoefficients(b);
return b->a[1] + t * (2.0 * b->a[2] + t * 3.0 * b->a[3]);
}

static inline void
_GSRationalBezierComputeBezierDesc(_GSRationalBezierDesc *rb)
{
Expand All @@ -106,18 +98,6 @@
return _GSBezierEval(&(rb->n), t) / _GSBezierEval(&(rb->d), t);
}

static inline float
_GSRationalBezierDerivEval(_GSRationalBezierDesc *rb, float t)
{
float h;
if (!rb->areBezierDescComputed)
_GSRationalBezierComputeBezierDesc(rb);
h = _GSBezierEval(&(rb->d), t);
return (_GSBezierDerivEval(&(rb->n), t) * h
- _GSBezierEval (&(rb->n), t) * _GSBezierDerivEval(&(rb->d), t))
/ (h*h);
}

static
_NSAnimationCurveDesc _gs_animationCurveDesc[] =
{
Expand Down
8 changes: 8 additions & 0 deletions Source/NSComboBox.m
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ - (void) _performClickWithFrame: (NSRect)cellFrame
inView: (NSView *)controlView;
@end

/*
* Declaration of private NSTextField method
*/

@interface NSTextField (GNUstepPrivate)
- (BOOL)textView: (NSTextView*)textView doCommandBySelector: (SEL)command;
@end

/**
<unit>
<heading>Class Description</heading>
Expand Down
2 changes: 1 addition & 1 deletion Source/NSFontAssetRequest.m
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ - (void) downloadFontAssetsWithCompletionHandler:
{
NSError *error = nil;

NSAssert(completionHandler != nil, NSInvalidArgumentException);
NSAssert(completionHandler != NULL, NSInvalidArgumentException);
CALL_NON_NULL_BLOCK(completionHandler, error);
}

Expand Down
2 changes: 1 addition & 1 deletion Source/NSRulerView.m
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ - (void) setMarkers: (NSArray *)newMarkers
}
else
{
ASSIGN(_markers, nil);
DESTROY(_markers);
}
[self setNeedsDisplay: YES];
}
Expand Down
2 changes: 1 addition & 1 deletion Source/NSSavePanel.m
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ - (BOOL) _browser: (NSBrowser*)sender
else
{
ASSIGN (_directory, [path stringByAppendingPathComponent: title]);
ASSIGN (_fullFileName, nil);
DESTROY (_fullFileName);
}

[self _selectTextInColumn:column];
Expand Down

0 comments on commit 14baf92

Please sign in to comment.