diff options
| author |  Alexey Sokolov | 2016-05-01 16:16:09 +0100 |
|---|---|---|
| committer | Alexey Sokolov | 2016-05-01 16:16:09 +0100 |
| commit | fe375f69972cd912739c0d68fa4951d35de90e5e (patch) | |
| tree | 71bd2c2b59d6be62d7c18588a417e5aa39ab233c /src/modules/theme/ThemeManagementDialog.cpp | |
| parent | libkvidcc: fix $dcc.currentSpeed documentation add missing @short and fix rig... (diff) | |
| parent | Apply clang-tidy: modernize-loop-convert (diff) | |
| download | KVIrc-fe375f69972cd912739c0d68fa4951d35de90e5e.tar.gz KVIrc-fe375f69972cd912739c0d68fa4951d35de90e5e.tar.bz2 KVIrc-fe375f69972cd912739c0d68fa4951d35de90e5e.zip | |
Merge pull request #1962 from DarthGandalf/modernize
Apply several fixes of clang-tidy
Diffstat (limited to 'src/modules/theme/ThemeManagementDialog.cpp')
| -rw-r--r-- | src/modules/theme/ThemeManagementDialog.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp index 1358961b6..14e36ba28 100644 --- a/src/modules/theme/ThemeManagementDialog.cpp +++ b/src/modules/theme/ThemeManagementDialog.cpp @@ -109,14 +109,14 @@ ThemeListWidgetItem::~ThemeListWidgetItem() delete m_pThemeInfo; } -ThemeManagementDialog * ThemeManagementDialog::m_pInstance = 0; +ThemeManagementDialog * ThemeManagementDialog::m_pInstance = nullptr; ThemeManagementDialog::ThemeManagementDialog(QWidget * parent) : QWidget(parent) { - m_pItemDelegate = NULL; + m_pItemDelegate = nullptr; #ifdef COMPILE_WEBKIT_SUPPORT - m_pWebThemeInterfaceDialog = NULL; + m_pWebThemeInterfaceDialog = nullptr; #endif setObjectName("theme_options_widget"); setWindowTitle(__tr2qs_ctx("Manage Themes - KVIrc", "theme")); @@ -252,12 +252,12 @@ ThemeManagementDialog::~ThemeManagementDialog() if(m_pItemDelegate) delete m_pItemDelegate; g_rectManagementDialogGeometry = QRect(pos().x(), pos().y(), size().width(), size().height()); - m_pInstance = 0; + m_pInstance = nullptr; #ifdef COMPILE_WEBKIT_SUPPORT if(m_pWebThemeInterfaceDialog) { m_pWebThemeInterfaceDialog->deleteLater(); - m_pWebThemeInterfaceDialog = NULL; + m_pWebThemeInterfaceDialog = nullptr; } #endif //COMPILE_WEBKIT_SUPPORT } @@ -265,7 +265,7 @@ ThemeManagementDialog::~ThemeManagementDialog() void ThemeManagementDialog::closeClicked() { deleteLater(); - m_pInstance = 0; + m_pInstance = nullptr; } void ThemeManagementDialog::display(bool bTopLevel) @@ -276,7 +276,7 @@ void ThemeManagementDialog::display(bool bTopLevel) { if(m_pInstance->parent()) { - m_pInstance->setParent(0); + m_pInstance->setParent(nullptr); } } else @@ -291,7 +291,7 @@ void ThemeManagementDialog::display(bool bTopLevel) { if(bTopLevel) { - m_pInstance = new ThemeManagementDialog(0); + m_pInstance = new ThemeManagementDialog(nullptr); } else { @@ -308,7 +308,7 @@ void ThemeManagementDialog::cleanup() if(!m_pInstance) return; delete m_pInstance; - m_pInstance = 0; + m_pInstance = nullptr; } void ThemeManagementDialog::packTheme() @@ -329,7 +329,7 @@ void ThemeManagementDialog::packTheme() void ThemeManagementDialog::contextMenuRequested(const QPoint & pos) { ThemeListWidgetItem * pItem = dynamic_cast<ThemeListWidgetItem *>(m_pListWidget->itemAt(pos)); - if(pItem != 0) + if(pItem != nullptr) { m_pListWidget->setCurrentItem(pItem); m_pContextPopup->clear(); @@ -453,7 +453,7 @@ void ThemeManagementDialog::getMoreThemes() void ThemeManagementDialog::webThemeInterfaceDialogDestroyed() { #ifdef COMPILE_WEBKIT_SUPPORT - m_pWebThemeInterfaceDialog = NULL; + m_pWebThemeInterfaceDialog = nullptr; #endif fillThemeBox(); } |