philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windows: Fix all clang-cl warnings

Browse Source 
Mostly int vs uint conversions.
In preparation to add -Werror
This commit is contained in:
Sergio Martins
2021-07-10 06:43:04 -07:00
parent 768c51f01c
commit 1d598d2585
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/LayoutSaver.cpp
View File

@@ -675,7 +675,7 @@ void LayoutSaver::Frame::fromVariantMap(const QVariantMap &map)
isNull = map.value(QStringLiteral("isNull")).toBool();
objectName = map.value(QStringLiteral("objectName")).toString();
geometry = Layouting::mapToRect(map.value(QStringLiteral("geometry")).toMap());
options = map.value(QStringLiteral("options")).toUInt();
options = static_cast<QFlags<FrameOption>::Int>(map.value(QStringLiteral("options")).toUInt());
currentTabIndex = map.value(QStringLiteral("currentTabIndex")).toInt();
const QVariantList dockWidgetsV = map.value(QStringLiteral("dockWidgets")).toList();

2
src/private/LayoutSaver_p.h
View File

@@ -205,7 +205,7 @@ struct LayoutSaver::Frame
bool isNull = true;
QString objectName;
QRect geometry;
unsigned int options;
QFlags<FrameOption>::Int options;
int currentTabIndex;
QString id; // for coorelation purposes

4
src/private/WidgetResizeHandler.cpp
View File

@@ -500,7 +500,7 @@ CursorPosition WidgetResizeHandler::cursorPosition(QPoint globalPos) const
const int y = pos.y();
const int margin = widgetResizeHandlerMargin();
unsigned int result = CursorPosition_Undefined;
QFlags<CursorPosition>::Int result = CursorPosition_Undefined;
if (qAbs(x) <= margin)
result |= CursorPosition_Left;
else if (qAbs(x - (mTarget->width() - margin)) <= margin)
@@ -550,7 +550,7 @@ void WidgetResizeHandler::setupWindow(QWindow *window)
#endif // Q_OS_WIN
}
bool WidgetResizeHandler::isInterestingNativeEvent(int nativeEvent)
bool WidgetResizeHandler::isInterestingNativeEvent(unsigned int nativeEvent)
{
#ifdef Q_OS_WIN
switch(nativeEvent) {

2
src/private/WidgetResizeHandler_p.h
View File

@@ -124,8 +124,8 @@ public:
static int widgetResizeHandlerMargin();
static void setupWindow(QWindow *window);
static bool isInterestingNativeEvent(int);
#ifdef Q_OS_WIN
static bool isInterestingNativeEvent(unsigned int);
static bool handleWindowsNativeEvent(QWindow *w, MSG *msg, Qt5Qt6Compat::qintptr *result, const NativeFeatures &);
static bool handleWindowsNativeEvent(FloatingWindow *w, const QByteArray &eventType,
void *message, Qt5Qt6Compat::qintptr *result);