| 23 | 23 |
output truncated before the last format character [-Wformat-truncation=]
|
| 24 | 24 |
‘receiver’ may not respond to ‘-message’
|
| 25 | 25 |
multiple methods named ‘-foo’ found
|
|
26 |
operation on ‘foo’ may be undefined [-Wsequence-point]
|
| 26 | 27 |
Author: Yavor Doganov <yavor@gnu.org>
|
| 27 | 28 |
Bug-Debian: http://bugs.debian.org/749733
|
| 28 | 29 |
Forwarded: no
|
| 29 | |
Last-Update: 2018-01-07
|
|
30 |
Last-Update: 2019-01-24
|
| 30 | 31 |
---
|
| 31 | 32 |
|
| 32 | 33 |
--- adun.app.orig/Kernel/AdunKernel/CoreAdditions/AdunTrajectory.m
|
|
| 1539 | 1540 |
{
|
| 1540 | 1541 |
--- adun.app.orig/Kernel/AdunKernel/Framework/AdunSmoothedGBTerm.m
|
| 1541 | 1542 |
+++ adun.app/Kernel/AdunKernel/Framework/AdunSmoothedGBTerm.m
|
| 1542 | |
@@ -69,7 +69,7 @@
|
|
1543 |
@@ -69,13 +69,13 @@
|
| 1543 | 1544 |
NSArray* array;
|
| 1544 | 1545 |
NSString* coefficientKey;
|
| 1545 | 1546 |
|
|
| 1548 | 1549 |
{
|
| 1549 | 1550 |
//Initialise some ivars
|
| 1550 | 1551 |
integrationStartPoint = 0.5; //Following Im et al.
|
|
1552 |
meshSize = 1.0; //Better for identifying complete overlaps
|
|
1553 |
cutBuffer = 0.0;
|
|
1554 |
- totalPairESTPotential = totalPairESTPotential = totalNonpolarPotential = 0;
|
|
1555 |
+ totalPairESTPotential = totalNonpolarPotential = 0;
|
|
1556 |
memoryManager = [AdMemoryManager appMemoryManager];
|
|
1557 |
|
|
1558 |
//Set arguments
|
| 1551 | 1559 |
@@ -240,8 +240,6 @@
|
| 1552 | 1560 |
|
| 1553 | 1561 |
- (void) calculateBornRadii
|
|
| 3550 | 3558 |
if([NSStringFromSelector(aSelector) isEqual: @"insertNewline:"])
|
| 3551 | 3559 |
--- adun.app.orig/UL/ULExportController.m
|
| 3552 | 3560 |
+++ adun.app/UL/ULExportController.m
|
| 3553 | |
@@ -49,7 +49,7 @@
|
|
3561 |
@@ -20,6 +20,7 @@
|
|
3562 |
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
|
|
3563 |
*/
|
|
3564 |
#include "ULExportController.h"
|
|
3565 |
+#import "ULInterfaceFunctions.h"
|
|
3566 |
#include <AdunKernel/AdunFileSystemSimulationStorage.h>
|
|
3567 |
#include <MolTalk/MolTalk.h>
|
|
3568 |
|
|
3569 |
@@ -49,7 +50,7 @@
|
| 3554 | 3570 |
if(sharedExportController != nil)
|
| 3555 | 3571 |
return sharedExportController;
|
| 3556 | 3572 |
|
|
| 3559 | 3575 |
{
|
| 3560 | 3576 |
if([NSBundle loadNibNamed: @"CreateAttributePanel" owner: self] == NO)
|
| 3561 | 3577 |
{
|
| 3562 | |
@@ -119,7 +119,6 @@
|
|
3578 |
@@ -119,7 +120,6 @@
|
| 3563 | 3579 |
- (void) _exportObjectAsBinaryArchive: (id) anObject toFile: (NSString*) filename
|
| 3564 | 3580 |
{
|
| 3565 | 3581 |
BOOL retVal;
|
|
| 3567 | 3583 |
NSError *error;
|
| 3568 | 3584 |
NSMutableData *data;
|
| 3569 | 3585 |
NSKeyedArchiver* archiver;
|
| 3570 | |
@@ -177,17 +176,17 @@
|
|
3586 |
@@ -177,17 +177,17 @@
|
| 3571 | 3587 |
|
| 3572 | 3588 |
- (void) export: (id) sender
|
| 3573 | 3589 |
{
|
|
| 3589 | 3605 |
format = [exportPanel choice];
|
| 3590 | 3606 |
|
| 3591 | 3607 |
if(result == NSOKButton)
|
| 3592 | |
@@ -204,7 +203,6 @@
|
|
3608 |
@@ -204,7 +204,6 @@
|
| 3593 | 3609 |
{
|
| 3594 | 3610 |
//Take any extension off filename
|
| 3595 | 3611 |
//This just makes it easier to work with it later
|
|
| 3597 | 3613 |
exportObject = [pasteboard objectForType: type];
|
| 3598 | 3614 |
[self exportObject: exportObject
|
| 3599 | 3615 |
toFile: filename
|
| 3600 | |
@@ -220,7 +218,7 @@
|
|
3616 |
@@ -220,7 +219,7 @@
|
| 3601 | 3617 |
*/
|
| 3602 | 3618 |
- (void) exportObject: (id) anObject toFile: (NSString*) filename as: (ULExportType) type
|
| 3603 | 3619 |
{
|
|
| 3606 | 3622 |
|
| 3607 | 3623 |
switch((int)type)
|
| 3608 | 3624 |
{
|
| 3609 | |
@@ -246,7 +244,6 @@
|
|
3625 |
@@ -246,7 +245,6 @@
|
| 3610 | 3626 |
|
| 3611 | 3627 |
- (void) exportObject: (id) anObject toFile: (NSString*) filename format: (NSString*) format
|
| 3612 | 3628 |
{
|
|
| 3614 | 3630 |
NSString* selectorString;
|
| 3615 | 3631 |
|
| 3616 | 3632 |
if([format isEqual: @"binary archive"])
|
| 3617 | |
@@ -324,7 +321,7 @@
|
|
3633 |
@@ -324,7 +322,7 @@
|
| 3618 | 3634 |
- (void) exportCurrentPasteboardObjectAs: (ULExportType) type
|
| 3619 | 3635 |
{
|
| 3620 | 3636 |
int result;
|
|
| 3623 | 3639 |
NSArray* availableTypes;
|
| 3624 | 3640 |
NSSavePanel* savePanel;
|
| 3625 | 3641 |
id exportObject;
|
| 3626 | |
@@ -349,7 +346,6 @@
|
|
3642 |
@@ -349,7 +347,6 @@
|
| 3627 | 3643 |
{
|
| 3628 | 3644 |
//Take any extension off filename
|
| 3629 | 3645 |
//This just makes it easier to work with it later
|
|
| 3631 | 3647 |
exportObject = [pasteboard objectForType: className];
|
| 3632 | 3648 |
[self exportObject: exportObject
|
| 3633 | 3649 |
toFile: filename
|
| 3634 | |
@@ -509,11 +505,10 @@
|
|
3650 |
@@ -430,11 +427,6 @@
|
|
3651 |
if(result == NSOKButton)
|
|
3652 |
{
|
|
3653 |
|
|
3654 |
-//Gnustep base pre 0.16
|
|
3655 |
-#if defined GNUSTEP && GS_API_VERSION(0, 011600)
|
|
3656 |
- [string writeToFile: filename
|
|
3657 |
- atomically: NO];
|
|
3658 |
-#else
|
|
3659 |
[string writeToFile: filename
|
|
3660 |
atomically: NO
|
|
3661 |
encoding: NSUTF8StringEncoding
|
|
3662 |
@@ -442,7 +434,6 @@
|
|
3663 |
|
|
3664 |
if(error != nil)
|
|
3665 |
ULRunErrorPanel(error);
|
|
3666 |
-#endif
|
|
3667 |
|
|
3668 |
}
|
|
3669 |
}
|
|
3670 |
@@ -509,11 +500,10 @@
|
| 3635 | 3671 |
int i;
|
| 3636 | 3672 |
NSRange numRange;
|
| 3637 | 3673 |
NSMutableString* string = [NSMutableString new];
|
|
| 3645 | 3681 |
|
| 3646 | 3682 |
matrixName = [matrixList titleOfSelectedItem];
|
| 3647 | 3683 |
|
| 3648 | |
@@ -565,7 +560,6 @@
|
|
3684 |
@@ -565,7 +555,6 @@
|
| 3649 | 3685 |
{
|
| 3650 | 3686 |
useAtoms = YES;
|
| 3651 | 3687 |
[string appendString: @"recipient: atoms\n"];
|