Fixing header imports, removing prefix imports

GitHubMob · Aug 25, 2015 · 9e629ed · 9e629ed
1 parent ec0eec8
commit 9e629ed
Show file tree

Hide file tree

Showing 36 changed files with 59 additions and 48 deletions.
diff --git a/QDateInlineTableViewCell.h b/QDateInlineTableViewCell.h
@@ -1,7 +1,8 @@
 //
 // Created by Eduardo Scoz on 1/11/14.
 //
-
+#import "QTableViewCell.h"
+#import "QDateTimeInlineElement.h"
 #import <Foundation/Foundation.h>
 
 

diff --git a/QDateInlineTableViewCell.m b/QDateInlineTableViewCell.m
@@ -11,6 +11,10 @@
 // ANY KIND, either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 //
+
+#import "QAppearance.h"
+#import "QElement.h"
+#import "QElement+Appearance.h"
 #import "QDateInlineTableViewCell.h"
 
 @interface QDateInlineTableViewCell ()

diff --git a/QuickDialog.podspec b/QuickDialog.podspec
@@ -40,9 +40,4 @@ Pod::Spec.new do |s|
     sp.source_files = 'extras/QColor*.{h,m}', 'extras/UIColor*.{h,m}'
   end
 
-  s.prefix_header_contents = <<-EOS
-#ifdef __OBJC__
-    #import "QuickDialog.h"
-#endif
-EOS
 end
diff --git a/extras/QMailElement.m b/extras/QMailElement.m
@@ -10,11 +10,6 @@
 
 @implementation QMailElement
 
-@synthesize subject = _subject;
-@synthesize messageBody = _messageBody;
-@synthesize toRecipients = _toRecipients;
-@synthesize ccRecipients = _ccRecipients;
-@synthesize bccRecipients = _bccRecipients;
 
 - (QMailElement *)initWithTitle:(NSString *)title subject:(NSString *)subject messageBody:(NSString *)messageBody toRecipients:(NSArray *)toRecipients ccRecipients:(NSArray *)ccRecipients bccRecipients:(NSArray *)bccRecipients {
     self = [super init];

diff --git a/extras/QMapAnnotation.m b/extras/QMapAnnotation.m
@@ -16,10 +16,6 @@
 
 @implementation QMapAnnotation
 
-@synthesize coordinate = _coordinate;
-@synthesize title = _title;
-@synthesize subtitle = _subtitle;
-
 - (QMapAnnotation *)initWithCoordinate:(CLLocationCoordinate2D)coordinate title:(NSString *)title {
     self = [super init];
     self.coordinate = coordinate;

diff --git a/extras/QMapElement.m b/extras/QMapElement.m
@@ -19,8 +19,6 @@
 
 @implementation QMapElement
 
-@synthesize coordinate = _coordinate;
-
 - (QMapElement *)init {
     self = [self initWithTitle:@"" coordinate:CLLocationCoordinate2DMake(0, 0)];
     return self;

diff --git a/extras/QPickerElement.m b/extras/QPickerElement.m
@@ -13,9 +13,6 @@ @implementation QPickerElement
     UIPickerView *_pickerView;
 }
 
-@synthesize items = _items;
-@synthesize valueParser = _valueParser;
-
 - (QPickerElement *)init
 {
     if (self = [super init]) {

diff --git a/extras/QPickerTableViewCell.m b/extras/QPickerTableViewCell.m
@@ -17,8 +17,6 @@ @interface QPickerTableViewCell ()
 
 @implementation QPickerTableViewCell
 
-@synthesize pickerView = _pickerView;
-
 - (QPickerTableViewCell *)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
 {
     if ((self = [self initWithStyle:style reuseIdentifier:reuseIdentifier]))

diff --git a/extras/QWebElement.m b/extras/QWebElement.m
@@ -18,9 +18,6 @@
 
 @implementation QWebElement
 
-@synthesize url = _url;
-@synthesize html = _html;
-
 - (QWebElement *)initWithTitle:(NSString *)title url:(NSString *)url {
     self = [super init];
     if (self!=nil){

diff --git a/libQuickDialog/libQuickDialog-Prefix.pch b/libQuickDialog/libQuickDialog-Prefix.pch
@@ -9,7 +9,6 @@
 #ifdef __OBJC__
 
 #import <UIKit/UIKit.h>
-#import "QuickDialog.h"
 
 #endif
 
diff --git a/quickdialog/QAppearance.h b/quickdialog/QAppearance.h
@@ -1,4 +1,6 @@
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import "QuickDialogTableView.h"
 
 
 @interface QAppearance : NSObject<NSCopying>

diff --git a/quickdialog/QAppearance.m b/quickdialog/QAppearance.m
@@ -1,18 +1,11 @@
+#import "QAppearance.h"
+#import <UIKit/UIKit.h>
+#import "QSection.h"
 
 @implementation QAppearance {
 
 }
 
-@synthesize sectionTitleFont = _sectionTitleFont;
-@synthesize sectionTitleColor = _sectionTitleColor;
-@synthesize sectionFooterFont = _sectionFooterFont;
-@synthesize sectionFooterColor = _sectionFooterColor;
-@synthesize entryAlignment = _entryAlignment;
-@synthesize buttonAlignment = _buttonAlignment;
-@synthesize selectedBackgroundView = _selectedBackgroundView;
-@synthesize sectionTitleShadowColor = _sectionTitleShadowColor;
-
-
 - (QAppearance *)init {
     self = [super init];
     if (self) {

diff --git a/quickdialog/QButtonElement.m b/quickdialog/QButtonElement.m
@@ -12,7 +12,9 @@
 // permissions and limitations under the License.
 //
 
+#import "QAppearance.h"
 #import "QButtonElement.h"
+#import "QElement+Appearance.h"
 
 @implementation QButtonElement
 

diff --git a/quickdialog/QClassicAppearance.h b/quickdialog/QClassicAppearance.h
@@ -4,7 +4,7 @@
 // To change the template use AppCode | Preferences | File Templates.
 //
 
-
+#import "QAppearance.h"
 #import <Foundation/Foundation.h>
 
 

diff --git a/quickdialog/QClassicAppearance.m b/quickdialog/QClassicAppearance.m
@@ -5,7 +5,12 @@
 //
 
 
+#import "QAppearance.h"
+#import "QElement+Appearance.h"
 #import "QClassicAppearance.h"
+#import "QSection.h"
+#import "QuickDialogTableView.h"
+#import "QRootElement.h"
 
 
 @implementation QClassicAppearance {

diff --git a/quickdialog/QCountdownElement.h b/quickdialog/QCountdownElement.h
@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
 
+#import "QDateTimeInlineElement.h"
+
 
 @interface QCountdownElement : QDateTimeInlineElement
 @end
diff --git a/quickdialog/QDateEntryTableViewCell.m b/quickdialog/QDateEntryTableViewCell.m
@@ -12,15 +12,14 @@
 // permissions and limitations under the License.
 //
 
+#import "QAppearance.h"
 #import "QEntryTableViewCell.h"
 #import "QDateEntryTableViewCell.h"
 #import "QDateTimeInlineElement.h"
-#import "QTextField.h"
+#import "QElement+Appearance.h"
 
 @implementation QDateEntryTableViewCell
 
-@synthesize pickerView = _pickerView;
-@synthesize centeredLabel = _centeredLabel;
 
 
 - (QDateEntryTableViewCell *)init {

diff --git a/quickdialog/QDateTimeInlineElement.h b/quickdialog/QDateTimeInlineElement.h
@@ -14,8 +14,7 @@
 
 #import "QuickDialogTableView.h"
 #import "QEntryElement.h"
-
-@class QDateEntryTableViewCell;
+#import "QDateEntryTableViewCell.h"
 
 @interface QDateTimeInlineElement : QEntryElement {
     NSDate * _dateValue;

diff --git a/quickdialog/QDateTimeInlineElement.m b/quickdialog/QDateTimeInlineElement.m
@@ -12,6 +12,8 @@
 // permissions and limitations under the License.
 //
 
+#import "QDateEntryTableViewCell.h"
+#import "QuickDialogController.h"
 #import "QDateInlineTableViewCell.h"
 
 @implementation QDateTimeInlineElement {

diff --git a/quickdialog/QElement+Appearance.h b/quickdialog/QElement+Appearance.h
@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import "QElement.h"
 
 @class QAppearance;
 

diff --git a/quickdialog/QElement+Appearance.m b/quickdialog/QElement+Appearance.m
@@ -1,6 +1,8 @@
 #import <objc/runtime.h>
 #import "QElement+Appearance.h"
 #import "QClassicAppearance.h"
+#import "QFlatAppearance.h"
+#import "QRootElement.h"
 
 
 static void * const KEY_APPEARANCE_OBJECT = (void*)&KEY_APPEARANCE_OBJECT;

diff --git a/quickdialog/QEmptyListElement.m b/quickdialog/QEmptyListElement.m
@@ -13,6 +13,8 @@
 //
 
 #import "QEmptyListElement.h"
+#import "QAppearance.h"
+#import "QElement+Appearance.h"
 
 @implementation QEmptyListElement
 

diff --git a/quickdialog/QEntryElement.h b/quickdialog/QEntryElement.h
@@ -13,7 +13,6 @@
 //
 #import "QLabelElement.h"
 #import "QEntryTableViewCell.h"
-
 @protocol QuickDialogEntryElementDelegate;
 
 /**

diff --git a/quickdialog/QFlatAppearance.h b/quickdialog/QFlatAppearance.h
@@ -7,6 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import "QAppearance.h"
 
 @interface QFlatAppearance : QAppearance
 

diff --git a/quickdialog/QFlatAppearance.m b/quickdialog/QFlatAppearance.m
@@ -6,6 +6,7 @@
 
 
 #import "QFlatAppearance.h"
+#import "QSection.h"
 
 
 @implementation QFlatAppearance {

diff --git a/quickdialog/QImageElement.h b/quickdialog/QImageElement.h
@@ -16,6 +16,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "QRootElement.h"
+#import "QEntryElement.h"
 
 @interface QImageElement : QEntryElement
 

diff --git a/quickdialog/QImageElement.m b/quickdialog/QImageElement.m
@@ -12,6 +12,9 @@
 // permissions and limitations under the License.
 //
 
+#import "QImageElement.h"
+#import "QEntryElement.h"
+#import "QuickDialogController+Navigation.h"
 #import "QImageTableViewCell.h"
 
 @interface QImageElement () <UINavigationControllerDelegate, UIImagePickerControllerDelegate, UIPopoverControllerDelegate>

diff --git a/quickdialog/QRadioItemElement.m b/quickdialog/QRadioItemElement.m
@@ -15,7 +15,10 @@
 #import "QuickDialogTableView.h"
 #import "QSection.h"
 #import "QRootElement.h"
+#import "QAppearance.h"
+#import "QElement+Appearance.h"
 #import "QRadioItemElement.h"
+#import "QuickDialogController+Navigation.h"
 
 @implementation QRadioItemElement
 

diff --git a/quickdialog/QSelectItemElement.m b/quickdialog/QSelectItemElement.m
@@ -6,6 +6,13 @@
 //  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
 //
 
+
+#import "QuickDialogController.h"
+#import <UIKit/UIKit.h>
+#import "QSelectItemElement.h"
+#import "QAppearance.h"
+#import "QElement+Appearance.h"
+
 @implementation QSelectItemElement {
     UIImage *_checkmarkImage;
 }

diff --git a/quickdialog/QTableViewCell.m b/quickdialog/QTableViewCell.m
@@ -13,6 +13,9 @@
 //
 
 #import "QTableViewCell.h"
+#import "QAppearance.h"
+#import "QElement+Appearance.h"
+
 @implementation QTableViewCell
 
 static const int kCellMinimumLabelWidth = 80;

diff --git a/quickdialog/QTextElement.m b/quickdialog/QTextElement.m
@@ -14,6 +14,8 @@
 
 #import <CoreGraphics/CoreGraphics.h>
 #import "QTextElement.h"
+#import "QAppearance.h"
+#import "QElement+Appearance.h"
 
 @implementation QTextElement
 

diff --git a/quickdialog/QuickDialog.h b/quickdialog/QuickDialog.h
@@ -24,8 +24,6 @@
 #import "QuickDialogTableDelegate.h"
 
 #import "QElement.h"
-#import "QAppearance.h"
-
 #import "QAppearance.h"
 #import "QFlatAppearance.h"
 #import "QElement+Appearance.h"

diff --git a/quickdialog/QuickDialogController+Animations.m b/quickdialog/QuickDialogController+Animations.m
@@ -1,4 +1,6 @@
 #import "QuickDialogController+Animations.h"
+#import "QElement.h"
+#import "QRootElement.h"
 
 @implementation QuickDialogController (Animations)
 

diff --git a/quickdialog/QuickDialogController.h b/quickdialog/QuickDialogController.h
@@ -12,6 +12,7 @@
 // permissions and limitations under the License.
 //
 
+#import "QElement.h"
 #import "QuickDialogTableView.h"
 
 @class QRootElement;

diff --git a/quickdialog/QuickDialogController.m b/quickdialog/QuickDialogController.m
@@ -14,6 +14,8 @@
 
 #import "QuickDialogController.h"
 #import "QRootElement.h"
+#import "QEntryElement.h"
+
 @interface QuickDialogController ()
 
 + (Class)controllerClassForRoot:(QRootElement *)root;

diff --git a/quickdialog/QuickDialogTableDelegate.h b/quickdialog/QuickDialogTableDelegate.h
@@ -15,9 +15,8 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-
-@class QuickDialogController;
-@class QuickDialogTableView;
+#import "QuickDialogController.h"
+#import "QuickDialogTableView.h"
 
 
 @interface QuickDialogTableDelegate : NSObject<UITableViewDelegate> {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     // To change the template use AppCode | Preferences | File Templates.
     //
+    #import "QAppearance.h"
     #import <Foundation/Foundation.h>
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,6 +7,7 @@

		#import <Foundation/Foundation.h>

		#import "QAppearance.h"

		@interface QFlatAppearance : QAppearance

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,7 @@


		#import "QFlatAppearance.h"
		#import "QSection.h"


		@implementation QFlatAppearance {
Expand Down