Fixed compilation errors/warnings. Qt req is raised to 5.10

Ri0n · Dec 5, 2020 · c7caa6f · c7caa6f
1 parent 848e19a
commit c7caa6f
Show file tree

Hide file tree

Showing 34 changed files with 93 additions and 60 deletions.
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -0,0 +1 @@
+plugins/baseintegration/3rdparty/qxt/.*
diff --git a/libqtnote/aboutdlg.h b/libqtnote/aboutdlg.h
@@ -31,7 +31,7 @@ class AboutDlg;
 class AboutDlg : public QDialog {
     Q_OBJECT
 public:
-    AboutDlg(QWidget *parent = 0);
+    AboutDlg(QWidget *parent = nullptr);
     ~AboutDlg();
 
 protected:

diff --git a/libqtnote/colorbutton.h b/libqtnote/colorbutton.h
@@ -8,7 +8,7 @@ namespace QtNote {
 class ColorButton : public QWidget {
     Q_OBJECT
 public:
-    explicit ColorButton(QWidget *parent = 0, Qt::WindowFlags f = 0);
+    explicit ColorButton(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
 
     void          setColor(QPalette::ColorRole role, const QColor &color);
     inline QColor color() const { return _color; }

diff --git a/libqtnote/filenameprovider.h b/libqtnote/filenameprovider.h
@@ -22,7 +22,7 @@ class QTNOTE_EXPORT FileNameProvider {
     inline bool isValid() const { return valid && dir.exists(); }
     inline bool setPath(const QString &path)
     {
-        dir   = path;
+        dir.setPath(path);
         valid = !path.isEmpty() && dir.exists();
         return valid;
     }

diff --git a/libqtnote/filestorage.cpp b/libqtnote/filestorage.cpp
@@ -70,7 +70,7 @@ QString FileStorage::saveNoteToFile(FileNoteData &note, const QString &text, con
         return newNoteId;
     }
     handleFSError();
-    return QString::null;
+    return QString();
 }
 
 void FileStorage::handleFSError()
@@ -159,7 +159,7 @@ QList<NoteListItem> FileStorage::noteList(int limit)
 {
     ensureChachePopulated();
     QList<NoteListItem> ret = cache.values();
-    qSort(ret.begin(), ret.end(), noteListItemModifyComparer);
+    std::sort(ret.begin(), ret.end(), noteListItemModifyComparer);
     // probably sort is unnecesary here if the only accessor is notemanager which also does sorting.
     return limit ? ret.mid(0, limit) : ret;
 }

diff --git a/libqtnote/filestorage.h b/libqtnote/filestorage.h
@@ -47,7 +47,7 @@ class QTNOTE_EXPORT FileStorage : public NoteStorage {
     virtual QList<NoteListItem> noteListFromInfoList(const QFileInfoList &) = 0;
 
 protected:
-    QString saveNoteToFile(FileNoteData &note, const QString &text, const QString &noteId = QString::null);
+    QString saveNoteToFile(FileNoteData &note, const QString &text, const QString &noteId = QString());
     void    handleFSError();
     void    ensureChachePopulated();
 

diff --git a/libqtnote/filestoragesettingswidget.h b/libqtnote/filestoragesettingswidget.h
@@ -15,7 +15,8 @@ class FileStorageSettingsWidget : public QWidget {
     Q_OBJECT
 
 public:
-    explicit FileStorageSettingsWidget(const QString &customPath, QtNote::FileStorage *storage, QWidget *parent = 0);
+    explicit FileStorageSettingsWidget(const QString &customPath, QtNote::FileStorage *storage,
+                                       QWidget *parent = nullptr);
     ~FileStorageSettingsWidget();
     QString path() const;
 

diff --git a/libqtnote/notedialog.cpp b/libqtnote/notedialog.cpp
@@ -22,6 +22,7 @@ E-Mail: [email protected] XMPP: [email protected]
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QHBoxLayout>
+#include <QRandomGenerator>
 #include <QSettings>
 
 #include "note.h"
@@ -55,8 +56,8 @@ NoteDialog::NoteDialog(NoteWidget *noteWidget) : QDialog(0), m_ui(new Ui::NoteDi
     }
     if (rect.isEmpty()) {
         QSize avail = QApplication::desktop()->size() - sizeHint();
-        int   x     = avail.width() / 4 + (qrand() / (float)RAND_MAX) * avail.width() / 2;
-        int   y     = avail.height() / 4 + (qrand() / (float)RAND_MAX) * avail.height() / 2;
+        int   x = avail.width() / 4 + (QRandomGenerator::global()->generate() / (float)RAND_MAX) * avail.width() / 2;
+        int   y = avail.height() / 4 + (QRandomGenerator::global()->generate() / (float)RAND_MAX) * avail.height() / 2;
         move(x, y);
     } else {
         setGeometry(rect);

diff --git a/libqtnote/noteedit.h b/libqtnote/noteedit.h
@@ -48,7 +48,7 @@ class QTNOTE_EXPORT NoteEdit : public QTextEdit {
     HoveredLinkPosition      hlp;
 
 public:
-    explicit NoteEdit(QWidget *parent = 0);
+    explicit NoteEdit(QWidget *parent = nullptr);
     virtual void                      addContextMenuHandler(NoteContextMenuHandler *handler);
     inline const HoveredLinkPosition &hoveredLinkPosition() const { return hlp; }
 

diff --git a/libqtnote/notehighlighter.cpp b/libqtnote/notehighlighter.cpp
@@ -31,8 +31,8 @@ void NoteHighlighter::highlightBlock(const QString &text)
         bps.insert(formats[i].start + formats[i].count);
     }
 
-    QList<int> bpl = bps.toList();
-    qSort(bpl);
+    auto bpl = QList<int>(bps.constBegin(), bps.constEnd());
+    std::sort(bpl.begin(), bpl.end());
     for (int i = 0; i < bpl.count() - 1; i++) {
         int             count = bpl[i + 1] - bpl[i];
         QTextCharFormat format;

diff --git a/libqtnote/notemanager.cpp b/libqtnote/notemanager.cpp
@@ -19,12 +19,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 E-Mail: [email protected] XMPP: [email protected]
 */
 
+#include "notemanager.h"
+
 #include <QApplication>
-#include <QLinkedList>
 #include <QSettings>
 #include <QStringList>
 
-#include "notemanager.h"
+#include <list>
 
 namespace QtNote {
 
@@ -123,7 +124,7 @@ QList<NoteListItem> NoteManager::noteList(int count) const
     foreach (NoteStorage::Ptr storage, prioritizedStorages()) {
         ret += storage->noteList(count);
     }
-    qSort(ret.begin(), ret.end(), noteListItemModifyComparer);
+    std::sort(ret.begin(), ret.end(), noteListItemModifyComparer);
     return ret.mid(0, count);
 }
 
@@ -152,7 +153,7 @@ const QMap<QString, NoteStorage::Ptr> NoteManager::storages(bool withInvalid) co
     return ret;
 }
 
-const QLinkedList<NoteStorage::Ptr> NoteManager::prioritizedStorages(bool withInvalid) const
+const std::list<NoteStorage::Ptr> NoteManager::prioritizedStorages(bool withInvalid) const
 {
     if (!_prioCache.size()) {
 
@@ -161,12 +162,12 @@ const QLinkedList<NoteStorage::Ptr> NoteManager::prioritizedStorages(bool withIn
         for (auto code : _priorities) {
             auto storage = storages.take(code);
             if (storage) {
-                _prioCache.append(storage);
+                _prioCache.push_back(storage);
             }
         }
 
         for (auto storage : storages) {
-            _prioCache.append(storage);
+            _prioCache.push_back(storage);
         }
     }
 
@@ -177,7 +178,7 @@ const QLinkedList<NoteStorage::Ptr> NoteManager::prioritizedStorages(bool withIn
     decltype(_prioCache) ret;
     for (auto storage : _prioCache) {
         if (storage->isAccessible()) {
-            ret.append(storage);
+            ret.push_back(storage);
         }
     }
 

diff --git a/libqtnote/notemanager.h b/libqtnote/notemanager.h
@@ -22,14 +22,15 @@ E-Mail: [email protected] XMPP: [email protected]
 #ifndef NOTEMANAGER_H
 #define NOTEMANAGER_H
 
-#include <QLinkedList>
+#include "notestorage.h"
+#include "qtnote_export.h"
+
 #include <QMap>
 #include <QObject>
 #include <QPointer>
 #include <QSet>
 
-#include "notestorage.h"
-#include "qtnote_export.h"
+#include <list>
 
 namespace QtNote {
 
@@ -68,12 +69,12 @@ class QTNOTE_EXPORT NoteManager : public QObject {
     Note note(const QString &storageId, const QString &noteId);
 
     const QMap<QString, NoteStorage::Ptr> storages(bool withInvalid = false) const;
-    const QLinkedList<NoteStorage::Ptr>   prioritizedStorages(bool withInvalid = false) const;
+    const std::list<NoteStorage::Ptr>     prioritizedStorages(bool withInvalid = false) const;
 
     virtual NoteStorage::Ptr storage(const QString &storageId) const; // virtual for plugins
     inline NoteStorage::Ptr  defaultStorage() const
     {
-        return prioritizedStorages().isEmpty() ? NoteStorage::Ptr() : prioritizedStorages().first();
+        return prioritizedStorages().empty() ? NoteStorage::Ptr() : prioritizedStorages().front();
     }
 
     /*
@@ -94,10 +95,10 @@ private slots:
 private:
     NoteManager(QObject *parent);
 
-    static NoteManager *                  _instance;
-    QStringList                           _priorities;
-    QMap<QString, NoteStorage::Ptr>       _storages;
-    mutable QLinkedList<NoteStorage::Ptr> _prioCache;
+    static NoteManager *                _instance;
+    QStringList                         _priorities;
+    QMap<QString, NoteStorage::Ptr>     _storages;
+    mutable std::list<NoteStorage::Ptr> _prioCache;
 };
 
 }

diff --git a/libqtnote/notemanagerview.h b/libqtnote/notemanagerview.h
@@ -29,7 +29,7 @@ namespace QtNote {
 class NoteManagerView : public QTreeView {
     Q_OBJECT
 public:
-    explicit NoteManagerView(QWidget *parent = 0);
+    explicit NoteManagerView(QWidget *parent = nullptr);
 
 protected:
     // reimplemented

diff --git a/libqtnote/notewidget.cpp b/libqtnote/notewidget.cpp
@@ -128,7 +128,7 @@ NoteWidget::NoteWidget(const QString &storageId, const QString &noteId) :
     // ui->saveBtn->setIcon(style()->standardIcon(QStyle::SP_DialogSaveButton));
 
     QHBoxLayout *hb3a = new QHBoxLayout();
-    findBar           = new TypeAheadFindBar(ui->noteEdit, QString::null, this);
+    findBar           = new TypeAheadFindBar(ui->noteEdit, QString(), this);
     hb3a->addWidget(findBar);
     ui->noteLayout->addLayout(hb3a);
 

diff --git a/libqtnote/optionsplugins.h b/libqtnote/optionsplugins.h
@@ -18,7 +18,7 @@ class OptionsPlugins : public QWidget {
     Q_OBJECT
 
 public:
-    explicit OptionsPlugins(Main *qtnote, QWidget *parent = 0);
+    explicit OptionsPlugins(Main *qtnote, QWidget *parent = nullptr);
     ~OptionsPlugins();
 
 private slots:

diff --git a/libqtnote/pluginhostinterface.h b/libqtnote/pluginhostinterface.h
@@ -22,6 +22,10 @@ E-Mail: [email protected] XMPP: [email protected]
 #ifndef PLUGIN_HOST_INTERFACE_H
 #define PLUGIN_HOST_INTERFACE_H
 
+#include <QString>
+
+#include <memory>
+
 class QWidget;
 
 namespace QtNote {

diff --git a/libqtnote/pluginmanager.cpp b/libqtnote/pluginmanager.cpp
@@ -194,7 +194,9 @@ void PluginManager::loadPlugins()
         }
     }
 
-    prioritizedList += (plugins.keys().toSet() - prioritizedList.toSet()).toList();
+    auto pluginKeys     = QSet<QString>(plugins.keyBegin(), plugins.keyEnd());
+    auto prioritizedSet = pluginKeys - QSet<QString>(prioritizedList.constBegin(), prioritizedList.constEnd());
+    prioritizedList += QStringList(prioritizedSet.constBegin(), prioritizedSet.constEnd());
     s.setValue("plugins-priority", prioritizedList);
 
     /*

diff --git a/libqtnote/pluginmanager.h b/libqtnote/pluginmanager.h
@@ -102,7 +102,8 @@ public slots:
     PluginHost *                    pluginHost = nullptr;
     QHash<QString, PluginData::Ptr> plugins;
 
-    LoadStatus loadPlugin(const QString &fileName, PluginData::Ptr &cache, QLibrary::LoadHints loadHints = 0);
+    LoadStatus loadPlugin(const QString &fileName, PluginData::Ptr &cache,
+                          QLibrary::LoadHints loadHints = QLibrary::LoadHints());
     void       updateMetadata();
     bool       ensureLoaded(PluginData::Ptr pd);
     QString    iconsCacheDir() const;

diff --git a/libqtnote/ptfdata.cpp b/libqtnote/ptfdata.cpp
@@ -36,7 +36,7 @@ bool PTFData::fromFile(QString fn)
     setFile(fn);
     file.close();
     QFileInfo fi(fn);
-    dtCreate     = fi.created();
+    dtCreate     = fi.birthTime();
     dtLastChange = fi.lastModified();
 
     return true;

diff --git a/libqtnote/qtnote.h b/libqtnote/qtnote.h
@@ -49,7 +49,7 @@ class QTNOTE_EXPORT Main : public QObject {
     inline bool isOperable() const { return _inited; }
     void        parseAppArguments(const QStringList &args);
 
-    NoteWidget * noteWidget(const QString &storageId, const QString &noteId, const QString &contents = QString::null);
+    NoteWidget * noteWidget(const QString &storageId, const QString &noteId, const QString &contents = QString());
     virtual void activateWidget(QWidget *w) const; // virtual for plugins
     inline ShortcutsManager *shortcutsManager() const { return _shortcutsManager; }
     inline PluginManager *   pluginManager() const { return _pluginManager; }
@@ -69,8 +69,8 @@ class QTNOTE_EXPORT Main : public QObject {
 
 public slots:
     void notifyError(const QString &);
-    void showNoteDialog(const QString &storageId, const QString &noteId = QString::null,
-                        const QString &contents = QString::null);
+    void showNoteDialog(const QString &storageId, const QString &noteId = QString(),
+                        const QString &contents = QString());
 
 private slots:
     void exitQtNote();

diff --git a/libqtnote/shortcutedit.h b/libqtnote/shortcutedit.h
@@ -32,7 +32,7 @@ class Main;
 class ShortcutEdit : public QLineEdit {
     Q_OBJECT
 public:
-    explicit ShortcutEdit(Main *qtnote, const QString &option, QWidget *parent = 0);
+    explicit ShortcutEdit(Main *qtnote, const QString &option, QWidget *parent = nullptr);
     inline const QKeySequence &sequence() const { return _seq; }
     inline void                setSequence(const QKeySequence &seq)
     {

diff --git a/libqtnote/typeaheadfind.h b/libqtnote/typeaheadfind.h
@@ -31,7 +31,7 @@ class TypeAheadFindBar : public QToolBar {
 public:
     enum Mode { Find, Replace };
 
-    TypeAheadFindBar(QTextEdit *textedit, const QString &title, QWidget *parent = 0);
+    TypeAheadFindBar(QTextEdit *textedit, const QString &title, QWidget *parent = nullptr);
     ~TypeAheadFindBar();
     void init();
     void setMode(Mode mode);

diff --git a/plugins/baseintegration/baseintegrationtray.cpp b/plugins/baseintegration/baseintegrationtray.cpp
@@ -2,6 +2,7 @@
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QMenu>
+#include <QScreen>
 #include <QSettings>
 #include <QStyle>
 
@@ -66,7 +67,7 @@ void BaseIntegrationTray::showNoteList(QSystemTrayIcon::ActivationReason reason)
     }
     menu.show();
     qtnote->activateWidget(&menu);
-    QRect dr = QApplication::desktop()->availableGeometry(QCursor::pos());
+    QRect dr = QGuiApplication::screenAt(QCursor::pos())->geometry();
     QRect ir = tray->geometry();
     QRect mr = menu.geometry();
     if (ir.isEmpty()) { // O_O but with kde this happens...

diff --git a/plugins/kdeintegration/kdeintegration.cpp b/plugins/kdeintegration/kdeintegration.cpp
@@ -13,6 +13,7 @@
 
 #include "kdeintegration.h"
 #include "kdeintegrationtray.h"
+#include "pluginhostinterface.h"
 
 namespace QtNote {
 
@@ -46,6 +47,8 @@ PluginMetadata KDEIntegration::metadata()
     return md;
 }
 
+void KDEIntegration::setHost(PluginHostInterface *) { }
+
 TrayImpl *KDEIntegration::initTray(Main *qtnote) { return new KDEIntegrationTray(qtnote, this); }
 
 void KDEIntegration::notifyError(const QString &msg)

diff --git a/plugins/kdeintegration/kdeintegration.h b/plugins/kdeintegration/kdeintegration.h
@@ -13,6 +13,8 @@ class KAction;
 
 namespace QtNote {
 
+class PluginHostInterface;
+
 class KDEIntegration : public QObject,
                        public PluginInterface,
                        public NotificationInterface,
@@ -28,15 +30,17 @@ class KDEIntegration : public QObject,
 public:
     explicit KDEIntegration(QObject *parent = 0);
 
-    int                    metadataVersion() const;
-    virtual PluginMetadata metadata();
-    TrayImpl *             initTray(Main *qtnote);
-    void                   notifyError(const QString &msg);
-    void                   activateWidget(QWidget *w);
+    int                    metadataVersion() const override;
+    virtual PluginMetadata metadata() override;
+    void                   setHost(PluginHostInterface *host) override;
+
+    TrayImpl *initTray(Main *qtnote) override;
+    void      notifyError(const QString &msg) override;
+    void      activateWidget(QWidget *w) override;
 
-    bool registerGlobalShortcut(const QString &id, const QKeySequence &key, QAction *action);
-    bool updateGlobalShortcut(const QString &id, const QKeySequence &key);
-    void setGlobalShortcutEnabled(const QString &id, bool enabled = true);
+    bool registerGlobalShortcut(const QString &id, const QKeySequence &key, QAction *action) override;
+    bool updateGlobalShortcut(const QString &id, const QKeySequence &key) override;
+    void setGlobalShortcutEnabled(const QString &id, bool enabled = true) override;
 
 signals: