Minor fixes

inyokaproject · Mar 30, 2024 · 264dca4 · 264dca4
1 parent e908c66
commit 264dca4
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/application/data/unix/org.inyokaproject.inyokaedit.metainfo.xml b/application/data/unix/org.inyokaproject.inyokaedit.metainfo.xml
@@ -25,7 +25,9 @@
   <url type="homepage">https://github.com/inyokaproject/inyokaedit</url>
   <url type="bugtracker">https://github.com/inyokaproject/inyokaedit/issues</url>
 
-  <developer_name>Thorsten Roth</developer_name>
+  <developer id="org.inyokaproject.inyokaedit">
+    <name>Thorsten Roth</name>
+  </developer>
   <update_contact>elthoro@gmx.de</update_contact>
 
   <provides>
@@ -35,13 +37,14 @@
   <content_rating type="oars-1.0" />
 
   <releases>
-    <release version="0.28.0" date="2024-03-10">
+    <release version="0.28.0" date="2024-03-30">
       <description>
         <p>Changes:</p>
         <ul>
           <li>Bundle Breeze light/dark icon themes</li>
           <li>Switch to c++17</li>
           <li>Fix Qt deprecations</li>
+          <li>Change AUR build to Qt6 and cmake</li>
         </ul>
       </description>
     </release>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;