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

Large-scale code cleanup. Also adds a license to the top of all files that were missing it.
2020-04-06 15:29:53 +10:00
parent 82b6ddccc8
commit 1aa87cbda6
519 changed files with 7939 additions and 158 deletions
@@ -26,6 +26,8 @@
 #include "nodeviewundo.h"
 #include "node/factory.h"

+OLIVE_NAMESPACE_ENTER
+
 NodeView::NodeView(QWidget *parent) :
  QGraphicsView(parent),
  graph_(nullptr),
@@ -468,3 +470,5 @@ void NodeView::DetachItemFromCursor()
 {
  AttachItemToCursor(nullptr);
 }
+
+OLIVE_NAMESPACE_EXIT
@@ -28,6 +28,8 @@
 #include "nodeviewscene.h"
 #include "widget/nodecopypaste/nodecopypaste.h"

+OLIVE_NAMESPACE_ENTER
+
 /**
 * @brief A widget for viewing and editing node graphs
 *
@@ -117,4 +119,6 @@ private slots:

 };

+OLIVE_NAMESPACE_EXIT
+
 #endif // NODEVIEW_H
@@ -29,6 +29,8 @@
 #include "nodeview.h"
 #include "nodeviewscene.h"

+OLIVE_NAMESPACE_ENTER
+
 NodeViewEdge::NodeViewEdge(QGraphicsItem *parent) :
  QGraphicsPathItem(parent),
  edge_(nullptr),
@@ -114,3 +116,4 @@ void NodeViewEdge::UpdatePen()
  //update();
 }

+OLIVE_NAMESPACE_EXIT
@@ -26,6 +26,8 @@

 #include "node/edge.h"

+OLIVE_NAMESPACE_ENTER
+
 /**
 * @brief A graphical representation of a NodeEdge to be used in NodeView
 *
@@ -94,4 +96,6 @@ private:

 };

+OLIVE_NAMESPACE_EXIT
+
 #endif // NODEEDGEITEM_H
@@ -35,6 +35,8 @@
 #include "ui/icons/icons.h"
 #include "window/mainwindow/mainwindow.h"

+OLIVE_NAMESPACE_ENTER
+
 NodeViewItem::NodeViewItem(QGraphicsItem *parent) :
  QGraphicsRectItem(parent),
  node_(nullptr),
@@ -456,3 +458,5 @@ QPointF NodeViewItem::GetInputPoint(int index) const

  return QPointF(input_rect.left(), input_rect.center().y());
 }
+
+OLIVE_NAMESPACE_EXIT
@@ -31,6 +31,8 @@
 #include "nodeviewedge.h"
 #include "nodeviewitemwidgetproxy.h"

+OLIVE_NAMESPACE_ENTER
+
 /**
 * @brief A visual widget representation of a Node object to be used in a NodeView
 *
@@ -153,4 +155,6 @@ private:

 };

+OLIVE_NAMESPACE_EXIT
+
 #endif // NODEVIEWITEM_H
@@ -1,8 +1,24 @@
-#include "nodeviewitemwidgetproxy.h"
+/***

-NodeViewItemWidget::NodeViewItemWidget()
-{
-}
+  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 "nodeviewitemwidgetproxy.h"

 QColor NodeViewItemWidget::TitleBarColor()
 {
@@ -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 NODEVIEWITEMWIDGETPROXY_H
 #define NODEVIEWITEMWIDGETPROXY_H

@@ -14,7 +34,7 @@ class NodeViewItemWidget : public QWidget {
  Q_PROPERTY(QColor titlebarColor READ TitleBarColor WRITE SetTitleBarColor DESIGNABLE true)
  Q_PROPERTY(QColor borderColor READ BorderColor WRITE SetBorderColor DESIGNABLE true)
 public:
-  NodeViewItemWidget();
+  NodeViewItemWidget() = default;

  QColor TitleBarColor();
  void SetTitleBarColor(QColor color);
@@ -1,5 +1,27 @@
+/***
+
+  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 "nodeviewscene.h"

+OLIVE_NAMESPACE_ENTER
+
 NodeViewScene::NodeViewScene(QObject *parent) :
  QGraphicsScene(parent),
  graph_(nullptr)
@@ -296,3 +318,5 @@ void NodeViewScene::Reorganize()
    ReorganizeInternal(NodeToUIObject(end_node), node_weights, processed_nodes);
  }
 }
+
+OLIVE_NAMESPACE_EXIT
@@ -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 NODEVIEWSCENE_H
 #define NODEVIEWSCENE_H

@@ -8,6 +28,8 @@
 #include "widget/nodeview/nodeviewedge.h"
 #include "widget/nodeview/nodeviewitem.h"

+OLIVE_NAMESPACE_ENTER
+
 class NodeViewScene : public QGraphicsScene
 {
  Q_OBJECT
@@ -105,4 +127,6 @@ private slots:

 };

+OLIVE_NAMESPACE_EXIT
+
 #endif // NODEVIEWSCENE_H
@@ -1,5 +1,27 @@
+/***
+
+  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 "nodeviewundo.h"

+OLIVE_NAMESPACE_ENTER
+
 NodeEdgeAddCommand::NodeEdgeAddCommand(NodeOutput *output, NodeInput *input, QUndoCommand *parent) :
  UndoCommand(parent),
  output_(output),
@@ -164,3 +186,5 @@ void NodeCopyInputsCommand::redo_internal()
 {
  Node::CopyInputs(src_, dest_, include_connections_);
 }
+
+OLIVE_NAMESPACE_EXIT
@@ -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 NODEVIEWUNDO_H
 #define NODEVIEWUNDO_H

@@ -8,6 +28,8 @@
 #include "nodeviewitem.h"
 #include "undo/undocommand.h"

+OLIVE_NAMESPACE_ENTER
+
 /**
 * @brief An undoable command for connecting two NodeParams together
 *
@@ -117,4 +139,6 @@ private:

 };

+OLIVE_NAMESPACE_EXIT
+
 #endif // NODEVIEWUNDO_H