Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove Q3 style remains

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-01-11 17:26:33 +02:00
parent f0a7f5dabc
commit 862cbef87d
4 changed files with 4 additions and 453 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -580,12 +580,10 @@ katie_generate_obsolete(qdate.h QtCore qdatetime.h)
katie_generate_obsolete(qwizardpage.h QtGui qwizard.h)
katie_generate_obsolete(qtimeedit.h QtGui qdatetimeedit.h)
katie_generate_obsolete(qdateedit.h QtGui qdatetimeedit.h)
katie_generate_obsolete(qhboxlayout.h QtGui qboxlayout.h)
katie_generate_obsolete(qvboxlayout.h QtGui qboxlayout.h)
katie_generate_obsolete(qspaceritem.h QtGui qlayoutitem.h)
katie_generate_obsolete(qdoublespinbox.h QtGui qspinbox.h)
katie_generate_obsolete(global.h Phonon ../phonon/phononnamespace.h)
katie_generate_obsolete(qxmlstream.h QtXml ../QtCore/qxmlstream.h)
katie_generate_obsolete(qxmlstreamwriter.h QtXml ../QtCore/qxmlstream.h)

3
src/gui/CMakeLists.txt
View file

@ -269,9 +269,6 @@ set(GUI_PUBLIC_HEADERS
QStyleOptionDockWidgetV2
QStyleOptionGroupBox
QStyleOptionProgressBar
QStyleOptionQ3DockWindow
QStyleOptionQ3ListView
QStyleOptionQ3ListViewItem
QStyleOptionSizeGrip
QStyleOptionTab
QStyleOptionTabBarBase

382
src/gui/styles/qstyleoption.cpp
View file

@ -135,12 +135,6 @@ QT_BEGIN_NAMESPACE
\value SO_ComplexCustomBase Reserved for custom QStyleOptions;
all custom complex controls values must be above this value
Some style options are defined for various Qt3Support controls:
\value SO_Q3DockWindow \l QStyleOptionQ3DockWindow
\value SO_Q3ListView \l QStyleOptionQ3ListView
\value SO_Q3ListViewItem \l QStyleOptionQ3ListViewItem
\sa type
*/
@ -2209,376 +2203,6 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version)
*/
#endif // QT_NO_SPINBOX
/*!
\class QStyleOptionQ3ListViewItem
\brief The QStyleOptionQ3ListViewItem class is used to describe an
item drawn in a Q3ListView.
This class is used for drawing the compatibility Q3ListView's
items. \bold {It is not recommended for new classes}.
QStyleOptionQ3ListViewItem contains all the information that
QStyle functions need to draw the Q3ListView items.
For performance reasons, the access to the member variables is
direct (i.e., using the \c . or \c -> operator). This low-level feel
makes the structures straightforward to use and emphasizes that
these are simply parameters used by the style functions.
For an example demonstrating how style options can be used, see
the \l {widgets/styles}{Styles} example.
\sa QStyleOption, QStyleOptionQ3ListView, Q3ListViewItem
*/
/*!
\enum QStyleOptionQ3ListViewItem::Q3ListViewItemFeature
This enum describes the features a list view item can have.
\value None A standard item.
\value Expandable The item has children that can be shown.
\value MultiLine The item is more than one line tall.
\value Visible The item is visible.
\value ParentControl The item's parent is a type of item control (Q3CheckListItem::Controller).
\sa features, Q3ListViewItem::isVisible(), Q3ListViewItem::multiLinesEnabled(),
Q3ListViewItem::isExpandable()
*/
/*!
Constructs a QStyleOptionQ3ListViewItem, initializing the members
variables to their default values.
*/
QStyleOptionQ3ListViewItem::QStyleOptionQ3ListViewItem()
: QStyleOption(Version, SO_Q3ListViewItem), features(None), height(0), totalHeight(0),
itemY(0), childCount(0)
{
}
/*!
\internal
*/
QStyleOptionQ3ListViewItem::QStyleOptionQ3ListViewItem(int version)
: QStyleOption(version, SO_Q3ListViewItem), features(None), height(0), totalHeight(0),
itemY(0), childCount(0)
{
}
/*!
\fn QStyleOptionQ3ListViewItem::QStyleOptionQ3ListViewItem(const QStyleOptionQ3ListViewItem &other)
Constructs a copy of the \a other style option.
*/
/*!
\enum QStyleOptionQ3ListViewItem::StyleOptionType
This enum is used to hold information about the type of the style option, and
is defined for each QStyleOption subclass.
\value Type The type of style option provided (\l{SO_Q3ListViewItem} for this class).
The type is used internally by QStyleOption, its subclasses, and
qstyleoption_cast() to determine the type of style option. In
general you do not need to worry about this unless you want to
create your own QStyleOption subclass and your own styles.
\sa StyleOptionVersion
*/
/*!
\enum QStyleOptionQ3ListViewItem::StyleOptionVersion
This enum is used to hold information about the version of the style option, and
is defined for each QStyleOption subclass.
\value Version 1
The version is used by QStyleOption subclasses to implement
extensions without breaking compatibility. If you use
qstyleoption_cast(), you normally do not need to check it.
\sa StyleOptionType
*/
/*!
\variable QStyleOptionQ3ListViewItem::features
\brief the features for this item
This variable is a bitwise OR of the features of the item. The deafult value is \l None.
\sa Q3ListViewItemFeature
*/
/*!
\variable QStyleOptionQ3ListViewItem::height
\brief the height of the item
This doesn't include the height of the item's children. The default height is 0.
\sa Q3ListViewItem::height()
*/
/*!
\variable QStyleOptionQ3ListViewItem::totalHeight
\brief the total height of the item, including its children
The default total height is 0.
\sa Q3ListViewItem::totalHeight()
*/
/*!
\variable QStyleOptionQ3ListViewItem::itemY
\brief the Y-coordinate for the item
The default value is 0.
\sa Q3ListViewItem::itemPos()
*/
/*!
\variable QStyleOptionQ3ListViewItem::childCount
\brief the number of children the item has
*/
/*!
\class QStyleOptionQ3ListView
\brief The QStyleOptionQ3ListView class is used to describe the
parameters for drawing a Q3ListView.
This class is used for drawing the compatibility Q3ListView. \bold
{It is not recommended for new classes}.
QStyleOptionQ3ListView contains all the information that QStyle
functions need to draw Q3ListView.
For performance reasons, the access to the member variables is
direct (i.e., using the \c . or \c -> operator). This low-level feel
makes the structures straightforward to use and emphasizes that
these are simply parameters used by the style functions.
For an example demonstrating how style options can be used, see
the \l {widgets/styles}{Styles} example.
\sa QStyleOptionComplex, Q3ListView, QStyleOptionQ3ListViewItem
*/
/*!
Creates a QStyleOptionQ3ListView, initializing the members
variables to their default values.
*/
QStyleOptionQ3ListView::QStyleOptionQ3ListView()
: QStyleOptionComplex(Version, SO_Q3ListView), viewportBGRole(QPalette::Base),
sortColumn(0), itemMargin(0), treeStepSize(0), rootIsDecorated(false)
{
}
/*!
\internal
*/
QStyleOptionQ3ListView::QStyleOptionQ3ListView(int version)
: QStyleOptionComplex(version, SO_Q3ListView), viewportBGRole(QPalette::Base),
sortColumn(0), itemMargin(0), treeStepSize(0), rootIsDecorated(false)
{
}
/*!
\fn QStyleOptionQ3ListView::QStyleOptionQ3ListView(const QStyleOptionQ3ListView &other)
Constructs a copy of the \a other style option.
*/
/*!
\enum QStyleOptionQ3ListView::StyleOptionType
This enum is used to hold information about the type of the style option, and
is defined for each QStyleOption subclass.
\value Type The type of style option provided (\l{SO_Q3ListView} for this class).
The type is used internally by QStyleOption, its subclasses, and
qstyleoption_cast() to determine the type of style option. In
general you do not need to worry about this unless you want to
create your own QStyleOption subclass and your own styles.
\sa StyleOptionVersion
*/
/*!
\enum QStyleOptionQ3ListView::StyleOptionVersion
This enum is used to hold information about the version of the style option, and
is defined for each QStyleOption subclass.
\value Version 1
The version is used by QStyleOption subclasses to implement
extensions without breaking compatibility. If you use
qstyleoption_cast(), you normally do not need to check it.
\sa StyleOptionType
*/
/*!
\variable QStyleOptionQ3ListView::items
\brief a list of items in the Q3ListView
This is a list of \l {QStyleOptionQ3ListViewItem}s. The first item
can be used for most of the calculation that are needed for
drawing a list view. Any additional items are the children of
this first item, which may be used for additional information.
\sa QStyleOptionQ3ListViewItem
*/
/*!
\variable QStyleOptionQ3ListView::viewportPalette
\brief the palette of Q3ListView's viewport
By default, the application's default palette is used.
*/
/*!
\variable QStyleOptionQ3ListView::viewportBGRole
\brief the background role of Q3ListView's viewport
The default value is QPalette::Base.
\sa QWidget::backgroundRole()
*/
/*!
\variable QStyleOptionQ3ListView::sortColumn
\brief the sort column of the list view
The default value is 0.
\sa Q3ListView::sortColumn()
*/
/*!
\variable QStyleOptionQ3ListView::itemMargin
\brief the margin for items in the list view
The default value is 0.
\sa Q3ListView::itemMargin()
*/
/*!
\variable QStyleOptionQ3ListView::treeStepSize
\brief the number of pixel to offset children items from their
parents
The default value is 0.
\sa Q3ListView::treeStepSize()
*/
/*!
\variable QStyleOptionQ3ListView::rootIsDecorated
\brief whether root items are decorated
The default value is false.
\sa Q3ListView::rootIsDecorated()
*/
/*!
\class QStyleOptionQ3DockWindow
\brief The QStyleOptionQ3DockWindow class is used to describe the
parameters for drawing various parts of a Q3DockWindow.
This class is used for drawing the old Q3DockWindow and its
parts. \bold {It is not recommended for new classes}.
QStyleOptionQ3DockWindow contains all the information that QStyle
functions need to draw Q3DockWindow and its parts.
For performance reasons, the access to the member variables is
direct (i.e., using the \c . or \c -> operator). This low-level feel
makes the structures straightforward to use and emphasizes that
these are simply parameters used by the style functions.
For an example demonstrating how style options can be used, see
the \l {widgets/styles}{Styles} example.
\sa QStyleOption, Q3DockWindow
*/
/*!
Constructs a QStyleOptionQ3DockWindow, initializing the member
variables to their default values.
*/
QStyleOptionQ3DockWindow::QStyleOptionQ3DockWindow()
: QStyleOption(Version, SO_Q3DockWindow), docked(false), closeEnabled(false)
{
}
/*!
\internal
*/
QStyleOptionQ3DockWindow::QStyleOptionQ3DockWindow(int version)
: QStyleOption(version, SO_Q3DockWindow), docked(false), closeEnabled(false)
{
}
/*!
\fn QStyleOptionQ3DockWindow::QStyleOptionQ3DockWindow(const QStyleOptionQ3DockWindow &other)
Constructs a copy of the \a other style option.
*/
/*!
\enum QStyleOptionQ3DockWindow::StyleOptionType
This enum is used to hold information about the type of the style option, and
is defined for each QStyleOption subclass.
\value Type The type of style option provided (\l{SO_Q3DockWindow} for this class).
The type is used internally by QStyleOption, its subclasses, and
qstyleoption_cast() to determine the type of style option. In
general you do not need to worry about this unless you want to
create your own QStyleOption subclass and your own styles.
\sa StyleOptionVersion
*/
/*!
\enum QStyleOptionQ3DockWindow::StyleOptionVersion
This enum is used to hold information about the version of the style option, and
is defined for each QStyleOption subclass.
\value Version 1
The version is used by QStyleOption subclasses to implement
extensions without breaking compatibility. If you use
qstyleoption_cast(), you normally do not need to check it.
\sa StyleOptionType
*/
/*!
\variable QStyleOptionQ3DockWindow::docked
\brief whether the dock window is currently docked
The default value is false.
*/
/*!
\variable QStyleOptionQ3DockWindow::closeEnabled
\brief whether the dock window has a close button
The default value is false.
*/
/*!
\class QStyleOptionDockWidget
\brief The QStyleOptionDockWidget class is used to describe the
@ -4324,12 +3948,8 @@ QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType)
debug << "SO_ToolBox"; break;
case QStyleOption::SO_Header:
debug << "SO_Header"; break;
case QStyleOption::SO_Q3DockWindow:
debug << "SO_Q3DockWindow"; break;
case QStyleOption::SO_DockWidget:
debug << "SO_DockWidget"; break;
case QStyleOption::SO_Q3ListViewItem:
debug << "SO_Q3ListViewItem"; break;
case QStyleOption::SO_ViewItem:
debug << "SO_ViewItem"; break;
case QStyleOption::SO_TabWidgetFrame:
@ -4348,8 +3968,6 @@ QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType)
debug << "SO_ToolButton"; break;
case QStyleOption::SO_ComboBox:
debug << "SO_ComboBox"; break;
case QStyleOption::SO_Q3ListView:
debug << "SO_Q3ListView"; break;
case QStyleOption::SO_TitleBar:
debug << "SO_TitleBar"; break;
case QStyleOption::SO_CustomBase:

70
src/gui/styles/qstyleoption.h
View file

@ -68,12 +68,12 @@ class Q_GUI_EXPORT QStyleOption
public:
enum OptionType {
SO_Default, SO_FocusRect, SO_Button, SO_Tab, SO_MenuItem,
SO_Frame, SO_ProgressBar, SO_ToolBox, SO_Header, SO_Q3DockWindow,
SO_DockWidget, SO_Q3ListViewItem, SO_ViewItem, SO_TabWidgetFrame,
SO_TabBarBase, SO_RubberBand, SO_ToolBar, SO_GraphicsItem,
SO_Frame, SO_ProgressBar, SO_ToolBox, SO_Header, SO_DockWidget,
SO_ViewItem, SO_TabWidgetFrame, SO_TabBarBase, SO_RubberBand,
SO_ToolBar, SO_GraphicsItem,
SO_Complex = 0xf0000, SO_Slider, SO_SpinBox, SO_ToolButton, SO_ComboBox,
SO_Q3ListView, SO_TitleBar, SO_GroupBox, SO_SizeGrip,
SO_TitleBar, SO_GroupBox, SO_SizeGrip,
SO_CustomBase = 0xf00,
SO_ComplexCustomBase = 0xf000000
@ -359,47 +359,6 @@ protected:
QStyleOptionMenuItem(int version);
};
class Q_GUI_EXPORT QStyleOptionQ3ListViewItem : public QStyleOption
{
public:
enum StyleOptionType { Type = SO_Q3ListViewItem };
enum StyleOptionVersion { Version = 1 };
enum Q3ListViewItemFeature { None = 0x00, Expandable = 0x01, MultiLine = 0x02, Visible = 0x04,
ParentControl = 0x08 };
Q_DECLARE_FLAGS(Q3ListViewItemFeatures, Q3ListViewItemFeature)
Q3ListViewItemFeatures features;
int height;
int totalHeight;
int itemY;
int childCount;
QStyleOptionQ3ListViewItem();
QStyleOptionQ3ListViewItem(const QStyleOptionQ3ListViewItem &other) : QStyleOption(Version, Type) { *this = other; }
protected:
QStyleOptionQ3ListViewItem(int version);
};
Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionQ3ListViewItem::Q3ListViewItemFeatures)
class Q_GUI_EXPORT QStyleOptionQ3DockWindow : public QStyleOption
{
public:
enum StyleOptionType { Type = SO_Q3DockWindow };
enum StyleOptionVersion { Version = 1 };
bool docked;
bool closeEnabled;
QStyleOptionQ3DockWindow();
QStyleOptionQ3DockWindow(const QStyleOptionQ3DockWindow &other) : QStyleOption(Version, Type) { *this = other; }
protected:
QStyleOptionQ3DockWindow(int version);
};
class Q_GUI_EXPORT QStyleOptionDockWidget : public QStyleOption
{
public:
@ -575,27 +534,6 @@ protected:
};
#endif // QT_NO_SPINBOX
class Q_GUI_EXPORT QStyleOptionQ3ListView : public QStyleOptionComplex
{
public:
enum StyleOptionType { Type = SO_Q3ListView };
enum StyleOptionVersion { Version = 1 };
QList<QStyleOptionQ3ListViewItem> items;
QPalette viewportPalette;
QPalette::ColorRole viewportBGRole;
int sortColumn;
int itemMargin;
int treeStepSize;
bool rootIsDecorated;
QStyleOptionQ3ListView();
QStyleOptionQ3ListView(const QStyleOptionQ3ListView &other) : QStyleOptionComplex(Version, Type) { *this = other; }
protected:
QStyleOptionQ3ListView(int version);
};
class Q_GUI_EXPORT QStyleOptionToolButton : public QStyleOptionComplex
{
public: