From 845501b780ca2021e5e1c9f7b13e7803b3236296 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Thu, 11 Aug 2016 20:12:21 +0200
Subject: [PATCH] Timeline: Use the existing [un]locked icons

..and remove the own ones.

Change-Id: I513bb78f07d405aa9699157db292085a847adbe7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/libs/timeline/qml/lock_closed.png | Bin 147 -> 0 bytes
 src/libs/timeline/qml/lock_open.png   | Bin 139 -> 0 bytes
 src/libs/timeline/qml/timeline.qrc    |   2 --
 src/libs/timeline/timelinetheme.cpp   |   6 ++----
 4 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 src/libs/timeline/qml/lock_closed.png
 delete mode 100644 src/libs/timeline/qml/lock_open.png

diff --git a/src/libs/timeline/qml/lock_closed.png b/src/libs/timeline/qml/lock_closed.png
deleted file mode 100644
index aeeee2cbb37deaee2c3e37af4dd182151f0a3e74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLn2Vh}LpV4%Za?&Yz`(%Z
z?djqeqH+H0Bx^1P0}kijivQZnXHSV>X}@Ikvsx%{!j{gRytzCszKkCGxxOvi-NuzN
zGv%DvvHrV{-t>40T`X;XQC?Bl{+r=n^*+{Dlcg1s3wb^=FfcH9y85}Sb4q9e00Z_i
AegFUf

diff --git a/src/libs/timeline/qml/lock_open.png b/src/libs/timeline/qml/lock_open.png
deleted file mode 100644
index 9906fc7ea094a6b5c8443cfb793a827c771be6b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 139
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLn2Vh}LpV4%Za?&Yz`(%Z
z?CIhdqH#X?&;S4S%$g0IjV=zG*u+x!l$DidnJjCbX%PDOyC`><^2ZmB-<g-K=BSq1
rFDJHUQALga?}`O`*^V8Y{)0hMPE`JY+4%_!3=9mOu6{1-oD!M<KFutq

diff --git a/src/libs/timeline/qml/timeline.qrc b/src/libs/timeline/qml/timeline.qrc
index de6701d5aa0..18b3cd2d4a9 100644
--- a/src/libs/timeline/qml/timeline.qrc
+++ b/src/libs/timeline/qml/timeline.qrc
@@ -6,8 +6,6 @@
         <file>RangeDetails.qml</file>
         <file>RangeMover.qml</file>
         <file>TimeDisplay.qml</file>
-        <file>lock_closed.png</file>
-        <file>lock_open.png</file>
         <file>ico_edit.png</file>
         <file>TimeMarks.qml</file>
         <file>Overview.qml</file>
diff --git a/src/libs/timeline/timelinetheme.cpp b/src/libs/timeline/timelinetheme.cpp
index d0306a3d7f5..853c42c972a 100644
--- a/src/libs/timeline/timelinetheme.cpp
+++ b/src/libs/timeline/timelinetheme.cpp
@@ -78,11 +78,9 @@ public:
             icon = Utils::Icon({{QLatin1String(":/timeline/ico_edit.png"),
                                  Utils::Theme::IconsBaseColor}});
         else if (iconName == QLatin1String("lock_open"))
-            icon = Utils::Icon({{QLatin1String(":/timeline/lock_open.png"),
-                                 Utils::Theme::IconsBaseColor}});
+            icon = Utils::Icons::UNLOCKED_TOOLBAR;
         else if (iconName == QLatin1String("lock_closed"))
-            icon = Utils::Icon({{QLatin1String(":/timeline/lock_closed.png"),
-                                 Utils::Theme::IconsBaseColor}});
+            icon = Utils::Icons::LOCKED_TOOLBAR;
         else if (iconName == QLatin1String("range_handle"))
             icon = Utils::Icon({{QLatin1String(":/timeline/range_handle.png"),
                                  Utils::Theme::IconsBaseColor}});