oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various: encapsulate all code in the olive namespace to avoid name collisions

Browse Source 
Large-scale code cleanup. Also adds a license to the top of all files that were
missing it.
This commit is contained in:
itsmattkc
2020-04-06 15:29:53 +10:00
parent 82b6ddccc8
commit 1aa87cbda6
519 changed files with 7939 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/timeline/timelinecoordinate.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "timelinecoordinate.h"
OLIVE_NAMESPACE_ENTER
TimelineCoordinate::TimelineCoordinate() :
track_(Timeline::kTrackTypeNone, 0)
{
@@ -56,3 +58,5 @@ void TimelineCoordinate::SetTrack(const TrackReference &track)
{
track_ = track;
}
OLIVE_NAMESPACE_EXIT
app/timeline/timelinecoordinate.h
+4
View File
@@ -24,6 +24,8 @@
#include "common/rational.h"
#include "trackreference.h"
OLIVE_NAMESPACE_ENTER
class TimelineCoordinate
{
public:
@@ -44,4 +46,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINECOORDINATE_H
app/timeline/timelinemarker.cpp
+24
View File
@@ -1,7 +1,29 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "timelinemarker.h"
#include "common/xmlutils.h"
OLIVE_NAMESPACE_ENTER
TimelineMarker::TimelineMarker(const TimeRange &time, const QString &name, QObject *parent) :
QObject(parent),
time_(time),
@@ -101,3 +123,5 @@ void TimelineMarkerList::Load(QXmlStreamReader *reader)
reader->skipCurrentElement();
}
}
OLIVE_NAMESPACE_EXIT
app/timeline/timelinemarker.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef TIMELINEMARKER_H
#define TIMELINEMARKER_H
@@ -7,6 +27,8 @@
#include "common/timerange.h"
OLIVE_NAMESPACE_ENTER
class TimelineMarker : public QObject
{
Q_OBJECT
@@ -58,4 +80,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEMARKER_H
app/timeline/timelinepoints.cpp
+24
View File
@@ -1,7 +1,29 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "timelinepoints.h"
#include "common/xmlutils.h"
OLIVE_NAMESPACE_ENTER
TimelineMarkerList *TimelinePoints::markers()
{
return &markers_;
@@ -45,3 +67,5 @@ TimelineWorkArea *TimelinePoints::workarea()
{
return &workarea_;
}
OLIVE_NAMESPACE_EXIT
app/timeline/timelinepoints.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef TIMELINEPOINTS_H
#define TIMELINEPOINTS_H
@@ -7,6 +27,8 @@
#include "timelinemarker.h"
#include "timelineworkarea.h"
OLIVE_NAMESPACE_ENTER
class TimelinePoints
{
public:
@@ -28,4 +50,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEPOINTS_H
app/timeline/timelineworkarea.cpp
+24
View File
@@ -1,7 +1,29 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#include "timelineworkarea.h"
#include "common/xmlutils.h"
OLIVE_NAMESPACE_ENTER
const rational TimelineWorkArea::kResetIn = 0;
const rational TimelineWorkArea::kResetOut = RATIONAL_MAX;
@@ -76,3 +98,5 @@ const rational &TimelineWorkArea::out() const
{
return workarea_range_.out();
}
OLIVE_NAMESPACE_EXIT
app/timeline/timelineworkarea.h
+24
View File
@@ -1,3 +1,23 @@
/***
Olive - Non-Linear Video Editor
Copyright (C) 2019 Olive Team
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef TIMELINEWORKAREA_H
#define TIMELINEWORKAREA_H
@@ -7,6 +27,8 @@
#include "common/timerange.h"
OLIVE_NAMESPACE_ENTER
class TimelineWorkArea : public QObject
{
Q_OBJECT
@@ -39,4 +61,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // TIMELINEWORKAREA_H
app/timeline/trackreference.cpp
+4
View File
@@ -20,6 +20,8 @@
#include "trackreference.h"
OLIVE_NAMESPACE_ENTER
TrackReference::TrackReference() :
type_(Timeline::kTrackTypeNone),
index_(0)
@@ -46,3 +48,5 @@ bool TrackReference::operator==(const TrackReference &ref) const
{
return type_ == ref.type_ && index_ == ref.index_;
}
OLIVE_NAMESPACE_EXIT
app/timeline/trackreference.h
+4
View File
@@ -23,6 +23,8 @@
#include "common/timelinecommon.h"
OLIVE_NAMESPACE_ENTER
class TrackReference
{
public:
@@ -42,4 +44,6 @@ private:
int index_;
};
OLIVE_NAMESPACE_EXIT
#endif // TRACKREFERENCE_H