This isn't strictly neccessary, but let's be safe.

[cydia.git] / Menes / ObjectHandle.h

diff --git a/Menes/ObjectHandle.h b/Menes/ObjectHandle.h
index 188ec1ae0993a214a1903a8d9a9b1596d4a80c4d..6c2b1e1599195ce062a109a4968320910e697ae1 100644 (file)
--- a/Menes/ObjectHandle.h
+++ b/Menes/ObjectHandle.h
@@ -1,40 +1,22 @@
 /* Cydia - iPhone UIKit Front-End for Debian APT
- * Copyright (C) 2008-2011  Jay Freeman (saurik)
+ * Copyright (C) 2008-2013  Jay Freeman (saurik)
 */
 
-/* Modified BSD License {{{ */
+/* GNU General Public License, Version 3 {{{ */
 /*
- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cydia 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, either version 3 of the License,
+ * or (at your option) any later version.
  *
- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * Cydia 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.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU General Public License
+ * along with Cydia.  If not, see <http://www.gnu.org/licenses/>.
+**/
 /* }}} */
 
 #ifndef Menes_ObjectHandle_H
@@ -79,10 +61,10 @@ class MenesObjectHandle {
             CFRetain((CFTypeRef) value_);
     }
 
-    _finline void Clear_() {
-        if (value_ != nil) {
-            MenesObjectHandle_<Type_, Delegate_>::Execute(value_);
-            CFRelease((CFTypeRef) value_);
+    _finline void Release_(Type_ *value) {
+        if (value != nil) {
+            MenesObjectHandle_<Type_, Delegate_>::Execute(value);
+            CFRelease((CFTypeRef) value);
         }
     }
 
@@ -100,20 +82,23 @@ class MenesObjectHandle {
     }
 
     _finline ~MenesObjectHandle() {
-        Clear_();
+        Release_(value_);
     }
 
     _finline operator Type_ *() const {
         return value_;
     }
 
+    _finline Type_ *operator ->() const {
+        return value_;
+    }
+
     _finline MenesObjectHandle &operator =(Type_ *value) {
         if (value_ != value) {
             Type_ *old(value_);
             value_ = value;
             Retain_();
-            if (old != nil)
-                CFRelease((CFTypeRef) old);
+            Release_(old);
         } return *this;
     }
 
@@ -124,4 +109,25 @@ class MenesObjectHandle {
 
 #define _H MenesObjectHandle
 
+#define rproperty_(Class, field) \
+    - (typeof(((Class*)nil)->_##field.operator->())) field { \
+        return _##field; \
+    }
+
+#define wproperty_(Class, field, Field) \
+    - (void) set##Field:(typeof(((Class*)nil)->_##field.operator->()))field { \
+        _##field = field; \
+    }
+
+#define roproperty(Class, field) \
+@implementation Class (Menes_##field) \
+rproperty_(Class, field) \
+@end
+
+#define rwproperty(Class, field, Field) \
+@implementation Class (Menes_##field) \
+rproperty_(Class, field) \
+wproperty_(Class, field, Field) \
+@end
+
 #endif//Menes_ObjectHandle_H