~mateo-salta/nitroshare/nitroshare

Viewing changes to include/discovery/CBroadcastServer.h

Committer: Nathan Osman
Date: 2012-06-29 22:01:55 UTC
Revision ID: admin@quickmediasolutions.com-20120629220155-ogwrn9fxxve9wyw1

Moved a TON of the broadcast and discovery code around, creating separate classes for each and partially implementing their use in the first start wizard.

files added:
include/discovery/CBasicListener.h

include/util/definitions.h

src/discovery/CBasicListener.cpp

src/util/definitions.cpp

files renamed:
include/discovery/CBasicBroadcastServer.h => include/discovery/CBasicBroadcaster.h

src/discovery/CBasicBroadcastServer.cpp => src/discovery/CBasicBroadcaster.cpp

files modified:
include/discovery/CBroadcastServer.h

include/util/network.h

include/widgets/CBroadcastDiscoveryWidget.h

nitroshare.pro

src/dialogs/CSettingsDialog.cpp

src/discovery/CBroadcastServer.cpp

src/file/CFileServer.cpp

src/util/network.cpp

src/widgets/CBroadcastDiscoveryWidget.cpp

ui/CBroadcastDiscoveryWidget.ui

Show diffs side-by-side

added added

removed removed

include/discovery/CBroadcastServer.h

#include <QMap>

#include <QTimer>

#include <QSystemTrayIcon>

#include <QUdpSocket>

#include <discovery/CBasicBroadcastServer.h>

#include <discovery/CMachine.h>

class CBroadcastServer : public CBasicBroadcastServer

class CBroadcastServer : public QUdpSocket

{

Q_OBJECT

bool MachineExists(QString id) { return m_machines.contains(id); }

CMachine GetMachine(QString id) { return m_machines[id]; }

signals:

// TODO: remove these

void Error(QString);

void Information(QString);

private slots:

void OnMessage();

Older »