From 5a0bb4c31bd7717b959aae9d2219a74bc8ba0d93 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 19 Oct 2015 16:51:31 -0700
Subject: [PATCH] Fixing line endings

---
 tests/controllers/src/main.cpp | 300 ++++++++++++++++-----------------
 1 file changed, 150 insertions(+), 150 deletions(-)

diff --git a/tests/controllers/src/main.cpp b/tests/controllers/src/main.cpp
index ccd670640c..eb080700fa 100644
--- a/tests/controllers/src/main.cpp
+++ b/tests/controllers/src/main.cpp
@@ -1,158 +1,158 @@
-//
-//  main.cpp
-//  tests/gpu-test/src
-//
-//  Copyright 2015 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <unordered_map>
-#include <memory>
-#include <cstdio>
-#include <mutex>
-#include <set>
-
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-
-#include <QtCore/QTime>
-#include <QtCore/QTimer>
-#include <QtCore/QDir>
-#include <QtCore/QElapsedTimer>
-#include <QtCore/QFile>
-#include <QtCore/QLoggingCategory>
-
-#include <QtGui/QResizeEvent>
-#include <QtGui/QWindow>
-#include <QtGui/QGuiApplication>
-#include <QtGui/QImage>
-
-#include <QtQuick/QQuickItem>
+//
+//  main.cpp
+//  tests/gpu-test/src
+//
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <unordered_map>
+#include <memory>
+#include <cstdio>
+#include <mutex>
+#include <set>
+
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>
+
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
+#include <QtCore/QDir>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QFile>
+#include <QtCore/QLoggingCategory>
+
+#include <QtGui/QResizeEvent>
+#include <QtGui/QWindow>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QImage>
+
+#include <QtQuick/QQuickItem>
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
-
-#include <plugins/Plugin.h>
-#include <plugins/PluginContainer.h>
-#include <plugins/PluginManager.h>
-#include <input-plugins/InputPlugin.h>
-#include <input-plugins/KeyboardMouseDevice.h>
-#include <controllers/ScriptingInterface.h>
-
-#include <DependencyManager.h>
-#include <controllers/UserInputMapper.h>
-
-const QString& getResourcesDir() {
-    static QString dir;
-    if (dir.isEmpty()) {
-        QDir path(__FILE__);
-        path.cdUp();
-        dir = path.cleanPath(path.absoluteFilePath("../../../interface/resources/")) + "/";
-        qDebug() << "Resources Path: " << dir;
-    }
-    return dir;
-}
-
-const QString& getQmlDir() {
-    static QString dir;
-    if (dir.isEmpty()) {
-        dir = getResourcesDir() + "qml/";
-        qDebug() << "Qml Path: " << dir;
-    }
-    return dir;
-}
-
-const QString& getTestQmlDir() {
-    static QString dir;
-    if (dir.isEmpty()) {
-        QDir path(__FILE__);
-        path.cdUp();
-        dir = path.cleanPath(path.absoluteFilePath("../")) + "/qml/";
-        qDebug() << "Qml Test Path: " << dir;
-    }
-    return dir;
-}
-
-using namespace controller;
-
-
-class PluginContainerProxy : public QObject, PluginContainer {
-    Q_OBJECT
-public:
-    PluginContainerProxy() {
-        Plugin::setContainer(this);
-    }
-    virtual ~PluginContainerProxy() {}
-    virtual void addMenu(const QString& menuName) override {}
-    virtual void removeMenu(const QString& menuName) override {}
-    virtual QAction* addMenuItem(const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") override { return nullptr;  }
-    virtual void removeMenuItem(const QString& menuName, const QString& menuItem) override {}
-    virtual bool isOptionChecked(const QString& name) override { return false;  }
-    virtual void setIsOptionChecked(const QString& path, bool checked) override {}
-    virtual void setFullscreen(const QScreen* targetScreen, bool hideMenu = true) override {}
-    virtual void unsetFullscreen(const QScreen* avoidScreen = nullptr) override {}
-    virtual void showDisplayPluginsTools() override {}
-    virtual void requestReset() override {}
-    virtual QGLWidget* getPrimarySurface() override { return nullptr; }
-    virtual bool isForeground() override { return true;  }
-    virtual const DisplayPlugin* getActiveDisplayPlugin() const override { return nullptr;  }
-};
-
-class MyControllerScriptingInterface : public controller::ScriptingInterface {
-public:
-    virtual void registerControllerTypes(QScriptEngine* engine) {};
-};
-
-
-int main(int argc, char** argv) {
-    QGuiApplication app(argc, argv);
+
+#include <plugins/Plugin.h>
+#include <plugins/PluginContainer.h>
+#include <plugins/PluginManager.h>
+#include <input-plugins/InputPlugin.h>
+#include <input-plugins/KeyboardMouseDevice.h>
+#include <controllers/ScriptingInterface.h>
+
+#include <DependencyManager.h>
+#include <controllers/UserInputMapper.h>
+
+const QString& getResourcesDir() {
+    static QString dir;
+    if (dir.isEmpty()) {
+        QDir path(__FILE__);
+        path.cdUp();
+        dir = path.cleanPath(path.absoluteFilePath("../../../interface/resources/")) + "/";
+        qDebug() << "Resources Path: " << dir;
+    }
+    return dir;
+}
+
+const QString& getQmlDir() {
+    static QString dir;
+    if (dir.isEmpty()) {
+        dir = getResourcesDir() + "qml/";
+        qDebug() << "Qml Path: " << dir;
+    }
+    return dir;
+}
+
+const QString& getTestQmlDir() {
+    static QString dir;
+    if (dir.isEmpty()) {
+        QDir path(__FILE__);
+        path.cdUp();
+        dir = path.cleanPath(path.absoluteFilePath("../")) + "/qml/";
+        qDebug() << "Qml Test Path: " << dir;
+    }
+    return dir;
+}
+
+using namespace controller;
+
+
+class PluginContainerProxy : public QObject, PluginContainer {
+    Q_OBJECT
+public:
+    PluginContainerProxy() {
+        Plugin::setContainer(this);
+    }
+    virtual ~PluginContainerProxy() {}
+    virtual void addMenu(const QString& menuName) override {}
+    virtual void removeMenu(const QString& menuName) override {}
+    virtual QAction* addMenuItem(const QString& path, const QString& name, std::function<void(bool)> onClicked, bool checkable = false, bool checked = false, const QString& groupName = "") override { return nullptr;  }
+    virtual void removeMenuItem(const QString& menuName, const QString& menuItem) override {}
+    virtual bool isOptionChecked(const QString& name) override { return false;  }
+    virtual void setIsOptionChecked(const QString& path, bool checked) override {}
+    virtual void setFullscreen(const QScreen* targetScreen, bool hideMenu = true) override {}
+    virtual void unsetFullscreen(const QScreen* avoidScreen = nullptr) override {}
+    virtual void showDisplayPluginsTools() override {}
+    virtual void requestReset() override {}
+    virtual QGLWidget* getPrimarySurface() override { return nullptr; }
+    virtual bool isForeground() override { return true;  }
+    virtual const DisplayPlugin* getActiveDisplayPlugin() const override { return nullptr;  }
+};
+
+class MyControllerScriptingInterface : public controller::ScriptingInterface {
+public:
+    virtual void registerControllerTypes(QScriptEngine* engine) {};
+};
+
+
+int main(int argc, char** argv) {
+    QGuiApplication app(argc, argv);
     QQmlApplicationEngine engine;
     auto rootContext = engine.rootContext();
     new PluginContainerProxy();
-
-    // Simulate our application idle loop
-    QTimer timer;
-    QObject::connect(&timer, &QTimer::timeout, [] {
-        static float last = secTimestampNow();
-        float now = secTimestampNow();
-        float delta = now - last;
-        last = now;
-
-        foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
-            inputPlugin->pluginUpdate(delta, false);
-        }
-
-        auto userInputMapper = DependencyManager::get<UserInputMapper>();
-        userInputMapper->update(delta);
-    });
-    timer.start(50);
 
-    {
-        DependencyManager::set<UserInputMapper>();
-        foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
-            QString name = inputPlugin->getName();
-            inputPlugin->activate();
-            auto userInputMapper = DependencyManager::get<UserInputMapper>();
-            if (name == KeyboardMouseDevice::NAME) {
-                auto keyboardMouseDevice = static_cast<KeyboardMouseDevice*>(inputPlugin.data()); // TODO: this seems super hacky
-                keyboardMouseDevice->registerToUserInputMapper(*userInputMapper);
-            }
-            inputPlugin->pluginUpdate(0, false);
-        }
+    // Simulate our application idle loop
+    QTimer timer;
+    QObject::connect(&timer, &QTimer::timeout, [] {
+        static float last = secTimestampNow();
+        float now = secTimestampNow();
+        float delta = now - last;
+        last = now;
+
+        foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
+            inputPlugin->pluginUpdate(delta, false);
+        }
+
+        auto userInputMapper = DependencyManager::get<UserInputMapper>();
+        userInputMapper->update(delta);
+    });
+    timer.start(50);
+
+    {
+        DependencyManager::set<UserInputMapper>();
+        foreach(auto inputPlugin, PluginManager::getInstance()->getInputPlugins()) {
+            QString name = inputPlugin->getName();
+            inputPlugin->activate();
+            auto userInputMapper = DependencyManager::get<UserInputMapper>();
+            if (name == KeyboardMouseDevice::NAME) {
+                auto keyboardMouseDevice = static_cast<KeyboardMouseDevice*>(inputPlugin.data()); // TODO: this seems super hacky
+                keyboardMouseDevice->registerToUserInputMapper(*userInputMapper);
+            }
+            inputPlugin->pluginUpdate(0, false);
+        }
         rootContext->setContextProperty("Controllers", new MyControllerScriptingInterface());
-    }
-    qDebug() << getQmlDir();
+    }
+    qDebug() << getQmlDir();
     rootContext->setContextProperty("ResourcePath", getQmlDir());
-    engine.setBaseUrl(QUrl::fromLocalFile(getQmlDir()));
-    engine.addImportPath(getQmlDir());
-    engine.load(getTestQmlDir() + "main.qml");
-    for (auto pathItem : engine.importPathList()) {
-        qDebug() << pathItem;
-    }
-    app.exec();
-    return 0;
-}
-
-#include "main.moc"
-
+    engine.setBaseUrl(QUrl::fromLocalFile(getQmlDir()));
+    engine.addImportPath(getQmlDir());
+    engine.load(getTestQmlDir() + "main.qml");
+    for (auto pathItem : engine.importPathList()) {
+        qDebug() << pathItem;
+    }
+    app.exec();
+    return 0;
+}
+
+#include "main.moc"
+