aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/actioneditor
diff options
context:
space:
mode:
authorGravatar Alexey Sokolov2016-04-30 18:23:42 +0100
committerGravatar Alexey Sokolov2016-04-30 18:50:44 +0100
commit505d0768f8392e3c4775425dd97f41e1c829ef44 (patch)
tree55dfa35f2e180b4186baf00ffbfd2ee38c0f1c18 /src/modules/actioneditor
parentUpdate my clang-format to 3.8.0 (diff)
downloadKVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.tar.gz
KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.tar.bz2
KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.zip
Apply clang-tidy: modernize-use-nullptr
Diffstat (limited to 'src/modules/actioneditor')
-rw-r--r--src/modules/actioneditor/ActionEditor.cpp20
-rw-r--r--src/modules/actioneditor/libkviactioneditor.cpp8
2 files changed, 14 insertions, 14 deletions
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 925061a31..29e5fa174 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -94,7 +94,7 @@ SingleActionEditor::SingleActionEditor(QWidget * par, ActionEditor * ed)
: QWidget(par)
{
m_pActionEditor = ed;
- m_pActionData = 0;
+ m_pActionData = nullptr;
QGridLayout * g = new QGridLayout(this);
@@ -650,8 +650,8 @@ ActionEditor::ActionEditor(QWidget * par)
m_pSingleActionEditor = new SingleActionEditor(m_pSplitter, this);
- ActionEditorTreeWidgetItem * last = 0;
- ActionEditorTreeWidgetItem * first = 0;
+ ActionEditorTreeWidgetItem * last = nullptr;
+ ActionEditorTreeWidgetItem * first = nullptr;
KviPointerHashTableIterator<QString, KviAction> it(*(KviActionManager::instance()->actions()));
while(KviAction * a = it.current())
@@ -668,7 +668,7 @@ ActionEditor::ActionEditor(QWidget * par)
a->smallIconId(),
a->flags(),
a->keySequence(),
- 0);
+ nullptr);
ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget, ad);
ad->m_pItem = lvi;
if(ad->m_szName == g_szLastEditedAction)
@@ -689,7 +689,7 @@ ActionEditor::ActionEditor(QWidget * par)
}
else
{
- currentItemChanged(0, 0);
+ currentItemChanged(nullptr, nullptr);
}
}
@@ -765,7 +765,7 @@ void ActionEditor::deleteActions()
for(ActionEditorTreeWidgetItem * i = l.first(); i; i = l.next())
{
if(m_pSingleActionEditor->actionData() == i->actionData())
- m_pSingleActionEditor->setActionData(0);
+ m_pSingleActionEditor->setActionData(nullptr);
delete i;
}
}
@@ -807,7 +807,7 @@ void ActionEditor::newAction()
QString(),
0,
QString(),
- 0);
+ nullptr);
ActionEditorTreeWidgetItem * lvi = new ActionEditorTreeWidgetItem(m_pTreeWidget, ad);
ad->m_pItem = lvi;
@@ -835,7 +835,7 @@ void ActionEditor::currentItemChanged(QTreeWidgetItem * i, QTreeWidgetItem *)
ActionEditorTreeWidgetItem * it = (ActionEditorTreeWidgetItem *)i;
if(!it)
{
- m_pSingleActionEditor->setActionData(0);
+ m_pSingleActionEditor->setActionData(nullptr);
m_pDeleteActionsButton->setEnabled(false);
m_pExportActionsButton->setEnabled(false);
return;
@@ -879,7 +879,7 @@ void ActionEditor::commit()
}
ActionEditorWindow::ActionEditorWindow()
- : KviWindow(KviWindow::ScriptEditor, "actioneditor", 0)
+ : KviWindow(KviWindow::ScriptEditor, "actioneditor", nullptr)
{
g_pActionEditorWindow = this;
setFixedCaption(__tr2qs_ctx("Action Editor", "editor"));
@@ -911,7 +911,7 @@ ActionEditorWindow::ActionEditorWindow()
ActionEditorWindow::~ActionEditorWindow()
{
- g_pActionEditorWindow = 0;
+ g_pActionEditorWindow = nullptr;
}
void ActionEditorWindow::okClicked()
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index a83450a03..a9da1c6c5 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -28,7 +28,7 @@
#include "KviLocale.h"
#include "KviMainWindow.h"
-ActionEditorWindow * g_pActionEditorWindow = 0;
+ActionEditorWindow * g_pActionEditorWindow = nullptr;
/*
@doc: actioneditor.open
@@ -59,20 +59,20 @@ static bool actioneditor_kvs_cmd_open(KviKvsModuleCommandCall *)
static bool actioneditor_module_init(KviModule * m)
{
KVSM_REGISTER_SIMPLE_COMMAND(m, "open", actioneditor_kvs_cmd_open);
- g_pActionEditorWindow = 0;
+ g_pActionEditorWindow = nullptr;
return true;
}
static bool actioneditor_module_can_unload(KviModule *)
{
- return (g_pActionEditorWindow == 0);
+ return (g_pActionEditorWindow == nullptr);
}
static bool actioneditor_module_cleanup(KviModule *)
{
if(g_pActionEditorWindow && g_pMainWindow)
g_pMainWindow->closeWindow(g_pActionEditorWindow);
- g_pActionEditorWindow = 0;
+ g_pActionEditorWindow = nullptr;
return true;
}