#10 using TBBean protocol in some beans

qvacua · Jun 6, 2013 · 8e68eb0 · 8e68eb0
1 parent 5b00356
commit 8e68eb0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/Qmind/QMCellSizeManager.h b/Qmind/QMCellSizeManager.h
@@ -11,8 +11,9 @@
 @class QMCell;
 @class QMTextLayoutManager;
 @class QMAppSettings;
+@protocol TBBean;
 
-@interface QMCellSizeManager : NSObject
+@interface QMCellSizeManager : NSObject <TBBean>
 
 @property (weak) QMTextLayoutManager *textLayoutManager;
 @property (weak) QMAppSettings *settings;

diff --git a/Qmind/QMCellSizeManager.m b/Qmind/QMCellSizeManager.m
@@ -7,6 +7,7 @@
  */
 
 #import <Qkit/Qkit.h>
+#import <TBCacao/TBCacao.h>
 #import "QMCellSizeManager.h"
 #import "QMCell.h"
 #import "QMTextLayoutManager.h"
@@ -15,7 +16,6 @@
 
 @implementation QMCellSizeManager
 
-TB_BEAN
 TB_AUTOWIRE(textLayoutManager)
 TB_AUTOWIRE(settings)
 

diff --git a/Qmind/QMTextDrawer.h b/Qmind/QMTextDrawer.h
@@ -8,7 +8,9 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface QMTextDrawer : NSObject
+@protocol TBBean;
+
+@interface QMTextDrawer : NSObject <TBBean>
 
 - (void)drawAttributedString:(NSAttributedString *)attrStr inRect:(NSRect)frame range:(NSRange)range;
 

diff --git a/Qmind/QMTextDrawer.m b/Qmind/QMTextDrawer.m
@@ -8,16 +8,13 @@
 
 #import <TBCacao/TBCacao.h>
 #import "QMTextDrawer.h"
-#import "QMAppSettings.h"
 
 @implementation QMTextDrawer {
     NSLayoutManager *_layoutManager;
     NSTextStorage *_textStorage;
     NSTextContainer *_textContainer;
 }
 
-TB_BEAN
-
 #pragma mark Public
 - (void)drawAttributedString:(NSAttributedString *)attrStr inRect:(NSRect)frame range:(NSRange)range {
     @synchronized (_textStorage) {

diff --git a/Qmind/QMTextLayoutManager.h b/Qmind/QMTextLayoutManager.h
@@ -9,8 +9,9 @@
 #import <Cocoa/Cocoa.h>
 
 @class QMAppSettings;
+@protocol TBBean;
 
-@interface QMTextLayoutManager : NSObject
+@interface QMTextLayoutManager : NSObject <TBBean>
 
 @property (weak) QMAppSettings *settings;
 

diff --git a/Qmind/QMTextLayoutManager.m b/Qmind/QMTextLayoutManager.m
@@ -6,18 +6,17 @@
  * See LICENSE
  */
 
-#import "QMTextLayoutManager.h"
-#import "QMAppSettings.h"
 #import <Qkit/Qkit.h>
 #import <TBCacao/TBCacao.h>
+#import "QMTextLayoutManager.h"
+#import "QMAppSettings.h"
 
 @implementation QMTextLayoutManager {
     NSLayoutManager *_layoutManager;
     NSTextStorage *_textStorage;
     NSTextContainer *_textContainer;
 }
 
-TB_BEAN
 TB_AUTOWIRE(settings)
 
 #pragma mark Public

diff --git a/Qmind/QMUiDrawer.h b/Qmind/QMUiDrawer.h
@@ -8,7 +8,9 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface QMUiDrawer : NSObject
+@protocol TBBean;
+
+@interface QMUiDrawer : NSObject <TBBean>
 
 - (void)drawBadgeWithNumber:(NSUInteger)number atPoint:(NSPoint)location;
 

diff --git a/Qmind/QMUiDrawer.m b/Qmind/QMUiDrawer.m
@@ -6,16 +6,14 @@
  * See LICENSE
  */
 
-#import "QMUiDrawer.h"
 #import <Qkit/Qkit.h>
 #import <TBCacao/TBCacao.h>
+#import "QMUiDrawer.h"
 
 static const NSSize qSizeOfBadgeCircle = {20., 20.};
 
 @implementation QMUiDrawer
 
-TB_BEAN
-
 - (void)drawBadgeWithNumber:(NSUInteger)number atPoint:(NSPoint)location {
     NSColor *red = [NSColor redColor];
     NSColor *darkRed = [NSColor colorWithCalibratedRed:0.71 green:0 blue:0.13 alpha:1];