chore: update files of project

This commit is contained in:
x-tools-author 2024-03-20 17:13:14 +08:00
parent 89a2485ab3
commit a212bc8401
3 changed files with 21 additions and 68 deletions

View File

@ -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/ToolBox)
include_directories(${CMAKE_SOURCE_DIR}/Source/ToolBox/ToolBoxUI) 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/ASCII/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Base64/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/Number/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Ping/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/String/Source) include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/String/Source)
include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/Broadcast/Source)
add_compile_definitions(X_TOOLS_IMPORT_MODULE_FILECHECKASSISTANT) include_directories(${CMAKE_SOURCE_DIR}/Source/Assistants/FileCheck/Source)
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)
set(WITH_GFLAGS OFF) set(WITH_GFLAGS OFF)
set(BUILD_TESTING OFF) set(BUILD_TESTING OFF)

View File

@ -7,69 +7,32 @@
* code directory. * code directory.
**************************************************************************************************/ **************************************************************************************************/
#include "xToolsAssistantFactory.h" #include "xToolsAssistantFactory.h"
#include "qwidget.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QWidget> #include <QWidget>
#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" #include "xToolsAsciiAssistant.h"
#endif
#ifdef X_TOOLS_IMPORT_MODULE_BROADCASTASSISTANT
#include "xToolsBroadcastAssistant.h"
#endif
#ifdef X_TOOLS_IMPORT_MODULE_BASE64ASSISTANT
#include "xToolsBase64Assisatnt.h" #include "xToolsBase64Assisatnt.h"
#endif #include "xToolsBroadcastAssistant.h"
#ifdef X_TOOLS_IMPORT_MODULE_MDNSASSISTANT #include "xToolsCRCAssistant.h"
#include "xToolsFileCheckAssistant.h"
#include "xToolsMdnsAssistant.h" #include "xToolsMdnsAssistant.h"
#endif #include "xToolsNumberAssistant.h"
#ifdef X_TOOLS_IMPORT_MODULE_PINGASSISTANT
#include "xToolsPingAssistant.h" #include "xToolsPingAssistant.h"
#endif #include "xToolsStringAssistant.h"
SAKAssistantsFactory::SAKAssistantsFactory(QObject* parent) SAKAssistantsFactory::SAKAssistantsFactory(QObject* parent)
: QObject(parent) : QObject(parent)
{ {
#ifdef X_TOOLS_IMPORT_MODULE_FILECHECKASSISTANT addAssistant<xToolsCRCAssistant>(AssistantTypeCrc, tr("CRC Assistant"));
registerAssistant<xToolsCRCAssistant>(AssistantTypeCrc, tr("CRC Assistant")); addAssistant<xToolsMdnsAssistant>(AssistantTypeMdns, tr("mDNS Assistant"));
#endif addAssistant<xToolsPingAssistant>(AssistantTypePing, tr("Ping Assistant"));
#ifdef X_TOOLS_IMPORT_MODULE_CRCASSISTANT addAssistant<xToolsAsciiAssistant>(AssistantTypeAscii, tr("ASCII Assistant"));
registerAssistant<xToolsFileCheckAssistant>(AssistantTypeFileCheck, tr("File Check Assistant")); addAssistant<xToolsBase64Assisatnt>(AssistantTypeBase64, tr("Base64 Assistant"));
#endif addAssistant<xToolsNumberAssistant>(AssistantTypeNumber, tr("Number Assistant"));
#ifdef X_TOOLS_IMPORT_MODULE_ASCIIASSISTANT addAssistant<xToolsStringAssistant>(AssistantTypeString, tr("String Assistant"));
registerAssistant<xToolsAsciiAssistant>(AssistantTypeAscii, tr("ASCII Assistant")); addAssistant<xToolsBroadcastAssistant>(AssistantTypeBroadcast, tr("Broadcast Assistant"));
#endif addAssistant<xToolsFileCheckAssistant>(AssistantTypeFileCheck, tr("File Check Assistant"));
#ifdef X_TOOLS_IMPORT_MODULE_NUMBERASSISTANT
registerAssistant<xToolsNumberAssistant>(AssistantTypeNumber, tr("Number Assistant"));
#endif
#ifdef X_TOOLS_IMPORT_MODULE_STRINGASSISTANT
registerAssistant<xToolsStringAssistant>(AssistantTypeString, tr("String Assistant"));
#endif
#ifdef X_TOOLS_IMPORT_MODULE_BROADCASTASSISTANT
registerAssistant<xToolsBroadcastAssistant>(AssistantTypeBroadcast, tr("Broadcast Assistant"));
#endif
#ifdef X_TOOLS_IMPORT_MODULE_BASE64ASSISTANT
registerAssistant<xToolsBase64Assisatnt>(AssistantTypeBase64, tr("Base64 Assistant"));
#endif
#ifdef X_TOOLS_IMPORT_MODULE_MDNSASSISTANT
registerAssistant<xToolsMdnsAssistant>(AssistantTypeMdns, tr("mDNS Assistant"));
#endif
#ifdef X_TOOLS_IMPORT_MODULE_PINGASSISTANT
registerAssistant<xToolsPingAssistant>(AssistantTypePing, tr("Ping Assistant"));
#endif
} }
QList<int> SAKAssistantsFactory::supportedAssistants() QList<int> SAKAssistantsFactory::supportedAssistants()
@ -83,7 +46,7 @@ QString SAKAssistantsFactory::assistantName(int type) const
return m_typeNameMap.value(type); return m_typeNameMap.value(type);
} }
QString name = QString("UnknowType(%1)").arg(type); QString name = QString("UnknownType(%1)").arg(type);
return name; return name;
} }

View File

@ -43,7 +43,7 @@ private:
private: private:
template<typename T> template<typename T>
void registerAssistant(int type, const QString& assistantName) void addAssistant(int type, const QString& assistantName)
{ {
m_typeNameMap.insert(type, assistantName); m_typeNameMap.insert(type, assistantName);
m_metaObjectMap.insert(type, T::staticMetaObject); m_metaObjectMap.insert(type, T::staticMetaObject);