Index: branches/5.2.x/units/shipping_quote_engines/usps.php
===================================================================
diff -u -N -r14089 -r14099
--- branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 14089)
+++ branches/5.2.x/units/shipping_quote_engines/usps.php	(.../usps.php)	(revision 14099)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: usps.php 14089 2010-11-26 22:16:00Z alex $
+* @version	$Id: usps.php 14099 2010-12-28 18:08:32Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -53,9 +53,13 @@
 	var $types = Array();
 	var $intl_types = Array();
 
-	function USPS()
+	/**
+	 * Creates USPS processing class
+	 *
+	 */
+	public function __construct()
 	{
-		parent::kBase();
+		parent::__construct();
 
         // EXPRESS, FIRST CLASS, PRIORITY, PARCEL, BMP, MEDIA
 		$this->types = Array(
@@ -1013,7 +1017,7 @@
 
 	function GetShippingQuotes($params = null)
 	{
-		$weights = Kg2Pounds($params['packages']['0']['weight']);
+		$weights = kUtil::Kg2Pounds($params['packages']['0']['weight']);
 		$weight = '';
 		$weight = $weights[0];
 		if ( $weights[1] != '' ) {
@@ -1179,8 +1183,9 @@
 	{
 		$sql = 'SELECT Properties FROM '.$this->Application->getUnitOption('sqe', 'TableName').'
 				WHERE ClassName="USPS"';
-		$db =& $this->Application->GetADODBConnection();
-		return unserialize($db->GetOne($sql));
+		$params = $this->Conn->GetOne($sql);
+
+		return unserialize($params);
 	}
 
 	function _prepare_xml_param($value) {
@@ -1238,7 +1243,7 @@
 				WHERE ' . $object->IDField . ' = ' . $object->GetID();
 		$weight = $this->Application->Conn->GetOne($sql);
 
-		$f_weight = Kg2Pounds($weight);
+		$f_weight = kUtil::Kg2Pounds($weight);
 		$sOrder['ShippingWeight'] = $f_weight[0].'.'.$f_weight[1];
 
 		foreach ($ShippingInfo as $k => $ShippingRow) {
@@ -1273,7 +1278,7 @@
 
 			foreach ($order_items as $k => $order_item) {
 				$p_weight = Array();
-				$p_weight = Kg2Pounds($order_item['Weight']);
+				$p_weight = kUtil::Kg2Pounds($order_item['Weight']);
 				$Items[$i] = Array('Qty' => $order_item['Quantity'], 'Price' => $order_item['Price'], 'NetPounds' => $p_weight[0], 'NetOunces' => $p_weight[1]);
 				$i++;
 			}