* doxygen

pavel-pimenov · Nov 12, 2019 · adbfeaf · adbfeaf
1 parent 66becc5
commit adbfeaf
Show file tree

Hide file tree

Showing 102 changed files with 220 additions and 253 deletions.
diff --git a/Doxyfile b/Doxyfile
diff --git a/FlyFeatures/AutoUpdate.cpp b/FlyFeatures/AutoUpdate.cpp
@@ -19,7 +19,6 @@
 #include "stdinc.h"
 #include "AutoUpdate.h"
 #include <Shellapi.h>
-#include "../client/Util.h"
 #include "../client/ResourceManager.h"
 #include "../client/LogManager.h"
 #include "../client/CompatibilityManager.h"

diff --git a/FlyFeatures/ThemeManager.cpp b/FlyFeatures/ThemeManager.cpp
@@ -18,7 +18,6 @@
 
 #include "stdinc.h"
 #include "ThemeManager.h"
-#include "../client/Util.h"
 
 HMODULE ThemeManager::g_resourceLibInstance = nullptr;
 #ifdef _DEBUG

diff --git a/client/ADLSearch.cpp b/client/ADLSearch.cpp
@@ -27,7 +27,6 @@
 
 #include "ADLSearch.h"
 #include "QueueManager.h"
-#include "StringTokenizer.h"
 
 ADLSearch::ADLSearch() :
 	searchString("<Enter string>"),

diff --git a/client/BufferedSocket.cpp b/client/BufferedSocket.cpp
@@ -19,7 +19,6 @@
 #include "stdinc.h"
 #include "CompatibilityManager.h"
 #include "BufferedSocket.h"
-#include "TimerManager.h"
 #include "SettingsManager.h"
 #include "Streams.h"
 #include "CryptoManager.h"
@@ -29,7 +28,6 @@
 #include "ResourceManager.h"
 #include "IpGuard.h"
 #include "ClientManager.h"
-#include "Util.h"
 #include "ShareManager.h"
 #include "DebugManager.h"
 #include "SSLSocket.h"

diff --git a/client/BufferedSocket.h b/client/BufferedSocket.h
@@ -28,7 +28,6 @@
 #include "BufferedSocketListener.h"
 #include "Semaphore.h"
 #include "Socket.h"
-#include "CFlySearchItemTTH.h"
 
 class UnZFilter;
 class InputStream;
@@ -263,7 +262,7 @@ class BufferedSocket : public Speaker<BufferedSocketListener>, private Thread
 		FastCriticalSection cs; // [!] IRainman opt: use spinlock here!
 
 		Semaphore m_socket_semaphore;
-        std::deque<std::pair<Tasks, std::unique_ptr<TaskData> > > m_tasks;
+		std::deque<std::pair<Tasks, std::unique_ptr<TaskData> > > m_tasks;
 		ByteVector m_inbuf;
 		size_t m_myInfoCount; // Ñ÷åò÷èê MyInfo
 		bool   m_is_all_my_info_loaded;  // Ôëàã ïåðåäà÷è êîìàíäû îòëè÷íîé îò MyInfo (ñòàðòîâàÿ çàãðóçêà ñïèñêà çàêîí÷èëàñü)

diff --git a/client/BufferedSocketListener.h b/client/BufferedSocketListener.h
@@ -22,7 +22,6 @@
 #ifndef DCPLUSPLUS_DCPP_BUFFEREDSOCKETLISTENER_H_
 #define DCPLUSPLUS_DCPP_BUFFEREDSOCKETLISTENER_H_
 
-#include "typedefs.h"
 #include "CFlySearchItemTTH.h"
 
 class BufferedSocketListener

diff --git a/client/CFlyMediaInfo.h b/client/CFlyMediaInfo.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <string>
 #include <vector>
 #ifdef _DEBUG
 #include <unordered_map>

diff --git a/client/CFlylinkDBManager.h b/client/CFlylinkDBManager.h
@@ -7,7 +7,6 @@
 #ifndef CFlylinkDBManager_H
 #define CFlylinkDBManager_H
 
-#include <vector>
 #include <memory>
 #include <boost/unordered/unordered_map.hpp>
 #include "QueueItem.h"

diff --git a/client/Client.h b/client/Client.h
@@ -22,13 +22,10 @@
 #ifndef DCPLUSPLUS_DCPP_CLIENT_H
 #define DCPLUSPLUS_DCPP_CLIENT_H
 
-#include <atomic>
 #include "ClientListener.h"
 #include "DebugManager.h"
-#include "SearchQueue.h"
 #include "OnlineUser.h"
 #include "BufferedSocket.h"
-#include "ChatMessage.h"
 
 struct CFlyClientStatistic
 {

diff --git a/client/ClientManager.h b/client/ClientManager.h
@@ -25,7 +25,6 @@
 #include "Client.h"
 #include "AdcSupports.h"
 #include "DirectoryListing.h"
-#include "FavoriteManager.h"
 
 class UserCommand;
 

diff --git a/client/CompatibilityManager.cpp b/client/CompatibilityManager.cpp
@@ -35,12 +35,10 @@
 #include <atlbase.h>
 #include <atlapp.h>
 #endif
-#include "Util.h"
 #include "Socket.h"
 #include "DownloadManager.h"
 #include "UploadManager.h"
 #include "CompatibilityManager.h"
-#include "CFlylinkDBManager.h"
 #include "ShareManager.h"
 #include "../FlyFeatures/flyServer.h"
 #include <iphlpapi.h>

diff --git a/client/ConnectionManager.cpp b/client/ConnectionManager.cpp
@@ -18,13 +18,11 @@
 
 #include "stdinc.h"
 
-#include "ConnectionManager.h"
-#include "DownloadManager.h"
-#include "UploadManager.h"
 #include "CryptoManager.h"
 #include "QueueManager.h"
 #include "ShareManager.h"
 #include "DebugManager.h"
+#include "DownloadManager.h"
 
 #ifdef RIP_USE_CONNECTION_AUTODETECT
 #include "nmdchub.h"

diff --git a/client/ConnectionManager.h b/client/ConnectionManager.h
@@ -26,7 +26,6 @@
 #include "TimerManager.h"
 
 #include "UserConnection.h"
-#include "Singleton.h"
 #include "ConnectionManagerListener.h"
 #include "HintedUser.h"
 
@@ -158,9 +157,9 @@ class ExpectedMap
 			CFlyFastLock(cs);
 			m_expectedConnections.insert(std::make_pair(aNick, NickHubPair(aMyNick, aHubUrl
 #ifdef RIP_USE_CONNECTION_AUTODETECT
-			                                                          , reason
+			                                                               , reason
 #endif
-			                                                         )));
+			                                                              )));
 		}
 
 		NickHubPair remove(const string& aNick)

diff --git a/client/CryptoManager.h b/client/CryptoManager.h
@@ -20,7 +20,6 @@
 #define DCPLUSPLUS_DCPP_CRYPTO_MANAGER_H
 
 #include "CFlyThread.h"
-#include "Exception.h"
 #include "Singleton.h"
 #include "SSL.h"
 #include "Socket.h"

diff --git a/client/DirectoryListing.h b/client/DirectoryListing.h
@@ -22,7 +22,6 @@
 #ifndef DCPLUSPLUS_DCPP_DIRECTORY_LISTING_H
 #define DCPLUSPLUS_DCPP_DIRECTORY_LISTING_H
 
-#include "SimpleXML.h"
 #include "QueueItem.h"
 #include "CFlyMediaInfo.h"
 #include "UserInfoBase.h"

diff --git a/client/DownloadManager.cpp b/client/DownloadManager.cpp
@@ -22,7 +22,6 @@
 #include "DownloadManager.h"
 #include "ConnectionManager.h"
 #include "QueueManager.h"
-#include "Download.h"
 #include "HashManager.h"
 #include "MerkleCheckOutputStream.h"
 #include "UploadManager.h"

diff --git a/client/DownloadManager.h b/client/DownloadManager.h
@@ -29,11 +29,7 @@
 #include <agents.h> // Win64 only
 #endif
 
-#include "forward.h"
-
 #include "DownloadManagerListener.h"
-#include "UserConnectionListener.h"
-#include "QueueItem.h"
 #include "TimerManager.h"
 #include "Singleton.h"
 #include "UserConnection.h"
@@ -59,7 +55,7 @@ class DownloadManager : public Speaker<DownloadManagerListener>,
 	public Singleton<DownloadManager>
 {
 #ifdef FLYLINKDC_USE_TORRENT
-        std::unique_ptr<libtorrent::session> m_torrent_session;
+		std::unique_ptr<libtorrent::session> m_torrent_session;
 		libtorrent::port_mapping_t m_maping_index[3];
 		void select_files(const libtorrent::torrent_handle& p_torrent_handle);
 		std::atomic<int> m_torrent_resume_count = { 0 };
@@ -101,7 +97,7 @@ class DownloadManager : public Speaker<DownloadManagerListener>,
 		void fireData(UserConnection*, const uint8_t*, size_t) noexcept;
 	private:
 		void onTorrentAlertNotify();
-
+		
 		static std::unique_ptr<webrtc::RWLockWrapper> g_csDownload;
 		static DownloadList g_download_map;
 		static UserConnectionList g_idlers;
@@ -154,8 +150,8 @@ class DownloadManager : public Speaker<DownloadManagerListener>,
 		#endif*/
 		void on(CheckUserIP, UserConnection*) noexcept override; // [+] SSA
 	public:
-        bool alert_handler();
-        void post_torrent_info();
+		bool alert_handler();
+		void post_torrent_info();
 	private:
 #ifdef FLYLKINKDC_USE_TORRENT_AGENTS_CONC_TIMER
 		concurrency::call<void*> alert_caller_;

diff --git a/client/DownloadManagerListener.h b/client/DownloadManagerListener.h
@@ -24,7 +24,6 @@
 
 #include "typedefs.h"
 #include "User.h"
-#include "TransferData.h"
 #include "Download.h"
 
 #include "libtorrent\torrent_info.hpp"

diff --git a/client/FavoriteManager.cpp b/client/FavoriteManager.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "stdinc.h"
-#include "FavoriteManager.h"
 #include "ClientManager.h"
 #include "StringTokenizer.h"
 #include "SimpleXML.h"

diff --git a/client/FavoriteManager.h b/client/FavoriteManager.h
@@ -32,8 +32,6 @@
 #include "FavoriteManagerListener.h"
 #include "HubEntry.h"
 #include "FavHubGroup.h"
-#include "webrtc/rtc_base/synchronization/rw_lock_wrapper.h"
-
 
 class PreviewApplication
 #ifdef _DEBUG

diff --git a/client/HashManager.cpp b/client/HashManager.cpp
@@ -18,7 +18,6 @@
 
 #include "stdinc.h"
 #include "HashManager.h"
-#include "ResourceManager.h"
 #include "SimpleXML.h"
 #include "LogManager.h"
 #include "CFlylinkDBManager.h"

diff --git a/client/LogManager.cpp b/client/LogManager.cpp
@@ -18,7 +18,6 @@
 
 #include "stdinc.h"
 #include "LogManager.h"
-#include "SettingsManager.h"
 #include "CFlylinkDBManager.h"
 #include "CompatibilityManager.h"
 #include "TimerManager.h"

diff --git a/client/MerkleCheckOutputStream.h b/client/MerkleCheckOutputStream.h
@@ -23,7 +23,6 @@
 #define DCPLUSPLUS_DCPP_MERKLE_CHECK_OUTPUT_STREAM_H
 
 #include "Streams.h"
-#include "MerkleTree.h"
 
 template<class TreeType, bool managed>
 class MerkleCheckOutputStream : public OutputStream

diff --git a/client/MerkleTree.h b/client/MerkleTree.h
@@ -23,7 +23,6 @@
 #define DCPLUSPLUS_DCPP_MERKLE_TREE_H
 
 #include "typedefs.h"
-#include "TigerHash.h"
 #include "HashValue.h"
 #include "GPGPUManager.h"
 

diff --git a/client/OnlineUser.h b/client/OnlineUser.h
@@ -21,9 +21,7 @@
 
 #pragma once
 
-#include <boost/unordered/unordered_map.hpp>
 #include "StringPool.h"
-#include "User.h"
 #include "UserInfoBase.h"
 #include "UserInfoColumns.h"
 

diff --git a/client/QueueItem.h b/client/QueueItem.h
@@ -26,11 +26,8 @@
 #include "HintedUser.h"
 #include "webrtc/rtc_base/synchronization/rw_lock_wrapper.h"
 #include "Download.h"
-#include "CFlyThread.h"
 #include <map>
-#include <vector>
 
-using std::vector;
 using std::pair;
 
 #ifdef FLYLINKDC_USE_LOG_QUEUE_ITEM_DIRTY

diff --git a/client/QueueManager.h b/client/QueueManager.h
@@ -23,7 +23,6 @@
 #define DCPLUSPLUS_DCPP_QUEUE_MANAGER_H
 
 #include "ClientManager.h"
-#include "Exception.h"
 #include "QueueManagerListener.h"
 #include "SearchManagerListener.h"
 #include "LogManager.h"

diff --git a/client/SSLSocket.h b/client/SSLSocket.h
@@ -21,11 +21,8 @@
 #ifndef DCPLUSPLUS_DCPP_SSLSOCKET_H
 #define DCPLUSPLUS_DCPP_SSLSOCKET_H
 
-#include <openssl/ssl.h>
-
 #include "CryptoManager.h"
 #include "Socket.h"
-#include "Singleton.h"
 
 using std::unique_ptr;
 using std::string;

diff --git a/client/ShareManager.cpp b/client/ShareManager.cpp
@@ -26,7 +26,6 @@
 #include "LogManager.h"
 #include "HashManager.h"
 #include "QueueManager.h"
-#include "debug.h"
 #include "AdcHub.h"
 #include "SimpleXML.h"
 #include "File.h"

diff --git a/client/ShareManager.h b/client/ShareManager.h
@@ -25,7 +25,6 @@
 #include <ShlObj.h>
 
 #include "SearchManager.h"
-#include "LogManager.h"
 #include "HashManager.h"
 #include "QueueManagerListener.h"
 #include "BloomFilter.h"

diff --git a/client/SimpleXMLReader.cpp b/client/SimpleXMLReader.cpp
@@ -17,13 +17,10 @@
  */
 
 #include "stdinc.h"
-#include "SimpleXMLReader.h"
 
+#include "SimpleXMLReader.h"
 #include "SimpleXML.h"
 
-#include "Text.h"
-#include "Streams.h"
-
 inline static bool isSpace(int c)
 {
 	return c == 0x20 || c == 0x09 || c == 0x0d || c == 0x0a;

diff --git a/client/UploadManager.h b/client/UploadManager.h
@@ -23,7 +23,6 @@
 #define DCPLUSPLUS_DCPP_UPLOAD_MANAGER_H
 
 #include <set>
-#include "Singleton.h"
 #include "UploadManagerListener.h"
 #include "ClientManagerListener.h"
 #include "UserConnection.h"

diff --git a/client/User.h b/client/User.h
@@ -22,7 +22,6 @@
 #ifndef DCPLUSPLUS_DCPP_USER_H
 #define DCPLUSPLUS_DCPP_USER_H
 
-#include <boost/asio/ip/address_v4.hpp>
 #ifdef _DEBUG
 #include <atomic>
 #endif

diff --git a/client/Util.h b/client/Util.h
@@ -27,7 +27,6 @@
 #include <atlcomtime.h>
 #endif
 
-#include <list>
 #include <map>
 
 #include "Text.h"
@@ -1346,7 +1345,7 @@ class Util
 
 		static StringList splitSettingAndReplaceSpace(string patternList);
 		static string toSettingString(const StringList& patternList);
-        static StringList splitSettingAndLower(const string& patternList);
+		static StringList splitSettingAndLower(const string& patternList);
 
 		static string getLang();
 

diff --git a/client/WildcardsReg.cpp b/client/WildcardsReg.cpp
@@ -8,7 +8,6 @@
 
 #include "stdinc.h"
 #include "WildcardsReg.h"
-#include "debug.h"
 
 namespace net
 {

diff --git a/client_2017.vcxproj b/client_2017.vcxproj
@@ -614,7 +614,6 @@
     <ClCompile Include="client\webrtc\rtc_base\synchronization\rw_lock_wrapper.cc" />
     <ClCompile Include="client\webrtc\talk\base\winfirewall.cc" />
     <ClCompile Include="client\WebServerManager.cpp" />
-    <ClCompile Include="client\WildcardsReg.cpp" />
     <ClCompile Include="client\zip\zip.c">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>