@@ -1,9 +1,6 @@
11/*
22 * Copyright (C) 2014 Canonical, Ltd.
33 *
4− * Authors:
5− * Josh Arenson <joshua.arenson@canonical.com>
6− *
74 * This program is free software; you can redistribute it and/or modify
85 * it under the terms of the GNU General Public License as published by
96 * the Free Software Foundation; version 3.
@@ -54,19 +51,14 @@ QtObject {
5451 function onKeyPressed(key) {
5552 /* Determine what key was pressed */
5653
57− // Power Key
5854 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
5955 powerPressed();
6056 eventAccepted = true;
6157 powerKeyPressed = true;
62− }
63−
64− //Volume Keys
65− else if (key == Qt.Key_VolumeDown) {
58+ } else if (key == Qt.Key_VolumeDown) {
6659 eventAccepted = true;
6760 volumeDownKeyPressed = true;
68− }
69− else if (key == Qt.Key_VolumeUp) {
61+ } else if (key == Qt.Key_VolumeUp) {
7062 eventAccepted = true;
7163 volumeUpKeyPressed = true;
7264 }
@@ -77,8 +69,7 @@ QtObject {
7769 bothVolumeKeysPressed();
7870 }
7971 aVolumeKeyWasReleased = false;
80− }
81− else if (volumeDownKeyPressed) {
72+ } else if (volumeDownKeyPressed) {
8273 if (powerKeyPressed && aPowerKeyWasReleased) {
8374 screenshotPressed();
8475 aPowerKeyWasReleased = false;
@@ -86,8 +77,7 @@ QtObject {
8677 } else if (aPowerKeyWasReleased){
8778 volumeDownPressed();
8879 }
89− }
90− else if (volumeUpKeyPressed) {
80+ } else if (volumeUpKeyPressed) {
9181 volumeUpPressed();
9282 }
9383
@@ -99,13 +89,11 @@ QtObject {
9989 eventAccepted = true;
10090 powerKeyPressed = false;
10191 aPowerKeyWasReleased = true;
102− }
103− else if (key == Qt.Key_VolumeDown) {
92+ } else if (key == Qt.Key_VolumeDown) {
10493 eventAccepted = true;
10594 volumeDownKeyPressed = false;
10695 aVolumeKeyWasReleased = false;
107− }
108− else if (key == Qt.Key_VolumeUp) {
96+ } else if (key == Qt.Key_VolumeUp) {
10997 eventAccepted = true;
11098 volumeUpKeyPressed = false;
11199 aVolumeKeyWasReleased = true;