From 9e629eda04dfb53a78752aa19a441b4d12e524f4 Mon Sep 17 00:00:00 2001 From: Eduardo Scoz Date: Tue, 25 Aug 2015 08:56:32 -0700 Subject: [PATCH] Fixing header imports, removing prefix imports --- QDateInlineTableViewCell.h | 3 ++- QDateInlineTableViewCell.m | 4 ++++ QuickDialog.podspec | 5 ----- extras/QMailElement.m | 5 ----- extras/QMapAnnotation.m | 4 ---- extras/QMapElement.m | 2 -- extras/QPickerElement.m | 3 --- extras/QPickerTableViewCell.m | 2 -- extras/QWebElement.m | 3 --- libQuickDialog/libQuickDialog-Prefix.pch | 1 - quickdialog/QAppearance.h | 2 ++ quickdialog/QAppearance.m | 13 +++---------- quickdialog/QButtonElement.m | 2 ++ quickdialog/QClassicAppearance.h | 2 +- quickdialog/QClassicAppearance.m | 5 +++++ quickdialog/QCountdownElement.h | 2 ++ quickdialog/QDateEntryTableViewCell.m | 5 ++--- quickdialog/QDateTimeInlineElement.h | 3 +-- quickdialog/QDateTimeInlineElement.m | 2 ++ quickdialog/QElement+Appearance.h | 1 + quickdialog/QElement+Appearance.m | 2 ++ quickdialog/QEmptyListElement.m | 2 ++ quickdialog/QEntryElement.h | 1 - quickdialog/QFlatAppearance.h | 1 + quickdialog/QFlatAppearance.m | 1 + quickdialog/QImageElement.h | 1 + quickdialog/QImageElement.m | 3 +++ quickdialog/QRadioItemElement.m | 3 +++ quickdialog/QSelectItemElement.m | 7 +++++++ quickdialog/QTableViewCell.m | 3 +++ quickdialog/QTextElement.m | 2 ++ quickdialog/QuickDialog.h | 2 -- quickdialog/QuickDialogController+Animations.m | 2 ++ quickdialog/QuickDialogController.h | 1 + quickdialog/QuickDialogController.m | 2 ++ quickdialog/QuickDialogTableDelegate.h | 5 ++--- 36 files changed, 59 insertions(+), 48 deletions(-) diff --git a/QDateInlineTableViewCell.h b/QDateInlineTableViewCell.h index 62ff8c68..f53f1ae8 100644 --- 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 diff --git a/QDateInlineTableViewCell.m b/QDateInlineTableViewCell.m index 30f9ca24..e830d781 100644 --- 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 index 9da6ce1c..16b8e381 100644 --- 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 index 53c68912..2991346d 100644 --- 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 index 882c8a89..bbd7b206 100644 --- 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 index bc3e75c8..e413541f 100644 --- 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 index 89817b59..5b65f5d5 100644 --- 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 index 586f9315..444ee5dc 100644 --- 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 index dd0aedd7..27952093 100644 --- 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 index dde4aaab..b3d87cc8 100644 --- a/libQuickDialog/libQuickDialog-Prefix.pch +++ b/libQuickDialog/libQuickDialog-Prefix.pch @@ -9,7 +9,6 @@ #ifdef __OBJC__ #import -#import "QuickDialog.h" #endif diff --git a/quickdialog/QAppearance.h b/quickdialog/QAppearance.h index 50e49dc7..25085c68 100644 --- a/quickdialog/QAppearance.h +++ b/quickdialog/QAppearance.h @@ -1,4 +1,6 @@ #import +#import +#import "QuickDialogTableView.h" @interface QAppearance : NSObject diff --git a/quickdialog/QAppearance.m b/quickdialog/QAppearance.m index a71ca514..da1ccc59 100644 --- a/quickdialog/QAppearance.m +++ b/quickdialog/QAppearance.m @@ -1,18 +1,11 @@ +#import "QAppearance.h" +#import +#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 index c002b9ac..2d1aa520 100644 --- 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 index 105a6746..49c42397 100644 --- 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 diff --git a/quickdialog/QClassicAppearance.m b/quickdialog/QClassicAppearance.m index 87d76954..5f1596b7 100644 --- 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 index fa94b65e..f8edfaa2 100644 --- a/quickdialog/QCountdownElement.h +++ b/quickdialog/QCountdownElement.h @@ -1,5 +1,7 @@ #import +#import "QDateTimeInlineElement.h" + @interface QCountdownElement : QDateTimeInlineElement @end diff --git a/quickdialog/QDateEntryTableViewCell.m b/quickdialog/QDateEntryTableViewCell.m index d074f982..be378bd1 100644 --- 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 index c27b5c6c..c787e3d3 100755 --- 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 index a94d976f..b608eb24 100755 --- 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 index 6e9d5595..5c735e43 100644 --- a/quickdialog/QElement+Appearance.h +++ b/quickdialog/QElement+Appearance.h @@ -1,4 +1,5 @@ #import +#import "QElement.h" @class QAppearance; diff --git a/quickdialog/QElement+Appearance.m b/quickdialog/QElement+Appearance.m index 36602dca..07b3d842 100644 --- a/quickdialog/QElement+Appearance.m +++ b/quickdialog/QElement+Appearance.m @@ -1,6 +1,8 @@ #import #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 index f5935e9c..d95e355a 100644 --- 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 index 8f33f038..2d98dc28 100644 --- 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 index 3c894447..201815b9 100644 --- a/quickdialog/QFlatAppearance.h +++ b/quickdialog/QFlatAppearance.h @@ -7,6 +7,7 @@ #import +#import "QAppearance.h" @interface QFlatAppearance : QAppearance diff --git a/quickdialog/QFlatAppearance.m b/quickdialog/QFlatAppearance.m index ba550cad..dd026a2d 100644 --- 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 index de4ab021..a3cc8419 100644 --- a/quickdialog/QImageElement.h +++ b/quickdialog/QImageElement.h @@ -16,6 +16,7 @@ #import #import #import "QRootElement.h" +#import "QEntryElement.h" @interface QImageElement : QEntryElement diff --git a/quickdialog/QImageElement.m b/quickdialog/QImageElement.m index eab3f0e2..622a3e4c 100644 --- 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 () diff --git a/quickdialog/QRadioItemElement.m b/quickdialog/QRadioItemElement.m index f90752ff..3f66754d 100644 --- 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 index 24b7a339..ad83ad2b 100644 --- a/quickdialog/QSelectItemElement.m +++ b/quickdialog/QSelectItemElement.m @@ -6,6 +6,13 @@ // Copyright (c) 2012 __MyCompanyName__. All rights reserved. // + +#import "QuickDialogController.h" +#import +#import "QSelectItemElement.h" +#import "QAppearance.h" +#import "QElement+Appearance.h" + @implementation QSelectItemElement { UIImage *_checkmarkImage; } diff --git a/quickdialog/QTableViewCell.m b/quickdialog/QTableViewCell.m index ef4be323..422139ab 100644 --- 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 index c33f9a48..ceda8570 100644 --- a/quickdialog/QTextElement.m +++ b/quickdialog/QTextElement.m @@ -14,6 +14,8 @@ #import #import "QTextElement.h" +#import "QAppearance.h" +#import "QElement+Appearance.h" @implementation QTextElement diff --git a/quickdialog/QuickDialog.h b/quickdialog/QuickDialog.h index b6c6898f..a5621bef 100644 --- 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 index 49cdbb5c..ff9ae544 100644 --- 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 index a30f9da8..8185c6cf 100644 --- 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 index 307cc017..879888d4 100644 --- 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 index ac430fb7..87ee55d1 100644 --- a/quickdialog/QuickDialogTableDelegate.h +++ b/quickdialog/QuickDialogTableDelegate.h @@ -15,9 +15,8 @@ #import #import - -@class QuickDialogController; -@class QuickDialogTableView; +#import "QuickDialogController.h" +#import "QuickDialogTableView.h" @interface QuickDialogTableDelegate : NSObject {