[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [krename] src: Use nullptr
From: Heiko Becker <null () kde ! org>
Date: 2017-10-22 16:26:35
Message-ID: E1e6J59-0004a3-K9 () code ! kde ! org
[Download RAW message or body]
Git commit b6413d6937e3bc7f72ba4fe303a23ae71ba7dfa9 by Heiko Becker.
Committed on 22/10/2017 at 16:24.
Pushed by heikobecker into branch 'master'.
Use nullptr
M +5 -5 src/batchrenamer.cpp
M +1 -1 src/datetimeplugin.cpp
M +1 -1 src/exiv2plugin.cpp
M +1 -1 src/firststartdlg.h
M +4 -4 src/fontplugin.cpp
M +1 -1 src/insertpartfilenamedlg.h
M +1 -1 src/krenamefile.cpp
M +4 -4 src/krenameimpl.cpp
M +2 -2 src/krenamelistview.cpp
M +3 -3 src/krenamemodel.cpp
M +1 -1 src/krenametokensorter.cpp
M +2 -2 src/krenamewindow.cpp
M +1 -1 src/krenamewindow.h
M +1 -1 src/numberdialog.h
M +1 -1 src/permissionsplugin.cpp
M +4 -4 src/pluginloader.cpp
M +1 -1 src/previewlist.cpp
M +1 -1 src/progressdialog.cpp
M +2 -2 src/progressdialog.h
M +1 -1 src/replacedialog.h
M +1 -1 src/richtextitemdelegate.h
M +3 -3 src/scriptplugin.cpp
M +1 -1 src/selectionsafelineedit.h
M +1 -1 src/startupinfo.h
M +2 -2 src/threadedlister.cpp
M +1 -1 src/tokenhelpdialog.cpp
M +1 -1 src/tokenhelpdialog.h
M +1 -1 src/tokensortmodedialog.h
https://commits.kde.org/krename/b6413d6937e3bc7f72ba4fe303a23ae71ba7dfa9
diff --git a/src/batchrenamer.cpp b/src/batchrenamer.cpp
index 5f77084..800c42c 100644
--- a/src/batchrenamer.cpp
+++ b/src/batchrenamer.cpp
@@ -103,7 +103,7 @@ static int getNextToken( const QString & text, QString & token, \
int pos = 0 ) }
BatchRenamer::BatchRenamer()
- : m_index( 0 ), m_step( 1 ), m_files( NULL ), m_renameMode( eRenameMode_Rename )
+ : m_index( 0 ), m_step( 1 ), m_files( nullptr ), m_renameMode( \
eRenameMode_Rename ) {
m_counter_index = 0;
m_reset = false;
@@ -149,7 +149,7 @@ void BatchRenamer::processFilenames()
// Let's run the plugins that change the final filename,
// i.e the encodingsplugin
int errors = 0;
- QString name = executePlugin( i, (*m_files)[i].dstFilename(), \
ePluginType_Filename, errors, NULL ); + QString name = executePlugin( i, \
(*m_files)[i].dstFilename(), ePluginType_Filename, errors, nullptr ); if( \
!name.isNull() ) (*m_files)[i].setDstFilename( name );
@@ -235,7 +235,7 @@ void BatchRenamer::processFiles( ProgressDialog* p )
createMissingSubDirs( (*m_files)[i], p );
KIO::JobFlags flags = (m_overwrite ? KIO::Overwrite : KIO::DefaultFlags) | \
KIO::HideProgressInfo;
- KIO::Job* job = NULL;
+ KIO::Job* job = nullptr;
const QUrl &srcUrl = (*m_files)[i].srcUrl();
if( srcUrl == dstUrl )
{
@@ -393,7 +393,7 @@ void BatchRenamer::undoFiles( ProgressDialog* p )
break;
KIO::JobFlags flags = (m_overwrite ? KIO::Overwrite : KIO::DefaultFlags) | \
KIO::HideProgressInfo;
- KIO::Job* job = NULL;
+ KIO::Job* job = nullptr;
switch( m_renameMode )
{
default:
@@ -654,7 +654,7 @@ QString BatchRenamer::executePlugin( int index, const QString & \
filenameOrPath, if( ! ret.isEmpty() )
{
// An error occurred -> report it
- if( p != NULL )
+ if( p != nullptr )
p->error( ret );
++errorCount;
}
diff --git a/src/datetimeplugin.cpp b/src/datetimeplugin.cpp
index 9e4fc63..7b9c44f 100644
--- a/src/datetimeplugin.cpp
+++ b/src/datetimeplugin.cpp
@@ -36,7 +36,7 @@
#include <sys/stat.h>
DateTimePlugin::DateTimePlugin( PluginLoader* loader )
- : QObject( NULL ), Plugin( loader )
+ : QObject( nullptr ), Plugin( loader )
{
m_widget = new Ui::DateTimePluginWidget();
}
diff --git a/src/exiv2plugin.cpp b/src/exiv2plugin.cpp
index 6c69977..5076c08 100644
--- a/src/exiv2plugin.cpp
+++ b/src/exiv2plugin.cpp
@@ -396,7 +396,7 @@ QString Exiv2Plugin::processFile( BatchRenamer* b, int index, \
const QString & fi try
{
Image::AutoPtr image = Exiv2::ImageFactory::open( strFilename );
- if( image.get() != NULL && image->good() )
+ if( image.get() != nullptr && image->good() )
{
image->readMetadata();
diff --git a/src/firststartdlg.h b/src/firststartdlg.h
index 6162bc2..3429403 100644
--- a/src/firststartdlg.h
+++ b/src/firststartdlg.h
@@ -35,7 +35,7 @@ class QDialogButtonBox;
*/
class FirstStartDlg : public QDialog {
public:
- explicit FirstStartDlg( QWidget* parent = NULL );
+ explicit FirstStartDlg( QWidget* parent = nullptr );
/**
* @returns the selected Gui Mode
diff --git a/src/fontplugin.cpp b/src/fontplugin.cpp
index 17cc885..16daa9c 100644
--- a/src/fontplugin.cpp
+++ b/src/fontplugin.cpp
@@ -46,14 +46,14 @@ FontPlugin::FontPlugin( PluginLoader* loader )
if( error )
{
qDebug("Freetype initialization error %i.", error );
- m_library = NULL;
+ m_library = nullptr;
}
}
FontPlugin::~FontPlugin()
{
FT_Done_FreeType( m_library );
- m_library = NULL;
+ m_library = nullptr;
}
@@ -79,12 +79,12 @@ QString FontPlugin::processFile( BatchRenamer* b, int index, \
const QString & fil
if ( error == FT_Err_Unknown_File_Format )
{
- face = NULL;
+ face = nullptr;
result = QString("Unknown font file format error: %1").arg(error);
}
else if ( error )
{
- face = NULL;
+ face = nullptr;
result = QString("Unknown error: %1.").arg(error);
}
else
diff --git a/src/insertpartfilenamedlg.h b/src/insertpartfilenamedlg.h
index de3e27c..d9a8e4e 100644
--- a/src/insertpartfilenamedlg.h
+++ b/src/insertpartfilenamedlg.h
@@ -28,7 +28,7 @@ class InsertPartFilenameDlg : public QDialog {
Q_OBJECT
public:
- explicit InsertPartFilenameDlg( const QString & filename, QWidget* parent = NULL \
); + explicit InsertPartFilenameDlg( const QString & filename, QWidget* parent = \
nullptr );
/**
* \returns the command to insert a substring of the original
diff --git a/src/krenamefile.cpp b/src/krenamefile.cpp
index 0146e81..1739696 100644
--- a/src/krenamefile.cpp
+++ b/src/krenamefile.cpp
@@ -56,7 +56,7 @@ private:
static KRenamePreviewProvider* s_instance;
};
-KRenamePreviewProvider* KRenamePreviewProvider::s_instance = NULL;
+KRenamePreviewProvider* KRenamePreviewProvider::s_instance = nullptr;
const int KRenameFile::DEFAULT_ICON_SIZE = 64;
diff --git a/src/krenameimpl.cpp b/src/krenameimpl.cpp
index 44705d6..dd239fd 100644
--- a/src/krenameimpl.cpp
+++ b/src/krenameimpl.cpp
@@ -102,7 +102,7 @@ QWidget* KRenameImpl::launch(const QRect & rect, const \
KRenameFile::List & list, // WELCOME TO KRENAME
}
- KRenameWindow* w = new KRenameWindow( NULL );
+ KRenameWindow* w = new KRenameWindow( nullptr );
//KRenameImpl* impl = new KRenameImpl( w, list );
new KRenameImpl( w, list, commandLine );
// Windows shows KRename otherwise outside of the visible
@@ -602,8 +602,8 @@ void KRenameImpl::slotStart()
saveConfig();
// Make sure the GUI will not delete our models
- m_window->setModel( NULL );
- m_window->setPreviewModel( NULL );
+ m_window->setModel( nullptr );
+ m_window->setPreviewModel( nullptr );
// show the progress dialog
progress->show();
@@ -614,7 +614,7 @@ void KRenameImpl::slotStart()
//delete m_window;
//m_window = NULL;
m_window->hide();
- m_window = NULL;
+ m_window = nullptr;
// Process files with additional properties which were not
// necessary or available in the preview
diff --git a/src/krenamelistview.cpp b/src/krenamelistview.cpp
index 41bf466..10ddc5e 100644
--- a/src/krenamelistview.cpp
+++ b/src/krenamelistview.cpp
@@ -22,7 +22,7 @@
KRenameListView::KRenameListView(QWidget* parent)
: QListView(parent),
- m_label(NULL)
+ m_label(nullptr)
{
}
@@ -39,7 +39,7 @@ void KRenameListView::slotUpdateCount()
void KRenameListView::positionLabel()
{
- if( m_label == NULL )
+ if( m_label == nullptr )
{
return;
}
diff --git a/src/krenamemodel.cpp b/src/krenamemodel.cpp
index 6284462..4a20371 100644
--- a/src/krenamemodel.cpp
+++ b/src/krenamemodel.cpp
@@ -158,7 +158,7 @@ bool KRenameModel::dropMimeData(const QMimeData *data,
while( it != dirs.constEnd() )
{
- ThreadedLister* thl = new ThreadedLister( *it, NULL, this );
+ ThreadedLister* thl = new ThreadedLister( *it, nullptr, this );
connect(thl, &ThreadedLister::listerDone,
this, &KRenameModel::slotListerDone);
@@ -267,7 +267,7 @@ void KRenameModel::gotPreview (const KFileItem &item, const \
QPixmap &preview)
static_cast<const \
KRenameFile*>(item.extraData(KRenameFile::EXTRA_DATA_KEY));
*/
- KRenameFile* file = NULL;
+ KRenameFile* file = nullptr;
// TODO: Find a more optimal "search algorithm" ....
KRenameFile::List::iterator it = m_vector->begin();
while( it != m_vector->end() )
@@ -282,7 +282,7 @@ void KRenameModel::gotPreview (const KFileItem &item, const \
QPixmap &preview) }
//it = find( m_vector->begin(), m_vector->end(), item );
- if( file != NULL ) // && file->fileItem() == item )
+ if( file != nullptr ) // && file->fileItem() == item )
{
file->setIcon( preview );
}
diff --git a/src/krenametokensorter.cpp b/src/krenametokensorter.cpp
index e5991c1..3b3335e 100644
--- a/src/krenametokensorter.cpp
+++ b/src/krenametokensorter.cpp
@@ -156,7 +156,7 @@ bool KRenameTokenSorter::operator()( const KRenameFile & file1, \
const KRenameFil QString KRenameTokenSorter::processString( int index ) const
{
QString ret = m_token;
- if( m_plugin != NULL )
+ if( m_plugin != nullptr )
{
ret = m_plugin->processFile( m_renamer, index, ret, ePluginType_Token );
}
diff --git a/src/krenamewindow.cpp b/src/krenamewindow.cpp
index 0f35b48..05b3615 100644
--- a/src/krenamewindow.cpp
+++ b/src/krenamewindow.cpp
@@ -62,7 +62,7 @@ static const KRenameWindow::TGuiMode tAdvancedMode = {
KRenameWindow::KRenameWindow( QWidget* parent )
: KMainWindow( parent ),
- m_curPage( 0 ), m_guiMode( NULL ),
+ m_curPage( 0 ), m_guiMode( nullptr ),
m_fileCount( 0 )
{
QWidget* center = new QWidget();
@@ -1199,7 +1199,7 @@ void KRenameWindow::blockSignalsRecursive( QObject* obj, bool b \
)
QList<QObject*> list = obj->children();
QList<QObject*>::iterator it = list.begin();
- QObject* o = NULL;
+ QObject* o = nullptr;
while( it != list.end() )
{
diff --git a/src/krenamewindow.h b/src/krenamewindow.h
index 9df11c4..af31080 100644
--- a/src/krenamewindow.h
+++ b/src/krenamewindow.h
@@ -59,7 +59,7 @@ class KRenameWindow : public KMainWindow {
friend class KRenameImpl;
public:
- explicit KRenameWindow( QWidget* parent = NULL );
+ explicit KRenameWindow( QWidget* parent = nullptr );
~KRenameWindow();
diff --git a/src/numberdialog.h b/src/numberdialog.h
index f14d354..e360eab 100644
--- a/src/numberdialog.h
+++ b/src/numberdialog.h
@@ -35,7 +35,7 @@ class QDialogButtonBox;
class NumberDialog : public QDialog {
Q_OBJECT
public:
- NumberDialog( int start, int step, bool reset, QList<int> skip, QWidget* parent \
= NULL ); + NumberDialog( int start, int step, bool reset, QList<int> skip, \
QWidget* parent = nullptr );
/**
* @returns the start index the user has selected
diff --git a/src/permissionsplugin.cpp b/src/permissionsplugin.cpp
index def1197..781bfdf 100644
--- a/src/permissionsplugin.cpp
+++ b/src/permissionsplugin.cpp
@@ -39,7 +39,7 @@
#define MAXENTRIES 1000
PermissionsPlugin::PermissionsPlugin( PluginLoader* loader )
- : QObject( NULL ), Plugin( loader ), m_curPermission( S_IRUSR | S_IWUSR | \
S_IRGRP ) + : QObject( nullptr ), Plugin( loader ), m_curPermission( S_IRUSR | \
S_IWUSR | S_IRGRP ) {
m_widget = new Ui::PermissionsPluginWidget();
diff --git a/src/pluginloader.cpp b/src/pluginloader.cpp
index b7aa0d2..9884c78 100644
--- a/src/pluginloader.cpp
+++ b/src/pluginloader.cpp
@@ -47,7 +47,7 @@
# include "fontplugin.h"
#endif // HAVE_FREETYPE
-PluginLoader* PluginLoader::s_instance = NULL;
+PluginLoader* PluginLoader::s_instance = nullptr;
PluginLoader* PluginLoader::Instance()
{
@@ -96,8 +96,8 @@ Plugin* PluginLoader::findPlugin( const QString & token )
// add typos to the cache, too:
// So that we find immediately that this key is not supported.
- m_tokenCache.insert( lower, NULL );
- return NULL;
+ m_tokenCache.insert( lower, nullptr );
+ return nullptr;
}
Plugin* PluginLoader::findPluginByName( const QString & name )
@@ -112,7 +112,7 @@ Plugin* PluginLoader::findPluginByName( const QString & name )
++it;
}
- return NULL;
+ return nullptr;
}
void PluginLoader::clear()
diff --git a/src/previewlist.cpp b/src/previewlist.cpp
index 30d7438..35e3bb3 100644
--- a/src/previewlist.cpp
+++ b/src/previewlist.cpp
@@ -25,7 +25,7 @@
#include <QPointer>
PreviewList::PreviewList( QWidget* parent )
- : QTreeView( parent ), m_model( NULL )
+ : QTreeView( parent ), m_model( nullptr )
{
m_menu = new QMenu( "KRename", this ); // we need any text here so that we have \
a title
m_menu->addAction( i18n("&Change filename manually..."), this, \
SLOT(slotManually()), QKeySequence("F2") );
diff --git a/src/progressdialog.cpp b/src/progressdialog.cpp
index 53d0b10..c7bb814 100644
--- a/src/progressdialog.cpp
+++ b/src/progressdialog.cpp
@@ -26,7 +26,7 @@
#include <krun.h>
ProgressDialog::ProgressDialog( ESplitMode eSplitMode, unsigned int dot, QWidget* \
parent )
- : QDialog( parent ), m_canceled( false ), m_renamer( NULL ), m_eSplitMode( \
eSplitMode ), m_dot( dot ) + : QDialog( parent ), m_canceled( false ), m_renamer( \
nullptr ), m_eSplitMode( eSplitMode ), m_dot( dot ) {
m_widget.setupUi( this );
diff --git a/src/progressdialog.h b/src/progressdialog.h
index a942ad6..feedf27 100644
--- a/src/progressdialog.h
+++ b/src/progressdialog.h
@@ -30,7 +30,7 @@ class ProgressDialog : public QDialog {
Q_OBJECT
public:
- ProgressDialog( ESplitMode eSplitMode, unsigned int dot, QWidget* parent = NULL \
); + ProgressDialog( ESplitMode eSplitMode, unsigned int dot, QWidget* parent = \
nullptr );
/** Set the destination of the files
* so that the user can easily open a file browser
@@ -74,7 +74,7 @@ class ProgressDialog : public QDialog {
* @param text message
* @param pixmap an optional icon
*/
- void print( const QString & text, const QString & pixmap = NULL );
+ void print( const QString & text, const QString & pixmap = nullptr );
/** Print an error message to the user
*
diff --git a/src/replacedialog.h b/src/replacedialog.h
index af6e38c..6e572c5 100644
--- a/src/replacedialog.h
+++ b/src/replacedialog.h
@@ -32,7 +32,7 @@ class QTableWidgetItem;
class ReplaceDialog : public QDialog {
Q_OBJECT
public:
- explicit ReplaceDialog( const QList<TReplaceItem> & items, QWidget* parent = \
NULL ); + explicit ReplaceDialog( const QList<TReplaceItem> & items, QWidget* \
parent = nullptr );
QList<TReplaceItem> replaceList() const;
diff --git a/src/richtextitemdelegate.h b/src/richtextitemdelegate.h
index e5e838d..3606215 100644
--- a/src/richtextitemdelegate.h
+++ b/src/richtextitemdelegate.h
@@ -25,7 +25,7 @@ class QTextDocument;
class RichTextItemDelegate : public QItemDelegate {
public:
- explicit RichTextItemDelegate(QObject* parent = NULL);
+ explicit RichTextItemDelegate(QObject* parent = nullptr);
virtual ~RichTextItemDelegate() { }
virtual void paint (QPainter* painter, const QStyleOptionViewItem& option, const \
QModelIndex& index ) const;
diff --git a/src/scriptplugin.cpp b/src/scriptplugin.cpp
index aa90053..b2f4fd2 100644
--- a/src/scriptplugin.cpp
+++ b/src/scriptplugin.cpp
@@ -55,7 +55,7 @@ enum EVarType {
ScriptPlugin::ScriptPlugin( PluginLoader* loader )
: QObject(),
- Plugin( loader ), m_parent( NULL )
+ Plugin( loader ), m_parent( nullptr )
{
m_name = i18n("JavaScript Plugin");
m_icon = "applications-development";
@@ -104,7 +104,7 @@ QString ScriptPlugin::processFile( BatchRenamer* b, int index,
// Make sure definitions are executed first
script = definitions + '\n' + script;
- KJSResult result = m_interpreter->evaluate( script, NULL );
+ KJSResult result = m_interpreter->evaluate( script, nullptr );
if( result.isException() )
{
qDebug( "JavaScript Error: %s", result.errorMessage().toUtf8().data() );
@@ -258,7 +258,7 @@ void ScriptPlugin::slotAdd()
QString script = name + " = " + value + ';';
KJSInterpreter interpreter;
- KJSResult result = m_interpreter->evaluate( script, NULL );
+ KJSResult result = m_interpreter->evaluate( script, nullptr );
if( result.isException() )
{
KMessageBox::error( m_parent,
diff --git a/src/selectionsafelineedit.h b/src/selectionsafelineedit.h
index 71ccee4..0c65852 100644
--- a/src/selectionsafelineedit.h
+++ b/src/selectionsafelineedit.h
@@ -30,7 +30,7 @@ public:
*
* @param parent parent widget
*/
- explicit SelectionSafeLineEdit( QWidget* parent = NULL )
+ explicit SelectionSafeLineEdit( QWidget* parent = nullptr )
: QLineEdit( parent )
{
diff --git a/src/startupinfo.h b/src/startupinfo.h
index 51e5ba3..15a5f30 100644
--- a/src/startupinfo.h
+++ b/src/startupinfo.h
@@ -33,7 +33,7 @@ class StartUpInfo : public QFrame {
Q_OBJECT
public:
- explicit StartUpInfo(QWidget* parent = NULL);
+ explicit StartUpInfo(QWidget* parent = nullptr);
virtual ~StartUpInfo();
Q_SIGNALS:
diff --git a/src/threadedlister.cpp b/src/threadedlister.cpp
index 2a2be09..41c3a33 100644
--- a/src/threadedlister.cpp
+++ b/src/threadedlister.cpp
@@ -29,7 +29,7 @@
QMutex ThreadedLister::s_mutex;
ThreadedLister::ThreadedLister( const QUrl &dirname, QWidget* cache, KRenameModel* \
model )
- : QObject( NULL ), m_dirname( dirname ), m_cache( cache ), m_model( model )
+ : QObject( nullptr ), m_dirname( dirname ), m_cache( cache ), m_model( model )
{
m_listHiddenFiles = false;
m_listRecursive = false;
@@ -61,7 +61,7 @@ void ThreadedLister::run()
}
s_mutex.unlock();
- KIO::ListJob* job = NULL; // Will delete itself automatically
+ KIO::ListJob* job = nullptr; // Will delete itself automatically
KIO::JobFlags flags = KIO::HideProgressInfo;
if( m_listRecursive )
job = KIO::listRecursive( m_dirname, flags, m_listHiddenFiles );
diff --git a/src/tokenhelpdialog.cpp b/src/tokenhelpdialog.cpp
index d156992..d22a385 100644
--- a/src/tokenhelpdialog.cpp
+++ b/src/tokenhelpdialog.cpp
@@ -297,7 +297,7 @@ void TokenHelpDialog::slotUpdatePreview()
return;
int index = m_widget.comboPreview->currentIndex();
- if( index >= 0 && m_widget.listCategories->currentItem() != NULL )
+ if( index >= 0 && m_widget.listCategories->currentItem() != nullptr )
{
QString name = m_widget.listCategories->currentItem()->text(0);
diff --git a/src/tokenhelpdialog.h b/src/tokenhelpdialog.h
index d410179..abc7334 100644
--- a/src/tokenhelpdialog.h
+++ b/src/tokenhelpdialog.h
@@ -34,7 +34,7 @@ class TokenHelpDialog : public QDialog {
Q_OBJECT
public:
TokenHelpDialog( KRenameModel* model, BatchRenamer* renamer,
- QLineEdit* edit, QWidget* parent = NULL );
+ QLineEdit* edit, QWidget* parent = nullptr );
~TokenHelpDialog();
diff --git a/src/tokensortmodedialog.h b/src/tokensortmodedialog.h
index 90911d0..dae50c2 100644
--- a/src/tokensortmodedialog.h
+++ b/src/tokensortmodedialog.h
@@ -29,7 +29,7 @@
class TokenSortModeDialog : public QDialog {
Q_OBJECT
public:
- explicit TokenSortModeDialog( KRenameTokenSorter::ESimpleSortMode eSortMode, \
QWidget* parent = NULL ); + explicit TokenSortModeDialog( \
KRenameTokenSorter::ESimpleSortMode eSortMode, QWidget* parent = nullptr );
/**
* Get the currently selected sort mode.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic