Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pragma-once' into 4.x-current

Browse Source
This commit is contained in:
Stéphane L 2019-01-01 18:46:38 +01:00
commit a1c5bc00bc
7 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Config.h
View File

@ -1,6 +1,6 @@
/* /*
obs-websocket obs-websocket
Copyright (C) 2016-2017 Stéphane Lepin <stephane.lepin@gmail.com> Copyright (C) 2016-2019 Stéphane Lepin <stephane.lepin@gmail.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License along
with this program. If not, see <https://www.gnu.org/licenses/> with this program. If not, see <https://www.gnu.org/licenses/>
*/ */
#ifndef CONFIG_H #pragma once
#define CONFIG_H
#include <QString> #include <QString>
#include <QSharedPointer> #include <QSharedPointer>
@ -55,5 +54,3 @@ class Config {
private: private:
static ConfigPtr _instance; static ConfigPtr _instance;
}; };
#endif // CONFIG_H

7
src/Utils.h
View File

@ -1,6 +1,6 @@
/* /*
obs-websocket obs-websocket
Copyright (C) 2016-2017 Stéphane Lepin <stephane.lepin@gmail.com> Copyright (C) 2016-2019 Stéphane Lepin <stephane.lepin@gmail.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License along
with this program. If not, see <https://www.gnu.org/licenses/> with this program. If not, see <https://www.gnu.org/licenses/>
*/ */
#ifndef UTILS_H #pragma once
#define UTILS_H
#include <stdio.h> #include <stdio.h>
@ -80,5 +79,3 @@ class Utils {
static const char* GetFilenameFormatting(); static const char* GetFilenameFormatting();
static bool SetFilenameFormatting(const char* filenameFormatting); static bool SetFilenameFormatting(const char* filenameFormatting);
}; };
#endif // UTILS_H

7
src/WSEvents.h
View File

@ -1,6 +1,6 @@
/* /*
obs-websocket obs-websocket
Copyright (C) 2016-2017 Stéphane Lepin <stephane.lepin@gmail.com> Copyright (C) 2016-2019 Stéphane Lepin <stephane.lepin@gmail.com>
Copyright (C) 2017 Brendan Hagan <https://github.com/haganbmj> Copyright (C) 2017 Brendan Hagan <https://github.com/haganbmj>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -17,8 +17,7 @@ You should have received a copy of the GNU General Public License along
with this program. If not, see <https://www.gnu.org/licenses/> with this program. If not, see <https://www.gnu.org/licenses/>
*/ */
#ifndef WSEVENTS_H #pragma once
#define WSEVENTS_H
#include <obs.hpp> #include <obs.hpp>
#include <obs-frontend-api.h> #include <obs-frontend-api.h>
@ -118,5 +117,3 @@ private:
static void OnSceneItemDelete(void* param, calldata_t* data); static void OnSceneItemDelete(void* param, calldata_t* data);
static void OnSceneItemVisibilityChanged(void* param, calldata_t* data); static void OnSceneItemVisibilityChanged(void* param, calldata_t* data);
}; };
#endif // WSEVENTS_H

7
src/WSRequestHandler.h
View File

@ -1,6 +1,6 @@
/* /*
obs-websocket obs-websocket
Copyright (C) 2016-2017 Stéphane Lepin <stephane.lepin@gmail.com> Copyright (C) 2016-2019 Stéphane Lepin <stephane.lepin@gmail.com>
Copyright (C) 2017 Mikhail Swift <https://github.com/mikhailswift> Copyright (C) 2017 Mikhail Swift <https://github.com/mikhailswift>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -17,8 +17,7 @@ You should have received a copy of the GNU General Public License along
with this program. If not, see <https://www.gnu.org/licenses/> with this program. If not, see <https://www.gnu.org/licenses/>
*/ */
#ifndef WSREQUESTHANDLER_H #pragma once
#define WSREQUESTHANDLER_H
#include <QHash> #include <QHash>
#include <QSet> #include <QSet>
@ -150,5 +149,3 @@ class WSRequestHandler : public QObject {
static HandlerResponse HandleSetBrowserSourceProperties(WSRequestHandler* req); static HandlerResponse HandleSetBrowserSourceProperties(WSRequestHandler* req);
static HandlerResponse HandleGetBrowserSourceProperties(WSRequestHandler* req); static HandlerResponse HandleGetBrowserSourceProperties(WSRequestHandler* req);
}; };
#endif // WSPROTOCOL_H

7
src/WSServer.h
View File

@ -1,6 +1,6 @@
/* /*
obs-websocket obs-websocket
Copyright (C) 2016-2017 Stéphane Lepin <stephane.lepin@gmail.com> Copyright (C) 2016-2019 Stéphane Lepin <stephane.lepin@gmail.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License along
with this program. If not, see <https://www.gnu.org/licenses/> with this program. If not, see <https://www.gnu.org/licenses/>
*/ */
#ifndef WSSERVER_H #pragma once
#define WSSERVER_H
#include <QObject> #include <QObject>
#include <QMutex> #include <QMutex>
@ -73,5 +72,3 @@ private:
std::map<connection_hdl, QVariantHash, std::owner_less<connection_hdl>> _connectionProperties; std::map<connection_hdl, QVariantHash, std::owner_less<connection_hdl>> _connectionProperties;
QMutex _clMutex; QMutex _clMutex;
}; };
#endif // WSSERVER_H

7
src/forms/settings-dialog.h
View File

@ -1,6 +1,6 @@
/* /*
obs-websocket obs-websocket
Copyright (C) 2016-2017 Stéphane Lepin <stephane.lepin@gmail.com> Copyright (C) 2016-2019 Stéphane Lepin <stephane.lepin@gmail.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License along
with this program. If not, see <https://www.gnu.org/licenses/> with this program. If not, see <https://www.gnu.org/licenses/>
*/ */
#ifndef SETTINGSDIALOG_H #pragma once
#define SETTINGSDIALOG_H
#include <QDialog> #include <QDialog>
@ -40,5 +39,3 @@ private Q_SLOTS:
private: private:
Ui::SettingsDialog* ui; Ui::SettingsDialog* ui;
}; };
#endif // SETTINGSDIALOG_H

7
src/obs-websocket.h
View File

@ -1,6 +1,6 @@
/* /*
obs-websocket obs-websocket
Copyright (C) 2016-2017 Stéphane Lepin <stephane.lepin@gmail.com> Copyright (C) 2016-2019 Stéphane Lepin <stephane.lepin@gmail.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -16,8 +16,7 @@ You should have received a copy of the GNU General Public License along
with this program. If not, see <https://www.gnu.org/licenses/> with this program. If not, see <https://www.gnu.org/licenses/>
*/ */
#ifndef OBSWEBSOCKET_H #pragma once
#define OBSWEBSOCKET_H
#include <obs.hpp> #include <obs.hpp>
@ -42,5 +41,3 @@ using OBSOutputAutoRelease =
#define OBS_WEBSOCKET_VERSION "4.5.0" #define OBS_WEBSOCKET_VERSION "4.5.0"
#define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__) #define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)
#endif // OBSWEBSOCKET_H