From 705c979c14e6793c3faf5fecc3ade838f0892c27 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 11 Sep 2013 18:15:07 +0200 Subject: [PATCH] QmlEditorWidgets: Remove dead code Change-Id: I4eb3128023061f4cfa07a166d1f3ed188e1d70db Reviewed-by: Thomas Hartmann --- .../qmleditorwidgets/contextpanewidget.cpp | 21 ----------- .../contextpanewidgetimage.cpp | 37 ------------------- src/libs/qmleditorwidgets/gradientline.cpp | 20 ---------- 3 files changed, 78 deletions(-) diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index c2f826da38f..84fdb2177e4 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -53,27 +53,6 @@ using namespace Utils; namespace QmlEditorWidgets { -/* XPM */ -static const char * const line_xpm[] = { - "14 14 3 1", - " c None", - ". c #0c0c0c", - "x c #1c1c1c", - "............. ", - ". . ", - ". x x . ", - ". x x . ", - ". x x . ", - ". x x . ", - ". x . ", - ". x x . ", - ". x x . ", - ". x x . ", - ". x x . ", - ". . ", - "............. ", - " "}; - /* XPM */ static const char * pin_xpm[] = { "12 9 7 1", diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp index df76de33b7d..ab2a3b898f6 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp @@ -779,43 +779,6 @@ static inline int limitPositive(int i) return 0; } -static inline int limit(int i, int zoom) -{ - static bool flag1 = 1; - static bool flag2 = 1; - if (zoom == 1) - return i; - if (i < 0) { - int v = i / zoom; - if (v) - return v; - if (zoom == 2) { - flag1 =!flag1; - return flag1 ? -1 : 0; - } - flag1 =!flag1; - if (flag1) - flag2 =!flag2; - - return flag1 && flag2 ? -1 : 0; - } - if (i > 0) { - int v = i / zoom; - if (v) - return v; - if (zoom == 2) { - flag1 =!flag1; - return flag1 ? 1 : 0; - } - flag1 =!flag1; - if (flag1) - flag2 =!flag2; - - return flag1 && flag2 ? 1 : 0; - } - return 0; -} - void PreviewLabel::mouseMoveEvent(QMouseEvent * event) { if (!m_borderImage) diff --git a/src/libs/qmleditorwidgets/gradientline.cpp b/src/libs/qmleditorwidgets/gradientline.cpp index c1f1cdf9e0d..f55d53528ee 100644 --- a/src/libs/qmleditorwidgets/gradientline.cpp +++ b/src/libs/qmleditorwidgets/gradientline.cpp @@ -52,13 +52,6 @@ void GradientLine::setGradient(const QLinearGradient &gradient) readGradient(); } -static inline QColor invertColor(const QColor color) -{ - QColor c = color.toHsv(); - c.setHsv(c.hue(), c.saturation(), 255 - c.value()); - return c; -} - GradientLine::GradientLine(QWidget *parent) : QWidget(parent), m_activeColor(Qt::black), @@ -327,19 +320,6 @@ void GradientLine::setup() } -static inline QColor normalizeColor(const QColor &color) -{ - QColor newColor = QColor(color.name()); - newColor.setAlpha(color.alpha()); - return newColor; -} - -static inline qreal roundReal(qreal real) -{ - int i = real * 100; - return qreal(i) / 100; -} - void GradientLine::updateGradient() { if (m_useGradient) {