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

removed olive:: qualifier from icon:: namespace

Browse Source
This commit is contained in:
itsmattkc
2019-12-26 17:38:18 +11:00
parent bb9284a894
commit 7d907d7ee1
16 changed files with 93 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ui/icons/icons.cpp
+43 -43
View File
@@ -30,49 +30,49 @@ const int ICON_SIZES[] = {
};
/// Internal icon library for use throughout Olive without having to regenerate constantly
QIcon olive::icon::GoToStart;
QIcon olive::icon::PrevFrame;
QIcon olive::icon::Play;
QIcon olive::icon::Pause;
QIcon olive::icon::NextFrame;
QIcon olive::icon::GoToEnd;
QIcon olive::icon::New;
QIcon olive::icon::Open;
QIcon olive::icon::Save;
QIcon olive::icon::Undo;
QIcon olive::icon::Redo;
QIcon olive::icon::TreeView;
QIcon olive::icon::ListView;
QIcon olive::icon::IconView;
QIcon olive::icon::ToolPointer;
QIcon olive::icon::ToolEdit;
QIcon olive::icon::ToolRipple;
QIcon olive::icon::ToolRolling;
QIcon olive::icon::ToolRazor;
QIcon olive::icon::ToolSlip;
QIcon olive::icon::ToolSlide;
QIcon olive::icon::ToolHand;
QIcon olive::icon::ToolTransition;
QIcon olive::icon::Folder;
QIcon olive::icon::Sequence;
QIcon olive::icon::Video;
QIcon olive::icon::Audio;
QIcon olive::icon::Image;
QIcon olive::icon::TriUp;
QIcon olive::icon::TriLeft;
QIcon olive::icon::TriDown;
QIcon olive::icon::TriRight;
QIcon olive::icon::Snapping;
QIcon olive::icon::ZoomIn;
QIcon olive::icon::ZoomOut;
QIcon olive::icon::Record;
QIcon olive::icon::Add;
QIcon olive::icon::Error;
QIcon olive::icon::DirUp;
QIcon olive::icon::Clock;
QIcon olive::icon::Diamond;
QIcon icon::GoToStart;
QIcon icon::PrevFrame;
QIcon icon::Play;
QIcon icon::Pause;
QIcon icon::NextFrame;
QIcon icon::GoToEnd;
QIcon icon::New;
QIcon icon::Open;
QIcon icon::Save;
QIcon icon::Undo;
QIcon icon::Redo;
QIcon icon::TreeView;
QIcon icon::ListView;
QIcon icon::IconView;
QIcon icon::ToolPointer;
QIcon icon::ToolEdit;
QIcon icon::ToolRipple;
QIcon icon::ToolRolling;
QIcon icon::ToolRazor;
QIcon icon::ToolSlip;
QIcon icon::ToolSlide;
QIcon icon::ToolHand;
QIcon icon::ToolTransition;
QIcon icon::Folder;
QIcon icon::Sequence;
QIcon icon::Video;
QIcon icon::Audio;
QIcon icon::Image;
QIcon icon::TriUp;
QIcon icon::TriLeft;
QIcon icon::TriDown;
QIcon icon::TriRight;
QIcon icon::Snapping;
QIcon icon::ZoomIn;
QIcon icon::ZoomOut;
QIcon icon::Record;
QIcon icon::Add;
QIcon icon::Error;
QIcon icon::DirUp;
QIcon icon::Clock;
QIcon icon::Diamond;
void olive::icon::LoadAll(const QString& theme)
void icon::LoadAll(const QString& theme)
{
GoToStart = Create(theme, "prev");
PrevFrame = Create(theme, "rew");
@@ -122,7 +122,7 @@ void olive::icon::LoadAll(const QString& theme)
Diamond = Create(theme, "diamond");
}
QIcon olive::icon::Create(const QString& theme, const QString &name)
QIcon icon::Create(const QString& theme, const QString &name)
{
QIcon icon;
app/ui/icons/icons.h
-2
View File
@@ -23,7 +23,6 @@
#include <QIcon>
namespace olive {
namespace icon {
// Playback Icons
@@ -118,7 +117,6 @@ QIcon Create(const QString &theme, const QString& name);
*/
void LoadAll(const QString &theme);
}
}
#endif // ICONS_H
app/ui/style/style.cpp
+1 -1
View File
@@ -140,7 +140,7 @@ void StyleManager::SetStyle(const StyleDescriptor &style)
void StyleManager::SetStyle(const QString &style_path)
{
// Load all icons for this style (icons must be loaded first because the style change below triggers the icon change)
olive::icon::LoadAll(style_path);
icon::LoadAll(style_path);
// Set palette for this
QString palette_file = QStringLiteral("%1/palette.ini").arg(style_path);