Commit fc464312 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #5028 from dogmaphobic/uiTweaks

Ui tweaks
parents da022f97 747c2917
......@@ -58,7 +58,8 @@ class CrashGenerationClientImpl : public CrashGenerationClient {
iov.iov_base = const_cast<void*>(blob);
iov.iov_len = blob_size;
struct kernel_msghdr msg = { 0 };
struct kernel_msghdr msg;
memset(&msg, 0, sizeof(kernel_msghdr));
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
char cmsg[kControlMsgSize] = "";
......
......@@ -471,7 +471,7 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
// This is a public interface to HandleSignal that allows the client to
// generate a crash dump. This function may run in a compromised context.
bool ExceptionHandler::SimulateSignalDelivery(int sig) {
siginfo_t siginfo = {};
siginfo_t siginfo;
// Mimic a trusted signal to allow tracing the process (see
// ExceptionHandler::HandleSignal().
siginfo.si_code = SI_USER;
......
......@@ -75,9 +75,10 @@ int writeToCrashLog(const char* buf) {
int write(const char* buf, size_t nbytes) {
#if defined(__ANDROID__)
return __android_log_write(ANDROID_LOG_WARN, kAndroidLogTag, buf);
(void)nbytes;
return __android_log_write(ANDROID_LOG_WARN, kAndroidLogTag, buf);
#else
return sys_write(2, buf, nbytes);
return sys_write(2, buf, nbytes);
#endif
}
......
......@@ -449,7 +449,8 @@ class MicrodumpWriter {
}
// Copy as many bytes of |identifier| as will fit into a MDGUID
MDGUID module_identifier = {0};
MDGUID module_identifier;
memset(&module_identifier, 0, sizeof(MDGUID));
memcpy(&module_identifier, &identifier_bytes[0],
std::min(sizeof(MDGUID), identifier_bytes.size()));
......
......@@ -874,7 +874,8 @@ bool LinuxDumper::HandleDeletedFileInMapping(char* path) const {
char exe_link[NAME_MAX];
if (!BuildProcPath(exe_link, pid_, "exe"))
return false;
MappingInfo new_mapping = {0};
MappingInfo new_mapping;
memset(&new_mapping, 0, sizeof(MappingInfo));
if (!SafeReadLink(exe_link, new_mapping.name))
return false;
char new_path[PATH_MAX];
......
......@@ -407,7 +407,7 @@ QGCView {
id: toolStrip
anchors.leftMargin: ScreenTools.defaultFontPixelWidth
anchors.left: _panel.left
anchors.topMargin: ScreenTools.toolbarHeight + _margins
anchors.topMargin: ScreenTools.toolbarHeight + (_margins * 2)
anchors.top: _panel.top
z: _panel.z + 4
title: qsTr("Fly")
......
......@@ -144,10 +144,10 @@ static QObject* qgroundcontrolQmlGlobalSingletonFactory(QQmlEngine*, QJSEngine*)
// breakpad support
#include "client/linux/handler/exception_handler.h"
static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* context, bool succeeded)
static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* /*context*/, bool succeeded)
{
qDebug() << "dumpCallback" << succeeded << descriptor.path();
return succeeded;
qDebug() << "dumpCallback" << succeeded << descriptor.path();
return succeeded;
}
#endif
......
......@@ -19,6 +19,8 @@ Rectangle {
width: ScreenTools.isMobile ? ScreenTools.minTouchPixels : ScreenTools.defaultFontPixelWidth * 6
height: buttonStripColumn.height + (buttonStripColumn.anchors.margins * 2)
radius: _radius
border.width: 1
border.color: qgcPal.globalTheme === QGCPalette.Light ? Qt.rgba(0,0,0,0.35) : Qt.rgba(1,1,1,0.35)
property string title: "Title"
property alias model: repeater.model
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment