Rename constructor for compliance with PHP7

5 files changed, 8 insertions, 8 deletions

diff --git a/Contact.php b/Contact.php
index ace3d70..dec7405 100644
--- a/Contact.php
+++ b/Contact.php
@@ -35,7 +35,7 @@ class Contact extends LibertyContent {
 	 * @param integer Contact Id identifer
 	 * @param integer Base content_id identifier
 	 */
-	function Contact( $pContactId = NULL, $pContentId = NULL ) {
+	function __construct( $pContactId = NULL, $pContentId = NULL ) {
 		parent::__construct( $pContentId );
 		$this->registerContentType( CONTACT_CONTENT_TYPE_GUID, array(
 				'content_type_guid' => CONTACT_CONTENT_TYPE_GUID,
diff --git a/ContactType.php b/ContactType.php
index c01a711..a7f837e 100644
--- a/ContactType.php
+++ b/ContactType.php
@@ -20,7 +20,7 @@ require_once( KERNEL_PKG_PATH."BitBase.php" );
 class ContactType extends BitBase {
 	var $mContactType;
 
-	function ContactType() {
+	function __construct() {
 		parent::__construct();
 	}
 
diff --git a/ContactXref.php b/ContactXref.php
index 3c1e7f8..3d35bb6 100644
--- a/ContactXref.php
+++ b/ContactXref.php
@@ -24,7 +24,7 @@ class ContactXref extends BitBase {
 	var $mContentId;
 	var $mDate;
 
-	function ContactXref( $iXrefId = NULL ) {
+	function __construct( $iXrefId = NULL ) {
 		$this->mXrefId = NULL;
 		$this->mSource = NULL;
 		parent::__construct();
diff --git a/ContactXrefType.php b/ContactXrefType.php
index 434185a..49b0404 100644
--- a/ContactXrefType.php
+++ b/ContactXrefType.php
@@ -19,7 +19,7 @@ require_once( KERNEL_PKG_PATH."BitBase.php" );
  */
 class ContactXrefType extends BitBase {
 
-	function ContactXrefType() {
+	function __construct() {
 		parent::__construct();
 
 	}
diff --git a/lib/phpcoord-2.3.php b/lib/phpcoord-2.3.php
index 46e105e..494d62d 100755
--- a/lib/phpcoord-2.3.php
+++ b/lib/phpcoord-2.3.php
@@ -32,7 +32,7 @@
      * @param lat latitude
      * @param lng longitude
      */
-    function LatLng($lat, $lng) {
+    function __construct($lat, $lng) {
       $this->lat = $lat;
       $this->lng = $lng;
     }
@@ -374,7 +374,7 @@
      * @param easting the easting of the reference (with 1m accuracy)
      * @param northing the northing of the reference (with 1m accuracy)
      */
-    function OSRef($easting, $northing) {
+    function __construct($easting, $northing) {
       $this->easting  = $easting;
       $this->northing = $northing;
     }
@@ -541,7 +541,7 @@
      * @param latZone
      * @param lngZone
      */
-    function UTMRef($easting, $northing, $latZone, $lngZone) {
+    function __construct($easting, $northing, $latZone, $lngZone) {
       $this->easting  = $easting;
       $this->northing = $northing;
       $this->latZone  = $latZone;
@@ -667,7 +667,7 @@
      * @param maj the major axis
      * @param min the minor axis
      */
-    function RefEll($maj, $min) {
+    function __construct($maj, $min) {
       $this->maj = $maj;
       $this->min = $min;
       $this->ecc = (($maj * $maj) - ($min * $min)) / ($maj * $maj);