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:
@@ -20,6 +20,8 @@
|
||||
|
||||
#include "icons.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
/// Works in conjunction with `genicons.sh` to generate and utilize icons of specific sizes
|
||||
const int ICON_SIZE_COUNT = 4;
|
||||
const int ICON_SIZES[] = {
|
||||
@@ -133,3 +135,5 @@ QIcon icon::Create(const QString& theme, const QString &name)
|
||||
|
||||
return icon;
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
|
||||
@@ -23,6 +23,10 @@
|
||||
|
||||
#include <QIcon>
|
||||
|
||||
#include "common/define.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
namespace icon {
|
||||
|
||||
// Playback Icons
|
||||
@@ -119,4 +123,6 @@ void LoadAll(const QString &theme);
|
||||
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
|
||||
#endif // ICONS_H
|
||||
|
||||
@@ -30,6 +30,8 @@
|
||||
|
||||
#include "ui/icons/icons.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
QList<StyleDescriptor> StyleManager::ListInternal()
|
||||
{
|
||||
QList<StyleDescriptor> style_list;
|
||||
@@ -189,3 +191,5 @@ const QString &StyleDescriptor::path() const
|
||||
{
|
||||
return path_;
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
|
||||
@@ -24,6 +24,10 @@
|
||||
#include <QSettings>
|
||||
#include <QWidget>
|
||||
|
||||
#include "common/define.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
|
||||
class StyleDescriptor {
|
||||
public:
|
||||
StyleDescriptor(const QString& name, const QString& path);
|
||||
@@ -58,4 +62,6 @@ private:
|
||||
static void ParsePaletteColor(QSettings* ini, QPalette* palette, QPalette::ColorGroup group, const QString& role_name);
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
|
||||
#endif // STYLEMANAGER_H
|
||||
|
||||
Reference in New Issue
Block a user