diff options
Diffstat (limited to 'src/modules/url')
| -rw-r--r-- | src/modules/url/libkviurl.cpp | 12 | ||||
| -rw-r--r-- | src/modules/url/libkviurl.h | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 279c414cd..a10d5171c 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -54,11 +54,11 @@ extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground; #endif -typedef struct _UrlDlgList +struct UrlDlgList { UrlDialog * dlg; int menu_id; -} UrlDlgList; +}; const char * g_pUrlListFilename = "/list.kviurl"; const char * g_pBanListFilename = "/list.kviban"; @@ -288,10 +288,10 @@ void UrlDialog::addUrl(QString url, QString window, QString count, QString times UrlItem->setText(2, count); UrlItem->setText(3, timestamp); - UrlItem->setForeground(0, KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_URL).fore())); - UrlItem->setForeground(1, KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore())); - UrlItem->setForeground(2, KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore())); - UrlItem->setForeground(3, KVI_OPTION_MIRCCOLOR(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore())); + UrlItem->setForeground(0, getMircColor(KVI_OPTION_MSGTYPE(KVI_OUT_URL).fore())); + UrlItem->setForeground(1, getMircColor(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore())); + UrlItem->setForeground(2, getMircColor(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore())); + UrlItem->setForeground(3, getMircColor(KVI_OPTION_MSGTYPE(KVI_OUT_NONE).fore())); m_pUrlList->resizeColumnToContents(0); m_pUrlList->resizeColumnToContents(3); diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h index 623d11b5a..cb14edac7 100644 --- a/src/modules/url/libkviurl.h +++ b/src/modules/url/libkviurl.h @@ -48,13 +48,13 @@ #include <unordered_set> #include <vector> -typedef struct _KviUrl +struct KviUrl { QString url; QString window; int count; QString timestamp; -} KviUrl; +}; class UrlDialogTreeWidget : public QTreeWidget { @@ -64,8 +64,8 @@ public: ~UrlDialogTreeWidget(){}; protected: - void mousePressEvent(QMouseEvent * e); - void paintEvent(QPaintEvent * event); + void mousePressEvent(QMouseEvent * e) override; + void paintEvent(QPaintEvent * event) override; signals: void rightButtonPressed(QTreeWidgetItem *, QPoint); void contextMenuRequested(QPoint); @@ -80,11 +80,11 @@ public: private: KviTalMenuBar * m_pMenuBar; - QMenu * m_pListPopup; // dynamic popup menu + QMenu * m_pListPopup = nullptr; // dynamic popup menu QString m_szUrl; // used to pass URLs to sayToWin slot protected: - QPixmap * myIconPtr(); - void resizeEvent(QResizeEvent *); + QPixmap * myIconPtr() override; + void resizeEvent(QResizeEvent *) override; public: UrlDialogTreeWidget * m_pUrlList; @@ -109,7 +109,7 @@ class BanFrame : public QFrame { Q_OBJECT public: - BanFrame(QWidget * parent = 0, const char * name = 0, bool banEnable = false); + BanFrame(QWidget * parent = nullptr, const char * name = nullptr, bool banEnable = false); ~BanFrame(); void saveBans(KviConfigurationFile * cfg); @@ -136,7 +136,7 @@ public: private: QCheckBox * cb[cbnum]; BanFrame * m_pBanFrame; - void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) override; protected slots: void acceptbtn(); void discardbtn(); |