浏览代码

Adjust some member names after clang-tidy changes

Tobias Hieta 9 年之前
父节点
当前提交
8ffdb7dd44
共有 2 个文件被更改,包括 11 次插入12 次删除
  1. 4 5
      src/input/InputCEC.cpp
  2. 7 7
      src/input/apple/InputAppleMediaKeys.mm

+ 4 - 5
src/input/InputCEC.cpp

@@ -4,11 +4,10 @@
 #include "settings/SettingsComponent.h"
 #include "power/PowerComponent.h"
 
-class KeyAction
+struct KeyAction
 {
-public:
-  QString m_action;
-  bool m_hasLongPress;
+  QString action;
+  bool hasLongPress;
 };
 
 static QMap<int, KeyAction> g_cecKeyMap   { \
@@ -197,7 +196,7 @@ QString InputCECWorker::getCommandString(cec_user_control_code code)
   if (g_cecKeyMap.contains(code))
   {
     KeyAction keyaction = g_cecKeyMap[code];
-    key = keyaction.m_action;
+    key = keyaction.action;
   }
 
   return key;

+ 7 - 7
src/input/apple/InputAppleMediaKeys.mm

@@ -8,22 +8,22 @@
 
 @interface MediaKeysDelegate : NSObject
 {
-  SPMediaKeyTap* m_keyTap;
-  InputAppleMediaKeys* m_input;
+  SPMediaKeyTap* keyTap;
+  InputAppleMediaKeys* input;
 }
 -(instancetype)initWithInput:(InputAppleMediaKeys*)input;
 @end
 
 @implementation MediaKeysDelegate
 
-- (instancetype)initWithInput:(InputAppleMediaKeys*)input
+- (instancetype)initWithInput:(InputAppleMediaKeys*)input_
 {
   self = [super init];
   if (self) {
-    m_input = input;
-    m_keyTap = [[SPMediaKeyTap alloc] initWithDelegate:self];
+    input = input_;
+    keyTap = [[SPMediaKeyTap alloc] initWithDelegate:self];
     if ([SPMediaKeyTap usesGlobalMediaKeyTap])
-      [m_keyTap startWatchingMediaKeys];
+      [keyTap startWatchingMediaKeys];
     else
       QLOG_WARN() << "Could not grab global media keys";
   }
@@ -65,7 +65,7 @@
         // More cases defined in hidsystem/ev_keymap.h
     }
 
-    emit m_input->receivedInput("AppleMediaKeys", keyPressed);
+    emit input->receivedInput("AppleMediaKeys", keyPressed);
   }
 }