start moving core frameworks to external libraries
This commit is contained in:
@@ -21,8 +21,11 @@
|
||||
#ifndef TIMELINECOMMON_H
|
||||
#define TIMELINECOMMON_H
|
||||
|
||||
#include <olive/core/core.h>
|
||||
|
||||
#include "common/define.h"
|
||||
#include "common/rational.h"
|
||||
|
||||
using namespace olive::core;
|
||||
|
||||
namespace olive {
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
#ifndef TIMELINECOORDINATE_H
|
||||
#define TIMELINECOORDINATE_H
|
||||
|
||||
#include "common/rational.h"
|
||||
#include "node/output/track/track.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
@@ -87,7 +87,7 @@ QRect TimelineMarker::Draw(QPainter *p, const QPoint &pt, int max_right, double
|
||||
|
||||
int half_width = marker_width / 2;
|
||||
|
||||
QColor c = ColorCoding::GetColor(color()).toQColor();
|
||||
QColor c = QtUtils::toQColor(ColorCoding::GetColor(color()));
|
||||
if (selected) {
|
||||
p->setPen(Qt::white);
|
||||
p->setBrush(c.lighter());
|
||||
|
||||
@@ -21,14 +21,16 @@
|
||||
#ifndef TIMELINEMARKER_H
|
||||
#define TIMELINEMARKER_H
|
||||
|
||||
#include <olive/core/core.h>
|
||||
#include <QPainter>
|
||||
#include <QString>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QXmlStreamWriter>
|
||||
|
||||
#include "common/timerange.h"
|
||||
#include "undo/undocommand.h"
|
||||
|
||||
using namespace olive::core;
|
||||
|
||||
namespace olive {
|
||||
|
||||
class TimelineMarker : public QObject
|
||||
|
||||
@@ -21,14 +21,15 @@
|
||||
#ifndef TIMELINEWORKAREA_H
|
||||
#define TIMELINEWORKAREA_H
|
||||
|
||||
#include <olive/core/core.h>
|
||||
#include <QObject>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QXmlStreamWriter>
|
||||
|
||||
#include "common/timerange.h"
|
||||
|
||||
namespace olive {
|
||||
|
||||
using namespace core;
|
||||
|
||||
class TimelineWorkArea : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
Reference in New Issue
Block a user