From e3cf5369d89c9c5c47c43237830d2e96c1f73a35 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Thu, 21 Jul 2022 14:49:00 +0200
Subject: [PATCH] Cleanup AddressBook namespaces

---
 .../libraries/RainLoop/Providers/AddressBook.php   | 14 +++++++-------
 .../Providers/AddressBook/PdoAddressBook.php       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
index 58135dce2..6517e82f0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
@@ -4,14 +4,14 @@ namespace RainLoop\Providers;
 
 use RainLoop\Providers\AddressBook\Enumerations\PropertyType as PropertyType;
 
-class AddressBook extends \RainLoop\Providers\AbstractProvider
+class AddressBook extends AbstractProvider
 {
 	/**
 	 * @var \RainLoop\Providers\AddressBook\AddressBookInterface
 	 */
 	private $oDriver;
 
-	public function __construct(?\RainLoop\Providers\AddressBook\AddressBookInterface $oDriver)
+	public function __construct(?AddressBook\AddressBookInterface $oDriver)
 	{
 		$this->oDriver = $oDriver;
 	}
@@ -37,7 +37,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 		return $this->IsActive() ? $this->oDriver->Export($sType) : false;
 	}
 
-	public function ContactSave(\RainLoop\Providers\AddressBook\Classes\Contact $oContact) : bool
+	public function ContactSave(AddressBook\Classes\Contact $oContact) : bool
 	{
 		return $this->IsActive() ? $this->oDriver->ContactSave($oContact) : false;
 	}
@@ -57,7 +57,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 		return $this->IsActive() ? $this->oDriver->GetContacts($iOffset, $iLimit, $sSearch, $iResultCount) : array();
 	}
 
-	public function GetContactByID($mID, bool $bIsStrID = false) : ?\RainLoop\Providers\AddressBook\Classes\Contact
+	public function GetContactByID($mID, bool $bIsStrID = false) : ?AddressBook\Classes\Contact
 	{
 		return $this->IsActive() ? $this->oDriver->GetContactByID($mID, $bIsStrID) : null;
 	}
@@ -160,7 +160,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 		$iCount = 0;
 		if ($this->IsActive() && \count($aCsvData))
 		{
-			$oContact = new \RainLoop\Providers\AddressBook\Classes\Contact();
+			$oContact = new AddressBook\Classes\Contact();
 			foreach ($aCsvData as $aItem)
 			{
 				\MailSo\Base\Utils::ResetTimeLimit();
@@ -177,7 +177,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 
 						if (PropertyType::UNKNOWN !== $iType)
 						{
-							$oProp = new \RainLoop\Providers\AddressBook\Classes\Property();
+							$oProp = new AddressBook\Classes\Property();
 							$oProp->Type = $iType;
 							$oProp->Value = $sItemValue;
 							$oProp->TypeStr = \is_array($mData) && !empty($mData[1]) ? $mData[1] : '';
@@ -228,7 +228,7 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 
 			if ($oVCardSplitter)
 			{
-				$oContact = new \RainLoop\Providers\AddressBook\Classes\Contact();
+				$oContact = new AddressBook\Classes\Contact();
 
 				$oVCard = null;
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index edc7fb373..1f31ae4b9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -6,7 +6,7 @@ use RainLoop\Providers\AddressBook\Enumerations\PropertyType;
 
 class PdoAddressBook
 	extends \RainLoop\Common\PdoAbstract
-	implements \RainLoop\Providers\AddressBook\AddressBookInterface
+	implements AddressBookInterface
 {
 	use CardDAV;