From 4383a3dccfa632656ceb049699f93b4396eb0b7f Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 19 Feb 2018 11:21:47 +0100
Subject: [PATCH] feat(IdentityAddress): remove useless private file (used only
 in identity address unit)

---
 src/CMakeLists.txt               |  7 +++---
 src/address/identity-address-p.h | 42 --------------------------------
 src/address/identity-address.cpp | 14 +++++++++--
 3 files changed, 15 insertions(+), 48 deletions(-)
 delete mode 100644 src/address/identity-address-p.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fec6de2bf..7af91b837 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,6 @@
 set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
 	address/address-p.h
 	address/address.h
-	address/identity-address-p.h
 	address/identity-address.h
 	c-wrapper/c-wrapper.h
 	c-wrapper/internal/c-sal.h
@@ -93,9 +92,9 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
 	conference/session/media-session.h
 	conference/session/port-config.h
 	content/content-manager.h
+	content/content-p.h
 	content/content-type.h
 	content/content.h
-	content/content-p.h
 	content/file-content.h
 	content/file-transfer-content.h
 	core/core-accessor.h
@@ -144,10 +143,10 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
 	object/property-container.h
 	object/singleton.h
 	sal/sal.h
-	search/magic-search.h
 	search/magic-search-p.h
-	search/search-result.h
+	search/magic-search.h
 	search/search-result-p.h
+	search/search-result.h
 	utils/background-task.h
 	utils/payload-type-handler.h
 	variant/variant.h
diff --git a/src/address/identity-address-p.h b/src/address/identity-address-p.h
deleted file mode 100644
index 052bd7965..000000000
--- a/src/address/identity-address-p.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * identity-address-p.h
- * Copyright (C) 2010-2018 Belledonne Communications SARL
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _L_IDENTITY_ADDRESS_P_H_
-#define _L_IDENTITY_ADDRESS_P_H_
-
-#include "identity-address.h"
-#include "object/clonable-object-p.h"
-
-// =============================================================================
-
-LINPHONE_BEGIN_NAMESPACE
-
-class IdentityAddressPrivate : public ClonableObjectPrivate {
-private:
-	std::string scheme;
-	std::string username;
-	std::string domain;
-	std::string gruu;
-
-	L_DECLARE_PUBLIC(IdentityAddress);
-};
-
-LINPHONE_END_NAMESPACE
-
-#endif // ifndef _L_IDENTITY_ADDRESS_P_H_
diff --git a/src/address/identity-address.cpp b/src/address/identity-address.cpp
index 7dcc480c2..f20590e16 100644
--- a/src/address/identity-address.cpp
+++ b/src/address/identity-address.cpp
@@ -20,10 +20,10 @@
 #include "linphone/utils/utils.h"
 
 #include "address.h"
-#include "identity-address-p.h"
 #include "c-wrapper/c-wrapper.h"
-#include "identity-address-p.h"
+#include "identity-address.h"
 #include "logger/logger.h"
+#include "object/clonable-object-p.h"
 
 // =============================================================================
 
@@ -33,6 +33,16 @@ LINPHONE_BEGIN_NAMESPACE
 
 // -----------------------------------------------------------------------------
 
+class IdentityAddressPrivate : public ClonableObjectPrivate {
+public:
+	std::string scheme;
+	std::string username;
+	std::string domain;
+	std::string gruu;
+};
+
+// -----------------------------------------------------------------------------
+
 IdentityAddress::IdentityAddress (const string &address) : ClonableObject(*new IdentityAddressPrivate) {
 	L_D();
 	Address tmpAddress(address);