RequestHandler.hpp   RequestHandler.hpp 
skipping to change at line 40 skipping to change at line 40
//! It also handles the optional simple HTTP authentication. See #service t o find out how the requests are processed. //! It also handles the optional simple HTTP authentication. See #service t o find out how the requests are processed.
//! @ingroup remoteControl //! @ingroup remoteControl
class RequestHandler : public HttpRequestHandler class RequestHandler : public HttpRequestHandler
{ {
Q_OBJECT Q_OBJECT
public: public:
//! Constructs the request handler. This also creates an StaticFileC ontroller for the \c webroot folder, //! Constructs the request handler. This also creates an StaticFileC ontroller for the \c webroot folder,
//! and an APIController. //! and an APIController.
//! //!
//! To see the default services that are registered here, see \ref r cApiReference. //! To see the default services that are registered here, see \ref r cApiReference.
RequestHandler(const StaticFileControllerSettings& settings, QObject * parent = 0); RequestHandler(const StaticFileControllerSettings& settings, QObject * parent = Q_NULLPTR);
//! The internal APIController, and all registered services are dele ted //! The internal APIController, and all registered services are dele ted
virtual ~RequestHandler(); virtual ~RequestHandler();
//! Called in the main thread each frame, only passed on to APIContr oller::update //! Called in the main thread each frame, only passed on to APIContr oller::update
void update(double deltaTime); void update(double deltaTime);
//! Receives the HttpRequest from the HttpListener. //! Receives the HttpRequest from the HttpListener.
//! It checks the optional HTTP authentication and sets the keep-ali ve header if requested //! It checks the optional HTTP authentication and sets the keep-ali ve header if requested
//! by the client. //! by the client.
//! //!
skipping to change at line 75 skipping to change at line 75
void setUsePassword(bool v); void setUsePassword(bool v);
//! Returns if a password is required to access the remote control //! Returns if a password is required to access the remote control
//! @warning Make sure to only call this only when the server is off line because they are not synchronized //! @warning Make sure to only call this only when the server is off line because they are not synchronized
bool getUsePassword() { return usePassword; } bool getUsePassword() { return usePassword; }
//! @warning Make sure to only call this only when the server is off line because they are not synchronized //! @warning Make sure to only call this only when the server is off line because they are not synchronized
void setPassword(const QString& pw); void setPassword(const QString& pw);
private slots: private slots:
void refreshTemplates(); void refreshTemplates();
void addExtensionServices(QObjectList services);
private: private:
//Contains the translated templates loaded from the file "translate_ files" in the webroot folder //Contains the translated templates loaded from the file "translate_ files" in the webroot folder
QMap<QByteArray,QString> templateMap; QMap<QByteArray,QString> templateMap;
bool usePassword; bool usePassword;
QString password; QString password;
QByteArray passwordReply; QByteArray passwordReply;
APIController* apiController; APIController* apiController;
StaticFileController* staticFiles; StaticFileController* staticFiles;
QMutex templateMutex; QMutex templateMutex;
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/