From c7e5e273939faab5c6700f2e0113925cfa01581b Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Mon, 16 Feb 2015 18:43:51 +0100 Subject: [PATCH] package -> kPackage --- shell/panelconfigview.cpp | 2 +- shell/panelview.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shell/panelconfigview.cpp b/shell/panelconfigview.cpp index aafdc794f..dee2acc86 100644 --- a/shell/panelconfigview.cpp +++ b/shell/panelconfigview.cpp @@ -94,7 +94,7 @@ PanelConfigView::~PanelConfigView() void PanelConfigView::init() { - setSource(QUrl::fromLocalFile(m_containment->corona()->package().filePath("panelconfigurationui"))); + setSource(QUrl::fromLocalFile(m_containment->corona()->kPackage().filePath("panelconfigurationui"))); syncGeometry(); syncSlideLocation(); } diff --git a/shell/panelview.cpp b/shell/panelview.cpp index 48687ba5c..71ed385b7 100644 --- a/shell/panelview.cpp +++ b/shell/panelview.cpp @@ -94,7 +94,7 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent emit m_corona->availableScreenRegionChanged(); }); - if (!m_corona->package().isValid()) { + if (!m_corona->kPackage().isValid()) { qWarning() << "Invalid home screen package"; } @@ -112,7 +112,7 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent qmlRegisterType(); engine()->rootContext()->setContextProperty("panel", this); - setSource(QUrl::fromLocalFile(m_corona->package().filePath("views", "Panel.qml"))); + setSource(QUrl::fromLocalFile(m_corona->kPackage().filePath("views", "Panel.qml"))); PanelShadows::self()->addWindow(this); }