From e519ca9689ccddf27cc9b7cd69b1eb36e029fab9 Mon Sep 17 00:00:00 2001 From: oltolm Date: Sun, 3 Nov 2024 15:26:27 +0100 Subject: [PATCH 1/4] fix CMake scripts --- .gitignore | 3 +++ cmake/Findlibzip.cmake | 2 +- cmake/use-in.cmake | 2 +- lib/CMakeLists.txt | 2 +- lib/libebook/CMakeLists.txt | 2 +- packages/CMakeLists.txt | 2 +- po/CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 ++-- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index cb9a8d0b..954e4acb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ CMakeLists.txt.user* # KDev project files .kdev4 *.kdev4 +/.cache/ +CMakeUserPresets.json +compile_commands.json diff --git a/cmake/Findlibzip.cmake b/cmake/Findlibzip.cmake index 2d47b2d9..36867394 100644 --- a/cmake/Findlibzip.cmake +++ b/cmake/Findlibzip.cmake @@ -1,6 +1,6 @@ # Tries to find libzip -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) find_path(libzip_INCLUDE_DIR NAMES zip.h PATHS ${libzip_ROOT} diff --git a/cmake/use-in.cmake b/cmake/use-in.cmake index 9d678b9b..3691e99c 100644 --- a/cmake/use-in.cmake +++ b/cmake/use-in.cmake @@ -3,7 +3,7 @@ # Copyright (c) 2022 Nick Egorrov ######################################## -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) #[==============================[ Attempts to set the cache variable to ON when building for a specific OS. diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6a7c94f1..8ac15278 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) if (${USE_STATIC_CHMLIB}) set(CHMLIB_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}/CHMLib/src) diff --git a/lib/libebook/CMakeLists.txt b/lib/libebook/CMakeLists.txt index c572850d..0e56dda0 100644 --- a/lib/libebook/CMakeLists.txt +++ b/lib/libebook/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) # Project files set(CPP_SOURCES diff --git a/packages/CMakeLists.txt b/packages/CMakeLists.txt index 05060bbd..a07ab549 100644 --- a/packages/CMakeLists.txt +++ b/packages/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") install(FILES freedesktop/uchmviewer.desktop DESTINATION ${APP_DEF_INSTALL_DIR}) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 2f1cd9ae..09e1fe40 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -1,6 +1,6 @@ # Create and install translation files. -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5) set(CATALOG_NAME uchmviewer) # The languages.txt file contains a list of locales. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 37119e03..96cd51d8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) # Need to include generated files. set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -87,7 +87,7 @@ qt_add_resources(RSRCS resources/images.qrc) qt_wrap_ui(UI_SOURCES ${UIS}) qt_wrap_cpp(MOC_SOURCES ${MOC_HEADERS}) -add_executable(uchmviewer ${CPP_SOURCES} ${RSRCS} ${UI_SOURCES} ${MOC_SOURCES}) +add_executable(uchmviewer WIN32 ${CPP_SOURCES} ${RSRCS} ${UI_SOURCES} ${MOC_SOURCES}) target_link_libraries(uchmviewer ebook chm From c56be7eb25841ad8fa1691e585a756a75a37e726 Mon Sep 17 00:00:00 2001 From: oltolm Date: Thu, 31 Oct 2024 17:19:36 +0100 Subject: [PATCH 2/4] remove debug print --- lib/libebook/ebook_chm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libebook/ebook_chm.cpp b/lib/libebook/ebook_chm.cpp index 47385850..6f2db215 100644 --- a/lib/libebook/ebook_chm.cpp +++ b/lib/libebook/ebook_chm.cpp @@ -196,7 +196,7 @@ bool EBook_CHM::getIndex(QList& index) const entry.indent = e.indent - root_offset; index.append( entry ); - printf("%d: %s\n", entry.indent, qPrintable(entry.name)); + // printf("%d: %s\n", entry.indent, qPrintable(entry.name)); } return true; From 71b172e613faeb76020321fc87bd67ef8880a70c Mon Sep 17 00:00:00 2001 From: oltolm Date: Fri, 1 Nov 2024 14:54:44 +0100 Subject: [PATCH 3/4] fix Qt deprecation warning --- src/qtwebkit/viewwindowmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qtwebkit/viewwindowmgr.cpp b/src/qtwebkit/viewwindowmgr.cpp index 336483a3..4740d111 100644 --- a/src/qtwebkit/viewwindowmgr.cpp +++ b/src/qtwebkit/viewwindowmgr.cpp @@ -374,7 +374,7 @@ void ViewWindowMgr::onActivateFind() void ViewWindowMgr::find( bool backward ) { - QWebPage::FindFlags webkitflags = 0; + QWebPage::FindFlags webkitflags; if ( checkCase->isChecked() ) webkitflags |= QWebPage::FindCaseSensitively; From e8c3d0d471e0b478f86c00916a035f66324bccdd Mon Sep 17 00:00:00 2001 From: oltolm Date: Thu, 31 Oct 2024 21:10:40 +0100 Subject: [PATCH 4/4] fix includes --- src/config.cpp | 2 -- src/main.cpp | 2 ++ src/qtwebengine/dataprovider.cpp | 4 ++-- src/qtwebengine/viewwindow.cpp | 10 +++++----- src/qtwebengine/viewwindowmgr.cpp | 12 ++++++------ src/qtwebkit/dataprovider.cpp | 6 +++--- src/qtwebkit/viewwindow.cpp | 10 +++++----- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 32667547..b8aab4cd 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -25,8 +25,6 @@ #include // qPrintable, qWarning #include "config.h" -#include "settings.h" // QSettings -#include "mainwindow.h" Config* pConfig; diff --git a/src/main.cpp b/src/main.cpp index df376574..f90db0df 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -25,7 +25,9 @@ #include "config.h" // Config, pConfig #include "mainwindow.h" // MainWindow ::mainWindow +#if defined (USE_KDE) #include "version.h" // APP_VERSION_MAJOR, APP_VERSION_MINOR +#endif #if defined USE_DBUS #include diff --git a/src/qtwebengine/dataprovider.cpp b/src/qtwebengine/dataprovider.cpp index e8f53e76..7ef65b4d 100644 --- a/src/qtwebengine/dataprovider.cpp +++ b/src/qtwebengine/dataprovider.cpp @@ -25,8 +25,8 @@ #include #include -#include "../mainwindow.h" // ::mainWindow -#include "../mimehelper.h" // MimeHelper::mimeType +#include "mainwindow.h" // ::mainWindow +#include "mimehelper.h" // MimeHelper::mimeType #include "dataprovider.h" // DataProvider, QWebEngineUrlSchemeHandler #include "ebook.h" // EBook #include "ebook_chm.h" // EBook_CHM::URL_SCHEME_CHM diff --git a/src/qtwebengine/viewwindow.cpp b/src/qtwebengine/viewwindow.cpp index 24b84f35..ab41e7ab 100644 --- a/src/qtwebengine/viewwindow.cpp +++ b/src/qtwebengine/viewwindow.cpp @@ -40,12 +40,12 @@ #include #include -#include "../i18n.h" +#include "i18n.h" -#include "../browser-settings.hpp" // BrowserSettings -#include "../mainwindow.h" // ::mainWindow -#include "../viewwindow.h" // ViewWindow, QWebEngineView -#include "../viewwindowmgr.h" // ViewWindowMgr +#include "browser-settings.hpp" // BrowserSettings +#include "mainwindow.h" // ::mainWindow +#include "viewwindow.h" // ViewWindow, QWebEngineView +#include "viewwindowmgr.h" // ViewWindowMgr #include "webenginepage.h" // WebEnginePage diff --git a/src/qtwebengine/viewwindowmgr.cpp b/src/qtwebengine/viewwindowmgr.cpp index de03b270..3d5a5266 100644 --- a/src/qtwebengine/viewwindowmgr.cpp +++ b/src/qtwebengine/viewwindowmgr.cpp @@ -34,13 +34,13 @@ #include // QWebEnginePage::{ FindFlag, FindBackward, FindCaseSensitively } #include -#include "../i18n.h" +#include "i18n.h" -#include "../config.h" // ::pConfig -#include "../mainwindow.h" // MainWindow, ::mainWindow -#include "../settings.h" // Settings -#include "../viewwindow.h" // ViewWindow -#include "../viewwindowmgr.h" +#include "config.h" // ::pConfig +#include "mainwindow.h" // MainWindow, ::mainWindow +#include "settings.h" // Settings +#include "viewwindow.h" // ViewWindow +#include "viewwindowmgr.h" // A small overriden class to handle a middle click diff --git a/src/qtwebkit/dataprovider.cpp b/src/qtwebkit/dataprovider.cpp index 49e691ed..23622a7c 100644 --- a/src/qtwebkit/dataprovider.cpp +++ b/src/qtwebkit/dataprovider.cpp @@ -24,9 +24,9 @@ #include // qint64, qPrintable, qDebug, qWarning #include -#include "../config.h" // ::pConfig -#include "../mainwindow.h" // ::mainWindow -#include "../mimehelper.h" // MimeHelper::mimeType +#include "config.h" // ::pConfig +#include "mainwindow.h" // ::mainWindow +#include "mimehelper.h" // MimeHelper::mimeType #include "dataprovider.h" diff --git a/src/qtwebkit/viewwindow.cpp b/src/qtwebkit/viewwindow.cpp index 7b675a01..3b335bf9 100644 --- a/src/qtwebkit/viewwindow.cpp +++ b/src/qtwebkit/viewwindow.cpp @@ -35,12 +35,12 @@ #include #include -#include "../i18n.h" +#include "i18n.h" -#include "../browser-settings.hpp" // BrowserSettings -#include "../mainwindow.h" // ::mainWindow -#include "../viewwindow.h" // ViewWindow, QWebView -#include "../viewwindowmgr.h" // ViewWindowMgr +#include "browser-settings.hpp" // BrowserSettings +#include "mainwindow.h" // ::mainWindow +#include "viewwindow.h" +#include "viewwindowmgr.h" // ViewWindowMgr #include "dataprovider.h" // KCHMNetworkAccessManager