Browse Source

Setup parent pointer

Rely on Qt to do the delete, since the parent ownership is setup
correctly.
adaptive-webui-19844
Chocobo1 8 years ago
parent
commit
86e82c71e5
  1. 2
      src/gui/addnewtorrentdialog.cpp
  2. 8
      src/gui/properties/peerlistwidget.cpp
  3. 4
      src/gui/properties/proplistdelegate.cpp
  4. 2
      src/gui/properties/proplistdelegate.h
  5. 2
      src/gui/search/searchlistdelegate.h

2
src/gui/addnewtorrentdialog.cpp

@ -718,7 +718,7 @@ void AddNewTorrentDialog::setupTreeview() @@ -718,7 +718,7 @@ void AddNewTorrentDialog::setupTreeview()
m_contentModel = new TorrentContentFilterModel(this);
connect(m_contentModel->model(), SIGNAL(filteredFilesChanged()), SLOT(updateDiskSpaceLabel()));
ui->contentTreeView->setModel(m_contentModel);
m_contentDelegate = new PropListDelegate();
m_contentDelegate = new PropListDelegate(nullptr);
ui->contentTreeView->setItemDelegate(m_contentDelegate);
connect(ui->contentTreeView, SIGNAL(clicked(const QModelIndex &)), ui->contentTreeView, SLOT(edit(const QModelIndex &)));
connect(ui->contentTreeView, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(displayContentTreeMenu(const QPoint &)));

8
src/gui/properties/peerlistwidget.cpp

@ -67,7 +67,7 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent) @@ -67,7 +67,7 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent)
setSelectionMode(QAbstractItemView::ExtendedSelection);
header()->setStretchLastSection(false);
// List Model
m_listModel = new QStandardItemModel(0, PeerListDelegate::COL_COUNT);
m_listModel = new QStandardItemModel(0, PeerListDelegate::COL_COUNT, this);
m_listModel->setHeaderData(PeerListDelegate::COUNTRY, Qt::Horizontal, tr("Country")); // Country flag column
m_listModel->setHeaderData(PeerListDelegate::IP, Qt::Horizontal, tr("IP"));
m_listModel->setHeaderData(PeerListDelegate::PORT, Qt::Horizontal, tr("Port"));
@ -90,7 +90,7 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent) @@ -90,7 +90,7 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent)
m_listModel->setHeaderData(PeerListDelegate::TOT_UP, Qt::Horizontal, QVariant(Qt::AlignRight | Qt::AlignVCenter), Qt::TextAlignmentRole);
m_listModel->setHeaderData(PeerListDelegate::RELEVANCE, Qt::Horizontal, QVariant(Qt::AlignRight | Qt::AlignVCenter), Qt::TextAlignmentRole);
// Proxy model to support sorting without actually altering the underlying model
m_proxyModel = new PeerListSortModel();
m_proxyModel = new PeerListSortModel(this);
m_proxyModel->setDynamicSortFilter(true);
m_proxyModel->setSourceModel(m_listModel);
m_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
@ -144,12 +144,8 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent) @@ -144,12 +144,8 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent)
PeerListWidget::~PeerListWidget()
{
saveSettings();
delete m_proxyModel;
delete m_listModel;
delete m_listDelegate;
if (m_resolver)
delete m_resolver;
delete m_copyHotkey;
}
void PeerListWidget::displayToggleColumnsMenu(const QPoint&)

4
src/gui/properties/proplistdelegate.cpp

@ -62,8 +62,8 @@ namespace { @@ -62,8 +62,8 @@ namespace {
}
}
PropListDelegate::PropListDelegate(PropertiesWidget *properties, QObject *parent)
: QItemDelegate(parent)
PropListDelegate::PropListDelegate(PropertiesWidget *properties)
: QItemDelegate(properties)
, m_properties(properties)
{
}

2
src/gui/properties/proplistdelegate.h

@ -54,7 +54,7 @@ class PropListDelegate : public QItemDelegate @@ -54,7 +54,7 @@ class PropListDelegate : public QItemDelegate
Q_OBJECT
public:
PropListDelegate(PropertiesWidget *properties = 0, QObject *parent = 0);
PropListDelegate(PropertiesWidget *properties);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
void setEditorData(QWidget *editor, const QModelIndex &index) const;

2
src/gui/search/searchlistdelegate.h

@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
class SearchListDelegate: public QItemDelegate
{
public:
explicit SearchListDelegate(QObject *parent = 0);
explicit SearchListDelegate(QObject *parent);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const;

Loading…
Cancel
Save