Merge branch 'master' into release-2.0

eskroch · eskroch · commit abfa6e11f894 · 2015-04-09T20:59:24.000-04:00
diff --git a/framework/Source/CPTFunctionDataSource.h b/framework/Source/CPTFunctionDataSource.h
@@ -18,7 +18,7 @@ typedef double (^CPTDataSourceBlock)(double);
 
 @property (nonatomic, readonly) CPTDataSourceFunction dataSourceFunction;
 @property (nonatomic, readonly) CPTDataSourceBlock dataSourceBlock;
-@property (nonatomic, readonly, cpt_weak_property) __cpt_weak CPTPlot *dataPlot;
+@property (nonatomic, readonly) CPTPlot *dataPlot;
 
 @property (nonatomic, readwrite) CGFloat resolution;
 @property (nonatomic, readwrite, strong) CPTPlotRange *dataRange;
diff --git a/framework/Source/CPTFunctionDataSource.m b/framework/Source/CPTFunctionDataSource.m
@@ -13,7 +13,7 @@
 
 @interface CPTFunctionDataSource()
 
-@property (nonatomic, readwrite, cpt_weak_property) __cpt_weak CPTPlot *dataPlot;
+@property (nonatomic, readwrite) CPTPlot *dataPlot;
 @property (nonatomic, readwrite) double cachedStep;
 @property (nonatomic, readwrite) NSUInteger dataCount;
 @property (nonatomic, readwrite) NSUInteger cachedCount;
@@ -44,7 +44,7 @@ @implementation CPTFunctionDataSource
  **/
 @synthesize dataSourceBlock;
 
-/** @property __cpt_weak CPTPlot *dataPlot
+/** @property CPTPlot *dataPlot
  *  @brief The plot that will display the function values. Must be an instance of CPTScatterPlot.
  **/
 @synthesize dataPlot;
@@ -162,8 +162,7 @@ -(void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 
-    CPTPlot *plot = dataPlot;
-    [plot removeObserver:self forKeyPath:@"plotSpace" context:CPTFunctionDataSourceKVOContext];
+    [dataPlot removeObserver:self forKeyPath:@"plotSpace" context:CPTFunctionDataSourceKVOContext];
 }
 
 /// @endcond
