From da1ed73c4c94933c6e181a031058946831f15451 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: [PATCH] Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- dvdread/ifo_read.c | 2 +- dvdread/ifo_types.h | 2 +- k9Mplayer/mplayer.ui | 2 +- k9author/chapterEdit.ui | 2 +- k9author/import.ui | 2 +- k9author/menuEdit.ui | 2 +- k9author/newTitle.ui | 2 +- k9decmpeg/mmx.h | 2 +- k9decmpeg/motion_comp_mmx.cpp | 14 +++++++------- k9decmpeg/motion_comp_vis.cpp | 2 +- k9vamps/tcmemcpy.cpp | 4 ++-- libdvdnav/decoder.c | 4 ++-- libk9copy/backupdlg.ui | 2 +- libk9copy/dvdprogress.ui | 2 +- libk9copy/k9dvdbackup.cpp | 14 +++++++------- libk9copy/k9ifo2.cpp | 2 +- libk9copy/mp4dlg.ui | 2 +- libk9copy/processList.ui | 2 +- libk9copy/progress.ui | 2 +- src/configDlg.ui | 2 +- src/k9mainw.ui | 2 +- src/k9mainwsov.ui | 2 +- src/langselectw.ui | 2 +- src/mencoderCmdGen.ui | 2 +- src/playbackoptionsw.ui | 2 +- src/prefAuthor.ui | 2 +- src/prefDVD.ui | 2 +- src/prefMPEG4.ui | 2 +- src/prefMencoder.ui | 2 +- src/prefpreview.ui | 2 +- src/titlefactor.ui | 2 +- src/viewmpeg2.ui | 2 +- 32 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dvdread/ifo_read.c b/dvdread/ifo_read.c index 41c797b..4c0e315 100644 --- a/dvdread/ifo_read.c +++ b/dvdread/ifo_read.c @@ -969,7 +969,7 @@ int ifoRead_TT_SRPT(ifo_handle_t *ifofile) { for(i = 0; i < tt_srpt->nr_of_srpts; i++) { B2N_16(tt_srpt->title[i].nr_of_ptts); - B2N_16(tt_srpt->title[i].tqparental_id); + B2N_16(tt_srpt->title[i].parental_id); B2N_32(tt_srpt->title[i].title_set_sector); } diff --git a/dvdread/ifo_types.h b/dvdread/ifo_types.h index 53ffc05..dccfed5 100644 --- a/dvdread/ifo_types.h +++ b/dvdread/ifo_types.h @@ -596,7 +596,7 @@ typedef struct { playback_type_t pb_ty; uint8_t nr_of_angles; uint16_t nr_of_ptts; - uint16_t tqparental_id; + uint16_t parental_id; uint8_t title_set_nr; uint8_t vts_ttn; uint32_t title_set_sector; diff --git a/k9Mplayer/mplayer.ui b/k9Mplayer/mplayer.ui index 3ded1de..c0c6854 100644 --- a/k9Mplayer/mplayer.ui +++ b/k9Mplayer/mplayer.ui @@ -428,7 +428,7 @@ bDownClick() bSwitchAudioClick() - + kicondialog.h kpushbutton.h diff --git a/k9author/chapterEdit.ui b/k9author/chapterEdit.ui index c3d876f..1307bdc 100644 --- a/k9author/chapterEdit.ui +++ b/k9author/chapterEdit.ui @@ -346,7 +346,7 @@ ckBreakEndClick() bTitleButtonClick() - + ktimewidget.h kurlrequester.h diff --git a/k9author/import.ui b/k9author/import.ui index 36b1949..4569542 100644 --- a/k9author/import.ui +++ b/k9author/import.ui @@ -199,7 +199,7 @@ bAddClick() cbFormatActivated(const TQString &) - + kcombobox.h kselect.h diff --git a/k9author/menuEdit.ui b/k9author/menuEdit.ui index 6e706a5..14abb77 100644 --- a/k9author/menuEdit.ui +++ b/k9author/menuEdit.ui @@ -330,7 +330,7 @@ cbStartActivated(int) cbEndActivated(int) - + kurlrequester.h klineedit.h diff --git a/k9author/newTitle.ui b/k9author/newTitle.ui index 6b5bcd7..7115c31 100644 --- a/k9author/newTitle.ui +++ b/k9author/newTitle.ui @@ -271,7 +271,7 @@ rbLengthClicked() bAddClicked() - + knuminput.h knuminput.h diff --git a/k9decmpeg/mmx.h b/k9decmpeg/mmx.h index bbbca78..a410caa 100755 --- a/k9decmpeg/mmx.h +++ b/k9decmpeg/mmx.h @@ -218,7 +218,7 @@ typedef union { : "m" (mem)) -#define tqmaskmovq(regs,tqmaskreg) mmx_r2ri (tqmaskmovq, regs, tqmaskreg) +#define maskmovq(regs,maskreg) mmx_r2ri (maskmovq, regs, maskreg) #define movntq_r2m(mmreg,var) mmx_r2m (movntq, mmreg, var) diff --git a/k9decmpeg/motion_comp_mmx.cpp b/k9decmpeg/motion_comp_mmx.cpp index f3c30ef..e6c8f78 100755 --- a/k9decmpeg/motion_comp_mmx.cpp +++ b/k9decmpeg/motion_comp_mmx.cpp @@ -636,7 +636,7 @@ static inline void MC_avg2_16 (int height, uint8_t * dest, const uint8_t * ref, } while (--height); } -static mmx_t tqmask_one = {0x0101010101010101LL}; +static mmx_t mask_one = {0x0101010101010101LL}; static inline void MC_put4_8 (int height, uint8_t * dest, const uint8_t * ref, const int stride, const int cpu) @@ -664,7 +664,7 @@ static inline void MC_put4_8 (int height, uint8_t * dest, const uint8_t * ref, pand_r2r (mm5, mm7); pavg_r2r (mm2, mm0); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); psubusb_r2r (mm7, mm0); @@ -695,7 +695,7 @@ static inline void MC_put4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_r2m (mm0, *dest); @@ -714,7 +714,7 @@ static inline void MC_put4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); ref += stride; @@ -741,7 +741,7 @@ static inline void MC_avg4_8 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_m2r (*dest, mm1); @@ -770,7 +770,7 @@ static inline void MC_avg4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_m2r (*dest, mm1); @@ -791,7 +791,7 @@ static inline void MC_avg4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (tqmask_one, mm7); + pand_m2r (mask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_m2r (*(dest+8), mm1); diff --git a/k9decmpeg/motion_comp_vis.cpp b/k9decmpeg/motion_comp_vis.cpp index 49e1b69..eb01501 100755 --- a/k9decmpeg/motion_comp_vis.cpp +++ b/k9decmpeg/motion_comp_vis.cpp @@ -37,7 +37,7 @@ * (x+y+1)>>1 == (x|y)-((x^y)>>1) * * This allows us to average 8 bytes at a time in a 64-bit FPU reg. - * We avoid overflows by tqmasking before we do the shift, and we + * We avoid overflows by masking before we do the shift, and we * implement the shift by multiplying by 1/2 using mul8x16. So in * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating tqmask * of '0xfe' is in f4, a repeating tqmask of '0x7f' is in f6, and diff --git a/k9vamps/tcmemcpy.cpp b/k9vamps/tcmemcpy.cpp index c72cd73..ceb7c69 100644 --- a/k9vamps/tcmemcpy.cpp +++ b/k9vamps/tcmemcpy.cpp @@ -224,7 +224,7 @@ sse.memcpy_small: # Small block copy routine--no prefetch \n" jg 1b \n\ \n\ # Then copy--forward, which seems to be faster than reverse for \n\ - # certain tqalignments \n\ + # certain alignments \n\ xor %%eax, %%eax \n\ 2: movq (%%esi,%%eax,8), %%mm0 # Copy 8 bytes and loop \n\ movntq %%mm0, (%%edi,%%eax,8) \n\ @@ -320,7 +320,7 @@ sse.memcpy_end: \n\ jg 1b \n\ \n\ # Then copy--forward, which seems to be faster than reverse for \n\ - # certain tqalignments \n\ + # certain alignments \n\ xor %%eax, %%eax \n\ 2: " #movdq " (%%rsi,%%rax,8), %%xmm0 # Copy 16 bytes and loop \n\ movntdq %%xmm0, (%%rdi,%%rax,8) \n\ diff --git a/libdvdnav/decoder.c b/libdvdnav/decoder.c index 9586b30..007fe35 100644 --- a/libdvdnav/decoder.c +++ b/libdvdnav/decoder.c @@ -217,11 +217,11 @@ static int32_t eval_special_instruction(command_t* command, int32_t cond) { /* max number of rows < 256, so we will end this set */ line = 256; return cond ? 256 : 0; - case 3: /* Set temporary tqparental level and goto */ + case 3: /* Set temporary parental level and goto */ line = vm_getbits(command, 7, 8); level = vm_getbits(command, 11, 4); if(cond) { - /* This always succeeds now, if we want real tqparental protection */ + /* This always succeeds now, if we want real parental protection */ /* we need to ask the user and have passwords and stuff. */ command->registers->SPRM[13] = level; } diff --git a/libk9copy/backupdlg.ui b/libk9copy/backupdlg.ui index 8b6bb13..6bb8af5 100644 --- a/libk9copy/backupdlg.ui +++ b/libk9copy/backupdlg.ui @@ -375,7 +375,7 @@ bAbortClick() bPlayToggled(bool state) - + kpushbutton.h kpushbutton.h diff --git a/libk9copy/dvdprogress.ui b/libk9copy/dvdprogress.ui index c83d3c4..8bb37b0 100755 --- a/libk9copy/dvdprogress.ui +++ b/libk9copy/dvdprogress.ui @@ -137,5 +137,5 @@ - + diff --git a/libk9copy/k9dvdbackup.cpp b/libk9copy/k9dvdbackup.cpp index 48a1463..e261038 100755 --- a/libk9copy/k9dvdbackup.cpp +++ b/libk9copy/k9dvdbackup.cpp @@ -850,22 +850,22 @@ k9Vobu * k9DVDBackup::remapVobu(uint32_t *value) { k9Vobu * k9DVDBackup::remapOffset(uint32_t _sector,uint32_t *_offset,int _dir) { k9Vobu *vobu1=NULL, *vobu2=NULL; uint32_t offset,sector; - uint32_t tqmaskOffset1=0,tqmaskOffset2=0,tqmaskSector=0; + uint32_t maskOffset1=0,maskOffset2=0,maskSector=0; if ((*_offset!= 0xbfffffff) && (*_offset!=0x3fffffff) && (*_offset!=0x7fffffff)) { if ( (*_offset & 0x80000000) == 0x80000000) - tqmaskOffset1= 0x80000000; + maskOffset1= 0x80000000; if ( (*_offset & 0x40000000) == 0x40000000) - tqmaskOffset2= 0x40000000; + maskOffset2= 0x40000000; offset = *_offset & 0x3FFFFFFF; if ( (_sector & 0x80000000) == 0x80000000) { sector = _sector & 0x7FFFFFFF; - tqmaskSector=0x80000000; + maskSector=0x80000000; } else { sector =_sector; - tqmaskSector=0; + maskSector=0; } k9CellList *lstCell; @@ -883,8 +883,8 @@ k9Vobu * k9DVDBackup::remapOffset(uint32_t _sector,uint32_t *_offset,int _dir) { if ((vobu1 !=NULL) && (vobu2!=NULL)) { - *_offset = abs(vobu1->newSector - vobu2->newSector) | tqmaskOffset1 ; - *_offset |= tqmaskOffset2; + *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ; + *_offset |= maskOffset2; return vobu2; } diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp index 8d5672e..2fb8dbb 100644 --- a/libk9copy/k9ifo2.cpp +++ b/libk9copy/k9ifo2.cpp @@ -419,7 +419,7 @@ void k9Ifo2::updateTT_SRPT(uchar *_buffer) { for(int i = 0; i < tt_srpt->nr_of_srpts; i++) { B2N_16(title_info[i].nr_of_ptts); - B2N_16(title_info[i].tqparental_id); + B2N_16(title_info[i].parental_id); B2N_32(title_info[i].title_set_sector); } memcpy(m_buffer+offset+TT_SRPT_SIZE,title_info,info_length); diff --git a/libk9copy/mp4dlg.ui b/libk9copy/mp4dlg.ui index 9dee05b..a5e124b 100644 --- a/libk9copy/mp4dlg.ui +++ b/libk9copy/mp4dlg.ui @@ -273,7 +273,7 @@ Cancel() - + kprogress.h kpushbutton.h diff --git a/libk9copy/processList.ui b/libk9copy/processList.ui index d5c7b28..8468f7b 100644 --- a/libk9copy/processList.ui +++ b/libk9copy/processList.ui @@ -109,7 +109,7 @@ bCancelClick() - + kpushbutton.h diff --git a/libk9copy/progress.ui b/libk9copy/progress.ui index 44993d9..91ca0de 100644 --- a/libk9copy/progress.ui +++ b/libk9copy/progress.ui @@ -237,7 +237,7 @@ bCancelClick() - + kpushbutton.h kprogress.h diff --git a/src/configDlg.ui b/src/configDlg.ui index 53a4cd3..62f037f 100644 --- a/src/configDlg.ui +++ b/src/configDlg.ui @@ -188,7 +188,7 @@ bAddClick() bOkClick() - + kpushbutton.h kpushbutton.h diff --git a/src/k9mainw.ui b/src/k9mainw.ui index 954b0d5..1e6e0be 100644 --- a/src/k9mainw.ui +++ b/src/k9mainw.ui @@ -416,7 +416,7 @@ ckMp4AspectRatioClick() itemRenamed(TQListViewItem*,int) - + kselect.h kcombobox.h diff --git a/src/k9mainwsov.ui b/src/k9mainwsov.ui index de7de4b..e4e82fc 100644 --- a/src/k9mainwsov.ui +++ b/src/k9mainwsov.ui @@ -413,7 +413,7 @@ ckMp4AspectRatioClick() itemRenamed(QListViewItem*,int) - + kcombobox.h klineedit.h diff --git a/src/langselectw.ui b/src/langselectw.ui index f514146..352d52e 100644 --- a/src/langselectw.ui +++ b/src/langselectw.ui @@ -68,5 +68,5 @@ 89504e470d0a1a0a0000000d4948445200000011000000120806000000bdf935540000022749444154388d9dd24f48d36118c0f1efef97ca0affe582220c9a825966ed20251d86512081c1829da2c33a64070fa5d0a50e5b5d0a42727508ba48073b49185114441b24b59ce5241029643041f1b77fbfaded37759b6f87e5dc3f5df4c203efe1793eefc3f33e9210024992283e1e30d7180cb63a93c928d7d7b301f8c6c65ce7c2e1b39b394288a24b21605c309984f07884989ecec5c2d09078093df9881002b94400d260ded7d707a15041b4f4f6a26b6e7e549cbf1de24ab9dd100c96c4718bc5f81cac159114340a4dcb16060205c8218381fdededb6a7d0b8995f05f075fc61a4e6db0b57fcfecc6c0a1aea743a6b536b6bb610a068f09d5d5d877fcdcfdf04ec39e460621cddc50be65d33c25cabd553d5d282944e67bbf80bacb8dd78bd5e35035ea1d723c18d02448b461d0d72d216e839c0dea93d108b6d3d2b4924fd7e3e78bd131a5ced079550088081fc99ac67e411e5c7a4babbfb24d1cc72b683bc58541412e0e807b5dc0c6580cec139351c4a3874f26fc2a7f4254854d3b80eae7240c1ef6c6418599efdacd69e3f4db83aba85280ac9d5d5edea0b91ee3b73aa12581f94630b2c5d3a0191084422c4e271e6d7d62676548ad7fefbf031dfd2a44dbc3136f9de82f3198c0ee7ed4471ad10a214797deba8d5ffeab2703eb6f8767c7d2704e0a3bdc3179e792046afb55bff0529bbf64a3033a8fefc42db1993ad523739addc797fbbcd1998ba279e5c3962ffaf4e001657e4bbee779f08567734546ae40f517b2c24c5d9542e0000000049454e44ae426082 - + diff --git a/src/mencoderCmdGen.ui b/src/mencoderCmdGen.ui index 497f74c..6d18a21 100644 --- a/src/mencoderCmdGen.ui +++ b/src/mencoderCmdGen.ui @@ -207,7 +207,7 @@ listViewCurrentChanged(TQListViewItem*) - + kpushbutton.h kpushbutton.h diff --git a/src/playbackoptionsw.ui b/src/playbackoptionsw.ui index c2a61dd..19ebae5 100644 --- a/src/playbackoptionsw.ui +++ b/src/playbackoptionsw.ui @@ -397,7 +397,7 @@ cbDefAudioActivated(int) cbDefSubActivated(int) - + kpushbutton.h kpushbutton.h diff --git a/src/prefAuthor.ui b/src/prefAuthor.ui index 9945691..c108b20 100644 --- a/src/prefAuthor.ui +++ b/src/prefAuthor.ui @@ -238,7 +238,7 @@ bButtonFontClicked() - + knuminput.h knuminput.h diff --git a/src/prefDVD.ui b/src/prefDVD.ui index ffa1884..4b113b6 100644 --- a/src/prefDVD.ui +++ b/src/prefDVD.ui @@ -166,7 +166,7 @@ - + kurlrequester.h klineedit.h diff --git a/src/prefMPEG4.ui b/src/prefMPEG4.ui index 1532ae7..7f8116a 100644 --- a/src/prefMPEG4.ui +++ b/src/prefMPEG4.ui @@ -701,5 +701,5 @@ sbAudioGainValueChanged(int) ckUseCacheClick() - + diff --git a/src/prefMencoder.ui b/src/prefMencoder.ui index bd5ebb3..1cab214 100644 --- a/src/prefMencoder.ui +++ b/src/prefMencoder.ui @@ -810,7 +810,7 @@ audio bitrate leFourccTextChanged(const TQString&) bResetClicked() - + kpushbutton.h kpushbutton.h diff --git a/src/prefpreview.ui b/src/prefpreview.ui index 102b8c1..ebef4fc 100644 --- a/src/prefpreview.ui +++ b/src/prefpreview.ui @@ -332,5 +332,5 @@ rbInternalClick() rbMplayerClick() - + diff --git a/src/titlefactor.ui b/src/titlefactor.ui index 1924365..d7e804d 100644 --- a/src/titlefactor.ui +++ b/src/titlefactor.ui @@ -161,5 +161,5 @@ slFactorReleased() ckAutoClicked(bool) - + diff --git a/src/viewmpeg2.ui b/src/viewmpeg2.ui index 8220910..bdc4436 100755 --- a/src/viewmpeg2.ui +++ b/src/viewmpeg2.ui @@ -179,5 +179,5 @@ bPlayClick() sliderPressed() - +