From e78c895e352c176fa33c8da6cb0d09438c61dc24 Mon Sep 17 00:00:00 2001 From: Shinya Kitaoka Date: Apr 20 2016 01:23:26 +0000 Subject: remove s --- diff --git a/toonz/sources/toonz/batchserversviewer.cpp b/toonz/sources/toonz/batchserversviewer.cpp index a71e146..8290dca 100644 --- a/toonz/sources/toonz/batchserversviewer.cpp +++ b/toonz/sources/toonz/batchserversviewer.cpp @@ -32,7 +32,7 @@ public: //----------------------------------------------------------------------------- FarmServerListView::FarmServerListView(QWidget *parent) - : QListWidget(parent), m_menu(0) + : QListWidget(parent) { setFrameStyle(QFrame::StyledPanel); } @@ -102,10 +102,7 @@ void FarmServerListView::openContextMenu(const QPoint &p) if (!item) return; - if (m_menu) - delete m_menu; - - m_menu = new QMenu(this); + m_menu.reset(new QMenu(this)); TFarmController *controller = getTFarmController(); ServerState state; diff --git a/toonz/sources/toonz/batchserversviewer.h b/toonz/sources/toonz/batchserversviewer.h index 139e077..a72f024 100644 --- a/toonz/sources/toonz/batchserversviewer.h +++ b/toonz/sources/toonz/batchserversviewer.h @@ -1,14 +1,15 @@ - - #ifndef BATCHSERVERSVIEWER_H #define BATCHSERVERSVIEWER_H +#include + #include "toonzqt/dvdialog.h" #include "toonzqt/doublefield.h" #include "toonzqt/lineedit.h" #include #include +#include class QComboBox; class FarmServerListView; @@ -36,7 +37,7 @@ protected slots: private: void openContextMenu(const QPoint &p); void mousePressEvent(QMouseEvent *event); - QMenu *m_menu; + std::unique_ptr m_menu; }; class BatchServersViewer : public QFrame diff --git a/toonz/sources/toonz/castselection.cpp b/toonz/sources/toonz/castselection.cpp index 8bbe91b..d21c3b5 100644 --- a/toonz/sources/toonz/castselection.cpp +++ b/toonz/sources/toonz/castselection.cpp @@ -41,16 +41,15 @@ CastSelection::~CastSelection() void CastSelection::getSelectedLevels(std::vector &levels) { assert(m_browser); - CastItems *castItems = m_browser->getCastItems(); - int i; - for (i = 0; i < castItems->getItemCount(); i++) { + CastItems const& castItems = m_browser->getCastItems(); + for (int i = 0; i < castItems.getItemCount(); i++) { if (!isSelected(i)) continue; - TXshLevel *level = castItems->getItem(i)->getSimpleLevel(); + TXshLevel *level = castItems.getItem(i)->getSimpleLevel(); if (!level) - level = castItems->getItem(i)->getPaletteLevel(); + level = castItems.getItem(i)->getPaletteLevel(); if (!level) - level = castItems->getItem(i)->getSoundLevel(); + level = castItems.getItem(i)->getSoundLevel(); if (level) levels.push_back(level); } diff --git a/toonz/sources/toonz/castviewer.cpp b/toonz/sources/toonz/castviewer.cpp index 3c55286..539bf47 100644 --- a/toonz/sources/toonz/castviewer.cpp +++ b/toonz/sources/toonz/castviewer.cpp @@ -483,7 +483,11 @@ CastBrowser::CastBrowser(QWidget *parent, Qt::WindowFlags flags) #else CastBrowser::CastBrowser(QWidget *parent, Qt::WFlags flags) #endif - : QSplitter(parent), m_treeViewer(0), m_folderName(0), m_itemViewer(0), m_castItems(new CastItems()) + : QSplitter(parent) + , m_treeViewer(0) + , m_folderName(0) + , m_itemViewer(0) + , m_castItems(new CastItems()) { // style sheet setObjectName("CastBrowser"); @@ -555,7 +559,6 @@ CastBrowser::CastBrowser(QWidget *parent, Qt::WFlags flags) CastBrowser::~CastBrowser() { - delete m_castItems; } //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/castviewer.h b/toonz/sources/toonz/castviewer.h index e8a713f..719d91c 100644 --- a/toonz/sources/toonz/castviewer.h +++ b/toonz/sources/toonz/castviewer.h @@ -1,8 +1,8 @@ - - #ifndef CAST_VIEWER_INCLUDED #define CAST_VIEWER_INCLUDED +#include + #include #include @@ -74,7 +74,7 @@ class CastBrowser : public QSplitter, public DvItemListModel QLabel *m_folderName; DvItemViewer *m_itemViewer; - CastItems *m_castItems; + std::unique_ptr m_castItems; public: #if QT_VERSION >= 0x050500 @@ -84,7 +84,7 @@ public: #endif ~CastBrowser(); - CastItems *getCastItems() const { return m_castItems; } + CastItems const& getCastItems() const { return *m_castItems; } void sortByDataModel(DataType dataType, bool isDiscendent); diff --git a/toonz/sources/toonz/cellkeyframeselection.cpp b/toonz/sources/toonz/cellkeyframeselection.cpp index fae7b24..859f985 100644 --- a/toonz/sources/toonz/cellkeyframeselection.cpp +++ b/toonz/sources/toonz/cellkeyframeselection.cpp @@ -23,7 +23,9 @@ //----------------------------------------------------------------------------- TCellKeyframeSelection::TCellKeyframeSelection(TCellSelection *cellSelection, TKeyframeSelection *keyframeSelection) - : m_cellSelection(cellSelection), m_keyframeSelection(keyframeSelection), m_xsheetHandle(0) + : m_cellSelection(cellSelection) + , m_keyframeSelection(keyframeSelection) + , m_xsheetHandle(0) { } diff --git a/toonz/sources/toonz/xshnoteviewer.cpp b/toonz/sources/toonz/xshnoteviewer.cpp index de0fd86..38a151b 100644 --- a/toonz/sources/toonz/xshnoteviewer.cpp +++ b/toonz/sources/toonz/xshnoteviewer.cpp @@ -366,7 +366,10 @@ void NotePopup::onXsheetSwitched() //----------------------------------------------------------------------------- NoteWidget::NoteWidget(XsheetViewer *parent, int noteIndex) - : QWidget(parent), m_viewer(parent), m_noteIndex(noteIndex), m_noteEditor(0), m_isHovered(false) + : QWidget(parent) + , m_viewer(parent) + , m_noteIndex(noteIndex) + , m_isHovered(false) { int width = (m_noteIndex < 0) ? 40 : NoteWidth; setFixedSize(width, NoteHeight); @@ -427,13 +430,16 @@ void NoteWidget::paint(QPainter *painter, QPoint pos, bool isCurrent) void NoteWidget::openNotePopup() { - if (!m_noteEditor) - m_noteEditor = new XsheetGUI::NotePopup(m_viewer, m_noteIndex); + if (!m_noteEditor) { + m_noteEditor.reset(new XsheetGUI::NotePopup(m_viewer, m_noteIndex)); + } - if (m_noteEditor->isVisible()) + if (m_noteEditor->isVisible()) { m_noteEditor->activateWindow(); - else + } + else { m_noteEditor->show(); + } } //----------------------------------------------------------------------------- @@ -453,7 +459,8 @@ NoteArea::NoteArea(XsheetViewer *parent, Qt::WindowFlags flags) #else NoteArea::NoteArea(XsheetViewer *parent, Qt::WFlags flags) #endif - : QFrame(parent), m_newNotePopup(0), m_viewer(parent) + : QFrame(parent) + , m_viewer(parent) { setFrameStyle(QFrame::StyledPanel); setObjectName("cornerWidget"); @@ -558,12 +565,14 @@ void NoteArea::updateButtons() void NoteArea::toggleNewNote() { if (!m_newNotePopup) - m_newNotePopup = new XsheetGUI::NotePopup(m_viewer, -1); + m_newNotePopup.reset(new XsheetGUI::NotePopup(m_viewer, -1)); - if (m_newNotePopup->isVisible()) + if (m_newNotePopup->isVisible()) { m_newNotePopup->activateWindow(); - else + } + else { m_newNotePopup->show(); + } } //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/xshnoteviewer.h b/toonz/sources/toonz/xshnoteviewer.h index 6d177a6..255e1d0 100644 --- a/toonz/sources/toonz/xshnoteviewer.h +++ b/toonz/sources/toonz/xshnoteviewer.h @@ -1,8 +1,8 @@ - - #ifndef XSHNOTEVIEWER_H #define XSHNOTEVIEWER_H +#include + #include "toonz/txsheet.h" #include "toonzqt/dvdialog.h" #include "toonzqt/dvtextedit.h" @@ -87,15 +87,11 @@ class NoteWidget : public QWidget Q_OBJECT XsheetViewer *m_viewer; int m_noteIndex; - NotePopup *m_noteEditor; + std::unique_ptr m_noteEditor; bool m_isHovered; public: NoteWidget(XsheetViewer *parent = 0, int noteIndex = -1); - ~NoteWidget() - { - delete m_noteEditor; - } int getNoteIndex() const { return m_noteIndex; } void setNoteIndex(int index) @@ -121,7 +117,7 @@ class NoteArea : public QFrame { Q_OBJECT - NotePopup *m_newNotePopup; //Popup used to create new note + std::unique_ptr m_newNotePopup; //Popup used to create new note XsheetViewer *m_viewer; QToolButton *m_nextNoteButton; @@ -135,10 +131,6 @@ public: #else NoteArea(XsheetViewer *parent = 0, Qt::WFlags flags = 0); #endif - ~NoteArea() - { - delete m_newNotePopup; - } void updatePopup() {