[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kompare] /: Use nullptr
From: Friedrich W. H. Kossebau <null () kde ! org>
Date: 2017-10-09 20:34:58
Message-ID: E1e1elO-00069G-9S () code ! kde ! org
[Download RAW message or body]
Git commit b8c46ffa3b51481bfcadbc9e6eef6742c25b1d0e by Friedrich W. H. Kossebau.
Committed on 09/10/2017 at 17:58.
Pushed by kossebau into branch 'master'.
Use nullptr
M +4 -4 kompare_shell.cpp
M +20 -20 komparenavtreepart/komparenavtreepart.cpp
M +18 -18 komparepart/kompare_part.cpp
M +7 -7 komparepart/kompareconnectwidget.cpp
M +2 -2 komparepart/kompareconnectwidget.h
M +20 -20 komparepart/komparelistview.cpp
M +2 -2 komparepart/komparelistview.h
M +1 -1 komparepart/kompareprefdlg.cpp
M +1 -1 komparepart/komparesaveoptionsbase.h
M +1 -1 kompareurldialog.h
M +2 -2 libdialogpages/diffpage.cpp
M +5 -5 libdialogpages/filespage.cpp
M +1 -1 main.cpp
https://commits.kde.org/kompare/b8c46ffa3b51481bfcadbc9e6eef6742c25b1d0e
diff --git a/kompare_shell.cpp b/kompare_shell.cpp
index c8cda3b..dc04825 100644
--- a/kompare_shell.cpp
+++ b/kompare_shell.cpp
@@ -52,8 +52,8 @@ Q_LOGGING_CATEGORY(KOMPARESHELL, "kompareshell")
KompareShell::KompareShell()
: KParts::MainWindow( ),
- m_textViewPart( 0 ),
- m_textViewWidget( 0 ),
+ m_textViewPart(nullptr),
+ m_textViewWidget(nullptr),
m_eventLoopLocker( new QEventLoopLocker() )
{
resize( 800, 480 );
@@ -148,7 +148,7 @@ KompareShell::KompareShell()
KompareShell::~KompareShell()
{
delete m_eventLoopLocker;
- m_eventLoopLocker = 0;
+ m_eventLoopLocker = nullptr;
}
bool KompareShell::queryClose()
@@ -233,7 +233,7 @@ void KompareShell::setupStatusBar()
statusBar()->insertPermanentWidget( ID_N_OF_N_DIFFERENCES, m_differencesLabel, 0);
statusBar()->insertPermanentWidget( ID_N_OF_N_FILES, m_filesLabel, 0);
- m_generalLabel = new KSqueezedTextLabel( "", 0 );
+ m_generalLabel = new KSqueezedTextLabel(QString(), nullptr);
statusBar()->addWidget( m_generalLabel, 1 );
m_generalLabel->setAlignment( Qt::AlignLeft );
}
diff --git a/komparenavtreepart/komparenavtreepart.cpp \
b/komparenavtreepart/komparenavtreepart.cpp index 115d7e8..65cccbc 100644
--- a/komparenavtreepart/komparenavtreepart.cpp
+++ b/komparenavtreepart/komparenavtreepart.cpp
@@ -41,19 +41,19 @@ Q_LOGGING_CATEGORY(KOMPARENAVVIEW, "komparenavview")
KompareNavTreePart::KompareNavTreePart( QWidget* parentWidget, QObject* parent, \
const QVariantList& ) : KParts::ReadOnlyPart( parent ),
- m_splitter( 0 ),
- m_modelList( 0 ),
- m_srcDirTree( 0 ),
- m_destDirTree( 0 ),
- m_fileList( 0 ),
- m_changesList( 0 ),
- m_srcRootItem( 0 ),
- m_destRootItem( 0 ),
- m_selectedModel( 0 ),
- m_selectedDifference( 0 ),
+ m_splitter(nullptr),
+ m_modelList(nullptr),
+ m_srcDirTree(nullptr),
+ m_destDirTree(nullptr),
+ m_fileList(nullptr),
+ m_changesList(nullptr),
+ m_srcRootItem(nullptr),
+ m_destRootItem(nullptr),
+ m_selectedModel(nullptr),
+ m_selectedDifference(nullptr),
m_source( "" ),
m_destination( "" ),
- m_info( 0 )
+ m_info(nullptr)
{
m_splitter = new QSplitter( Qt::Horizontal, parentWidget );
@@ -97,9 +97,9 @@ KompareNavTreePart::KompareNavTreePart( QWidget* parentWidget, \
QObject* parent,
KompareNavTreePart::~KompareNavTreePart()
{
- m_modelList = 0;
- m_selectedModel = 0;
- m_selectedDifference = 0;
+ m_modelList = nullptr;
+ m_selectedModel = nullptr;
+ m_selectedDifference = nullptr;
}
void KompareNavTreePart::slotKompareInfo( struct Kompare::Info* info )
@@ -140,7 +140,7 @@ void KompareNavTreePart::buildTreeInMemory()
return; // avoids a crash on clear()
}
- if ( m_info == 0 )
+ if (!m_info)
{
qCDebug(KOMPARENAVVIEW) << "No Info... weird shit..." ;
return;
@@ -151,7 +151,7 @@ void KompareNavTreePart::buildTreeInMemory()
DiffModel* model;
model = m_modelList->first();
- m_selectedModel = 0L;
+ m_selectedModel = nullptr;
switch ( m_info->mode )
{
@@ -678,7 +678,7 @@ KDirLVI* KDirLVI::findChild( QString dir )
{
// qCDebug(KOMPARENAVVIEW) << "KDirLVI::findChild called with dir = " << dir ;
KDirLVI* child;
- if ( ( child = static_cast<KDirLVI*>(this->child(0)) ) != 0L )
+ if ((child = static_cast<KDirLVI*>(this->child(0))) != nullptr)
{ // has children, check if dir already exists, if so addModel
QTreeWidgetItemIterator it(child);
while (*it) {
@@ -690,7 +690,7 @@ KDirLVI* KDirLVI::findChild( QString dir )
}
}
- return 0L;
+ return nullptr;
}
void KDirLVI::fillFileList( QTreeWidget* fileList, QHash<const Diff2::DiffModel*, \
KFileLVI*>* modelToFileItemDict ) @@ -745,7 +745,7 @@ KDirLVI* KDirLVI::setSelected( \
QString dir ) }
KDirLVI* child = static_cast<KDirLVI*>(this->child(0));
if ( !child )
- return 0L;
+ return nullptr;
QTreeWidgetItemIterator it(child);
while (*it) {
@@ -756,7 +756,7 @@ KDirLVI* KDirLVI::setSelected( QString dir )
++it;
}
- return 0L;
+ return nullptr;
}
KDirLVI::~KDirLVI()
diff --git a/komparepart/kompare_part.cpp b/komparepart/kompare_part.cpp
index 7eca46d..ddfb543 100644
--- a/komparepart/kompare_part.cpp
+++ b/komparepart/kompare_part.cpp
@@ -61,8 +61,8 @@ Q_LOGGING_CATEGORY(KOMPAREPART, "komparepart")
K_PLUGIN_FACTORY( KomparePartFactory, registerPlugin<KomparePart>(); )
-ViewSettings* KomparePart::m_viewSettings = 0L;
-DiffSettings* KomparePart::m_diffSettings = 0L;
+ViewSettings* KomparePart::m_viewSettings = nullptr;
+DiffSettings* KomparePart::m_diffSettings = nullptr;
static KAboutData createAboutData()
{
@@ -84,10 +84,10 @@ KomparePart::KomparePart( QWidget *parentWidget, QObject *parent, \
const QVariant setXMLFile(QStringLiteral("komparepartui.rc"));
if( !m_viewSettings ) {
- m_viewSettings = new ViewSettings( 0 );
+ m_viewSettings = new ViewSettings(nullptr);
}
if( !m_diffSettings ) {
- m_diffSettings = new DiffSettings( 0 );
+ m_diffSettings = new DiffSettings(nullptr);
}
readProperties( KSharedConfig::openConfig().data() );
@@ -292,7 +292,7 @@ bool KomparePart::fetchURL( const QUrl& url, bool addToSource )
QString tempFileName( "" );
// Only in case of error do we set result to false, don't forget!!
bool result = true;
- QTemporaryDir* tmpDir = 0;
+ QTemporaryDir* tmpDir = nullptr;
if ( !url.isLocalFile() )
{
@@ -327,7 +327,7 @@ bool KomparePart::fetchURL( const QUrl& url, bool addToSource )
{
slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be \
downloaded.</qt>", url.toDisplayString() ) ); delete tmpDir;
- tmpDir = 0;
+ tmpDir = nullptr;
result = false;
}
else
@@ -349,7 +349,7 @@ bool KomparePart::fetchURL( const QUrl& url, bool addToSource )
{
qCDebug(KOMPAREPART) << "Yikes, nothing downloaded?";
delete tmpDir;
- tmpDir = 0;
+ tmpDir = nullptr;
tempFileName = "";
result = false;
}
@@ -388,19 +388,19 @@ void KomparePart::cleanUpTemporaryFiles()
qCDebug(KOMPAREPART) << "Cleaning temporary files.";
if ( !m_info.localSource.isEmpty() )
{
- if ( m_info.sourceQTempDir != 0 )
+ if (m_info.sourceQTempDir)
{
delete m_info.sourceQTempDir;
- m_info.sourceQTempDir = 0;
+ m_info.sourceQTempDir = nullptr;
}
m_info.localSource = "";
}
if ( !m_info.localDestination.isEmpty() )
{
- if ( m_info.destinationQTempDir != 0 )
+ if (!m_info.destinationQTempDir)
{
delete m_info.destinationQTempDir;
- m_info.destinationQTempDir = 0;
+ m_info.destinationQTempDir = nullptr;
}
m_info.localDestination = "";
}
@@ -614,7 +614,7 @@ void KomparePart::slotFilePrint()
{
QPrinter printer;
printer.setOrientation( QPrinter::Landscape );
- QPrintDialog* dlg = new QPrintDialog( &printer, 0 );
+ QPrintDialog* dlg = new QPrintDialog(&printer, nullptr);
if ( dlg->exec() == QDialog::Accepted )
{
@@ -885,13 +885,13 @@ void KomparePart::slotShowDiffstats( void )
noOfDiffs = m_modelList->selectedModel() ? \
m_modelList->selectedModel()->differenceCount() : 0;
if ( m_modelList->modelCount() == 0 ) { // no diff loaded yet
- KMessageBox::information( 0L, i18n(
+ KMessageBox::information(nullptr, i18n(
"No diff file, or no 2 files have been diffed. "
"Therefore no stats are available."),
- i18n("Diff Statistics"), QString(), 0 );
+ i18n("Diff Statistics"), QString(), nullptr);
}
else if ( m_modelList->modelCount() == 1 ) { // 1 file in diff, or 2 files compared
- KMessageBox::information( 0L, i18n(
+ KMessageBox::information(nullptr, i18n(
"Statistics:\n"
"\n"
"Old file: %1\n"
@@ -902,9 +902,9 @@ void KomparePart::slotShowDiffstats( void )
"Number of differences: %5",
oldFile, newFile, diffFormat,
noOfHunks, noOfDiffs),
- i18n("Diff Statistics"), QString(), 0 );
+ i18n("Diff Statistics"), QString(), nullptr);
} else { // more than 1 file in diff, or 2 directories compared
- KMessageBox::information( 0L, ki18n(
+ KMessageBox::information(nullptr, ki18n(
"Statistics:\n"
"\n"
"Number of files in diff file: %1\n"
@@ -918,7 +918,7 @@ void KomparePart::slotShowDiffstats( void )
.subs(filesInDiff).subs(diffFormat).subs(oldFile)
.subs(newFile).subs(noOfHunks).subs(noOfDiffs)
.toString(),
- i18n("Diff Statistics"), QString(), 0 );
+ i18n("Diff Statistics"), QString(), nullptr);
}
}
diff --git a/komparepart/kompareconnectwidget.cpp \
b/komparepart/kompareconnectwidget.cpp index 077a9f7..93efd14 100644
--- a/komparepart/kompareconnectwidget.cpp
+++ b/komparepart/kompareconnectwidget.cpp
@@ -104,8 +104,8 @@ void KompareConnectWidgetFrame::mouseReleaseEvent( QMouseEvent *e \
) KompareConnectWidget::KompareConnectWidget( ViewSettings* settings, QWidget* \
parent, const char* name ) : QWidget(parent),
m_settings( settings ),
- m_selectedModel( 0 ),
- m_selectedDifference( 0 )
+ m_selectedModel(nullptr),
+ m_selectedDifference(nullptr)
{
setObjectName(name);
// connect( m_settings, SIGNAL( settingsChanged() ), this, SLOT( \
slotDelayedRepaint() ) ); @@ -116,9 +116,9 @@ \
KompareConnectWidget::KompareConnectWidget( ViewSettings* settings, QWidget* par
KompareConnectWidget::~KompareConnectWidget()
{
- m_settings = 0;
- m_selectedModel = 0;
- m_selectedDifference = 0;
+ m_settings = nullptr;
+ m_selectedModel = nullptr;
+ m_selectedDifference = nullptr;
}
void KompareConnectWidget::slotSetSelection( const DiffModel* model, const \
Difference* diff ) @@ -166,8 +166,8 @@ void KompareConnectWidget::paintEvent( \
QPaintEvent* /* e */ )
KompareSplitter* splitter = static_cast<KompareSplitter*>( parent()->parent() );
int count = splitter->count();
- KompareListView *leftView = count >= 2 ? static_cast<KompareListViewFrame*>( \
splitter->widget(0) )->view() : 0;
- KompareListView *rightView = count >= 2 ? static_cast<KompareListViewFrame*>( \
splitter->widget(1) )->view() : 0; + KompareListView *leftView = count >= 2 ? \
static_cast<KompareListViewFrame*>( splitter->widget(0) )->view() : nullptr; \
+ KompareListView *rightView = count >= 2 ? static_cast<KompareListViewFrame*>( \
splitter->widget(1) )->view() : nullptr;
if ( m_selectedModel && leftView && rightView )
{
diff --git a/komparepart/kompareconnectwidget.h b/komparepart/kompareconnectwidget.h
index 7bc0c6c..572d344 100644
--- a/komparepart/kompareconnectwidget.h
+++ b/komparepart/kompareconnectwidget.h
@@ -40,7 +40,7 @@ class KompareConnectWidget : public QWidget
Q_OBJECT
public:
- KompareConnectWidget( ViewSettings* settings, QWidget* parent, const char* name = 0 \
); + KompareConnectWidget(ViewSettings* settings, QWidget* parent, const char* name = \
nullptr); ~KompareConnectWidget() override;
public slots:
@@ -67,7 +67,7 @@ class KompareConnectWidgetFrame : public QSplitterHandle
{
Q_OBJECT
public:
- KompareConnectWidgetFrame( ViewSettings* settings, KompareSplitter* parent, const \
char* name = 0 ); + KompareConnectWidgetFrame(ViewSettings* settings, \
KompareSplitter* parent, const char* name = nullptr); ~KompareConnectWidgetFrame() \
override;
QSize sizeHint() const override;
diff --git a/komparepart/komparelistview.cpp b/komparepart/komparelistview.cpp
index 978afb8..b6e9bfc 100644
--- a/komparepart/komparelistview.cpp
+++ b/komparepart/komparelistview.cpp
@@ -109,8 +109,8 @@ KompareListView::KompareListView( bool isSource,
m_isSource( isSource ),
m_settings( settings ),
m_scrollId( -1 ),
- m_selectedModel( 0 ),
- m_selectedDifference( 0 )
+ m_selectedModel(nullptr),
+ m_selectedDifference(nullptr)
{
setObjectName( name );
setItemDelegate( new KompareListViewItemDelegate( this ) );
@@ -130,9 +130,9 @@ KompareListView::KompareListView( bool isSource,
KompareListView::~KompareListView()
{
- m_settings = 0;
- m_selectedModel = 0;
- m_selectedDifference = 0;
+ m_settings = nullptr;
+ m_selectedModel = nullptr;
+ m_selectedDifference = nullptr;
}
KompareListViewItem* KompareListView::itemAtIndex( int i )
@@ -144,7 +144,7 @@ int KompareListView::firstVisibleDifference()
{
QTreeWidgetItem* item = itemAt( QPoint( 0, 0 ) );
- if( item == 0 )
+ if( item == nullptr )
{
qCDebug(KOMPAREPART) << "no item at viewport coordinates (0,0)" ;
}
@@ -166,7 +166,7 @@ int KompareListView::lastVisibleDifference()
{
QTreeWidgetItem* item = itemAt( QPoint( 0, visibleHeight() - 1 ) );
- if( item == 0 )
+ if( item == nullptr )
{
qCDebug(KOMPAREPART) << "no item at viewport coordinates (0," << visibleHeight() - \
1 << ")" ; // find last item
@@ -276,7 +276,7 @@ void KompareListView::scrollToId( int id )
{
// qCDebug(KOMPAREPART) << "ScrollToID : Scroll to id : " << id ;
int n = topLevelItemCount();
- KompareListViewItem* item = 0;
+ KompareListViewItem* item = nullptr;
if( n ) {
int i = 1;
for( ; i<n; i++ ) {
@@ -378,7 +378,7 @@ void KompareListView::slotSetSelection( const DiffModel* model, \
const Difference DiffHunkListConstIterator hunkIt = model->hunks()->begin();
DiffHunkListConstIterator hEnd = model->hunks()->end();
- KompareListViewItem* item = 0;
+ KompareListViewItem* item = nullptr;
m_nextPaintOffset = 0;
for ( ; hunkIt != hEnd; ++hunkIt )
@@ -415,10 +415,10 @@ KompareListViewDiffItem* KompareListView::diffItemAt( const \
QPoint& pos ) {
KompareListViewItem* item = static_cast<KompareListViewItem*>( itemAt( pos ) );
if( !item )
- return 0;
+ return nullptr;
switch( item->type() ) {
case KompareListViewItem::Hunk:
- if( item->paintHeight() ) return 0; // no diff item here
+ if( item->paintHeight() ) return nullptr; // no diff item here
// zero height (fake 1 pixel height), so a diff item shines through
return static_cast<KompareListViewDiffItem*>( itemBelow( item ) );
case KompareListViewItem::Line:
@@ -429,7 +429,7 @@ KompareListViewDiffItem* KompareListView::diffItemAt( const \
QPoint& pos ) case KompareListViewItem::Diff:
return static_cast<KompareListViewDiffItem*>( item );
default:
- return 0;
+ return nullptr;
}
}
@@ -627,8 +627,8 @@ void KompareListViewItem::paintCell( QPainter* p, const \
QStyleOptionViewItem& op KompareListViewDiffItem::KompareListViewDiffItem( \
KompareListView* parent, Difference* difference ) : KompareListViewItem( parent, \
Diff ), m_difference( difference ),
- m_sourceItem( 0L ),
- m_destItem( 0L )
+ m_sourceItem(nullptr),
+ m_destItem(nullptr)
{
init();
}
@@ -636,15 +636,15 @@ KompareListViewDiffItem::KompareListViewDiffItem( \
KompareListView* parent, Diffe KompareListViewDiffItem::KompareListViewDiffItem( \
KompareListView* parent, KompareListViewItem* after, Difference* difference ) : \
KompareListViewItem( parent, after, Diff ), m_difference( difference ),
- m_sourceItem( 0L ),
- m_destItem( 0L )
+ m_sourceItem(nullptr),
+ m_destItem(nullptr)
{
init();
}
KompareListViewDiffItem::~KompareListViewDiffItem()
{
- m_difference = 0;
+ m_difference = nullptr;
}
void KompareListViewDiffItem::init()
@@ -681,7 +681,7 @@ int KompareListViewDiffItem::maxHeight()
KompareListViewLineContainerItem::KompareListViewLineContainerItem( \
KompareListViewDiffItem* parent, bool isSource ) : KompareListViewItem( parent, \
Container ),
- m_blankLineItem( 0 ),
+ m_blankLineItem(nullptr),
m_isSource( isSource )
{
// qCDebug(KOMPAREPART) << "isSource ? " << (isSource ? " Yes!" : " No!") ;
@@ -742,7 +742,7 @@ KompareListViewLineItem::KompareListViewLineItem( \
KompareListViewLineContainerIt
KompareListViewLineItem::~KompareListViewLineItem()
{
- m_text = 0;
+ m_text = nullptr;
}
void KompareListViewLineItem::init( int line, DifferenceString* text )
@@ -940,7 +940,7 @@ KompareListViewHunkItem::KompareListViewHunkItem( \
KompareListView* parent, Kompa
KompareListViewHunkItem::~KompareListViewHunkItem()
{
- m_hunk = 0;
+ m_hunk = nullptr;
}
int KompareListViewHunkItem::maxHeight()
diff --git a/komparepart/komparelistview.h b/komparepart/komparelistview.h
index 71b08a9..390237f 100644
--- a/komparepart/komparelistview.h
+++ b/komparepart/komparelistview.h
@@ -51,7 +51,7 @@ class KompareListView : public QTreeWidget
friend class KompareListViewItemDelegate;
public:
- KompareListView( bool isSource, ViewSettings* settings, QWidget* parent, const \
char* name = 0 ); + KompareListView(bool isSource, ViewSettings* settings, QWidget* \
parent, const char* name = nullptr); ~KompareListView() override;
KompareListViewItem* itemAtIndex( int i );
@@ -118,7 +118,7 @@ class KompareListViewFrame : public QFrame
Q_OBJECT
public:
- KompareListViewFrame( bool isSource, ViewSettings* settings, KompareSplitter* \
parent, const char* name = 0 ); + KompareListViewFrame(bool isSource, ViewSettings* \
settings, KompareSplitter* parent, const char* name = nullptr); \
~KompareListViewFrame() override {}; KompareListView* view() { return &m_view; \
};
diff --git a/komparepart/kompareprefdlg.cpp b/komparepart/kompareprefdlg.cpp
index 8da7001..06f3cd1 100644
--- a/komparepart/kompareprefdlg.cpp
+++ b/komparepart/kompareprefdlg.cpp
@@ -30,7 +30,7 @@
// implementation
-KomparePrefDlg::KomparePrefDlg( ViewSettings* viewSets, DiffSettings* diffSets ) : \
KPageDialog( 0 ) +KomparePrefDlg::KomparePrefDlg( ViewSettings* viewSets, \
DiffSettings* diffSets ) : KPageDialog(nullptr) {
setFaceType( KPageDialog::List );
setWindowTitle( i18n( "Preferences" ) );
diff --git a/komparepart/komparesaveoptionsbase.h \
b/komparepart/komparesaveoptionsbase.h index 630aba3..bcc938a 100644
--- a/komparepart/komparesaveoptionsbase.h
+++ b/komparepart/komparesaveoptionsbase.h
@@ -26,7 +26,7 @@ class KompareSaveOptionsBase : public QWidget, public \
Ui::KompareSaveOptionsBase Q_OBJECT
public:
- explicit KompareSaveOptionsBase(QWidget* parent = 0, Qt::WindowFlags fl = 0);
+ explicit KompareSaveOptionsBase(QWidget* parent = nullptr, Qt::WindowFlags fl = \
{}); ~KompareSaveOptionsBase() override;
protected slots:
diff --git a/kompareurldialog.h b/kompareurldialog.h
index dad8dd4..3a61db8 100644
--- a/kompareurldialog.h
+++ b/kompareurldialog.h
@@ -37,7 +37,7 @@ class KompareURLDialog : public KPageDialog
Q_OBJECT
public:
- explicit KompareURLDialog( QWidget *parent= 0, Qt::WindowFlags flags= 0 );
+ explicit KompareURLDialog(QWidget *parent= nullptr, Qt::WindowFlags flags = {});
~KompareURLDialog() override;
QUrl getFirstURL() const;
diff --git a/libdialogpages/diffpage.cpp b/libdialogpages/diffpage.cpp
index 15c83a7..8a55d75 100644
--- a/libdialogpages/diffpage.cpp
+++ b/libdialogpages/diffpage.cpp
@@ -54,7 +54,7 @@ QUrl urlFromArg(const QString& arg)
#endif
}
-DiffPage::DiffPage() : QFrame(), m_ignoreRegExpDialog( 0 )
+DiffPage::DiffPage() : QFrame(), m_ignoreRegExpDialog(nullptr)
{
QVBoxLayout *layout = new QVBoxLayout( this );
m_tabWidget = new QTabWidget( this );
@@ -71,7 +71,7 @@ DiffPage::DiffPage() : QFrame(), m_ignoreRegExpDialog( 0 )
DiffPage::~DiffPage()
{
- m_settings = 0;
+ m_settings = nullptr;
}
void DiffPage::setSettings( DiffSettings* setts )
diff --git a/libdialogpages/filespage.cpp b/libdialogpages/filespage.cpp
index eacae17..027a3d5 100644
--- a/libdialogpages/filespage.cpp
+++ b/libdialogpages/filespage.cpp
@@ -42,7 +42,7 @@ FilesPage::FilesPage() : QFrame()
m_firstURLComboBox = new KUrlComboBox( KUrlComboBox::Both, true, m_firstGB );
m_firstURLComboBox->setMaxItems( 10 );
m_firstURLComboBox->setObjectName( "SourceURLComboBox" );
- m_firstURLRequester = new KUrlRequester( m_firstURLComboBox, 0 );
+ m_firstURLRequester = new KUrlRequester(m_firstURLComboBox, nullptr);
gb1Layout->addWidget( m_firstURLComboBox );
m_firstURLComboBox->setFocus();
@@ -72,7 +72,7 @@ FilesPage::FilesPage() : QFrame()
m_secondURLComboBox = new KUrlComboBox( KUrlComboBox::Both, true, m_secondGB );
m_secondURLComboBox->setMaxItems( 10 );
m_secondURLComboBox->setObjectName( "DestURLComboBox" );
- m_secondURLRequester = new KUrlRequester( m_secondURLComboBox, 0 );
+ m_secondURLRequester = new KUrlRequester(m_secondURLComboBox, nullptr);
gb2Layout->addWidget( m_secondURLComboBox );
button = new QPushButton( "", this );
@@ -115,10 +115,10 @@ FilesPage::FilesPage() : QFrame()
FilesPage::~FilesPage()
{
delete m_firstURLRequester;
- m_firstURLRequester = 0;
+ m_firstURLRequester = nullptr;
delete m_secondURLRequester;
- m_secondURLRequester = 0;
- m_settings = 0;
+ m_secondURLRequester = nullptr;
+ m_settings = nullptr;
}
void FilesPage::open()
diff --git a/main.cpp b/main.cpp
index ebd33d0..7ec56f3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -220,7 +220,7 @@ int main(int argc, char *argv[])
if ( difault )
{
- KompareURLDialog dialog( 0 );
+ KompareURLDialog dialog(nullptr);
dialog.setWindowTitle( i18n("Compare Files or Folders") );
dialog.setFirstGroupBoxTitle( i18n( "Source" ) );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic