From 605deb55e87cddf710b2394aaa85cc64e9a4ab08 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 16 Oct 2014 22:59:14 +0300
Subject: [PATCH] Theme: Remove theme_p.cpp

Merge into theme.cpp

Change-Id: I2068f224e6364a87573fe7e938d4dd8089cbaafa
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 src/libs/utils/theme/theme.cpp   | 10 +++++++
 src/libs/utils/theme/theme_p.cpp | 47 --------------------------------
 src/libs/utils/utils-lib.pri     |  1 -
 src/libs/utils/utils.qbs         |  1 -
 4 files changed, 10 insertions(+), 49 deletions(-)
 delete mode 100644 src/libs/utils/theme/theme_p.cpp

diff --git a/src/libs/utils/theme/theme.cpp b/src/libs/utils/theme/theme.cpp
index d56e99f800d..8479692546f 100644
--- a/src/libs/utils/theme/theme.cpp
+++ b/src/libs/utils/theme/theme.cpp
@@ -41,6 +41,16 @@ namespace Utils {
 
 static Theme *m_creatorTheme = 0;
 
+ThemePrivate::ThemePrivate()
+    : widgetStyle(Theme::StyleDefault)
+{
+    const QMetaObject &m = Theme::staticMetaObject;
+    colors.resize        (m.enumerator(m.indexOfEnumerator("ColorRole")).keyCount());
+    imageFiles.resize    (m.enumerator(m.indexOfEnumerator("ImageFile")).keyCount());
+    gradientStops.resize (m.enumerator(m.indexOfEnumerator("GradientRole")).keyCount());
+    flags.resize         (m.enumerator(m.indexOfEnumerator("Flag")).keyCount());
+}
+
 Theme *creatorTheme()
 {
     return m_creatorTheme;
diff --git a/src/libs/utils/theme/theme_p.cpp b/src/libs/utils/theme/theme_p.cpp
deleted file mode 100644
index d2b67b3f4d2..00000000000
--- a/src/libs/utils/theme/theme_p.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Thorben Kroeger <thorbenkroeger@gmail.com>.
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://www.qt.io/licensing.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "theme_p.h"
-
-#include <QMetaEnum>
-
-namespace Utils {
-
-ThemePrivate::ThemePrivate()
-    : widgetStyle(Theme::StyleDefault)
-{
-    const QMetaObject &m = Theme::staticMetaObject;
-    colors.resize        (m.enumerator(m.indexOfEnumerator("ColorRole")).keyCount());
-    imageFiles.resize    (m.enumerator(m.indexOfEnumerator("ImageFile")).keyCount());
-    gradientStops.resize (m.enumerator(m.indexOfEnumerator("GradientRole")).keyCount());
-    flags.resize         (m.enumerator(m.indexOfEnumerator("Flag")).keyCount());
-}
-
-} // namespace Utils
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index 087bcba89e9..2897e440530 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -94,7 +94,6 @@ SOURCES += $$PWD/environment.cpp \
     $$PWD/proxycredentialsdialog.cpp \
     $$PWD/macroexpander.cpp \
     $$PWD/theme/theme.cpp \
-    $$PWD/theme/theme_p.cpp \
     $$PWD/theme/welcometheme.cpp
 
 win32:SOURCES += $$PWD/consoleprocess_win.cpp
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index a5a92af87af..6318c1b478f 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -210,7 +210,6 @@ QtcLibrary {
         files: [
             "theme.cpp",
             "theme.h",
-            "theme_p.cpp",
             "theme_p.h",
             "welcometheme.cpp",
             "welcometheme.h",