Use new static ICore interface.

Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
hjk
2012-01-24 15:36:40 +01:00
committed by hjk
parent c14a4756a9
commit 4a21f0c3c8
254 changed files with 848 additions and 1007 deletions

View File

@@ -164,8 +164,8 @@ QSize ListWidget::sizeHint() const
// We try to keep the height of the popup equal to the actionbar
QSize size(width, height);
static QStatusBar *statusBar = Core::ICore::instance()->statusBar();
static QWidget *actionBar = Core::ICore::instance()->mainWindow()->findChild<QWidget*>(QLatin1String("actionbar"));
static QStatusBar *statusBar = Core::ICore::statusBar();
static QWidget *actionBar = Core::ICore::mainWindow()->findChild<QWidget*>(QLatin1String("actionbar"));
Q_ASSERT(actionBar);
QMargins popupMargins = window()->contentsMargins();
@@ -933,7 +933,7 @@ void MiniProjectTargetSelector::updateSeparatorVisible()
void MiniProjectTargetSelector::setVisible(bool visible)
{
if (visible) {
QStatusBar *statusBar = Core::ICore::instance()->statusBar();
QStatusBar *statusBar = Core::ICore::statusBar();
QPoint moveTo = statusBar->mapToGlobal(QPoint(0,0));
moveTo -= QPoint(0, sizeHint().height());
move(moveTo);
@@ -990,8 +990,8 @@ void MiniProjectTargetSelector::keyReleaseEvent(QKeyEvent *ke)
QSize MiniProjectTargetSelector::sizeHint() const
{
static QStatusBar *statusBar = Core::ICore::instance()->statusBar();
static QWidget *actionBar = Core::ICore::instance()->mainWindow()->findChild<QWidget*>(QLatin1String("actionbar"));
static QStatusBar *statusBar = Core::ICore::statusBar();
static QWidget *actionBar = Core::ICore::mainWindow()->findChild<QWidget*>(QLatin1String("actionbar"));
Q_ASSERT(actionBar);
int alignedWithActionHeight