razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #823 from manongjohn/fix_missing_returns

Browse source 
Fix missing returns
This commit is contained in:
manongjohn 2021-10-23 19:25:20 -04:00 committed by GitHub
commit 03ff92727b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/include/toonzqt/styleeditor.h
View file

@ -925,7 +925,7 @@ public:
void editStyleSetName(StyleChooserPage *styleSetPage); void editStyleSetName(StyleChooserPage *styleSetPage);
void renameStyleSet(StyleChooserPage *styleSetPage, QString newName); void renameStyleSet(StyleChooserPage *styleSetPage, QString newName);
std::vector<StyleChooserPage *> getStyleSetList(StylePageType pageType); std::vector<StyleChooserPage *> *getStyleSetList(StylePageType pageType);
void setUpdated(TFilePath setPath); void setUpdated(TFilePath setPath);
TFilePath getSetStyleFolder(QString setName); TFilePath getSetStyleFolder(QString setName);

3
toonz/sources/toonz/graphwidget.cpp
View file

@ -318,8 +318,7 @@ QPointF GraphWidget::getInvertedPoint(QPointF p) {
y *= 0.5; y *= 0.5;
} }
else return QPointF(x, height() - y);
return QPointF(x, height() - y);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

49
toonz/sources/toonzqt/styleeditor.cpp
View file

@ -2282,7 +2282,7 @@ void StyleChooserPage::contextMenuEvent(QContextMenuEvent *event) {
QMenu *menu = new QMenu(this); QMenu *menu = new QMenu(this);
QAction *action; QAction *action;
std::vector<StyleChooserPage *> styleSets = std::vector<StyleChooserPage *> *styleSets =
m_editor->getStyleSetList(m_pageType); m_editor->getStyleSetList(m_pageType);
if (m_editor->isSelecting()) { if (m_editor->isSelecting()) {
@ -2307,8 +2307,8 @@ void StyleChooserPage::contextMenuEvent(QContextMenuEvent *event) {
menu->addAction(action); menu->addAction(action);
QMenu *styleSetMenu = new QMenu(tr("Copy Selected to Style Set..."), this); QMenu *styleSetMenu = new QMenu(tr("Copy Selected to Style Set..."), this);
for (int i = 1; i < styleSets.size(); i++) { for (int i = 1; i < styleSets->size(); i++) {
StyleChooserPage *page = styleSets[i]; StyleChooserPage *page = styleSets->at(i);
QAction *subAction = new QAction(page->getStyleSetName()); QAction *subAction = new QAction(page->getStyleSetName());
subAction->setData(page->getStyleSetName()); subAction->setData(page->getStyleSetName());
connect(subAction, SIGNAL(triggered()), m_editor, connect(subAction, SIGNAL(triggered()), m_editor,
@ -2318,12 +2318,12 @@ void StyleChooserPage::contextMenuEvent(QContextMenuEvent *event) {
subAction->setDisabled(true); subAction->setDisabled(true);
styleSetMenu->addAction(subAction); styleSetMenu->addAction(subAction);
} }
if (styleSets.size() < 2) styleSetMenu->setDisabled(true); if (styleSets->size() < 2) styleSetMenu->setDisabled(true);
menu->addMenu(styleSetMenu); menu->addMenu(styleSetMenu);
styleSetMenu = new QMenu(tr("Move Selected to Style Set..."), this); styleSetMenu = new QMenu(tr("Move Selected to Style Set..."), this);
for (int i = 1; i < styleSets.size(); i++) { for (int i = 1; i < styleSets->size(); i++) {
StyleChooserPage *page = styleSets[i]; StyleChooserPage *page = styleSets->at(i);
QAction *subAction = new QAction(page->getStyleSetName()); QAction *subAction = new QAction(page->getStyleSetName());
subAction->setData(page->getStyleSetName()); subAction->setData(page->getStyleSetName());
connect(subAction, SIGNAL(triggered()), m_editor, connect(subAction, SIGNAL(triggered()), m_editor,
@ -2333,7 +2333,7 @@ void StyleChooserPage::contextMenuEvent(QContextMenuEvent *event) {
subAction->setDisabled(true); subAction->setDisabled(true);
styleSetMenu->addAction(subAction); styleSetMenu->addAction(subAction);
} }
if (styleSets.size() < 2 || m_pageType == StylePageType::VectorGenerated) if (styleSets->size() < 2 || m_pageType == StylePageType::VectorGenerated)
styleSetMenu->setDisabled(true); styleSetMenu->setDisabled(true);
menu->addMenu(styleSetMenu); menu->addMenu(styleSetMenu);
@ -2341,8 +2341,8 @@ void StyleChooserPage::contextMenuEvent(QContextMenuEvent *event) {
action->setText(tr("Remove Selected from Sets")); action->setText(tr("Remove Selected from Sets"));
connect(action, SIGNAL(triggered()), m_editor, connect(action, SIGNAL(triggered()), m_editor,
SLOT(onRemoveSelectedStyleFromSet())); SLOT(onRemoveSelectedStyleFromSet()));
for (int i = 1; i < styleSets.size(); i++) { for (int i = 1; i < styleSets->size(); i++) {
StyleChooserPage *page = styleSets[i]; StyleChooserPage *page = styleSets->at(i);
if (page->getSelection().size() && if (page->getSelection().size() &&
(page->isExternal() || (page->isExternal() ||
page->getPageType() == StylePageType::VectorGenerated)) { page->getPageType() == StylePageType::VectorGenerated)) {
@ -2377,8 +2377,8 @@ void StyleChooserPage::contextMenuEvent(QContextMenuEvent *event) {
menu->addAction(action); menu->addAction(action);
QMenu *styleSetMenu = new QMenu(tr("Copy to Style Set..."), this); QMenu *styleSetMenu = new QMenu(tr("Copy to Style Set..."), this);
for (int i = 1; i < styleSets.size(); i++) { for (int i = 1; i < styleSets->size(); i++) {
StyleChooserPage *page = styleSets[i]; StyleChooserPage *page = styleSets->at(i);
QAction *subAction = new QAction(page->getStyleSetName()); QAction *subAction = new QAction(page->getStyleSetName());
subAction->setData(page->getStyleSetName()); subAction->setData(page->getStyleSetName());
connect(subAction, SIGNAL(triggered()), this, SLOT(onCopyStyleToSet())); connect(subAction, SIGNAL(triggered()), this, SLOT(onCopyStyleToSet()));
@ -2389,13 +2389,13 @@ void StyleChooserPage::contextMenuEvent(QContextMenuEvent *event) {
} }
if (m_currentIndex == 0 || (m_pageType == StylePageType::Texture && if (m_currentIndex == 0 || (m_pageType == StylePageType::Texture &&
m_currentIndex == getChipCount() - 1) || m_currentIndex == getChipCount() - 1) ||
styleSets.size() <= 2) styleSets->size() <= 2)
styleSetMenu->setDisabled(true); styleSetMenu->setDisabled(true);
menu->addMenu(styleSetMenu); menu->addMenu(styleSetMenu);
styleSetMenu = new QMenu(tr("Move to Style Set..."), this); styleSetMenu = new QMenu(tr("Move to Style Set..."), this);
for (int i = 1; i < styleSets.size(); i++) { for (int i = 1; i < styleSets->size(); i++) {
StyleChooserPage *page = styleSets[i]; StyleChooserPage *page = styleSets->at(i);
QAction *subAction = new QAction(page->getStyleSetName()); QAction *subAction = new QAction(page->getStyleSetName());
subAction->setData(page->getStyleSetName()); subAction->setData(page->getStyleSetName());
connect(subAction, SIGNAL(triggered()), this, SLOT(onMoveStyleToSet())); connect(subAction, SIGNAL(triggered()), this, SLOT(onMoveStyleToSet()));
@ -2406,7 +2406,7 @@ void StyleChooserPage::contextMenuEvent(QContextMenuEvent *event) {
} }
if (m_currentIndex == 0 || (m_pageType == StylePageType::Texture && if (m_currentIndex == 0 || (m_pageType == StylePageType::Texture &&
m_currentIndex == getChipCount() - 1) || m_currentIndex == getChipCount() - 1) ||
m_pageType == StylePageType::VectorGenerated || styleSets.size() <= 2) m_pageType == StylePageType::VectorGenerated || styleSets->size() <= 2)
styleSetMenu->setDisabled(true); styleSetMenu->setDisabled(true);
menu->addMenu(styleSetMenu); menu->addMenu(styleSetMenu);
@ -2506,12 +2506,17 @@ bool StyleChooserPage::copyFilesToStyleFolder(TFilePathSet srcFiles,
bool StyleChooserPage::deleteFilesFromStyleFolder(TFilePathSet targetFiles) { bool StyleChooserPage::deleteFilesFromStyleFolder(TFilePathSet targetFiles) {
if (targetFiles.empty()) return false; if (targetFiles.empty()) return false;
bool filesDeleted = false;
TFilePathSet::iterator it; TFilePathSet::iterator it;
for (it = targetFiles.begin(); it != targetFiles.end(); it++) try { for (it = targetFiles.begin(); it != targetFiles.end(); it++) try {
if (!TSystem::doesExistFileOrLevel(*it)) return false; if (!TSystem::doesExistFileOrLevel(*it)) continue;
TSystem::deleteFile(*it); TSystem::deleteFile(*it);
filesDeleted = true;
} catch (...) { } catch (...) {
} }
return filesDeleted;
} }
//***************************************************************************** //*****************************************************************************
@ -6806,16 +6811,20 @@ void StyleEditor::renameStyleSet(StyleChooserPage *styleSetPage,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
std::vector<StyleChooserPage *> StyleEditor::getStyleSetList( std::vector<StyleChooserPage *> *StyleEditor::getStyleSetList(
StylePageType pageType) { StylePageType pageType) {
std::vector<StyleChooserPage *> *pages;
if (pageType == StylePageType::Texture) if (pageType == StylePageType::Texture)
return m_texturePages; pages = &m_texturePages;
else if (pageType == StylePageType::VectorBrush || else if (pageType == StylePageType::VectorBrush ||
pageType == StylePageType::VectorCustom || pageType == StylePageType::VectorCustom ||
pageType == StylePageType::VectorGenerated) pageType == StylePageType::VectorGenerated)
return m_vectorPages; pages = &m_vectorPages;
else if (pageType == StylePageType::Raster) else if (pageType == StylePageType::Raster)
return m_rasterPages; pages = &m_rasterPages;
return pages;
} }
bool StyleEditor::isStyleNameValid(QString name, StylePageType pageType, bool StyleEditor::isStyleNameValid(QString name, StylePageType pageType,