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

get rid of vestigal m_corona now

Browse Source
This commit is contained in:
Aaron Seigo 2011-07-30 20:21:15 +02:00
parent 7c8cf530e1
commit 011f79bca8
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
corona.cpp
View File

@ -68,7 +68,6 @@ Corona::Corona(QObject *parent)
kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Corona ctor start"; kDebug() << "!!{} STARTUP TIME" << QTime().msecsTo(QTime::currentTime()) << "Corona ctor start";
#endif #endif
d->init(); d->init();
ToolTipManager::self()->m_corona = this;
//setViewport(new QGLWidget(QGLFormat(QGL::StencilBuffer | QGL::AlphaChannel))); //setViewport(new QGLWidget(QGLFormat(QGL::StencilBuffer | QGL::AlphaChannel)));
} }
@ -452,11 +451,7 @@ QRegion Corona::availableScreenRegion(int id) const
QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::AlignmentFlag alignment) QPoint Corona::popupPosition(const QGraphicsItem *item, const QSize &s, Qt::AlignmentFlag alignment)
{ {
// TODO: merge both methods (also these in Applet) into one (with optional alignment) when we can break compatibility
// TODO: add support for more flags in the future?
const QGraphicsItem *actualItem = item; const QGraphicsItem *actualItem = item;
const QGraphicsView *v = viewFor(item); const QGraphicsView *v = viewFor(item);
if (!v) { if (!v) {

3
tooltipmanager.cpp
View File

@ -119,8 +119,7 @@ ToolTipManager *ToolTipManager::self()
ToolTipManager::ToolTipManager(QObject *parent) ToolTipManager::ToolTipManager(QObject *parent)
: QObject(parent), : QObject(parent),
d(new ToolTipManagerPrivate(this)), d(new ToolTipManagerPrivate(this))
m_corona(0)
{ {
d->showTimer->setSingleShot(true); d->showTimer->setSingleShot(true);
connect(d->showTimer, SIGNAL(timeout()), SLOT(showToolTip())); connect(d->showTimer, SIGNAL(timeout()), SLOT(showToolTip()));

1
tooltipmanager.h
View File

@ -205,7 +205,6 @@ private:
bool eventFilter(QObject *watched, QEvent *event); bool eventFilter(QObject *watched, QEvent *event);
ToolTipManagerPrivate *const d; ToolTipManagerPrivate *const d;
Corona* m_corona;
Q_PRIVATE_SLOT(d, void showToolTip()) Q_PRIVATE_SLOT(d, void showToolTip())
Q_PRIVATE_SLOT(d, void toolTipHovered(bool)) Q_PRIVATE_SLOT(d, void toolTipHovered(bool))