diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-08-18 10:22:22 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-08-18 10:22:22 -0500 |
| commit | 6aab98c89729af95ace9a660a94cdef1af5d4971 (patch) | |
| tree | 474b685980f50f9b653f661ca7602b9d777bd23c | |
| parent | 851cce9063b1d4cf6e36a7ed4ebf4ee4315a70ba (diff) | |
| download | koffice-6aab98c8.tar.gz koffice-6aab98c8.zip | |
Rename KStyle to TDEStyle to avoid conflicts with KDE4.
| -rwxr-xr-x | kpresenter/scripts/mkstandalone.sh | 2 | ||||
| -rw-r--r-- | lib/koproperty/editoritem.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kpresenter/scripts/mkstandalone.sh b/kpresenter/scripts/mkstandalone.sh index be7314ca..0423feb4 100755 --- a/kpresenter/scripts/mkstandalone.sh +++ b/kpresenter/scripts/mkstandalone.sh @@ -22,7 +22,7 @@ else mkdir -p $out/share/apps cp -r $TDEDIR/share/apps/kpresenter $out/share/apps/ cp -r $TDEDIR/share/apps/koffice $out/share/apps/ - cp -r $TDEDIR/share/apps/kstyle $out/share/apps/ + cp -r $TDEDIR/share/apps/tdestyle $out/share/apps/ mkdir -p $out/share/config cp $TDEDIR/share/config/kdebug.areas $out/share/config/ cp ~/.trinity/share/config/kdeglobals $out/share/config/ diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index 07c97263..2fd9c18d 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -61,10 +61,10 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T // if (dynamic_cast<EditorGroupItem*>(item)) // xmarg = xmarg * 10 / 14 -1; #if 0 -//! @todo disabled: kstyles do not paint background yet... reenable in the future... - TDEStyle* kstyle = dynamic_cast<TDEStyle*>(widget->style()); - if (kstyle) { - kstyle->drawTDEStylePrimitive( +//! @todo disabled: tdestyles do not paint background yet... reenable in the future... + TDEStyle* tdestyle = dynamic_cast<TDEStyle*>(widget->style()); + if (tdestyle) { + tdestyle->drawTDEStylePrimitive( TDEStyle::KPE_ListViewExpander, p, w, TQRect( xmarg, marg, BRANCHBOX_SIZE, BRANCHBOX_SIZE ), cg, isOpen ? 0 : TQStyle::Style_On, TQStyleOption::Default); |