From 72b4c3ac30cf6d868a60abef1c51f3a6009220b1 Mon Sep 17 00:00:00 2001 From: Norbert Bizet Date: Thu, 2 Nov 2017 15:25:47 +0100 Subject: [PATCH] Preparation fixes: remove some warning --- bacula/src/lib/parse_conf.h | 2 +- bacula/src/qt-console/bcomm/dircomm.h | 6 +++--- bacula/src/qt-console/tray-monitor/runjob.cpp | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bacula/src/lib/parse_conf.h b/bacula/src/lib/parse_conf.h index e0d3594147..3a8f2e60ce 100644 --- a/bacula/src/lib/parse_conf.h +++ b/bacula/src/lib/parse_conf.h @@ -21,7 +21,7 @@ * Kern Sibbald, January MM * */ - +#pragma once /* Used for certain keyword tables */ struct s_kw { const char *name; diff --git a/bacula/src/qt-console/bcomm/dircomm.h b/bacula/src/qt-console/bcomm/dircomm.h index 54ce58dc65..11ba9706b1 100644 --- a/bacula/src/qt-console/bcomm/dircomm.h +++ b/bacula/src/qt-console/bcomm/dircomm.h @@ -48,12 +48,12 @@ public: int sock_read(); bool authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons, char *buf, int buflen); - bool is_connected() { return m_sock != NULL; }; - bool is_ready() { return is_connected() && m_at_prompt && m_at_main_prompt; }; + bool is_connected() { return m_sock != NULL; } + bool is_ready() { return is_connected() && m_at_prompt && m_at_main_prompt; } char *msg(); bool notify(bool enable); // enables/disables socket notification - returns the previous state bool is_notify_enabled() const; - bool is_in_command() const { return m_in_command > 0; }; + bool is_in_command() const { return m_in_command > 0; } void terminate(); bool connect_dir(); int read(void); diff --git a/bacula/src/qt-console/tray-monitor/runjob.cpp b/bacula/src/qt-console/tray-monitor/runjob.cpp index e6204ee45b..7186335709 100644 --- a/bacula/src/qt-console/tray-monitor/runjob.cpp +++ b/bacula/src/qt-console/tray-monitor/runjob.cpp @@ -381,6 +381,7 @@ bool TSched::read_command_file(const char *file, alist *lst, btime_t mtime) void TSched::timerEvent(QTimerEvent *event) { + Q_UNUSED(event) POOL_MEM tmp, command; TSchedJob *j; alist lst(10, not_owned_by_alist); -- 2.39.5