start moving core frameworks to external libraries
This commit is contained in:
@@ -25,7 +25,6 @@
|
||||
#include <QScrollBar>
|
||||
#include <QTimer>
|
||||
|
||||
#include "common/timecodefunctions.h"
|
||||
#include "widget/timebased/timebasedwidget.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
@@ -27,8 +27,6 @@
|
||||
#include <QToolTip>
|
||||
|
||||
#include "common/qtutils.h"
|
||||
#include "common/rational.h"
|
||||
#include "common/timecodefunctions.h"
|
||||
#include "timebasedview.h"
|
||||
#include "timebasedwidget.h"
|
||||
#include "widget/timetarget/timetarget.h"
|
||||
@@ -309,8 +307,9 @@ public:
|
||||
display_time = initial_drag_item_->time();
|
||||
}
|
||||
|
||||
QString tip = Timecode::time_to_timecode(display_time, timebase_,
|
||||
Core::instance()->GetTimecodeDisplay(), false);
|
||||
QString tip = QString::fromStdString(Timecode::time_to_timecode(
|
||||
display_time, timebase_,
|
||||
Core::instance()->GetTimecodeDisplay(), false));
|
||||
|
||||
if (!tip_format.isEmpty()) {
|
||||
tip = tip_format.arg(tip);
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
|
||||
#include "common/autoscroll.h"
|
||||
#include "common/range.h"
|
||||
#include "common/timecodefunctions.h"
|
||||
#include "config/config.h"
|
||||
#include "core.h"
|
||||
#include "dialog/markerproperties/markerpropertiesdialog.h"
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
#ifndef TIMELINESCALEDOBJECT_H
|
||||
#define TIMELINESCALEDOBJECT_H
|
||||
|
||||
#include <olive/core/core.h>
|
||||
#include <QWidget>
|
||||
|
||||
#include "common/rational.h"
|
||||
#include "node/block/block.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
Reference in New Issue
Block a user