From a13328c6001f9baba37f3fae58f1e7de93340a55 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 13 Jan 2013 22:44:09 +0100 Subject: [PATCH] Revert "src/gui/scan_setup.cpp -fix compil warnings" This reverts commit 14a6028667cdc30140b52a1184fbbe97e84bb93e. --- src/gui/scan_setup.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index eb345732a..b335afb79 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -822,12 +822,13 @@ int CScanSetup::showScanMenuSatFind() void CScanSetup::addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t & satconfig) { temp_sat->addIntroItems(); - CMenuOptionNumberChooser *diseqc = NULL; - CMenuOptionNumberChooser *comm = NULL; - CMenuOptionNumberChooser *uncomm = NULL; - CMenuOptionNumberChooser *unilnb = NULL; - CMenuOptionNumberChooser *motor = NULL; - CMenuOptionChooser *usals = NULL; + CMenuOptionNumberChooser *diseqc; + CMenuOptionNumberChooser *comm; + CMenuOptionNumberChooser *uncomm; + CMenuOptionNumberChooser *unilnb; + CMenuOptionNumberChooser *motor; + CMenuOptionChooser *usals; + CMenuForwarder *mf; bool unicable = (dmode == DISEQC_UNICABLE); if (!unicable) { @@ -863,7 +864,7 @@ void CScanSetup::addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t & satcon temp_sat->addItem(unilnb); } - CMenuForwarder *mf = new CMenuDForwarder(LOCALE_SATSETUP_LOFL, true, lofL->getValue(), lofL); + mf = new CMenuDForwarder(LOCALE_SATSETUP_LOFL, true, lofL->getValue(), lofL); mf->setHint("", LOCALE_MENU_HINT_SCAN_LOFL); temp_sat->addItem(mf); mf = new CMenuDForwarder(LOCALE_SATSETUP_LOFH, true, lofH->getValue(), lofH);