small fixes

.gitignore

@@ -8,3 +8,6 @@ CMakeLists.txt.user*
 # KDev project files
 .kdev4
 *.kdev4
+/.cache/
+CMakeUserPresets.json
+compile_commands.json

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}

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.

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)

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

lib/libebook/ebook_chm.cpp

@@ -196,7 +196,7 @@ bool EBook_CHM::getIndex(QList<EBookIndexEntry>& 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;

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})

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.

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

src/config.cpp

@@ -25,8 +25,6 @@
 #include <QtGlobal>         // qPrintable, qWarning
 
 #include "config.h"
-#include "settings.h"   // QSettings
-#include "mainwindow.h"
 
 Config* pConfig;
 

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 <QDBusConnection>

src/qtwebengine/dataprovider.cpp

@@ -25,8 +25,8 @@
 #include <QUrl>
 #include <QWebEngineUrlRequestJob>
 
-#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

src/qtwebengine/viewwindow.cpp

@@ -40,12 +40,12 @@
 #include <QWebEngineScript>
 #include <QWidget>
 
-#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
 
 

src/qtwebengine/viewwindowmgr.cpp

@@ -34,13 +34,13 @@
 #include <QWebEnginePage>     // QWebEnginePage::{ FindFlag, FindBackward, FindCaseSensitively }
 #include <QWidget>
 
-#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

src/qtwebkit/dataprovider.cpp

@@ -24,9 +24,9 @@
 #include <QtGlobal>        // qint64, qPrintable, qDebug, qWarning
 #include <QUrl>
 
-#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"
 
 

src/qtwebkit/viewwindow.cpp

@@ -35,12 +35,12 @@
 #include <QWebSettings>
 #include <QWidget>
 
-#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
 
 

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;