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

Renamed classes, QDeclarative -> QQml/QQuick*

Browse Source
This commit is contained in:
Sebastian Kügler 2013-02-01 17:26:26 +01:00
parent 6c5025a866
commit 7f0011a843
12 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
declarativeimports/core/datasource.h
View File

@ -25,14 +25,14 @@
#include <QObject>
#include <QDeclarativePropertyMap>
#include <QQmlPropertyMap>
#include "dataengineconsumer_p.h"
#include <Plasma/DataEngine>
#include <qdeclarative.h>
class QDeclarativePropertyMap;
class QQmlPropertyMap;
namespace Plasma

4
declarativeimports/core/declarativeitemcontainer.cpp
View File

@ -30,7 +30,7 @@ DeclarativeItemContainer::~DeclarativeItemContainer()
{
}
void DeclarativeItemContainer::setDeclarativeItem(QDeclarativeItem *item, bool reparent)
void DeclarativeItemContainer::setDeclarativeItem(QQuickItem *item, bool reparent)
{
if (m_declarativeItem) {
disconnect(m_declarativeItem.data(), 0, this, 0);
@ -106,7 +106,7 @@ void DeclarativeItemContainer::setDeclarativeItem(QDeclarativeItem *item, bool r
}
}
QDeclarativeItem *DeclarativeItemContainer::declarativeItem() const
QQuickItem *DeclarativeItemContainer::declarativeItem() const
{
return m_declarativeItem.data();
}

8
declarativeimports/core/declarativeitemcontainer_p.h
View File

@ -20,7 +20,7 @@
#ifndef DECLARATIVEITEMCONTAINER_P
#define DECLARATIVEITEMCONTAINER_P
#include <QDeclarativeItem>
#include <QQuickItem>
#include <QGraphicsObject>
#include <QGraphicsWidget>
#include <QGraphicsSceneResizeEvent>
@ -34,8 +34,8 @@ public:
DeclarativeItemContainer(QGraphicsItem *parent = 0);
~DeclarativeItemContainer();
void setDeclarativeItem(QDeclarativeItem *item, bool reparent = true);
QDeclarativeItem *declarativeItem() const;
void setDeclarativeItem(QQuickItem *item, bool reparent = true);
QQuickItem *declarativeItem() const;
protected:
void resizeEvent(QGraphicsSceneResizeEvent *event);
@ -53,7 +53,7 @@ protected Q_SLOTS:
void preferredHeightChanged();
private:
QWeakPointer<QDeclarativeItem> m_declarativeItem;
QWeakPointer<QQuickItem> m_declarativeItem;
};
#endif

8
declarativeimports/core/dialog.cpp
View File

@ -21,7 +21,7 @@
#include "declarativeitemcontainer_p.h"
#include <QApplication>
#include <QDeclarativeItem>
#include <QQuickItem>
#include <QDesktopWidget>
#include <QGraphicsObject>
#include <QGraphicsWidget>
@ -89,8 +89,8 @@ int DialogMargins::bottom() const
return m_bottom;
}
DialogProxy::DialogProxy(QDeclarativeItem *parent)
: QDeclarativeItem(parent),
DialogProxy::DialogProxy(QQuickItem *parent)
: QQuickItem(parent),
m_declarativeItemContainer(0),
m_activeWindow(false),
m_location(Plasma::Floating)
@ -173,7 +173,7 @@ void DialogProxy::syncMainItem()
m_declarativeItemContainer = 0;
}
} else {
QDeclarativeItem *di = qobject_cast<QDeclarativeItem *>(m_mainItem.data());
QQuickItem *di = qobject_cast<QQuickItem *>(m_mainItem.data());
if (di) {
if (!m_declarativeItemContainer) {
m_declarativeItemContainer = new DeclarativeItemContainer();

6
declarativeimports/core/dialog.h
View File

@ -19,7 +19,7 @@
#ifndef DIALOG_PROXY_P
#define DIALOG_PROXY_P
#include <QDeclarativeItem>
#include <QQuickItem>
#include <QWeakPointer>
#include <QPoint>
@ -89,7 +89,7 @@ private:
*
* Exposed as `Dialog` in QML.
*/
class DialogProxy : public QDeclarativeItem
class DialogProxy : public QQuickItem
{
Q_OBJECT
@ -157,7 +157,7 @@ public:
WA_X11NetWmWindowTypeDock = Qt::WA_X11NetWmWindowTypeDock
};
DialogProxy(QDeclarativeItem *parent = 0);
DialogProxy(QQuickItem *parent = 0);
~DialogProxy();
QGraphicsObject *mainItem() const;

14
declarativeimports/core/framesvgitem.cpp
View File

@ -60,8 +60,8 @@ void FrameSvgItemMargins::update()
emit marginsChanged();
}
FrameSvgItem::FrameSvgItem(QDeclarativeItem *parent)
: QDeclarativeItem(parent)
FrameSvgItem::FrameSvgItem(QQuickItem *parent)
: QQuickItem(parent)
{
m_frameSvg = new Plasma::FrameSvg(this);
m_margins = new FrameSvgItemMargins(m_frameSvg, this);
@ -160,7 +160,7 @@ void FrameSvgItem::geometryChanged(const QRectF &newGeometry,
const QRectF &oldGeometry)
{
m_frameSvg->resizeFrame(newGeometry.size());
QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
QQuickItem::geometryChanged(newGeometry, oldGeometry);
}
void FrameSvgItem::doUpdate()
@ -182,14 +182,14 @@ void FrameSvgItem::setImplicitWidth(qreal width)
return;
}
QDeclarativeItem::setImplicitWidth(width);
QQuickItem::setImplicitWidth(width);
emit implicitWidthChanged();
}
qreal FrameSvgItem::implicitWidth() const
{
return QDeclarativeItem::implicitWidth();
return QQuickItem::implicitWidth();
}
void FrameSvgItem::setImplicitHeight(qreal height)
@ -198,14 +198,14 @@ void FrameSvgItem::setImplicitHeight(qreal height)
return;
}
QDeclarativeItem::setImplicitHeight(height);
QQuickItem::setImplicitHeight(height);
emit implicitHeightChanged();
}
qreal FrameSvgItem::implicitHeight() const
{
return QDeclarativeItem::implicitHeight();
return QQuickItem::implicitHeight();
}
} // Plasma namespace

6
declarativeimports/core/framesvgitem.h
View File

@ -19,7 +19,7 @@
#ifndef FRAMESVGITEM_P
#define FRAMESVGITEM_P
#include <QDeclarativeItem>
#include <QQuickItem>
#include <Plasma/FrameSvg>
@ -69,7 +69,7 @@ private:
FrameSvg *m_frameSvg;
};
class FrameSvgItem : public QDeclarativeItem
class FrameSvgItem : public QQuickItem
{
Q_OBJECT
@ -113,7 +113,7 @@ class FrameSvgItem : public QDeclarativeItem
Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged)
public:
FrameSvgItem(QDeclarativeItem *parent=0);
FrameSvgItem(QQuickItem *parent=0);
~FrameSvgItem();
void setImagePath(const QString &path);

14
declarativeimports/core/iconitem.cpp
View File

@ -29,8 +29,8 @@
#include <Plasma/PaintUtils>
#include <Plasma/Svg>
IconItem::IconItem(QDeclarativeItem *parent)
: QDeclarativeItem(parent),
IconItem::IconItem(QQuickItem *parent)
: QQuickItem(parent),
m_svgIcon(0),
m_smooth(false),
m_active(false),
@ -161,14 +161,14 @@ void IconItem::setImplicitWidth(qreal width)
return;
}
QDeclarativeItem::setImplicitWidth(width);
QQuickItem::setImplicitWidth(width);
emit implicitWidthChanged();
}
qreal IconItem::implicitWidth() const
{
return QDeclarativeItem::implicitWidth();
return QQuickItem::implicitWidth();
}
void IconItem::setImplicitHeight(qreal height)
@ -177,14 +177,14 @@ void IconItem::setImplicitHeight(qreal height)
return;
}
QDeclarativeItem::setImplicitHeight(height);
QQuickItem::setImplicitHeight(height);
emit implicitHeightChanged();
}
qreal IconItem::implicitHeight() const
{
return QDeclarativeItem::implicitHeight();
return QQuickItem::implicitHeight();
}
void IconItem::setSmooth(const bool smooth)
@ -322,7 +322,7 @@ void IconItem::geometryChanged(const QRectF &newGeometry,
loadPixmap();
}
QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
QQuickItem::geometryChanged(newGeometry, oldGeometry);
}
#include "iconitem.moc"

6
declarativeimports/core/iconitem.h
View File

@ -20,7 +20,7 @@
#ifndef ICONITEM_H
#define ICONITEM_H
#include <QDeclarativeItem>
#include <QQuickItem>
#include <QPixmap>
#include <QVariant>
@ -30,7 +30,7 @@ namespace Plasma {
class Svg;
}
class IconItem : public QDeclarativeItem
class IconItem : public QQuickItem
{
Q_OBJECT
@ -43,7 +43,7 @@ class IconItem : public QDeclarativeItem
public:
IconItem(QDeclarativeItem *parent=0);
IconItem(QQuickItem *parent=0);
~IconItem();
void setSource(const QVariant &source);

6
declarativeimports/core/theme.cpp
View File

@ -19,7 +19,7 @@
#include "theme.h"
#include <QDeclarativePropertyMap>
#include <QQmlPropertyMap>
#include <KIconLoader>
@ -157,7 +157,7 @@ ThemeProxy::ThemeProxy(QObject *parent)
{
m_defaultIconSize = KIconLoader::global()->currentSize(KIconLoader::Desktop);
m_iconSizes = new QDeclarativePropertyMap(this);
m_iconSizes = new QQmlPropertyMap(this);
m_iconSizes->insert("desktop", QVariant(KIconLoader::global()->currentSize(KIconLoader::Desktop)));
m_iconSizes->insert("toolbar", KIconLoader::global()->currentSize(KIconLoader::Toolbar));
m_iconSizes->insert("small", KIconLoader::global()->currentSize(KIconLoader::Small));
@ -335,7 +335,7 @@ int ThemeProxy::defaultIconSize() const
return m_defaultIconSize;
}
QDeclarativePropertyMap *ThemeProxy::iconSizes() const
QQmlPropertyMap *ThemeProxy::iconSizes() const
{
return m_iconSizes;
}

8
declarativeimports/core/theme.h
View File

@ -27,7 +27,7 @@
#include <Plasma/Theme>
class QDeclarativePropertyMap;
class QQmlPropertyMap;
class FontProxy : public QObject
{
@ -220,7 +220,7 @@ class ThemeProxy : public QObject
* * small
* * dialog
*/
Q_PROPERTY(QDeclarativePropertyMap *iconSizes READ iconSizes NOTIFY iconSizesChanged)
Q_PROPERTY(QQmlPropertyMap *iconSizes READ iconSizes NOTIFY iconSizesChanged)
public:
ThemeProxy(QObject *parent = 0);
@ -258,7 +258,7 @@ public:
int hugeIconSize() const;
int enormousIconSize() const;
int defaultIconSize() const;
QDeclarativePropertyMap *iconSizes() const;
QQmlPropertyMap *iconSizes() const;
private Q_SLOTS:
void iconLoaderSettingsChanged();
@ -270,7 +270,7 @@ Q_SIGNALS:
private:
int m_defaultIconSize;
QDeclarativePropertyMap *m_iconSizes;
QQmlPropertyMap *m_iconSizes;
};
#endif

4
declarativeimports/core/tooltip.cpp
View File

@ -21,7 +21,7 @@
#include "tooltip.h"
#include "declarativeitemcontainer_p.h"
#include <QDeclarativeItem>
#include <QQuickItem>
#include <QGraphicsObject>
#include <QGraphicsWidget>
#include <QGraphicsScene>
@ -87,7 +87,7 @@ void ToolTipProxy::syncTarget()
}
}
QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(m_target.data());
QQuickItem *item = qobject_cast<QQuickItem*>(m_target.data());
if (!item) {
return;
}