Changeset 109346 in webkit


Ignore:
Timestamp:
Mar 1, 2012 7:18:23 AM (12 years ago)
Author:
Simon Hausmann
Message:

[Qt] Remove dead style option code.
https://bugs.webkit.org/show_bug.cgi?id=80017

Reviewed by Kenneth Rohde Christiansen.

QtStyleOptionWebComboBox provides functionality (bool multiple()) that
is not called from anywhere (and the base class does not have it as a
virtual function).

  • Target.pri:
  • platform/qt/QtStyleOptionWebComboBox.h: Removed.
  • platform/qt/RenderThemeQStyle.cpp:

(WebCore::RenderThemeQStyle::paintMenuList):
(WebCore::RenderThemeQStyle::paintMenuListButton):

Location:
trunk/Source/WebCore
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r109345 r109346  
     12012-03-01  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        [Qt] Remove dead style option code.
     4        https://bugs.webkit.org/show_bug.cgi?id=80017
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        QtStyleOptionWebComboBox provides functionality (bool multiple()) that
     9        is not called from anywhere (and the base class does not have it as a
     10        virtual function).
     11
     12        * Target.pri:
     13        * platform/qt/QtStyleOptionWebComboBox.h: Removed.
     14        * platform/qt/RenderThemeQStyle.cpp:
     15        (WebCore::RenderThemeQStyle::paintMenuList):
     16        (WebCore::RenderThemeQStyle::paintMenuListButton):
     17
    1182012-03-01  Stephen Chenney  <schenney@chromium.org>
    219
  • trunk/Source/WebCore/Target.pri

    r109319 r109346  
    28662866
    28672867contains(DEFINES, HAVE_QSTYLE=1) {
    2868     HEADERS += platform/qt/QtStyleOptionWebComboBox.h \
    2869                platform/qt/RenderThemeQStyle.h \
     2868    HEADERS += platform/qt/RenderThemeQStyle.h \
    28702869               platform/qt/ScrollbarThemeQt.h
    28712870    SOURCES += platform/qt/RenderThemeQStyle.cpp
  • trunk/Source/WebCore/platform/qt/RenderThemeQStyle.cpp

    r102679 r109346  
    4848#include "PaintInfo.h"
    4949#include "QWebPageClient.h"
    50 #include "QtStyleOptionWebComboBox.h"
    5150#include "RenderBox.h"
    5251#if ENABLE(PROGRESS_TAG)
     
    443442        return true;
    444443
    445     QtStyleOptionWebComboBox opt(o);
     444    QStyleOptionComboBox opt;
    446445    initStyleOption(p.widget, opt);
    447446    initializeCommonQStyleOptions(opt, o);
     
    483482        return true;
    484483
    485     QtStyleOptionWebComboBox option(o);
     484    QStyleOptionComboBox option;
    486485    initStyleOption(p.widget, option);
    487486    initializeCommonQStyleOptions(option, o);
Note: See TracChangeset for help on using the changeset viewer.