Package: gworkspace / 0.9.4-1

misc-compiler-warnings.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
Description: Fix miscellaneous compiler warnings.
 - @interface of class ‘NSPopUpMenu’ not found
 - ‘NSCollectionViewItem’ may not respond to ‘-setTag:’
 - logical not is only applied to the left hand side of comparison
 - initialization from distinct Objective-C type
 - variable ‘is_daemon’ set but not used
 - comparison between pointer and zero character constant
Author: Yavor Doganov <yavor@gnu.org>
Forwarded: https://savannah.gnu.org/bugs/?52730
Last-Update: 2017-12-22
---

--- gworkspace.orig/GWMetadata/MDKit/MDKAttributeEditor.h
+++ gworkspace/GWMetadata/MDKit/MDKAttributeEditor.h
@@ -33,7 +33,7 @@
 @class MDKStringEditor;
 @class NSBox;
 @class NSTextField;
-@class NSPopUpMenu;
+@class NSPopUpButtonCell;
 @class NSButton;
 @class NSStepper;
 @class NSView;
@@ -43,13 +43,13 @@
   IBOutlet id win;
   IBOutlet NSBox *editorBox;
   
-  IBOutlet NSPopUpMenu *operatorPopup;
+  IBOutlet NSPopUpButtonCell *operatorPopup;
   
   IBOutlet NSBox *valueBox;  
   IBOutlet NSTextField *valueField;
   
   IBOutlet NSBox *firstValueBox;
-  IBOutlet NSPopUpMenu *valuesPopup;
+  IBOutlet NSPopUpButtonCell *valuesPopup;
   
   IBOutlet NSBox *secondValueBox;
   
--- gworkspace.orig/GWMetadata/MDKit/MDKAttributeView.h
+++ gworkspace/GWMetadata/MDKit/MDKAttributeView.h
@@ -28,7 +28,7 @@
 #include <Foundation/Foundation.h>
 
 @class NSBox;
-@class NSPopUpMenu;
+@class NSPopUpButtonCell;
 @class NSButton;
 @class MDKWindow;
 @class MDKAttribute;
@@ -37,7 +37,7 @@
 {
   IBOutlet id win;
   IBOutlet NSBox *mainBox;
-  IBOutlet NSPopUpMenu *popUp;
+  IBOutlet NSPopUpButtonCell *popUp;
   IBOutlet NSBox *editorBox;
   IBOutlet NSButton *removeButt;
   IBOutlet NSButton *addButt;
--- gworkspace.orig/GWMetadata/MDKit/MDKQuery.m
+++ gworkspace/GWMetadata/MDKit/MDKQuery.m
@@ -1986,9 +1986,9 @@
   }
 
   if ([self scanString: @"(" intoString: NULL]) {
-    PARSEXCEPT (!(((parsed & SUBOPEN) == SUBOPEN) 
+    PARSEXCEPT ((!(((parsed & SUBOPEN) == SUBOPEN)
                       || ((parsed & COMPOUND) == COMPOUND)
-                      || ((parsed == 0) && (currentQuery == rootQuery))), 
+                      || ((parsed == 0) && (currentQuery == rootQuery)))),
                                       @"subquery without compound operator");
     parsed &= ~(COMPOUND | SUBCLOSE | COMPARISION);  
     parsed |= SUBOPEN;
--- gworkspace.orig/GWMetadata/MDKit/MDKWindow.m
+++ gworkspace/GWMetadata/MDKit/MDKWindow.m
@@ -1126,7 +1126,7 @@
       newquery = YES;
     
     } else {
-      MDKAttribute *attribute = [sender attribute];      
+      MDKAttribute *attribute = (MDKAttribute *)[sender attribute];
 
       if ([attribute inUse]) {  
         if ([sender hasValidValues]) {    
--- gworkspace.orig/GWMetadata/gmds/mdextractor/mdextractor.m
+++ gworkspace/GWMetadata/gmds/mdextractor/mdextractor.m
@@ -1594,12 +1594,10 @@
   CREATE_AUTORELEASE_POOL(pool);
   NSProcessInfo *info = [NSProcessInfo processInfo];
   NSMutableArray *args = AUTORELEASE ([[info arguments] mutableCopy]);
-  static BOOL	is_daemon = NO;
   BOOL subtask = YES;
 
   if ([[info arguments] containsObject: @"--daemon"]) {
     subtask = NO;
-    is_daemon = YES;
   }
 
   if (subtask) {
--- gworkspace.orig/GWorkspace/TShelf/TShelfView.m
+++ gworkspace/GWorkspace/TShelf/TShelfView.m
@@ -321,7 +321,7 @@
   [[NSColor controlColor] set];
   NSRectFill(NSMakeRect(p.x, p.y, s.width, s.height - TAB_H));
 
-  if (selected == NO) {
+  if (selected == nil) {
     [self selectTabItemAtIndex: 0];
   }