Commit 605deb55 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk

Theme: Remove theme_p.cpp

Merge into theme.cpp

Change-Id: I2068f224e6364a87573fe7e938d4dd8089cbaafa
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 58b39b2a
...@@ -41,6 +41,16 @@ namespace Utils { ...@@ -41,6 +41,16 @@ namespace Utils {
static Theme *m_creatorTheme = 0; 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() Theme *creatorTheme()
{ {
return m_creatorTheme; return m_creatorTheme;
......
/****************************************************************************
**
** 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
...@@ -94,7 +94,6 @@ SOURCES += $$PWD/environment.cpp \ ...@@ -94,7 +94,6 @@ SOURCES += $$PWD/environment.cpp \
$$PWD/proxycredentialsdialog.cpp \ $$PWD/proxycredentialsdialog.cpp \
$$PWD/macroexpander.cpp \ $$PWD/macroexpander.cpp \
$$PWD/theme/theme.cpp \ $$PWD/theme/theme.cpp \
$$PWD/theme/theme_p.cpp \
$$PWD/theme/welcometheme.cpp $$PWD/theme/welcometheme.cpp
win32:SOURCES += $$PWD/consoleprocess_win.cpp win32:SOURCES += $$PWD/consoleprocess_win.cpp
......
...@@ -210,7 +210,6 @@ QtcLibrary { ...@@ -210,7 +210,6 @@ QtcLibrary {
files: [ files: [
"theme.cpp", "theme.cpp",
"theme.h", "theme.h",
"theme_p.cpp",
"theme_p.h", "theme_p.h",
"welcometheme.cpp", "welcometheme.cpp",
"welcometheme.h", "welcometheme.h",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment