From a212bc840144e43efd51081d1a8e01fa1c47a291 Mon Sep 17 00:00:00 2001 From: x-tools-author Date: Wed, 20 Mar 2024 17:13:14 +0800 Subject: [PATCH] chore: update files of project --- CMakeLists.txt | 20 ++---- Source/Assistants/xToolsAssistantFactory.cpp | 67 +++++--------------- Source/Assistants/xToolsAssistantFactory.h | 2 +- 3 files changed, 21 insertions(+), 68 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7e316a4..4fb111b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,25 +83,15 @@ include_directories(${CMAKE_SOURCE_DIR}/Source/Tools/ToolsUI) include_directories(${CMAKE_SOURCE_DIR}/Source/ToolBox/ToolBox) include_directories(${CMAKE_SOURCE_DIR}/Source/ToolBox/ToolBoxUI) +include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/CRC/Source) +include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/mDNS/Source) +include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Ping/Source) include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/ASCII/Source) include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Base64/Source) -include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Broadcast/Source) -include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/CRC/Source) -include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/FileCheck/Source) -include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/mDNS/Source) include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Number/Source) -include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Ping/Source) include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/String/Source) - -add_compile_definitions(X_TOOLS_IMPORT_MODULE_FILECHECKASSISTANT) -add_compile_definitions(X_TOOLS_IMPORT_MODULE_CRCASSISTANT) -add_compile_definitions(X_TOOLS_IMPORT_MODULE_NUMBERASSISTANT) -add_compile_definitions(X_TOOLS_IMPORT_MODULE_STRINGASSISTANT) -add_compile_definitions(X_TOOLS_IMPORT_MODULE_ASCIIASSISTANT) -add_compile_definitions(X_TOOLS_IMPORT_MODULE_BASE64ASSISTANT) -add_compile_definitions(X_TOOLS_IMPORT_MODULE_MDNSASSISTANT) -add_compile_definitions(X_TOOLS_IMPORT_MODULE_PINGASSISTANT) -add_compile_definitions(X_TOOLS_IMPORT_MODULE_BROADCASTASSISTANT) +include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Broadcast/Source) +include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/FileCheck/Source) set(WITH_GFLAGS OFF) set(BUILD_TESTING OFF) diff --git a/Source/Assistants/xToolsAssistantFactory.cpp b/Source/Assistants/xToolsAssistantFactory.cpp index 46b0a737..6c7b8b7a 100644 --- a/Source/Assistants/xToolsAssistantFactory.cpp +++ b/Source/Assistants/xToolsAssistantFactory.cpp @@ -7,69 +7,32 @@ * code directory. **************************************************************************************************/ #include "xToolsAssistantFactory.h" -#include "qwidget.h" #include #include -#ifdef X_TOOLS_IMPORT_MODULE_FILECHECKASSISTANT -#include "xToolsFileCheckAssistant.h" -#endif -#ifdef X_TOOLS_IMPORT_MODULE_CRCASSISTANT -#include "xToolsCRCAssistant.h" -#endif -#ifdef X_TOOLS_IMPORT_MODULE_NUMBERASSISTANT -#include "xToolsNumberAssistant.h" -#endif -#ifdef X_TOOLS_IMPORT_MODULE_STRINGASSISTANT -#include "xToolsStringAssistant.h" -#endif -#ifdef X_TOOLS_IMPORT_MODULE_ASCIIASSISTANT #include "xToolsAsciiAssistant.h" -#endif -#ifdef X_TOOLS_IMPORT_MODULE_BROADCASTASSISTANT -#include "xToolsBroadcastAssistant.h" -#endif -#ifdef X_TOOLS_IMPORT_MODULE_BASE64ASSISTANT #include "xToolsBase64Assisatnt.h" -#endif -#ifdef X_TOOLS_IMPORT_MODULE_MDNSASSISTANT +#include "xToolsBroadcastAssistant.h" +#include "xToolsCRCAssistant.h" +#include "xToolsFileCheckAssistant.h" #include "xToolsMdnsAssistant.h" -#endif -#ifdef X_TOOLS_IMPORT_MODULE_PINGASSISTANT +#include "xToolsNumberAssistant.h" #include "xToolsPingAssistant.h" -#endif +#include "xToolsStringAssistant.h" SAKAssistantsFactory::SAKAssistantsFactory(QObject* parent) : QObject(parent) { -#ifdef X_TOOLS_IMPORT_MODULE_FILECHECKASSISTANT - registerAssistant(AssistantTypeCrc, tr("CRC Assistant")); -#endif -#ifdef X_TOOLS_IMPORT_MODULE_CRCASSISTANT - registerAssistant(AssistantTypeFileCheck, tr("File Check Assistant")); -#endif -#ifdef X_TOOLS_IMPORT_MODULE_ASCIIASSISTANT - registerAssistant(AssistantTypeAscii, tr("ASCII Assistant")); -#endif -#ifdef X_TOOLS_IMPORT_MODULE_NUMBERASSISTANT - registerAssistant(AssistantTypeNumber, tr("Number Assistant")); -#endif -#ifdef X_TOOLS_IMPORT_MODULE_STRINGASSISTANT - registerAssistant(AssistantTypeString, tr("String Assistant")); -#endif -#ifdef X_TOOLS_IMPORT_MODULE_BROADCASTASSISTANT - registerAssistant(AssistantTypeBroadcast, tr("Broadcast Assistant")); -#endif -#ifdef X_TOOLS_IMPORT_MODULE_BASE64ASSISTANT - registerAssistant(AssistantTypeBase64, tr("Base64 Assistant")); -#endif -#ifdef X_TOOLS_IMPORT_MODULE_MDNSASSISTANT - registerAssistant(AssistantTypeMdns, tr("mDNS Assistant")); -#endif -#ifdef X_TOOLS_IMPORT_MODULE_PINGASSISTANT - registerAssistant(AssistantTypePing, tr("Ping Assistant")); -#endif + addAssistant(AssistantTypeCrc, tr("CRC Assistant")); + addAssistant(AssistantTypeMdns, tr("mDNS Assistant")); + addAssistant(AssistantTypePing, tr("Ping Assistant")); + addAssistant(AssistantTypeAscii, tr("ASCII Assistant")); + addAssistant(AssistantTypeBase64, tr("Base64 Assistant")); + addAssistant(AssistantTypeNumber, tr("Number Assistant")); + addAssistant(AssistantTypeString, tr("String Assistant")); + addAssistant(AssistantTypeBroadcast, tr("Broadcast Assistant")); + addAssistant(AssistantTypeFileCheck, tr("File Check Assistant")); } QList SAKAssistantsFactory::supportedAssistants() @@ -83,7 +46,7 @@ QString SAKAssistantsFactory::assistantName(int type) const return m_typeNameMap.value(type); } - QString name = QString("UnknowType(%1)").arg(type); + QString name = QString("UnknownType(%1)").arg(type); return name; } diff --git a/Source/Assistants/xToolsAssistantFactory.h b/Source/Assistants/xToolsAssistantFactory.h index b6380027..4c178fd8 100644 --- a/Source/Assistants/xToolsAssistantFactory.h +++ b/Source/Assistants/xToolsAssistantFactory.h @@ -43,7 +43,7 @@ private: private: template - void registerAssistant(int type, const QString& assistantName) + void addAssistant(int type, const QString& assistantName) { m_typeNameMap.insert(type, assistantName); m_metaObjectMap.insert(type, T::staticMetaObject);