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 <QDir>
|
||||
|
||||
static const char networkSecurity[] = "ns";
|
||||
|
||||
SettingsDialog::SettingsDialog(QWidget* parent, AppConfig& config) :
|
||||
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
|
||||
Ui::SettingsDialogBase(),
|
||||
|
|
|
@ -690,7 +690,6 @@ ArchNetworkBSD::nameToAddr(const std::string& name)
|
|||
// allocate address
|
||||
ArchNetAddressImpl* addr = new ArchNetAddressImpl;
|
||||
|
||||
char ipstr[INET6_ADDRSTRLEN];
|
||||
struct addrinfo hints;
|
||||
struct addrinfo *p;
|
||||
int ret;
|
||||
|
|
|
@ -684,9 +684,9 @@ ServerApp::handleNoClients(const Event&, void*)
|
|||
void
|
||||
ServerApp::handleScreenSwitched(const Event& e, void*)
|
||||
{
|
||||
Server::SwitchToScreenInfo* info = (Server::SwitchToScreenInfo*)(e.getData());
|
||||
|
||||
#ifdef WINAPI_XWINDOWS
|
||||
Server::SwitchToScreenInfo* info = (Server::SwitchToScreenInfo*)(e.getData());
|
||||
|
||||
if (!args().m_screenChangeScript.empty()) {
|
||||
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_notifyCond(ARCH->newCondVar()),
|
||||
m_notifyMutex(ARCH->newMutex()),
|
||||
m_bufferThreadId(0),
|
||||
m_bufferWaiting(false),
|
||||
m_bufferThreadId(0),
|
||||
m_bufferMaxSize(kBufferMaxSize),
|
||||
m_bufferRateWriteLimit(kBufferRateWriteLimit),
|
||||
m_bufferRateTimeLimit(kBufferRateTimeLimit),
|
||||
|
|
|
@ -39,21 +39,21 @@ public:
|
|||
~SecureSocket();
|
||||
|
||||
// ISocket overrides
|
||||
void close();
|
||||
void close() override;
|
||||
|
||||
// IDataSocket overrides
|
||||
virtual void connect(const NetworkAddress&);
|
||||
virtual void connect(const NetworkAddress&) 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; }
|
||||
bool isSecureReady();
|
||||
void secureConnect();
|
||||
void secureAccept();
|
||||
int secureRead(void* buffer, int size, int& read);
|
||||
int secureWrite(const void* buffer, int size, int& wrote);
|
||||
EJobResult doRead();
|
||||
EJobResult doWrite();
|
||||
EJobResult doRead() override;
|
||||
EJobResult doWrite() override;
|
||||
void initSsl(bool server);
|
||||
bool loadCertificates(String& CertFile);
|
||||
|
||||
|
|
|
@ -129,13 +129,13 @@ draggingSourceOperationMask
|
|||
|
||||
- (NSPoint)draggingLocation
|
||||
{
|
||||
NSPoint point;
|
||||
NSPoint point = NSMakePoint(0, 0);
|
||||
return point;
|
||||
}
|
||||
|
||||
- (NSPoint)draggedImageLocation
|
||||
{
|
||||
NSPoint point;
|
||||
NSPoint point = NSMakePoint(0, 0);
|
||||
return point;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue