diff options
author | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-07-16 01:07:50 +0400 |
---|---|---|
committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-07-16 01:07:50 +0400 |
commit | 86c2c3419cea8f958e0fbdbaff7f3f90e58e4e09 (patch) | |
tree | cb73df9d588883571e64c1bf9918bd8aaeeba1bc /src/murmur/BonjourServer.h | |
parent | 9f2b29d6528b5eb71e95bac83704b4dbce101246 (diff) |
Indent, changelog and submodule update
Diffstat (limited to 'src/murmur/BonjourServer.h')
-rw-r--r-- | src/murmur/BonjourServer.h | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/src/murmur/BonjourServer.h b/src/murmur/BonjourServer.h index 5fbbb1360..73bfbc1fa 100644 --- a/src/murmur/BonjourServer.h +++ b/src/murmur/BonjourServer.h @@ -1,48 +1,48 @@ -/* Copyright (C) 2009, Stefan Hacker
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- - Neither the name of the Mumble Developers nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef _BONJOURSERVER_H
-#define _BONJOURSERVER_H
-
-#include "bonjourserviceregister.h"
-
-class BonjourServer : public QObject {
- private:
- Q_OBJECT
- Q_DISABLE_COPY(BonjourServer)
- public:
- BonjourServer();
- ~BonjourServer();
-
- BonjourServiceRegister *bsrRegister;
-};
-
-#else
-class BonjourServer;
-#endif
+/* Copyright (C) 2009, Stefan Hacker + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + - Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + - Neither the name of the Mumble Developers nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +#ifndef _BONJOURSERVER_H +#define _BONJOURSERVER_H + +#include "bonjourserviceregister.h" + +class BonjourServer : public QObject { + private: + Q_OBJECT + Q_DISABLE_COPY(BonjourServer) + public: + BonjourServer(); + ~BonjourServer(); + + BonjourServiceRegister *bsrRegister; +}; + +#else +class BonjourServer; +#endif |