History

handle location set/get in AddressManager, handle set to address map

Stephen Birarda committed 12 years ago

Commit 27f7cdb1 parent b90db284 files · +39 −62Browse files

Showing the changes to interface/src/scripting/LocationScriptingInterface.h (1 of 4 files). Show all

Unified · Split

interface/src/scripting/LocationScriptingInterface.h+3−27
@@ -12,41 +12,17 @@ · 11 unmodified lines
12#ifndef hifi_LocationScriptingInterface_h12#ifndef hifi_LocationScriptingInterface_h
13#define hifi_LocationScriptingInterface_h13#define hifi_LocationScriptingInterface_h
14 14
15#include <QObject>15#include <qscriptengine.h>
16#include <QScriptContext>
17#include <QScriptEngine>
18#include <QScriptValue>
19#include <QString>
20
21#include <AddressManager.h>
22
23#include "Application.h"
24 16
25class LocationScriptingInterface : public QObject {17class LocationScriptingInterface : public QObject {
26 Q_OBJECT18 Q_OBJECT
27 Q_PROPERTY(bool isConnected READ isConnected)
28 Q_PROPERTY(QString href READ getHref)
29 Q_PROPERTY(QString protocol READ getProtocol)
30 Q_PROPERTY(QString hostname READ getHostname)
31 Q_PROPERTY(QString pathname READ getPathname)
32 Q_PROPERTY(QString domainID READ getDomainID)
33 LocationScriptingInterface() { };
34public:19public:
35 static LocationScriptingInterface* getInstance();20 static LocationScriptingInterface* getInstance();
36 21
37 bool isConnected();
38 QString getHref();
39 QString getProtocol() { return HIFI_URL_SCHEME; };
40 QString getPathname();
41 QString getHostname();
42 QString getDomainID() const;
43
44 static QScriptValue locationGetter(QScriptContext* context, QScriptEngine* engine);22 static QScriptValue locationGetter(QScriptContext* context, QScriptEngine* engine);
45 static QScriptValue locationSetter(QScriptContext* context, QScriptEngine* engine);23 static QScriptValue locationSetter(QScriptContext* context, QScriptEngine* engine);
46 24private:
47public slots:25 LocationScriptingInterface() {};
48 void assign(const QString& url);
49
50};26};
51 27
52#endif // hifi_LocationScriptingInterface_h28#endif // hifi_LocationScriptingInterface_h