diff options
author | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-03-04 18:32:43 +0300 |
---|---|---|
committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-03-04 18:32:43 +0300 |
commit | ac0b3cf4d4214eaae34bf4f981f4e0ded06e86fd (patch) | |
tree | d7d9fb45f0bdca6fb278253af030a510059a4ce9 /src/murmur/Tray.h | |
parent | a2765a6cb6f142a82f38db80fd0a494e818a5596 (diff) |
Indenting
Diffstat (limited to 'src/murmur/Tray.h')
-rw-r--r-- | src/murmur/Tray.h | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/src/murmur/Tray.h b/src/murmur/Tray.h index aa6cd447c..a82743a65 100644 --- a/src/murmur/Tray.h +++ b/src/murmur/Tray.h @@ -1,57 +1,57 @@ -/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
-
- 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 _TRAY_H
-#define _TRAY_H
-
-#include "murmur_pch.h"
-#include "Server.h"
-
-class Tray : public QObject {
- private:
- Q_OBJECT
- Q_DISABLE_COPY(Tray);
- protected:
- QSystemTrayIcon *qsti;
- QMenu *qm;
- QAction *qaQuit;
- QAction *qaShowLog;
- QStringList qlLog;
- LogEmitter *le;
- public slots:
- void on_Tray_activated(QSystemTrayIcon::ActivationReason);
- void on_Quit_triggered();
- void on_ShowLog_triggered();
- void addLogMessage(const QString &);
- public:
- Tray(QObject *parent, LogEmitter *le);
-};
-
-#endif
+/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com> + + 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 _TRAY_H +#define _TRAY_H + +#include "murmur_pch.h" +#include "Server.h" + +class Tray : public QObject { + private: + Q_OBJECT + Q_DISABLE_COPY(Tray); + protected: + QSystemTrayIcon *qsti; + QMenu *qm; + QAction *qaQuit; + QAction *qaShowLog; + QStringList qlLog; + LogEmitter *le; + public slots: + void on_Tray_activated(QSystemTrayIcon::ActivationReason); + void on_Quit_triggered(); + void on_ShowLog_triggered(); + void addLogMessage(const QString &); + public: + Tray(QObject *parent, LogEmitter *le); +}; + +#endif |