Windows QPA: Fix clang warnings about using typedef
Replace by using (except for function pointers). Change-Id: I0dfe03c22f9f87155003d13a6376381623df7217 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
parent
e85aa551eb
commit
27e7234963
@ -84,7 +84,7 @@ private:
|
||||
const HCURSOR m_hcursor;
|
||||
};
|
||||
|
||||
typedef QSharedPointer<CursorHandle> CursorHandlePtr;
|
||||
using CursorHandlePtr = QSharedPointer<CursorHandle>;
|
||||
|
||||
class QWindowsCursor : public QPlatformCursor
|
||||
{
|
||||
|
@ -271,7 +271,7 @@ QWindowsNativeDialogBase *QWindowsDialogHelperBase<BaseClass>::ensureNativeDialo
|
||||
class QWindowsDialogThread : public QThread
|
||||
{
|
||||
public:
|
||||
typedef QSharedPointer<QWindowsNativeDialogBase> QWindowsNativeDialogBasePtr;
|
||||
using QWindowsNativeDialogBasePtr = QSharedPointer<QWindowsNativeDialogBase>;
|
||||
|
||||
explicit QWindowsDialogThread(const QWindowsNativeDialogBasePtr &d, HWND owner)
|
||||
: m_dialog(d), m_owner(owner) {}
|
||||
@ -551,7 +551,7 @@ IFileDialogEvents *QWindowsNativeFileDialogEventHandler::create(QWindowsNativeFi
|
||||
class QWindowsShellItem
|
||||
{
|
||||
public:
|
||||
typedef std::vector<IShellItem *> IShellItems;
|
||||
using IShellItems = std::vector<IShellItem *>;
|
||||
|
||||
explicit QWindowsShellItem(IShellItem *item);
|
||||
|
||||
@ -1688,7 +1688,7 @@ class QWindowsXpNativeFileDialog : public QWindowsNativeDialogBase
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
typedef QSharedPointer<QFileDialogOptions> OptionsPtr;
|
||||
using OptionsPtr = QSharedPointer<QFileDialogOptions>;
|
||||
|
||||
static QWindowsXpNativeFileDialog *create(const OptionsPtr &options, const QWindowsFileDialogSharedData &data);
|
||||
|
||||
@ -1779,7 +1779,7 @@ static int QT_WIN_CALLBACK xpFileDialogGetExistingDirCallbackProc(HWND hwnd, UIN
|
||||
#if defined(Q_CC_MINGW) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 3)
|
||||
typedef ITEMIDLIST *qt_LpItemIdList;
|
||||
#else
|
||||
typedef PIDLIST_ABSOLUTE qt_LpItemIdList;
|
||||
using qt_LpItemIdList = PIDLIST_ABSOLUTE;
|
||||
#endif
|
||||
|
||||
int QWindowsXpNativeFileDialog::existingDirCallback(HWND hwnd, UINT uMsg, LPARAM lParam)
|
||||
@ -2007,7 +2007,7 @@ QString QWindowsXpFileDialogHelper::selectedNameFilter() const
|
||||
\ingroup qt-lighthouse-win
|
||||
*/
|
||||
|
||||
typedef QSharedPointer<QColor> SharedPointerColor;
|
||||
using SharedPointerColor = QSharedPointer<QColor>;
|
||||
|
||||
#ifdef USE_NATIVE_COLOR_DIALOG
|
||||
class QWindowsNativeColorDialog : public QWindowsNativeDialogBase
|
||||
|
@ -66,7 +66,7 @@ class QWindowsDialogHelperBase : public BaseClass
|
||||
{
|
||||
Q_DISABLE_COPY_MOVE(QWindowsDialogHelperBase)
|
||||
public:
|
||||
typedef QSharedPointer<QWindowsNativeDialogBase> QWindowsNativeDialogBasePtr;
|
||||
using QWindowsNativeDialogBasePtr = QSharedPointer<QWindowsNativeDialogBase>;
|
||||
~QWindowsDialogHelperBase() { cleanupThread(); }
|
||||
|
||||
void exec() override;
|
||||
|
@ -120,7 +120,7 @@ class QWindowsMenu : public QPlatformMenu
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
typedef QVector<QWindowsMenuItem *> MenuItems;
|
||||
using MenuItems = QVector<QWindowsMenuItem *>;
|
||||
|
||||
QWindowsMenu();
|
||||
~QWindowsMenu();
|
||||
@ -196,7 +196,7 @@ class QWindowsMenuBar : public QPlatformMenuBar
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
typedef QVector<QWindowsMenu *> Menus;
|
||||
using Menus = QVector<QWindowsMenu *>;
|
||||
|
||||
QWindowsMenuBar();
|
||||
~QWindowsMenuBar() override;
|
||||
|
@ -609,8 +609,8 @@ bool QWindowsMouseHandler::translateTouchEvent(QWindow *window, HWND,
|
||||
QtWindows::WindowsEventType,
|
||||
MSG msg, LRESULT *)
|
||||
{
|
||||
typedef QWindowSystemInterface::TouchPoint QTouchPoint;
|
||||
typedef QList<QWindowSystemInterface::TouchPoint> QTouchPointList;
|
||||
using QTouchPoint = QWindowSystemInterface::TouchPoint;
|
||||
using QTouchPointList = QList<QWindowSystemInterface::TouchPoint>;
|
||||
|
||||
if (!QWindowsContext::instance()->initTouch()) {
|
||||
qWarning("Unable to initialize touch handling.");
|
||||
|
@ -72,7 +72,7 @@ static inline QDpi monitorDPI(HMONITOR hMonitor)
|
||||
return {0, 0};
|
||||
}
|
||||
|
||||
typedef QList<QWindowsScreenData> WindowsScreenDataList;
|
||||
using WindowsScreenDataList = QList<QWindowsScreenData>;
|
||||
|
||||
static bool monitorData(HMONITOR hMonitor, QWindowsScreenData *data)
|
||||
{
|
||||
|
@ -76,7 +76,7 @@ class QWindowsScreen : public QPlatformScreen
|
||||
{
|
||||
public:
|
||||
#ifndef QT_NO_CURSOR
|
||||
typedef QScopedPointer<QPlatformCursor> CursorPtr;
|
||||
using CursorPtr = QScopedPointer<QPlatformCursor>;
|
||||
#endif
|
||||
|
||||
explicit QWindowsScreen(const QWindowsScreenData &data);
|
||||
@ -127,7 +127,7 @@ private:
|
||||
class QWindowsScreenManager
|
||||
{
|
||||
public:
|
||||
typedef QList<QWindowsScreen *> WindowsScreenList;
|
||||
using WindowsScreenList = QList<QWindowsScreen *>;
|
||||
|
||||
QWindowsScreenManager();
|
||||
|
||||
|
@ -117,7 +117,7 @@ struct QWindowsHwndSystemTrayIconEntry
|
||||
QWindowsSystemTrayIcon *trayIcon;
|
||||
};
|
||||
|
||||
typedef QVector<QWindowsHwndSystemTrayIconEntry> HwndTrayIconEntries;
|
||||
using HwndTrayIconEntries = QVector<QWindowsHwndSystemTrayIconEntry>;
|
||||
|
||||
Q_GLOBAL_STATIC(HwndTrayIconEntries, hwndTrayIconEntries)
|
||||
|
||||
|
@ -86,7 +86,7 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
typedef QSharedPointer<QWindowCreationContext> QWindowCreationContextPtr;
|
||||
using QWindowCreationContextPtr = QSharedPointer<QWindowCreationContext>;
|
||||
|
||||
enum {
|
||||
defaultWindowWidth = 160,
|
||||
@ -494,7 +494,7 @@ static QMargins invisibleMargins(QPoint screenPoint)
|
||||
|
||||
struct WindowCreationData
|
||||
{
|
||||
typedef QWindowsWindowData WindowData;
|
||||
using WindowData = QWindowsWindowData;
|
||||
enum Flags { ForceChild = 0x1, ForceTopLevel = 0x2 };
|
||||
|
||||
void fromWindow(const QWindow *w, const Qt::WindowFlags flags, unsigned creationFlags = 0);
|
||||
|
Loading…
Reference in New Issue
Block a user