Ticket #7013: libs_libmythui-unused-value

File libs_libmythui-unused-value, 1.9 KB (added by Erik Hovland <erik@…>, 16 years ago)

Fixes or removes unused or unreachable code.

Line 
1A few assignments are never used.
2
3From: Erik Hovland <erik@hovland.org>
4
5
6---
7
8 mythtv/libs/libmythui/lirc_client.c | 4 ++--
9 mythtv/libs/libmythui/mythvirtualkeyboard.cpp | 20 ++++----------------
10 2 files changed, 6 insertions(+), 18 deletions(-)
11
12
13diff --git a/mythtv/libs/libmythui/lirc_client.c b/mythtv/libs/libmythui/lirc_client.c
14index 866b144..c11f2fc 100644
15--- a/mythtv/libs/libmythui/lirc_client.c
16+++ b/mythtv/libs/libmythui/lirc_client.c
17@@ -1092,7 +1092,7 @@ static int lirc_readconfig_only_internal(const struct lirc_state *state,
18 {
19 token2=strtok(NULL," \t");
20 if(token2!=NULL &&
21- (token3=strtok(NULL," \t"))!=NULL)
22+ strtok(NULL," \t")!=NULL)
23 {
24 lirc_printf(state, "%s: unexpected token in line %s:%d\n",
25 state->lirc_prog,filestack->name,filestack->line);
26@@ -1843,7 +1843,7 @@ int lirc_nextcode(struct lirc_state *state, char **code)
27 end_len+=len;
28 state->lirc_buffer[end_len]=0;
29 /* return if next code not yet available completely */
30- if((end=strchr(state->lirc_buffer,'\n'))==NULL)
31+ if(strchr(state->lirc_buffer,'\n')==NULL)
32 {
33 return(0);
34 }
35diff --git a/mythtv/libs/libmythui/mythvirtualkeyboard.cpp b/mythtv/libs/libmythui/mythvirtualkeyboard.cpp
36index a3b6dd4..5fa7a93 100644
37--- a/mythtv/libs/libmythui/mythvirtualkeyboard.cpp
38+++ b/mythtv/libs/libmythui/mythvirtualkeyboard.cpp
39@@ -609,25 +609,13 @@ QString MythUIVirtualKeyboard::getKeyText(KeyDefinition key)
40 if (m_shift)
41 {
42 if (m_alt)
43- {
44 return key.altshift;
45- }
46 else
47- {
48 return key.shift;
49- }
50- }
51- else
52- {
53- if (m_alt)
54- {
55- return key.alt;
56- }
57- else
58- {
59- return key.normal;
60- }
61 }
62
63- return QString("");
64+ if (m_alt)
65+ return key.alt;
66+
67+ return key.normal;
68 }