Re: hub - r30565 - in abiword/trunk/src: af/ev/cocoa af/xap/cocoa wp/ap/cocoa

Hub,

On Thu, Dec 29, 2011 at 2:28 AM, <cvs@abisource.com> wrote:
>
> Author: hub
> Date: 2011-12-29 05:28:33 +0100 (Thu, 29 Dec 2011)
> New Revision: 30565
>
> Modified:
>   abiword/trunk/src/af/ev/cocoa/ev_CocoaMenu.cpp
>   abiword/trunk/src/af/ev/cocoa/ev_CocoaToolbar.cpp
>   abiword/trunk/src/af/xap/cocoa/xap_CocoaApp.cpp
>   abiword/trunk/src/af/xap/cocoa/xap_CocoaAppController.cpp
>   abiword/trunk/src/af/xap/cocoa/xap_CocoaCompat.h
>   abiword/trunk/src/af/xap/cocoa/xap_CocoaDialog_Utilities.cpp
>   abiword/trunk/src/af/xap/cocoa/xap_CocoaDlg_ClipArt.cpp
>   abiword/trunk/src/af/xap/cocoa/xap_CocoaDlg_MessageBox.cpp
>   abiword/trunk/src/af/xap/cocoa/xap_CocoaPlugin.h
>   abiword/trunk/src/af/xap/cocoa/xap_CocoaTextView.cpp
>   abiword/trunk/src/af/xap/cocoa/xap_CocoaToolPalette.cpp
>   abiword/trunk/src/af/xap/cocoa/xap_Cocoa_NSTableUtils.cpp
>   abiword/trunk/src/af/xap/cocoa/xap_PrintingNSView.cpp
>   abiword/trunk/src/wp/ap/cocoa/ap_CocoaDialog_FormatFrame.h
>   abiword/trunk/src/wp/ap/cocoa/ap_CocoaFrameImpl.cpp
> Log:
> Warning fixes
> 64-bits fixes
>
> Modified: abiword/trunk/src/af/ev/cocoa/ev_CocoaMenu.cpp
> ===================================================================
> --- abiword/trunk/src/af/ev/cocoa/ev_CocoaMenu.cpp      2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/ev/cocoa/ev_CocoaMenu.cpp      2011-12-29 04:28:33 UTC (rev 30565)
> @@ -34,6 +34,7 @@
>  #include "xap_CocoaApp.h"
>  #include "xap_CocoaFrame.h"
>  #include "xap_CocoaFrameImpl.h"
> +#import "xap_CocoaCompat.h"
>  #include "xap_CocoaDialog_Utilities.h"
>  #include "xap_CocoaToolPalette.h"
>  #include "xap_Types.h"
>
> Modified: abiword/trunk/src/af/ev/cocoa/ev_CocoaToolbar.cpp
> ===================================================================
> --- abiword/trunk/src/af/ev/cocoa/ev_CocoaToolbar.cpp   2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/ev/cocoa/ev_CocoaToolbar.cpp   2011-12-29 04:28:33 UTC (rev 30565)
> @@ -935,7 +935,7 @@
>                                                }
>                                        }
>                                        if (value) {
> -                                               int idx = [item indexOfItemWithObjectValue:value];
> +                                               NSInteger idx = [item indexOfItemWithObjectValue:value];
>                                                if (idx == NSNotFound) {
>                                                        [item setStringValue:value];
>                                                }
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_CocoaApp.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_CocoaApp.cpp     2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_CocoaApp.cpp     2011-12-29 04:28:33 UTC (rev 30565)
> @@ -87,7 +87,7 @@
>
>        if(pGF)
>        {
> -               bool bSuccess = pGF->registerClass(GR_CocoaCairoGraphics::graphicsAllocator,
> +               UT_DebugOnly<bool> bSuccess = pGF->registerClass(GR_CocoaCairoGraphics::graphicsAllocator,
>                                                                                   GR_CocoaCairoGraphics::graphicsDescriptor,
>                                                                                   GR_CocoaCairoGraphics::s_getClassId());
>
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_CocoaAppController.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_CocoaAppController.cpp   2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_CocoaAppController.cpp   2011-12-29 04:28:33 UTC (rev 30565)
> @@ -102,6 +102,7 @@
>
>  - (void)showHelp:(id)sender
>  {
> +       UT_UNUSED(sender);
>        UT_UCS4String ucs4_empty; // Can we use this to override help-contents location? e.g., to bundle help files? [TODO]
>        ev_EditMethod_invoke("helpContents", ucs4_empty); // [TODO: this needs to be redireced to firstResponder]
>  }
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_CocoaCompat.h
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_CocoaCompat.h    2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_CocoaCompat.h    2011-12-29 04:28:33 UTC (rev 30565)
> @@ -30,4 +30,11 @@
>  typedef float CGFloat;
>  #endif
>
> +
> +#if NSINTEGER_DEFINED
> +#else
> +typedef int NSInteger;
> +typedef unsigned int NSUInteger;
>  #endif

When you have time, take a look at this:
http://pastebin.com/9LZqULev

I think it's an OS X 10.6 running.
Which kind of infos do you need?

> +
> +#endif
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_CocoaDialog_Utilities.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_CocoaDialog_Utilities.cpp        2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_CocoaDialog_Utilities.cpp        2011-12-29 04:28:33 UTC (rev 30565)
> @@ -126,7 +126,7 @@
>        UT_ASSERT(buf);
>        UT_ASSERT(strlen(label) < bufSize);
>
> -       strcpy (buf, label);
> +       strncpy (buf, label, bufSize);
>
>        char * src, *dst;
>        src = dst = buf;
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_CocoaDlg_ClipArt.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_CocoaDlg_ClipArt.cpp     2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_CocoaDlg_ClipArt.cpp     2011-12-29 04:28:33 UTC (rev 30565)
> @@ -56,10 +56,8 @@
>  {
>  }
>
> -void XAP_CocoaDialog_ClipArt::runModal(XAP_Frame * pFrame)
> +void XAP_CocoaDialog_ClipArt::runModal(XAP_Frame * /*pFrame*/)
>  {
> -       UT_ASSERT(pFrame);
> -
>  /*
>        NOTE: This template can be used to create a working stub for a
>        new dialog on this platform.  To do so:
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_CocoaDlg_MessageBox.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_CocoaDlg_MessageBox.cpp  2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_CocoaDlg_MessageBox.cpp  2011-12-29 04:28:33 UTC (rev 30565)
> @@ -50,10 +50,8 @@
>
>  /*****************************************************************/
>
> -void XAP_CocoaDialog_MessageBox::runModal(XAP_Frame * pFrame)
> +void XAP_CocoaDialog_MessageBox::runModal(XAP_Frame * /*pFrame*/)
>  {
> -       UT_ASSERT(pFrame);
> -
>        XAP_App * pApp = XAP_App::getApp();
>
>        const XAP_StringSet * pSS = pApp->getStringSet();
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_CocoaPlugin.h
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_CocoaPlugin.h    2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_CocoaPlugin.h    2011-12-29 04:28:33 UTC (rev 30565)
> @@ -26,6 +26,8 @@
>
>  #import <Cocoa/Cocoa.h>
>
> +#import "xap_CocoaCompat.h"
> +
>  @class XAP_CocoaPlugin;
>
>  @protocol XAP_CocoaPlugin_Tool;
> @@ -297,12 +299,12 @@
>  /**
>  * \param anInt An integer which can be used to identify this particular object.
>  */
> -- (void)setTag:(int)anInt;
> +- (void)setTag:(NSInteger)anInt;
>
>  /**
>  * \return The integer used to identify this particular object.
>  */
> -- (int)tag;
> +- (NSInteger)tag;
>
>  /**
>  * \param state To have a check (tick) beside the menu item, set the state to NSOnState, otherwise
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_CocoaTextView.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_CocoaTextView.cpp        2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_CocoaTextView.cpp        2011-12-29 04:28:33 UTC (rev 30565)
> @@ -30,6 +30,7 @@
>  #include "ev_NamedVirtualKey.h"
>
>  #include "xap_App.h"
> +#import "xap_CocoaCompat.h"
>  #include "xap_CocoaTextView.h"
>  #include "xap_CocoaToolPalette.h"
>  #include "xap_Frame.h"
> @@ -335,11 +336,11 @@
>  }
>
>
> -- (unsigned int)characterIndexForPoint:(NSPoint)thePoint
> +- (NSUInteger)characterIndexForPoint:(NSPoint)thePoint
>  {
>        UT_UNUSED(thePoint);
>        UT_ASSERT_NOT_REACHED();
> -       return 0xffffffff;
> +       return NSNotFound;
>  }
>
>
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_CocoaToolPalette.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_CocoaToolPalette.cpp     2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_CocoaToolPalette.cpp     2011-12-29 04:28:33 UTC (rev 30565)
> @@ -1914,7 +1914,7 @@
>                        {
>                                NSString * selection = [NSString stringWithUTF8String:szState];
>
> -                               int index = [oFontSize indexOfItemWithObjectValue:selection];
> +                               NSInteger index = [oFontSize indexOfItemWithObjectValue:selection];
>
>                                if (index == NSNotFound)
>                                {
> @@ -1958,7 +1958,7 @@
>                        {
>                                NSString * selection = [NSString stringWithUTF8String:szState];
>
> -                               int index = [oZoom indexOfItemWithObjectValue:selection];
> +                               NSInteger index = [oZoom indexOfItemWithObjectValue:selection];
>
>                                if (index == NSNotFound)
>                                {
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_Cocoa_NSTableUtils.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_Cocoa_NSTableUtils.cpp   2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_Cocoa_NSTableUtils.cpp   2011-12-29 04:28:33 UTC (rev 30565)
> @@ -18,6 +18,7 @@
>  */
>
>  #include "ut_types.h"
> +#import "xap_CocoaCompat.h"
>  #import "xap_Cocoa_NSTableUtils.h"
>
>
> @@ -76,7 +77,7 @@
>  - (int)rowWithCString:(const char *)cString
>  {
>        NSString *string = [[NSString alloc] initWithUTF8String:cString];
> -       unsigned int idx = [_array indexOfObject:string];
> +       NSUInteger idx = [_array indexOfObject:string];
>        [string release];
>        if (idx == NSNotFound) {
>                return -1;
>
> Modified: abiword/trunk/src/af/xap/cocoa/xap_PrintingNSView.cpp
> ===================================================================
> --- abiword/trunk/src/af/xap/cocoa/xap_PrintingNSView.cpp       2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/af/xap/cocoa/xap_PrintingNSView.cpp       2011-12-29 04:28:33 UTC (rev 30565)
> @@ -21,6 +21,7 @@
>  #include "ut_debugmsg.h"
>
>  #include "xap_PrintingDelegate.h"
> +#import "xap_CocoaCompat.h"
>  #import "xap_PrintingNSView.h"
>
>
> @@ -49,7 +50,7 @@
>        return YES;
>  }
>
> -- (NSRect)rectForPage:(int)page
> +- (NSRect)rectForPage:(NSInteger)page
>  {
>        UT_UNUSED(page);
>        return [self bounds];
>
> Modified: abiword/trunk/src/wp/ap/cocoa/ap_CocoaDialog_FormatFrame.h
> ===================================================================
> --- abiword/trunk/src/wp/ap/cocoa/ap_CocoaDialog_FormatFrame.h  2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/wp/ap/cocoa/ap_CocoaDialog_FormatFrame.h  2011-12-29 04:28:33 UTC (rev 30565)
> @@ -25,12 +25,12 @@
>
>  #import <Cocoa/Cocoa.h>
>
> -#include "ap_Dialog_FormatFrame.h"
> +#import "xap_CocoaToolbar_Icons.h"
> +#import "ap_Dialog_FormatFrame.h"
>
>
>  class XAP_CocoaFrame;
>  class GR_CocoaCairoGraphics;
> -@protocol XAP_CocoaButtonController;
>  @class AP_CocoaDialog_FormatFrameController;
>
>  /*****************************************************************/
>
> Modified: abiword/trunk/src/wp/ap/cocoa/ap_CocoaFrameImpl.cpp
> ===================================================================
> --- abiword/trunk/src/wp/ap/cocoa/ap_CocoaFrameImpl.cpp 2011-12-29 03:36:35 UTC (rev 30564)
> +++ abiword/trunk/src/wp/ap/cocoa/ap_CocoaFrameImpl.cpp 2011-12-29 04:28:33 UTC (rev 30565)
> @@ -312,9 +312,11 @@
>
>  void AP_CocoaFrameImpl::_showTopRulerNSView(void)
>  {
> -       AP_CocoaFrameController* ctrl = _getController();
> -       XAP_CocoaNSView* ruler = [ctrl getHRuler];
> -       XAP_CocoaNSView* vRuler = [ctrl getVRuler];
> +       XAP_CocoaFrameController* ctrl = _getController();
> +       UT_ASSERT([ctrl isKindOfClass:[XAP_CocoaFrameController class]]);
> +       AP_CocoaFrameController* apCtrl = (AP_CocoaFrameController*)ctrl;
> +       XAP_CocoaNSView* ruler = [apCtrl getHRuler];
> +       XAP_CocoaNSView* vRuler = [apCtrl getVRuler];
>        NSView* mainView = [ctrl getMainView];
>
>        UT_ASSERT([ruler superview] == nil);
> @@ -344,9 +346,11 @@
>
>  void AP_CocoaFrameImpl::_hideTopRulerNSView(void)
>  {
> -       AP_CocoaFrameController* ctrl = _getController();
> -       XAP_CocoaNSView* ruler = [ctrl getHRuler];
> -       XAP_CocoaNSView* vRuler = [ctrl getVRuler];
> +       XAP_CocoaFrameController* ctrl = _getController();
> +       UT_ASSERT([ctrl isKindOfClass:[XAP_CocoaFrameController class]]);
> +       AP_CocoaFrameController* apCtrl = (AP_CocoaFrameController*)ctrl;
> +       XAP_CocoaNSView* ruler = [apCtrl getHRuler];
> +       XAP_CocoaNSView* vRuler = [apCtrl getVRuler];
>        NSView* mainView = [ctrl getMainView];
>
>        UT_ASSERT([ruler superview]);
> @@ -375,8 +379,10 @@
>
>  void AP_CocoaFrameImpl::_showLeftRulerNSView(void)
>  {
> -       AP_CocoaFrameController* ctrl = _getController();
> -       XAP_CocoaNSView* ruler = [ctrl getVRuler];
> +       XAP_CocoaFrameController* ctrl = _getController();
> +       UT_ASSERT([ctrl isKindOfClass:[XAP_CocoaFrameController class]]);
> +       AP_CocoaFrameController* apCtrl = (AP_CocoaFrameController*)ctrl;
> +       XAP_CocoaNSView* ruler = [apCtrl getVRuler];
>        NSView* mainView = [ctrl getMainView];
>
>        UT_ASSERT([ruler superview] == nil);
> @@ -403,8 +409,10 @@
>
>  void AP_CocoaFrameImpl::_hideLeftRulerNSView(void)
>  {
> -       AP_CocoaFrameController* ctrl = _getController();
> -       XAP_CocoaNSView* ruler = [ctrl getVRuler];
> +       XAP_CocoaFrameController* ctrl = _getController();
> +       UT_ASSERT([ctrl isKindOfClass:[XAP_CocoaFrameController class]]);
> +       AP_CocoaFrameController* apCtrl = (AP_CocoaFrameController*)ctrl;
> +       XAP_CocoaNSView* ruler = [apCtrl getVRuler];
>        NSView* mainView = [ctrl getMainView];
>
>        UT_ASSERT([ruler superview]);
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.

Best Regards,

-- 
Fabiano Fidêncio