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_wizard.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_wizard.h')
| -rw-r--r-- | src/modules/objects/KvsObject_wizard.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/objects/KvsObject_wizard.h b/src/modules/objects/KvsObject_wizard.h index 976e25f93..b37b0aa8a 100644 --- a/src/modules/objects/KvsObject_wizard.h +++ b/src/modules/objects/KvsObject_wizard.h @@ -41,7 +41,7 @@ public: void backClicked(); protected: - virtual bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams); + bool init(KviKvsRunTimeContext * pContext, KviKvsVariantList * pParams) override; bool addPage(KviKvsObjectFunctionCall * c); bool insertPage(KviKvsObjectFunctionCall * c); @@ -68,7 +68,7 @@ public: KviKvsMdmWizard(QWidget * par, const char * name, KvsObject_wizard *); void accept(); void reject(); - virtual ~KviKvsMdmWizard(); + ~KviKvsMdmWizard(); protected: KvsObject_wizard * m_pParentScript; |