diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2013-09-10 16:50:08 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-11 09:50:12 +0200 |
commit | ed51fd0a8c97d38a4b12c82679d70e7d249c78c0 (patch) | |
tree | c38f5ef1982baaec5dc54f9b130a184e72285b96 /src | |
parent | ad0cbe320c8fc1f9171e82164ce2a79e77c4b194 (diff) |
Tidy up the QtQuick classes
- not part of the public API => private header naming convention
- unify class names (quick-prefix vs. win-prefix vs. quickwin-prefix)
=> drop the superfluous win-prefix from the class names, just like
for the registered QML type names
Change-Id: I408cb22b38ae1db71e9bd7cdb8fa29c1aa1f504a
Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/winextras/plugin.cpp | 19 | ||||
-rw-r--r-- | src/imports/winextras/qquickdwmfeatures.cpp (renamed from src/imports/winextras/qquickwindwmfeatures.cpp) | 121 | ||||
-rw-r--r-- | src/imports/winextras/qquickdwmfeatures_p.h (renamed from src/imports/winextras/qquickwindwmfeatures.h) | 23 | ||||
-rw-r--r-- | src/imports/winextras/qquickdwmfeatures_p_p.h (renamed from src/imports/winextras/qquickwindwmfeatures_p.h) | 19 | ||||
-rw-r--r-- | src/imports/winextras/qquickiconloader.cpp (renamed from src/imports/winextras/qwiniconloader.cpp) | 17 | ||||
-rw-r--r-- | src/imports/winextras/qquickiconloader_p.h (renamed from src/imports/winextras/qwiniconloader.h) | 11 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplist.cpp | 3 | ||||
-rw-r--r-- | src/imports/winextras/qquickjumplist_p.h (renamed from src/imports/winextras/qquickjumplist.h) | 7 | ||||
-rw-r--r-- | src/imports/winextras/qquicktaskbarbutton.cpp (renamed from src/imports/winextras/qquickwintaskbarbutton.cpp) | 23 | ||||
-rw-r--r-- | src/imports/winextras/qquicktaskbarbutton_p.h (renamed from src/imports/winextras/qquickwintaskbarbutton.h) | 15 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbar.cpp (renamed from src/imports/winextras/qquickwinthumbnailtoolbar.cpp) | 45 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbar_p.h (renamed from src/imports/winextras/qquickwinthumbnailtoolbar.h) | 29 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbutton.cpp (renamed from src/imports/winextras/qquickwinthumbnailtoolbutton.cpp) | 39 | ||||
-rw-r--r-- | src/imports/winextras/qquickthumbnailtoolbutton_p.h (renamed from src/imports/winextras/qquickwinthumbnailtoolbutton.h) | 19 | ||||
-rw-r--r-- | src/imports/winextras/winextras.pro | 24 |
15 files changed, 214 insertions, 200 deletions
diff --git a/src/imports/winextras/plugin.cpp b/src/imports/winextras/plugin.cpp index f165770..e3dab0d 100644 --- a/src/imports/winextras/plugin.cpp +++ b/src/imports/winextras/plugin.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,11 +40,11 @@ ** ****************************************************************************/ -#include "qquickwindwmfeatures.h" -#include "qquickwintaskbarbutton.h" -#include "qquickjumplist.h" -#include "qquickwinthumbnailtoolbar.h" -#include "qquickwinthumbnailtoolbutton.h" +#include "qquickdwmfeatures_p.h" +#include "qquicktaskbarbutton_p.h" +#include "qquickjumplist_p.h" +#include "qquickthumbnailtoolbar_p.h" +#include "qquickthumbnailtoolbutton_p.h" #include <QtQml/QtQml> @@ -58,14 +59,14 @@ public: void registerTypes(const char *uri) Q_DECL_OVERRIDE { Q_ASSERT(uri == QLatin1String("QtWinExtras")); - qmlRegisterType<QQuickWinDwmFeatures>(uri, 1, 0, "DwmFeatures"); - qmlRegisterType<QQuickWinTaskbarButton>(uri, 1, 0, "TaskbarButton"); + qmlRegisterType<QQuickDwmFeatures>(uri, 1, 0, "DwmFeatures"); + qmlRegisterType<QQuickTaskbarButton>(uri, 1, 0, "TaskbarButton"); qmlRegisterUncreatableType<QWinTaskbarProgress>(uri, 1, 0, "TaskbarProgress", "Cannot create TaskbarProgress - use TaskbarButton.progress instead."); qmlRegisterType<QQuickJumpList>(uri, 1, 0, "JumpList"); qmlRegisterType<QQuickJumpListItem>(uri, 1, 0, "JumpListItem"); qmlRegisterType<QQuickJumpListCategory>(uri, 1, 0, "JumpListCategory"); - qmlRegisterType<QQuickWinThumbnailToolBar>(uri, 1, 0, "ThumbnailToolBar"); - qmlRegisterType<QQuickWinThumbnailToolButton>(uri, 1, 0, "ThumbnailToolButton"); + qmlRegisterType<QQuickThumbnailToolBar>(uri, 1, 0, "ThumbnailToolBar"); + qmlRegisterType<QQuickThumbnailToolButton>(uri, 1, 0, "ThumbnailToolButton"); } }; diff --git a/src/imports/winextras/qquickwindwmfeatures.cpp b/src/imports/winextras/qquickdwmfeatures.cpp index ddc4d36..5255b69 100644 --- a/src/imports/winextras/qquickwindwmfeatures.cpp +++ b/src/imports/winextras/qquickdwmfeatures.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,8 +40,8 @@ ** ****************************************************************************/ -#include "qquickwindwmfeatures.h" -#include "qquickwindwmfeatures_p.h" +#include "qquickdwmfeatures_p.h" +#include "qquickdwmfeatures_p_p.h" #include <QtWinExtras/private/qwineventfilter_p.h> #include <QWinEvent> @@ -49,54 +50,54 @@ QT_BEGIN_NAMESPACE /*! - \qmltype WinDwmFeatures - \instantiates QQuickWinDwmFeatures + \qmltype DwmFeatures + \instantiates QQuickDwmFeatures \inqmlmodule QtWinExtras \brief Enables you to manage the Windows DWM features. \since QtWinExtras 1.0 - The WinDwmFeatures type enables you to extend a glass frame into the client + The DwmFeatures type enables you to extend a glass frame into the client area, as well as to control the behavior of Aero Peek and Flip3D. */ /*! - \class QQuickWinDwmFeatures + \class QQuickDwmFeatures \internal */ -QQuickWinDwmFeatures::QQuickWinDwmFeatures(QQuickItem *parent) : - QQuickItem(parent), d_ptr(new QQuickWinDwmFeaturesPrivate(this)) +QQuickDwmFeatures::QQuickDwmFeatures(QQuickItem *parent) : + QQuickItem(parent), d_ptr(new QQuickDwmFeaturesPrivate(this)) { QWinEventFilter::setup(); } -QQuickWinDwmFeatures::~QQuickWinDwmFeatures() +QQuickDwmFeatures::~QQuickDwmFeatures() { } -void QQuickWinDwmFeatures::setCompositionEnabled(bool enabled) +void QQuickDwmFeatures::setCompositionEnabled(bool enabled) { QtWin::setCompositionEnabled(enabled); } -bool QQuickWinDwmFeatures::isCompositionEnabled() const +bool QQuickDwmFeatures::isCompositionEnabled() const { return QtWin::isCompositionEnabled(); } -QColor QQuickWinDwmFeatures::colorizationColor() const +QColor QQuickDwmFeatures::colorizationColor() const { return QtWin::colorizationColor(); } -QColor QQuickWinDwmFeatures::realColorizationColor() const +QColor QQuickDwmFeatures::realColorizationColor() const { return QtWin::realColorizationColor(); } -bool QQuickWinDwmFeatures::colorizationOpaqueBlend() const +bool QQuickDwmFeatures::colorizationOpaqueBlend() const { bool opaque; QtWin::colorizationColor(&opaque); @@ -104,146 +105,146 @@ bool QQuickWinDwmFeatures::colorizationOpaqueBlend() const } /*! - \qmlproperty int WinDwmFeatures::topGlassMargin + \qmlproperty int DwmFeatures::topGlassMargin The top glass frame margin. The default value is 0. */ -void QQuickWinDwmFeatures::setTopGlassMargin(int margin) +void QQuickDwmFeatures::setTopGlassMargin(int margin) { - Q_D(QQuickWinDwmFeatures); + Q_D(QQuickDwmFeatures); d->topMargin = margin; d->update(); } /*! - \qmlproperty int WinDwmFeatures::rightGlassMargin + \qmlproperty int DwmFeatures::rightGlassMargin The right glass frame margin. The default value is 0. */ -void QQuickWinDwmFeatures::setRightGlassMargin(int margin) +void QQuickDwmFeatures::setRightGlassMargin(int margin) { - Q_D(QQuickWinDwmFeatures); + Q_D(QQuickDwmFeatures); d->rightMargin = margin; d->update(); } /*! - \qmlproperty int WinDwmFeatures::bottomGlassMargin + \qmlproperty int DwmFeatures::bottomGlassMargin The bottom glass frame margin. The default value is 0. */ -void QQuickWinDwmFeatures::setBottomGlassMargin(int margin) +void QQuickDwmFeatures::setBottomGlassMargin(int margin) { - Q_D(QQuickWinDwmFeatures); + Q_D(QQuickDwmFeatures); d->bottomMargin = margin; d->update(); } /*! - \qmlproperty int WinDwmFeatures::leftGlassMargin + \qmlproperty int DwmFeatures::leftGlassMargin The left glass frame margin. The default value is 0. */ -void QQuickWinDwmFeatures::setLeftGlassMargin(int margin) +void QQuickDwmFeatures::setLeftGlassMargin(int margin) { - Q_D(QQuickWinDwmFeatures); + Q_D(QQuickDwmFeatures); d->leftMargin = margin; d->update(); } -int QQuickWinDwmFeatures::topGlassMargin() const +int QQuickDwmFeatures::topGlassMargin() const { - Q_D(const QQuickWinDwmFeatures); + Q_D(const QQuickDwmFeatures); return d->topMargin; } -int QQuickWinDwmFeatures::rightGlassMargin() const +int QQuickDwmFeatures::rightGlassMargin() const { - Q_D(const QQuickWinDwmFeatures); + Q_D(const QQuickDwmFeatures); return d->rightMargin; } -int QQuickWinDwmFeatures::bottomGlassMargin() const +int QQuickDwmFeatures::bottomGlassMargin() const { - Q_D(const QQuickWinDwmFeatures); + Q_D(const QQuickDwmFeatures); return d->bottomMargin; } -int QQuickWinDwmFeatures::leftGlassMargin() const +int QQuickDwmFeatures::leftGlassMargin() const { - Q_D(const QQuickWinDwmFeatures); + Q_D(const QQuickDwmFeatures); return d->leftMargin; } /*! - \qmlproperty bool WinDwmFeatures::excludedFromPeek + \qmlproperty bool DwmFeatures::excludedFromPeek Specifies whether the window is excluded from Aero Peek. The default value is false. */ -bool QQuickWinDwmFeatures::excludedFromPeek() const +bool QQuickDwmFeatures::excludedFromPeek() const { - Q_D(const QQuickWinDwmFeatures); + Q_D(const QQuickDwmFeatures); if (window()) return QtWin::isWindowExcludedFromPeek(window()); else return d->peekExcluded; } -void QQuickWinDwmFeatures::setExcludedFromPeek(bool exclude) +void QQuickDwmFeatures::setExcludedFromPeek(bool exclude) { - Q_D(QQuickWinDwmFeatures); + Q_D(QQuickDwmFeatures); d->peekExcluded = exclude; } /*! - \qmlproperty bool WinDwmFeatures::peekDisallowed + \qmlproperty bool DwmFeatures::peekDisallowed Set this value to true if you want to forbid Aero Peek when the user hovers the mouse over the window thumbnail. The default value is false. */ -bool QQuickWinDwmFeatures::peekDisallowed() const +bool QQuickDwmFeatures::peekDisallowed() const { - Q_D(const QQuickWinDwmFeatures); + Q_D(const QQuickDwmFeatures); if (window()) return QtWin::isWindowPeekDisallowed(window()); else return d->peekDisallowed; } -void QQuickWinDwmFeatures::setPeekDisallowed(bool disallow) +void QQuickDwmFeatures::setPeekDisallowed(bool disallow) { - Q_D(QQuickWinDwmFeatures); + Q_D(QQuickDwmFeatures); d->peekDisallowed = disallow; } /*! - \enum QQuickWinDwmFeatures::Flip3DPolicy + \enum QQuickDwmFeatures::Flip3DPolicy See QtWin::WindowFlip3DPolicy. */ /*! - \qmlproperty WinDwmFeatures::Flip3DPolicy WinDwmFeatures::flip3DPolicy + \qmlproperty DwmFeatures::Flip3DPolicy DwmFeatures::flip3DPolicy The current Flip3D policy for the window. */ -QQuickWinDwmFeatures::Flip3DPolicy QQuickWinDwmFeatures::flip3DPolicy() const +QQuickDwmFeatures::Flip3DPolicy QQuickDwmFeatures::flip3DPolicy() const { - Q_D(const QQuickWinDwmFeatures); + Q_D(const QQuickDwmFeatures); if (window()) return static_cast<Flip3DPolicy>(QtWin::windowFlip3DPolicy(window())); else return static_cast<Flip3DPolicy>(d->flipPolicy); } -void QQuickWinDwmFeatures::setFlip3DPolicy(QQuickWinDwmFeatures::Flip3DPolicy policy) +void QQuickDwmFeatures::setFlip3DPolicy(QQuickDwmFeatures::Flip3DPolicy policy) { - Q_D(QQuickWinDwmFeatures); + Q_D(QQuickDwmFeatures); d->flipPolicy = policy; } -bool QQuickWinDwmFeatures::eventFilter(QObject *object, QEvent *event) +bool QQuickDwmFeatures::eventFilter(QObject *object, QEvent *event) { bool filterOut = false; if (object == window()) { @@ -263,9 +264,9 @@ bool QQuickWinDwmFeatures::eventFilter(QObject *object, QEvent *event) return filterOut; } -QQuickWinDwmFeatures *QQuickWinDwmFeatures::qmlAttachedProperties(QObject *parentObject) +QQuickDwmFeatures *QQuickDwmFeatures::qmlAttachedProperties(QObject *parentObject) { - QQuickWinDwmFeatures *featuresObj = new QQuickWinDwmFeatures(); + QQuickDwmFeatures *featuresObj = new QQuickDwmFeatures(); QQuickItem *parentItem = qobject_cast<QQuickItem *>(parentObject); if (parentItem) featuresObj->setParentItem(parentItem); @@ -274,9 +275,9 @@ QQuickWinDwmFeatures *QQuickWinDwmFeatures::qmlAttachedProperties(QObject *paren return featuresObj; } -void QQuickWinDwmFeatures::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) +void QQuickDwmFeatures::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) { - Q_D(QQuickWinDwmFeatures); + Q_D(QQuickDwmFeatures); if (change == ItemSceneChange && data.window) { d->update(); data.window->installEventFilter(this); @@ -286,16 +287,16 @@ void QQuickWinDwmFeatures::itemChange(QQuickItem::ItemChange change, const QQuic -QQuickWinDwmFeaturesPrivate::QQuickWinDwmFeaturesPrivate(QQuickWinDwmFeatures *parent) : +QQuickDwmFeaturesPrivate::QQuickDwmFeaturesPrivate(QQuickDwmFeatures *parent) : topMargin(0), rightMargin(0), bottomMargin(0), leftMargin(0), - peekDisallowed(false), peekExcluded(false), flipPolicy(QQuickWinDwmFeatures::FlipDefault), + peekDisallowed(false), peekExcluded(false), flipPolicy(QQuickDwmFeatures::FlipDefault), q_ptr(parent), formatSet(false), frameUpdateScheduled(false), attributesUpdateScheduled(false) { } -void QQuickWinDwmFeaturesPrivate::update() +void QQuickDwmFeaturesPrivate::update() { - Q_Q(QQuickWinDwmFeatures); + Q_Q(QQuickDwmFeatures); QWindow *w = q->window(); if (w) { if (!formatSet) { @@ -309,7 +310,7 @@ void QQuickWinDwmFeaturesPrivate::update() QtWin::setWindowExcludedFromPeek(w, peekExcluded); if (peekDisallowed) QtWin::setWindowDisallowPeek(w, peekDisallowed); - if (flipPolicy != QQuickWinDwmFeatures::FlipDefault) + if (flipPolicy != QQuickDwmFeatures::FlipDefault) QtWin::setWindowFlip3DPolicy(w, static_cast<QtWin::WindowFlip3DPolicy>(flipPolicy)); if (topMargin || rightMargin || bottomMargin || leftMargin) QtWin::extendFrameIntoClientArea(w, leftMargin, topMargin, rightMargin, bottomMargin); diff --git a/src/imports/winextras/qquickwindwmfeatures.h b/src/imports/winextras/qquickdwmfeatures_p.h index 6c05a00..fb8d191 100644 --- a/src/imports/winextras/qquickwindwmfeatures.h +++ b/src/imports/winextras/qquickdwmfeatures_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,17 +40,17 @@ ** ****************************************************************************/ -#ifndef QQUICKWINDWMFEATURES_H -#define QQUICKWINDWMFEATURES_H +#ifndef QQUICKDWMFEATURES_P_H +#define QQUICKDWMFEATURES_P_H #include <QQuickItem> #include <QWinFunctions> QT_BEGIN_NAMESPACE -class QQuickWinDwmFeaturesPrivate; +class QQuickDwmFeaturesPrivate; -class QQuickWinDwmFeatures : public QQuickItem +class QQuickDwmFeatures : public QQuickItem { Q_OBJECT Q_PROPERTY(bool isCompositionEnabled READ isCompositionEnabled WRITE setCompositionEnabled NOTIFY isCompositionEnabledChanged) @@ -74,8 +75,8 @@ public: Q_ENUMS(Flip3DPolicy) - explicit QQuickWinDwmFeatures(QQuickItem *parent = 0); - ~QQuickWinDwmFeatures(); + explicit QQuickDwmFeatures(QQuickItem *parent = 0); + ~QQuickDwmFeatures(); void setCompositionEnabled(bool enabled); bool isCompositionEnabled() const; @@ -101,7 +102,7 @@ public: bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - static QQuickWinDwmFeatures *qmlAttachedProperties(QObject *object); + static QQuickDwmFeatures *qmlAttachedProperties(QObject *object); Q_SIGNALS: void colorizationColorChanged(); @@ -113,13 +114,13 @@ protected: void itemChange(ItemChange, const ItemChangeData &) Q_DECL_OVERRIDE; private: - QScopedPointer<QQuickWinDwmFeaturesPrivate> d_ptr; + QScopedPointer<QQuickDwmFeaturesPrivate> d_ptr; - Q_DECLARE_PRIVATE(QQuickWinDwmFeatures) + Q_DECLARE_PRIVATE(QQuickDwmFeatures) }; QT_END_NAMESPACE -QML_DECLARE_TYPEINFO(QQuickWinDwmFeatures, QML_HAS_ATTACHED_PROPERTIES) +QML_DECLARE_TYPEINFO(QQuickDwmFeatures, QML_HAS_ATTACHED_PROPERTIES) -#endif // QQUICKWINDWMFEATURES_H +#endif // QQUICKDWMFEATURES_P_H diff --git a/src/imports/winextras/qquickwindwmfeatures_p.h b/src/imports/winextras/qquickdwmfeatures_p_p.h index 0cf068c..fb45c5b 100644 --- a/src/imports/winextras/qquickwindwmfeatures_p.h +++ b/src/imports/winextras/qquickdwmfeatures_p_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,17 +40,17 @@ ** ****************************************************************************/ -#ifndef QQUICKWINDWMFEATURES_P_H -#define QQUICKWINDWMFEATURES_P_H +#ifndef QQUICKDWMFEATURES_P_P_H +#define QQUICKDWMFEATURES_P_P_H -#include "qquickwindwmfeatures.h" +#include "qquickdwmfeatures_p.h" QT_BEGIN_NAMESPACE -class QQuickWinDwmFeaturesPrivate +class QQuickDwmFeaturesPrivate { public: - QQuickWinDwmFeaturesPrivate(QQuickWinDwmFeatures *parent); + QQuickDwmFeaturesPrivate(QQuickDwmFeatures *parent); int topMargin; int rightMargin; int bottomMargin; @@ -57,19 +58,19 @@ public: bool peekDisallowed; bool peekExcluded; - QQuickWinDwmFeatures::Flip3DPolicy flipPolicy; + QQuickDwmFeatures::Flip3DPolicy flipPolicy; void update(); private: - QQuickWinDwmFeatures *q_ptr; + QQuickDwmFeatures *q_ptr; bool formatSet; bool frameUpdateScheduled; bool attributesUpdateScheduled; - Q_DECLARE_PUBLIC(QQuickWinDwmFeatures) + Q_DECLARE_PUBLIC(QQuickDwmFeatures) }; QT_END_NAMESPACE -#endif // QQUICKWINDWMFEATURES_P_H +#endif // QQUICKDWMFEATURES_P_P_H diff --git a/src/imports/winextras/qwiniconloader.cpp b/src/imports/winextras/qquickiconloader.cpp index 30c6f3e..e1b7506 100644 --- a/src/imports/winextras/qwiniconloader.cpp +++ b/src/imports/winextras/qquickiconloader.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,7 +40,7 @@ ** ****************************************************************************/ -#include "qwiniconloader.h" +#include "qquickiconloader_p.h" #include <QUrl> #include <QQmlEngine> @@ -55,12 +56,12 @@ QT_BEGIN_NAMESPACE -QWinIconLoader::QWinIconLoader(QObject *parent) : +QQuickIconLoader::QQuickIconLoader(QObject *parent) : QObject(parent) { } -void QWinIconLoader::load(const QUrl &url, QQmlEngine *engine) +void QQuickIconLoader::load(const QUrl &url, QQmlEngine *engine) { m_icon = QIcon(); QString scheme = url.scheme(); @@ -72,12 +73,12 @@ void QWinIconLoader::load(const QUrl &url, QQmlEngine *engine) loadFromImageProvider(url, engine); } -QIcon QWinIconLoader::icon() const +QIcon QQuickIconLoader::icon() const { return m_icon; } -void QWinIconLoader::onRequestFinished(QNetworkReply *reply) +void QQuickIconLoader::onRequestFinished(QNetworkReply *reply) { disconnect(reply->manager(), 0, this, 0); if (reply->error() == QNetworkReply::NoError) { @@ -93,7 +94,7 @@ void QWinIconLoader::onRequestFinished(QNetworkReply *reply) reply->deleteLater(); } -void QWinIconLoader::loadFromFile(const QUrl &url) +void QQuickIconLoader::loadFromFile(const QUrl &url) { QString path = QQmlFile::urlToLocalFileOrQrc(url); if (QFileInfo(path).exists()) { @@ -102,7 +103,7 @@ void QWinIconLoader::loadFromFile(const QUrl &url) } } -void QWinIconLoader::loadFromNetwork(const QUrl &url, QQmlEngine *engine) +void QQuickIconLoader::loadFromNetwork(const QUrl &url, QQmlEngine *engine) { QNetworkRequest request(url); QNetworkAccessManager *manager = engine->networkAccessManager(); @@ -120,7 +121,7 @@ static inline QString imageId(const QUrl &url) return url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority).mid(1); } -void QWinIconLoader::loadFromImageProvider(const QUrl &url, QQmlEngine *engine) +void QQuickIconLoader::loadFromImageProvider(const QUrl &url, QQmlEngine *engine) { const QString providerId = url.host(); const QString imageId = url.toString(QUrl::RemoveScheme | QUrl::RemoveAuthority).mid(1); diff --git a/src/imports/winextras/qwiniconloader.h b/src/imports/winextras/qquickiconloader_p.h index a4a2f5b..0df9b01 100644 --- a/src/imports/winextras/qwiniconloader.h +++ b/src/imports/winextras/qquickiconloader_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,8 +40,8 @@ ** ****************************************************************************/ -#ifndef QWINICONLOADER_H -#define QWINICONLOADER_H +#ifndef QQUICKICONLOADER_P_H +#define QQUICKICONLOADER_P_H #include <QObject> #include <QIcon> @@ -51,12 +52,12 @@ class QIcon; class QQmlEngine; class QNetworkReply; -class QWinIconLoader : public QObject +class QQuickIconLoader : public QObject { Q_OBJECT public: - explicit QWinIconLoader(QObject *parent = 0); + explicit QQuickIconLoader(QObject *parent = 0); void load(const QUrl &url, QQmlEngine *engine); QIcon icon() const; @@ -76,4 +77,4 @@ private: QT_END_NAMESPACE -#endif // QWINICONLOADER_H +#endif // QQUICKICONLOADER_P_H diff --git a/src/imports/winextras/qquickjumplist.cpp b/src/imports/winextras/qquickjumplist.cpp index c328061..8ff70c2 100644 --- a/src/imports/winextras/qquickjumplist.cpp +++ b/src/imports/winextras/qquickjumplist.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,7 +40,7 @@ ** ****************************************************************************/ -#include "qquickjumplist.h" +#include "qquickjumplist_p.h" #include <QIcon> QT_BEGIN_NAMESPACE diff --git a/src/imports/winextras/qquickjumplist.h b/src/imports/winextras/qquickjumplist_p.h index d76d2ea..b64b1d5 100644 --- a/src/imports/winextras/qquickjumplist.h +++ b/src/imports/winextras/qquickjumplist_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,8 +40,8 @@ ** ****************************************************************************/ -#ifndef QQUICKJUMPLIST_H -#define QQUICKJUMPLIST_H +#ifndef QQUICKJUMPLIST_P_H +#define QQUICKJUMPLIST_P_H #include <QQuickItem> #include <QQmlListProperty> @@ -128,4 +129,4 @@ private: QT_END_NAMESPACE -#endif // QQUICKJUMPLIST_H +#endif // QQUICKJUMPLIST_P_H diff --git a/src/imports/winextras/qquickwintaskbarbutton.cpp b/src/imports/winextras/qquicktaskbarbutton.cpp index 179e838..fbae377 100644 --- a/src/imports/winextras/qquickwintaskbarbutton.cpp +++ b/src/imports/winextras/qquicktaskbarbutton.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,7 +40,7 @@ ** ****************************************************************************/ -#include "qquickwintaskbarbutton.h" +#include "qquicktaskbarbutton_p.h" #include <QtWinExtras/private/qwintaskbarbutton_p.h> #include <QQuickWindow> @@ -47,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype TaskbarButton - \instantiates QQuickWinTaskbarButton + \instantiates QQuickTaskbarButton \inqmlmodule QtWinExtras \brief Manages Windows taskbar buttons. @@ -62,16 +63,16 @@ QT_BEGIN_NAMESPACE */ /*! - \class QQuickWinTaskbarButton + \class QQuickTaskbarButton \internal */ -QQuickWinTaskbarButton::QQuickWinTaskbarButton(QQuickItem *parent) : +QQuickTaskbarButton::QQuickTaskbarButton(QQuickItem *parent) : QQuickItem(parent), button(new QWinTaskbarButton(this)) { } -QQuickWinTaskbarButton::~QQuickWinTaskbarButton() +QQuickTaskbarButton::~QQuickTaskbarButton() { } @@ -80,7 +81,7 @@ QQuickWinTaskbarButton::~QQuickWinTaskbarButton() The task bar progress indicator. */ -QWinTaskbarProgress *QQuickWinTaskbarButton::progress() const +QWinTaskbarProgress *QQuickTaskbarButton::progress() const { return button->progress(); } @@ -90,12 +91,12 @@ QWinTaskbarProgress *QQuickWinTaskbarButton::progress() const The overlay icon path. */ -QString QQuickWinTaskbarButton::overlayIcon() const +QString QQuickTaskbarButton::overlayIcon() const { return m_iconPath; } -void QQuickWinTaskbarButton::setOverlayIcon(const QString &path) +void QQuickTaskbarButton::setOverlayIcon(const QString &path) { m_iconPath = path; button->setOverlayIcon(QIcon(m_iconPath)); @@ -106,17 +107,17 @@ void QQuickWinTaskbarButton::setOverlayIcon(const QString &path) The description of the overlay for accessibility purposes. */ -QString QQuickWinTaskbarButton::overlayAccessibleDescription() const +QString QQuickTaskbarButton::overlayAccessibleDescription() const { return button->overlayAccessibleDescription(); } -void QQuickWinTaskbarButton::setOverlayAccessibleDescription(const QString &description) +void QQuickTaskbarButton::setOverlayAccessibleDescription(const QString &description) { button->setOverlayAccessibleDescription(description); } -void QQuickWinTaskbarButton::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) +void QQuickTaskbarButton::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) { if (change == ItemSceneChange) { button->setWindow(data.window); diff --git a/src/imports/winextras/qquickwintaskbarbutton.h b/src/imports/winextras/qquicktaskbarbutton_p.h index a8bd874..7c01687 100644 --- a/src/imports/winextras/qquickwintaskbarbutton.h +++ b/src/imports/winextras/qquicktaskbarbutton_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,8 +40,8 @@ ** ****************************************************************************/ -#ifndef QQUICKWINTASKBARBUTTON_H -#define QQUICKWINTASKBARBUTTON_H +#ifndef QQUICKTASKBARBUTTON_P_H +#define QQUICKTASKBARBUTTON_P_H #include <QQuickItem> #include <QWinTaskbarButton> @@ -48,9 +49,9 @@ QT_BEGIN_NAMESPACE -class QQuickWinTaskbarButtonPrivate; +class QQuickTaskbarButtonPrivate; -class QQuickWinTaskbarButton : public QQuickItem +class QQuickTaskbarButton : public QQuickItem { Q_OBJECT Q_PROPERTY(QString overlayIcon READ overlayIcon WRITE setOverlayIcon) @@ -58,8 +59,8 @@ class QQuickWinTaskbarButton : public QQuickItem Q_PROPERTY(QWinTaskbarProgress *progress READ progress CONSTANT) public: - QQuickWinTaskbarButton(QQuickItem *parent = 0); - ~QQuickWinTaskbarButton(); + QQuickTaskbarButton(QQuickItem *parent = 0); + ~QQuickTaskbarButton(); QWinTaskbarProgress *progress() const; QString overlayIcon() const; void setOverlayIcon(const QString &path); @@ -76,4 +77,4 @@ private: QT_END_NAMESPACE -#endif // QQUICKWINTASKBARBUTTON_H +#endif // QQUICKTASKBARBUTTON_P_H diff --git a/src/imports/winextras/qquickwinthumbnailtoolbar.cpp b/src/imports/winextras/qquickthumbnailtoolbar.cpp index 7871bee..5558cb8 100644 --- a/src/imports/winextras/qquickwinthumbnailtoolbar.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbar.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,8 +40,8 @@ ** ****************************************************************************/ -#include "qquickwinthumbnailtoolbar.h" -#include "qquickwinthumbnailtoolbutton.h" +#include "qquickthumbnailtoolbar_p.h" +#include "qquickthumbnailtoolbutton_p.h" #include <QQuickWindow> #include <QQmlEngine> @@ -49,7 +50,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype ThumbnailToolBar - \instantiates QQuickWinThumbnailToolBar + \instantiates QQuickThumbnailToolBar \inqmlmodule QtWinExtras \brief Allows manipulating the window's thumbnail toolbar. @@ -65,31 +66,31 @@ QT_BEGIN_NAMESPACE \since QtWinExtras 1.0 */ -QQuickWinThumbnailToolBar::QQuickWinThumbnailToolBar(QQuickItem *parent) : +QQuickThumbnailToolBar::QQuickThumbnailToolBar(QQuickItem *parent) : QQuickItem(parent) { } -QQuickWinThumbnailToolBar::~QQuickWinThumbnailToolBar() +QQuickThumbnailToolBar::~QQuickThumbnailToolBar() { } -int QQuickWinThumbnailToolBar::count() const +int QQuickThumbnailToolBar::count() const { return m_toolbar.count(); } -QQmlListProperty<QObject> QQuickWinThumbnailToolBar::data() +QQmlListProperty<QObject> QQuickThumbnailToolBar::data() { - return QQmlListProperty<QObject>(this, 0, &QQuickWinThumbnailToolBar::addData, 0, 0, 0); + return QQmlListProperty<QObject>(this, 0, &QQuickThumbnailToolBar::addData, 0, 0, 0); } -QQmlListProperty<QQuickWinThumbnailToolButton> QQuickWinThumbnailToolBar::buttons() +QQmlListProperty<QQuickThumbnailToolButton> QQuickThumbnailToolBar::buttons() { - return QQmlListProperty<QQuickWinThumbnailToolButton>(this, 0, &QQuickWinThumbnailToolBar::buttonCount, &QQuickWinThumbnailToolBar::buttonAt); + return QQmlListProperty<QQuickThumbnailToolButton>(this, 0, &QQuickThumbnailToolBar::buttonCount, &QQuickThumbnailToolBar::buttonAt); } -void QQuickWinThumbnailToolBar::addButton(QQuickWinThumbnailToolButton *button) +void QQuickThumbnailToolBar::addButton(QQuickThumbnailToolButton *button) { if (!m_buttons.contains(button)) { m_toolbar.addButton(button->m_button); @@ -99,7 +100,7 @@ void QQuickWinThumbnailToolBar::addButton(QQuickWinThumbnailToolButton *button) } } -void QQuickWinThumbnailToolBar::removeButton(QQuickWinThumbnailToolButton *button) +void QQuickThumbnailToolBar::removeButton(QQuickThumbnailToolButton *button) { if (m_buttons.removeOne(button)) { m_toolbar.removeButton(button->m_button); @@ -108,27 +109,27 @@ void QQuickWinThumbnailToolBar::removeButton(QQuickWinThumbnailToolButton *butto } } -void QQuickWinThumbnailToolBar::clear() +void QQuickThumbnailToolBar::clear() { m_toolbar.clear(); - foreach (QQuickWinThumbnailToolButton *button, m_buttons) + foreach (QQuickThumbnailToolButton *button, m_buttons) button->deleteLater(); m_buttons.clear(); emit countChanged(); emit buttonsChanged(); } -void QQuickWinThumbnailToolBar::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) +void QQuickThumbnailToolBar::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) { if (change == ItemSceneChange) m_toolbar.setWindow(data.window); QQuickItem::itemChange(change, data); } -void QQuickWinThumbnailToolBar::addData(QQmlListProperty<QObject> *property, QObject *object) +void QQuickThumbnailToolBar::addData(QQmlListProperty<QObject> *property, QObject *object) { - if (QQuickWinThumbnailToolButton *button = qobject_cast<QQuickWinThumbnailToolButton *>(object)) { - QQuickWinThumbnailToolBar *quickThumbbar = static_cast<QQuickWinThumbnailToolBar *>(property->object); + if (QQuickThumbnailToolButton *button = qobject_cast<QQuickThumbnailToolButton *>(object)) { + QQuickThumbnailToolBar *quickThumbbar = static_cast<QQuickThumbnailToolBar *>(property->object); quickThumbbar->m_toolbar.addButton(button->m_button); quickThumbbar->m_buttons.append(button); emit quickThumbbar->countChanged(); @@ -136,14 +137,14 @@ void QQuickWinThumbnailToolBar::addData(QQmlListProperty<QObject> *property, QOb } } -int QQuickWinThumbnailToolBar::buttonCount(QQmlListProperty<QQuickWinThumbnailToolButton> *property) +int QQuickThumbnailToolBar::buttonCount(QQmlListProperty<QQuickThumbnailToolButton> *property) { - return static_cast<QQuickWinThumbnailToolBar *>(property->object)->count(); + return static_cast<QQuickThumbnailToolBar *>(property->object)->count(); } -QQuickWinThumbnailToolButton *QQuickWinThumbnailToolBar::buttonAt(QQmlListProperty<QQuickWinThumbnailToolButton> *property, int index) +QQuickThumbnailToolButton *QQuickThumbnailToolBar::buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property, int index) { - return static_cast<QQuickWinThumbnailToolBar *>(property->object)->m_buttons.value(index); + return static_cast<QQuickThumbnailToolBar *>(property->object)->m_buttons.value(index); } QT_END_NAMESPACE diff --git a/src/imports/winextras/qquickwinthumbnailtoolbar.h b/src/imports/winextras/qquickthumbnailtoolbar_p.h index 3d9e7d6..6a80d80 100644 --- a/src/imports/winextras/qquickwinthumbnailtoolbar.h +++ b/src/imports/winextras/qquickthumbnailtoolbar_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,35 +40,35 @@ ** ****************************************************************************/ -#ifndef QQUICKWINTHUMBNAILTOOLBAR_H -#define QQUICKWINTHUMBNAILTOOLBAR_H +#ifndef QQUICKTHUMBNAILTOOLBAR_P_H +#define QQUICKTHUMBNAILTOOLBAR_P_H #include <QQuickItem> #include <QWinThumbnailToolBar> QT_BEGIN_NAMESPACE -class QQuickWinThumbnailToolButton; +class QQuickThumbnailToolButton; -class QQuickWinThumbnailToolBar : public QQuickItem +class QQuickThumbnailToolBar : public QQuickItem { Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged) Q_PROPERTY(QQmlListProperty<QObject> data READ data) - Q_PROPERTY(QQmlListProperty<QQuickWinThumbnailToolButton> buttons READ buttons NOTIFY buttonsChanged) + Q_PROPERTY(QQmlListProperty<QQuickThumbnailToolButton> buttons READ buttons NOTIFY buttonsChanged) Q_CLASSINFO("DefaultProperty", "data") public: - explicit QQuickWinThumbnailToolBar(QQuickItem *parent = 0); - ~QQuickWinThumbnailToolBar(); + explicit QQuickThumbnailToolBar(QQuickItem *parent = 0); + ~QQuickThumbnailToolBar(); int count() const; QQmlListProperty<QObject> data(); - QQmlListProperty<QQuickWinThumbnailToolButton> buttons(); + QQmlListProperty<QQuickThumbnailToolButton> buttons(); - Q_INVOKABLE void addButton(QQuickWinThumbnailToolButton *button); - Q_INVOKABLE void removeButton(QQuickWinThumbnailToolButton *button); + Q_INVOKABLE void addButton(QQuickThumbnailToolButton *button); + Q_INVOKABLE void removeButton(QQuickThumbnailToolButton *button); public Q_SLOTS: void clear(); @@ -81,13 +82,13 @@ protected: private: static void addData(QQmlListProperty<QObject> *property, QObject *button); - static int buttonCount(QQmlListProperty<QQuickWinThumbnailToolButton> *property); - static QQuickWinThumbnailToolButton *buttonAt(QQmlListProperty<QQuickWinThumbnailToolButton> *property, int index); + static int buttonCount(QQmlListProperty<QQuickThumbnailToolButton> *property); + static QQuickThumbnailToolButton *buttonAt(QQmlListProperty<QQuickThumbnailToolButton> *property, int index); QWinThumbnailToolBar m_toolbar; - QList<QQuickWinThumbnailToolButton *> m_buttons; + QList<QQuickThumbnailToolButton *> m_buttons; }; QT_END_NAMESPACE -#endif // QQUICKWINTHUMBNAILTOOLBAR_H +#endif // QQUICKTHUMBNAILTOOLBAR_P_H diff --git a/src/imports/winextras/qquickwinthumbnailtoolbutton.cpp b/src/imports/winextras/qquickthumbnailtoolbutton.cpp index 46f20be..7f84988 100644 --- a/src/imports/winextras/qquickwinthumbnailtoolbutton.cpp +++ b/src/imports/winextras/qquickthumbnailtoolbutton.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,7 +40,7 @@ ** ****************************************************************************/ -#include "qquickwinthumbnailtoolbutton.h" +#include "qquickthumbnailtoolbutton_p.h" #include <QWinThumbnailToolButton> @@ -47,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype ThumbnailToolButton - \instantiates QQuickWinThumbnailToolButton + \instantiates QQuickThumbnailToolButton \inqmlmodule QtWinExtras \brief Represents a button in a thumbnail toolbar. @@ -61,14 +62,14 @@ QT_BEGIN_NAMESPACE This signal is emitted when the user clicks the button. The corresponding handler is \c onClicked. */ -QQuickWinThumbnailToolButton::QQuickWinThumbnailToolButton(QObject *parent) : +QQuickThumbnailToolButton::QQuickThumbnailToolButton(QObject *parent) : QObject(parent), m_button(new QWinThumbnailToolButton(this)) { connect(m_button, SIGNAL(clicked()), SIGNAL(clicked())); connect(&m_loader, SIGNAL(finished()), SLOT(iconLoaded())); } -QQuickWinThumbnailToolButton::~QQuickWinThumbnailToolButton() +QQuickThumbnailToolButton::~QQuickThumbnailToolButton() { } @@ -77,7 +78,7 @@ QQuickWinThumbnailToolButton::~QQuickWinThumbnailToolButton() The button icon path. */ -void QQuickWinThumbnailToolButton::setIconSource(const QUrl &iconSource) +void QQuickThumbnailToolButton::setIconSource(const QUrl &iconSource) { if (m_iconSource != iconSource) { m_iconSource = iconSource; @@ -86,7 +87,7 @@ void QQuickWinThumbnailToolButton::setIconSource(const QUrl &iconSource) } } -QUrl QQuickWinThumbnailToolButton::iconSource() +QUrl QQuickThumbnailToolButton::iconSource() { return m_iconSource; } @@ -96,7 +97,7 @@ QUrl QQuickWinThumbnailToolButton::iconSource() The tooltip of the button. */ -void QQuickWinThumbnailToolButton::setTooltip(const QString &tooltip) +void QQuickThumbnailToolButton::setTooltip(const QString &tooltip) { if (m_button->toolTip() != tooltip) { m_button->setToolTip(tooltip); @@ -104,7 +105,7 @@ void QQuickWinThumbnailToolButton::setTooltip(const QString &tooltip) } } -QString QQuickWinThumbnailToolButton::tooltip() const +QString QQuickThumbnailToolButton::tooltip() const { return m_button->toolTip(); } @@ -116,7 +117,7 @@ QString QQuickWinThumbnailToolButton::tooltip() const By default, this property is set to true. */ -void QQuickWinThumbnailToolButton::setEnabled(bool enabled) +void QQuickThumbnailToolButton::setEnabled(bool enabled) { if (m_button->isEnabled() != enabled) { m_button->setEnabled(enabled); @@ -124,7 +125,7 @@ void QQuickWinThumbnailToolButton::setEnabled(bool enabled) } } -bool QQuickWinThumbnailToolButton::isEnabled() const +bool QQuickThumbnailToolButton::isEnabled() const { return m_button->isEnabled(); } @@ -139,7 +140,7 @@ bool QQuickWinThumbnailToolButton::isEnabled() const By default, this property is set to true. */ -void QQuickWinThumbnailToolButton::setInteractive(bool interactive) +void QQuickThumbnailToolButton::setInteractive(bool interactive) { if (m_button->isInteractive() != interactive) { m_button->setInteractive(interactive); @@ -147,7 +148,7 @@ void QQuickWinThumbnailToolButton::setInteractive(bool interactive) } } -bool QQuickWinThumbnailToolButton::isInteractive() const +bool QQuickThumbnailToolButton::isInteractive() const { return m_button->isInteractive(); } @@ -159,7 +160,7 @@ bool QQuickWinThumbnailToolButton::isInteractive() const By default, this property is set to true. */ -void QQuickWinThumbnailToolButton::setVisible(bool visible) +void QQuickThumbnailToolButton::setVisible(bool visible) { if (m_button->isVisible() != visible) { m_button->setVisible(visible); @@ -167,7 +168,7 @@ void QQuickWinThumbnailToolButton::setVisible(bool visible) } } -bool QQuickWinThumbnailToolButton::isVisible() const +bool QQuickThumbnailToolButton::isVisible() const { return m_button->isVisible(); } @@ -179,7 +180,7 @@ bool QQuickWinThumbnailToolButton::isVisible() const By default, this property is set to false. */ -void QQuickWinThumbnailToolButton::setDismissOnClick(bool dismiss) +void QQuickThumbnailToolButton::setDismissOnClick(bool dismiss) { if (m_button->dismissOnClick() != dismiss) { m_button->setDismissOnClick(dismiss); @@ -187,7 +188,7 @@ void QQuickWinThumbnailToolButton::setDismissOnClick(bool dismiss) } } -bool QQuickWinThumbnailToolButton::dismissOnClick() const +bool QQuickThumbnailToolButton::dismissOnClick() const { return m_button->dismissOnClick(); } @@ -199,7 +200,7 @@ bool QQuickWinThumbnailToolButton::dismissOnClick() const By default, this property is set to false. */ -void QQuickWinThumbnailToolButton::setFlat(bool flat) +void QQuickThumbnailToolButton::setFlat(bool flat) { if (m_button->isFlat() != flat) { m_button->setFlat(flat); @@ -207,12 +208,12 @@ void QQuickWinThumbnailToolButton::setFlat(bool flat) } } -bool QQuickWinThumbnailToolButton::isFlat() const +bool QQuickThumbnailToolButton::isFlat() const { return m_button->isFlat(); } -void QQuickWinThumbnailToolButton::iconLoaded() +void QQuickThumbnailToolButton::iconLoaded() { QIcon icon = m_loader.icon(); if (!icon.isNull()) diff --git a/src/imports/winextras/qquickwinthumbnailtoolbutton.h b/src/imports/winextras/qquickthumbnailtoolbutton_p.h index b3f58cc..82fcdae 100644 --- a/src/imports/winextras/qquickwinthumbnailtoolbutton.h +++ b/src/imports/winextras/qquickthumbnailtoolbutton_p.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Ivan Vizir <define-true-false@yandex.com> + ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWinExtras module of the Qt Toolkit. @@ -39,18 +40,18 @@ ** ****************************************************************************/ -#ifndef QQUICKWINTHUMBNAILTOOLBUTTON_H -#define QQUICKWINTHUMBNAILTOOLBUTTON_H +#ifndef QQUICKTHUMBNAILTOOLBUTTON_P_H +#define QQUICKTHUMBNAILTOOLBUTTON_P_H #include <QQuickItem> #include <QWinThumbnailToolBar> #include <QUrl> -#include "qwiniconloader.h" +#include "qquickiconloader_p.h" QT_BEGIN_NAMESPACE -class QQuickWinThumbnailToolButton : public QObject +class QQuickThumbnailToolButton : public QObject { Q_OBJECT Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource NOTIFY iconSourceChanged) @@ -62,8 +63,8 @@ class QQuickWinThumbnailToolButton : public QObject Q_PROPERTY(bool flat READ isFlat WRITE setFlat NOTIFY flatChanged) public: - explicit QQuickWinThumbnailToolButton(QObject *parent = 0); - ~QQuickWinThumbnailToolButton(); + explicit QQuickThumbnailToolButton(QObject *parent = 0); + ~QQuickThumbnailToolButton(); void setIconSource(const QUrl &iconSource); QUrl iconSource(); @@ -96,11 +97,11 @@ private Q_SLOTS: private: QUrl m_iconSource; QWinThumbnailToolButton *m_button; - QWinIconLoader m_loader; + QQuickIconLoader m_loader; - friend class QQuickWinThumbnailToolBar; + friend class QQuickThumbnailToolBar; }; QT_END_NAMESPACE -#endif // QQUICKWINTHUMBNAILTOOLBUTTON_H +#endif // QQUICKTHUMBNAILTOOLBUTTON_P_H diff --git a/src/imports/winextras/winextras.pro b/src/imports/winextras/winextras.pro index 4281e07..2083241 100644 --- a/src/imports/winextras/winextras.pro +++ b/src/imports/winextras/winextras.pro @@ -11,22 +11,22 @@ QML_FILES += \ JumpListSeparator.qml HEADERS += \ - qquickwindwmfeatures.h \ - qquickwindwmfeatures_p.h \ - qquickwintaskbarbutton.h \ - qquickjumplist.h \ - qquickwinthumbnailtoolbar.h \ - qquickwinthumbnailtoolbutton.h \ - qwiniconloader.h + qquickdwmfeatures_p.h \ + qquickdwmfeatures_p_p.h \ + qquicktaskbarbutton_p.h \ + qquickjumplist_p.h \ + qquickthumbnailtoolbar_p.h \ + qquickthumbnailtoolbutton_p.h \ + qquickiconloader_p.h SOURCES += \ plugin.cpp \ - qquickwindwmfeatures.cpp \ - qquickwintaskbarbutton.cpp \ + qquickdwmfeatures.cpp \ + qquicktaskbarbutton.cpp \ qquickjumplist.cpp \ - qquickwinthumbnailtoolbar.cpp \ - qquickwinthumbnailtoolbutton.cpp \ - qwiniconloader.cpp + qquickthumbnailtoolbar.cpp \ + qquickthumbnailtoolbutton.cpp \ + qquickiconloader.cpp OTHER_FILES += \ qmldir \ |