--- a/QTfrontend/CocoaInitializer.mm Sun Apr 03 16:31:48 2011 +0400
+++ b/QTfrontend/CocoaInitializer.mm Sun Apr 03 16:34:12 2011 +0200
@@ -1,7 +1,23 @@
/*
- * Copyright (C) 2008 Remko Troncon
+ * Hedgewars, a free turn based strategy game
+ * Copyright (c) 2005-2011 Andrey Korotaev <unC0Rr@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+// see original example here http://el-tramo.be/blog/mixing-cocoa-and-qt
+
#include "CocoaInitializer.h"
#include <AppKit/AppKit.h>
@@ -10,23 +26,19 @@
class CocoaInitializer::Private
{
- public:
- NSAutoreleasePool* autoReleasePool_;
+ public:
+ NSAutoreleasePool* pool;
};
CocoaInitializer::CocoaInitializer()
{
- d = new CocoaInitializer::Private();
- c = new CocoaInitializer::Private();
- NSApplicationLoad();
- c->autoReleasePool_ = [[NSAutoreleasePool alloc] init];
- d->autoReleasePool_ = [[NSAutoreleasePool alloc] init];
+ c = new CocoaInitializer::Private();
+ NSApplicationLoad();
+ c->pool = [[NSAutoreleasePool alloc] init];
}
CocoaInitializer::~CocoaInitializer()
{
- [d->autoReleasePool_ release];
- [c->autoReleasePool_ release];
- delete c;
- delete d;
+ [c->pool release];
+ delete c;
}