Modify plugins

App/main.cpp

@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
         f.close();
     }
 
-    app.addLibraryPath(RabbitCommon::CDir::Instance()->GetDirPlugs());
+    app.addLibraryPath(RabbitCommon::CDir::Instance()->GetDirPlugins());
 
     MainWindow w;
     

CMakeLists.txt

@@ -128,9 +128,9 @@ if(ANDROID)
     set(INSTALL_FACE_RECOGNIZER_PLUGS_DIR "libs/${CMAKE_ANDROID_ARCH_ABI}")
 else()
     set(INSTALL_DATA_PREFIX data)
-    set(INSTALL_FACE_RECOGNIZER_PLUGS_DIR plugs)
+    set(INSTALL_FACE_RECOGNIZER_PLUGS_DIR plugins)
 endif()
-set(FACE_RECOGNIZER_PLUGS_BINARY_DIR ${CMAKE_BINARY_DIR}/plugs)
+set(FACE_RECOGNIZER_PLUGS_BINARY_DIR ${CMAKE_BINARY_DIR}/plugins)
 
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)

Src/CMakeLists.txt

@@ -106,7 +106,7 @@ if(BUILD_TYPE STREQUAL "debug")
     SET(RCC_FILES ${RCC_FILES} ../Resource/ResourceSql.qrc)
 endif()
 
-add_subdirectory(Plugs)
+add_subdirectory(Plugins)
 
 add_library(${PROJECT_NAME} ${SOURCES_FILES} ${HEADER_FILES} ${RCC_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES

Src/FactoryFace.cpp

@@ -21,15 +21,15 @@ CFactoryFace::CFactoryFace(QObject *parent): QObject(parent),
         }
     }
 
-    QString szPath = RabbitCommon::CDir::Instance()->GetDirPlugs();
+    QString szPath = RabbitCommon::CDir::Instance()->GetDirPlugins();
 #if !defined (Q_OS_ANDROID)
     szPath = szPath + QDir::separator() + "Face";
 #endif
     QStringList filters;
 #if defined (Q_OS_WINDOWS)
-        filters << "*PlugFace*.dll";
+        filters << "*PluginFace*.dll";
 #else
-        filters << "*PlugFace*.so";
+        filters << "*PluginFace*.so";
 #endif
     FindPlugins(szPath, filters);
     

Src/ImageTool.cpp

@@ -31,15 +31,15 @@ CImageTool::CImageTool(QObject *parent) : QObject(parent), m_pConverFormat(nullp
             break;
     }
 
-    QString szPath = RabbitCommon::CDir::Instance()->GetDirPlugs();
+    QString szPath = RabbitCommon::CDir::Instance()->GetDirPlugins();
 #if !defined (Q_OS_ANDROID)
     szPath = szPath + QDir::separator() + "ConverFormat";
 #endif
     QStringList filters;
 #if defined (Q_OS_WINDOWS)
-        filters << "*PlugConverFormat*.dll";
+        filters << "*PluginConverFormat*.dll";
 #else
-        filters << "*PlugConverFormat*.so";
+        filters << "*PluginConverFormat*.so";
 #endif
     FindPlugins(szPath, filters);
 }

Src/Plugs/CMakeLists.txt → Src/Plugins/CMakeLists.txt

@@ -8,19 +8,19 @@ if(POLICY CMP0020)
     cmake_policy(SET CMP0020 NEW)
 endif()
 
-project(FaceRecognizerPlugs)
+project(FaceRecognizerPlugins)
 
 #SUBDIRLIST(listPlugs ${CMAKE_CURRENT_SOURCE_DIR})
 set(listPlugs LibFacedetection OpenCV ncnn Seeta FFmpge)
 foreach(sub ${listPlugs})
     add_subdirectory(${sub})
-    if(TARGET Plug${sub})
-        set(PLUG_LIBS ${PLUG_LIBS} Plug${sub})
+    if(TARGET Plugin${sub})
+        set(PLUG_LIBS ${PLUG_LIBS} Plugin${sub})
         SET(PLUG_CONTENT "${PLUG_CONTENT}\nQ_IMPORT_PLUGIN(CFace${sub})")
     endif()
 endforeach()
 if(NOT BUILD_SHARED_LIBS)
-    set(PLUGS_SOURCES_FILE ${CMAKE_BINARY_DIR}/PlugsSource.cpp)
+    set(PLUGS_SOURCES_FILE ${CMAKE_BINARY_DIR}/PluginsSource.cpp)
     
     FILE(WRITE ${PLUGS_SOURCES_FILE} "#include <QtPlugin>\n")
     FILE(APPEND ${PLUGS_SOURCES_FILE} "#include <QObject>\n")

Src/Plugs/FFmpge/CMakeLists.txt → Src/Plugins/FFmpge/CMakeLists.txt

@@ -25,7 +25,7 @@ elseif(WIN32)
             COMPONENT Runtime)
 endif()
 
-project(PlugConverFormatFFMpeg)
+project(PluginConverFormatFFMpeg)
 
 set(SOURCES_FILES
     ConverFormatFFmpeg.cpp

Src/Plugs/LibFacedetection/CMakeLists.txt → Src/Plugins/LibFacedetection/CMakeLists.txt

@@ -4,10 +4,10 @@ if(NOT USE_LIBFACEDETECTION)
     return()
 endif()
 
-project(PlugFaceLibFacedetection)
+project(PluginFaceLibFacedetection)
 
 find_package(facedetection)
-message("== Plugs libfacedetection:${facedetection_FOUND}")
+message("== Plugins libfacedetection:${facedetection_FOUND}")
 if(NOT facedetection_FOUND)
     return()
 endif()

Src/Plugs/OpenCV/CMakeLists.txt → Src/Plugins/OpenCV/CMakeLists.txt

@@ -3,7 +3,7 @@ if(NOT USE_OPENCV)
     return()
 endif()
 
-PROJECT(PlugConverFormatOpenCV)
+PROJECT(PluginConverFormatOpenCV)
 
 find_package(OpenCV)
 message("== Plug OpenCV:${OpenCV_FOUND}")

Src/Plugs/Seeta/CMakeLists.txt → Src/Plugins/Seeta/CMakeLists.txt

@@ -4,9 +4,9 @@ if(NOT USE_SEETA)
     return()
 endif()
 
-project(PlugFaceSeeta)
+project(PluginFaceSeeta)
 find_package(SeetaFace)
-message("== Plugs SeetaFace:${SeetaFace_FOUND}")
+message("== Plugins SeetaFace:${SeetaFace_FOUND}")
 if(NOT SeetaFace_FOUND)
     return()
 endif()

Src/Plugs/Test/CMakeLists.txt → Src/Plugins/Test/CMakeLists.txt

@@ -4,7 +4,7 @@ if(NOT USE_TEST)
     return()
 endif()
 
-project(PlugTest)
+project(PluginTest)
 
 set(SOURCES_FILES
     Test.cpp

Src/Plugs/ncnn/CMakeLists.txt → Src/Plugins/ncnn/CMakeLists.txt

@@ -4,9 +4,9 @@ if(NOT USE_NCNN)
     return()
 endif()
 
-project(PlugFaceNcnn)
+project(PluginFaceNcnn)
 find_package(ncnn)
-message("== Plugs ncnn:${ncnn_FOUND}")
+message("== Plugins ncnn:${ncnn_FOUND}")
 if(NOT ncnn_FOUND)
     return()
 endif()

docs/Develop.md

@@ -5,12 +5,12 @@
   + [CConverFormat 接口类](../Src/ConverFormat.h)
   + 插件位置：
     - android: 应用程序目录下
-    - windows、linux: 应用程序安装目录/plugs/ConverFormat
-  + 插件命名：project(PlugConverXXXX)  
+    - windows、linux: 应用程序安装目录/plugins/ConverFormat
+  + 插件命名：project(PluginConverXXXX)  
 - 人脸识别
   + [CFace 接口类](../Src/Face.h)
   + 插件位置：
     - android: 应用程序目录下
-    - windows、linux: 应用程序安装目录/plugs/Face
-  + 插件命名：project(PlugFaceXXXX)  
+    - windows、linux: 应用程序安装目录/plugins/Face
+  + 插件命名：project(PluginFaceXXXX)  
     插件加载详见： [Src/FactoryFace.cpp 中的 CFactoryFace::FindPlugins 函数](../Src/FactoryFace.cpp)