Skip to content

Commit 86a5caf

Browse files
committed
Use scoped pointer for Ui in plugins
1 parent 15dbfd5 commit 86a5caf

17 files changed

+26
-82
lines changed

plugins/itemdata/itemdata.cpp

+1-8
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,8 @@ void ItemData::contextMenuEvent(QContextMenuEvent *e)
151151
e->ignore();
152152
}
153153

154-
ItemDataLoader::ItemDataLoader()
155-
: ui(NULL)
156-
{
157-
}
158-
159154
ItemDataLoader::~ItemDataLoader()
160155
{
161-
delete ui;
162156
}
163157

164158
ItemWidget *ItemDataLoader::create(const QModelIndex &index, QWidget *parent) const
@@ -187,8 +181,7 @@ QVariantMap ItemDataLoader::applySettings()
187181

188182
QWidget *ItemDataLoader::createSettingsWidget(QWidget *parent)
189183
{
190-
delete ui;
191-
ui = new Ui::ItemDataSettings;
184+
ui.reset(new Ui::ItemDataSettings);
192185
QWidget *w = new QWidget(parent);
193186
ui->setupUi(w);
194187

plugins/itemdata/itemdata.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "gui/icons.h"
2525

2626
#include <QLabel>
27+
#include <QScopedPointer>
2728

2829
namespace Ui {
2930
class ItemDataSettings;
@@ -58,8 +59,6 @@ class ItemDataLoader : public QObject, public ItemLoaderInterface
5859
Q_INTERFACES(ItemLoaderInterface)
5960

6061
public:
61-
ItemDataLoader();
62-
6362
~ItemDataLoader();
6463

6564
virtual ItemWidget *create(const QModelIndex &index, QWidget *parent) const;
@@ -83,7 +82,7 @@ private slots:
8382

8483
private:
8584
QVariantMap m_settings;
86-
Ui::ItemDataSettings *ui;
85+
QScopedPointer<Ui::ItemDataSettings> ui;
8786
};
8887

8988
#endif // ITEMDATA_H

plugins/itemencrypted/itemencrypted.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void ItemEncrypted::setModelData(QWidget *editor, QAbstractItemModel *model,
117117
}
118118

119119
ItemEncryptedLoader::ItemEncryptedLoader()
120-
: ui(NULL)
120+
: ui()
121121
, m_settings()
122122
, m_gpgProcessStatus(GpgNotRunning)
123123
, m_gpgProcess(NULL)
@@ -127,7 +127,6 @@ ItemEncryptedLoader::ItemEncryptedLoader()
127127
ItemEncryptedLoader::~ItemEncryptedLoader()
128128
{
129129
terminateGpgProcess();
130-
delete ui;
131130
}
132131

133132
ItemWidget *ItemEncryptedLoader::create(const QModelIndex &index, QWidget *parent) const
@@ -150,8 +149,7 @@ QVariantMap ItemEncryptedLoader::applySettings()
150149

151150
QWidget *ItemEncryptedLoader::createSettingsWidget(QWidget *parent)
152151
{
153-
delete ui;
154-
ui = new Ui::ItemEncryptedSettings;
152+
ui.reset(new Ui::ItemEncryptedSettings);
155153
QWidget *w = new QWidget(parent);
156154
ui->setupUi(w);
157155

plugins/itemencrypted/itemencrypted.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "gui/icons.h"
2525

2626
#include <QProcess>
27+
#include <QScopedPointer>
2728
#include <QWidget>
2829

2930
namespace Ui {
@@ -97,7 +98,7 @@ private slots:
9798

9899
void updateUi();
99100

100-
Ui::ItemEncryptedSettings *ui;
101+
QScopedPointer<Ui::ItemEncryptedSettings> ui;
101102
QVariantMap m_settings;
102103

103104
GpgProcessStatus m_gpgProcessStatus;

plugins/itemfakevim/itemfakevim.cpp

+1-8
Original file line numberDiff line numberDiff line change
@@ -531,14 +531,8 @@ QObject *ItemFakeVim::createExternalEditor(const QModelIndex &index, QWidget *pa
531531
return m_childItem->createExternalEditor(index, parent);
532532
}
533533

534-
ItemFakeVimLoader::ItemFakeVimLoader()
535-
: ui(NULL)
536-
{
537-
}
538-
539534
ItemFakeVimLoader::~ItemFakeVimLoader()
540535
{
541-
delete ui;
542536
}
543537

544538
QVariant ItemFakeVimLoader::icon() const
@@ -563,8 +557,7 @@ void ItemFakeVimLoader::loadSettings(const QVariantMap &settings)
563557

564558
QWidget *ItemFakeVimLoader::createSettingsWidget(QWidget *parent)
565559
{
566-
delete ui;
567-
ui = new Ui::ItemFakeVimSettings;
560+
ui.reset(new Ui::ItemFakeVimSettings);
568561
QWidget *w = new QWidget(parent);
569562
ui->setupUi(w);
570563

plugins/itemfakevim/itemfakevim.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ class ItemFakeVimLoader : public QObject, public ItemLoaderInterface
6666
Q_INTERFACES(ItemLoaderInterface)
6767

6868
public:
69-
ItemFakeVimLoader();
70-
7169
~ItemFakeVimLoader();
7270

7371
virtual QString id() const { return "itemfakevim"; }
@@ -91,7 +89,7 @@ class ItemFakeVimLoader : public QObject, public ItemLoaderInterface
9189
private:
9290
bool m_enabled;
9391
QString m_sourceFileName;
94-
Ui::ItemFakeVimSettings *ui;
92+
QScopedPointer<Ui::ItemFakeVimSettings> ui;
9593
};
9694

9795
#endif // ITEMFAKEVIM_H

plugins/itemimage/itemimage.cpp

+1-9
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,8 @@ QObject *ItemImage::createExternalEditor(const QModelIndex &index, QWidget *pare
9999
return cmd.isEmpty() ? NULL : new ItemEditor(data, mime, cmd, parent);
100100
}
101101

102-
ItemImageLoader::ItemImageLoader()
103-
: ui(NULL)
104-
{
105-
}
106-
107102
ItemImageLoader::~ItemImageLoader()
108103
{
109-
delete ui;
110104
}
111105

112106
ItemWidget *ItemImageLoader::create(const QModelIndex &index, QWidget *parent) const
@@ -137,7 +131,6 @@ QStringList ItemImageLoader::formatsToSave() const
137131

138132
QVariantMap ItemImageLoader::applySettings()
139133
{
140-
Q_ASSERT(ui != NULL);
141134
m_settings["max_image_width"] = ui->spinBoxImageWidth->value();
142135
m_settings["max_image_height"] = ui->spinBoxImageHeight->value();
143136
m_settings["image_editor"] = ui->lineEditImageEditor->text();
@@ -147,8 +140,7 @@ QVariantMap ItemImageLoader::applySettings()
147140

148141
QWidget *ItemImageLoader::createSettingsWidget(QWidget *parent)
149142
{
150-
delete ui;
151-
ui = new Ui::ItemImageSettings;
143+
ui.reset(new Ui::ItemImageSettings);
152144
QWidget *w = new QWidget(parent);
153145
ui->setupUi(w);
154146
ui->spinBoxImageWidth->setValue( m_settings.value("max_image_width", 320).toInt() );

plugins/itemimage/itemimage.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "item/itemwidget.h"
2525

2626
#include <QLabel>
27+
#include <QScopedPointer>
2728

2829
namespace Ui {
2930
class ItemImageSettings;
@@ -53,8 +54,6 @@ class ItemImageLoader : public QObject, public ItemLoaderInterface
5354
Q_INTERFACES(ItemLoaderInterface)
5455

5556
public:
56-
ItemImageLoader();
57-
5857
~ItemImageLoader();
5958

6059
virtual ItemWidget *create(const QModelIndex &index, QWidget *parent) const;
@@ -77,7 +76,7 @@ class ItemImageLoader : public QObject, public ItemLoaderInterface
7776

7877
private:
7978
QVariantMap m_settings;
80-
Ui::ItemImageSettings *ui;
79+
QScopedPointer<Ui::ItemImageSettings> ui;
8180
};
8281

8382
#endif // ITEMIMAGE_H

plugins/itemnotes/itemnotes.cpp

+1-8
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,8 @@ void ItemNotes::showToolTip()
273273
QToolTip::showText(toolTipPosition, m_toolTipText, this);
274274
}
275275

276-
ItemNotesLoader::ItemNotesLoader()
277-
: ui(NULL)
278-
{
279-
}
280-
281276
ItemNotesLoader::~ItemNotesLoader()
282277
{
283-
delete ui;
284278
}
285279

286280
QStringList ItemNotesLoader::formatsToSave() const
@@ -298,8 +292,7 @@ QVariantMap ItemNotesLoader::applySettings()
298292

299293
QWidget *ItemNotesLoader::createSettingsWidget(QWidget *parent)
300294
{
301-
delete ui;
302-
ui = new Ui::ItemNotesSettings;
295+
ui.reset(new Ui::ItemNotesSettings);
303296
QWidget *w = new QWidget(parent);
304297
ui->setupUi(w);
305298

plugins/itemnotes/itemnotes.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ class ItemNotesLoader : public QObject, public ItemLoaderInterface
8787
Q_INTERFACES(ItemLoaderInterface)
8888

8989
public:
90-
ItemNotesLoader();
91-
9290
~ItemNotesLoader();
9391

9492
virtual QString id() const { return "itemnotes"; }
@@ -111,7 +109,7 @@ class ItemNotesLoader : public QObject, public ItemLoaderInterface
111109

112110
private:
113111
QVariantMap m_settings;
114-
Ui::ItemNotesSettings *ui;
112+
QScopedPointer<Ui::ItemNotesSettings> ui;
115113
};
116114

117115
#endif // ITEMNOTES_H

plugins/itemsync/itemsync.cpp

+1-10
Original file line numberDiff line numberDiff line change
@@ -1250,20 +1250,12 @@ private slots:
12501250
QMap<QPersistentModelIndex, IndexData> m_indexData;
12511251
};
12521252

1253-
ItemSyncLoader::ItemSyncLoader()
1254-
: ui(NULL)
1255-
, m_settings()
1256-
{
1257-
}
1258-
12591253
ItemSyncLoader::~ItemSyncLoader()
12601254
{
12611255
}
12621256

12631257
QVariantMap ItemSyncLoader::applySettings()
12641258
{
1265-
Q_ASSERT(ui);
1266-
12671259
// Apply settings from tab sync path table.
12681260
QTableWidget *t = ui->tableWidgetSyncTabs;
12691261
QStringList tabPaths;
@@ -1341,8 +1333,7 @@ void setNormalStretchFixedColumns(QTableWidget *table, int normalColumn, int str
13411333

13421334
QWidget *ItemSyncLoader::createSettingsWidget(QWidget *parent)
13431335
{
1344-
delete ui;
1345-
ui = new Ui::ItemSyncSettings;
1336+
ui.reset(new Ui::ItemSyncSettings);
13461337
QWidget *w = new QWidget(parent);
13471338
ui->setupUi(w);
13481339

plugins/itemsync/itemsync.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "gui/icons.h"
2424
#include "item/itemwidget.h"
2525

26+
#include <QScopedPointer>
2627
#include <QWidget>
2728

2829
namespace Ui {
@@ -100,8 +101,6 @@ class ItemSyncLoader : public QObject, public ItemLoaderInterface
100101
Q_INTERFACES(ItemLoaderInterface)
101102

102103
public:
103-
ItemSyncLoader();
104-
105104
~ItemSyncLoader();
106105

107106
virtual QString id() const { return "itemsync"; }
@@ -152,7 +151,7 @@ private slots:
152151

153152
bool loadItems(QAbstractItemModel *model, const QStringList &files);
154153

155-
Ui::ItemSyncSettings *ui;
154+
QScopedPointer<Ui::ItemSyncSettings> ui;
156155
QVariantMap m_settings;
157156
QMap<const QObject*, FileWatcher*> m_watchers;
158157
QMap<QString, QString> m_tabPaths;

plugins/itemtext/itemtext.cpp

+1-9
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,8 @@ void ItemText::onSelectionChanged()
188188
m_copyOnMouseUp = true;
189189
}
190190

191-
ItemTextLoader::ItemTextLoader()
192-
: ui(NULL)
193-
{
194-
}
195-
196191
ItemTextLoader::~ItemTextLoader()
197192
{
198-
delete ui;
199193
}
200194

201195
ItemWidget *ItemTextLoader::create(const QModelIndex &index, QWidget *parent) const
@@ -221,7 +215,6 @@ QStringList ItemTextLoader::formatsToSave() const
221215

222216
QVariantMap ItemTextLoader::applySettings()
223217
{
224-
Q_ASSERT(ui != NULL);
225218
m_settings[optionUseRichText] = ui->checkBoxUseRichText->isChecked();
226219
m_settings[optionMaximumLines] = ui->spinBoxMaxLines->value();
227220
m_settings[optionMaximumHeight] = ui->spinBoxMaxHeight->value();
@@ -230,8 +223,7 @@ QVariantMap ItemTextLoader::applySettings()
230223

231224
QWidget *ItemTextLoader::createSettingsWidget(QWidget *parent)
232225
{
233-
delete ui;
234-
ui = new Ui::ItemTextSettings;
226+
ui.reset(new Ui::ItemTextSettings);
235227
QWidget *w = new QWidget(parent);
236228
ui->setupUi(w);
237229
ui->checkBoxUseRichText->setChecked( m_settings.value(optionUseRichText, true).toBool() );

plugins/itemtext/itemtext.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "gui/icons.h"
2424
#include "item/itemwidget.h"
2525

26+
#include <QScopedPointer>
2627
#include <QTextDocument>
2728
#include <QTextEdit>
2829

@@ -63,8 +64,6 @@ class ItemTextLoader : public QObject, public ItemLoaderInterface
6364
Q_INTERFACES(ItemLoaderInterface)
6465

6566
public:
66-
ItemTextLoader();
67-
6867
~ItemTextLoader();
6968

7069
virtual ItemWidget *create(const QModelIndex &index, QWidget *parent) const;
@@ -85,7 +84,7 @@ class ItemTextLoader : public QObject, public ItemLoaderInterface
8584

8685
private:
8786
QVariantMap m_settings;
88-
Ui::ItemTextSettings *ui;
87+
QScopedPointer<Ui::ItemTextSettings> ui;
8988
};
9089

9190
#endif // ITEMTEXT_H

plugins/itemweb/itemweb.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ void ItemWeb::mouseReleaseEvent(QMouseEvent *e)
162162
}
163163
}
164164

165-
ItemWebLoader::ItemWebLoader()
166-
: ui(NULL)
165+
ItemWebLoader::~ItemWebLoader()
167166
{
168167
}
169168

@@ -189,8 +188,7 @@ QVariantMap ItemWebLoader::applySettings()
189188

190189
QWidget *ItemWebLoader::createSettingsWidget(QWidget *parent)
191190
{
192-
delete ui;
193-
ui = new Ui::ItemWebSettings;
191+
ui.reset(new Ui::ItemWebSettings);
194192
QWidget *w = new QWidget(parent);
195193
ui->setupUi(w);
196194
ui->spinBoxMaxHeight->setValue( m_settings.value(optionMaximumHeight, 0).toInt() );

0 commit comments

Comments
 (0)