From 5660db4e68c904cc2dd01888775483189cda7a10 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libk9copy/k9dvdbackup.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'libk9copy/k9dvdbackup.cpp') diff --git a/libk9copy/k9dvdbackup.cpp b/libk9copy/k9dvdbackup.cpp index e261038..a365efb 100755 --- a/libk9copy/k9dvdbackup.cpp +++ b/libk9copy/k9dvdbackup.cpp @@ -368,7 +368,7 @@ void k9DVDBackup::getOutput(uchar * buffer, uint32_t buflen) { k9Vobu * vobu = vobuQueue.dequeue(); - cellOut=vobu->tqparent; + cellOut=vobu->parent; dsi_t dsiPack; navRead_DSI (&dsiPack, (uchar*)(temp+itemp) + DSI_START_BYTE); @@ -817,13 +817,13 @@ uint32_t k9DVDBackup::copyVobu(k9DVDFile *_fileHandle,uint32_t _startSector,k9V k9Vobu * k9DVDBackup::remapVobu(uint32_t *value) { k9Vobu *vobu=NULL; - uint32_t sector,tqmask; + uint32_t sector,mask; if ( (*value & 0x80000000) == 0x80000000) { sector = *value & 0x7FFFFFFF; - tqmask=0x80000000; + mask=0x80000000; } else { sector =*value; - tqmask=0; + mask=0; } *value=0; k9CellList *lstCell; @@ -837,7 +837,7 @@ k9Vobu * k9DVDBackup::remapVobu(uint32_t *value) { } vobu=lstCell->findVobu(sector); if (vobu !=NULL) { - *value = vobu->newSector | tqmask; + *value = vobu->newSector | mask; return vobu; } @@ -1099,7 +1099,7 @@ void k9DVDBackup::update4Menu(ifo_handle_t *_hifo) { qDebug ("Error : could not find startSector"); else { if (remapVobu(&lastSect)==NULL) - lastSect=vobu->tqparent->lastSector; + lastSect=vobu->parent->lastSector; else lastSect--; ptr[i].start_sector = startSect; @@ -1312,7 +1312,7 @@ void k9DVDBackup::updateIfo() { qDebug ("Error : could not find startSector"); else { if (remapVobu(&lastSect)==NULL) - lastSect= vobu->tqparent->lastSector; + lastSect= vobu->parent->lastSector; else lastSect--; ptr[i].start_sector = startSect; @@ -1347,10 +1347,10 @@ void k9DVDBackup::updateIfo() { newPos=0; for(uint32_t j = 0; j < vts_tmapt->tmap[i].nr_of_entries; j++) { //bit 31 indicates whether VOBU time codes are discontinous with previous - uint32_t tqmask=map_ent[j] & 0x80000000 ; + uint32_t mask=map_ent[j] & 0x80000000 ; uint32_t value=map_ent[j] & 0x7FFFFFFF; if (remapVobu(&value) !=NULL) { - map_ent[j]=value | tqmask; + map_ent[j]=value | mask; map_ent[newPos]=map_ent[j]; newPos++; } else -- cgit v1.2.3