diff options
Diffstat (limited to 'src/modules/theme')
| -rw-r--r-- | src/modules/theme/PackThemeDialog.cpp | 2 | ||||
| -rw-r--r-- | src/modules/theme/ThemeFunctions.cpp | 8 | ||||
| -rw-r--r-- | src/modules/theme/ThemeManagementDialog.cpp | 22 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp index 65c56984b..73c229c15 100644 --- a/src/modules/theme/PackThemeDialog.cpp +++ b/src/modules/theme/PackThemeDialog.cpp @@ -144,7 +144,7 @@ void PackThemeDataWidget::parseThemes(KviPointerList<KviThemeInfo> * pThemeInfoL QString szPackageAuthor; QString szPackageDescription; QString szPackageVersion; - KviThemeInfo * pThemeInfo = 0; + KviThemeInfo * pThemeInfo = nullptr; bool bPackagePathSet = false; QString szPackagePath = QDir::homePath(); diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp index b2b8aa22d..90e5a3bdc 100644 --- a/src/modules/theme/ThemeFunctions.cpp +++ b/src/modules/theme/ThemeFunctions.cpp @@ -115,7 +115,7 @@ namespace ThemeFunctions // load its picture pByteArray = r.binaryInfoFields()->find("Image"); if(pByteArray) - pix.loadFromData(*pByteArray, 0, 0); + pix.loadFromData(*pByteArray, nullptr, nullptr); if(pix.isNull()) { @@ -182,7 +182,7 @@ namespace ThemeFunctions QPixmap pixScreenshot; pByteArray = r.binaryInfoFields()->find(szTmp); if(pByteArray) - pixScreenshot.loadFromData(*pByteArray, 0, 0); + pixScreenshot.loadFromData(*pByteArray, nullptr, nullptr); if(szThemeName.isEmpty() || szThemeVersion.isEmpty() || szThemeSubdirectory.isEmpty() || szThemeEngineVersion.isEmpty()) bValid = false; @@ -442,7 +442,7 @@ namespace ThemeFunctions if(!out.isNull()) { QByteArray * pba = new QByteArray(); - QBuffer buffer(pba, 0); + QBuffer buffer(pba, nullptr); buffer.open(QIODevice::WriteOnly); out.save(&buffer, "PNG"); buffer.close(); @@ -493,7 +493,7 @@ namespace ThemeFunctions szTmp = QString("Theme%1Screenshot").arg(iIdx); QByteArray * pba = new QByteArray(); - QBuffer bufferz(pba, 0); + QBuffer bufferz(pba, nullptr); bufferz.open(QIODevice::WriteOnly); pixScreenshot.save(&bufferz, "PNG"); bufferz.close(); 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(); } |