1 | Removes any unnecessary assignment. |
---|
2 | |
---|
3 | From: Erik Hovland <erik@hovland.org> |
---|
4 | |
---|
5 | |
---|
6 | --- |
---|
7 | |
---|
8 | mythtv/programs/mythfrontend/customedit.cpp | 10 +++++----- |
---|
9 | mythtv/programs/mythfrontend/custompriority.cpp | 6 +++--- |
---|
10 | 2 files changed, 8 insertions(+), 8 deletions(-) |
---|
11 | |
---|
12 | |
---|
13 | diff --git a/mythtv/programs/mythfrontend/customedit.cpp b/mythtv/programs/mythfrontend/customedit.cpp |
---|
14 | index 2c4bdcd..edd80a4 100644 |
---|
15 | --- a/mythtv/programs/mythfrontend/customedit.cpp |
---|
16 | +++ b/mythtv/programs/mythfrontend/customedit.cpp |
---|
17 | @@ -105,9 +105,8 @@ void CustomEdit::loadData(void) |
---|
18 | rule.subtitle; |
---|
19 | rule.description; |
---|
20 | |
---|
21 | - MythUIButtonListItem *item; |
---|
22 | - item = new MythUIButtonListItem(m_ruleList, tr("<New rule>"), |
---|
23 | - qVariantFromValue(rule)); |
---|
24 | + new MythUIButtonListItem(m_ruleList, tr("<New rule>"), |
---|
25 | + qVariantFromValue(rule)); |
---|
26 | |
---|
27 | MSqlQuery result(MSqlQuery::InitCon()); |
---|
28 | result.prepare("SELECT recordid, title, subtitle, description " |
---|
29 | @@ -126,8 +125,9 @@ void CustomEdit::loadData(void) |
---|
30 | rule.subtitle = result.value(2).toString(); |
---|
31 | rule.description = result.value(3).toString(); |
---|
32 | |
---|
33 | - item = new MythUIButtonListItem(m_ruleList, rule.title, |
---|
34 | - qVariantFromValue(rule)); |
---|
35 | + MythUIButtonListItem *item = |
---|
36 | + new MythUIButtonListItem(m_ruleList, rule.title, |
---|
37 | + qVariantFromValue(rule)); |
---|
38 | |
---|
39 | if (trimTitle == baseTitle || |
---|
40 | result.value(0).toInt() == m_pginfo->recordid) |
---|
41 | diff --git a/mythtv/programs/mythfrontend/custompriority.cpp b/mythtv/programs/mythfrontend/custompriority.cpp |
---|
42 | index bf73269..46e2884 100644 |
---|
43 | --- a/mythtv/programs/mythfrontend/custompriority.cpp |
---|
44 | +++ b/mythtv/programs/mythfrontend/custompriority.cpp |
---|
45 | @@ -98,9 +98,8 @@ void CustomPriority::loadData() |
---|
46 | rule.priority = QString().setNum(1); |
---|
47 | rule.description; |
---|
48 | |
---|
49 | - MythUIButtonListItem *item = NULL; |
---|
50 | - item = new MythUIButtonListItem(m_ruleList, tr("<New priority rule>"), |
---|
51 | - qVariantFromValue(rule)); |
---|
52 | + new MythUIButtonListItem(m_ruleList, tr("<New priority rule>"), |
---|
53 | + qVariantFromValue(rule)); |
---|
54 | |
---|
55 | MSqlQuery result(MSqlQuery::InitCon()); |
---|
56 | result.prepare("SELECT priorityname, recpriority, selectclause " |
---|
57 | @@ -108,6 +107,7 @@ void CustomPriority::loadData() |
---|
58 | |
---|
59 | if (result.exec()) |
---|
60 | { |
---|
61 | + MythUIButtonListItem *item = NULL; |
---|
62 | while (result.next()) |
---|
63 | { |
---|
64 | QString trimTitle = result.value(0).toString(); |
---|