diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 999e8359d7..d7c3746e57 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 6b7d02af4a..b5567f7e90 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -28,7 +28,6 @@ #include #include "Application.h" -#include "PairingHandler.h" #include "Menu.h" #include "Util.h" #include "InfoView.h" @@ -137,7 +136,6 @@ Menu::Menu() : addActionToQMenuAndActionHash(fileMenu, MenuOption::SettingsExport, 0, this, SLOT(exportSettings())); addDisabledActionAndSeparator(fileMenu, "Devices"); - addActionToQMenuAndActionHash(fileMenu, MenuOption::Pair, 0, PairingHandler::getInstance(), SLOT(sendPairRequest())); addCheckableActionToQMenuAndActionHash(fileMenu, MenuOption::TransmitterDrive, 0, true); addActionToQMenuAndActionHash(fileMenu, diff --git a/interface/src/PairingHandler.cpp b/interface/src/PairingHandler.cpp deleted file mode 100644 index a710ebce7c..0000000000 --- a/interface/src/PairingHandler.cpp +++ /dev/null @@ -1,59 +0,0 @@ -// -// PairingHandler.cpp -// hifi -// -// Created by Stephen Birarda on 5/13/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -// - -#ifndef _WIN32 -#include // not available on windows -#endif - -#include -#include - -#include - -#include -#include - -#include "PairingHandler.h" - -const char PAIRING_SERVER_HOSTNAME[] = "pairing.highfidelity.io"; -const int PAIRING_SERVER_PORT = 7247; - -PairingHandler* PairingHandler::getInstance() { - static PairingHandler* instance = NULL; - - if (!instance) { - instance = new PairingHandler(); - } - - return instance; -} - -void PairingHandler::sendPairRequest() { - - // prepare the pairing request packet - - NodeList* nodeList = NodeList::getInstance(); - - // use the getLocalAddress helper to get this client's listening address - quint32 localAddress = htonl(getHostOrderLocalAddress()); - - char pairPacket[24] = {}; - sprintf(pairPacket, "Find %d.%d.%d.%d:%hu", - localAddress & 0xFF, - (localAddress >> 8) & 0xFF, - (localAddress >> 16) & 0xFF, - (localAddress >> 24) & 0xFF, - NodeList::getInstance()->getNodeSocket().localPort()); - qDebug("Sending pair packet: %s", pairPacket); - - HifiSockAddr pairingServerSocket(PAIRING_SERVER_HOSTNAME, PAIRING_SERVER_PORT); - - // send the pair request to the pairing server - nodeList->getNodeSocket().writeDatagram((char*) pairPacket, strlen(pairPacket), - pairingServerSocket.getAddress(), pairingServerSocket.getPort()); -} diff --git a/interface/src/PairingHandler.h b/interface/src/PairingHandler.h deleted file mode 100644 index 68d9f7de5a..0000000000 --- a/interface/src/PairingHandler.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// PairingHandler.h -// hifi -// -// Created by Stephen Birarda on 5/13/13. -// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. -// - -#ifndef __hifi__PairingHandler__ -#define __hifi__PairingHandler__ - -#include - -class PairingHandler : public QObject { - Q_OBJECT -public: - static PairingHandler* getInstance(); -public slots: - void sendPairRequest(); -}; - -#endif /* defined(__hifi__PairingHandler__) */