Traktor: Fixed some deprecation warnings in UI. Also new checkbox ima…

…ges.
apistol78 · May 14, 2024 · e0ca872 · e0ca872
1 parent 291947c
commit e0ca872
Show file tree

Hide file tree

Showing 87 changed files with 348 additions and 265 deletions.
diff --git a/code/Editor/App/BrowseInstanceDialog.cpp b/code/Editor/App/BrowseInstanceDialog.cpp
@@ -248,7 +248,7 @@ void BrowseInstanceDialog::updatePreviewList()
 				ui::PreviewItem* item = previewItems->get(i);
 				if (!item->getImage())
 				{
-					m_previewTasks.put([=](){ taskGeneratePreview(item); });
+					m_previewTasks.put([=, this](){ taskGeneratePreview(item); });
 					m_previewTaskEvent.pulse();
 				}
 			}

diff --git a/code/Editor/App/EditorForm.cpp b/code/Editor/App/EditorForm.cpp
@@ -1877,7 +1877,7 @@ void EditorForm::buildAssets(const AlignedVector< Guid >& assetGuids, bool rebui
 	buildWaitUntilFinished();
 
 	// Create build thread.
-	m_threadBuild = ThreadManager::getInstance().create([=](){ buildAssetsThread(assetGuids, rebuild); }, L"Pipeline thread");
+	m_threadBuild = ThreadManager::getInstance().create([=, this](){ buildAssetsThread(assetGuids, rebuild); }, L"Pipeline thread");
 	if (m_threadBuild)
 	{
 		m_threadBuild->start(Thread::Above);

diff --git a/code/Editor/App/SearchToolDialog.cpp b/code/Editor/App/SearchToolDialog.cpp
@@ -341,7 +341,7 @@ void SearchToolDialog::search(const std::wstring& needle)
 	bool caseSensitive = m_checkCaseSensitive->isChecked();
 
 	m_gridResults->removeAllRows();
-	m_jobSearch = JobManager::getInstance().add([=](){
+	m_jobSearch = JobManager::getInstance().add([=, this](){
 		jobSearch(needle, regExp, caseSensitive);
 	});
 

diff --git a/code/Render/Editor/Shader/ShaderViewer.cpp b/code/Render/Editor/Shader/ShaderViewer.cpp
@@ -378,7 +378,7 @@ void ShaderViewer::eventTimer(ui::TimerEvent* event)
 			return;
 
 		Ref< ShaderGraph > shaderGraph = m_pendingShaderGraph;
-		m_reflectJob = JobManager::getInstance().add([=](){
+		m_reflectJob = JobManager::getInstance().add([=, this](){
 			jobReflect(shaderGraph, compiler);
 		});
 

diff --git a/code/Scene/Editor/RenderControls/PerspectiveRenderControl.cpp b/code/Scene/Editor/RenderControls/PerspectiveRenderControl.cpp
@@ -137,7 +137,7 @@ bool PerspectiveRenderControl::create(ui::Widget* parent, SceneEditorContext* co
 	m_renderGraph = new render::RenderGraph(
 		m_context->getRenderSystem(),
 		m_multiSample,
-		[=](int32_t pass, int32_t level, const std::wstring& name, double start, double duration) {
+		[=, this](int32_t pass, int32_t level, const std::wstring& name, double start, double duration) {
 			m_context->raiseMeasurement(pass, level, name, start, duration);
 		}
 	);

diff --git a/code/Ui/AspectLayout.h b/code/Ui/AspectLayout.h
@@ -29,7 +29,7 @@ class T_DLLCLASS AspectLayout : public Layout
 	T_RTTI_CLASS;
 
 public:
-	AspectLayout(float ratio = -1.0f);
+	explicit AspectLayout(float ratio = -1.0f);
 
 	virtual bool fit(Widget* widget, const Size& bounds, Size& result) override;
 

diff --git a/code/Ui/Auto/AutoWidget.cpp b/code/Ui/Auto/AutoWidget.cpp
@@ -18,7 +18,7 @@ namespace traktor::ui
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.AutoWidget", AutoWidget, Widget)
 
-bool AutoWidget::create(ui::Widget* parent, int32_t style)
+bool AutoWidget::create(ui::Widget* parent, uint32_t style)
 {
 	if (!ui::Widget::create(parent, style))
 		return false;

diff --git a/code/Ui/Auto/AutoWidget.h b/code/Ui/Auto/AutoWidget.h
@@ -40,7 +40,7 @@ class T_DLLCLASS AutoWidget : public Widget
 	T_RTTI_CLASS;
 
 public:
-	bool create(ui::Widget* parent, int32_t style);
+	bool create(ui::Widget* parent, uint32_t style);
 
 	void setFocusCell(AutoWidgetCell* focusCell);
 

diff --git a/code/Ui/Auto/ChildWidgetCell.h b/code/Ui/Auto/ChildWidgetCell.h
@@ -33,7 +33,7 @@ class T_DLLCLASS ChildWidgetCell : public AutoWidgetCell
 	T_RTTI_CLASS;
 
 public:
-	ChildWidgetCell(Widget* child);
+	explicit ChildWidgetCell(Widget* child);
 
 	virtual ~ChildWidgetCell();
 

diff --git a/code/Ui/BuildChart/BuildChartControl.cpp b/code/Ui/BuildChart/BuildChartControl.cpp
@@ -33,7 +33,7 @@ BuildChartControl::BuildChartControl()
 {
 }
 
-bool BuildChartControl::create(Widget* parent, uint32_t laneCount, int style)
+bool BuildChartControl::create(Widget* parent, uint32_t laneCount, uint32_t style)
 {
 	if (!Widget::create(parent, style))
 		return false;

diff --git a/code/Ui/BuildChart/BuildChartControl.h b/code/Ui/BuildChart/BuildChartControl.h
@@ -32,21 +32,15 @@ class T_DLLCLASS BuildChartControl : public Widget
 public:
 	struct Task
 	{
-		double time0;
-		double time1;
+		double time0 = -1.0;
+		double time1 = -1.0;
 		std::wstring text;
 		Color4ub color;
-
-		Task()
-		:	time0(-1.0)
-		,	time1(-1.0)
-		{
-		}
 	};
 
 	BuildChartControl();
 
-	bool create(Widget* parent, uint32_t laneCount, int style = WsDoubleBuffer);
+	bool create(Widget* parent, uint32_t laneCount, uint32_t style = WsDoubleBuffer);
 
 	void showRange(double fromTime, double toTime);
 

diff --git a/code/Ui/Button.cpp b/code/Ui/Button.cpp
@@ -17,9 +17,9 @@ namespace traktor::ui
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.Button", Button, Widget)
 
-bool Button::create(Widget* parent, const std::wstring& text, int style)
+bool Button::create(Widget* parent, const std::wstring& text, uint32_t style)
 {
-	if (!Widget::create(parent))
+	if (!Widget::create(parent, style))
 		return false;
 
 	addEventHandler< MouseTrackEvent >(this, &Button::eventMouseTrack);

diff --git a/code/Ui/Button.h b/code/Ui/Button.h
@@ -29,13 +29,10 @@ class T_DLLCLASS Button : public Widget
 	T_RTTI_CLASS;
 
 public:
-	enum StyleFlags
-	{
-		WsDefaultButton	= WsUser,
-		WsToggle = (WsUser << 1)
-	};
+	constexpr static uint32_t WsDefaultButton = WsUser;
+	constexpr static uint32_t WsToggle = (WsUser << 1);
 
-	bool create(Widget* parent, const std::wstring& text, int style = WsNone);
+	bool create(Widget* parent, const std::wstring& text, uint32_t style = WsNone);
 
 	virtual Size getPreferredSize(const Size& hint) const override;
 

diff --git a/code/Ui/CaptionBar.cpp b/code/Ui/CaptionBar.cpp
@@ -24,7 +24,7 @@ const Unit c_preferedHeightMargin = 8_ut;
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.CaptionBar", CaptionBar, Widget)
 
-bool CaptionBar::create(Widget* parent, int style)
+bool CaptionBar::create(Widget* parent, uint32_t style)
 {
 	if (!Widget::create(parent, style))
 		return false;

diff --git a/code/Ui/CaptionBar.h b/code/Ui/CaptionBar.h
@@ -31,7 +31,7 @@ class T_DLLCLASS CaptionBar : public Widget
 	T_RTTI_CLASS;
 
 public:
-	bool create(Widget* parent, int style = WsNone);
+	bool create(Widget* parent, uint32_t style = WsNone);
 
 	virtual Size getPreferredSize(const Size& hint) const override;
 

diff --git a/code/Ui/ColorPicker/ColorControl.cpp b/code/Ui/ColorPicker/ColorControl.cpp
@@ -24,7 +24,7 @@ const Unit c_height = 24_ut;
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.ColorControl", ColorControl, Widget)
 
-bool ColorControl::create(Widget* parent, int style)
+bool ColorControl::create(Widget* parent, uint32_t style)
 {
 	if (!Widget::create(parent, style))
 		return false;

diff --git a/code/Ui/ColorPicker/ColorControl.h b/code/Ui/ColorPicker/ColorControl.h
@@ -38,7 +38,7 @@ class T_DLLCLASS ColorControl : public Widget
 	T_RTTI_CLASS;
 
 public:
-	bool create(Widget* parent, int style);
+	bool create(Widget* parent, uint32_t style);
 
 	void setColor(const Color4ub& color);
 

diff --git a/code/Ui/ColorPicker/ColorDialog.cpp b/code/Ui/ColorPicker/ColorDialog.cpp
@@ -61,7 +61,7 @@ struct AlphaGradient : public ColorSliderControl::IGradient
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.ColorDialog", ColorDialog, ConfigDialog)
 
-bool ColorDialog::create(Widget* parent, const std::wstring& text, int32_t style, const Color4f& initialColor)
+bool ColorDialog::create(Widget* parent, const std::wstring& text, uint32_t style, const Color4f& initialColor)
 {
 	if (!ConfigDialog::create(
 		parent,

diff --git a/code/Ui/ColorPicker/ColorDialog.h b/code/Ui/ColorPicker/ColorDialog.h
@@ -41,13 +41,10 @@ class T_DLLCLASS ColorDialog : public ConfigDialog
 	T_RTTI_CLASS;
 
 public:
-	enum StyleFlags
-	{
-		WsAlpha = WsUser,
-		WsHDR = (WsUser << 1)
-	};
+	constexpr static uint32_t WsAlpha = WsUser;
+	constexpr static uint32_t WsHDR = (WsUser << 1);
 
-	bool create(Widget* parent, const std::wstring& text, int32_t style = WsDefaultFixed, const Color4f& initialColor = Color4f(1.0f, 1.0f, 1.0f, 1.0f));
+	bool create(Widget* parent, const std::wstring& text, uint32_t style = WsDefaultFixed, const Color4f& initialColor = Color4f(1.0f, 1.0f, 1.0f, 1.0f));
 
 	void setColor(const Color4f& color);
 

diff --git a/code/Ui/ColorPicker/ColorGradientControl.cpp b/code/Ui/ColorPicker/ColorGradientControl.cpp
@@ -19,7 +19,7 @@ namespace traktor::ui
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.ColorGradientControl", ColorGradientControl, Widget)
 
-bool ColorGradientControl::create(Widget* parent, int style, const Color4ub& primaryColor)
+bool ColorGradientControl::create(Widget* parent, uint32_t style, const Color4ub& primaryColor)
 {
 	if (!Widget::create(parent, style))
 		return false;

diff --git a/code/Ui/ColorPicker/ColorGradientControl.h b/code/Ui/ColorPicker/ColorGradientControl.h
@@ -40,7 +40,7 @@ class T_DLLCLASS ColorGradientControl : public Widget
 	T_RTTI_CLASS;
 
 public:
-	bool create(Widget* parent, int style, const Color4ub& color = Color4ub(0, 0, 0, 255));
+	bool create(Widget* parent, uint32_t style, const Color4ub& color = Color4ub(0, 0, 0, 255));
 
 	virtual Size getPreferredSize(const Size& hint) const override;
 

diff --git a/code/Ui/ColorPicker/ColorSliderControl.cpp b/code/Ui/ColorPicker/ColorSliderControl.cpp
@@ -19,7 +19,7 @@ namespace traktor::ui
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.ColorSliderControl", ColorSliderControl, Widget)
 
-bool ColorSliderControl::create(Widget* parent, int style, IGradient* gradient)
+bool ColorSliderControl::create(Widget* parent, uint32_t style, IGradient* gradient)
 {
 	if (!Widget::create(parent, style))
 		return false;

diff --git a/code/Ui/ColorPicker/ColorSliderControl.h b/code/Ui/ColorPicker/ColorSliderControl.h
@@ -43,7 +43,7 @@ class T_DLLCLASS ColorSliderControl : public Widget
 		virtual Color4ub get(int32_t at) const = 0;
 	};
 
-	bool create(Widget* parent, int style, IGradient* gradient);
+	bool create(Widget* parent, uint32_t style, IGradient* gradient);
 
 	void setMarker(int32_t marker);
 

diff --git a/code/Ui/ComboBox.cpp b/code/Ui/ComboBox.cpp
@@ -17,7 +17,7 @@ namespace traktor::ui
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.ComboBox", ComboBox, Widget)
 
-bool ComboBox::create(Widget* parent, const std::wstring& text, int style)
+bool ComboBox::create(Widget* parent, const std::wstring& text, uint32_t style)
 {
 	if (!Widget::create(parent, style))
 		return false;

diff --git a/code/Ui/ComboBox.h b/code/Ui/ComboBox.h
@@ -34,7 +34,7 @@ class T_DLLCLASS ComboBox : public Widget
 	T_RTTI_CLASS;
 
 public:
-	bool create(Widget* parent, const std::wstring& text, int style = WsNone);
+	bool create(Widget* parent, const std::wstring& text, uint32_t style = WsNone);
 
 	int add(const std::wstring& item);
 

diff --git a/code/Ui/ConfigDialog.cpp b/code/Ui/ConfigDialog.cpp
@@ -16,7 +16,7 @@ namespace traktor::ui
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.ConfigDialog", ConfigDialog, Dialog)
 
-bool ConfigDialog::create(Widget* parent, const std::wstring& text, Unit width, Unit height, int style, Layout* layout)
+bool ConfigDialog::create(Widget* parent, const std::wstring& text, Unit width, Unit height, uint32_t style, Layout* layout)
 {
 	if (!Dialog::create(parent, text, width, height, style, layout))
 		return false;

diff --git a/code/Ui/ConfigDialog.h b/code/Ui/ConfigDialog.h
@@ -32,14 +32,11 @@ class T_DLLCLASS ConfigDialog : public Dialog
 	T_RTTI_CLASS;
 
 public:
-	enum StyleFlags
-	{
-		WsOkCancelButtons = 0,
-		WsYesNoButtons = (WsUser << 1),
-		WsApplyButton = (WsUser << 2)
-	};
-
-	bool create(Widget* parent, const std::wstring& text, Unit width, Unit height, int style, Layout* layout);
+	constexpr static uint32_t WsOkCancelButtons = 0;
+	constexpr static uint32_t WsYesNoButtons = (WsUser << 1);
+	constexpr static uint32_t WsApplyButton = (WsUser << 2);
+
+	bool create(Widget* parent, const std::wstring& text, Unit width, Unit height, uint32_t style, Layout* layout);
 
 	virtual void destroy() override;
 

diff --git a/code/Ui/Container.cpp b/code/Ui/Container.cpp
@@ -18,7 +18,7 @@ namespace traktor::ui
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.Container", Container, Widget)
 
-bool Container::create(Widget* parent, int style, Layout* layout)
+bool Container::create(Widget* parent, uint32_t style, Layout* layout)
 {
 	m_layout = layout;
 

diff --git a/code/Ui/Container.h b/code/Ui/Container.h
@@ -39,7 +39,7 @@ class T_DLLCLASS Container : public Widget
 		Both = (Horizontal | Vertical)
 	};
 
-	bool create(Widget* parent, int style = WsNone, Layout* layout = nullptr);
+	bool create(Widget* parent, uint32_t style = WsNone, Layout* layout = nullptr);
 
 	virtual void fit(uint32_t axis);
 

diff --git a/code/Ui/Dialog.cpp b/code/Ui/Dialog.cpp
@@ -38,7 +38,7 @@ WidgetType* getAncestorOf(Widget* widget)
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.Dialog", Dialog, Container)
 
-bool Dialog::create(Widget* parent, const std::wstring& text, Unit width, Unit height, int style, Layout* layout)
+bool Dialog::create(Widget* parent, const std::wstring& text, Unit width, Unit height, uint32_t style, Layout* layout)
 {
 	IDialog* dialog = Application::getInstance()->getWidgetFactory()->createDialog(this);
 	if (!dialog)

diff --git a/code/Ui/Dialog.h b/code/Ui/Dialog.h
@@ -33,15 +33,12 @@ class T_DLLCLASS Dialog : public Container
 	T_RTTI_CLASS;
 
 public:
-	enum StyleFlags
-	{
-		WsCenterParent = WsUser,
-		WsCenterDesktop = (WsUser << 1),
-		WsDefaultFixed = WsSystemBox | WsMinimizeBox | WsCloseBox | WsCaption,
-		WsDefaultResizable = WsResizable | WsSystemBox | WsMinimizeBox | WsMaximizeBox | WsCloseBox | WsCaption
-	};
-
-	bool create(Widget* parent, const std::wstring& text, Unit width, Unit height, int style = WsDefaultResizable, Layout* layout = 0);
+	constexpr static uint32_t WsCenterParent = WsUser;
+	constexpr static uint32_t WsCenterDesktop = (WsUser << 1);
+	constexpr static uint32_t WsDefaultFixed = WsSystemBox | WsMinimizeBox | WsCloseBox | WsCaption;
+	constexpr static uint32_t WsDefaultResizable = WsResizable | WsSystemBox | WsMinimizeBox | WsMaximizeBox | WsCloseBox | WsCaption;
+
+	bool create(Widget* parent, const std::wstring& text, Unit width, Unit height, uint32_t style = WsDefaultResizable, Layout* layout = 0);
 
 	void setIcon(IBitmap* icon);
 

diff --git a/code/Ui/DropDown.cpp b/code/Ui/DropDown.cpp
@@ -20,7 +20,7 @@ namespace traktor::ui
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.ui.DropDown", DropDown, Widget)
 
-bool DropDown::create(Widget* parent, int32_t style)
+bool DropDown::create(Widget* parent, uint32_t style)
 {
 	if (!Widget::create(parent, style))
 		return false;

diff --git a/code/Ui/DropDown.h b/code/Ui/DropDown.h
@@ -30,14 +30,11 @@ class T_DLLCLASS DropDown : public Widget
 	T_RTTI_CLASS;
 
 public:
-	enum Styles
-	{
-		WsSingle = 0,
-		WsMultiple = WsUser,
-		WsDefault = WsSingle
-	};
+	constexpr static uint32_t WsSingle = 0;
+	constexpr static uint32_t WsMultiple = WsUser;
+	constexpr static uint32_t WsDefault = WsSingle;
 
-	bool create(Widget* parent, int32_t style = WsDefault);
+	bool create(Widget* parent, uint32_t style = WsDefault);
 
 	int32_t add(const std::wstring& item, Object* data = 0);
 

diff --git a/code/Ui/Edit.cpp b/code/Ui/Edit.cpp
@@ -43,7 +43,7 @@ Edit::Edit()
 {
 }
 
-bool Edit::create(Widget* parent, const std::wstring& text, int style, const EditValidator* validator)
+bool Edit::create(Widget* parent, const std::wstring& text, uint32_t style, const EditValidator* validator)
 {
 	if (!Widget::create(parent, style | WsDoubleBuffer))
 		return false;

diff --git a/code/Ui/Edit.h b/code/Ui/Edit.h
@@ -31,14 +31,11 @@ class T_DLLCLASS Edit : public Widget
 	T_RTTI_CLASS;
 
 public:
-	enum Styles
-	{
-		WsReadOnly = WsUser
-	};
+	constexpr static uint32_t WsReadOnly = WsUser;
 
 	Edit();
 
-	bool create(Widget* parent, const std::wstring& text = L"", int style = WsNone, const EditValidator* validator = nullptr);
+	bool create(Widget* parent, const std::wstring& text = L"", uint32_t style = WsNone, const EditValidator* validator = nullptr);
 
 	virtual void destroy() override;