From 391e0b69f256bab8971430050c65f0e6e7eea9be Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 3 Feb 2013 22:50:50 -0600 Subject: Rename KStyle to TDEStyle to avoid conflicts with KDE4 --- kexi/widget/utils/kexicomboboxdropdownbutton.cpp | 2 +- kexi/widget/utils/kexidropdownbutton.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kexi/widget') diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp index 858ea914..319bf305 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp @@ -78,7 +78,7 @@ void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle ) m_fixForHeight = 0; // m_drawComplexControl = - (style().inherits("KStyle") && tqstricmp(style().name(),"qtcurve")!=0) + (style().inherits("TDEStyle") && tqstricmp(style().name(),"qtcurve")!=0) || tqstricmp(style().name(),"platinum")==0; if (m_fixForHeight==0) setFixedWidth( style().querySubControlMetrics( TQStyle::CC_ComboBox, diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index c3a14dca..cf204d13 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -29,7 +29,7 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent) : TQToolButton(parent, "KexiDBImageBox::Button") { setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); -//! @todo get this from a KStyle +//! @todo get this from a TDEStyle // setFixedWidth(TQMAX(18, tqApp->globalStrut().width())); int fixedWidth; //hack -- cgit v1.2.1