Merge pull request #498 from tiwoc/fix-macos-warnings
Fix macOS build warnings
This commit is contained in:
commit
1246ec36fd
|
@ -31,8 +31,6 @@
|
||||||
#include <QFileDialog>
|
#include <QFileDialog>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
|
||||||
static const char networkSecurity[] = "ns";
|
|
||||||
|
|
||||||
SettingsDialog::SettingsDialog(QWidget* parent, AppConfig& config) :
|
SettingsDialog::SettingsDialog(QWidget* parent, AppConfig& config) :
|
||||||
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
|
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
|
||||||
Ui::SettingsDialogBase(),
|
Ui::SettingsDialogBase(),
|
||||||
|
@ -136,4 +134,4 @@ void SettingsDialog::on_m_pComboLanguage_currentIndexChanged(int index)
|
||||||
{
|
{
|
||||||
QString ietfCode = m_pComboLanguage->itemData(index).toString();
|
QString ietfCode = m_pComboLanguage->itemData(index).toString();
|
||||||
QBarrierApplication::getInstance()->switchTranslator(ietfCode);
|
QBarrierApplication::getInstance()->switchTranslator(ietfCode);
|
||||||
}
|
}
|
||||||
|
|
|
@ -690,7 +690,6 @@ ArchNetworkBSD::nameToAddr(const std::string& name)
|
||||||
// allocate address
|
// allocate address
|
||||||
ArchNetAddressImpl* addr = new ArchNetAddressImpl;
|
ArchNetAddressImpl* addr = new ArchNetAddressImpl;
|
||||||
|
|
||||||
char ipstr[INET6_ADDRSTRLEN];
|
|
||||||
struct addrinfo hints;
|
struct addrinfo hints;
|
||||||
struct addrinfo *p;
|
struct addrinfo *p;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -684,9 +684,9 @@ ServerApp::handleNoClients(const Event&, void*)
|
||||||
void
|
void
|
||||||
ServerApp::handleScreenSwitched(const Event& e, void*)
|
ServerApp::handleScreenSwitched(const Event& e, void*)
|
||||||
{
|
{
|
||||||
Server::SwitchToScreenInfo* info = (Server::SwitchToScreenInfo*)(e.getData());
|
|
||||||
|
|
||||||
#ifdef WINAPI_XWINDOWS
|
#ifdef WINAPI_XWINDOWS
|
||||||
|
Server::SwitchToScreenInfo* info = (Server::SwitchToScreenInfo*)(e.getData());
|
||||||
|
|
||||||
if (!args().m_screenChangeScript.empty()) {
|
if (!args().m_screenChangeScript.empty()) {
|
||||||
LOG((CLOG_INFO "Running shell script for screen \"%s\"", info->m_screen));
|
LOG((CLOG_INFO "Running shell script for screen \"%s\"", info->m_screen));
|
||||||
|
|
||||||
|
|
|
@ -44,8 +44,8 @@ IpcLogOutputter::IpcLogOutputter(IpcServer& ipcServer, EIpcClientType clientType
|
||||||
m_running(false),
|
m_running(false),
|
||||||
m_notifyCond(ARCH->newCondVar()),
|
m_notifyCond(ARCH->newCondVar()),
|
||||||
m_notifyMutex(ARCH->newMutex()),
|
m_notifyMutex(ARCH->newMutex()),
|
||||||
m_bufferThreadId(0),
|
|
||||||
m_bufferWaiting(false),
|
m_bufferWaiting(false),
|
||||||
|
m_bufferThreadId(0),
|
||||||
m_bufferMaxSize(kBufferMaxSize),
|
m_bufferMaxSize(kBufferMaxSize),
|
||||||
m_bufferRateWriteLimit(kBufferRateWriteLimit),
|
m_bufferRateWriteLimit(kBufferRateWriteLimit),
|
||||||
m_bufferRateTimeLimit(kBufferRateTimeLimit),
|
m_bufferRateTimeLimit(kBufferRateTimeLimit),
|
||||||
|
|
|
@ -39,21 +39,21 @@ public:
|
||||||
~SecureSocket();
|
~SecureSocket();
|
||||||
|
|
||||||
// ISocket overrides
|
// ISocket overrides
|
||||||
void close();
|
void close() override;
|
||||||
|
|
||||||
// IDataSocket overrides
|
// IDataSocket overrides
|
||||||
virtual void connect(const NetworkAddress&);
|
virtual void connect(const NetworkAddress&) override;
|
||||||
|
|
||||||
std::unique_ptr<ISocketMultiplexerJob> newJob() override;
|
std::unique_ptr<ISocketMultiplexerJob> newJob() override;
|
||||||
bool isFatal() const { return m_fatal; }
|
bool isFatal() const override { return m_fatal; }
|
||||||
void isFatal(bool b) { m_fatal = b; }
|
void isFatal(bool b) { m_fatal = b; }
|
||||||
bool isSecureReady();
|
bool isSecureReady();
|
||||||
void secureConnect();
|
void secureConnect();
|
||||||
void secureAccept();
|
void secureAccept();
|
||||||
int secureRead(void* buffer, int size, int& read);
|
int secureRead(void* buffer, int size, int& read);
|
||||||
int secureWrite(const void* buffer, int size, int& wrote);
|
int secureWrite(const void* buffer, int size, int& wrote);
|
||||||
EJobResult doRead();
|
EJobResult doRead() override;
|
||||||
EJobResult doWrite();
|
EJobResult doWrite() override;
|
||||||
void initSsl(bool server);
|
void initSsl(bool server);
|
||||||
bool loadCertificates(String& CertFile);
|
bool loadCertificates(String& CertFile);
|
||||||
|
|
||||||
|
|
|
@ -129,13 +129,13 @@ draggingSourceOperationMask
|
||||||
|
|
||||||
- (NSPoint)draggingLocation
|
- (NSPoint)draggingLocation
|
||||||
{
|
{
|
||||||
NSPoint point;
|
NSPoint point = NSMakePoint(0, 0);
|
||||||
return point;
|
return point;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSPoint)draggedImageLocation
|
- (NSPoint)draggedImageLocation
|
||||||
{
|
{
|
||||||
NSPoint point;
|
NSPoint point = NSMakePoint(0, 0);
|
||||||
return point;
|
return point;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue