diff options
| author |  wodim | 2019-04-01 15:01:02 +0200 |
|---|---|---|
| committer |  GitHub | 2019-04-01 15:01:02 +0200 |
| commit | 1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9 (patch) | |
| tree | 94cfdd5000b6b0d6af1272e89f8b234fd8c484d4 /src/modules/objects/KvsObject_window.h | |
| parent | Add support for Python 3 (diff) | |
| parent | uintUserListMinimumWidth: Reduce minimum due to account for certain combinati... (diff) | |
| download | KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.tar.gz KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.tar.bz2 KVIrc-1e89e2da2e3740e55642c8ce44c573cd4bbe6ea9.zip | |
Merge branch 'master' into python3
Diffstat (limited to 'src/modules/objects/KvsObject_window.h')
| -rw-r--r-- | src/modules/objects/KvsObject_window.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/objects/KvsObject_window.h b/src/modules/objects/KvsObject_window.h index 172db20de..0c21138ff 100644 --- a/src/modules/objects/KvsObject_window.h +++ b/src/modules/objects/KvsObject_window.h @@ -36,12 +36,12 @@ public: ~KviKvsScriptWindowWindow(); protected: - KvsObject_widget * m_pCentralWidgetObject; - QWidget * m_pCentralWidget; - QPixmap * m_pIcon; + KvsObject_widget * m_pCentralWidgetObject = nullptr; + QWidget * m_pCentralWidget = nullptr; + QPixmap * m_pIcon = nullptr; public: - virtual QPixmap * myIconPtr(); + QPixmap * myIconPtr() override; void setIcon(QPixmap * pPixmap) { m_pIcon = pPixmap; }; void setCentralWidget(KvsObject_widget * o, QWidget * w); void setWindowTitleString(const QString & s) @@ -49,7 +49,7 @@ public: setFixedCaption(s); fillCaptionBuffers(); }; - virtual void resizeEvent(QResizeEvent * e); + void resizeEvent(QResizeEvent * e) override; protected slots: void centralWidgetObjectDestroyed(); void centralWidgetDestroyed(); @@ -60,10 +60,10 @@ class KvsObject_window : public KvsObject_widget public: KVSO_DECLARE_OBJECT(KvsObject_window) public: - QWidget * widget() { return (QWidget *)object(); }; + QWidget * widget() { return (QWidget *)object(); } protected: - virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams); + bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override; bool setWindowTitle(KviKvsObjectFunctionCall * c); bool setIcon(KviKvsObjectFunctionCall * c); |