aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firestore/Source/Model
diff options
context:
space:
mode:
authorGravatar Gil <mcg@google.com>2017-11-16 20:52:01 -0800
committerGravatar GitHub <noreply@github.com>2017-11-16 20:52:01 -0800
commit4fbc96904fe86b3a0cdb91bfa6d96491221eb6b9 (patch)
treeb1737ee79405b7c80c2a03f6598c3ba71df2d05f /Firestore/Source/Model
parent88b7e74e3102fc8de453f22a44fd5cb4c91472e3 (diff)
Use fully qualified imports in Firestore (#467)
This simplifies the import process back into google3 and allows us to add additional directories to the project without needing to update the project files for each directory we add. This shows up most clearly in the change to Firestore/Example/Firestore.xcodeproj/project.pbxproj: this no longer needs to list essentially every directory in the project as a header search path. * Clang-format configuration for C++ files * Add support C++-only sources to the podspec * Podspec support for fully qualified imports * xcodeproj changes for fully-qualified imports * Use fully-qualified imports in Firestore sources
Diffstat (limited to 'Firestore/Source/Model')
-rw-r--r--Firestore/Source/Model/FSTDatabaseID.m4
-rw-r--r--Firestore/Source/Model/FSTDocument.m12
-rw-r--r--Firestore/Source/Model/FSTDocumentDictionary.h2
-rw-r--r--Firestore/Source/Model/FSTDocumentDictionary.m4
-rw-r--r--Firestore/Source/Model/FSTDocumentKey.m8
-rw-r--r--Firestore/Source/Model/FSTDocumentKeySet.h2
-rw-r--r--Firestore/Source/Model/FSTDocumentKeySet.m4
-rw-r--r--Firestore/Source/Model/FSTDocumentSet.h2
-rw-r--r--Firestore/Source/Model/FSTDocumentSet.m8
-rw-r--r--Firestore/Source/Model/FSTDocumentVersionDictionary.h2
-rw-r--r--Firestore/Source/Model/FSTDocumentVersionDictionary.m6
-rw-r--r--Firestore/Source/Model/FSTFieldValue.h2
-rw-r--r--Firestore/Source/Model/FSTFieldValue.m20
-rw-r--r--Firestore/Source/Model/FSTMutation.m20
-rw-r--r--Firestore/Source/Model/FSTMutationBatch.h6
-rw-r--r--Firestore/Source/Model/FSTMutationBatch.m16
-rw-r--r--Firestore/Source/Model/FSTPath.m10
17 files changed, 64 insertions, 64 deletions
diff --git a/Firestore/Source/Model/FSTDatabaseID.m b/Firestore/Source/Model/FSTDatabaseID.m
index bf4b417..4d0448a 100644
--- a/Firestore/Source/Model/FSTDatabaseID.m
+++ b/Firestore/Source/Model/FSTDatabaseID.m
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#import "FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
-#import "FSTAssert.h"
+#import "Firestore/Source/Util/FSTAssert.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTDocument.m b/Firestore/Source/Model/FSTDocument.m
index 5146d46..bf416e7 100644
--- a/Firestore/Source/Model/FSTDocument.m
+++ b/Firestore/Source/Model/FSTDocument.m
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#import "FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocument.h"
-#import "FSTAssert.h"
-#import "FSTDocumentKey.h"
-#import "FSTFieldValue.h"
-#import "FSTPath.h"
-#import "FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTDocumentDictionary.h b/Firestore/Source/Model/FSTDocumentDictionary.h
index 8ae8e01..f4e4ba1 100644
--- a/Firestore/Source/Model/FSTDocumentDictionary.h
+++ b/Firestore/Source/Model/FSTDocumentDictionary.h
@@ -16,7 +16,7 @@
#import <Foundation/Foundation.h>
-#import "FSTImmutableSortedDictionary.h"
+#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h"
@class FSTDocument;
@class FSTDocumentKey;
diff --git a/Firestore/Source/Model/FSTDocumentDictionary.m b/Firestore/Source/Model/FSTDocumentDictionary.m
index 67e3ae7..362af54 100644
--- a/Firestore/Source/Model/FSTDocumentDictionary.m
+++ b/Firestore/Source/Model/FSTDocumentDictionary.m
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#import "FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
-#import "FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTDocumentKey.m b/Firestore/Source/Model/FSTDocumentKey.m
index a412b13..a382a55 100644
--- a/Firestore/Source/Model/FSTDocumentKey.m
+++ b/Firestore/Source/Model/FSTDocumentKey.m
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#import "FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
-#import "FSTAssert.h"
-#import "FSTFirestoreClient.h"
-#import "FSTPath.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTDocumentKeySet.h b/Firestore/Source/Model/FSTDocumentKeySet.h
index 7352985..80f6624 100644
--- a/Firestore/Source/Model/FSTDocumentKeySet.h
+++ b/Firestore/Source/Model/FSTDocumentKeySet.h
@@ -16,7 +16,7 @@
#import <Foundation/Foundation.h>
-#import "FSTImmutableSortedSet.h"
+#import "Firestore/third_party/Immutable/FSTImmutableSortedSet.h"
@class FSTDocumentKey;
diff --git a/Firestore/Source/Model/FSTDocumentKeySet.m b/Firestore/Source/Model/FSTDocumentKeySet.m
index 54f1b2c..f07b785 100644
--- a/Firestore/Source/Model/FSTDocumentKeySet.m
+++ b/Firestore/Source/Model/FSTDocumentKeySet.m
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#import "FSTDocumentKeySet.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
-#import "FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTDocumentSet.h b/Firestore/Source/Model/FSTDocumentSet.h
index 7457ea3..a7f8c4a 100644
--- a/Firestore/Source/Model/FSTDocumentSet.h
+++ b/Firestore/Source/Model/FSTDocumentSet.h
@@ -16,7 +16,7 @@
#import <Foundation/Foundation.h>
-#import "FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
@class FSTDocument;
@class FSTDocumentKey;
diff --git a/Firestore/Source/Model/FSTDocumentSet.m b/Firestore/Source/Model/FSTDocumentSet.m
index 94b7b58..c4c0f49 100644
--- a/Firestore/Source/Model/FSTDocumentSet.m
+++ b/Firestore/Source/Model/FSTDocumentSet.m
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#import "FSTDocumentSet.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTImmutableSortedSet.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/third_party/Immutable/FSTImmutableSortedSet.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTDocumentVersionDictionary.h b/Firestore/Source/Model/FSTDocumentVersionDictionary.h
index f94545f..674614e 100644
--- a/Firestore/Source/Model/FSTDocumentVersionDictionary.h
+++ b/Firestore/Source/Model/FSTDocumentVersionDictionary.h
@@ -16,7 +16,7 @@
#import <Foundation/Foundation.h>
-#import "FSTImmutableSortedDictionary.h"
+#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h"
@class FSTDocumentKey;
@class FSTSnapshotVersion;
diff --git a/Firestore/Source/Model/FSTDocumentVersionDictionary.m b/Firestore/Source/Model/FSTDocumentVersionDictionary.m
index 0eaf9f8..870e082 100644
--- a/Firestore/Source/Model/FSTDocumentVersionDictionary.m
+++ b/Firestore/Source/Model/FSTDocumentVersionDictionary.m
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-#import "FSTDocumentVersionDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentVersionDictionary.h"
-#import "FSTDocumentKey.h"
-#import "FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTFieldValue.h b/Firestore/Source/Model/FSTFieldValue.h
index cbf7e3e..6de9793 100644
--- a/Firestore/Source/Model/FSTFieldValue.h
+++ b/Firestore/Source/Model/FSTFieldValue.h
@@ -16,7 +16,7 @@
#import <Foundation/Foundation.h>
-#import "FSTImmutableSortedDictionary.h"
+#import "Firestore/third_party/Immutable/FSTImmutableSortedDictionary.h"
@class FSTDatabaseID;
@class FSTDocumentKey;
diff --git a/Firestore/Source/Model/FSTFieldValue.m b/Firestore/Source/Model/FSTFieldValue.m
index 7f96a3c..95ad306 100644
--- a/Firestore/Source/Model/FSTFieldValue.m
+++ b/Firestore/Source/Model/FSTFieldValue.m
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-#import "FSTFieldValue.h"
-
-#import "FIRGeoPoint+Internal.h"
-#import "FSTAssert.h"
-#import "FSTClasses.h"
-#import "FSTComparison.h"
-#import "FSTDatabaseID.h"
-#import "FSTDocumentKey.h"
-#import "FSTPath.h"
-#import "FSTTimestamp.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+
+#import "Firestore/Source/API/FIRGeoPoint+Internal.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTClasses.h"
+#import "Firestore/Source/Util/FSTComparison.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTMutation.m b/Firestore/Source/Model/FSTMutation.m
index 9704fde..5b47280 100644
--- a/Firestore/Source/Model/FSTMutation.m
+++ b/Firestore/Source/Model/FSTMutation.m
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-#import "FSTMutation.h"
-
-#import "FSTAssert.h"
-#import "FSTClasses.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTFieldValue.h"
-#import "FSTPath.h"
-#import "FSTSnapshotVersion.h"
-#import "FSTTimestamp.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTClasses.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTMutationBatch.h b/Firestore/Source/Model/FSTMutationBatch.h
index cbc31b6..145adfa 100644
--- a/Firestore/Source/Model/FSTMutationBatch.h
+++ b/Firestore/Source/Model/FSTMutationBatch.h
@@ -16,9 +16,9 @@
#import <Foundation/Foundation.h>
-#import "FSTDocumentKeySet.h"
-#import "FSTDocumentVersionDictionary.h"
-#import "FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
+#import "Firestore/Source/Model/FSTDocumentVersionDictionary.h"
@class FSTMutation;
@class FSTTimestamp;
diff --git a/Firestore/Source/Model/FSTMutationBatch.m b/Firestore/Source/Model/FSTMutationBatch.m
index ed0e659..3677908 100644
--- a/Firestore/Source/Model/FSTMutationBatch.m
+++ b/Firestore/Source/Model/FSTMutationBatch.m
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#import "FSTMutationBatch.h"
-
-#import "FSTAssert.h"
-#import "FSTDocument.h"
-#import "FSTDocumentKey.h"
-#import "FSTMutation.h"
-#import "FSTSnapshotVersion.h"
-#import "FSTTimestamp.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Util/FSTAssert.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/Firestore/Source/Model/FSTPath.m b/Firestore/Source/Model/FSTPath.m
index 0588612..b236107 100644
--- a/Firestore/Source/Model/FSTPath.m
+++ b/Firestore/Source/Model/FSTPath.m
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-#import "FSTPath.h"
+#import "Firestore/Source/Model/FSTPath.h"
-#import "FSTAssert.h"
-#import "FSTClasses.h"
-#import "FSTDocumentKey.h"
-#import "FSTUsageValidation.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTClasses.h"
+#import "Firestore/Source/Util/FSTUsageValidation.h"
NS_ASSUME_NONNULL_BEGIN