alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git rid of the native member, it's redundant; use d->setWidget which notes that it's not a palette customization

Browse Source
This commit is contained in:
Aaron Seigo 2011-12-04 13:59:54 +01:00
parent 27531a3173
commit e34c70415e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
widgets/textbrowser.cpp
View File

@ -40,7 +40,6 @@ class TextBrowserPrivate : public ThemedWidgetInterface<TextBrowser>
public: public:
TextBrowserPrivate(TextBrowser *browser) TextBrowserPrivate(TextBrowser *browser)
: ThemedWidgetInterface<TextBrowser>(browser), : ThemedWidgetInterface<TextBrowser>(browser),
native(0),
savedMinimumHeight(0), savedMinimumHeight(0),
savedMaximumHeight(QWIDGETSIZE_MAX), savedMaximumHeight(QWIDGETSIZE_MAX),
wasNotFixed(true) wasNotFixed(true)
@ -49,7 +48,8 @@ public:
void setFixedHeight() void setFixedHeight()
{ {
if (native && native->document() && KTextBrowser *native = q->nativeWidget();
if (native->document() &&
q->sizePolicy().verticalPolicy() == QSizePolicy::Fixed && q->sizePolicy().verticalPolicy() == QSizePolicy::Fixed &&
native->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOff) { native->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOff) {
native->document()->setTextWidth(q->size().width()); native->document()->setTextWidth(q->size().width());
@ -84,7 +84,7 @@ TextBrowser::TextBrowser(QGraphicsWidget *parent)
connect(native, SIGNAL(textChanged()), this, SIGNAL(textChanged())); connect(native, SIGNAL(textChanged()), this, SIGNAL(textChanged()));
connect(native, SIGNAL(textChanged()), this, SLOT(setFixedHeight())); connect(native, SIGNAL(textChanged()), this, SLOT(setFixedHeight()));
native->setWindowIcon(QIcon()); native->setWindowIcon(QIcon());
setWidget(native); d->setWidget(native);
d->native = native; d->native = native;
native->setAttribute(Qt::WA_NoSystemBackground); native->setAttribute(Qt::WA_NoSystemBackground);
native->setFrameShape(QFrame::NoFrame); native->setFrameShape(QFrame::NoFrame);
@ -114,12 +114,12 @@ QString TextBrowser::text() const
void TextBrowser::setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy policy) void TextBrowser::setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy policy)
{ {
d->native->setHorizontalScrollBarPolicy(policy); nativeWidget()->setHorizontalScrollBarPolicy(policy);
} }
void TextBrowser::setVerticalScrollBarPolicy(Qt::ScrollBarPolicy policy) void TextBrowser::setVerticalScrollBarPolicy(Qt::ScrollBarPolicy policy)
{ {
d->native->setVerticalScrollBarPolicy(policy); nativeWidget()->setVerticalScrollBarPolicy(policy);
} }
void TextBrowser::setStyleSheet(const QString &stylesheet) void TextBrowser::setStyleSheet(const QString &stylesheet)
@ -173,8 +173,8 @@ void TextBrowser::resizeEvent(QGraphicsSceneResizeEvent *event)
void TextBrowser::wheelEvent(QGraphicsSceneWheelEvent *event) void TextBrowser::wheelEvent(QGraphicsSceneWheelEvent *event)
{ {
if (d->native->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOff && if (nativeWidget()->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOff &&
d->native->horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOff) { nativeWidget()->horizontalScrollBarPolicy() == Qt::ScrollBarAlwaysOff) {
event->ignore(); event->ignore();
} else { } else {
QGraphicsProxyWidget::wheelEvent(event); QGraphicsProxyWidget::wheelEvent(event);