mirror of
https://github.com/gnustep/libs-gdl2.git
synced 2025-02-21 02:20:55 +00:00
* EOAccess/EOEntity.m
remove unused variable * EOControl/EOEditingContext.m use the object, instead of the EOGlobalID to get the entityName * EOControl/EOGenericRecord.m * EOInterface/EOColumnAssociation.[h|m] * EOInterface/EOTableViewAssociation.m some NS(U)Integer conversions git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@36677 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
a1c3192f7f
commit
291ec858bf
7 changed files with 33 additions and 24 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2013-05-29: Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
|
||||||
|
* EOAccess/EOEntity.m
|
||||||
|
remove unused variable
|
||||||
|
* EOControl/EOEditingContext.m
|
||||||
|
use the object, instead of the EOGlobalID to get the entityName
|
||||||
|
* EOControl/EOGenericRecord.m
|
||||||
|
* EOInterface/EOColumnAssociation.[h|m]
|
||||||
|
* EOInterface/EOTableViewAssociation.m
|
||||||
|
some NS(U)Integer conversions
|
||||||
|
|
||||||
2013-05-28: Graham Lee <iamleeg@gmail.com>
|
2013-05-28: Graham Lee <iamleeg@gmail.com>
|
||||||
* Tools/gsdoc-model.m
|
* Tools/gsdoc-model.m
|
||||||
* EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m
|
* EOAdaptors/SQLiteAdaptor/LoginPanel/SQLite3LoginPanel.m
|
||||||
|
|
|
@ -1417,7 +1417,6 @@ static void performSelectorOnArrayWithEachObjectOfClass(NSArray *arr, SEL select
|
||||||
NSString *key = nil;
|
NSString *key = nil;
|
||||||
id value = nil;
|
id value = nil;
|
||||||
NSUInteger i, count;
|
NSUInteger i, count;
|
||||||
BOOL isValid = YES;
|
|
||||||
IMP pkanOAI=NULL;
|
IMP pkanOAI=NULL;
|
||||||
IMP objectVFK=NULL;
|
IMP objectVFK=NULL;
|
||||||
|
|
||||||
|
|
|
@ -3458,7 +3458,7 @@ modified state of the object.**/
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
objectCopy = [[EOClassDescription classDescriptionForEntityName:
|
objectCopy = [[EOClassDescription classDescriptionForEntityName:
|
||||||
[globalID entityName]]
|
[object entityName]]
|
||||||
createInstanceWithEditingContext: context
|
createInstanceWithEditingContext: context
|
||||||
globalID: globalID
|
globalID: globalID
|
||||||
zone: NULL];
|
zone: NULL];
|
||||||
|
@ -3606,7 +3606,7 @@ modified state of the object.**/
|
||||||
gid=EOEditingContext_globalIDForObjectWithImpPtr(context,&globalIDForObjectIMP,object);
|
gid=EOEditingContext_globalIDForObjectWithImpPtr(context,&globalIDForObjectIMP,object);
|
||||||
|
|
||||||
localObject = [[EOClassDescription classDescriptionForEntityName:
|
localObject = [[EOClassDescription classDescriptionForEntityName:
|
||||||
[gid entityName]]
|
[object entityName]]
|
||||||
createInstanceWithEditingContext: context
|
createInstanceWithEditingContext: context
|
||||||
globalID: gid
|
globalID: gid
|
||||||
zone: NULL];
|
zone: NULL];
|
||||||
|
|
|
@ -151,7 +151,7 @@ __attribute__((objc_root_class))
|
||||||
{
|
{
|
||||||
SEL sel = 0;
|
SEL sel = 0;
|
||||||
const char *type = 0;
|
const char *type = 0;
|
||||||
int off;
|
int off = 0;
|
||||||
unsigned size = [aKey length];
|
unsigned size = [aKey length];
|
||||||
id self_id = self;
|
id self_id = self;
|
||||||
|
|
||||||
|
|
|
@ -91,20 +91,20 @@
|
||||||
- (void)tableView: (NSTableView *)tableView
|
- (void)tableView: (NSTableView *)tableView
|
||||||
setObjectValue: (id)object
|
setObjectValue: (id)object
|
||||||
forTableColumn: (NSTableColumn *)tableColumn
|
forTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row;
|
row: (NSInteger)row;
|
||||||
|
|
||||||
- (id)tableView: (NSTableView *)tableView
|
- (id)tableView: (NSTableView *)tableView
|
||||||
objectValueForTableColumn: (NSTableColumn *)tableColumn
|
objectValueForTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row;
|
row: (NSInteger)row;
|
||||||
|
|
||||||
- (BOOL)tableView: (NSTableView *)tableView
|
- (BOOL)tableView: (NSTableView *)tableView
|
||||||
shouldEditTableColumn: (NSTableColumn *)tableColumn
|
shouldEditTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row;
|
row: (NSInteger)row;
|
||||||
|
|
||||||
- (void)tableView: (NSTableView *)tableView
|
- (void)tableView: (NSTableView *)tableView
|
||||||
willDisplayCell: (id)cell
|
willDisplayCell: (id)cell
|
||||||
forTableColumn: (NSTableColumn *)tableColumn
|
forTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row;
|
row: (NSInteger)row;
|
||||||
|
|
||||||
/* EOColumnViewAssociation control delegate. */
|
/* EOColumnViewAssociation control delegate. */
|
||||||
- (BOOL)control: (NSControl *)control
|
- (BOOL)control: (NSControl *)control
|
||||||
|
@ -169,21 +169,21 @@ textShouldBeginEditing: (NSText *)fieldEditor;
|
||||||
- (void)tableView: (NSTableView *)tableView
|
- (void)tableView: (NSTableView *)tableView
|
||||||
setObjectValue: (id)object
|
setObjectValue: (id)object
|
||||||
forTableColumn: (NSTableColumn *)tableColumn
|
forTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row;
|
row: (NSInteger)row;
|
||||||
|
|
||||||
- (id)tableView: (NSTableView *)tableView
|
- (id)tableView: (NSTableView *)tableView
|
||||||
objectValueForTableColumn: (NSTableColumn *)tableColumn
|
objectValueForTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row;
|
row: (NSInteger)row;
|
||||||
|
|
||||||
/* Delegate methods for table view. */
|
/* Delegate methods for table view. */
|
||||||
- (BOOL)tableView: (NSTableView *)tableView
|
- (BOOL)tableView: (NSTableView *)tableView
|
||||||
shouldEditTableColumn: (NSTableColumn *)tableColumn
|
shouldEditTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row;
|
row: (NSInteger)row;
|
||||||
|
|
||||||
- (void)tableView: (NSTableView *)tableView
|
- (void)tableView: (NSTableView *)tableView
|
||||||
willDisplayCell: (id)cell
|
willDisplayCell: (id)cell
|
||||||
forTableColumn: (NSTableColumn *)tableColumn
|
forTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row;
|
row: (NSInteger)row;
|
||||||
|
|
||||||
/* Notification methods for table view. */
|
/* Notification methods for table view. */
|
||||||
- (void)tableViewSelectionDidChange: (NSNotification *)notification;
|
- (void)tableViewSelectionDidChange: (NSNotification *)notification;
|
||||||
|
|
|
@ -135,7 +135,7 @@
|
||||||
if (subclassFlags & ValueAspectMask)
|
if (subclassFlags & ValueAspectMask)
|
||||||
{
|
{
|
||||||
NSTableView *tv = [[self object] tableView];
|
NSTableView *tv = [[self object] tableView];
|
||||||
int row = tv ? [tv editedRow] : -1;
|
NSInteger row = tv ? [tv editedRow] : -1;
|
||||||
|
|
||||||
if (row != -1)
|
if (row != -1)
|
||||||
{
|
{
|
||||||
|
@ -161,21 +161,21 @@
|
||||||
- (void)tableView: (NSTableView *)tableView
|
- (void)tableView: (NSTableView *)tableView
|
||||||
setObjectValue: (id)object
|
setObjectValue: (id)object
|
||||||
forTableColumn: (NSTableColumn *)tableColumn
|
forTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row
|
row: (NSInteger)row
|
||||||
{
|
{
|
||||||
[self setValue:object forAspect:@"value" atIndex:row];
|
[self setValue:object forAspect:@"value" atIndex:row];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (id)tableView: (NSTableView *)tableView
|
- (id)tableView: (NSTableView *)tableView
|
||||||
objectValueForTableColumn: (NSTableColumn *)tableColumn
|
objectValueForTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row
|
row: (NSInteger)row
|
||||||
{
|
{
|
||||||
return [self valueForAspect:@"value" atIndex:row];
|
return [self valueForAspect:@"value" atIndex:row];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (BOOL)tableView: (NSTableView *)tableView
|
- (BOOL)tableView: (NSTableView *)tableView
|
||||||
shouldEditTableColumn: (NSTableColumn *)tableColumn
|
shouldEditTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row
|
row: (NSInteger)row
|
||||||
{
|
{
|
||||||
if (_enabledAspectBound)
|
if (_enabledAspectBound)
|
||||||
return [[self valueForAspect:@"enabled"] boolValue];
|
return [[self valueForAspect:@"enabled"] boolValue];
|
||||||
|
@ -186,7 +186,7 @@ shouldEditTableColumn: (NSTableColumn *)tableColumn
|
||||||
- (void)tableView: (NSTableView *)tableView
|
- (void)tableView: (NSTableView *)tableView
|
||||||
willDisplayCell: (id)cell
|
willDisplayCell: (id)cell
|
||||||
forTableColumn: (NSTableColumn *)tableColumn
|
forTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row
|
row: (NSInteger)row
|
||||||
{
|
{
|
||||||
if (_enabledAspectBound)
|
if (_enabledAspectBound)
|
||||||
[cell setEnabled:[[self valueForAspect:@"value" atIndex:row] boolValue]];
|
[cell setEnabled:[[self valueForAspect:@"value" atIndex:row] boolValue]];
|
||||||
|
|
|
@ -149,13 +149,13 @@ static NSMapTable *tvAssociationMap;
|
||||||
if (!_extras)
|
if (!_extras)
|
||||||
{
|
{
|
||||||
NSArray *selectionIndexes = RETAIN([dg selectionIndexes]);
|
NSArray *selectionIndexes = RETAIN([dg selectionIndexes]);
|
||||||
unsigned int i, count;
|
NSUInteger i, count;
|
||||||
count = [selectionIndexes count];
|
count = [selectionIndexes count];
|
||||||
if (count)
|
if (count)
|
||||||
{
|
{
|
||||||
for (i = 0; i < count; i++)
|
for (i = 0; i < count; i++)
|
||||||
{
|
{
|
||||||
int rowIndex = [[selectionIndexes objectAtIndex:i] intValue];
|
NSInteger rowIndex = [[selectionIndexes objectAtIndex:i] integerValue];
|
||||||
|
|
||||||
/* don't extend the first selection */
|
/* don't extend the first selection */
|
||||||
[[self object] selectRow: rowIndex
|
[[self object] selectRow: rowIndex
|
||||||
|
@ -229,7 +229,7 @@ static NSMapTable *tvAssociationMap;
|
||||||
|
|
||||||
- (EOColumnAssociation *)editingAssociation
|
- (EOColumnAssociation *)editingAssociation
|
||||||
{
|
{
|
||||||
int editedColumn = [[self object] editedColumn];
|
NSInteger editedColumn = [[self object] editedColumn];
|
||||||
|
|
||||||
if (editedColumn == -1)
|
if (editedColumn == -1)
|
||||||
{
|
{
|
||||||
|
@ -249,7 +249,7 @@ static NSMapTable *tvAssociationMap;
|
||||||
- (void)tableView: (NSTableView *)tableView
|
- (void)tableView: (NSTableView *)tableView
|
||||||
setObjectValue: (id)object
|
setObjectValue: (id)object
|
||||||
forTableColumn: (NSTableColumn *)tableColumn
|
forTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row
|
row: (NSInteger)row
|
||||||
{
|
{
|
||||||
[(EOColumnAssociation *)[tableColumn identifier]
|
[(EOColumnAssociation *)[tableColumn identifier]
|
||||||
tableView: tableView
|
tableView: tableView
|
||||||
|
@ -260,7 +260,7 @@ static NSMapTable *tvAssociationMap;
|
||||||
|
|
||||||
- (id)tableView: (NSTableView *)tableView
|
- (id)tableView: (NSTableView *)tableView
|
||||||
objectValueForTableColumn: (NSTableColumn *)tableColumn
|
objectValueForTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row
|
row: (NSInteger)row
|
||||||
{
|
{
|
||||||
id object;
|
id object;
|
||||||
object = [[tableColumn identifier] tableView: tableView
|
object = [[tableColumn identifier] tableView: tableView
|
||||||
|
@ -271,7 +271,7 @@ objectValueForTableColumn: (NSTableColumn *)tableColumn
|
||||||
|
|
||||||
- (BOOL)tableView: (NSTableView *)tableView
|
- (BOOL)tableView: (NSTableView *)tableView
|
||||||
shouldEditTableColumn: (NSTableColumn *)tableColumn
|
shouldEditTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row
|
row: (NSInteger)row
|
||||||
{
|
{
|
||||||
if (_enabledAspectBound)
|
if (_enabledAspectBound)
|
||||||
if ([[self valueForAspect: @"enabled" atIndex:row] boolValue] == NO)
|
if ([[self valueForAspect: @"enabled" atIndex:row] boolValue] == NO)
|
||||||
|
@ -283,7 +283,7 @@ shouldEditTableColumn: (NSTableColumn *)tableColumn
|
||||||
- (void)tableView: (NSTableView *)tableView
|
- (void)tableView: (NSTableView *)tableView
|
||||||
willDisplayCell: (id)cell
|
willDisplayCell: (id)cell
|
||||||
forTableColumn: (NSTableColumn *)tableColumn
|
forTableColumn: (NSTableColumn *)tableColumn
|
||||||
row: (int)row
|
row: (NSInteger)row
|
||||||
{
|
{
|
||||||
if (_enabledAspectBound)
|
if (_enabledAspectBound)
|
||||||
[cell setEnabled: [[self valueForAspect:@"enabled" atIndex: row] boolValue]];
|
[cell setEnabled: [[self valueForAspect:@"enabled" atIndex: row] boolValue]];
|
||||||
|
|
Loading…
Reference in a new issue