Current version of Psi+ is 1.5.2068

It is based on: * psi: 84fb444f * plugins: 347230b * psimedia: 478567e * resources: fc4cfc1
psi-plus · Oct 29, 2024 · 3b95e83 · 3b95e83
1 parent b0332a3
commit 3b95e83
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 20 deletions.
diff --git a/Readme-dev-cmake-ru.txt b/Readme-dev-cmake-ru.txt
@@ -90,7 +90,7 @@
         библиотек зависимостей в выходной каталог сборки при помощи модуля win32-prepare-deps.cmake
     подключает каталог plugins, если включена опция и скопированы плагины
 
-./src/config.h.in - файл-шаблон для создания файла config.h
+./src/psi_config.h.in - файл-шаблон для создания файла psi_config.h
 
 ./src/src.cmake:
     содержит определения (definitions) определяющие функционал программы по-умолчанию

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -225,8 +225,8 @@ elseif(APPLE)
     message(STATUS "${CLIENT_NAME} libraries directory: ${PSI_LIBDIR}")
 endif()
 
-set(CONFIG_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/config.h")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CONFIG_OUTPUT_FILE} @ONLY)
+set(CONFIG_OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/psi_config.h")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/psi_config.h.in ${CONFIG_OUTPUT_FILE} @ONLY)
 
 prepare_iconsets(prepare-src)
 #Generate iconsets.qrc and icondef.xml
@@ -238,7 +238,7 @@ configure_file(${PROJECT_SOURCE_DIR}/iconsets.qrc.in ${ICONSETSQRC_OUTPUT_FILE}
 #Include SOURCES HEADERS FORMS
 include(src.cmake)
 
-#Append config.h to HEADERS list
+#Append psi_config.h to HEADERS list
 if(EXISTS "${CONFIG_OUTPUT_FILE}")
     message(STATUS "${CONFIG_OUTPUT_FILE} file generated")
     list(APPEND HEADERS ${CONFIG_OUTPUT_FILE})

diff --git a/src/applicationinfo.cpp b/src/applicationinfo.cpp
@@ -1,7 +1,7 @@
 #include "applicationinfo.h"
 
 #ifdef HAVE_CONFIG
-#include "config.h"
+#include "psi_config.h"
 #endif
 #include "profiles.h"
 #include "systeminfo.h"
@@ -83,8 +83,7 @@ QStringList ApplicationInfo::getCertificateStoreDirs()
 #if defined(Q_OS_LINUX) && defined(SHARE_SUFF)
         additionalPath,
 #endif
-        ApplicationInfo::resourcesDir() + "/certs",
-        ApplicationInfo::homeDir(ApplicationInfo::DataLocation) + "/certs"
+        ApplicationInfo::resourcesDir() + "/certs", ApplicationInfo::homeDir(ApplicationInfo::DataLocation) + "/certs"
     };
     return dirs;
 }
@@ -101,10 +100,7 @@ QStringList ApplicationInfo::dataDirs()
 #if defined(Q_OS_LINUX) && defined(SHARE_SUFF)
         additionalPath,
 #endif
-        ":",
-        ".",
-        homeDir(DataLocation),
-        resourcesDir()
+        ":", ".", homeDir(DataLocation), resourcesDir()
     };
     return dirs;
 }
@@ -121,8 +117,7 @@ QStringList ApplicationInfo::pluginDirs()
 #if defined(Q_OS_LINUX) && defined(SHARE_SUFF)
         additionalPath,
 #endif
-        ApplicationInfo::resourcesDir() + "/plugins",
-        homeDir(ApplicationInfo::DataLocation) + "/plugins",
+        ApplicationInfo::resourcesDir() + "/plugins", homeDir(ApplicationInfo::DataLocation) + "/plugins",
         libDir() + "/plugins"
     };
     return dirs;
@@ -148,9 +143,9 @@ QString ApplicationInfo::resourcesDir()
     // System routine locates resource files. We "know" that Psi.icns is
     // in the Resources directory.
     QString     resourcePath;
-    CFBundleRef mainBundle          = CFBundleGetMainBundle();
+    CFBundleRef mainBundle = CFBundleGetMainBundle();
 #ifdef PSI_PLUS
-    const char *appIconName         = "application-plus.icns";
+    const char *appIconName = "application-plus.icns";
 #else
     const char *appIconName = "application.icns";
 #endif

diff --git a/src/debug.cpp b/src/debug.cpp
@@ -20,7 +20,7 @@
 #include "debug.h"
 
 #include <QDir>
-#include <config.h>
+#include <psi_config.h>
 
 SlowTimer::SlowTimer(const QString &path, int line, int maxTime, const QString &message) :
     _path(QDir::fromNativeSeparators(path)), _line(line), _message(message), _maxTime(maxTime)

diff --git a/src/config.h.in → src/psi_config.h.in b/src/config.h.in → src/psi_config.h.in
diff --git a/src/tools/crash/crash_sigsegv.cpp b/src/tools/crash/crash_sigsegv.cpp
@@ -25,7 +25,7 @@
 
 #include <assert.h>
 #ifdef HAVE_CONFIG_H_
-#include <config.h>
+#include <psi_config.h>
 #endif
 #include <errno.h>
 /*

diff --git a/src/tools/spellchecker/hunspellchecker.cpp b/src/tools/spellchecker/hunspellchecker.cpp
@@ -28,8 +28,8 @@
 #ifdef Q_OS_WIN
 #include "applicationinfo.h"
 #endif
-#include "config.h"
 #include "languagemanager.h"
+#include "psi_config.h"
 
 #include <QCoreApplication>
 // #include <QDebug>

diff --git a/src/translationmanager.cpp b/src/translationmanager.cpp
@@ -20,7 +20,7 @@
 #include "translationmanager.h"
 
 #include "applicationinfo.h"
-#include "config.h"
+#include "psi_config.h"
 #include "varlist.h"
 
 #include <QCoreApplication>

diff --git a/version b/version
@@ -1 +1 @@
-1.5.2067 (2024-10-28, 0d08d3d0)
+1.5.2068 (2024-10-29, 84fb444f)