Rename KStyle to TDEStyle to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 2256e553c4
commit 391e0b69f2

@ -78,7 +78,7 @@ void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle )
m_fixForHeight = 0; m_fixForHeight = 0;
//</hack> //</hack>
m_drawComplexControl = m_drawComplexControl =
(style().inherits("KStyle") && tqstricmp(style().name(),"qtcurve")!=0) (style().inherits("TDEStyle") && tqstricmp(style().name(),"qtcurve")!=0)
|| tqstricmp(style().name(),"platinum")==0; || tqstricmp(style().name(),"platinum")==0;
if (m_fixForHeight==0) if (m_fixForHeight==0)
setFixedWidth( style().querySubControlMetrics( TQStyle::CC_ComboBox, setFixedWidth( style().querySubControlMetrics( TQStyle::CC_ComboBox,

@ -29,7 +29,7 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
: TQToolButton(parent, "KexiDBImageBox::Button") : TQToolButton(parent, "KexiDBImageBox::Button")
{ {
setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
//! @todo get this from a KStyle //! @todo get this from a TDEStyle
// setFixedWidth(TQMAX(18, tqApp->globalStrut().width())); // setFixedWidth(TQMAX(18, tqApp->globalStrut().width()));
int fixedWidth; int fixedWidth;
//hack //hack

@ -62,10 +62,10 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T
// xmarg = xmarg * 10 / 14 -1; // xmarg = xmarg * 10 / 14 -1;
#if 0 #if 0
//! @todo disabled: kstyles do not paint background yet... reenable in the future... //! @todo disabled: kstyles do not paint background yet... reenable in the future...
KStyle* kstyle = dynamic_cast<KStyle*>(widget->style()); TDEStyle* kstyle = dynamic_cast<TDEStyle*>(widget->style());
if (kstyle) { if (kstyle) {
kstyle->drawKStylePrimitive( kstyle->drawTDEStylePrimitive(
KStyle::KPE_ListViewExpander, p, w, TQRect( xmarg, marg, BRANCHBOX_SIZE, BRANCHBOX_SIZE ), TDEStyle::KPE_ListViewExpander, p, w, TQRect( xmarg, marg, BRANCHBOX_SIZE, BRANCHBOX_SIZE ),
cg, isOpen ? 0 : TQStyle::Style_On, cg, isOpen ? 0 : TQStyle::Style_On,
TQStyleOption::Default); TQStyleOption::Default);
} }

Loading…
Cancel
Save