diff --git a/cursors/cursors.qrc b/cursors/cursors.qrc
index 96dc6728a..0d40e1940 100644
--- a/cursors/cursors.qrc
+++ b/cursors/cursors.qrc
@@ -1,6 +1,6 @@
- Cursor_Left_Arrow.png
- Cursor_Right_Arrow.png
+ left_side.png
+ right_side.png
diff --git a/cursors/Cursor_Left_Arrow.png b/cursors/left_side.png
similarity index 100%
rename from cursors/Cursor_Left_Arrow.png
rename to cursors/left_side.png
diff --git a/cursors/Cursor_Right_Arrow.png b/cursors/right_side.png
similarity index 100%
rename from cursors/Cursor_Right_Arrow.png
rename to cursors/right_side.png
diff --git a/ui/cursors.cpp b/ui/cursors.cpp
index 86e89a9ac..65bb01f88 100644
--- a/ui/cursors.cpp
+++ b/ui/cursors.cpp
@@ -5,18 +5,18 @@
#include
-QCursor OLIVE_CURSORS::left_arrow;
-QCursor OLIVE_CURSORS::right_arrow;
+QCursor Olive::left_side;
+QCursor Olive::right_side;
-QCursor load_cursor(QString file, const int hotX, const int hotY, const bool right_aligend){
- int hotoutX;
+QCursor load_cursor(QString file, const int hotX, const int hotY, const bool right_aligned){
+ int hotX_out;
QPixmap temp = QPixmap(file);
- right_aligend? hotoutX = temp.width() : hotoutX = hotX;
- return QCursor(temp,hotoutX,hotY);
+ right_aligned? hotX_out = temp.width() : hotX_out = hotX;
+ return QCursor(temp,hotX_out,hotY);
}
void initCustomCursors(){
qInfo() << "Loading Custom Cursors";
- OLIVE_CURSORS::left_arrow = load_cursor(":/cursors/Cursor_Left_Arrow.png", 0,-1, false);
- OLIVE_CURSORS::right_arrow = load_cursor(":/cursors/Cursor_Right_Arrow.png", 0,-1, true);
+ Olive::left_side = load_cursor(":/cursors/left_side.png", 0,-1, false);
+ Olive::right_side = load_cursor(":/cursors/right_side.png", 0,-1, true);
}
diff --git a/ui/cursors.h b/ui/cursors.h
index 53f1cb9fa..cec2bb514 100644
--- a/ui/cursors.h
+++ b/ui/cursors.h
@@ -5,9 +5,9 @@
void initCustomCursors();
-namespace OLIVE_CURSORS{
- extern QCursor left_arrow;
- extern QCursor right_arrow;
+namespace Olive{
+ extern QCursor left_side;
+ extern QCursor right_side;
}
#endif // CURSORS_H
diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp
index 8e6e55b9d..5aa17e26f 100644
--- a/ui/timelinewidget.cpp
+++ b/ui/timelinewidget.cpp
@@ -2070,9 +2070,9 @@ void TimelineWidget::mouseMoveEvent(QMouseEvent *event) {
}*/
if (found) {
if (right_arrow_cursor && !panel_timeline->trim_in_point){
- setCursor(OLIVE_CURSORS::right_arrow);
+ setCursor(Olive::right_side);
}else if (left_arrow_cursor && panel_timeline->trim_in_point){
- setCursor(OLIVE_CURSORS::left_arrow);
+ setCursor(Olive::left_side);
}else
setCursor(Qt::SizeHorCursor);
} else {