Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 64 insertions, 64 deletions

diff --git a/qxt-mini/qxtglobalshortcut.h b/qxt-mini/qxtglobalshortcut.h
index a81942d2..641c07c9 100644
--- a/qxt-mini/qxtglobalshortcut.h
+++ b/qxt-mini/qxtglobalshortcut.h
@@ -1,64 +1,64 @@
-#ifndef QXTGLOBALSHORTCUT_H

-/****************************************************************************

-** Copyright (c) 2006 - 2011, the LibQxt project.

-** See the Qxt AUTHORS file for a list of authors and copyright holders.

-** 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 LibQxt project 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 <COPYRIGHT HOLDER> 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.

-**

-** <http://libqxt.org>  <foundation@libqxt.org>

-*****************************************************************************/

-

-#define QXTGLOBALSHORTCUT_H

-

-#include "qxtglobal.h"

-#include <QObject>

-#include <QKeySequence>

-class QxtGlobalShortcutPrivate;

-

-class QXT_GUI_EXPORT QxtGlobalShortcut : public QObject

-{

-    Q_OBJECT

-    QXT_DECLARE_PRIVATE(QxtGlobalShortcut)

-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)

-    Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut)

-

-public:

-    explicit QxtGlobalShortcut(QObject* parent = 0);

-    explicit QxtGlobalShortcut(const QKeySequence& shortcut, QObject* parent = 0);

-    virtual ~QxtGlobalShortcut();

-

-    QKeySequence shortcut() const;

-    bool setShortcut(const QKeySequence& shortcut);

-

-    bool isEnabled() const;

-

-public Q_SLOTS:

-    void setEnabled(bool enabled = true);

-    void setDisabled(bool disabled = true);

-

-Q_SIGNALS:

-    void activated();

-};

-

-#endif // QXTGLOBALSHORTCUT_H

+#ifndef QXTGLOBALSHORTCUT_H
+/****************************************************************************
+** Copyright (c) 2006 - 2011, the LibQxt project.
+** See the Qxt AUTHORS file for a list of authors and copyright holders.
+** 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 LibQxt project 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 <COPYRIGHT HOLDER> 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.
+**
+** <http://libqxt.org>  <foundation@libqxt.org>
+*****************************************************************************/
+
+#define QXTGLOBALSHORTCUT_H
+
+#include "qxtglobal.h"
+#include <QObject>
+#include <QKeySequence>
+class QxtGlobalShortcutPrivate;
+
+class QXT_GUI_EXPORT QxtGlobalShortcut : public QObject
+{
+    Q_OBJECT
+    QXT_DECLARE_PRIVATE(QxtGlobalShortcut)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
+    Q_PROPERTY(QKeySequence shortcut READ shortcut WRITE setShortcut)
+
+public:
+    explicit QxtGlobalShortcut(QObject* parent = 0);
+    explicit QxtGlobalShortcut(const QKeySequence& shortcut, QObject* parent = 0);
+    virtual ~QxtGlobalShortcut();
+
+    QKeySequence shortcut() const;
+    bool setShortcut(const QKeySequence& shortcut);
+
+    bool isEnabled() const;
+
+public Q_SLOTS:
+    void setEnabled(bool enabled = true);
+    void setDisabled(bool disabled = true);
+
+Q_SIGNALS:
+    void activated();
+};
+
+#endif // QXTGLOBALSHORTCUT_H