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

make private what should be private

Browse Source
This commit is contained in:
Marco Martin 2014-02-19 18:30:24 +01:00
parent 2be97bdcdc
commit c9ac5ebefb
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/declarativeimports/core/dialog.cpp
View File

@ -514,6 +514,11 @@ DialogProxy::WindowType DialogProxy::type() const
return m_type; return m_type;
} }
Plasma::FrameSvgItem *DialogProxy::frameSvgItem()
{
return m_frameSvgItem;
}
void DialogProxy::focusInEvent(QFocusEvent *ev) void DialogProxy::focusInEvent(QFocusEvent *ev)
{ {
QQuickWindow::focusInEvent(ev); QQuickWindow::focusInEvent(ev);

13
src/declarativeimports/core/dialog.h
View File

@ -163,15 +163,11 @@ protected:
void hideEvent(QHideEvent *event); void hideEvent(QHideEvent *event);
bool event(QEvent *event); bool event(QEvent *event);
Plasma::FrameSvgItem *frameSvgItem();
virtual void classBegin(); virtual void classBegin();
virtual void componentComplete(); virtual void componentComplete();
QTimer *m_syncTimer;
Plasma::Types::Location m_location;
Plasma::FrameSvgItem *m_frameSvgItem;
QWeakPointer<QQuickItem> m_mainItem;
QWeakPointer<QQuickItem> m_visualParent;
private Q_SLOTS: private Q_SLOTS:
void syncBorders(); void syncBorders();
void updateContrast(); void updateContrast();
@ -183,6 +179,11 @@ private Q_SLOTS:
void updateMaximumHeight(); void updateMaximumHeight();
private: private:
QTimer *m_syncTimer;
Plasma::Types::Location m_location;
Plasma::FrameSvgItem *m_frameSvgItem;
QWeakPointer<QQuickItem> m_mainItem;
QWeakPointer<QQuickItem> m_visualParent;
QScreen* screenForItem(QQuickItem *item) const; QScreen* screenForItem(QQuickItem *item) const;
QRect m_cachedGeometry; QRect m_cachedGeometry;

2
src/declarativeimports/core/tooltipdialog.cpp
View File

@ -41,7 +41,7 @@ ToolTipDialog::ToolTipDialog(QQuickItem *parent)
setFlags(Qt::ToolTip); setFlags(Qt::ToolTip);
setLocation(Plasma::Types::Floating); setLocation(Plasma::Types::Floating);
setDirection(Plasma::Types::Up); setDirection(Plasma::Types::Up);
m_frameSvgItem->setImagePath("widgets/tooltip"); frameSvgItem()->setImagePath("widgets/tooltip");
m_animation = new QPropertyAnimation(this); m_animation = new QPropertyAnimation(this);
connect(m_animation, SIGNAL(valueChanged(QVariant)), connect(m_animation, SIGNAL(valueChanged(QVariant)),