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.
This commit is contained in:
@@ -28,6 +28,8 @@
|
||||
#include "widget/menu/menu.h"
|
||||
#include "ui/icons/icons.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
Toolbar::Toolbar(QWidget *parent) :
|
||||
QWidget(parent)
|
||||
{
|
||||
@@ -183,3 +185,5 @@ void Toolbar::AddMenuItemTriggered(QAction* a)
|
||||
{
|
||||
emit AddableObjectChanged(static_cast<Tool::AddableObject>(a->data().toInt()));
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
|
||||
@@ -27,6 +27,8 @@
|
||||
#include "widget/toolbar/toolbarbutton.h"
|
||||
#include "tool/tool.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
/**
|
||||
* @brief A widget containing buttons for all of Olive's application-wide tools.
|
||||
*
|
||||
@@ -215,4 +217,6 @@ private slots:
|
||||
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
|
||||
#endif // TOOLBAR_H
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
#include "toolbarbutton.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
ToolbarButton::ToolbarButton(QWidget *parent, const Tool::Item &tool) :
|
||||
QPushButton(parent),
|
||||
tool_(tool)
|
||||
@@ -31,3 +33,5 @@ const Tool::Item &ToolbarButton::tool()
|
||||
{
|
||||
return tool_;
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
#include "tool/tool.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
/**
|
||||
* @brief Simple derived class of QPushButton to contain an Tool ID. Used as the main widget through Toolbar.
|
||||
*/
|
||||
@@ -57,4 +59,6 @@ private:
|
||||
Tool::Item tool_;
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
|
||||
#endif // TOOLBARBUTTON_H
|
||||
|
||||
Reference in New Issue
Block a user