From 3ad1c9496661f0aa97a8a44356d669bc782bc073 Mon Sep 17 00:00:00 2001
From: user <user>
Date: Wed, 28 Oct 2020 02:43:04 +0800
Subject: [PATCH] fixed conflicting qt and libi2pd TunnelConfig.cpp (.o names
 clash)

---
 build/CMakeLists.txt                              | 2 +-
 libi2pd/Tunnel.h                                  | 2 +-
 libi2pd/{TunnelConfig.cpp => TunnelHopConfig.cpp} | 4 ++--
 libi2pd/{TunnelConfig.h => TunnelHopConfig.h}     | 0
 qt/i2pd_qt/i2pd_qt.pro                            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename libi2pd/{TunnelConfig.cpp => TunnelHopConfig.cpp} (99%)
 rename libi2pd/{TunnelConfig.h => TunnelHopConfig.h} (100%)

diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index 827e20d3..4844ff42 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -85,7 +85,7 @@ set(LIBI2PD_SRC
   "${LIBI2PD_SRC_DIR}/TunnelEndpoint.cpp"
   "${LIBI2PD_SRC_DIR}/TunnelGateway.cpp"
   "${LIBI2PD_SRC_DIR}/TunnelPool.cpp"
-  "${LIBI2PD_SRC_DIR}/TunnelConfig.cpp"
+  "${LIBI2PD_SRC_DIR}/TunnelHopConfig.cpp"
   "${LIBI2PD_SRC_DIR}/util.cpp"
 )
 
diff --git a/libi2pd/Tunnel.h b/libi2pd/Tunnel.h
index a50bc31a..4c1d4f2f 100644
--- a/libi2pd/Tunnel.h
+++ b/libi2pd/Tunnel.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include "Queue.h"
 #include "Crypto.h"
-#include "TunnelConfig.h"
+#include "TunnelHopConfig.h"
 #include "TunnelPool.h"
 #include "TransitTunnel.h"
 #include "TunnelEndpoint.h"
diff --git a/libi2pd/TunnelConfig.cpp b/libi2pd/TunnelHopConfig.cpp
similarity index 99%
rename from libi2pd/TunnelConfig.cpp
rename to libi2pd/TunnelHopConfig.cpp
index 5c2cbd53..4e47f60f 100644
--- a/libi2pd/TunnelConfig.cpp
+++ b/libi2pd/TunnelHopConfig.cpp
@@ -16,7 +16,7 @@
 #include "Timestamp.h"
 #include "I2PEndian.h"
 #include "I2NPProtocol.h"
-#include "TunnelConfig.h"
+#include "TunnelHopConfig.h"
 
 namespace i2p
 {
@@ -163,4 +163,4 @@ namespace tunnel
 		SHA256_Final (h, &ctx);
 	}
 }
-}
\ No newline at end of file
+}
diff --git a/libi2pd/TunnelConfig.h b/libi2pd/TunnelHopConfig.h
similarity index 100%
rename from libi2pd/TunnelConfig.h
rename to libi2pd/TunnelHopConfig.h
diff --git a/qt/i2pd_qt/i2pd_qt.pro b/qt/i2pd_qt/i2pd_qt.pro
index 534d5f5a..ae193db5 100644
--- a/qt/i2pd_qt/i2pd_qt.pro
+++ b/qt/i2pd_qt/i2pd_qt.pro
@@ -60,7 +60,7 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \
     ../../libi2pd/TunnelEndpoint.cpp \
     ../../libi2pd/TunnelGateway.cpp \
     ../../libi2pd/TunnelPool.cpp \
-    ../../libi2pd/TunnelConfig.cpp \
+    ../../libi2pd/TunnelHopConfig.cpp \
     ../../libi2pd/util.cpp \
     ../../libi2pd/Elligator.cpp \
     ../../libi2pd/ECIESX25519AEADRatchetSession.cpp \