Ticket #5425: libs_libmythtv-unused-value.patch

File libs_libmythtv-unused-value.patch, 18.9 KB (added by Erik Hovland <erik@…>, 12 years ago)

removes any unused assignments from the code in the libs/libmythtv directory

  • libs/libmythtv/NuppelVideoPlayer.cpp

    Qt can do a lot of work in a 'new object()' then most
    
    From: Erik Hovland <erik@hovland.org>
    
    libraries. So you often see all sorts of new calls
    in Qt that don't actually assign the pointer. Don't worry,
    Qt will automagically clean it up later.
    
    Anyhow, it seems that the OSDGenericTree class is
    designed much the same. So the assignments of these
    new objects are superfluous.
    ---
    
     libs/libmythtv/NuppelVideoPlayer.cpp |    6 -
     libs/libmythtv/tv_play.cpp           |  213 +++++++++++++++-------------------
     2 files changed, 96 insertions(+), 123 deletions(-)
    
    diff --git a/libs/libmythtv/NuppelVideoPlayer.cpp b/libs/libmythtv/NuppelVideoPlayer.cpp
    index 6c52cc7..e59ab11 100644
    a b void NuppelVideoPlayer::ChangeCaptionTrack(int dir) 
    66806680 */
    66816681void NuppelVideoPlayer::DisplayAVSubtitles(void)
    66826682{
    6683     OSDSet *subtitleOSD;
     6683    OSDSet *subtitleOSD = osd->GetSet("subtitles");
    66846684    bool setVisible = false;
    66856685    VideoFrame *currentFrame = videoOutput->GetLastShownFrame();
    66866686
    6687     if (!osd || !currentFrame || !(subtitleOSD = osd->GetSet("subtitles")))
     6687    if (!osd || !currentFrame || !subtitleOSD)
    66886688        return;
    66896689
    66906690    subtitleLock.lock();
    66916691
    6692     subtitleOSD = osd->GetSet("subtitles");
    6693 
    66946692    // hide the subs if they have been long enough in the screen without
    66956693    // new subtitles replacing them
    66966694    if (osdHasSubtitles && currentFrame->timecode >= osdSubtitlesExpireAt)
  • libs/libmythtv/tv_play.cpp

    diff --git a/libs/libmythtv/tv_play.cpp b/libs/libmythtv/tv_play.cpp
    index de6ebdd..9794412 100644
    a b void TV::BuildOSDTreeMenu(void) 
    74887488        delete treeMenu;
    74897489
    74907490    treeMenu = new OSDGenericTree(NULL, "treeMenu");
    7491     OSDGenericTree *item, *subitem;
     7491    OSDGenericTree *item;
    74927492
    74937493    if (StateIsLiveTV(GetState()))
    74947494        FillMenuLiveTV(treeMenu);
    void TV::BuildOSDTreeMenu(void) 
    75207520
    75217521        bool sel = (i != kAspect_Off) ? (aspectoverride == i) :
    75227522            (aspectoverride <= kAspect_Off) || (aspectoverride >= kAspect_END);
    7523         subitem = new OSDGenericTree(item, toString((AspectOverrideMode) i),
    7524                                      QString("TOGGLEASPECT%1").arg(i),
    7525                                      (sel) ? 1 : 0, NULL, "ASPECTGROUP");
     7523        new OSDGenericTree(item, toString((AspectOverrideMode) i),
     7524                           QString("TOGGLEASPECT%1").arg(i),
     7525                           (sel) ? 1 : 0, NULL, "ASPECTGROUP");
    75267526    }
    75277527
    75287528    AdjustFillMode adjustfill = nvp->GetAdjustFill();
    void TV::BuildOSDTreeMenu(void) 
    75317531    {
    75327532        bool sel = (i != kAdjustFill_Off) ? (adjustfill == i) :
    75337533            (adjustfill <= kAdjustFill_Off) || (adjustfill >= kAdjustFill_END);
    7534         subitem = new OSDGenericTree(item, toString((AdjustFillMode) i),
    7535                                      QString("TOGGLEFILL%1").arg(i),
    7536                                      (sel) ? 1 : 0, NULL, "ADJUSTFILLGROUP");
     7534        new OSDGenericTree(item, toString((AdjustFillMode) i),
     7535                           QString("TOGGLEFILL%1").arg(i),
     7536                           (sel) ? 1 : 0, NULL, "ADJUSTFILLGROUP");
    75377537    }
    75387538
    75397539    uint sup = kPictureAttributeSupported_None;
    void TV::BuildOSDTreeMenu(void) 
    75467546        {
    75477547            if (!item)
    75487548                item = new OSDGenericTree(treeMenu, tr("Adjust Picture"));
    7549             subitem = new OSDGenericTree(
    7550                 item, toString((PictureAttribute) i),
    7551                 QString("TOGGLEPICCONTROLS%1").arg(i));
     7549
     7550            new OSDGenericTree(item, toString((PictureAttribute) i),
     7551                               QString("TOGGLEPICCONTROLS%1").arg(i));
    75527552        }
    75537553    }
    75547554
    7555     item = new OSDGenericTree(treeMenu, tr("Manual Zoom Mode"),
    7556                              "TOGGLEMANUALZOOM");
     7555    new OSDGenericTree(treeMenu, tr("Manual Zoom Mode"), "TOGGLEMANUALZOOM");
    75577556
    75587557    item = new OSDGenericTree(treeMenu, tr("Adjust Audio Sync"), "TOGGLEAUDIOSYNC");
    75597558
    75607559    int speedX100 = (int)(round(normal_speed * 100));
    75617560
    75627561    item = new OSDGenericTree(treeMenu, tr("Adjust Time Stretch"), "ADJUSTSTRETCH");
    7563     subitem = new OSDGenericTree(item, tr("Toggle"), "TOGGLESTRETCH");
    7564     subitem = new OSDGenericTree(item, tr("Adjust"), "ADJUSTSTRETCH");
    7565     subitem = new OSDGenericTree(item, tr("0.5X"), "ADJUSTSTRETCH0.5",
    7566                                  (speedX100 == 50) ? 1 : 0, NULL,
    7567                                  "STRETCHGROUP");
    7568     subitem = new OSDGenericTree(item, tr("0.9X"), "ADJUSTSTRETCH0.9",
    7569                                  (speedX100 == 90) ? 1 : 0, NULL,
    7570                                  "STRETCHGROUP");
    7571     subitem = new OSDGenericTree(item, tr("1.0X"), "ADJUSTSTRETCH1.0",
    7572                                  (speedX100 == 100) ? 1 : 0, NULL,
    7573                                  "STRETCHGROUP");
    7574     subitem = new OSDGenericTree(item, tr("1.1X"), "ADJUSTSTRETCH1.1",
    7575                                  (speedX100 == 110) ? 1 : 0, NULL,
    7576                                  "STRETCHGROUP");
    7577     subitem = new OSDGenericTree(item, tr("1.2X"), "ADJUSTSTRETCH1.2",
    7578                                  (speedX100 == 120) ? 1 : 0, NULL,
    7579                                  "STRETCHGROUP");
    7580     subitem = new OSDGenericTree(item, tr("1.3X"), "ADJUSTSTRETCH1.3",
    7581                                  (speedX100 == 130) ? 1 : 0, NULL,
    7582                                  "STRETCHGROUP");
    7583     subitem = new OSDGenericTree(item, tr("1.4X"), "ADJUSTSTRETCH1.4",
    7584                                  (speedX100 == 140) ? 1 : 0, NULL,
    7585                                  "STRETCHGROUP");
    7586     subitem = new OSDGenericTree(item, tr("1.5X"), "ADJUSTSTRETCH1.5",
    7587                                  (speedX100 == 150) ? 1 : 0, NULL,
    7588                                  "STRETCHGROUP");
     7562    new OSDGenericTree(item, tr("Toggle"), "TOGGLESTRETCH");
     7563    OSDGenericTree(item, tr("Adjust"), "ADJUSTSTRETCH");
     7564    new OSDGenericTree(item, tr("0.5X"), "ADJUSTSTRETCH0.5",
     7565                       (speedX100 == 50) ? 1 : 0, NULL,
     7566                       "STRETCHGROUP");
     7567    new OSDGenericTree(item, tr("0.9X"), "ADJUSTSTRETCH0.9",
     7568                       (speedX100 == 90) ? 1 : 0, NULL,
     7569                       "STRETCHGROUP");
     7570    new OSDGenericTree(item, tr("1.0X"), "ADJUSTSTRETCH1.0",
     7571                       (speedX100 == 100) ? 1 : 0, NULL,
     7572                       "STRETCHGROUP");
     7573    new OSDGenericTree(item, tr("1.1X"), "ADJUSTSTRETCH1.1",
     7574                       (speedX100 == 110) ? 1 : 0, NULL,
     7575                       "STRETCHGROUP");
     7576    new OSDGenericTree(item, tr("1.2X"), "ADJUSTSTRETCH1.2",
     7577                       (speedX100 == 120) ? 1 : 0, NULL,
     7578                       "STRETCHGROUP");
     7579    new OSDGenericTree(item, tr("1.3X"), "ADJUSTSTRETCH1.3",
     7580                       (speedX100 == 130) ? 1 : 0, NULL,
     7581                       "STRETCHGROUP");
     7582    new OSDGenericTree(item, tr("1.4X"), "ADJUSTSTRETCH1.4",
     7583                       (speedX100 == 140) ? 1 : 0, NULL,
     7584                       "STRETCHGROUP");
     7585    new OSDGenericTree(item, tr("1.5X"), "ADJUSTSTRETCH1.5",
     7586                       (speedX100 == 150) ? 1 : 0, NULL,
     7587                       "STRETCHGROUP");
    75897588
    75907589    // add scan mode override settings to menu
    75917590    FrameScanType scan_type = kScan_Ignore;
    void TV::BuildOSDTreeMenu(void) 
    76107609
    76117610    item = new OSDGenericTree(
    76127611        treeMenu, tr("Video Scan"), "SCANMODE");
    7613     subitem = new OSDGenericTree(
    7614         item, tr("Detect") + cur_mode, "SELECTSCAN_0",
     7612    new OSDGenericTree(item, tr("Detect") + cur_mode, "SELECTSCAN_0",
    76157613        (scan_type == kScan_Detect) ? 1 : 0, NULL, "SCANGROUP");
    7616     subitem = new OSDGenericTree(
    7617         item, tr("Progressive"), "SELECTSCAN_3",
     7614    new OSDGenericTree(item, tr("Progressive"), "SELECTSCAN_3",
    76187615        (scan_type == kScan_Progressive) ? 1 : 0, NULL, "SCANGROUP");
    7619     subitem = new OSDGenericTree(
    7620         item, tr("Interlaced (Normal)"), "SELECTSCAN_1",
     7616    new OSDGenericTree(item, tr("Interlaced (Normal)"), "SELECTSCAN_1",
    76217617        (scan_type == kScan_Interlaced) ? 1 : 0, NULL, "SCANGROUP");
    7622     subitem = new OSDGenericTree(
    7623         item, tr("Interlaced (Reversed)"), "SELECTSCAN_2",
     7618    new OSDGenericTree(item, tr("Interlaced (Reversed)"), "SELECTSCAN_2",
    76247619        (scan_type == kScan_Intr2ndField) ? 1 : 0, NULL, "SCANGROUP");
    76257620   
    76267621    // add sleep items to menu
    76277622
    76287623    item = new OSDGenericTree(treeMenu, tr("Sleep"), "TOGGLESLEEPON");
    76297624    if (sleepTimer.isRunning())
    7630         subitem = new OSDGenericTree(item, tr("Sleep Off"), "TOGGLESLEEPON");
    7631     subitem = new OSDGenericTree(item, "30 " + tr("minutes"), "TOGGLESLEEP30");
    7632     subitem = new OSDGenericTree(item, "60 " + tr("minutes"), "TOGGLESLEEP60");
    7633     subitem = new OSDGenericTree(item, "90 " + tr("minutes"), "TOGGLESLEEP90");
    7634     subitem = new OSDGenericTree(item, "120 " + tr("minutes"), "TOGGLESLEEP120");
     7625        new OSDGenericTree(item, tr("Sleep Off"), "TOGGLESLEEPON");
     7626
     7627    new OSDGenericTree(item, "30 " + tr("minutes"), "TOGGLESLEEP30");
     7628    new OSDGenericTree(item, "60 " + tr("minutes"), "TOGGLESLEEP60");
     7629    new OSDGenericTree(item, "90 " + tr("minutes"), "TOGGLESLEEP90");
     7630    new OSDGenericTree(item, "120 " + tr("minutes"), "TOGGLESLEEP120");
    76357631}
    76367632
    76377633void TV::FillMenuLiveTV(OSDGenericTree *treeMenu)
    76387634{
    7639     OSDGenericTree *item, *subitem;
     7635    OSDGenericTree *item;
    76407636
    76417637    bool freeRecorders = (pipnvp != NULL);
    76427638    if (!freeRecorders)
    void TV::FillMenuLiveTV(OSDGenericTree *treeMenu) 
    76477643    if (!gContext->GetNumSetting("JumpToProgramOSD", 1))
    76487644    {
    76497645        item = new OSDGenericTree(treeMenu, tr("Jump to Program"));
    7650         subitem = new OSDGenericTree(item, tr("Recorded Program"), "JUMPREC");
     7646        new OSDGenericTree(item, tr("Recorded Program"), "JUMPREC");
    76517647        if (lastProgram != NULL)
    7652             subitem = new OSDGenericTree(item, lastProgram->title, "JUMPPREV");
     7648            new OSDGenericTree(item, lastProgram->title, "JUMPPREV");
    76537649    }
    76547650
    76557651    if (freeRecorders)
    76567652    {
    76577653        // Picture-in-Picture
    76587654        item = new OSDGenericTree(treeMenu, tr("Picture-in-Picture"));
    7659         subitem = new OSDGenericTree(item, tr("Enable/Disable"),
     7655        new OSDGenericTree(item, tr("Enable/Disable"),
    76607656                                     "TOGGLEPIPMODE");
    7661         subitem = new OSDGenericTree(item, tr("Swap PiP/Main"), "SWAPPIP");
    7662         subitem = new OSDGenericTree(item, tr("Change Active Window"),
     7657        new OSDGenericTree(item, tr("Swap PiP/Main"), "SWAPPIP");
     7658        new OSDGenericTree(item, tr("Change Active Window"),
    76637659                                     "TOGGLEPIPWINDOW");
    76647660
    76657661        // Input switching
    void TV::FillMenuLiveTV(OSDGenericTree *treeMenu) 
    77147710                        tr("I", "Input") + ":" + inputs[i].name;
    77157711                }
    77167712
    7717                 subitem = new OSDGenericTree(
    7718                     item, name,
    7719                     QString("SWITCHTOINPUT_%1").arg(inputs[i].inputid));
     7713                new OSDGenericTree(item, name,
     7714                                   QString("SWITCHTOINPUT_%1")
     7715                                       .arg(inputs[i].inputid));
    77207716            }
    77217717        }
    77227718
    void TV::FillMenuLiveTV(OSDGenericTree *treeMenu) 
    77317727            item = new OSDGenericTree(treeMenu, tr("Switch Source"));
    77327728        for (; sit != sources.end(); ++sit)
    77337729        {
    7734             subitem = new OSDGenericTree(
    7735                 item, SourceUtil::GetSourceName((*sit).sourceid),
    7736                 QString("SWITCHTOINPUT_%1").arg((*sit).inputid));
     7730            new OSDGenericTree(item, SourceUtil::GetSourceName((*sit).sourceid),
     7731                               QString("SWITCHTOINPUT_%1").arg((*sit).inputid));
    77377732        }
    77387733    }
    77397734
    77407735    if (!persistentbrowsemode)
    7741     {
    7742         item = new OSDGenericTree(
    7743             treeMenu, tr("Enable Browse Mode"), "TOGGLEBROWSE");
    7744     }
     7736        new OSDGenericTree(treeMenu, tr("Enable Browse Mode"), "TOGGLEBROWSE");
    77457737
    7746     item = new OSDGenericTree(treeMenu, tr("Previous Channel"),
    7747                               "PREVCHAN");
     7738    new OSDGenericTree(treeMenu, tr("Previous Channel"), "PREVCHAN");
    77487739}
    77497740
    77507741void TV::FillMenuPlaying(OSDGenericTree *treeMenu)
    77517742{
    7752     OSDGenericTree *item, *subitem;
     7743    OSDGenericTree *item;
    77537744
    77547745    if (activerbuffer && activerbuffer->isDVD())
    77557746    {
    7756         item = new OSDGenericTree(
    7757             treeMenu, tr("DVD Root Menu"),    "JUMPTODVDROOTMENU");
    7758         item = new OSDGenericTree(
    7759             treeMenu, tr("DVD Chapter Menu"), "JUMPTODVDCHAPTERMENU");
     7747        new OSDGenericTree(treeMenu, tr("DVD Root Menu"), "JUMPTODVDROOTMENU");
     7748        new OSDGenericTree(treeMenu,tr("DVD Chapter Menu"),
     7749                           "JUMPTODVDCHAPTERMENU");
    77607750
    77617751        return;
    77627752    }
    void TV::FillMenuPlaying(OSDGenericTree *treeMenu) 
    77657755
    77667756    item = new OSDGenericTree(treeMenu, tr("Jump to Program"));
    77677757
    7768     subitem = new OSDGenericTree(item, tr("Recorded Program"), "JUMPREC");
     7758    new OSDGenericTree(item, tr("Recorded Program"), "JUMPREC");
    77697759    if (lastProgram != NULL)
    7770         subitem = new OSDGenericTree(item, lastProgram->title, "JUMPPREV");
     7760        new OSDGenericTree(item, lastProgram->title, "JUMPPREV");
    77717761
    77727762    pbinfoLock.lock();
    77737763
    77747764    if (JobQueue::IsJobQueuedOrRunning(
    77757765            JOB_TRANSCODE, playbackinfo->chanid, playbackinfo->startts))
    77767766    {
    7777         item = new OSDGenericTree(treeMenu, tr("Stop Transcoding"),
    7778                                   "QUEUETRANSCODE");
     7767        new OSDGenericTree(treeMenu, tr("Stop Transcoding"), "QUEUETRANSCODE");
    77797768    }
    77807769    else
    77817770    {
    77827771        item = new OSDGenericTree(treeMenu, tr("Begin Transcoding"));
    7783         subitem = new OSDGenericTree(item, tr("Default"),
    7784                                      "QUEUETRANSCODE");
    7785         subitem = new OSDGenericTree(item, tr("Autodetect"),
    7786                                      "QUEUETRANSCODE_AUTO");
    7787         subitem = new OSDGenericTree(item, tr("High Quality"),
    7788                                      "QUEUETRANSCODE_HIGH");
    7789         subitem = new OSDGenericTree(item, tr("Medium Quality"),
    7790                                      "QUEUETRANSCODE_MEDIUM");
    7791         subitem = new OSDGenericTree(item, tr("Low Quality"),
    7792                                      "QUEUETRANSCODE_LOW");
     7772        new OSDGenericTree(item, tr("Default"), "QUEUETRANSCODE");
     7773        new OSDGenericTree(item, tr("Autodetect"), "QUEUETRANSCODE_AUTO");
     7774        new OSDGenericTree(item, tr("High Quality"), "QUEUETRANSCODE_HIGH");
     7775        new OSDGenericTree(item, tr("Medium Quality"), "QUEUETRANSCODE_MEDIUM");
     7776        new OSDGenericTree(item, tr("Low Quality"), "QUEUETRANSCODE_LOW");
    77937777    }
    77947778
    77957779    item = new OSDGenericTree(treeMenu, tr("Commercial Auto-Skip"));
    7796     subitem = new OSDGenericTree(item, tr("Auto-Skip OFF"),
    7797                                  "TOGGLECOMMSKIP0",
    7798                                  (autoCommercialSkip == 0) ? 1 : 0, NULL,
    7799                                  "COMMSKIPGROUP");
    7800     subitem = new OSDGenericTree(item, tr("Auto-Skip Notify"),
    7801                                  "TOGGLECOMMSKIP2",
    7802                                  (autoCommercialSkip == 2) ? 1 : 0, NULL,
    7803                                  "COMMSKIPGROUP");
    7804     subitem = new OSDGenericTree(item, tr("Auto-Skip ON"),
    7805                                  "TOGGLECOMMSKIP1",
    7806                                  (autoCommercialSkip == 1) ? 1 : 0, NULL,
    7807                                  "COMMSKIPGROUP");
     7780    new OSDGenericTree(item, tr("Auto-Skip OFF"), "TOGGLECOMMSKIP0",
     7781                       (autoCommercialSkip == 0) ? 1 : 0, NULL,
     7782                       "COMMSKIPGROUP");
     7783    new OSDGenericTree(item, tr("Auto-Skip Notify"), "TOGGLECOMMSKIP2",
     7784                       (autoCommercialSkip == 2) ? 1 : 0, NULL,
     7785                       "COMMSKIPGROUP");
     7786    new OSDGenericTree(item, tr("Auto-Skip ON"), "TOGGLECOMMSKIP1",
     7787                       (autoCommercialSkip == 1) ? 1 : 0, NULL,
     7788                       "COMMSKIPGROUP");
    78087789
    78097790    if (playbackinfo->GetAutoExpireFromRecorded())
    78107791    {
    7811         item = new OSDGenericTree(treeMenu, tr("Turn Auto-Expire OFF"),
    7812                                   "TOGGLEAUTOEXPIRE");
     7792        new OSDGenericTree(treeMenu, tr("Turn Auto-Expire OFF"),
     7793                           "TOGGLEAUTOEXPIRE");
    78137794    }
    78147795    else
    7815     {
    78167796        item = new OSDGenericTree(treeMenu, tr("Turn Auto-Expire ON"),
    78177797                                  "TOGGLEAUTOEXPIRE");
    7818     }
    78197798
    78207799    pbinfoLock.unlock();
    78217800
    78227801    item = new OSDGenericTree(treeMenu, tr("Schedule Recordings"));
    7823     subitem = new OSDGenericTree(item, tr("Program Guide"), "GUIDE");
    7824     subitem = new OSDGenericTree(item, tr("Upcoming Recordings"),
    7825                                 "VIEWSCHEDULED");
    7826     subitem = new OSDGenericTree(item, tr("Program Finder"), "FINDER");
    7827     subitem = new OSDGenericTree(item, tr("Edit Recording Schedule"),
    7828                                  "SCHEDULE");
     7802    new OSDGenericTree(item, tr("Program Guide"), "GUIDE");
     7803    new OSDGenericTree(item, tr("Upcoming Recordings"), "VIEWSCHEDULED");
     7804    new OSDGenericTree(item, tr("Program Finder"), "FINDER");
     7805    new OSDGenericTree(item, tr("Edit Recording Schedule"), "SCHEDULE");
    78297806}
    78307807
    78317808bool TV::FillMenuTracks(OSDGenericTree *treeMenu, uint type)
    bool TV::FillMenuTracks(OSDGenericTree *treeMenu, uint type) 
    78767853        sel     = activenvp->GetCaptionMode() & kTrackTypeTeletextCaptions;
    78777854    }
    78787855    else
    7879     {
    78807856        return false;
    7881     }
    78827857   
    78837858    const QStringList tracks = activenvp->GetTracks(type);
    78847859    if (tracks.empty())
    void TV::DoDisplayJumpMenu(void) 
    86828657        delete treeMenu;
    86838658
    86848659     treeMenu = new OSDGenericTree(NULL, "treeMenu");
    8685      OSDGenericTree *item, *subitem;
     8660     OSDGenericTree *item;
    86868661   
    86878662     // Build jumpMenu of recorded program titles
    86888663        ProgramInfo *p;
    void TV::DoDisplayJumpMenu(void) 
    87118686            int progIndex = plist.count();
    87128687            if (progIndex == 1)
    87138688            { 
    8714                 item = new OSDGenericTree(treeMenu, tr(Iprog.key()),
    8715                     QString("JUMPPROG %1 0").arg(Iprog.key()));
     8689                new OSDGenericTree(treeMenu, tr(Iprog.key()),
     8690                                   QString("JUMPPROG %1 0").arg(Iprog.key()));
    87168691            } 
    87178692            else 
    87188693            {
    void TV::DoDisplayJumpMenu(void) 
    87218696                {
    87228697                    p = plist.at(i);
    87238698                    if (p->subtitle != "")
    8724                         subitem = new OSDGenericTree(item, tr(p->subtitle), 
    8725                             QString("JUMPPROG %1 %2").arg(Iprog.key()).arg(i)); 
     8699                        new OSDGenericTree(item, tr(p->subtitle), 
     8700                            QString("JUMPPROG %1 %2").arg(Iprog.key()).arg(i));
    87268701                    else 
    8727                         subitem = new OSDGenericTree(item, tr(p->title), 
    8728                             QString("JUMPPROG %1 %2").arg(Iprog.key()).arg(i)); 
     8702                        new OSDGenericTree(item, tr(p->title), 
     8703                            QString("JUMPPROG %1 %2").arg(Iprog.key()).arg(i));
    87298704                }
    87308705            }
    87318706        }