Merge pull request #9 from Holt59/new-filetree

Replace usage of FileNameString and Qt::CaseInsensitive.

CMakeLists.txt

@@ -1,13 +1,12 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.16)
 
-ADD_COMPILE_OPTIONS($<$<CXX_COMPILER_ID:MSVC>:/MP> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELEASE>:/O2>> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELWITHDEBINFO>:/O2>>)
+project(diagnose_basic)
+set(project_type plugin)
+set(enable_warnings OFF)
 
-SET(PROJ_NAME diagnose_basic)
-PROJECT(${PROJ_NAME})
-
-SET(DEPENDENCIES_DIR CACHE PATH "")
-
-# hint to find qt in dependencies path
-LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
-
-ADD_SUBDIRECTORY(src)
+if(DEFINED DEPENDENCIES_DIR)
+	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake)
+else()
+	include(../cmake_common/project.cmake)
+endif()
+add_subdirectory(src)

src/CMakeLists.txt

@@ -1,65 +1,6 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.8.11)
-
-CMAKE_POLICY(SET CMP0020 NEW)
-CMAKE_POLICY(SET CMP0043 NEW)
-
-FILE(GLOB ${PROJ_NAME}_SRCS *.cpp)
-FILE(GLOB ${PROJ_NAME}_HDRS *.h)
-FILE(GLOB ${PROJ_NAME}_FORMS *.ui)
-
-
-SET(CMAKE_INCLUDE_CURRENT_DIR ON)
-SET(CMAKE_AUTOMOC ON)
-SET(CMAKE_AUTOUIC ON)
-FIND_PACKAGE(Qt5Widgets REQUIRED)
-FIND_PACKAGE(Qt5LinguistTools)
-QT5_WRAP_UI(${PROJ_NAME}_UIHDRS ${${PROJ_NAME}_FORMS})
-QT5_CREATE_TRANSLATION(${PROJ_NAME}_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/diagnose_basic_en.ts)
-
-SET(Boost_USE_STATIC_LIBS        ON)
-SET(Boost_USE_MULTITHREADED      ON)
-SET(Boost_USE_STATIC_RUNTIME    OFF)
-FIND_PACKAGE(Boost)
-
-IF (Boost_FOUND)
-  INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-ENDIF (Boost_FOUND)
-
-SET(default_project_path "${DEPENDENCIES_DIR}/modorganizer_super")
-GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH)
-
-SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects")
-SET(lib_path "${project_path}/../../install/libs")
-
-INCLUDE_DIRECTORIES(${project_path}/uibase/src)
-LINK_DIRECTORIES(${lib_path})
-
-ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
-ADD_LIBRARY(${PROJ_NAME} SHARED ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS} ${${PROJ_NAME}_UIHDRS} ${${PROJ_NAME}_translations_qm})
-TARGET_LINK_LIBRARIES(${PROJ_NAME}
-                      Qt5::Widgets
-                      ${Boost_LIBRARIES}
-                      uibase)
-
-IF (MSVC)
-  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS "/std:c++latest")
-ENDIF()
-IF (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-  # 32 bits
-  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE")
-ENDIF()
-
-IF (NOT "${OPTIMIZE_COMPILE_FLAGS}" STREQUAL "")
-  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO ${OPTIMIZE_COMPILE_FLAGS})
-ENDIF()
-IF (NOT "${OPTIMIZE_LINK_FLAGS}" STREQUAL "")
-  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO ${OPTIMIZE_LINK_FLAGS})
-ENDIF()
-
-###############
-## Installation
-
-INSTALL(TARGETS ${PROJ_NAME}
-        RUNTIME DESTINATION bin/plugins)
-INSTALL(FILES $<TARGET_PDB_FILE:${PROJ_NAME}>
-        DESTINATION pdb)
+cmake_minimum_required(VERSION 3.16)
+if(DEFINED DEPENDENCIES_DIR)
+	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake)
+else()
+	include(../../cmake_common/src.cmake)
+endif()

src/diagnosebasic.cpp

@@ -19,7 +19,7 @@
 
 #include "diagnosebasic.h"
 
-#include "filenamestring.h"
+#include "ifiletree.h"
 #include "iplugingame.h"
 #include <report.h>
 #include <utility.h>
@@ -180,9 +180,9 @@ bool DiagnoseBasic::checkEmpty(QString const &path) const
 
   //Search files first
   for (QString const &f : dir.entryList()) {
-    FileNameString file(f);
+    QString file(f);
     if (! m_MOInfo->pluginSetting(name(), "ow_ignore_log").toBool() ||
-        ! file.endsWith(".log")) {
+        ! file.endsWith(".log", FileNameComparator::CaseSensitivity)) {
       return false;
     }
   }
@@ -243,9 +243,9 @@ bool DiagnoseBasic::missingMasters() const
   std::set<QString> enabledPlugins;
 
   QStringList esps = m_MOInfo->findFiles("",
-      [] (const QString &fileName) -> bool { return fileName.endsWith(".esp", Qt::CaseInsensitive)
-                                                  || fileName.endsWith(".esm", Qt::CaseInsensitive)
-                                                  || fileName.endsWith(".esl", Qt::CaseInsensitive); });
+      [] (const QString &fileName) -> bool { return fileName.endsWith(".esp", FileNameComparator::CaseSensitivity)
+                                                  || fileName.endsWith(".esm", FileNameComparator::CaseSensitivity)
+                                                  || fileName.endsWith(".esl", FileNameComparator::CaseSensitivity); });
   // gather enabled masters first
   for (const QString &esp : esps) {
     QString baseName = QFileInfo(esp).fileName();
@@ -310,7 +310,7 @@ bool DiagnoseBasic::invalidFontConfig() const
       QString path(temp.c_str());
       bool isDefault = false;
       for (const QString &def : defaultFonts) {
-        if (QString::compare(def, path, Qt::CaseInsensitive) == 0) {
+        if (QString::compare(def, path, FileNameComparator::CaseSensitivity) == 0) {
           isDefault = true;
           break;
         }