upgrade to Qt6

Author: kassane

.gitignore

@@ -0,0 +1 @@
+build/

CMakeLists.txt

@@ -0,0 +1,54 @@
+cmake_minimum_required(VERSION 3.14)
+
+project(
+    Geist
+    VERSION 0.1.0
+    LANGUAGES CXX
+)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(NO_CACHEGEN "NO_CACHEGEN")
+endif()
+
+include(FeatureSummary)
+
+find_package(
+    Qt6
+    COMPONENTS Core Widgets Core5Compat
+    REQUIRED
+)
+
+include_directories(src)
+
+set(PROJECT_SOURCES
+    src/files.cpp
+    src/highlighter.cpp
+    src/files.h
+    src/highlighter.h
+    src/main.cpp
+    src/mainwindow.cpp
+    src/mainwindow.ui
+    src/mainwindow.h
+    src/search.cpp
+    src/utils/conversion.cpp
+    src/utils/templates.cpp
+    src/utils/conversion.h
+    src/utils/templates.h
+    src/widgets/geisttextedit.cpp
+    src/widgets/geisttextedit.h
+)
+
+qt_add_executable(${PROJECT_NAME} WIN32 ${PROJECT_SOURCES})
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets Qt::Core5Compat)
+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

README.md

@@ -2,7 +2,7 @@
 
 [![Try it online](https://img.shields.io/badge/Try%20it%20online!-informational)](https://wasm-apps.netlify.app/geist/)
 
-Geist is an all purpose text/code editor written in C++ and using the Qt framework.
+Geist is an all purpose text/code editor written in C++ and using the Qt6 framework.
 
 ## Screenshot
 ![Geist](https://github.com/jubal-R/Geist/blob/master/Screenshots/geist.png)
@@ -20,26 +20,33 @@ Note: Font settings to be added in the future
 - Anonymous Pro - http://www.marksimonson.com/fonts/view/anonymous-pro
 
 ## Dependencies
-qt5-default qt5-qmake
+
+- Qt6 {Core, Widgets & Core5Compat (QRegExp)}
+- CMake
 
 ## Building Geist
-`git clone https://github.com/jubal-R/Geist.git`  
-`mkdir build`  
-`cd build`  
-`qmake ../Geist/Geist.pro`  
-`make`
+
+```bash
+git clone https://github.com/jubal-R/Geist.git
+cd Geist
+cmake -B build -DCMAKE_BUILD_TYPE=RelMinSize
+cmake --build build --config release --parallel
+```
 
 ## Features To Be Added
+
 - Additional preference options
 - Auto-completion
 
 ## License
+
 Geist - All purpose text/code editor Copyright (C) 2017
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.
 
 ## Acknowledgements
+
 highlighter.cpp and highlighter.h  
 Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).  
 Full copyright notice is maintained within these files.

src/Geist.pro

@@ -1,5 +1,4 @@
 #include <QtGui>
-
 #include "highlighter.h"
 
 Highlighter::Highlighter(QString filetype, QString theme, QTextDocument *parent)

src/Geist.pro.user

@@ -44,6 +44,7 @@
 #include <QSyntaxHighlighter>
 #include <QHash>
 #include <QTextCharFormat>
+#include <QRegExp>
 
 class QTextDocument;
 

src/Geist.pro.user.2cbb2e6.4.8-pre1

@@ -1150,7 +1150,7 @@ void MainWindow::setTabWidth(int width){
 
     for(int i = 0; i < ui->tabWidget->count(); i++){
         ui->tabWidget->setCurrentIndex(i);
-        currentEditorWidget->setTabStopWidth(width * metrics.width(' ') );
+        currentEditorWidget->setTabStopDistance(width * metrics.maxWidth() );
     }
 
     ui->tabWidget->setCurrentIndex(current);

src/highlighter.cpp

@@ -2,7 +2,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <highlighter.h>
+#include "highlighter.h"
 #include <QShortcut>
 #include "QSettings"
 #include <QPlainTextEdit>