From 5644fa1b9c0a8996bf9318922471c20cf3b50252 Mon Sep 17 00:00:00 2001
From: Ali Kianian <ali.kianian@qt.io>
Date: Fri, 24 Mar 2023 15:24:58 +0200
Subject: [PATCH] QmlDesigner: Move StyleAnimator to Utils

StyleAnimator moved to Utils in order to be used by other modules and
styles.
Since Utils is the most common dependency, it's chosen as the right
place of StyleAnimator.

Task-number: QDS-9522
Change-Id: Idbf55875e0c320ccfa21e1c479bf5997ea7d150d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/libs/utils/CMakeLists.txt                   |  1 +
 .../coreplugin => libs/utils}/styleanimator.cpp |  6 +++++-
 .../coreplugin => libs/utils}/styleanimator.h   | 17 +++++++++++------
 src/libs/utils/utils.qbs                        |  2 ++
 src/plugins/coreplugin/CMakeLists.txt           |  1 -
 src/plugins/coreplugin/coreplugin.qbs           |  2 --
 src/plugins/coreplugin/manhattanstyle.cpp       | 10 ++++------
 7 files changed, 23 insertions(+), 16 deletions(-)
 rename src/{plugins/coreplugin => libs/utils}/styleanimator.cpp (97%)
 rename src/{plugins/coreplugin => libs/utils}/styleanimator.h (89%)

diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index ba19104db4e..59728939cb7 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -164,6 +164,7 @@ add_qtc_library(Utils
     statuslabel.cpp statuslabel.h
     stringtable.cpp stringtable.h
     stringutils.cpp stringutils.h
+    styleanimator.cpp styleanimator.h
     styledbar.cpp styledbar.h
     stylehelper.cpp stylehelper.h
     tasktree.cpp tasktree.h
diff --git a/src/plugins/coreplugin/styleanimator.cpp b/src/libs/utils/styleanimator.cpp
similarity index 97%
rename from src/plugins/coreplugin/styleanimator.cpp
rename to src/libs/utils/styleanimator.cpp
index f9d57a0d399..05973677323 100644
--- a/src/plugins/coreplugin/styleanimator.cpp
+++ b/src/libs/utils/styleanimator.cpp
@@ -3,9 +3,13 @@
 
 #include "styleanimator.h"
 
-#include <utils/algorithm.h>
+#include "algorithm.h"
 
+#include <QPainter>
 #include <QStyleOption>
+#include <QWidget>
+
+using namespace Utils;
 
 Animation * StyleAnimator::widgetAnimation(const QWidget *widget) const
 {
diff --git a/src/plugins/coreplugin/styleanimator.h b/src/libs/utils/styleanimator.h
similarity index 89%
rename from src/plugins/coreplugin/styleanimator.h
rename to src/libs/utils/styleanimator.h
index f12690aa715..08c4755cd1a 100644
--- a/src/plugins/coreplugin/styleanimator.h
+++ b/src/libs/utils/styleanimator.h
@@ -3,13 +3,17 @@
 
 #pragma once
 
+#include "utils_global.h"
+
+#include <QBasicTimer>
 #include <QPointer>
 #include <QTime>
-#include <QBasicTimer>
-#include <QStyle>
-#include <QPainter>
 #include <QWidget>
 
+class QPainter;
+class QStyleOption;
+
+namespace Utils {
 /*
  * This is a set of helper classes to allow for widget animations in
  * the style. Its mostly taken from Vista style so it should be fully documented
@@ -17,7 +21,7 @@
  *
  */
 
-class Animation
+class QTCREATOR_UTILS_EXPORT Animation
 {
 public :
     Animation() = default;
@@ -41,7 +45,7 @@ protected:
 };
 
 // Handles state transition animations
-class Transition : public Animation
+class QTCREATOR_UTILS_EXPORT Transition : public Animation
 {
 public :
     Transition() = default;
@@ -54,7 +58,7 @@ public :
     int m_duration = 100; //set time in ms to complete a state transition
 };
 
-class StyleAnimator : public QObject
+class QTCREATOR_UTILS_EXPORT StyleAnimator : public QObject
 {
     Q_OBJECT
 
@@ -70,3 +74,4 @@ private:
     QBasicTimer animationTimer;
     QList <Animation*> animations;
 };
+}
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 11c0e342826..6fb84c69cc2 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -293,6 +293,8 @@ Project {
             "stringtable.h",
             "stringutils.cpp",
             "stringutils.h",
+            "styleanimator.cpp",
+            "styleanimator.h",
             "styledbar.cpp",
             "styledbar.h",
             "stylehelper.cpp",
diff --git a/src/plugins/coreplugin/CMakeLists.txt b/src/plugins/coreplugin/CMakeLists.txt
index 8a680a0f7bd..17d1af01e39 100644
--- a/src/plugins/coreplugin/CMakeLists.txt
+++ b/src/plugins/coreplugin/CMakeLists.txt
@@ -150,7 +150,6 @@ add_qtc_plugin(Core
     sidebar.cpp sidebar.h
     sidebarwidget.cpp sidebarwidget.h
     statusbarmanager.cpp statusbarmanager.h
-    styleanimator.cpp styleanimator.h
     systemsettings.cpp systemsettings.h
     textdocument.cpp textdocument.h
     themechooser.cpp themechooser.h
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index be30292174b..36edf7f5acf 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -157,8 +157,6 @@ Project {
                 "sidebarwidget.h",
                 "statusbarmanager.cpp",
                 "statusbarmanager.h",
-                "styleanimator.cpp",
-                "styleanimator.h",
                 "systemsettings.cpp",
                 "systemsettings.h",
                 "textdocument.cpp",
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 3e079b568a3..4b8d78dab03 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -3,16 +3,14 @@
 
 #include "manhattanstyle.h"
 
-#include "styleanimator.h"
-
 #include <utils/algorithm.h>
-#include <utils/hostosinfo.h>
-#include <utils/stylehelper.h>
-
 #include <utils/fancymainwindow.h>
+#include <utils/hostosinfo.h>
+#include <utils/qtcassert.h>
+#include <utils/styleanimator.h>
+#include <utils/stylehelper.h>
 #include <utils/theme/theme.h>
 #include <utils/utilsicons.h>
-#include <utils/qtcassert.h>
 
 #include <QApplication>
 #include <QCheckBox>