many modules: trivial cleanups only

- Remove "this->" where it's not needed. Possibly rename shadowed vars.
- Don't reload the options bundle manually since `options::opts' exists
for that very reason.
- Remove '^ \+$' whitespace
- :retab

2 files changed, 5 insertions, 5 deletions

diff --git a/proto-ft/ftnoir_protocol_ft.cpp b/proto-ft/ftnoir_protocol_ft.cpp
index 9dba2bff..e5648250 100644
--- a/proto-ft/ftnoir_protocol_ft.cpp
+++ b/proto-ft/ftnoir_protocol_ft.cpp
@@ -82,7 +82,7 @@ void FTNoIR_Protocol::pose(const double* headpose) {
         }
         ft->GameID2 = id;
         intGameID = id;
-        QMutexLocker foo(&this->game_name_mutex);
+        QMutexLocker foo(&game_name_mutex);
         connected_game = gamename;
     }
     
diff --git a/proto-ft/ftnoir_protocol_ft_dialog.cpp b/proto-ft/ftnoir_protocol_ft_dialog.cpp
index da00a03a..36846273 100644
--- a/proto-ft/ftnoir_protocol_ft_dialog.cpp
+++ b/proto-ft/ftnoir_protocol_ft_dialog.cpp
@@ -41,12 +41,12 @@ FTControls::FTControls()
 
 void FTControls::doOK() {
     s.b->save();
-    this->close();
+    close();
 }
 
-void FTControls::doCancel() {
-    s.b->reload();
-    this->close();
+void FTControls::doCancel()
+{
+    close();
 }
 
 void FTControls::selectDLL() {