diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
| commit | 914b4db5c94848135cd675ffdb5fa4049cbe33e4 (patch) | |
| tree | 051d5d44af2695f6066f38bee804dfae1ad62490 /mpeglib/lib | |
| parent | f949c4652e0aae023b4306f3550914811743698e (diff) | |
| download | tdemultimedia-914b4db5c94848135cd675ffdb5fa4049cbe33e4.tar.gz tdemultimedia-914b4db5c94848135cd675ffdb5fa4049cbe33e4.zip | |
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/kdemultimedia@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'mpeglib/lib')
| -rw-r--r-- | mpeglib/lib/mpegplay/decoderClass.cpp | 2 | ||||
| -rw-r--r-- | mpeglib/lib/mpegplay/pesSystemStream.cpp | 2 | ||||
| -rw-r--r-- | mpeglib/lib/util/mmx/mmx_asm.h | 2 | ||||
| -rw-r--r-- | mpeglib/lib/util/render/x11/x11Surface.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mpeglib/lib/mpegplay/decoderClass.cpp b/mpeglib/lib/mpegplay/decoderClass.cpp index 0e46f752..1e7df93c 100644 --- a/mpeglib/lib/mpegplay/decoderClass.cpp +++ b/mpeglib/lib/mpegplay/decoderClass.cpp @@ -54,7 +54,7 @@ static const int zigzag_direct_mmx[64] = { -/* Bit tqmasks used by bit i/o operations. */ +/* Bit masks used by bit i/o operations. */ diff --git a/mpeglib/lib/mpegplay/pesSystemStream.cpp b/mpeglib/lib/mpegplay/pesSystemStream.cpp index b9915fc2..10787f21 100644 --- a/mpeglib/lib/mpegplay/pesSystemStream.cpp +++ b/mpeglib/lib/mpegplay/pesSystemStream.cpp @@ -192,7 +192,7 @@ int PESSystemStream::processMPEG2PacketHeader(MpegSystemHeader* mpegHeader){ //LIVID u_char original_or_copy : 1; u_char copyright : 1; - u_char data_tqalignment_indicator : 1; + u_char data_alignment_indicator : 1; u_char pes_priority : 1; u_char pes_scrambling_control : 2; u_char start_code_prefix : 2; // 0x02 diff --git a/mpeglib/lib/util/mmx/mmx_asm.h b/mpeglib/lib/util/mmx/mmx_asm.h index d1c2a0bd..8717eff5 100644 --- a/mpeglib/lib/util/mmx/mmx_asm.h +++ b/mpeglib/lib/util/mmx/mmx_asm.h @@ -208,7 +208,7 @@ typedef union { : "X" (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/mpeglib/lib/util/render/x11/x11Surface.cpp b/mpeglib/lib/util/render/x11/x11Surface.cpp index 0aaf7743..d7b8f052 100644 --- a/mpeglib/lib/util/render/x11/x11Surface.cpp +++ b/mpeglib/lib/util/render/x11/x11Surface.cpp @@ -183,7 +183,7 @@ int X11Surface::open(int width, int height,const char *title, bool border) { } else { // depth is <= 8 // allocate memory for dithertables - // gets the rgb tqmasks + // gets the rgb masks initColorDisplay(xWindow); // create 8 bit dithertables // create private colormap |