fixed gcc compile issues
This commit is contained in:
@@ -194,6 +194,8 @@ void CurveView::ScaleChangedEvent(double scale)
|
||||
|
||||
void CurveView::VerticalScaleChangedEvent(double scale)
|
||||
{
|
||||
Q_UNUSED(scale)
|
||||
|
||||
QMap<NodeKeyframe*, KeyframeViewItem*>::const_iterator iterator;
|
||||
|
||||
for (iterator=item_map().begin();iterator!=item_map().end();iterator++) {
|
||||
|
||||
@@ -197,7 +197,7 @@ void KeyframeViewBase::ScaleChangedEvent(double scale)
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewBase::VerticalScaleChangedEvent(double scale)
|
||||
void KeyframeViewBase::VerticalScaleChangedEvent(double)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -300,9 +300,9 @@ void KeyframeViewBase::ShowContextMenu()
|
||||
|
||||
MenuShared::instance()->AddItemsForEditMenu(&m);
|
||||
|
||||
QAction* linear_key_action;
|
||||
QAction* bezier_key_action;
|
||||
QAction* hold_key_action;
|
||||
QAction* linear_key_action = nullptr;
|
||||
QAction* bezier_key_action = nullptr;
|
||||
QAction* hold_key_action = nullptr;
|
||||
|
||||
QList<QGraphicsItem*> items = scene()->selectedItems();
|
||||
if (!items.isEmpty()) {
|
||||
|
||||
@@ -228,5 +228,7 @@ void NodeParamView::ItemRequestedTimeChanged(const rational &time)
|
||||
|
||||
void NodeParamView::ForceKeyframeViewToScroll(int min, int max)
|
||||
{
|
||||
Q_UNUSED(min)
|
||||
|
||||
bottom_item_->setY(keyframe_view_->viewport()->height() + max);
|
||||
}
|
||||
|
||||
@@ -33,17 +33,17 @@ int IntegerSlider::GetValue()
|
||||
|
||||
void IntegerSlider::SetValue(const int64_t &v)
|
||||
{
|
||||
SliderBase::SetValue(v);
|
||||
SliderBase::SetValue(QVariant::fromValue(v));
|
||||
}
|
||||
|
||||
void IntegerSlider::SetMinimum(const int64_t &d)
|
||||
{
|
||||
SetMinimumInternal(d);
|
||||
SetMinimumInternal(QVariant::fromValue(d));
|
||||
}
|
||||
|
||||
void IntegerSlider::SetMaximum(const int64_t &d)
|
||||
{
|
||||
SetMaximumInternal(d);
|
||||
SetMaximumInternal(QVariant::fromValue(d));
|
||||
}
|
||||
|
||||
QVariant IntegerSlider::StringToValue(const QString &s, bool *ok)
|
||||
|
||||
@@ -30,5 +30,5 @@ QString TimeSlider::ValueToString(const QVariant &v)
|
||||
|
||||
QVariant TimeSlider::StringToValue(const QString &s, bool *ok)
|
||||
{
|
||||
return Timecode::timecode_to_timestamp(s, timebase_, Timecode::CurrentDisplay(), ok);
|
||||
return QVariant::fromValue(Timecode::timecode_to_timestamp(s, timebase_, Timecode::CurrentDisplay(), ok));
|
||||
}
|
||||
|
||||
@@ -7,15 +7,15 @@ TimelineWidget::EditTool::EditTool(TimelineWidget* parent) :
|
||||
|
||||
void TimelineWidget::EditTool::MousePress(TimelineViewMouseEvent *event)
|
||||
{
|
||||
|
||||
Q_UNUSED(event)
|
||||
}
|
||||
|
||||
void TimelineWidget::EditTool::MouseMove(TimelineViewMouseEvent *event)
|
||||
{
|
||||
|
||||
Q_UNUSED(event)
|
||||
}
|
||||
|
||||
void TimelineWidget::EditTool::MouseRelease(TimelineViewMouseEvent *event)
|
||||
{
|
||||
|
||||
Q_UNUSED(event)
|
||||
}
|
||||
|
||||
@@ -32,6 +32,8 @@ void TimelineWidget::ZoomTool::MousePress(TimelineViewMouseEvent *event)
|
||||
|
||||
void TimelineWidget::ZoomTool::MouseMove(TimelineViewMouseEvent *event)
|
||||
{
|
||||
Q_UNUSED(event)
|
||||
|
||||
if (dragging_) {
|
||||
parent()->MoveRubberBandSelect(false, false);
|
||||
} else {
|
||||
|
||||
@@ -139,7 +139,7 @@ bool TimelineViewBase::PlayheadMove(QMouseEvent *event)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TimelineViewBase::PlayheadRelease(QMouseEvent *event)
|
||||
bool TimelineViewBase::PlayheadRelease(QMouseEvent*)
|
||||
{
|
||||
if (dragging_playhead_) {
|
||||
dragging_playhead_ = false;
|
||||
@@ -210,7 +210,7 @@ bool TimelineViewBase::HandRelease(QMouseEvent *event)
|
||||
return false;
|
||||
}
|
||||
|
||||
void TimelineViewBase::ToolChangedEvent(Tool::Item tool)
|
||||
void TimelineViewBase::ToolChangedEvent(Tool::Item)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -326,7 +326,7 @@ bool TimelineViewBase::WheelEventIsAZoomEvent(QWheelEvent *event)
|
||||
return (static_cast<bool>(event->modifiers() & Qt::ControlModifier) == !Config::Current()["ScrollZooms"].toBool());
|
||||
}
|
||||
|
||||
void TimelineViewBase::SetLimitYAxis(bool e)
|
||||
void TimelineViewBase::SetLimitYAxis(bool)
|
||||
{
|
||||
limit_y_axis_ = true;
|
||||
UpdateSceneRect();
|
||||
|
||||
@@ -143,7 +143,7 @@ void TimeRuler::paintEvent(QPaintEvent *)
|
||||
double width_of_day = width_of_hour * 24;
|
||||
|
||||
double long_interval, short_interval;
|
||||
int long_rate;
|
||||
int long_rate = 0;
|
||||
|
||||
// Used for comparison, even if one unit can technically fit, we have to fit at least two for it to matter
|
||||
int doubled_gap = minimum_gap_between_lines_ * 2;
|
||||
@@ -252,7 +252,7 @@ void TimeRuler::paintEvent(QPaintEvent *)
|
||||
|
||||
if (timecode_left > last_text_draw) {
|
||||
p.drawText(text_rect,
|
||||
text_align,
|
||||
static_cast<int>(text_align),
|
||||
timecode_str);
|
||||
|
||||
last_text_draw = timecode_left + timecode_width;
|
||||
|
||||
Reference in New Issue
Block a user