[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [baloo-widgets] /: Use nullptr
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2018-07-04 22:05:16
Message-ID: E1faptk-0004ea-NI () code ! kde ! org
[Download RAW message or body]
Git commit 4e5ca0a7479e73fc9073b52f0a748a30c94ba01f by Friedrich W. H. Kossebau.
Committed on 04/07/2018 at 21:49.
Pushed by kossebau into branch 'master'.
Use nullptr
M +1 -1 src/filefetchjob.h
M +5 -5 src/filemetadataconfigwidget.cpp
M +1 -1 src/filemetadataconfigwidget.h
M +3 -3 src/filemetadataprovider.cpp
M +1 -1 src/filemetadataprovider.h
M +4 -4 src/filemetadatawidget.cpp
M +1 -1 src/filemetadatawidget.h
M +1 -1 src/indexeddataretriever.h
M +3 -3 src/kblocklayout.cpp
M +5 -5 src/kcommentwidget.cpp
M +1 -1 src/kcommentwidget_p.h
M +2 -2 src/kedittagsdialog.cpp
M +1 -1 src/kedittagsdialog_p.h
M +2 -2 src/metadatafilter.cpp
M +1 -1 src/metadatafilter.h
M +1 -1 src/tagcheckbox.cpp
M +1 -1 src/tagcheckbox.h
M +4 -4 src/tagwidget.cpp
M +1 -1 src/tagwidget.h
M +2 -2 src/widgetfactory.cpp
M +1 -1 src/widgetfactory.h
M +1 -1 test/metadataconfigwidgetapp.cpp
https://commits.kde.org/baloo-widgets/4e5ca0a7479e73fc9073b52f0a748a30c94ba01f
diff --git a/src/filefetchjob.h b/src/filefetchjob.h
index aed8257..213f1d1 100644
--- a/src/filefetchjob.h
+++ b/src/filefetchjob.h
@@ -30,7 +30,7 @@ class FileFetchJob : public KJob
{
Q_OBJECT
public:
- FileFetchJob(const QStringList& urls, QObject* parent = 0);
+ FileFetchJob(const QStringList& urls, QObject* parent = nullptr);
QList<QVariantMap> data() const;
diff --git a/src/filemetadataconfigwidget.cpp b/src/filemetadataconfigwidget.cpp
index 788f938..97dd2b4 100644
--- a/src/filemetadataconfigwidget.cpp
+++ b/src/filemetadataconfigwidget.cpp
@@ -61,8 +61,8 @@ private:
FileMetaDataConfigWidget::Private::Private(FileMetaDataConfigWidget* parent) :
m_visibleDataTypes(0),
m_fileItems(),
- m_provider(0),
- m_metaDataList(0),
+ m_provider(nullptr),
+ m_metaDataList(nullptr),
q(parent)
{
m_metaDataList = new QListWidget(q);
@@ -96,11 +96,11 @@ void FileMetaDataConfigWidget::Private::addItem(const QString& key)
"comment", // = fixed item kfileitem#comment
"contentSize", // = fixed item kfileitem#size
- 0 // mandatory last entry
+ nullptr // mandatory last entry
};
int i = 0;
- while (hiddenProperties[i] != 0) {
+ while (hiddenProperties[i] != nullptr) {
if (key == QLatin1String(hiddenProperties[i])) {
// the item is hidden
return;
@@ -124,7 +124,7 @@ void FileMetaDataConfigWidget::Private::slotLoadingFinished()
{
// Get all meta information labels that are available for
// the currently shown file item and add them to the list.
- Q_ASSERT(m_provider != 0);
+ Q_ASSERT(m_provider != nullptr);
m_metaDataList->clear();
diff --git a/src/filemetadataconfigwidget.h b/src/filemetadataconfigwidget.h
index e1de8d0..5a03a6d 100644
--- a/src/filemetadataconfigwidget.h
+++ b/src/filemetadataconfigwidget.h
@@ -38,7 +38,7 @@ class BALOO_WIDGETS_EXPORT FileMetaDataConfigWidget : public QWidget
Q_OBJECT
public:
- explicit FileMetaDataConfigWidget(QWidget* parent = 0);
+ explicit FileMetaDataConfigWidget(QWidget* parent = nullptr);
virtual ~FileMetaDataConfigWidget();
/**
diff --git a/src/filemetadataprovider.cpp b/src/filemetadataprovider.cpp
index 2da6973..2047e28 100644
--- a/src/filemetadataprovider.cpp
+++ b/src/filemetadataprovider.cpp
@@ -397,13 +397,13 @@ QString FileMetaDataProvider::label(const QString& metaDataLabel) const
{ "rating", I18N_NOOP2_NOSTRIP("@label", "Rating") },
{ "userComment", I18N_NOOP2_NOSTRIP("@label", "Comment") },
{ "originUrl", I18N_NOOP2_NOSTRIP("@label", "Downloaded From") },
- { 0, 0, 0} // Mandatory last entry
+ { nullptr, nullptr, nullptr} // Mandatory last entry
};
static QHash<QString, QString> hash;
if (hash.isEmpty()) {
const TranslationItem* item = &translations[0];
- while (item->key != 0) {
+ while (item->key != nullptr) {
hash.insert(item->key, i18nc(item->context, item->value));
++item;
}
@@ -495,7 +495,7 @@ int FileMetaDataProvider::subDirectoriesCount(const QString& path)
DIR* dir = ::opendir(QFile::encodeName(path));
if (dir) {
count = 0;
- struct dirent *dirEntry = 0;
+ struct dirent *dirEntry = nullptr;
while ((dirEntry = ::readdir(dir))) { // krazy:exclude=syscalls
if (dirEntry->d_name[0] == '.') {
if (dirEntry->d_name[1] == '\0') {
diff --git a/src/filemetadataprovider.h b/src/filemetadataprovider.h
index 104970b..27fd22b 100644
--- a/src/filemetadataprovider.h
+++ b/src/filemetadataprovider.h
@@ -44,7 +44,7 @@ class FileMetaDataProvider : public QObject
Q_OBJECT
public:
- explicit FileMetaDataProvider(QObject* parent = 0);
+ explicit FileMetaDataProvider(QObject* parent = nullptr);
virtual ~FileMetaDataProvider();
/**
diff --git a/src/filemetadatawidget.cpp b/src/filemetadatawidget.cpp
index 4c15d95..09696eb 100644
--- a/src/filemetadatawidget.cpp
+++ b/src/filemetadatawidget.cpp
@@ -83,8 +83,8 @@ private:
FileMetaDataWidget::Private::Private(FileMetaDataWidget* parent)
: m_rows()
- , m_provider(0)
- , m_gridLayout(0)
+ , m_provider(nullptr)
+ , m_gridLayout(nullptr)
, q(parent)
{
m_filter = new MetadataFilter(q);
@@ -128,7 +128,7 @@ void FileMetaDataWidget::Private::slotLoadingFinished()
{
deleteRows();
- if (m_gridLayout == 0) {
+ if (m_gridLayout == nullptr) {
m_gridLayout = new QGridLayout(q);
m_gridLayout->setMargin(0);
m_gridLayout->setSpacing(q->fontMetrics().height() / 4);
@@ -273,7 +273,7 @@ DateFormats FileMetaDataWidget::dateFormat() const
QSize FileMetaDataWidget::sizeHint() const
{
- if (d->m_gridLayout == 0) {
+ if (d->m_gridLayout == nullptr) {
return QWidget::sizeHint();
}
diff --git a/src/filemetadatawidget.h b/src/filemetadatawidget.h
index f3c8307..c95eca2 100644
--- a/src/filemetadatawidget.h
+++ b/src/filemetadatawidget.h
@@ -50,7 +50,7 @@ class BALOO_WIDGETS_EXPORT FileMetaDataWidget : public QWidget
Q_PROPERTY(DateFormats dateFormat READ dateFormat WRITE setDateFormat)
public:
- explicit FileMetaDataWidget(QWidget* parent = 0);
+ explicit FileMetaDataWidget(QWidget* parent = nullptr);
virtual ~FileMetaDataWidget();
/**
diff --git a/src/indexeddataretriever.h b/src/indexeddataretriever.h
index 130f55e..7bbf79c 100644
--- a/src/indexeddataretriever.h
+++ b/src/indexeddataretriever.h
@@ -31,7 +31,7 @@ class IndexedDataRetriever : public KJob
{
Q_OBJECT
public:
- IndexedDataRetriever(const QString& fileUrl, QObject* parent = 0);
+ IndexedDataRetriever(const QString& fileUrl, QObject* parent = nullptr);
virtual ~IndexedDataRetriever();
virtual void start() Q_DECL_OVERRIDE;
diff --git a/src/kblocklayout.cpp b/src/kblocklayout.cpp
index 5ed8990..59f6818 100644
--- a/src/kblocklayout.cpp
+++ b/src/kblocklayout.cpp
@@ -46,7 +46,7 @@ public:
return -1;
} else if (parent->isWidgetType()) {
QWidget *pw = static_cast<QWidget *>(parent);
- return pw->style()->pixelMetric(pm, 0, pw);
+ return pw->style()->pixelMetric(pm, nullptr, pw);
} else {
return static_cast<QLayout *>(parent)->spacing();
}
@@ -143,12 +143,12 @@ QLayoutItem *KBlockLayout::takeAt( int index )
if (index >= 0 && index < d->itemList.size())
return d->itemList.takeAt(index);
else
- return 0;
+ return nullptr;
}
Qt::Orientations KBlockLayout::expandingDirections() const
{
- return 0;
+ return nullptr;
}
bool KBlockLayout::hasHeightForWidth() const
diff --git a/src/kcommentwidget.cpp b/src/kcommentwidget.cpp
index 96246e6..ff8d58a 100644
--- a/src/kcommentwidget.cpp
+++ b/src/kcommentwidget.cpp
@@ -34,8 +34,8 @@
KCommentWidget::KCommentWidget(QWidget* parent) :
QWidget(parent),
m_readOnly(false),
- m_label(0),
- m_sizeHintHelper(0),
+ m_label(nullptr),
+ m_sizeHintHelper(nullptr),
m_comment()
{
m_label = new QLabel(this);
@@ -126,7 +126,7 @@ void KCommentWidget::slotLinkActivated(const QString& link)
if (dialog->exec() == QDialog::Accepted) {
const QString oldText = m_comment;
- if (dialog != 0) {
+ if (dialog != nullptr) {
setText(dialog->getCommentText());
}
if (oldText != m_comment) {
@@ -134,9 +134,9 @@ void KCommentWidget::slotLinkActivated(const QString& link)
}
}
- if (dialog != 0) {
+ if (dialog != nullptr) {
KWindowConfig::saveWindowSize(dialog->windowHandle(), dialogConfig);
delete dialog;
- dialog = 0;
+ dialog = nullptr;
}
}
diff --git a/src/kcommentwidget_p.h b/src/kcommentwidget_p.h
index 01e770c..96954c0 100644
--- a/src/kcommentwidget_p.h
+++ b/src/kcommentwidget_p.h
@@ -34,7 +34,7 @@ class KCommentWidget : public QWidget
Q_OBJECT
public:
- explicit KCommentWidget(QWidget* parent = 0);
+ explicit KCommentWidget(QWidget* parent = nullptr);
virtual ~KCommentWidget();
void setText(const QString& comment);
diff --git a/src/kedittagsdialog.cpp b/src/kedittagsdialog.cpp
index 091eb92..d252526 100644
--- a/src/kedittagsdialog.cpp
+++ b/src/kedittagsdialog.cpp
@@ -40,8 +40,8 @@ KEditTagsDialog::KEditTagsDialog(const QStringList& tags,
QWidget *parent) :
QDialog(parent),
m_tags(tags),
- m_tagTree(0),
- m_newTagEdit(0)
+ m_tagTree(nullptr),
+ m_newTagEdit(nullptr)
{
const QString captionText = (tags.count() > 0) ?
i18nc("@title:window", "Change Tags") :
diff --git a/src/kedittagsdialog_p.h b/src/kedittagsdialog_p.h
index 666bf19..9b7d347 100644
--- a/src/kedittagsdialog_p.h
+++ b/src/kedittagsdialog_p.h
@@ -41,7 +41,7 @@ class KEditTagsDialog : public QDialog
public:
KEditTagsDialog(const QStringList& tags,
- QWidget* parent = 0);
+ QWidget* parent = nullptr);
virtual ~KEditTagsDialog();
diff --git a/src/metadatafilter.cpp b/src/metadatafilter.cpp
index 081ce4d..cac1c4d 100644
--- a/src/metadatafilter.cpp
+++ b/src/metadatafilter.cpp
@@ -86,10 +86,10 @@ void MetadataFilter::initMetaInformationSettings()
"kfileitem#owner",
"kfileitem#group",
"kfileitem#permissions",
- 0 // mandatory last entry
+ nullptr // mandatory last entry
};
- for (int i = 0; disabledProperties[i] != 0; ++i) {
+ for (int i = 0; disabledProperties[i] != nullptr; ++i) {
settings.writeEntry(disabledProperties[i], false);
}
diff --git a/src/metadatafilter.h b/src/metadatafilter.h
index 900c0bd..9b1f649 100644
--- a/src/metadatafilter.h
+++ b/src/metadatafilter.h
@@ -30,7 +30,7 @@ namespace Baloo {
class MetadataFilter : public QObject
{
public:
- explicit MetadataFilter(QObject* parent = 0);
+ explicit MetadataFilter(QObject* parent = nullptr);
virtual ~MetadataFilter();
/**
diff --git a/src/tagcheckbox.cpp b/src/tagcheckbox.cpp
index 0e945b0..b1d9b84 100644
--- a/src/tagcheckbox.cpp
+++ b/src/tagcheckbox.cpp
@@ -32,7 +32,7 @@ using namespace Baloo;
TagCheckBox::TagCheckBox(const QString& tag, QWidget* parent)
: QWidget( parent ),
- m_label(0),
+ m_label(nullptr),
m_tag(tag),
m_urlHover(false)
{
diff --git a/src/tagcheckbox.h b/src/tagcheckbox.h
index 9fecbb1..0a87821 100644
--- a/src/tagcheckbox.h
+++ b/src/tagcheckbox.h
@@ -36,7 +36,7 @@ class TagCheckBox : public QWidget
Q_OBJECT
public:
- TagCheckBox(const QString& tag, QWidget* parent = 0);
+ TagCheckBox(const QString& tag, QWidget* parent = nullptr);
~TagCheckBox();
QString tag() const { return m_tag; }
diff --git a/src/tagwidget.cpp b/src/tagwidget.cpp
index 1de24fa..53a8bad 100644
--- a/src/tagwidget.cpp
+++ b/src/tagwidget.cpp
@@ -38,8 +38,8 @@ void TagWidgetPrivate::init( TagWidget* parent )
{
q = parent;
m_readOnly = false;
- m_showAllLinkLabel = 0;
- m_editTagsDialog = 0;
+ m_showAllLinkLabel = nullptr;
+ m_editTagsDialog = nullptr;
QGridLayout* mainLayout = new QGridLayout( q );
mainLayout->setMargin(0);
@@ -66,7 +66,7 @@ void TagWidgetPrivate::buildTagHash(const QStringList& tags)
}
delete m_showAllLinkLabel;
- m_showAllLinkLabel = 0;
+ m_showAllLinkLabel = nullptr;
if (m_readOnly && !tags.isEmpty()) {
return;
@@ -185,6 +185,6 @@ void TagWidget::slotKEditTagDialogFinished(int result)
}
d->m_editTagsDialog->deleteLater();
- d->m_editTagsDialog = 0;
+ d->m_editTagsDialog = nullptr;
}
diff --git a/src/tagwidget.h b/src/tagwidget.h
index d73d343..26d6b41 100644
--- a/src/tagwidget.h
+++ b/src/tagwidget.h
@@ -46,7 +46,7 @@ namespace Baloo {
/**
* Constructor
*/
- explicit TagWidget(QWidget* parent = 0);
+ explicit TagWidget(QWidget* parent = nullptr);
/**
* Destructor
diff --git a/src/widgetfactory.cpp b/src/widgetfactory.cpp
index d38d906..5606d80 100644
--- a/src/widgetfactory.cpp
+++ b/src/widgetfactory.cpp
@@ -100,7 +100,7 @@ static QString toString(const QVariant& value)
QWidget* WidgetFactory::createWidget(const QString& prop, const QVariant& value, QWidget* parent)
{
- QWidget* widget = 0;
+ QWidget* widget = nullptr;
if (prop == QLatin1String("rating")) {
widget = createRatingWidget( value.toInt(), parent );
@@ -213,7 +213,7 @@ QWidget* WidgetFactory::createRatingWidget(int rating, QWidget* parent)
class ValueWidget : public QLabel
{
public:
- explicit ValueWidget(QWidget* parent = 0);
+ explicit ValueWidget(QWidget* parent = nullptr);
virtual QSize sizeHint() const Q_DECL_OVERRIDE;
};
diff --git a/src/widgetfactory.h b/src/widgetfactory.h
index 8363379..9285369 100644
--- a/src/widgetfactory.h
+++ b/src/widgetfactory.h
@@ -40,7 +40,7 @@ namespace Baloo {
{
Q_OBJECT
public:
- explicit WidgetFactory(QObject* parent = 0);
+ explicit WidgetFactory(QObject* parent = nullptr);
virtual ~WidgetFactory();
void setItems(const QStringList& items);
diff --git a/test/metadataconfigwidgetapp.cpp b/test/metadataconfigwidgetapp.cpp
index 0c54fc1..e8bfa74 100644
--- a/test/metadataconfigwidgetapp.cpp
+++ b/test/metadataconfigwidgetapp.cpp
@@ -29,7 +29,7 @@ class FileMetadataWidgetTest : public QWidget
{
Q_OBJECT
public:
- explicit FileMetadataWidgetTest(QWidget* parent = 0, Qt::WindowFlags f = 0);
+ explicit FileMetadataWidgetTest(QWidget* parent = nullptr, Qt::WindowFlags f = {});
private Q_SLOTS:
void slotChooseFiles();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic