10 files changed, 54 insertions, 54 deletions
diff --git a/Frameworks/QueryKit/Source/QKQuery.h b/Frameworks/QueryKit/Source/QKQuery.h
index 9eb0a621..73b21489 100644
--- a/Frameworks/QueryKit/Source/QKQuery.h
+++ b/Frameworks/QueryKit/Source/QKQuery.h
@@ -64,59 +64,59 @@
 }
 
 /**
- * @property _database The database the query is to be run against (optional).
+ * @property database The database the query is to be run against (optional).
  */
-@property(readwrite, retain, getter=database, setter=setDatabase:) NSString *_database;
+@property(readwrite, retain) NSString *database;
 
 /**
- * @property _table The table the query is to be run against.
+ * @property table The table the query is to be run against.
  */
-@property(readwrite, retain, getter=table, setter=setTable:) NSString *_table; 
+@property(readwrite, retain) NSString *table; 
 
 /**
- * @property _parameters The parameters (constraints) of the query.
+ * @property parameters The parameters (constraints) of the query.
  */
-@property(readwrite, retain, getter=parameters, setter=setParameters:) NSMutableArray *_parameters;
+@property(readwrite, retain) NSMutableArray *parameters;
 
 /**
- * @property _fields The fields of the query.
+ * @property fields The fields of the query.
  */
-@property(readwrite, retain, getter=fields, setter=setFields:) NSMutableArray *_fields;
+@property(readwrite, retain) NSMutableArray *fields;
 
 /**
- * @property _updateFields The fields of an UPDATE query.
+ * @property updateFields The fields of an UPDATE query.
  */
-@property(readwrite, retain, getter=updateParameters, setter=setUpdateParameters:) NSMutableArray *_updateParameters;
+@property(readwrite, retain) NSMutableArray *updateParameters;
 
 /**
- * @property _queryType The type of query to be built.
+ * @property queryType The type of query to be built.
  */
-@property(readwrite, assign, getter=queryType, setter=setQueryType:) QKQueryType _queryType;
+@property(readwrite, assign) QKQueryType queryType;
 
 /**
- * @property _queryDatabase The underlying database system this query will be run against.
+ * @property queryDatabase The underlying database system this query will be run against.
  */
-@property(readwrite, assign, getter=queryDatabase, setter=setQueryDatabase:) QKQueryDatabase _queryDatabase;
+@property(readwrite, assign) QKQueryDatabase queryDatabase;
 
 /**
- * @property _useQuotedIdentifiers Indicates whether or not the query's fields should be quoted.
+ * @property useQuotedIdentifiers Indicates whether or not the query's fields should be quoted.
  */
-@property(readwrite, assign, getter=useQuotedIdentifiers, setter=setUseQuotedIdentifiers:) BOOL _useQuotedIdentifiers;
+@property(readwrite, assign) BOOL useQuotedIdentifiers;
 
 /**
- * @property _groupByFields The group by fields of the query.
+ * @property groupByFields The group by fields of the query.
  */
-@property(readonly, getter=groupByFields) NSMutableArray *_groupByFields;
+@property(readonly) NSMutableArray *groupByFields;
 
 /**
- * @property _orderByFields The order by fields of the query.
+ * @property orderByFields The order by fields of the query.
  */
-@property(readonly, getter=orderByFields) NSMutableArray *_orderByFields;
+@property(readonly) NSMutableArray *orderByFields;
 
 /**
- * @property _identifierQuote The character to use when quoting identifiers.
+ * @property identifierQuote The character to use when quoting identifiers.
  */
-@property(readonly, getter=identifierQuote) NSString *_identifierQuote;
+@property(readonly) NSString *identifierQuote;
 
 + (QKQuery *)queryTable:(NSString *)table;
 + (QKQuery *)queryTable:(NSString *)table database:(NSString *)database;
diff --git a/Frameworks/QueryKit/Source/QKQuery.m b/Frameworks/QueryKit/Source/QKQuery.m
index 01dfa1fc..359ca558 100644
--- a/Frameworks/QueryKit/Source/QKQuery.m
+++ b/Frameworks/QueryKit/Source/QKQuery.m
@@ -59,17 +59,17 @@ static NSString *QKNoQueryTableException = @"QKNoQueryTable";
 
 @implementation QKQuery
 
-@synthesize _database;
-@synthesize _table;
-@synthesize _identifierQuote;
-@synthesize _parameters;
-@synthesize _queryType;
-@synthesize _queryDatabase;
-@synthesize _fields;
-@synthesize _updateParameters;
-@synthesize _useQuotedIdentifiers;
-@synthesize _groupByFields;
-@synthesize _orderByFields;
+@synthesize database = _database;
+@synthesize table = _table; 
+@synthesize identifierQuote = _identifierQuote;
+@synthesize parameters = _parameters;
+@synthesize queryType = _queryType;
+@synthesize queryDatabase = _queryDatabase;
+@synthesize fields = _fields;
+@synthesize updateParameters = _updateParameters;
+@synthesize useQuotedIdentifiers = _useQuotedIdentifiers;
+@synthesize groupByFields = _groupByFields;
+@synthesize orderByFields = _orderByFields;
 
 #pragma mark -
 #pragma mark Initialization
diff --git a/Frameworks/QueryKit/Source/QKQueryConstruct.h b/Frameworks/QueryKit/Source/QKQueryConstruct.h
index be3ab220..bf4a786b 100644
--- a/Frameworks/QueryKit/Source/QKQueryConstruct.h
+++ b/Frameworks/QueryKit/Source/QKQueryConstruct.h
@@ -43,13 +43,13 @@
 }
 
 /**
- * @property _identifierQuote The quoute character to use for identifiers.
+ * @property identifierQuote The quoute character to use for identifiers.
  */
-@property(readwrite, retain, getter=identifierQuote, setter=setIdentifierQuote:) NSString *_identiferQuote;
+@property(readwrite, retain) NSString *identifierQuote;
 
 /**
- * @property _useQuotedIdentifier Indicates whether or not identifiers should be quoted.
+ * @property useQuotedIdentifier Indicates whether or not identifiers should be quoted.
  */
-@property(readwrite, assign, getter=useQuotedIdentifier, setter=setUseQuotedIdentifier:) BOOL _useQuotedIdentifier;
+@property(readwrite, assign) BOOL useQuotedIdentifier;
 
 @end
diff --git a/Frameworks/QueryKit/Source/QKQueryConstruct.m b/Frameworks/QueryKit/Source/QKQueryConstruct.m
index db432add..b98c4e7b 100644
--- a/Frameworks/QueryKit/Source/QKQueryConstruct.m
+++ b/Frameworks/QueryKit/Source/QKQueryConstruct.m
@@ -32,8 +32,8 @@
 
 @implementation QKQueryConstruct
 
-@synthesize _useQuotedIdentifier;
-@synthesize _identiferQuote;
+@synthesize useQuotedIdentifier = _useQuotedIdentifier;
+@synthesize identifierQuote = _identiferQuote;
 
 #pragma mark -
 #pragma mark Initialisation
diff --git a/Frameworks/QueryKit/Source/QKQueryGenericParameter.h b/Frameworks/QueryKit/Source/QKQueryGenericParameter.h
index 1c782b6a..13d722c5 100644
--- a/Frameworks/QueryKit/Source/QKQueryGenericParameter.h
+++ b/Frameworks/QueryKit/Source/QKQueryGenericParameter.h
@@ -38,13 +38,13 @@
 }
 
 /**
- * @property _field The field component of the parameter.
+ * @property field The field component of the parameter.
  */
-@property(readwrite, retain, getter=field, setter=setField:) NSString *_field;
+@property(readwrite, retain) NSString *field;
 
 /**
- *@property _value The value component of the parameter.
+ *@property value The value component of the parameter.
  */
-@property(readwrite, retain, getter=value, setter=setValue:) id _value;
+@property(readwrite, retain) id value;
 
 @end
diff --git a/Frameworks/QueryKit/Source/QKQueryGenericParameter.m b/Frameworks/QueryKit/Source/QKQueryGenericParameter.m
index 57fe58c7..e58b1daf 100644
--- a/Frameworks/QueryKit/Source/QKQueryGenericParameter.m
+++ b/Frameworks/QueryKit/Source/QKQueryGenericParameter.m
@@ -33,8 +33,8 @@
 
 @implementation QKQueryGenericParameter
 
-@synthesize _field;
-@synthesize _value;
+@synthesize field = _field;
+@synthesize value = _value;
 
 #pragma mark -
 
diff --git a/Frameworks/QueryKit/Source/QKQueryOrderBy.h b/Frameworks/QueryKit/Source/QKQueryOrderBy.h
index aa7a80e7..38a3ba7d 100644
--- a/Frameworks/QueryKit/Source/QKQueryOrderBy.h
+++ b/Frameworks/QueryKit/Source/QKQueryOrderBy.h
@@ -44,14 +44,14 @@
 }
 
 /**
- * @property _orderByField
+ * @property orderByField
  */
-@property(readwrite, retain, getter=orderByField, setter=setOrderByField:) NSString *_orderByField;
+@property(readwrite, retain) NSString *orderByField;
 
 /**
- * @property _orderByDescending
+ * @property orderByDescending
  */
-@property(readwrite, assign, getter=orderByDescending, setter=setOrderByDescending:) BOOL _orderByDescending;
+@property(readwrite, assign) BOOL orderByDescending;
 
 + (QKQueryOrderBy *)orderByField:(NSString *)field descending:(BOOL)descending;
 
diff --git a/Frameworks/QueryKit/Source/QKQueryOrderBy.m b/Frameworks/QueryKit/Source/QKQueryOrderBy.m
index 36b43248..389868ae 100644
--- a/Frameworks/QueryKit/Source/QKQueryOrderBy.m
+++ b/Frameworks/QueryKit/Source/QKQueryOrderBy.m
@@ -32,8 +32,8 @@
 
 @implementation QKQueryOrderBy
 
-@synthesize _orderByField;
-@synthesize _orderByDescending;
+@synthesize orderByField = _orderByField;
+@synthesize orderByDescending = _orderByDescending;
 
 #pragma mark -
 #pragma mark Initialisation
diff --git a/Frameworks/QueryKit/Source/QKQueryParameter.h b/Frameworks/QueryKit/Source/QKQueryParameter.h
index 8cbcafd6..f3a525e6 100644
--- a/Frameworks/QueryKit/Source/QKQueryParameter.h
+++ b/Frameworks/QueryKit/Source/QKQueryParameter.h
@@ -44,9 +44,9 @@
 }
 
 /**
- * @property _operator The operator component of the parameter.
+ * @property operator The operator component of the parameter.
  */
-@property(readwrite, assign, getter=operator, setter=setOperator:) QKQueryOperator _operator;
+@property(readwrite, assign) QKQueryOperator operator;
 
 + (QKQueryParameter *)queryParamWithField:(NSString *)field operator:(QKQueryOperator)op value:(id)value;
 
diff --git a/Frameworks/QueryKit/Source/QKQueryParameter.m b/Frameworks/QueryKit/Source/QKQueryParameter.m
index 87035d00..1818b732 100644
--- a/Frameworks/QueryKit/Source/QKQueryParameter.m
+++ b/Frameworks/QueryKit/Source/QKQueryParameter.m
@@ -34,7 +34,7 @@
 
 @implementation QKQueryParameter
 
-@synthesize _operator;
+@synthesize operator = _operator;
 
 #pragma mark -
 #pragma mark Initialisation