Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit 3eaee3d

Browse files
committed
Merge pull request #128 from ParsePlatform/nlutsenko.alertview
Rename PFAlertView.h to PFUIAlertView.h to avoid collisions with Parse.
2 parents 9e67c23 + 3ced4e3 commit 3eaee3d

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

ParseUI.xcodeproj/project.pbxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
3A105F8401D6777BE50537C7 /* Pods.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B91892E5A1364B4A9F064902 /* Pods.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
1111
810D6C1519F7F006005B3DB2 /* PFActivityIndicatorTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 810D6BFA19F7F005005B3DB2 /* PFActivityIndicatorTableViewCell.h */; };
1212
810D6C1619F7F006005B3DB2 /* PFActivityIndicatorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 810D6BFB19F7F005005B3DB2 /* PFActivityIndicatorTableViewCell.m */; };
13-
810D6C1719F7F006005B3DB2 /* PFAlertView.h in Headers */ = {isa = PBXBuildFile; fileRef = 810D6BFD19F7F005005B3DB2 /* PFAlertView.h */; };
14-
810D6C1819F7F006005B3DB2 /* PFAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 810D6BFE19F7F005005B3DB2 /* PFAlertView.m */; };
13+
810D6C1719F7F006005B3DB2 /* PFUIAlertView.h in Headers */ = {isa = PBXBuildFile; fileRef = 810D6BFD19F7F005005B3DB2 /* PFUIAlertView.h */; };
14+
810D6C1819F7F006005B3DB2 /* PFUIAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 810D6BFE19F7F005005B3DB2 /* PFUIAlertView.m */; };
1515
810D6C1919F7F006005B3DB2 /* PFColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 810D6BFF19F7F005005B3DB2 /* PFColor.h */; };
1616
810D6C1A19F7F006005B3DB2 /* PFColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 810D6C0019F7F005005B3DB2 /* PFColor.m */; };
1717
810D6C1B19F7F006005B3DB2 /* PFImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 810D6C0119F7F005005B3DB2 /* PFImage.h */; };
@@ -126,8 +126,8 @@
126126
2C9AC93D6C1063CD6DCC1F9A /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
127127
810D6BFA19F7F005005B3DB2 /* PFActivityIndicatorTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFActivityIndicatorTableViewCell.h; sourceTree = "<group>"; };
128128
810D6BFB19F7F005005B3DB2 /* PFActivityIndicatorTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFActivityIndicatorTableViewCell.m; sourceTree = "<group>"; };
129-
810D6BFD19F7F005005B3DB2 /* PFAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFAlertView.h; sourceTree = "<group>"; };
130-
810D6BFE19F7F005005B3DB2 /* PFAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFAlertView.m; sourceTree = "<group>"; };
129+
810D6BFD19F7F005005B3DB2 /* PFUIAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFUIAlertView.h; sourceTree = "<group>"; };
130+
810D6BFE19F7F005005B3DB2 /* PFUIAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFUIAlertView.m; sourceTree = "<group>"; };
131131
810D6BFF19F7F005005B3DB2 /* PFColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFColor.h; sourceTree = "<group>"; };
132132
810D6C0019F7F005005B3DB2 /* PFColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFColor.m; sourceTree = "<group>"; };
133133
810D6C0119F7F005005B3DB2 /* PFImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFImage.h; sourceTree = "<group>"; };
@@ -351,8 +351,8 @@
351351
810D6BFC19F7F005005B3DB2 /* Extensions */ = {
352352
isa = PBXGroup;
353353
children = (
354-
810D6BFD19F7F005005B3DB2 /* PFAlertView.h */,
355-
810D6BFE19F7F005005B3DB2 /* PFAlertView.m */,
354+
810D6BFD19F7F005005B3DB2 /* PFUIAlertView.h */,
355+
810D6BFE19F7F005005B3DB2 /* PFUIAlertView.m */,
356356
810D6BFF19F7F005005B3DB2 /* PFColor.h */,
357357
810D6C0019F7F005005B3DB2 /* PFColor.m */,
358358
810D6C0119F7F005005B3DB2 /* PFImage.h */,
@@ -755,7 +755,7 @@
755755
810D6C3419F7F38B005B3DB2 /* PFPurchaseTableViewCell.h in Headers */,
756756
81ED079619F6809F009745F4 /* PFImageView.h in Headers */,
757757
81ED079B19F680B9009745F4 /* PFQueryTableViewController.h in Headers */,
758-
810D6C1719F7F006005B3DB2 /* PFAlertView.h in Headers */,
758+
810D6C1719F7F006005B3DB2 /* PFUIAlertView.h in Headers */,
759759
81E9CCFF19F56D3100487B0F /* PFSignUpView.h in Headers */,
760760
810D6C2119F7F006005B3DB2 /* PFActionButton.h in Headers */,
761761
81E9CD4119F57AC500487B0F /* PFResources.h in Headers */,
@@ -1142,7 +1142,7 @@
11421142
81ED075819F68028009745F4 /* PFLogInViewController.m in Sources */,
11431143
8185BA791A64241B002815C0 /* PFQueryCollectionViewController.m in Sources */,
11441144
810D6C1C19F7F006005B3DB2 /* PFImage.m in Sources */,
1145-
810D6C1819F7F006005B3DB2 /* PFAlertView.m in Sources */,
1145+
810D6C1819F7F006005B3DB2 /* PFUIAlertView.m in Sources */,
11461146
81E9CD0219F56D3100487B0F /* PFSignUpViewController.m in Sources */,
11471147
81ED075619F68028009745F4 /* PFLogInView.m in Sources */,
11481148
810D6C2619F7F006005B3DB2 /* PFPrimaryButton.m in Sources */,

ParseUI/Classes/Internal/Extensions/PFAlertView.m renamed to ParseUI/Classes/Internal/Extensions/PFUIAlertView.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
*/
2121

22-
#import "PFAlertView.h"
22+
#import "PFUIAlertView.h"
2323

2424
#import "PFLocalization.h"
2525

ParseUI/Classes/LogInViewController/PFLogInViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#import <Parse/PFUser.h>
2525

2626
#import "PFActionButton.h"
27-
#import "PFAlertView.h"
27+
#import "PFUIAlertView.h"
2828
#import "PFLocalization.h"
2929
#import "PFPrimaryButton.h"
3030
#import "PFSignUpViewController.h"

ParseUI/Classes/ProductTableViewController/PFProductTableViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#import <Parse/PFPurchase.h>
2626
#import <Parse/PFQuery.h>
2727

28-
#import "PFAlertView.h"
28+
#import "PFUIAlertView.h"
2929
#import "PFLocalization.h"
3030
#import "PFPurchaseTableViewCell.h"
3131

ParseUI/Classes/SignUpViewController/PFSignUpViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#import <Parse/PFConstants.h>
2525
#import <Parse/PFUser.h>
2626

27-
#import "PFAlertView.h"
27+
#import "PFUIAlertView.h"
2828
#import "PFLocalization.h"
2929
#import "PFPrimaryButton.h"
3030
#import "PFTextField.h"

0 commit comments

Comments
 (0)