diff options
| author | Timothy Pearson <[email protected]> | 2013-02-03 22:50:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-03 22:50:50 -0600 |
| commit | 391e0b69f256bab8971430050c65f0e6e7eea9be (patch) | |
| tree | 77efb7924b999e16e7d35b8e7d9d4ea142b092b7 | |
| parent | 2256e553c46ff2cbcd2d0f4d0cdf24852e21847b (diff) | |
| download | koffice-391e0b69f256bab8971430050c65f0e6e7eea9be.tar.gz koffice-391e0b69f256bab8971430050c65f0e6e7eea9be.zip | |
Rename KStyle to TDEStyle to avoid conflicts with KDE4
| -rw-r--r-- | kexi/widget/utils/kexicomboboxdropdownbutton.cpp | 2 | ||||
| -rw-r--r-- | kexi/widget/utils/kexidropdownbutton.cpp | 2 | ||||
| -rw-r--r-- | lib/koproperty/editoritem.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
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; //</hack> 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 diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 9ff69035..aad5f0bc 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -62,10 +62,10 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T // xmarg = xmarg * 10 / 14 -1; #if 0 //! @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) { - kstyle->drawKStylePrimitive( - KStyle::KPE_ListViewExpander, p, w, TQRect( xmarg, marg, BRANCHBOX_SIZE, BRANCHBOX_SIZE ), + kstyle->drawTDEStylePrimitive( + TDEStyle::KPE_ListViewExpander, p, w, TQRect( xmarg, marg, BRANCHBOX_SIZE, BRANCHBOX_SIZE ), cg, isOpen ? 0 : TQStyle::Style_On, TQStyleOption::Default); } |