aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-08-06 16:43:02 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-13 20:41:34 +0200
commit75a230610aa7f2548c0b7ef9cbacc3c5de58bccc (patch)
treec6a989861a3c98f28b530ff76f2f0dde1ec23624 /src/imports
parenta38a4318a0a6427e9a7f58aaf446ce0613924354 (diff)
Rename QJumpList(Item) to QWinJumpList(Item)
Follow the existing QtWinExtras class naming convention. All the other public classes are currently named QWinXxx. Change-Id: I2509961e280b9794547e7420b941469fc8cdd2fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/winextras/qquickjumplist.cpp20
-rw-r--r--src/imports/winextras/qquickjumplist.h8
2 files changed, 14 insertions, 14 deletions
diff --git a/src/imports/winextras/qquickjumplist.cpp b/src/imports/winextras/qquickjumplist.cpp
index 45aa3e8..c328061 100644
--- a/src/imports/winextras/qquickjumplist.cpp
+++ b/src/imports/winextras/qquickjumplist.cpp
@@ -122,7 +122,7 @@ void QQuickJumpList::setShowRecentCategory(bool show)
void QQuickJumpList::componentComplete()
{
QQuickItem::componentComplete();
- QJumpList jumplist;
+ QWinJumpList jumplist;
jumplist.begin();
jumplist.setFrequentCategoryShown(frequentCategoryShown);
jumplist.setRecentCategoryShown(recentCategoryShown);
@@ -135,8 +135,8 @@ void QQuickJumpList::componentComplete()
if (!categoryList.isEmpty()) {
Q_FOREACH (QQuickJumpListCategory *category, categoryList) {
jumplist.beginCategory(category->title());
- QList<QJumpListItem *> items = category->toItemList();
- Q_FOREACH (QJumpListItem *item, items)
+ QList<QWinJumpListItem *> items = category->toItemList();
+ Q_FOREACH (QWinJumpListItem *item, items)
jumplist.addItem(item);
}
}
@@ -206,9 +206,9 @@ QString QQuickJumpListCategory::title() const
return m_groupTitle;
}
-QList<QJumpListItem *> QQuickJumpListCategory::toItemList() const
+QList<QWinJumpListItem *> QQuickJumpListCategory::toItemList() const
{
- QList<QJumpListItem *> destinations;
+ QList<QWinJumpListItem *> destinations;
foreach (QQuickJumpListItem *item, m_destinations)
destinations.append(item->toJumpListItem());
return destinations;
@@ -239,19 +239,19 @@ int QQuickJumpListItem::type() const
return m_type;
}
-QJumpListItem *QQuickJumpListItem::toJumpListItem() const
+QWinJumpListItem *QQuickJumpListItem::toJumpListItem() const
{
- QJumpListItem *item = new QJumpListItem();
+ QWinJumpListItem *item = new QWinJumpListItem();
switch (m_type) {
case ItemTypeSeparator :
- item->setType(QJumpListItem::Separator);
+ item->setType(QWinJumpListItem::Separator);
break;
case ItemTypeDestination :
- item->setType(QJumpListItem::Destination);
+ item->setType(QWinJumpListItem::Destination);
item->setFilePath(property("filePath").toString());
break;
case ItemTypeLink :
- item->setType(QJumpListItem::Link);
+ item->setType(QWinJumpListItem::Link);
item->setFilePath(property("executablePath").toString());
item->setArguments(QStringList(property("arguments").toStringList()));
item->setDescription(property("description").toString());
diff --git a/src/imports/winextras/qquickjumplist.h b/src/imports/winextras/qquickjumplist.h
index ac9a6d5..d76d2ea 100644
--- a/src/imports/winextras/qquickjumplist.h
+++ b/src/imports/winextras/qquickjumplist.h
@@ -45,8 +45,8 @@
#include <QQuickItem>
#include <QQmlListProperty>
#include <QIcon>
-#include <QJumpList>
-#include <QJumpListItem>
+#include <QWinJumpList>
+#include <QWinJumpListItem>
QT_BEGIN_NAMESPACE
@@ -68,7 +68,7 @@ public:
~QQuickJumpListItem();
void setType(int type);
int type() const;
- QJumpListItem *toJumpListItem() const;
+ QWinJumpListItem *toJumpListItem() const;
private:
int m_type; // 1 - link, 2 - destination
@@ -88,7 +88,7 @@ public:
void setTitle(const QString &title);
QString title() const;
- QList<QJumpListItem *> toItemList() const;
+ QList<QWinJumpListItem *> toItemList() const;
static void addItem(QQmlListProperty<QQuickJumpListItem> *property, QQuickJumpListItem *value);