Permalink
Browse files

Move NIPageView back into its own file to facilitate its removal and …

…allow clients to avoid pulling in dead code.
  • Loading branch information...
1 parent 16228df commit 728e1c6e40f6ea4e07cd7534f86638bbe3894ebb @stephanemoore stephanemoore committed Feb 19, 2014
@@ -332,6 +332,8 @@
C7BBC70316DDC12800833DC9 /* NITextField.h in Sources */ = {isa = PBXBuildFile; fileRef = C7BBC6B716DDC0DB00833DC9 /* NITextField.h */; };
C7BBC70416DDC12800833DC9 /* NITextField.m in Sources */ = {isa = PBXBuildFile; fileRef = C7BBC6B816DDC0DB00833DC9 /* NITextField.m */; };
C7BBC71116DE66BD00833DC9 /* media-rulesets.css in Resources */ = {isa = PBXBuildFile; fileRef = C7BBC71016DE66BD00833DC9 /* media-rulesets.css */; };
+ D509DDDF18B53AE500895428 /* NIPageView.h in Headers */ = {isa = PBXBuildFile; fileRef = D509DDDD18B53AE500895428 /* NIPageView.h */; };
+ D509DDE018B53AE500895428 /* NIPageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D509DDDE18B53AE500895428 /* NIPageView.m */; };
DB3A231713FD4B8E00614220 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66A03C1A13E6E85E00B514F3 /* SenTestingKit.framework */; };
DB3A231913FD4B8E00614220 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66A03C0C13E6E85E00B514F3 /* Foundation.framework */; };
DB3A231D13FD4B8E00614220 /* libNimbusAttributedLabel.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DB3A230913FD4B8E00614220 /* libNimbusAttributedLabel.a */; };
@@ -983,6 +985,8 @@
C7BBC6B816DDC0DB00833DC9 /* NITextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NITextField.m; sourceTree = "<group>"; };
C7BBC70216DDC0E700833DC9 /* libNimbusTextField.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libNimbusTextField.a; sourceTree = BUILT_PRODUCTS_DIR; };
C7BBC71016DE66BD00833DC9 /* media-rulesets.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = "media-rulesets.css"; path = "css/unittests/media-rulesets.css"; sourceTree = SOURCE_ROOT; };
+ D509DDDD18B53AE500895428 /* NIPageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NIPageView.h; sourceTree = "<group>"; };
+ D509DDDE18B53AE500895428 /* NIPageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NIPageView.m; sourceTree = "<group>"; };
DB3A230913FD4B8E00614220 /* libNimbusAttributedLabel.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libNimbusAttributedLabel.a; sourceTree = BUILT_PRODUCTS_DIR; };
DB3A231613FD4B8E00614220 /* NimbusAttributedLabelTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NimbusAttributedLabelTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
DB3A233213FD4BE500614220 /* NIAttributedLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NIAttributedLabel.h; sourceTree = "<group>"; };
@@ -1353,6 +1357,8 @@
isa = PBXGroup;
children = (
663B52661445061B00CC26DF /* NimbusPagingScrollView.h */,
+ D509DDDD18B53AE500895428 /* NIPageView.h */,
+ D509DDDE18B53AE500895428 /* NIPageView.m */,
663B52681445070100CC26DF /* NIPagingScrollView.h */,
663B52691445070100CC26DF /* NIPagingScrollView.m */,
66CB9A201654307A00FFB4BF /* NIPagingScrollView+Subclassing.h */,
@@ -2202,6 +2208,7 @@
buildActionMask = 2147483647;
files = (
663B52671445061B00CC26DF /* NimbusPagingScrollView.h in Headers */,
+ D509DDDF18B53AE500895428 /* NIPageView.h in Headers */,
663B526A1445070100CC26DF /* NIPagingScrollView.h in Headers */,
66F27D55145B7A5F00AFCA08 /* NIPagingScrollViewPage.h in Headers */,
66CB9A211654307A00FFB4BF /* NIPagingScrollView+Subclassing.h in Headers */,
@@ -3496,6 +3503,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ D509DDE018B53AE500895428 /* NIPageView.m in Sources */,
663B526B1445070100CC26DF /* NIPagingScrollView.m in Sources */,
66F27D56145B7A5F00AFCA08 /* NIPagingScrollViewPage.m in Sources */,
);
@@ -0,0 +1,30 @@
+//
+// Copyright 2011-2014 NimbusKit
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <UIKit/UIKit.h>
+
+#import "NIPagingScrollViewPage.h"
+
+/**
+ * Use NIPagingScrollViewPage instead.
+ *
+ * This class will be deleted after February 28, 2014.
+ *
+ * @ingroup NimbusPagingScrollView
+ */
+__NI_DEPRECATED_METHOD
+@interface NIPageView : NIPagingScrollViewPage
+@end
@@ -0,0 +1,27 @@
+//
+// Copyright 2011-2014 NimbusKit
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import "NIPageView.h"
+
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "Nimbus requires ARC support."
+#endif
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
+@implementation NIPageView
+@end
+#pragma clang diagnostic pop
@@ -30,17 +30,6 @@
@end
/**
- * Use NIPagingScrollViewPage instead.
- *
- * This class will be deleted after February 28, 2014.
- *
- * @ingroup NimbusPagingScrollView
- */
-__NI_DEPRECATED_METHOD
-@interface NIPageView : NIPagingScrollViewPage
-@end
-
-/**
* The page index.
*
* @fn NIPageView::pageIndex
@@ -24,6 +24,3 @@
@implementation NIPagingScrollViewPage
@end
-
-@implementation NIPageView
-@end

0 comments on commit 728e1c6

Please sign in to comment.