summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-07-02 14:25:25 +0200
committerMontel Laurent <[email protected]>2017-07-02 14:25:25 +0200
commit70510362dcdb3895d49fe1b13f24693cb419e0f3 (patch)
tree313bd6d48a0e921e7a6e2c8a1f4c18c4a24fc082
parent0f73f0194e7a1789444769e3bf9c21c5c338a0f8 (diff)
nullptr
-rw-r--r--src/manager/kwalleteditor.cpp4
-rw-r--r--src/manager/kwalleteditor.h2
-rw-r--r--src/manager/walletcontrolwidget.cpp6
3 files changed, 7 insertions, 5 deletions
diff --git a/src/manager/kwalleteditor.cpp b/src/manager/kwalleteditor.cpp
index 77c3f50..61b74ae 100644
--- a/src/manager/kwalleteditor.cpp
+++ b/src/manager/kwalleteditor.cpp
@@ -76,11 +76,11 @@ QAction *KWalletEditor::_alwaysHideContentsAction = nullptr;
RegisterCreateActionsMethod KWalletEditor::_registerCreateActionMethod(&KWalletEditor::createActions);
-KWalletEditor::KWalletEditor(QWidget *parent, const char *name)
+KWalletEditor::KWalletEditor(QWidget *parent, const QString &name)
: QWidget(parent), _displayedItem(0), _actionCollection(nullptr), _alwaysShowContents(false)
{
setupUi(this);
- setObjectName(QLatin1String(name));
+ setObjectName(name);
_newWallet = false;
_splitter->setStretchFactor(0, 1);
_splitter->setStretchFactor(1, 2);
diff --git a/src/manager/kwalleteditor.h b/src/manager/kwalleteditor.h
index f7736cb..25d7635 100644
--- a/src/manager/kwalleteditor.h
+++ b/src/manager/kwalleteditor.h
@@ -41,7 +41,7 @@ class KWalletEditor : public QWidget, public Ui::WalletWidget
Q_OBJECT
public:
- KWalletEditor(QWidget *parent, const char *name = 0);
+ explicit KWalletEditor(QWidget *parent, const QString &name = QString());
virtual ~KWalletEditor();
void setWallet(KWallet::Wallet *wallet, bool isPath = false);
diff --git a/src/manager/walletcontrolwidget.cpp b/src/manager/walletcontrolwidget.cpp
index 705cf4b..65fab5f 100644
--- a/src/manager/walletcontrolwidget.cpp
+++ b/src/manager/walletcontrolwidget.cpp
@@ -92,12 +92,14 @@ void WalletControlWidget::onSetupWidget()
if (_walletEditor) {
_walletEditor->setVisible(false);
- delete _walletEditor, _walletEditor = nullptr;
+ delete _walletEditor;
+ _walletEditor = nullptr;
}
if (_applicationsManager) {
_applicationsManager->setVisible(false);
- delete _applicationsManager, _applicationsManager = nullptr;
+ delete _applicationsManager;
+ _applicationsManager = nullptr;
}
_changePassword->setEnabled(false);
_stateLabel->setText(i18n("The wallet is currently closed"));