diff options
author | Robin Gareus <robin@gareus.org> | 2014-10-07 14:48:08 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2014-10-07 14:48:08 +0200 |
commit | aab64ecd5c4726c084919788b0b380227618cff7 (patch) | |
tree | 9226e5cd53d2939a3def29306745abe5e2c4a856 /gtk2_ardour | |
parent | 7bfa25777b87836e13d74ba0dec1d7d47edf4c72 (diff) |
OSX 10.9.5 clang++ loves nil more than ever
#undef nil // for sigc++ compat does no longer work as expected.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/au_pluginui.mm | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm index bbae272116..fc773f54ae 100644 --- a/gtk2_ardour/au_pluginui.mm +++ b/gtk2_ardour/au_pluginui.mm @@ -1,6 +1,9 @@ #undef Marker #define Marker FuckYouAppleAndYourLackOfNameSpaces +#include <gtkmm/button.h> +#include <gdk/gdkquartz.h> + #include "pbd/convert.h" #include "pbd/error.h" @@ -10,9 +13,6 @@ #undef check // stupid gtk, stupid apple -#include <gtkmm/button.h> -#include <gdk/gdkquartz.h> - #include <gtkmm2ext/utils.h> #include "au_pluginui.h" @@ -34,7 +34,6 @@ using namespace ARDOUR; using namespace Gtk; using namespace Gtkmm2ext; -using namespace sigc; using namespace std; using namespace PBD; @@ -84,12 +83,12 @@ dump_view_tree (NSView* view, int depth) [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cocoaParentActivationHandler:) name:NSWindowDidBecomeMainNotification - object:nil]; + object:NULL]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cocoaParentBecameKeyHandler:) name:NSWindowDidBecomeKeyNotification - object:nil]; + object:NULL]; } } @@ -366,7 +365,7 @@ AUPluginUI::create_cocoa_view () DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("tried to create bundle, result = %1\n", viewBundle)); - if (viewBundle == nil) { + if (viewBundle == NULL) { error << _("AUPluginUI: error loading AU view's bundle") << endmsg; return -1; } else { @@ -384,7 +383,7 @@ AUPluginUI::create_cocoa_view () } // make a factory id factory = [[[factoryClass alloc] init] autorelease]; - if (factory == nil) { + if (factory == NULL) { error << _("AUPluginUI: Could not create an instance of the AU view factory") << endmsg; return -1; } @@ -661,13 +660,13 @@ AUPluginUI::parent_cocoa_window () NSPoint origin = { 0, static_cast<CGFloat> (a.height) }; [au_view setFrameOrigin:origin]; - [view addSubview:au_view positioned:NSWindowBelow relativeTo:nil]; + [view addSubview:au_view positioned:NSWindowBelow relativeTo:NULL]; last_au_frame = [au_view frame]; // watch for size changes of the view - _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:nil andTopLevelParent:win ]; + _notify = [ [NotificationObject alloc] initWithPluginUI:this andCocoaParent:NULL andTopLevelParent:win ]; [[NSNotificationCenter defaultCenter] addObserver:_notify selector:@selector(auViewResized:) name:NSViewFrameDidChangeNotification |