fixed gcc 4.0 warnings

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@770 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/Sieve/ChangeLog b/SOGo/SoObjects/Sieve/ChangeLog
index 05157bda6d74bb7d0fba3b0d399dad77b216bd0d..1003b3a339bacdc4722cae24ff7796c0e868835c 100644 (file)
--- a/SOGo/SoObjects/Sieve/ChangeLog
+++ b/SOGo/SoObjects/Sieve/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
+
+       * SOGoSieveScriptObject.m: fixed a gcc 4.0 warning (v0.9.11)
+
 2005-07-11  Helge Hess  <helge.hess@opengroupware.org>
 
        * SOGoSieveBaseObject.[hm]: removed unused -imap4Client method

diff --git a/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m b/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m
index 98aa60ebd8c929758a56dde2a1997e731573a785..527a13349de49fc6e7d0d54e736ce94a8f7e7a44 100644 (file)
--- a/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m
+++ b/SOGo/SoObjects/Sieve/SOGoSieveScriptObject.m
@@ -50,7 +50,8 @@
   NSString *reason;
   
   /* Note: valueForKey:@"reason" does not work?! */
-  reason = [[_result valueForKey:@"RawResponse"] objectForKey:@"reason"];
+  reason = [(NSDictionary *)[_result valueForKey:@"RawResponse"] 
+                           objectForKey:@"reason"];
   if (![reason isNotNull])
     reason = @"Failed to upload Sieve script.";
   

diff --git a/SOGo/SoObjects/Sieve/Version b/SOGo/SoObjects/Sieve/Version
index fb0c6a818d2a9ad2b7e0496b288c213fef53caed..b92acff698a476f437a7751d962237e34ec6c4e2 100644 (file)
--- a/SOGo/SoObjects/Sieve/Version
+++ b/SOGo/SoObjects/Sieve/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=10
+SUBMINOR_VERSION:=11
 
 # v0.9.9 requires libNGMime v4.5.223
 # v0.9.6 requires libNGMime v4.5.207

diff --git a/SOGo/UI/MailPartViewers/ChangeLog b/SOGo/UI/MailPartViewers/ChangeLog
index f52e981e5889a41ecf14b7145f360d601f0f6a9f..62bfd39fa6c933753ae66ea16b575d044f41e627 100644 (file)
--- a/SOGo/UI/MailPartViewers/ChangeLog
+++ b/SOGo/UI/MailPartViewers/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
+
+       * UIxMailSizeFormatter.m, UIxMailPartMixedViewer.m, 
+         UIxMailPartICalViewer.m, UIxMailPartAlternativeViewer.m,
+         UIxMailPartViewer.m: fixed gcc 4.0 warnings (v0.9.8)
+
 2005-07-14  Helge Hess  <helge.hess@opengroupware.org>
 
        * UIxMailPartICalViewer.m: properly reset part caches when the

diff --git a/SOGo/UI/MailPartViewers/UIxMailPartAlternativeViewer.m b/SOGo/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
index eff3d340ddc6a8711976e41a24ee45f8c88f7b07..95e4e2e7a6cfdd103d951746753858eed3068966 100644 (file)
--- a/SOGo/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
+++ b/SOGo/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
@@ -138,7 +138,7 @@
 }
 
 - (NSString *)childPartName {
-  unsigned char buf[8];
+  char buf[8];
   sprintf(buf, "%d", [self childIndex] + 1);
   return [NSString stringWithCString:buf];
 }

diff --git a/SOGo/UI/MailPartViewers/UIxMailPartICalViewer.m b/SOGo/UI/MailPartViewers/UIxMailPartICalViewer.m
index ba1315ae54faa8cb8b9ad368baffa6daa33ed235..46b07ca3212ce390e95ffe29ee08dbffb62be720 100644 (file)
--- a/SOGo/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/SOGo/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -179,7 +179,7 @@
 }
 
 - (iCalEvent *)storedEvent {
-  return [[self storedEventObject] event];
+  return [(SOGoAppointmentObject *)[self storedEventObject] event];
 }
 
 /* organizer tracking */

diff --git a/SOGo/UI/MailPartViewers/UIxMailPartMixedViewer.m b/SOGo/UI/MailPartViewers/UIxMailPartMixedViewer.m
index e0ace2c7a8aa05d1e62b0de17bb24ec220671d85..191d35b7a68c9e245369802a6e7b63f19df44448 100644 (file)
--- a/SOGo/UI/MailPartViewers/UIxMailPartMixedViewer.m
+++ b/SOGo/UI/MailPartViewers/UIxMailPartMixedViewer.m
@@ -64,7 +64,7 @@
 }
 
 - (NSString *)childPartName {
-  unsigned char buf[8];
+  char buf[8];
   sprintf(buf, "%d", [self childIndex] + 1);
   return [NSString stringWithCString:buf];
 }

diff --git a/SOGo/UI/MailPartViewers/UIxMailPartViewer.m b/SOGo/UI/MailPartViewers/UIxMailPartViewer.m
index ce1e6f7eecd3602bba103c9e2e7b41bdb8886b70..0308ff8f89aa999784e880543623eed5c03f5eb8 100644 (file)
--- a/SOGo/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/SOGo/UI/MailPartViewers/UIxMailPartViewer.m
@@ -87,7 +87,8 @@
 - (NSData *)decodedFlatContent {
   NSString *enc;
   
-  enc = [[[self bodyInfo] objectForKey:@"encoding"] lowercaseString];
+  enc = [[(NSDictionary *)[self bodyInfo] 
+                         objectForKey:@"encoding"] lowercaseString];
   
   if ([enc isEqualToString:@"7bit"])
     return [self flatContent];
@@ -117,8 +118,9 @@
     return nil;
   }
   
-  charset =
-    [[[self bodyInfo] objectForKey:@"parameterList"] objectForKey:@"charset"];
+  charset = [(NSDictionary *)
+             [(NSDictionary *)[self bodyInfo] objectForKey:@"parameterList"] 
+                                              objectForKey:@"charset"];
   charset = [charset lowercaseString];
   
   // TODO: properly decode charset, might need to handle encoding?

diff --git a/SOGo/UI/MailPartViewers/UIxMailSizeFormatter.m b/SOGo/UI/MailPartViewers/UIxMailSizeFormatter.m
index 34b3579964db340c48b05362dac3d5d8484fbb79..002de6f7a96a2156b764566ee5a79147d7a1a414 100644 (file)
--- a/SOGo/UI/MailPartViewers/UIxMailSizeFormatter.m
+++ b/SOGo/UI/MailPartViewers/UIxMailSizeFormatter.m
@@ -33,7 +33,7 @@
 /* formatting */
 
 - (NSString *)stringForSize:(unsigned int)size {
-  unsigned char buf[128];
+  char buf[128];
   
   if (size < 1024)
     sprintf(buf, "%d", size);

diff --git a/SOGo/UI/MailPartViewers/Version b/SOGo/UI/MailPartViewers/Version
index 386501a0c3dc2696457d0bc3987fff61d978aa3d..612c754bdd99da993776f97e0b18e6cbf86648a8 100644 (file)
--- a/SOGo/UI/MailPartViewers/Version
+++ b/SOGo/UI/MailPartViewers/Version
@@ -1,5 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=6
+SUBMINOR_VERSION:=8
 
 # v0.9.1 requires libNGMime v4.5.213

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index 7fdc6753ca923a3220e14ab88650f87bd4eadef4..01a03c4f672240f7f1971895c9e187ab78406d2c 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,5 +1,9 @@
 2005-07-15  Helge Hess  <helge.hess@opengroupware.org>
 
+       * UIxCalScheduleOverview.m, UIxAppointmentView.m,
+         UIxAppointmentProposal.m, UIxAppointmentEditor.m: fixed gcc 4.0
+         warnings (v0.9.135)
+
        * UIxAppointmentView.h: fixed a Cocoa warning (v0.9.134)
 
 2005-07-14  Marcus Mueller  <znek@mulle-kybernetik.com>

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index 6b0d2c68f302cf42810d520abc5f9b93c4591b99..5acb46fa0d27438a7e8c3543452e89022137e979 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
@@ -347,7 +347,7 @@
 - (NSString *)cycleLabel {
   NSString *key;
   
-  key = [self->item objectForKey:@"label"];
+  key = [(NSDictionary *)self->item objectForKey:@"label"];
   return [self labelForKey:key];
 }
 
@@ -944,7 +944,7 @@
   return self;
 }
 
-- (id)defaultAction {
+- (id<WOActionResults>)defaultAction {
   NSString *ical;
   
   /* load iCalendar file */

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.m b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
index c6be40abec776bb906fa345e862ce0b4d37194e7..d540e2ff5bae8a2b9d5fe00729d571ac11cff996 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
@@ -377,7 +377,7 @@
   return YES;
 }
 
-- (id)defaultAction {
+- (id<WOActionResults>)defaultAction {
   NSCalendarDate *now;
   
   now = [NSCalendarDate date];

diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.m b/SOGo/UI/Scheduler/UIxAppointmentView.m
index febffc0579b272df6607d421fc375d10fd8edc74..b6394dc740ac11b3d948c9fcf47468225d4a99c7 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentView.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentView.m
@@ -215,7 +215,7 @@
 
 /* action */
 
-- (id)defaultAction {
+- (id<WOActionResults>)defaultAction {
   if ([self appointment] == nil) {
     return [NSException exceptionWithHTTPStatus:404 /* Not Found */
                        reason:@"could not locate appointment"];

diff --git a/SOGo/UI/Scheduler/UIxCalScheduleOverview.m b/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
index 5522a1e7f6d9cc6d90a036d93829b6ace9407b53..3b230aed3a82cc9bccd5d4b6021dac8868e5bcc0 100644 (file)
--- a/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
+++ b/SOGo/UI/Scheduler/UIxCalScheduleOverview.m
@@ -324,7 +324,7 @@
     NSString *orgEmail;
 
     apt      = [apts objectAtIndex:i];
-    orgEmail = [apt objectForKey:@"orgmail"];
+    orgEmail = [(NSDictionary *)apt objectForKey:@"orgmail"];
     if (orgEmail && [orgEmail isEqualToString:userEmail]) {
       [self->userApts addObject:apt];
     }

diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version
index 21ae0daff0b47f4966c9f3ea9aaa5bae27adbd66..23169dd85aa5638d92d0577bf82e62838b5fded9 100644 (file)
--- a/SOGo/UI/Scheduler/Version
+++ b/SOGo/UI/Scheduler/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=134
+SUBMINOR_VERSION:=135
 
 # v0.9.123 requires Appointments v0.9.35
 # v0.9.123 requires SOGoUI       v0.9.24