diff options
Diffstat (limited to 'src/winextras')
-rw-r--r-- | src/winextras/doc/qtwinextras.qdocconf | 2 | ||||
-rw-r--r-- | src/winextras/qwineventfilter_p.h | 11 | ||||
-rw-r--r-- | src/winextras/qwinfunctions_p.h | 11 | ||||
-rw-r--r-- | src/winextras/qwinjumplist.cpp | 22 | ||||
-rw-r--r-- | src/winextras/qwinjumplist.h | 4 | ||||
-rw-r--r-- | src/winextras/qwinjumplist_p.h | 11 | ||||
-rw-r--r-- | src/winextras/qwinjumplistcategory.cpp | 26 | ||||
-rw-r--r-- | src/winextras/qwinjumplistcategory.h | 5 | ||||
-rw-r--r-- | src/winextras/qwinjumplistcategory_p.h | 11 | ||||
-rw-r--r-- | src/winextras/qwinjumplistitem.cpp | 30 | ||||
-rw-r--r-- | src/winextras/qwinjumplistitem.h | 4 | ||||
-rw-r--r-- | src/winextras/qwinjumplistitem_p.h | 11 | ||||
-rw-r--r-- | src/winextras/qwintaskbarbutton_p.h | 11 | ||||
-rw-r--r-- | src/winextras/qwinthumbnailtoolbar_p.h | 11 | ||||
-rw-r--r-- | src/winextras/qwinthumbnailtoolbutton_p.h | 11 | ||||
-rw-r--r-- | src/winextras/winshobjidl_p.h | 11 |
16 files changed, 190 insertions, 2 deletions
diff --git a/src/winextras/doc/qtwinextras.qdocconf b/src/winextras/doc/qtwinextras.qdocconf index 27b991a..46c3e95 100644 --- a/src/winextras/doc/qtwinextras.qdocconf +++ b/src/winextras/doc/qtwinextras.qdocconf @@ -7,7 +7,7 @@ version = $QT_VERSION exampledirs += ../../../examples/winextras \ snippets -examplesinstallpath = winextras +examplesinstallpath = qtwinextras/winextras headerdirs = .. ../../imports/winextras sourcedirs = .. ../../imports/winextras diff --git a/src/winextras/qwineventfilter_p.h b/src/winextras/qwineventfilter_p.h index 87b55c3..b4a4f51 100644 --- a/src/winextras/qwineventfilter_p.h +++ b/src/winextras/qwineventfilter_p.h @@ -34,6 +34,17 @@ #ifndef QWINEVENTFILTER_H #define QWINEVENTFILTER_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtWinExtras/qwinextrasglobal.h> #include <QAbstractNativeEventFilter> #include <qt_windows.h> diff --git a/src/winextras/qwinfunctions_p.h b/src/winextras/qwinfunctions_p.h index 4e97afe..715a997 100644 --- a/src/winextras/qwinfunctions_p.h +++ b/src/winextras/qwinfunctions_p.h @@ -34,6 +34,17 @@ #ifndef QWINFUNCTIONS_P_H #define QWINFUNCTIONS_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QString> #include <qt_windows.h> #include <uxtheme.h> diff --git a/src/winextras/qwinjumplist.cpp b/src/winextras/qwinjumplist.cpp index 28b4fdc..9caebdc 100644 --- a/src/winextras/qwinjumplist.cpp +++ b/src/winextras/qwinjumplist.cpp @@ -41,6 +41,7 @@ #include "winpropkey_p.h" #include <QDir> +#include <QtCore/QDebug> #include <QCoreApplication> #include <qt_windows.h> #include <propvarutil.h> @@ -563,6 +564,27 @@ void QWinJumpList::clear() d->destroy(); } +#ifndef QT_NO_DEBUG_STREAM + +QDebug operator<<(QDebug debug, const QWinJumpList *jumplist) +{ + QDebugStateSaver saver(debug); + debug.nospace(); + debug.noquote(); + debug << "QWinJumpList("; + if (jumplist) { + debug << "(identifier=\"" << jumplist->identifier() << "\", recent=" + << jumplist->recent() << ", frequent=" << jumplist->frequent() + << ", tasks=" << jumplist->tasks() + << ", categories=" << jumplist->categories(); + } else { + debug << '0'; + } + debug << ')'; + return debug; +} +#endif // !QT_NO_DEBUG_STREAM + QT_END_NAMESPACE #include "moc_qwinjumplist.cpp" diff --git a/src/winextras/qwinjumplist.h b/src/winextras/qwinjumplist.h index 5350588..732742c 100644 --- a/src/winextras/qwinjumplist.h +++ b/src/winextras/qwinjumplist.h @@ -77,6 +77,10 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_rebuild()) }; +#ifndef QT_NO_DEBUG_STREAM +Q_WINEXTRAS_EXPORT QDebug operator<<(QDebug, const QWinJumpList *); +#endif + QT_END_NAMESPACE #endif // QWINJUMPLIST_H diff --git a/src/winextras/qwinjumplist_p.h b/src/winextras/qwinjumplist_p.h index 95d707e..bce382d 100644 --- a/src/winextras/qwinjumplist_p.h +++ b/src/winextras/qwinjumplist_p.h @@ -35,6 +35,17 @@ #ifndef QWINJUMPLIST_P_H #define QWINJUMPLIST_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qwinjumplist.h" #include "winshobjidl_p.h" diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp index 77903dd..2f26e1a 100644 --- a/src/winextras/qwinjumplistcategory.cpp +++ b/src/winextras/qwinjumplistcategory.cpp @@ -40,6 +40,8 @@ #include "winshobjidl_p.h" #include "windowsguidsdefs_p.h" +#include <QtCore/QDebug> + #include <shlobj.h> #if defined(_MSC_VER) && _MSC_VER < 1600 @@ -343,4 +345,28 @@ void QWinJumpListCategory::clear() } } +#ifndef QT_NO_DEBUG_STREAM + +QDebug operator<<(QDebug debug, const QWinJumpListCategory *category) +{ + QDebugStateSaver saver(debug); + debug.nospace(); + debug.noquote(); + debug << "QWinJumpListCategory("; + if (category) { + debug << "type=" << category->type() << ", isVisible=" + << category->isVisible() << ", title=\"" << category->title() + << "\", items=" << category->items(); + } else { + debug << '0'; + } + debug << ')'; + return debug; + + + return debug; +} + +#endif // !QT_NO_DEBUG_STREAM + QT_END_NAMESPACE diff --git a/src/winextras/qwinjumplistcategory.h b/src/winextras/qwinjumplistcategory.h index a5de402..9cc684b 100644 --- a/src/winextras/qwinjumplistcategory.h +++ b/src/winextras/qwinjumplistcategory.h @@ -55,7 +55,6 @@ public: Frequent, Tasks }; - explicit QWinJumpListCategory(const QString &title = QString()); ~QWinJumpListCategory(); @@ -85,6 +84,10 @@ private: QScopedPointer<QWinJumpListCategoryPrivate> d_ptr; }; +#ifndef QT_NO_DEBUG_STREAM +Q_WINEXTRAS_EXPORT QDebug operator<<(QDebug d, const QWinJumpListCategory *); +#endif + QT_END_NAMESPACE #endif // QWINJUMPLISTCATEGORY_H diff --git a/src/winextras/qwinjumplistcategory_p.h b/src/winextras/qwinjumplistcategory_p.h index 8a73be6..bce93d5 100644 --- a/src/winextras/qwinjumplistcategory_p.h +++ b/src/winextras/qwinjumplistcategory_p.h @@ -35,6 +35,17 @@ #ifndef QWINJUMPLISTCATEGORY_P_H #define QWINJUMPLISTCATEGORY_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qwinjumplistcategory.h" QT_BEGIN_NAMESPACE diff --git a/src/winextras/qwinjumplistitem.cpp b/src/winextras/qwinjumplistitem.cpp index a5d0a39..daf5456 100644 --- a/src/winextras/qwinjumplistitem.cpp +++ b/src/winextras/qwinjumplistitem.cpp @@ -36,6 +36,9 @@ #include "qwinjumplistitem_p.h" #include "qwinjumplistcategory_p.h" +#include <QtCore/QDebug> +#include <QtCore/QDir> + QT_BEGIN_NAMESPACE /*! @@ -256,4 +259,31 @@ QStringList QWinJumpListItem::arguments() const return d->arguments; } +#ifndef QT_NO_DEBUG_STREAM + +QDebug operator<<(QDebug debug, const QWinJumpListItem *item) +{ + QDebugStateSaver saver(debug); + debug.nospace(); + debug.noquote(); + debug << "QWinJumpListItem("; + if (item) { + debug << "type=" << item->type() << ", title=\"" << item->title() + << "\", description=\"" << item->description() + << "\", filePath=\"" << QDir::toNativeSeparators(item->filePath()) + << "\", arguments="; + debug.quote(); + debug << item->arguments(); + debug.noquote(); + debug << ", workingDirectory=\"" << QDir::toNativeSeparators(item->workingDirectory()) + << "\", icon=" << item->icon(); + } else { + debug << '0'; + } + debug << ')'; + return debug; +} + +#endif // !QT_NO_DEBUG_STREAM + QT_END_NAMESPACE diff --git a/src/winextras/qwinjumplistitem.h b/src/winextras/qwinjumplistitem.h index 9e57748..3fffa85 100644 --- a/src/winextras/qwinjumplistitem.h +++ b/src/winextras/qwinjumplistitem.h @@ -78,6 +78,10 @@ private: QScopedPointer<QWinJumpListItemPrivate> d_ptr; }; +#ifndef QT_NO_DEBUG_STREAM +Q_WINEXTRAS_EXPORT QDebug operator<<(QDebug, const QWinJumpListItem *); +#endif + QT_END_NAMESPACE #endif // QWINJUMPLISTITEM_H diff --git a/src/winextras/qwinjumplistitem_p.h b/src/winextras/qwinjumplistitem_p.h index f51171e..4341b1f 100644 --- a/src/winextras/qwinjumplistitem_p.h +++ b/src/winextras/qwinjumplistitem_p.h @@ -35,6 +35,17 @@ #ifndef QWINJUMPLISTITEM_P_H #define QWINJUMPLISTITEM_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qwinjumplistitem.h" QT_BEGIN_NAMESPACE diff --git a/src/winextras/qwintaskbarbutton_p.h b/src/winextras/qwintaskbarbutton_p.h index 51bbe6b..dff1e26 100644 --- a/src/winextras/qwintaskbarbutton_p.h +++ b/src/winextras/qwintaskbarbutton_p.h @@ -34,6 +34,17 @@ #ifndef QWINTASKBARBUTTON_P_H #define QWINTASKBARBUTTON_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qwintaskbarbutton.h" #include <QWindow> diff --git a/src/winextras/qwinthumbnailtoolbar_p.h b/src/winextras/qwinthumbnailtoolbar_p.h index 87df367..908e847 100644 --- a/src/winextras/qwinthumbnailtoolbar_p.h +++ b/src/winextras/qwinthumbnailtoolbar_p.h @@ -34,6 +34,17 @@ #ifndef QWINTHUMBNAILTOOLBAR_P_H #define QWINTHUMBNAILTOOLBAR_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qwinthumbnailtoolbar.h" #include <QtCore/QHash> diff --git a/src/winextras/qwinthumbnailtoolbutton_p.h b/src/winextras/qwinthumbnailtoolbutton_p.h index 4647b11..706b7ec 100644 --- a/src/winextras/qwinthumbnailtoolbutton_p.h +++ b/src/winextras/qwinthumbnailtoolbutton_p.h @@ -34,6 +34,17 @@ #ifndef QWINTHUMBNAILTOOLBUTTON_P_H #define QWINTHUMBNAILTOOLBUTTON_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtGui/qicon.h> #include <QtCore/qstring.h> diff --git a/src/winextras/winshobjidl_p.h b/src/winextras/winshobjidl_p.h index d10cb85..224150d 100644 --- a/src/winextras/winshobjidl_p.h +++ b/src/winextras/winshobjidl_p.h @@ -34,6 +34,17 @@ #ifndef WINSHOBJIDL_P_H #define WINSHOBJIDL_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <shobjidl.h> #ifndef __ITaskbarList_INTERFACE_DEFINED__ |