From 2ba928fa1fbdce1907c25ee7da20e281e599b868 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 8 Feb 2020 00:13:38 +1100 Subject: [PATCH] code cleanup: renamed qtversionabstraction.h to qtutils.h --- app/common/CMakeLists.txt | 4 ++-- app/common/{qtversionabstraction.cpp => qtutils.cpp} | 2 +- app/common/{qtversionabstraction.h => qtutils.h} | 0 app/widget/audiomonitor/audiomonitor.cpp | 2 +- app/widget/curvewidget/beziercontrolpointitem.cpp | 2 +- app/widget/curvewidget/curveview.cpp | 2 +- app/widget/curvewidget/curvewidget.cpp | 2 +- app/widget/keyframeview/keyframeviewitem.cpp | 2 +- app/widget/nodeview/nodeviewitem.cpp | 2 +- .../projectexplorer/projectexplorericonviewitemdelegate.cpp | 2 +- app/widget/timelinewidget/tool/import.cpp | 2 +- app/widget/timelinewidget/tool/pointer.cpp | 2 +- app/widget/timelinewidget/view/timelineviewblockitem.cpp | 2 +- app/widget/timeruler/timeruler.cpp | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename app/common/{qtversionabstraction.cpp => qtutils.cpp} (96%) rename app/common/{qtversionabstraction.h => qtutils.h} (100%) diff --git a/app/common/CMakeLists.txt b/app/common/CMakeLists.txt index cc5aa14c3..c4dbe01c2 100644 --- a/app/common/CMakeLists.txt +++ b/app/common/CMakeLists.txt @@ -29,8 +29,8 @@ set(OLIVE_SOURCES common/flipmodifiers.h common/flipmodifiers.cpp common/lerp.h - common/qtversionabstraction.h - common/qtversionabstraction.cpp + common/qtutils.h + common/qtutils.cpp common/range.h common/rational.h common/rational.cpp diff --git a/app/common/qtversionabstraction.cpp b/app/common/qtutils.cpp similarity index 96% rename from app/common/qtversionabstraction.cpp rename to app/common/qtutils.cpp index b0a7ef975..0dc8090ec 100644 --- a/app/common/qtversionabstraction.cpp +++ b/app/common/qtutils.cpp @@ -18,7 +18,7 @@ ***/ -#include "qtversionabstraction.h" +#include "qtutils.h" int QFontMetricsWidth(QFontMetrics fm, const QString& s) { #if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) diff --git a/app/common/qtversionabstraction.h b/app/common/qtutils.h similarity index 100% rename from app/common/qtversionabstraction.h rename to app/common/qtutils.h diff --git a/app/widget/audiomonitor/audiomonitor.cpp b/app/widget/audiomonitor/audiomonitor.cpp index 1deb8679a..1c580be87 100644 --- a/app/widget/audiomonitor/audiomonitor.cpp +++ b/app/widget/audiomonitor/audiomonitor.cpp @@ -5,7 +5,7 @@ #include #include "audio/audiomanager.h" -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" const int kDecibelStep = 6; const int kDecibelMinimum = -200; diff --git a/app/widget/curvewidget/beziercontrolpointitem.cpp b/app/widget/curvewidget/beziercontrolpointitem.cpp index a2950caeb..e0f745db5 100644 --- a/app/widget/curvewidget/beziercontrolpointitem.cpp +++ b/app/widget/curvewidget/beziercontrolpointitem.cpp @@ -5,7 +5,7 @@ #include #include -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" BezierControlPointItem::BezierControlPointItem(NodeKeyframePtr key, NodeKeyframe::BezierType mode, QGraphicsItem *parent) : QGraphicsRectItem(parent), diff --git a/app/widget/curvewidget/curveview.cpp b/app/widget/curvewidget/curveview.cpp index b77d9855a..04b23b160 100644 --- a/app/widget/curvewidget/curveview.cpp +++ b/app/widget/curvewidget/curveview.cpp @@ -3,7 +3,7 @@ #include #include -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" CurveView::CurveView(QWidget *parent) : KeyframeViewBase(parent) diff --git a/app/widget/curvewidget/curvewidget.cpp b/app/widget/curvewidget/curvewidget.cpp index 48175e0d7..71d309f22 100644 --- a/app/widget/curvewidget/curvewidget.cpp +++ b/app/widget/curvewidget/curvewidget.cpp @@ -6,7 +6,7 @@ #include #include "core.h" -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" #include "common/timecodefunctions.h" #include "node/node.h" #include "widget/keyframeview/keyframeviewundo.h" diff --git a/app/widget/keyframeview/keyframeviewitem.cpp b/app/widget/keyframeview/keyframeviewitem.cpp index ae1a31b23..9e9495d88 100644 --- a/app/widget/keyframeview/keyframeviewitem.cpp +++ b/app/widget/keyframeview/keyframeviewitem.cpp @@ -5,7 +5,7 @@ #include #include -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" KeyframeViewItem::KeyframeViewItem(NodeKeyframePtr key, QGraphicsItem *parent) : QGraphicsRectItem(parent), diff --git a/app/widget/nodeview/nodeviewitem.cpp b/app/widget/nodeview/nodeviewitem.cpp index f5a64545c..3a9126ba7 100644 --- a/app/widget/nodeview/nodeviewitem.cpp +++ b/app/widget/nodeview/nodeviewitem.cpp @@ -26,7 +26,7 @@ #include #include -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" #include "core.h" #include "nodeview.h" #include "nodeviewundo.h" diff --git a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp index f936236bb..046e3f342 100644 --- a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp +++ b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp @@ -22,7 +22,7 @@ #include -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" ProjectExplorerIconViewItemDelegate::ProjectExplorerIconViewItemDelegate(QObject *parent) : QStyledItemDelegate (parent) diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp index 762e724df..30193a7c1 100644 --- a/app/widget/timelinewidget/tool/import.cpp +++ b/app/widget/timelinewidget/tool/import.cpp @@ -24,7 +24,7 @@ #include #include "config/config.h" -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" #include "core.h" #include "node/audio/volume/volume.h" #include "node/distort/transform/transform.h" diff --git a/app/widget/timelinewidget/tool/pointer.cpp b/app/widget/timelinewidget/tool/pointer.cpp index 0578c4c76..bf77a0b47 100644 --- a/app/widget/timelinewidget/tool/pointer.cpp +++ b/app/widget/timelinewidget/tool/pointer.cpp @@ -25,7 +25,7 @@ #include "common/clamp.h" #include "common/flipmodifiers.h" -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" #include "common/range.h" #include "common/timecodefunctions.h" #include "config/config.h" diff --git a/app/widget/timelinewidget/view/timelineviewblockitem.cpp b/app/widget/timelinewidget/view/timelineviewblockitem.cpp index 836e9959b..f8023af4a 100644 --- a/app/widget/timelinewidget/view/timelineviewblockitem.cpp +++ b/app/widget/timelinewidget/view/timelineviewblockitem.cpp @@ -27,7 +27,7 @@ #include #include -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" #include "node/block/transition/transition.h" TimelineViewBlockItem::TimelineViewBlockItem(QGraphicsItem* parent) : diff --git a/app/widget/timeruler/timeruler.cpp b/app/widget/timeruler/timeruler.cpp index 405b62120..db61fa7e1 100644 --- a/app/widget/timeruler/timeruler.cpp +++ b/app/widget/timeruler/timeruler.cpp @@ -26,7 +26,7 @@ #include #include "common/timecodefunctions.h" -#include "common/qtversionabstraction.h" +#include "common/qtutils.h" #include "config/config.h" #include "core.h"