whitespace edits.
authorCampbell Barton <ideasman42@gmail.com>
Wed, 3 Aug 2011 06:27:44 +0000 (06:27 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 3 Aug 2011 06:27:44 +0000 (06:27 +0000)
intern/ghost/intern/GHOST_NDOFManager.cpp
intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
intern/ghost/intern/GHOST_NDOFManagerX11.cpp
intern/ghost/intern/GHOST_NDOFManagerX11.h

index 5a0f14c85a367e868dfcb1e3a13b454d09cf0558..e608301bbcd1d4ae1517236d8e4eb6494daa1596 100644 (file)
@@ -79,17 +79,15 @@ static const char* ndof_button_names[] = {
        "NDOF_BUTTON_8",
        "NDOF_BUTTON_9",
        "NDOF_BUTTON_10",
-       };
+};
 #endif
 
-static const NDOF_ButtonT SpaceNavigator_HID_map[] =
-       {
+static const NDOF_ButtonT SpaceNavigator_HID_map[] = {
        NDOF_BUTTON_MENU,
        NDOF_BUTTON_FIT
-       };
+};
 
-static const NDOF_ButtonT SpaceExplorer_HID_map[] =
-       {
+static const NDOF_ButtonT SpaceExplorer_HID_map[] = {
        NDOF_BUTTON_1,
        NDOF_BUTTON_2,
        NDOF_BUTTON_TOP,
@@ -105,10 +103,9 @@ static const NDOF_ButtonT SpaceExplorer_HID_map[] =
        NDOF_BUTTON_PLUS,
        NDOF_BUTTON_MINUS,
        NDOF_BUTTON_ROTATE
-       };
+};
 
-static const NDOF_ButtonT SpacePilotPro_HID_map[] =
-       {
+static const NDOF_ButtonT SpacePilotPro_HID_map[] = {
        NDOF_BUTTON_MENU,
        NDOF_BUTTON_FIT,
        NDOF_BUTTON_TOP,
@@ -140,12 +137,11 @@ static const NDOF_ButtonT SpacePilotPro_HID_map[] =
        NDOF_BUTTON_DOMINANT,
        NDOF_BUTTON_PLUS,
        NDOF_BUTTON_MINUS
-       };
+};
 
-static const NDOF_ButtonT SpacePilot_HID_map[] =
-// this is the older SpacePilot (sans Pro)
-// thanks to polosson for the info in this table
-       {
+/* this is the older SpacePilot (sans Pro)
+ * thanks to polosson for the info in this table */
+static const NDOF_ButtonT SpacePilot_HID_map[] = {
        NDOF_BUTTON_1,
        NDOF_BUTTON_2,
        NDOF_BUTTON_3,
@@ -167,7 +163,7 @@ static const NDOF_ButtonT SpacePilot_HID_map[] =
        NDOF_BUTTON_DOMINANT,
        NDOF_BUTTON_ROTATE,
        NDOF_BUTTON_NONE // the CONFIG button -- what does it do?
-       };
+};
 
 GHOST_NDOFManager::GHOST_NDOFManager(GHOST_System& sys)
        : m_system(sys)
@@ -180,29 +176,27 @@ GHOST_NDOFManager::GHOST_NDOFManager(GHOST_System& sys)
        , m_motionState(GHOST_kNotStarted)
        , m_motionEventPending(false)
        , m_deadZone(0.f)
-       {
+{
        // to avoid the rare situation where one triple is updated and
        // the other is not, initialize them both here:
        memset(m_translation, 0, sizeof(m_translation));
        memset(m_rotation, 0, sizeof(m_rotation));
 
-       #ifdef WITH_INPUT_NDOF
+#ifdef WITH_INPUT_NDOF
        GHOST_PRINT("WITH_INPUT_NDOF is defined!");
-       #else
+#else
        GHOST_PRINT("WITH_INPUT_NDOF is not defined.");
-       #endif
-       }
+#endif
+}
 
 bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short product_id)
-       {
+{
        // default to NDOF_UnknownDevice so rogue button events will get discarded
        // "mystery device" owners can help build a HID_map for their hardware
 
-       switch (vendor_id)
-               {
+       switch (vendor_id) {
                case 0x046D: // Logitech (3Dconnexion)
-                       switch (product_id)
-                               {
+                       switch (product_id) {
                                // -- current devices --
                                case 0xC626:
                                        puts("ndof: using SpaceNavigator");
@@ -225,7 +219,7 @@ bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short produ
                                        m_buttonCount = 31;
                                        break;
 
-                               // -- older devices --
+                                       // -- older devices --
                                case 0xC625:
                                        puts("ndof: using SpacePilot");
                                        m_deviceType = NDOF_SpacePilot;
@@ -239,182 +233,183 @@ bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short produ
 
                                default:
                                        printf("ndof: unknown Logitech product %04hx\n", product_id);
-                               }
+                       }
                        break;
                default:
                        printf("ndof: unknown device %04hx:%04hx\n", vendor_id, product_id);
-               }
+       }
 
-       if (m_deviceType == NDOF_UnknownDevice)
+       if (m_deviceType == NDOF_UnknownDevice) {
                return false;
-       else
-               {
+       }
+       else {
                m_buttonMask = ~(-1 << m_buttonCount);
 
-               #ifdef DEBUG_NDOF_BUTTONS
+#ifdef DEBUG_NDOF_BUTTONS
                printf("ndof: %d buttons -> hex:%X\n", m_buttonCount, m_buttonMask);
-               #endif
+#endif
 
                return true;
-               }
        }
+}
 
 void GHOST_NDOFManager::updateTranslation(short t[3], GHOST_TUns64 time)
-       {
+{
        memcpy(m_translation, t, sizeof(m_translation));
        m_motionTime = time;
        m_motionEventPending = true;
-       }
+}
 
 void GHOST_NDOFManager::updateRotation(short r[3], GHOST_TUns64 time)
-       {
+{
        memcpy(m_rotation, r, sizeof(m_rotation));
        m_motionTime = time;
        m_motionEventPending = true;
-       }
+}
 
 void GHOST_NDOFManager::sendButtonEvent(NDOF_ButtonT button, bool press, GHOST_TUns64 time, GHOST_IWindow* window)
-       {
+{
        GHOST_EventNDOFButton* event = new GHOST_EventNDOFButton(time, window);
        GHOST_TEventNDOFButtonData* data = (GHOST_TEventNDOFButtonData*) event->getData();
 
        data->action = press ? GHOST_kPress : GHOST_kRelease;
        data->button = button;
 
-       #ifdef DEBUG_NDOF_BUTTONS
+#ifdef DEBUG_NDOF_BUTTONS
        printf("%s %s\n", ndof_button_names[button], press ? "pressed" : "released");
-       #endif
+#endif
 
        m_system.pushEvent(event);
-       }
+}
 
 void GHOST_NDOFManager::sendKeyEvent(GHOST_TKey key, bool press, GHOST_TUns64 time, GHOST_IWindow* window)
-       {
+{
        GHOST_TEventType type = press ? GHOST_kEventKeyDown : GHOST_kEventKeyUp;
        GHOST_EventKey* event = new GHOST_EventKey(time, type, window, key);
 
-       #ifdef DEBUG_NDOF_BUTTONS
+#ifdef DEBUG_NDOF_BUTTONS
        printf("keyboard %s\n", press ? "down" : "up");
-       #endif
+#endif
 
        m_system.pushEvent(event);
-       }
+}
 
 void GHOST_NDOFManager::updateButton(int button_number, bool press, GHOST_TUns64 time)
-       {
+{
        GHOST_IWindow* window = m_system.getWindowManager()->getActiveWindow();
 
-       #ifdef DEBUG_NDOF_BUTTONS
+#ifdef DEBUG_NDOF_BUTTONS
        if (m_deviceType != NDOF_UnknownDevice)
                printf("ndof: button %d -> ", button_number);
-       #endif
+#endif
 
-       switch (m_deviceType)
-               {
+       switch (m_deviceType) {
                case NDOF_SpaceNavigator:
                        sendButtonEvent(SpaceNavigator_HID_map[button_number], press, time, window);
                        break;
                case NDOF_SpaceExplorer:
-                       switch (button_number)
-                               {
+                       switch (button_number) {
                                case 6: sendKeyEvent(GHOST_kKeyEsc, press, time, window); break;
                                case 7: sendKeyEvent(GHOST_kKeyLeftAlt, press, time, window); break;
                                case 8: sendKeyEvent(GHOST_kKeyLeftShift, press, time, window); break;
                                case 9: sendKeyEvent(GHOST_kKeyLeftControl, press, time, window); break;
                                default: sendButtonEvent(SpaceExplorer_HID_map[button_number], press, time, window);
-                               }
+                       }
                        break;
                case NDOF_SpacePilotPro:
-                       switch (button_number)
-                               {
+                       switch (button_number) {
                                case 22: sendKeyEvent(GHOST_kKeyEsc, press, time, window); break;
                                case 23: sendKeyEvent(GHOST_kKeyLeftAlt, press, time, window); break;
                                case 24: sendKeyEvent(GHOST_kKeyLeftShift, press, time, window); break;
                                case 25: sendKeyEvent(GHOST_kKeyLeftControl, press, time, window); break;
                                default: sendButtonEvent(SpacePilotPro_HID_map[button_number], press, time, window);
-                               }
+                       }
                        break;
                case NDOF_SpacePilot:
-                       switch (button_number)
-                               {
+                       switch (button_number) {
                                case 10: sendKeyEvent(GHOST_kKeyEsc, press, time, window); break;
                                case 11: sendKeyEvent(GHOST_kKeyLeftAlt, press, time, window); break;
                                case 12: sendKeyEvent(GHOST_kKeyLeftShift, press, time, window); break;
                                case 13: sendKeyEvent(GHOST_kKeyLeftControl, press, time, window); break;
                                case 20: puts("ndof: ignoring CONFIG button"); break;
                                default: sendButtonEvent(SpacePilot_HID_map[button_number], press, time, window);
-                               }
+                       }
                        break;
                case NDOF_UnknownDevice:
                        printf("ndof: button %d on unknown device (ignoring)\n", button_number);
-               }
+       }
 
        int mask = 1 << button_number;
-       if (press)
+       if (press) {
                m_buttons |= mask; // set this button's bit
-       else
+       }
+       else {
                m_buttons &= ~mask; // clear this button's bit
        }
+}
 
 void GHOST_NDOFManager::updateButtons(int button_bits, GHOST_TUns64 time)
-       {
+{
        button_bits &= m_buttonMask; // discard any "garbage" bits
 
        int diff = m_buttons ^ button_bits;
 
-       for (int button_number = 0; button_number < m_buttonCount; ++button_number)
-               {
+       for (int button_number = 0; button_number < m_buttonCount; ++button_number) {
                int mask = 1 << button_number;
 
-               if (diff & mask)
-                       {
+               if (diff & mask) {
                        bool press = button_bits & mask;
                        updateButton(button_number, press, time);
-                       }
                }
        }
+}
 
 void GHOST_NDOFManager::setDeadZone(float dz)
-       {
-       if (dz < 0.f)
+{
+       if (dz < 0.f) {
                // negative values don't make sense, so clamp at zero
                dz = 0.f;
-       else if (dz > 0.5f)
+       }
+       else if (dz > 0.5f) {
                // warn the rogue user/programmer, but allow it
                printf("ndof: dead zone of %.2f is rather high...\n", dz);
-
+       }
        m_deadZone = dz;
 
        printf("ndof: dead zone set to %.2f\n", dz);
-       }
+}
 
 static bool atHomePosition(GHOST_TEventNDOFMotionData* ndof)
-       {
-       #define HOME(foo) (ndof->foo == 0)
+{
+#define HOME(foo) (ndof->foo == 0)
        return HOME(tx) && HOME(ty) && HOME(tz) && HOME(rx) && HOME(ry) && HOME(rz);
-       }
+#undef HOME
+}
 
 static bool nearHomePosition(GHOST_TEventNDOFMotionData* ndof, float threshold)
-       {
-       if (threshold == 0.f)
+{
+       if (threshold == 0.f) {
                return atHomePosition(ndof);
-       else
-               {
-               #define HOME1(foo) (fabsf(ndof->foo) < threshold)
+       }
+       else {
+#define HOME1(foo) (fabsf(ndof->foo) < threshold)
                return HOME1(tx) && HOME1(ty) && HOME1(tz) && HOME1(rx) && HOME1(ry) && HOME1(rz);
-               }
+#undef HOME1
        }
+}
 
 bool GHOST_NDOFManager::sendMotionEvent()
-       {
+{
        if (!m_motionEventPending)
                return false;
 
        m_motionEventPending = false; // any pending motion is handled right now
 
        GHOST_IWindow* window = m_system.getWindowManager()->getActiveWindow();
-       if (window == NULL)
+
+       if (window == NULL) {
                return false; // delivery will fail, so don't bother sending
+       }
 
        GHOST_EventNDOFMotion* event = new GHOST_EventNDOFMotion(m_motionTime, window);
        GHOST_TEventNDOFMotionData* data = (GHOST_TEventNDOFMotionData*) event->getData();
@@ -438,51 +433,46 @@ bool GHOST_NDOFManager::sendMotionEvent()
 
        // determine what kind of motion event to send (Starting, InProgress, Finishing)
        // and where that leaves this NDOF manager (NotStarted, InProgress, Finished)
-       switch (m_motionState)
-               {
+       switch (m_motionState) {
                case GHOST_kNotStarted:
                case GHOST_kFinished:
-                       if (handMotion)
-                               {
+                       if (handMotion) {
                                data->progress = GHOST_kStarting;
                                m_motionState = GHOST_kInProgress;
                                // prev motion time will be ancient, so just make up something reasonable
                                data->dt = 0.0125f;
-                               }
-                       else
-                               {
+                       }
+                       else {
                                // send no event and keep current state
                                delete event;
                                return false;
-                               }
+                       }
                        break;
                case GHOST_kInProgress:
-                       if (handMotion)
-                               {
+                       if (handMotion) {
                                data->progress = GHOST_kInProgress;
                                // keep InProgress state
-                               }
-                       else
-                               {
+                       }
+                       else {
                                data->progress = GHOST_kFinishing;
                                m_motionState = GHOST_kFinished;
-                               }
+                       }
                        break;
-               }
+       }
 
-       #ifdef DEBUG_NDOF_MOTION
+#ifdef DEBUG_NDOF_MOTION
        printf("ndof motion sent -- %s\n", progress_string[data->progress]);
 
        // show details about this motion event
        printf("    T=(%.2f,%.2f,%.2f) R=(%.2f,%.2f,%.2f) dt=%.3f\n",
-               data->tx, data->ty, data->tz,
-               data->rx, data->ry, data->rz,
-               data->dt);
-       #endif
+              data->tx, data->ty, data->tz,
+              data->rx, data->ry, data->rz,
+              data->dt);
+#endif
 
        m_system.pushEvent(event);
 
        m_prevMotionTime = m_motionTime;
 
        return true;
-       }
+}
index 07811c563ec83524a1464cc766e2b990d48b35a4..53a991a7396f78ede325f01cbf93bfbdbf59d9ec 100644 (file)
@@ -40,7 +40,7 @@ static GHOST_NDOFManager* ndof_manager = NULL;
 static bool has_old_driver = true;
 
 static void NDOF_DeviceAdded(io_connect_t connection)
-       {
+{
        printf("ndof: device added\n"); // change these: printf --> informational reports
 
 #if 0 // device preferences will be useful some day
@@ -55,27 +55,27 @@ static void NDOF_DeviceAdded(io_connect_t connection)
        unsigned short productID = result & 0xffff;
 
        ndof_manager->setDevice(vendorID, productID);
-       }
+}
 
 static void NDOF_DeviceRemoved(io_connect_t connection)
-       {
+{
        printf("ndof: device removed\n");
-       }
+}
 
 static void NDOF_DeviceEvent(io_connect_t connection, natural_t messageType, void* messageArgument)
-       {
+{
        switch (messageType)
-               {
+       {
                case kConnexionMsgDeviceState:
-                       {
+               {
                        ConnexionDeviceState* s = (ConnexionDeviceState*)messageArgument;
 
                        GHOST_TUns64 now = ghost_system->getMilliSeconds();
 
                        switch (s->command)
-                               {
+                       {
                                case kConnexionCmdHandleAxis:
-                                       {
+                               {
                                        // convert to blender view coordinates
                                        short t[3] = {s->axis[0], -(s->axis[2]), s->axis[1]};
                                        short r[3] = {-(s->axis[3]), s->axis[5], -(s->axis[4])};
@@ -85,23 +85,23 @@ static void NDOF_DeviceEvent(io_connect_t connection, natural_t messageType, voi
 
                                        ghost_system->notifyExternalEventProcessed();
                                        break;
-                                       }
+                               }
                                case kConnexionCmdHandleButtons:
-                                       {
+                               {
                                        int button_bits = has_old_driver ? s->buttons8 : s->buttons;
                                        ndof_manager->updateButtons(button_bits, now);
                                        ghost_system->notifyExternalEventProcessed();
                                        break;
-                                       }
+                               }
                                case kConnexionCmdAppSpecific:
                                        printf("ndof: app-specific command, param = %hd, value = %d\n", s->param, s->value);
                                        break;
 
                                default:
                                        printf("ndof: mystery device command %d\n", s->command);
-                               }
-                       break;
                        }
+                       break;
+               }
                case kConnexionMsgPrefsChanged:
                        // printf("ndof: prefs changed\n"); // this includes app switches
                        // TODO: look through updated prefs for things blender cares about
@@ -117,58 +117,56 @@ static void NDOF_DeviceEvent(io_connect_t connection, natural_t messageType, voi
                        break;
                default:
                        printf("ndof: mystery event %d\n", messageType);
-               }
        }
+}
 
 GHOST_NDOFManagerCocoa::GHOST_NDOFManagerCocoa(GHOST_System& sys)
-       : GHOST_NDOFManager(sys)
-       {
+    : GHOST_NDOFManager(sys)
+{
        if (available())
-               {
+       {
                // give static functions something to talk to:
                ghost_system = dynamic_cast<GHOST_SystemCocoa*>(&sys);
                ndof_manager = this;
 
                OSErr error = InstallConnexionHandlers(NDOF_DeviceEvent, NDOF_DeviceAdded, NDOF_DeviceRemoved);
-               if (error)
-                       {
+               if (error) {
                        printf("ndof: error %d while installing handlers\n", error);
                        return;
-                       }
+               }
 
                // Pascal string *and* a four-letter constant. How old-skool.
                m_clientID = RegisterConnexionClient('blnd', (UInt8*) "\007blender",
-                       kConnexionClientModeTakeOver, kConnexionMaskAll);
+                                                    kConnexionClientModeTakeOver, kConnexionMaskAll);
 
                // printf("ndof: client id = %d\n", m_clientID);
 
-               if (SetConnexionClientButtonMask != NULL)
-                       {
+               if (SetConnexionClientButtonMask != NULL) {
                        has_old_driver = false;
                        SetConnexionClientButtonMask(m_clientID, kConnexionMaskAllButtons);
-                       }
-               else
+               }
+               else {
                        printf("ndof: old 3Dx driver installed, some buttons may not work\n");
                }
-       else
-               {
+       }
+       else {
                printf("ndof: 3Dx driver not found\n");
                // This isn't a hard error, just means the user doesn't have a 3D mouse.
-               }
        }
+}
 
 GHOST_NDOFManagerCocoa::~GHOST_NDOFManagerCocoa()
-       {
+{
        UnregisterConnexionClient(m_clientID);
        CleanupConnexionHandlers();
        ghost_system = NULL;
        ndof_manager = NULL;
-       }
+}
 
 bool GHOST_NDOFManagerCocoa::available()
-       {
+{
        // extern OSErr InstallConnexionHandlers() __attribute__((weak_import));
        // ^^ not needed since the entire framework is weak-linked
        return InstallConnexionHandlers != NULL;
        // this means that the driver is installed and dynamically linked to blender
-       }
+}
index bd86c03d8e9e954f1b6a41981f64e318a5e68271..57d84ec14d47395bf38eae47a4082dc36453861f 100644 (file)
 
 
 GHOST_NDOFManagerWin32::GHOST_NDOFManagerWin32(GHOST_System& sys)
-       : GHOST_NDOFManager(sys)
-       {
+    : GHOST_NDOFManager(sys)
+{
        setDeadZone(0.1f);
-    }
+}
 
 // whether multi-axis functionality is available (via the OS or driver)
 // does not imply that a device is plugged in or being used
 bool GHOST_NDOFManagerWin32::available()
-       {
+{
        // always available since RawInput is built into Windows
        return true;
-       }
+}
index 8043af2760e7d972ee493793a96dfeb69514c19e..099fa15d179ee0335879bbfb278de277f19014c3 100644 (file)
 
 
 GHOST_NDOFManagerX11::GHOST_NDOFManagerX11(GHOST_System& sys)
-       : GHOST_NDOFManager(sys)
-       , m_available(false)
-       {
+    :
+      GHOST_NDOFManager(sys),
+      m_available(false)
+{
        setDeadZone(0.1f); // how to calibrate on Linux? throw away slight motion!
 
-       if (spnav_open() != -1)
-               {
+       if (spnav_open() != -1) {
                // determine exactly which device (if any) is plugged in
 
-               #define MAX_LINE_LENGTH 100
+#define MAX_LINE_LENGTH 100
 
                // look for USB devices with Logitech's vendor ID
                FILE* command_output = popen("lsusb -d 046d:","r");
-               if (command_output)
-                       {
+               if (command_output) {
                        char line[MAX_LINE_LENGTH] = {0};
-                       while (fgets(line, MAX_LINE_LENGTH, command_output))
-                               {
+                       while (fgets(line, MAX_LINE_LENGTH, command_output)) {
                                unsigned short vendor_id = 0, product_id = 0;
                                if (sscanf(line, "Bus %*d Device %*d: ID %hx:%hx", &vendor_id, &product_id) == 2)
-                                       if (setDevice(vendor_id, product_id))
-                                               {
+                                       if (setDevice(vendor_id, product_id)) {
                                                m_available = true;
                                                break; // stop looking once the first 3D mouse is found
-                                               }
-                               }
-                       pclose(command_output);
+                                       }
                        }
+                       pclose(command_output);
                }
-       else
-               {
+       }
+       else {
                printf("ndof: spacenavd not found\n");
                // This isn't a hard error, just means the user doesn't have a 3D mouse.
-               }
        }
+}
 
 GHOST_NDOFManagerX11::~GHOST_NDOFManagerX11()
-       {
+{
        if (m_available)
                spnav_close();
-       }
+}
 
 bool GHOST_NDOFManagerX11::available()
-       {
+{
        return m_available;
-       }
+}
 
 //bool GHOST_NDOFManagerX11::identifyDevice()
-//     {
+//{
 //     
-//     }
+//}
 
 bool GHOST_NDOFManagerX11::processEvents()
-       {
+{
        GHOST_TUns64 now = m_system.getMilliSeconds();
 
        bool anyProcessed = false;
        spnav_event e;
-       while (spnav_poll_event(&e))
-               {
-               switch (e.type)
-                       {
+       while (spnav_poll_event(&e)) {
+               switch (e.type) {
                        case SPNAV_EVENT_MOTION:
-                               {
+                       {
                                // convert to blender view coords
                                short t[3] = {e.motion.x, e.motion.y, -e.motion.z};
                                short r[3] = {-e.motion.rx, -e.motion.ry, e.motion.rz};
@@ -101,12 +95,12 @@ bool GHOST_NDOFManagerX11::processEvents()
                                updateTranslation(t, now);
                                updateRotation(r, now);
                                break;
-                               }
+                       }
                        case SPNAV_EVENT_BUTTON:
                                updateButton(e.button.bnum, e.button.press, now);
                                break;
-                       }
-               anyProcessed = true;
                }
-       return anyProcessed;
+               anyProcessed = true;
        }
+       return anyProcessed;
+}
index 175041b21e9817eb4d859a922fae7ffcb68c1ae0..82bd256c70736c6e869c50bf91217493f951672c 100644 (file)
 
 #include "GHOST_NDOFManager.h"
 
-// Event capture is handled within the NDOF manager on Linux,
-// so there's no need for SystemX11 to look for them.
+/* Event capture is handled within the NDOF manager on Linux,
+ * so there's no need for SystemX11 to look for them. */
 
 class GHOST_NDOFManagerX11 : public GHOST_NDOFManager
-       {
+{
 public:
        GHOST_NDOFManagerX11(GHOST_System&);
        ~GHOST_NDOFManagerX11();
@@ -40,10 +40,10 @@ public:
        bool processEvents();
 
 private:
-//     bool identifyDevice();
+       //      bool identifyDevice();
 
        bool m_available;
-       };
+};
 
 #endif