From d82933593f4588ecc93b2f9325fa5e8311c436aa Mon Sep 17 00:00:00 2001 From: flurick Date: Sat, 3 Jun 2023 21:35:55 +0200 Subject: [PATCH 01/10] Replace fixed sized with minimum hint --- toonz/sources/toonz/insertfxpopup.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toonz/sources/toonz/insertfxpopup.cpp b/toonz/sources/toonz/insertfxpopup.cpp index 9f87204b..c9fb39ac 100644 --- a/toonz/sources/toonz/insertfxpopup.cpp +++ b/toonz/sources/toonz/insertfxpopup.cpp @@ -276,20 +276,20 @@ InsertFxPopup::InsertFxPopup() addWidget(m_fxTree); QPushButton *insertBtn = new QPushButton(tr("Insert"), this); - insertBtn->setFixedSize(65, 25); + insertBtn->setMinimumSize(65, 25); insertBtn->setObjectName("PushButton_NoPadding"); connect(insertBtn, SIGNAL(clicked()), this, SLOT(onInsert())); insertBtn->setDefault(true); m_buttonLayout->addWidget(insertBtn); QPushButton *addBtn = new QPushButton(tr("Add"), this); - addBtn->setFixedSize(65, 25); + addBtn->setMinimumSize(65, 25); addBtn->setObjectName("PushButton_NoPadding"); connect(addBtn, SIGNAL(clicked()), this, SLOT(onAdd())); m_buttonLayout->addWidget(addBtn); QPushButton *replaceBtn = new QPushButton(tr("Replace"), this); - replaceBtn->setFixedHeight(25); + addBtn->setMinimumSize(65, 25); replaceBtn->setObjectName("PushButton_NoPadding"); connect(replaceBtn, SIGNAL(clicked()), this, SLOT(onReplace())); m_buttonLayout->addWidget(replaceBtn); From b14ea62cf3ce70a4b31b672e30c16ffc978e4cd6 Mon Sep 17 00:00:00 2001 From: flurick Date: Sat, 24 Jun 2023 21:01:32 +0200 Subject: [PATCH 02/10] Update toonz/sources/toonz/insertfxpopup.cpp Co-authored-by: konero --- toonz/sources/toonz/insertfxpopup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toonz/sources/toonz/insertfxpopup.cpp b/toonz/sources/toonz/insertfxpopup.cpp index c9fb39ac..290841dc 100644 --- a/toonz/sources/toonz/insertfxpopup.cpp +++ b/toonz/sources/toonz/insertfxpopup.cpp @@ -289,7 +289,7 @@ InsertFxPopup::InsertFxPopup() m_buttonLayout->addWidget(addBtn); QPushButton *replaceBtn = new QPushButton(tr("Replace"), this); - addBtn->setMinimumSize(65, 25); + replaceBtn->setMinimumSize(65, 25); replaceBtn->setObjectName("PushButton_NoPadding"); connect(replaceBtn, SIGNAL(clicked()), this, SLOT(onReplace())); m_buttonLayout->addWidget(replaceBtn); From ec3be750a9c82b8896f817a3477d9efc4796bb3e Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Thu, 27 Jul 2023 11:20:27 +0900 Subject: [PATCH 03/10] fix 32bit preview --- toonz/sources/toonz/previewfxmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toonz/sources/toonz/previewfxmanager.cpp b/toonz/sources/toonz/previewfxmanager.cpp index ce186ef8..e8dc454f 100644 --- a/toonz/sources/toonz/previewfxmanager.cpp +++ b/toonz/sources/toonz/previewfxmanager.cpp @@ -1082,7 +1082,7 @@ void PreviewFxInstance::doOnRenderRasterCompleted( /*-- 16bpc縺ｧ險育ｮ励＆繧後◆蝣ｴ蜷医€∫ｵ先棡繧奪ithering縺吶ｋ --*/ // dither the 16bpc image IF the "30bit display" preference option is OFF - if ((rasA->getPixelSize() == 8 || rasA->getPixelSize() == 16) && + if (rasA->getPixelSize() == 8 && !Preferences::instance()->is30bitDisplayEnabled()) // render in 64 bits { TRaster32P auxA(rasA->getLx(), rasA->getLy()); From f6c0e9df7b7622f1385b9428d4e1683f4a631dcd Mon Sep 17 00:00:00 2001 From: otakuto Date: Fri, 18 Aug 2023 08:36:23 +0900 Subject: [PATCH 04/10] Fix Use default constructor instead --- toonz/sources/stopmotion/stopmotioncontroller.cpp | 4 ++-- toonz/sources/toonz/batchserversviewer.h | 2 +- toonz/sources/toonz/castviewer.h | 2 +- toonz/sources/toonz/comboviewerpane.h | 2 +- toonz/sources/toonz/commandbar.h | 2 +- toonz/sources/toonz/exportpanel.h | 2 +- toonz/sources/toonz/filebrowser.h | 2 +- toonz/sources/toonz/filebrowserpopup.cpp | 2 +- toonz/sources/toonz/filmstrip.h | 2 +- toonz/sources/toonz/historypane.h | 2 +- toonz/sources/toonz/layerfooterpanel.h | 2 +- toonz/sources/toonz/messagepanel.h | 2 +- toonz/sources/toonz/quicktoolbar.h | 2 +- toonz/sources/toonz/scenebrowser.h | 2 +- toonz/sources/toonz/tasksviewer.h | 2 +- toonz/sources/toonz/testpanel.h | 2 +- toonz/sources/toonz/tpanels.cpp | 8 ++++---- toonz/sources/toonz/vectorguideddrawingpane.h | 2 +- toonz/sources/toonz/viewerpane.h | 2 +- toonz/sources/toonz/xshcellviewer.cpp | 2 +- toonz/sources/toonz/xshcolumnviewer.cpp | 2 +- toonz/sources/toonz/xshcolumnviewer.h | 2 +- toonz/sources/toonz/xsheetviewer.cpp | 6 +++--- toonz/sources/toonz/xsheetviewer.h | 4 ++-- toonz/sources/toonz/xshnoteviewer.h | 4 ++-- toonz/sources/toonz/xshrowviewer.cpp | 2 +- toonz/sources/toonzqt/tdockwindows.h | 6 +++--- 27 files changed, 37 insertions(+), 37 deletions(-) diff --git a/toonz/sources/stopmotion/stopmotioncontroller.cpp b/toonz/sources/stopmotion/stopmotioncontroller.cpp index 6023d2c8..837d0a66 100644 --- a/toonz/sources/stopmotion/stopmotioncontroller.cpp +++ b/toonz/sources/stopmotion/stopmotioncontroller.cpp @@ -1749,8 +1749,8 @@ StopMotionController::StopMotionController(QWidget *parent) : QWidget(parent) { } m_tabBarContainer->setLayout(hLayout); - mainLayout->addWidget(m_tabBarContainer, 0, 0); - mainLayout->addWidget(m_stackedChooser, 1, 0); + mainLayout->addWidget(m_tabBarContainer, 0); + mainLayout->addWidget(m_stackedChooser, 1); mainLayout->addWidget(opacityFrame, 0); mainLayout->addWidget(controlButtonFrame, 0); setLayout(mainLayout); diff --git a/toonz/sources/toonz/batchserversviewer.h b/toonz/sources/toonz/batchserversviewer.h index c8a54536..5e677a4f 100644 --- a/toonz/sources/toonz/batchserversviewer.h +++ b/toonz/sources/toonz/batchserversviewer.h @@ -44,7 +44,7 @@ class BatchServersViewer final : public QFrame { Q_OBJECT public: - BatchServersViewer(QWidget *parent = 0, Qt::WindowFlags flags = 0); + BatchServersViewer(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~BatchServersViewer(); void updateSelected(); diff --git a/toonz/sources/toonz/castviewer.h b/toonz/sources/toonz/castviewer.h index 46054ee1..7c8542cc 100644 --- a/toonz/sources/toonz/castviewer.h +++ b/toonz/sources/toonz/castviewer.h @@ -78,7 +78,7 @@ class CastBrowser final : public QSplitter, public DvItemListModel { std::unique_ptr m_castItems; public: - CastBrowser(QWidget *parent = 0, Qt::WindowFlags flags = 0); + CastBrowser(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~CastBrowser(); CastItems const &getCastItems() const { return *m_castItems; } diff --git a/toonz/sources/toonz/comboviewerpane.h b/toonz/sources/toonz/comboviewerpane.h index 963cbc42..660f0924 100644 --- a/toonz/sources/toonz/comboviewerpane.h +++ b/toonz/sources/toonz/comboviewerpane.h @@ -21,7 +21,7 @@ class ComboViewerPanel final : public BaseViewerPanel { Ruler *m_hRuler; public: - ComboViewerPanel(QWidget *parent = 0, Qt::WindowFlags flags = 0); + ComboViewerPanel(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~ComboViewerPanel() {} ToolOptions *getToolOptions() { return m_toolOptions; } diff --git a/toonz/sources/toonz/commandbar.h b/toonz/sources/toonz/commandbar.h index 3e3ba2aa..dc435669 100644 --- a/toonz/sources/toonz/commandbar.h +++ b/toonz/sources/toonz/commandbar.h @@ -29,7 +29,7 @@ protected: QString m_barId; public: - CommandBar(QWidget *parent = 0, Qt::WindowFlags flags = 0, + CommandBar(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags(), bool isCollapsible = false, bool isQuickToolbar = false); QString getBarId() { return m_barId; } diff --git a/toonz/sources/toonz/exportpanel.h b/toonz/sources/toonz/exportpanel.h index 3436304e..c7bef3e8 100644 --- a/toonz/sources/toonz/exportpanel.h +++ b/toonz/sources/toonz/exportpanel.h @@ -90,7 +90,7 @@ class ExportPanel final : public TPanel { QCheckBox *m_useMarker; public: - ExportPanel(QWidget *parent = 0, Qt::WindowFlags flags = 0); + ExportPanel(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~ExportPanel(); void loadExportSettings(); void saveExportSettings(); diff --git a/toonz/sources/toonz/filebrowser.h b/toonz/sources/toonz/filebrowser.h index 7e52151f..6920ec30 100644 --- a/toonz/sources/toonz/filebrowser.h +++ b/toonz/sources/toonz/filebrowser.h @@ -60,7 +60,7 @@ class FileBrowser final : public QFrame, public DvItemListModel { Q_OBJECT public: - FileBrowser(QWidget *parent, Qt::WindowFlags flags = 0, + FileBrowser(QWidget *parent, Qt::WindowFlags flags = Qt::WindowFlags(), bool noContextMenu = false, bool multiSelectionEnabled = false); ~FileBrowser(); diff --git a/toonz/sources/toonz/filebrowserpopup.cpp b/toonz/sources/toonz/filebrowserpopup.cpp index 9b78b2f6..5d5f414d 100644 --- a/toonz/sources/toonz/filebrowserpopup.cpp +++ b/toonz/sources/toonz/filebrowserpopup.cpp @@ -87,7 +87,7 @@ FileBrowserPopup::FileBrowserPopup(const QString &title, Options options, setWindowTitle(title); setModal(false); - m_browser = new FileBrowser(this, 0, false, m_multiSelectionEnabled); + m_browser = new FileBrowser(this, Qt::WindowFlags(), false, m_multiSelectionEnabled); m_nameFieldLabel = new QLabel(tr("File name:")); m_nameField = new DVGui::LineEdit(this); m_okButton = new QPushButton(tr("OK"), this); diff --git a/toonz/sources/toonz/filmstrip.h b/toonz/sources/toonz/filmstrip.h index 5ae91e81..34b27aa6 100644 --- a/toonz/sources/toonz/filmstrip.h +++ b/toonz/sources/toonz/filmstrip.h @@ -236,7 +236,7 @@ class Filmstrip final : public QWidget, public SaveLoadQSettings { bool m_showComboBox = true; public: - Filmstrip(QWidget *parent = 0, Qt::WindowFlags flags = 0); + Filmstrip(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~Filmstrip(); // SaveLoadQSettings diff --git a/toonz/sources/toonz/historypane.h b/toonz/sources/toonz/historypane.h index e68a6b0b..8d913cad 100644 --- a/toonz/sources/toonz/historypane.h +++ b/toonz/sources/toonz/historypane.h @@ -33,7 +33,7 @@ class HistoryPane final : public QWidget { QScrollArea *m_frameArea; public: - HistoryPane(QWidget *parent = 0, Qt::WindowFlags flags = 0); + HistoryPane(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~HistoryPane(){}; protected: diff --git a/toonz/sources/toonz/layerfooterpanel.h b/toonz/sources/toonz/layerfooterpanel.h index e24725cb..80cbe9aa 100644 --- a/toonz/sources/toonz/layerfooterpanel.h +++ b/toonz/sources/toonz/layerfooterpanel.h @@ -34,7 +34,7 @@ private: public: LayerFooterPanel(XsheetViewer *viewer, QWidget *parent = 0, - Qt::WindowFlags flags = 0); + Qt::WindowFlags flags = Qt::WindowFlags()); ~LayerFooterPanel(); void showOrHide(const Orientation *o); diff --git a/toonz/sources/toonz/messagepanel.h b/toonz/sources/toonz/messagepanel.h index dac810b3..02e462d6 100644 --- a/toonz/sources/toonz/messagepanel.h +++ b/toonz/sources/toonz/messagepanel.h @@ -54,7 +54,7 @@ class LogPanel final : public TPanel, public TLogger::Listener { int m_poolIndex; public: - LogPanel(QWidget *parent = 0, Qt::WindowFlags flags = 0); + LogPanel(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~LogPanel(); void onLogChanged() override; diff --git a/toonz/sources/toonz/quicktoolbar.h b/toonz/sources/toonz/quicktoolbar.h index 0fb500d6..ad4c24bd 100644 --- a/toonz/sources/toonz/quicktoolbar.h +++ b/toonz/sources/toonz/quicktoolbar.h @@ -31,7 +31,7 @@ class QuickToolbar final : public CommandBar { XsheetViewer *m_viewer; public: - QuickToolbar(XsheetViewer *parent = 0, Qt::WindowFlags flags = 0, + QuickToolbar(XsheetViewer *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags(), bool isCollapsible = false); static void toggleQuickToolbar(); void showToolbar(bool show); diff --git a/toonz/sources/toonz/scenebrowser.h b/toonz/sources/toonz/scenebrowser.h index 0e51a43a..52702fca 100644 --- a/toonz/sources/toonz/scenebrowser.h +++ b/toonz/sources/toonz/scenebrowser.h @@ -43,7 +43,7 @@ class SceneBrowser final : public QFrame, public DvItemListModel { Q_OBJECT public: - SceneBrowser(QWidget *parent, Qt::WindowFlags flags = 0, + SceneBrowser(QWidget *parent, Qt::WindowFlags flags = Qt::WindowFlags(), bool noContextMenu = false, bool multiSelectionEnabled = false); ~SceneBrowser(); diff --git a/toonz/sources/toonz/tasksviewer.h b/toonz/sources/toonz/tasksviewer.h index bb65d04e..9e17810b 100644 --- a/toonz/sources/toonz/tasksviewer.h +++ b/toonz/sources/toonz/tasksviewer.h @@ -173,7 +173,7 @@ public: TaskTreeView *m_treeView; QTimer *m_timer; - TasksViewer(QWidget *parent = 0, Qt::WindowFlags flags = 0); + TasksViewer(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~TasksViewer(); void update() override; diff --git a/toonz/sources/toonz/testpanel.h b/toonz/sources/toonz/testpanel.h index 1b70451c..2b0ae165 100644 --- a/toonz/sources/toonz/testpanel.h +++ b/toonz/sources/toonz/testpanel.h @@ -13,7 +13,7 @@ class TestPanel final : public TPanel { Q_OBJECT public: - TestPanel(QWidget *parent = 0, Qt::WindowFlags flags = 0); + TestPanel(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~TestPanel(); public slots: diff --git a/toonz/sources/toonz/tpanels.cpp b/toonz/sources/toonz/tpanels.cpp index 7b1f188c..2931f003 100644 --- a/toonz/sources/toonz/tpanels.cpp +++ b/toonz/sources/toonz/tpanels.cpp @@ -1033,7 +1033,7 @@ public: //----------------------------------------------------------------------------- CommandBarPanel::CommandBarPanel(QWidget *parent) - : TPanel(parent, 0, TDockWidget::horizontal) { + : TPanel(parent, Qt::WindowFlags(), TDockWidget::horizontal) { CommandBar *xsheetToolbar = new CommandBar(this); setWidget(xsheetToolbar); setIsMaximizable(false); @@ -1064,7 +1064,7 @@ OpenFloatingPanel openCommandBarCommand(MI_OpenCommandToolbar, "CommandBar", //--------------------------------------------------------- ToolOptionPanel::ToolOptionPanel(QWidget *parent) - : TPanel(parent, 0, TDockWidget::horizontal) { + : TPanel(parent, Qt::WindowFlags(), TDockWidget::horizontal) { TApp *app = TApp::instance(); m_toolOption = new ToolOptions; @@ -1221,7 +1221,7 @@ class BrowserFactory final : public TPanelFactory { public: BrowserFactory() : TPanelFactory("Browser") {} void initialize(TPanel *panel) override { - FileBrowser *browser = new FileBrowser(panel, 0, false, true); + FileBrowser *browser = new FileBrowser(panel, Qt::WindowFlags(), false, true); panel->setWidget(browser); panel->setWindowTitle(QObject::tr("File Browser")); panel->getTitleBar()->showTitleBar(TApp::instance()->getShowTitleBars()); @@ -1241,7 +1241,7 @@ class PreproductionBoardFactory final : public TPanelFactory { public: PreproductionBoardFactory() : TPanelFactory("PreproductionBoard") {} void initialize(TPanel *panel) override { - SceneBrowser *browser = new SceneBrowser(panel, 0, false, true); + SceneBrowser *browser = new SceneBrowser(panel, Qt::WindowFlags(), false, true); panel->setWidget(browser); panel->setWindowTitle(QObject::tr("Preproduction Board")); TFilePath scenesFolder = diff --git a/toonz/sources/toonz/vectorguideddrawingpane.h b/toonz/sources/toonz/vectorguideddrawingpane.h index 9437b054..484369b7 100644 --- a/toonz/sources/toonz/vectorguideddrawingpane.h +++ b/toonz/sources/toonz/vectorguideddrawingpane.h @@ -26,7 +26,7 @@ class VectorGuidedDrawingPane final : public QFrame { *m_FlipNextDirectionBtn, *m_FlipPrevDirectionBtn; public: - VectorGuidedDrawingPane(QWidget *parent = 0, Qt::WindowFlags flags = 0); + VectorGuidedDrawingPane(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~VectorGuidedDrawingPane(){}; void updateStatus(); diff --git a/toonz/sources/toonz/viewerpane.h b/toonz/sources/toonz/viewerpane.h index c5af0b3c..d249abf3 100644 --- a/toonz/sources/toonz/viewerpane.h +++ b/toonz/sources/toonz/viewerpane.h @@ -67,7 +67,7 @@ protected: bool m_isActive = false; public: - BaseViewerPanel(QWidget *parent = 0, Qt::WindowFlags flags = 0); + BaseViewerPanel(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~BaseViewerPanel() {} virtual void updateShowHide(); diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cpp index 199530fb..b6b7384d 100644 --- a/toonz/sources/toonz/xshcellviewer.cpp +++ b/toonz/sources/toonz/xshcellviewer.cpp @@ -3748,7 +3748,7 @@ void CellArea::mouseMoveEvent(QMouseEvent *event) { //----------------------------------------------------------------------------- void CellArea::mouseReleaseEvent(QMouseEvent *event) { - m_viewer->setQtModifiers(0); + m_viewer->setQtModifiers(Qt::KeyboardModifiers()); m_isMousePressed = false; m_viewer->stopAutoPan(); m_isPanning = false; diff --git a/toonz/sources/toonz/xshcolumnviewer.cpp b/toonz/sources/toonz/xshcolumnviewer.cpp index f0667912..ee9210df 100644 --- a/toonz/sources/toonz/xshcolumnviewer.cpp +++ b/toonz/sources/toonz/xshcolumnviewer.cpp @@ -2861,7 +2861,7 @@ void ColumnArea::mouseReleaseEvent(QMouseEvent *event) { if (m_transparencyPopupTimer) m_transparencyPopupTimer->stop(); - m_viewer->setQtModifiers(0); + m_viewer->setQtModifiers(Qt::KeyboardModifiers()); m_viewer->dragToolRelease(event); m_isPanning = false; m_viewer->stopAutoPan(); diff --git a/toonz/sources/toonz/xshcolumnviewer.h b/toonz/sources/toonz/xshcolumnviewer.h index f35023e1..a184df71 100644 --- a/toonz/sources/toonz/xshcolumnviewer.h +++ b/toonz/sources/toonz/xshcolumnviewer.h @@ -50,7 +50,7 @@ class MotionPathMenu final : public QWidget { QPoint m_pos; public: - MotionPathMenu(QWidget *parent = 0, Qt::WindowFlags flags = 0); + MotionPathMenu(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~MotionPathMenu(); protected: diff --git a/toonz/sources/toonz/xsheetviewer.cpp b/toonz/sources/toonz/xsheetviewer.cpp index d19e5328..23fb07d0 100644 --- a/toonz/sources/toonz/xsheetviewer.cpp +++ b/toonz/sources/toonz/xsheetviewer.cpp @@ -231,7 +231,7 @@ XsheetViewer::XsheetViewer(QWidget *parent, Qt::WindowFlags flags) , m_isCurrentColumnSwitched(false) , m_isComputingSize(false) , m_currentNoteIndex(0) - , m_qtModifiers(0) + , m_qtModifiers(Qt::KeyboardModifiers()) , m_frameDisplayStyle(to_enum(FrameDisplayStyleInXsheetRowArea)) , m_orientation(nullptr) , m_xsheetLayout("Classic") @@ -252,7 +252,7 @@ XsheetViewer::XsheetViewer(QWidget *parent, Qt::WindowFlags flags) m_toolbarScrollArea = new XsheetScrollArea(this); m_toolbarScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_toolbarScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - m_toolbar = new XsheetGUI::QuickToolbar(this, 0, true); + m_toolbar = new XsheetGUI::QuickToolbar(this, Qt::WindowFlags(), true); m_toolbarScrollArea->setWidget(m_toolbar); m_noteArea = new XsheetGUI::NoteArea(this); @@ -704,7 +704,7 @@ void XsheetViewer::timerEvent(QTimerEvent *) { scroll(m_autoPanSpeed); if (!m_dragTool) return; QMouseEvent mouseEvent(QEvent::MouseMove, m_lastAutoPanPos - m_autoPanSpeed, - Qt::NoButton, 0, m_qtModifiers); + Qt::NoButton, Qt::MouseButtons(), m_qtModifiers); m_dragTool->onDrag(&mouseEvent); m_lastAutoPanPos += m_autoPanSpeed; } diff --git a/toonz/sources/toonz/xsheetviewer.h b/toonz/sources/toonz/xsheetviewer.h index e1a277a6..5279fbaa 100644 --- a/toonz/sources/toonz/xsheetviewer.h +++ b/toonz/sources/toonz/xsheetviewer.h @@ -163,7 +163,7 @@ class XsheetScrollArea final : public QScrollArea { Q_OBJECT public: - XsheetScrollArea(QWidget *parent = 0, Qt::WindowFlags flags = 0) + XsheetScrollArea(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()) : QScrollArea(parent) { setObjectName("xsheetScrollArea"); setFrameStyle(QFrame::StyledPanel); @@ -640,7 +640,7 @@ private: } public: - XsheetViewer(QWidget *parent = 0, Qt::WindowFlags flags = 0); + XsheetViewer(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~XsheetViewer(); TColumnSelection *getColumnSelection() const { return m_columnSelection; } diff --git a/toonz/sources/toonz/xshnoteviewer.h b/toonz/sources/toonz/xshnoteviewer.h index 920ced45..4dce2d7b 100644 --- a/toonz/sources/toonz/xshnoteviewer.h +++ b/toonz/sources/toonz/xshnoteviewer.h @@ -137,7 +137,7 @@ class NoteArea final : public QFrame { QLayout *m_currentLayout; public: - NoteArea(XsheetViewer *parent = 0, Qt::WindowFlags flags = 0); + NoteArea(XsheetViewer *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); void updateButtons(); @@ -172,7 +172,7 @@ class FooterNoteArea final : public QFrame { public: FooterNoteArea(QWidget *parent = 0, XsheetViewer *viewer = 0, - Qt::WindowFlags flags = 0); + Qt::WindowFlags flags = Qt::WindowFlags()); void updateButtons(); diff --git a/toonz/sources/toonz/xshrowviewer.cpp b/toonz/sources/toonz/xshrowviewer.cpp index 5ae48a69..1e4bf76b 100644 --- a/toonz/sources/toonz/xshrowviewer.cpp +++ b/toonz/sources/toonz/xshrowviewer.cpp @@ -1338,7 +1338,7 @@ void RowArea::mouseMoveEvent(QMouseEvent *event) { //----------------------------------------------------------------------------- void RowArea::mouseReleaseEvent(QMouseEvent *event) { - m_viewer->setQtModifiers(0); + m_viewer->setQtModifiers(Qt::KeyboardModifiers()); m_viewer->stopAutoPan(); m_isPanning = false; m_viewer->dragToolRelease(event); diff --git a/toonz/sources/toonzqt/tdockwindows.h b/toonz/sources/toonzqt/tdockwindows.h index 8cd6062f..852c4dc7 100644 --- a/toonz/sources/toonzqt/tdockwindows.h +++ b/toonz/sources/toonzqt/tdockwindows.h @@ -43,7 +43,7 @@ class DVAPI TMainWindow : public QWidget { QWidget *m_menu; public: - TMainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0); + TMainWindow(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); virtual ~TMainWindow(); void addDockWidget(TDockWidget *item); @@ -85,8 +85,8 @@ class DVAPI TDockWidget : public DockWidget { public: TDockWidget(const QString &title, QWidget *parent = 0, - Qt::WindowFlags flags = 0); - TDockWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0); + Qt::WindowFlags flags = Qt::WindowFlags()); + TDockWidget(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags()); ~TDockWidget() {} void setTitleBarWidget(QWidget *titlebar); From cce15602e7a97d7482d2def932c01eea3d5e4218 Mon Sep 17 00:00:00 2001 From: konero <19820721+konero@users.noreply.github.com> Date: Sun, 3 Sep 2023 12:44:04 +0100 Subject: [PATCH 05/10] use strcmp --- toonz/sources/toonzqt/menubarcommand.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toonz/sources/toonzqt/menubarcommand.cpp b/toonz/sources/toonzqt/menubarcommand.cpp index 08210d22..41248c3d 100644 --- a/toonz/sources/toonzqt/menubarcommand.cpp +++ b/toonz/sources/toonzqt/menubarcommand.cpp @@ -413,7 +413,7 @@ void CommandManager::enlargeIcon(CommandId id, const QSize dstSize) { if (!action) return; const char *iconSVGName = getIconSVGName(id); - if (iconSVGName == "") return; + if (strcmp(iconSVGName, "") == 0) return; QIcon icon = action->icon(); From 26e6db165c81cb3987e9bd72760eb3b39b544a5f Mon Sep 17 00:00:00 2001 From: konero <19820721+konero@users.noreply.github.com> Date: Sun, 3 Sep 2023 13:35:54 +0100 Subject: [PATCH 06/10] restore addSpecifiedSizedImageToIcon function --- toonz/sources/include/toonzqt/gutil.h | 5 +++++ toonz/sources/toonzqt/gutil.cpp | 21 +++++++++++++++++++++ toonz/sources/toonzqt/menubarcommand.cpp | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/toonz/sources/include/toonzqt/gutil.h b/toonz/sources/include/toonzqt/gutil.h index 2ab5aa7a..10a36061 100644 --- a/toonz/sources/include/toonzqt/gutil.h +++ b/toonz/sources/include/toonzqt/gutil.h @@ -162,6 +162,11 @@ void DVAPI addImagesToIcon(QIcon &icon, const QImage &baseImg, //----------------------------------------------------------------------------- +void DVAPI addSpecifiedSizedImageToIcon(QIcon &icon, const char *iconSVGName, + QSize newSize = QSize()); + +//----------------------------------------------------------------------------- + void DVAPI addPixmapToAllModesAndStates(QIcon &icon, const QPixmap &pixmap); //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonzqt/gutil.cpp b/toonz/sources/toonzqt/gutil.cpp index 3b451a5b..06dbe822 100644 --- a/toonz/sources/toonzqt/gutil.cpp +++ b/toonz/sources/toonzqt/gutil.cpp @@ -508,6 +508,27 @@ void addImagesToIcon(QIcon &icon, const QImage &baseImg, const QImage &overImg, //----------------------------------------------------------------------------- +void addSpecifiedSizedImageToIcon(QIcon &icon, const char *iconSVGName, + QSize newSize) { + static int devPixRatio = getHighestDevicePixelRatio(); + newSize *= devPixRatio; + + // Construct icon filenames + QString iconName = QString::fromUtf8(iconSVGName); + QString overIconName = iconName + "_over"; + QString onIconName = iconName + "_on"; + + // Generate icon images + QImage baseImg = generateIconImage(iconName, 1.0, newSize); + QImage overImg = generateIconImage(overIconName, 1.0, newSize); + QImage onImg = generateIconImage(onIconName, 1.0, newSize); + + // Add newly sized images to the icon + addImagesToIcon(icon, baseImg, overImg, onImg); +} + +//----------------------------------------------------------------------------- + // Add the same pixmap to all modes and states of a QIcon void addPixmapToAllModesAndStates(QIcon &icon, const QPixmap &pixmap) { QIcon::Mode modes[] = {QIcon::Normal, QIcon::Disabled, QIcon::Selected}; diff --git a/toonz/sources/toonzqt/menubarcommand.cpp b/toonz/sources/toonzqt/menubarcommand.cpp index 41248c3d..28016f6b 100644 --- a/toonz/sources/toonzqt/menubarcommand.cpp +++ b/toonz/sources/toonzqt/menubarcommand.cpp @@ -424,7 +424,7 @@ void CommandManager::enlargeIcon(CommandId id, const QSize dstSize) { return; } - icon = createQIcon(iconSVGName, false, false, dstSize); + addSpecifiedSizedImageToIcon(icon, iconSVGName, dstSize); action->setIcon(icon); } From 755ed51f07392bcd3add540b31606a67a7f4bca5 Mon Sep 17 00:00:00 2001 From: Martin Strunz Date: Mon, 4 Sep 2023 16:50:07 +0200 Subject: [PATCH 07/10] Update sceneviewerevents.cpp remove identical include --- toonz/sources/toonz/sceneviewerevents.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp index 20e97f91..204a1bab 100644 --- a/toonz/sources/toonz/sceneviewerevents.cpp +++ b/toonz/sources/toonz/sceneviewerevents.cpp @@ -13,7 +13,6 @@ #include "menubarcommandids.h" #include "onionskinmaskgui.h" #include "ruler.h" -#include "comboviewerpane.h" #include "locatorpopup.h" #include "cellselection.h" #include "styleshortcutswitchablepanel.h" From 6ea738cfc457e67e1463785ec1853bb98f83060f Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Mon, 11 Sep 2023 05:28:37 +0300 Subject: [PATCH 08/10] Fix build on FreeBSD 13+ --- toonz/sources/CMakeLists.txt | 2 +- toonz/sources/common/tsystem/tpluginmanager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index a0dd626d..94929fa4 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -520,7 +520,7 @@ elseif(BUILD_ENV_UNIXLIKE) find_package(LZO REQUIRED) message("LZO:" ${LZO_INCLUDE_DIR}) - if(HAIKU) + if(BUILD_TARGET_BSD OR HAIKU) find_library(EXECINFO_LIBRARY execinfo) endif() find_library(PTHREAD_LIBRARY pthread) diff --git a/toonz/sources/common/tsystem/tpluginmanager.cpp b/toonz/sources/common/tsystem/tpluginmanager.cpp index 4c0d20cc..80746911 100644 --- a/toonz/sources/common/tsystem/tpluginmanager.cpp +++ b/toonz/sources/common/tsystem/tpluginmanager.cpp @@ -15,12 +15,12 @@ #include #include #include -#ifndef FREEBSD +#if !defined(FREEBSD) || __FreeBSD_version >= 1300040 #include #endif #include #include -#ifndef HAIKU +#if !defined(HAIKU) && (!defined(FREEBSD) || __FreeBSD_version < 1300040) #include #endif #include // for getfsstat From 37337aeaf44ae403ab9b5f0d7707dbbd5617dd80 Mon Sep 17 00:00:00 2001 From: otakuto Date: Fri, 18 Aug 2023 07:27:20 +0900 Subject: [PATCH 09/10] Remove boost::bind --- toonz/sources/tnztools/levelselection.cpp | 3 +- .../sources/tnztools/vectorselectiontool.cpp | 28 ++++++++----------- toonz/sources/toonz/filebrowser.cpp | 13 ++++----- toonz/sources/toonz/loadfoldercommand.cpp | 23 +++++---------- toonz/sources/toonz/scenebrowser.cpp | 13 ++++----- toonz/sources/toonz/selectionutils.cpp | 4 +-- toonz/sources/toonz/xsheetcmd.cpp | 10 ++----- toonz/sources/toonzlib/palettecmd.cpp | 4 +-- toonz/sources/toonzlib/preferences.cpp | 5 +--- 9 files changed, 35 insertions(+), 68 deletions(-) diff --git a/toonz/sources/tnztools/levelselection.cpp b/toonz/sources/tnztools/levelselection.cpp index bfa0d427..688d1dae 100644 --- a/toonz/sources/tnztools/levelselection.cpp +++ b/toonz/sources/tnztools/levelselection.cpp @@ -14,7 +14,6 @@ // Boost includes #include -#include //******************************************************************************* // Local namespace stuff @@ -108,7 +107,7 @@ void getBoundaries(TVectorImage &vi, std::vector &strokes) { std::copy_if(boost::make_counting_iterator(0u), boost::make_counting_iterator(vi.getStrokeCount()), std::back_inserter(strokes), - boost::bind(locals::isBoundary, sData, _1)); + [&](UINT e) { return locals::isBoundary(sData, e); }); } } // namespace diff --git a/toonz/sources/tnztools/vectorselectiontool.cpp b/toonz/sources/tnztools/vectorselectiontool.cpp index 6523455c..d67fb55a 100644 --- a/toonz/sources/tnztools/vectorselectiontool.cpp +++ b/toonz/sources/tnztools/vectorselectiontool.cpp @@ -24,9 +24,6 @@ // TnzCore includes #include "drawutil.h" -// boost includes -#include - using namespace ToolUtils; using namespace DragSelectionTool; @@ -655,7 +652,7 @@ void DragSelectionTool::VectorDeformTool::transformWholeLevel() { // Remove unwanted fids fids.erase(std::remove_if( fids.begin(), fids.end(), - boost::bind(::currentOrNotSelected, boost::cref(*tool), _1)), + [tool](const TFrameId &fid) { return currentOrNotSelected(*tool, fid); }), fids.end()); TUndoManager::manager()->beginBlock(); @@ -704,9 +701,9 @@ void DragSelectionTool::VectorDeformTool::transformWholeLevel() { // Finally, notify changed frames std::for_each(fids.begin(), fids.end(), - boost::bind( // NOTE: current frame is not here - it should be, - &TTool::notifyImageChanged, m_tool, - _1)); // but it's currently unnecessary, in fact... + // NOTE: current frame is not here - it should be, + // but it's currently unnecessary, in fact... + [this](const TFrameId &fid) { m_tool->notifyImageChanged(fid); }); // notifyImageChanged(fid) must be invoked OUTSIDE of the loop - since it // seems to imply notifyImageChanged() @@ -976,12 +973,12 @@ void DragSelectionTool::VectorChangeThicknessTool::setStrokesThickness( const std::set &selectedStrokeIdxs = strokeSelection->getSelection(); std::for_each(selectedStrokeIdxs.begin(), selectedStrokeIdxs.end(), - boost::bind(locals::setThickness, boost::cref(data), _1)); + [&data](int s) { locals::setThickness(data, s); }); } else { std::vector strokeIdxs = getSelectedStrokes(vi, levelSelection); std::for_each(strokeIdxs.begin(), strokeIdxs.end(), - boost::bind(locals::setThickness, boost::cref(data), _1)); + [&data](int s) { locals::setThickness(data, s); }); } } @@ -1030,12 +1027,12 @@ void DragSelectionTool::VectorChangeThicknessTool::changeImageThickness( const std::set &selectedStrokeIdxs = strokeSelection->getSelection(); std::for_each(selectedStrokeIdxs.begin(), selectedStrokeIdxs.end(), - boost::bind(locals::changeThickness, boost::ref(data), _1)); + [&data](int s) { locals::changeThickness(data, s); }); } else { std::vector strokeIdxs = getSelectedStrokes(vi, levelSelection); std::for_each(strokeIdxs.begin(), strokeIdxs.end(), - boost::bind(locals::changeThickness, boost::ref(data), _1)); + [&data](int s) { locals::changeThickness(data, s); }); } } @@ -1061,8 +1058,7 @@ void DragSelectionTool::VectorChangeThicknessTool::addUndo() { // Remove unwanted frames fids.erase(std::remove_if(fids.begin(), fids.end(), - boost::bind(::currentOrNotSelected, - boost::cref(*vtool), _1)), + [vtool](const TFrameId &fid) { return currentOrNotSelected(*vtool, fid); }), fids.end()); TUndoManager::manager()->beginBlock(); @@ -1098,9 +1094,7 @@ void DragSelectionTool::VectorChangeThicknessTool::addUndo() { // Finally, notify changed frames std::for_each(fids.begin(), fids.end(), - boost::bind( // NOTE: current frame is not here - it was - &TTool::notifyImageChanged, m_tool, - _1)); // aldready notified + [this](const TFrameId &fid) { m_tool->notifyImageChanged(fid); }); } else TUndoManager::manager()->add(m_undo.release()); // Outside any undo block } @@ -1286,7 +1280,7 @@ void VectorSelectionTool::setNewFreeDeformer() { fids.erase(std::remove_if( fids.begin(), fids.end(), - boost::bind(::currentOrNotSelected, boost::cref(*this), _1)), + [this](const TFrameId &fid) { return currentOrNotSelected(*this, fid); }), fids.end()); std::vector::iterator ft, fEnd = fids.end(); diff --git a/toonz/sources/toonz/filebrowser.cpp b/toonz/sources/toonz/filebrowser.cpp index 9e22eea2..f7c2161f 100644 --- a/toonz/sources/toonz/filebrowser.cpp +++ b/toonz/sources/toonz/filebrowser.cpp @@ -80,7 +80,6 @@ #include "tcg/boost/permuted_range.h" // boost includes -#include #include #include #include @@ -435,7 +434,7 @@ void FileBrowser::sortByDataModel(DataType dataType, bool isDiscendent) { std::stable_sort( new2OldIdx.begin(), new2OldIdx.end(), - boost::bind(locals::itemLess, _1, _2, boost::ref(*this), dataType)); + [this, dataType](int x, int y) { return locals::itemLess(x, y, *this, dataType); }); // Use the renumbering table to permutate elements std::vector( @@ -453,15 +452,13 @@ void FileBrowser::sortByDataModel(DataType dataType, bool isDiscendent) { boost::make_counting_iterator(int(m_items.size()))); std::sort(old2NewIdx.begin(), old2NewIdx.end(), - boost::bind(locals::indexLess, _1, _2, boost::ref(new2OldIdx))); + [&new2OldIdx](int aIdx, int bIdx){ return locals::indexLess(aIdx, bIdx, new2OldIdx); }); std::vector newSelectedIndices; tcg::substitute( newSelectedIndices, tcg::permuted_range(old2NewIdx, fs->getSelectedIndices() | - ba::filtered(boost::bind( - std::less(), _1, - int(old2NewIdx.size()))))); + ba::filtered([&old2NewIdx](int x){ return x < old2NewIdx.size(); }))); fs->select(!newSelectedIndices.empty() ? &newSelectedIndices.front() : 0, int(newSelectedIndices.size())); @@ -486,8 +483,8 @@ void FileBrowser::sortByDataModel(DataType dataType, bool isDiscendent) { tcg::substitute( newSelectedIndices, fs->getSelectedIndices() | - ba::filtered(boost::bind(std::less(), _1, iCount)) | - ba::transformed(boost::bind(locals::complement, _1, lastIdx))); + ba::filtered([iCount](int x){ return x < iCount; }) | + ba::transformed([lastIdx](int x){ return locals::complement(x, lastIdx); })); fs->select(!newSelectedIndices.empty() ? &newSelectedIndices.front() : 0, int(newSelectedIndices.size())); diff --git a/toonz/sources/toonz/loadfoldercommand.cpp b/toonz/sources/toonz/loadfoldercommand.cpp index 47fb11d0..05d9301b 100644 --- a/toonz/sources/toonz/loadfoldercommand.cpp +++ b/toonz/sources/toonz/loadfoldercommand.cpp @@ -35,8 +35,6 @@ #include #include -#include - #include #include @@ -239,9 +237,7 @@ struct buildResources_locals { const MergeData *mdt, *mdEnd = mergeTable + boost::size(mergeTable) - 1; // Last item is fake - mdt = std::find_if(mergeTable, mdEnd, - boost::bind(exactMatch, _1, - boost::cref(rt->first.first.m_relFp))); + mdt = std::find_if(mergeTable, mdEnd, [&rt](const MergeData& mergeData){ return exactMatch(mergeData, rt->first.first.m_relFp); }); if (mdt != mdEnd) { // Lookup every possible resource component to merge @@ -306,8 +302,7 @@ void buildResources(std::vector &resources, const TFilePath &rootPath, const FormatData *fdt, *fdEnd = l_formatDatas + boost::size(l_formatDatas); fdt = std::find_if( - l_formatDatas, fdEnd, - boost::bind(exactMatch, _1, boost::cref(relPath))); + l_formatDatas, fdEnd, [&relPath](const FormatData &formatData){ return exactMatch(formatData, relPath); }); if (fdt != fdEnd) { relPath = fdt->m_resourcePathFunc(relPath); @@ -402,8 +397,7 @@ struct import_Locals { // Perform resource copy std::for_each(rsrc.m_components.begin(), rsrc.m_components.end(), - boost::bind(copy, boost::cref(srcDir), boost::cref(dstDir), - _1, overwrite)); + [&srcDir, &dstDir, &overwrite](const Resource::Component &comp){ copy(srcDir, dstDir, comp, overwrite); }); } catch (const TException &e) { DVGui::error(QString::fromStdWString(e.getMessage())); } catch (...) { @@ -492,7 +486,7 @@ QString OverwriteDialog::acceptResolution(void *obj_, int resolution, static bool existsResource(const TFilePath &dstDir, const Resource &rsrc) { return std::any_of(rsrc.m_components.begin(), rsrc.m_components.end(), - boost::bind(existsComponent, boost::cref(dstDir), _1)); + [&dstDir](const Resource::Component &comp){ return existsComponent(dstDir, comp); }); } }; // locals @@ -547,7 +541,7 @@ int IoCmd::loadResourceFolders(LoadResourceArguments &args, { if (std::any_of( args.resourceDatas.begin(), args.resourceDatas.end(), - boost::bind(locals::isExternPath, boost::cref(*scene), _1))) { + [scene](const LRArgs::ResourceData &rd){ return locals::isExternPath(*scene, rd); })) { // Ask for data import in this case int resolutionButton = DVGui::MsgBox( QObject::tr("Selected folders don't belong to the current project.\n" @@ -570,11 +564,8 @@ int IoCmd::loadResourceFolders(LoadResourceArguments &args, // Select resources to be loaded std::vector resources; - boost::for_each( - args.resourceDatas | - boost::adaptors::transformed(boost::bind( - &LRArgs::ResourceData::m_path, _1)), - boost::bind(::buildResources, boost::ref(resources), _1, TFilePath())); + boost::for_each(args.resourceDatas, + [&resources](const LRArgs::ResourceData &resourceData){ buildResources(resources, resourceData.m_path, TFilePath()); }); // Import them if required if (import) ::import(*scene, resources, *sb); diff --git a/toonz/sources/toonz/scenebrowser.cpp b/toonz/sources/toonz/scenebrowser.cpp index f79eaf2e..a44a5199 100644 --- a/toonz/sources/toonz/scenebrowser.cpp +++ b/toonz/sources/toonz/scenebrowser.cpp @@ -81,7 +81,6 @@ #include "tcg/boost/permuted_range.h" // boost includes -#include #include #include #include @@ -419,7 +418,7 @@ void SceneBrowser::sortByDataModel(DataType dataType, bool isDiscendent) { std::stable_sort( new2OldIdx.begin(), new2OldIdx.end(), - boost::bind(locals::itemLess, _1, _2, boost::ref(*this), dataType)); + [this, dataType](int x, int y){ return locals::itemLess(x, y, *this, dataType); }); // Use the renumbering table to permutate elements std::vector( @@ -437,15 +436,13 @@ void SceneBrowser::sortByDataModel(DataType dataType, bool isDiscendent) { boost::make_counting_iterator(int(m_items.size()))); std::sort(old2NewIdx.begin(), old2NewIdx.end(), - boost::bind(locals::indexLess, _1, _2, boost::ref(new2OldIdx))); + [&new2OldIdx](int x, int y){ return locals::indexLess(x, y, new2OldIdx); }); std::vector newSelectedIndices; tcg::substitute( newSelectedIndices, tcg::permuted_range(old2NewIdx, fs->getSelectedIndices() | - ba::filtered(boost::bind( - std::less(), _1, - int(old2NewIdx.size()))))); + ba::filtered([&old2NewIdx](int x){ return x < old2NewIdx.size(); }))); fs->select(!newSelectedIndices.empty() ? &newSelectedIndices.front() : 0, int(newSelectedIndices.size())); @@ -470,8 +467,8 @@ void SceneBrowser::sortByDataModel(DataType dataType, bool isDiscendent) { tcg::substitute( newSelectedIndices, fs->getSelectedIndices() | - ba::filtered(boost::bind(std::less(), _1, iCount)) | - ba::transformed(boost::bind(locals::complement, _1, lastIdx))); + ba::filtered([iCount](int x){ return x < iCount; }) | + ba::transformed([lastIdx](int x){ return locals::complement(x, lastIdx); })); fs->select(!newSelectedIndices.empty() ? &newSelectedIndices.front() : 0, int(newSelectedIndices.size())); diff --git a/toonz/sources/toonz/selectionutils.cpp b/toonz/sources/toonz/selectionutils.cpp index 39b611ec..7be8f305 100644 --- a/toonz/sources/toonz/selectionutils.cpp +++ b/toonz/sources/toonz/selectionutils.cpp @@ -24,7 +24,6 @@ #include "tcg/boost/range_utility.h" // Boost includes -#include #include #include @@ -63,8 +62,7 @@ void getSelectedFrames( if (!sl) continue; tcg::substitute(frames[sl], boost::counting_range(0, sl->getFrameCount()) | - boost::adaptors::transformed(boost::bind( - &TXshSimpleLevel::getFrameId, sl, _1))); + boost::adaptors::transformed([&sl](int index){ return sl->getFrameId(index); })); } } diff --git a/toonz/sources/toonz/xsheetcmd.cpp b/toonz/sources/toonz/xsheetcmd.cpp index a265d003..396168be 100644 --- a/toonz/sources/toonz/xsheetcmd.cpp +++ b/toonz/sources/toonz/xsheetcmd.cpp @@ -72,8 +72,6 @@ #include "tcg/boost/range_utility.h" // boost includes -#include -#include #include #include @@ -506,8 +504,7 @@ public: : GlobalKeyframeUndo(frame) { tcg::substitute( m_columns, - columns | ba::filtered(std::not1(boost::make_adaptable( - boost::bind(isKeyframe, frame, _1))))); + columns | ba::filtered([frame](int c){ return !isKeyframe(frame, c); })); } void redo() const override { @@ -581,11 +578,10 @@ public: }; // locals tcg::substitute(m_columns, - columns | ba::filtered(boost::bind(isKeyframe, frame, _1))); + columns | ba::filtered([frame](int c){ return isKeyframe(frame, c); })); tcg::substitute(m_keyframes, - m_columns | ba::transformed(boost::bind(locals::getKeyframe, - frame, _1))); + m_columns | ba::transformed([frame](int c){ return locals::getKeyframe(frame, c); })); } void redo() const override { diff --git a/toonz/sources/toonzlib/palettecmd.cpp b/toonz/sources/toonzlib/palettecmd.cpp index 1bc38fdd..2c4bb8cc 100644 --- a/toonz/sources/toonzlib/palettecmd.cpp +++ b/toonz/sources/toonzlib/palettecmd.cpp @@ -39,7 +39,6 @@ #include "tcg/boost/range_utility.h" // boost includes -#include #include #include #include @@ -585,8 +584,7 @@ void PaletteCmd::eraseStyles(const std::set &levels, tcg::substitute( levelImages.second, boost::counting_range(0, levelImages.first->getFrameCount()) | - boost::adaptors::transformed(boost::bind( - cloneImage, boost::cref(*levelImages.first), _1))); + boost::adaptors::transformed([&levelImages](int f){ return cloneImage(*levelImages.first, f); })); } static void restoreImage(const TXshSimpleLevelP &level, int f, diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cpp index 62695afd..97058596 100644 --- a/toonz/sources/toonzlib/preferences.cpp +++ b/toonz/sources/toonzlib/preferences.cpp @@ -28,9 +28,6 @@ #include #include -// boost includes -#include - //********************************************************************************** // Local namespace stuff //********************************************************************************** @@ -1130,7 +1127,7 @@ int Preferences::levelFormatsCount() const { int Preferences::matchLevelFormat(const TFilePath &fp) const { LevelFormatVector::const_iterator lft = std::find_if(m_levelFormats.begin(), m_levelFormats.end(), - boost::bind(&LevelFormat::matches, _1, boost::cref(fp))); + [&fp](const LevelFormat &format) { return format.matches(fp); }); return (lft != m_levelFormats.end()) ? lft - m_levelFormats.begin() : -1; } From 4f1ce85ca62253fb9b68b429cad185da0ba39d1d Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Mon, 25 Sep 2023 20:00:20 +0700 Subject: [PATCH 10/10] fix column right-click action --- toonz/sources/toonz/columncommand.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/toonz/sources/toonz/columncommand.cpp b/toonz/sources/toonz/columncommand.cpp index dfa39f0a..800ed1f0 100644 --- a/toonz/sources/toonz/columncommand.cpp +++ b/toonz/sources/toonz/columncommand.cpp @@ -1453,7 +1453,9 @@ public: TXshColumn *column = xsh->getColumn(i); if (!column) continue; /*- Skip if target is in selected column mode and not selected -*/ - bool isSelected = selection && selection->isColumnSelected(i); + bool isSelected = selection && !selection->isEmpty() + ? selection->isColumnSelected(i) + : cc == i; if (m_target == TARGET_SELECTED && !isSelected) continue; /*-