diff --git a/application/data/unix/org.inyokaproject.inyokaedit.metainfo.xml b/application/data/unix/org.inyokaproject.inyokaedit.metainfo.xml
index 1f6f708..a8b47e0 100755
--- a/application/data/unix/org.inyokaproject.inyokaedit.metainfo.xml
+++ b/application/data/unix/org.inyokaproject.inyokaedit.metainfo.xml
@@ -25,7 +25,9 @@
https://github.com/inyokaproject/inyokaedit
https://github.com/inyokaproject/inyokaedit/issues
- Thorsten Roth
+
+ Thorsten Roth
+
elthoro@gmx.de
@@ -35,13 +37,14 @@
-
+
Changes:
- Bundle Breeze light/dark icon themes
- Switch to c++17
- Fix Qt deprecations
+ - Change AUR build to Qt6 and cmake
diff --git a/application/fileoperations.cpp b/application/fileoperations.cpp
index 6795fca..99aa2d4 100644
--- a/application/fileoperations.cpp
+++ b/application/fileoperations.cpp
@@ -170,7 +170,7 @@ void FileOperations::open() {
m_pSettings->getLastOpenedDir().absolutePath(), m_sFileFilter);
if (!sFileName.isEmpty()) {
QFileInfo tmpFI(sFileName);
- m_pSettings->setLastOpenedDir(tmpFI.absoluteDir());
+ m_pSettings->setLastOpenedDir(tmpFI.absolutePath());
this->loadFile(sFileName, true);
}
}
@@ -217,7 +217,7 @@ auto FileOperations::saveAs() -> bool {
}
QFileInfo tmpFI(sFileName);
- m_pSettings->setLastOpenedDir(tmpFI.absoluteDir());
+ m_pSettings->setLastOpenedDir(tmpFI.absolutePath());
return this->saveFile(sFileName);
}
diff --git a/application/settings.cpp b/application/settings.cpp
index 2f60cd1..2378b11 100644
--- a/application/settings.cpp
+++ b/application/settings.cpp
@@ -407,8 +407,8 @@ auto Settings::getPreviewHorizontal() const -> bool {
auto Settings::getLastOpenedDir() const -> QDir { return m_LastOpenedDir; }
-void Settings::setLastOpenedDir(const QDir &LastDir) {
- m_LastOpenedDir = LastDir;
+void Settings::setLastOpenedDir(const QString &sLastDir) {
+ m_LastOpenedDir.setPath(sLastDir);
}
auto Settings::getCheckLinks() const -> bool { return m_bCheckLinks; }
diff --git a/application/settings.h b/application/settings.h
index 90810e8..f34c541 100644
--- a/application/settings.h
+++ b/application/settings.h
@@ -53,7 +53,7 @@ class Settings : public QObject {
void writeSettings(const QByteArray &WinGeometry, const QByteArray &WinState,
const QByteArray &SplitterState = nullptr);
- void setLastOpenedDir(const QDir &LastDir);
+ void setLastOpenedDir(const QString &sLastDir);
// General
auto getGuiLanguage() const -> QString;
diff --git a/plugins/spellchecker-hunspell/spellchecker-hunspell.cpp b/plugins/spellchecker-hunspell/spellchecker-hunspell.cpp
index f373a5f..0a187df 100644
--- a/plugins/spellchecker-hunspell/spellchecker-hunspell.cpp
+++ b/plugins/spellchecker-hunspell/spellchecker-hunspell.cpp
@@ -91,7 +91,7 @@ void SpellChecker_Hunspell::initPlugin(QWidget *pParent, TextEditor *pEditor,
m_pHunspell = nullptr;
m_pEditor = pEditor;
m_pParent = pParent;
- m_UserDataDir = userDataDir;
+ m_UserDataDir.setPath(userDataDir.absolutePath());
m_sSharePath = sSharePath;
m_bIsDarkTheme = bIsDarkTheme;
diff --git a/plugins/spellchecker-nuspell/spellchecker-nuspell.cpp b/plugins/spellchecker-nuspell/spellchecker-nuspell.cpp
index 73cb70e..5a4626e 100644
--- a/plugins/spellchecker-nuspell/spellchecker-nuspell.cpp
+++ b/plugins/spellchecker-nuspell/spellchecker-nuspell.cpp
@@ -87,7 +87,7 @@ void SpellChecker_Nuspell::initPlugin(QWidget *pParent, TextEditor *pEditor,
m_pEditor = pEditor;
m_pParent = pParent;
- m_UserDataDir = userDataDir;
+ m_UserDataDir.setPath(userDataDir.absolutePath());
m_sSharePath = sSharePath;
m_bIsDarkTheme = bIsDarkTheme;
@@ -173,7 +173,7 @@ auto SpellChecker_Nuspell::initDictionaries() -> bool {
searchdirs.push_back(app_path);
QString sTmp;
- for (auto s : dict_list) {
+ for (const auto &s : dict_list) {
sTmp = QString::fromUtf16(s.u16string().c_str());
// qDebug() << sTmp;
sTmp.remove(QStringLiteral(".aff"));
@@ -190,7 +190,7 @@ auto SpellChecker_Nuspell::initDictionaries() -> bool {
if (std::empty(dict_path)) {
qWarning() << "Can not find the requested dictionary:" << m_sDictLang;
qDebug() << "Found dictionaries:";
- for (auto s : dict_list) {
+ for (const auto &s : dict_list) {
qDebug() << QString::fromUtf16(s.u16string().c_str());
}
QMessageBox::warning(nullptr, qApp->applicationName(),
diff --git a/plugins/uu_tabletemplate/uu_tabletemplate.cpp b/plugins/uu_tabletemplate/uu_tabletemplate.cpp
index c504f51..10709c9 100644
--- a/plugins/uu_tabletemplate/uu_tabletemplate.cpp
+++ b/plugins/uu_tabletemplate/uu_tabletemplate.cpp
@@ -55,7 +55,7 @@ void Uu_TableTemplate::initPlugin(QWidget *pParent, TextEditor *pEditor,
m_pParent = pParent;
m_pEditor = pEditor;
- m_dirPreview = userDataDir;
+ m_dirPreview.setPath(userDataDir.absolutePath());
m_pTextDocument = new QTextDocument(this);
m_sSharePath = sSharePath;
m_bIsDarkTheme = bIsDarkTheme;