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
v3.5.13-sru
tpearson 13 years ago
parent 33e6166f7e
commit 5660db4e68

@ -1778,7 +1778,7 @@ static int ifoRead_PGCIT_internal(ifo_handle_t *ifofile, pgcit_t *pgcit,
for(i = 0; i < pgcit->nr_of_pgci_srp; i++) {
memcpy(&pgcit->pgci_srp[i], ptr, PGCI_SRP_SIZE);
ptr += PGCI_SRP_SIZE;
B2N_16(pgcit->pgci_srp[i].ptl_id_tqmask);
B2N_16(pgcit->pgci_srp[i].ptl_id_mask);
B2N_32(pgcit->pgci_srp[i].pgc_start_byte);
CHECK_VALUE(pgcit->pgci_srp[i].unknown1 == 0);
}

@ -444,7 +444,7 @@ typedef struct {
unsigned int block_type : 2;
unsigned int block_mode : 2;
#endif
uint16_t ptl_id_tqmask;
uint16_t ptl_id_mask;
uint32_t pgc_start_byte;
pgc_t *pgc;
} ATTRIBUTE_PACKED pgci_srp_t;

@ -18,7 +18,7 @@
#include <klocale.h>
#include <kmessagebox.h>
K9Mplayer::K9Mplayer(TQObject *tqparent,const char *name,const TQStringList args):MPlayer((TQWidget*)tqparent) {
K9Mplayer::K9Mplayer(TQObject *parent,const char *name,const TQStringList args):MPlayer((TQWidget*)parent) {
m_seeking=FALSE;
m_initVol=TRUE;
m_title=0;

@ -29,8 +29,8 @@ private:
TQWidget *m_container;
float m_ratio;
public:
//K9Mplayer(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
K9Mplayer(TQObject *tqparent=0,const char *name=0,const TQStringList args=0);
//K9Mplayer(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
K9Mplayer(TQObject *parent=0,const char *name=0,const TQStringList args=0);
~K9Mplayer();
/*$PUBLIC_FUNCTIONS$*/
void setDevice(const TQString & _device);

@ -444,11 +444,11 @@ static const unsigned char img3_mplayer[] = {
/*
* Constructs a MPlayer as a child of 'tqparent', with the
* Constructs a MPlayer as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
MPlayer::MPlayer( TQWidget* tqparent, const char* name, WFlags fl )
: TQWidget( tqparent, name, fl )
MPlayer::MPlayer( TQWidget* parent, const char* name, WFlags fl )
: TQWidget( parent, name, fl )
{
TQImage img;
img.loadFromData( img0_mplayer, sizeof( img0_mplayer ), "PNG" );

@ -26,11 +26,11 @@
#include "kpushbutton.h"
/*
* Constructs a chapterEdit as a child of 'tqparent', with the
* Constructs a chapterEdit as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
chapterEdit::chapterEdit( TQWidget* tqparent, const char* name, WFlags fl )
: TQWidget( tqparent, name, fl )
chapterEdit::chapterEdit( TQWidget* parent, const char* name, WFlags fl )
: TQWidget( parent, name, fl )
{
if ( !name )
setName( "chapterEdit" );

@ -24,11 +24,11 @@
#include "kselect.h"
/*
* Constructs a import as a child of 'tqparent', with the
* Constructs a import as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
import::import( TQWidget* tqparent, const char* name, WFlags fl )
: TQWidget( tqparent, name, fl )
import::import( TQWidget* parent, const char* name, WFlags fl )
: TQWidget( parent, name, fl )
{
if ( !name )
setName( "import" );

@ -41,8 +41,8 @@ void av_free_packet(AVPacket *pkt)
#endif
#endif
k9AviDecode::k9AviDecode(TQObject *tqparent, const char *name)
: TQObject(tqparent, name) {
k9AviDecode::k9AviDecode(TQObject *parent, const char *name)
: TQObject(parent, name) {
if (glibref==0) {
CodecHandle=dlopen("libavcodec.so",RTLD_LAZY | RTLD_GLOBAL);
FormatHandle=dlopen("libavformat.so",RTLD_LAZY | RTLD_GLOBAL);

@ -59,7 +59,7 @@ class k9AviDecode : public TQObject
Q_OBJECT
TQ_OBJECT
public:
k9AviDecode(TQObject *tqparent = 0, const char *name = 0);
k9AviDecode(TQObject *parent = 0, const char *name = 0);
~k9AviDecode();
bool open(const TQString & _fileName);

@ -13,11 +13,11 @@
#include "k9avifile.h"
#include "k9title.h"
k9AviFile::k9AviFile(k9Title *tqparent, const char *name)
: TQObject(tqparent, name)
k9AviFile::k9AviFile(k9Title *parent, const char *name)
: TQObject(parent, name)
{
m_num=tqparent->getFiles()->count();
setTitle(tqparent);
m_num=parent->getFiles()->count();
setTitle(parent);
m_previous=NULL;
m_next=NULL;
m_breakNext=false;

@ -25,7 +25,7 @@ class k9AviFile : public TQObject
Q_OBJECT
TQ_OBJECT
public:
k9AviFile(k9Title *tqparent = 0, const char *name = 0);
k9AviFile(k9Title *parent = 0, const char *name = 0);
~k9AviFile();

@ -24,8 +24,8 @@
#include <kpushbutton.h>
#include <kiconloader.h>
k9ChapterEdit::k9ChapterEdit(TQWidget* tqparent, const char* name, WFlags fl)
: chapterEdit(tqparent,name,fl)
k9ChapterEdit::k9ChapterEdit(TQWidget* parent, const char* name, WFlags fl)
: chapterEdit(parent,name,fl)
{
m_wimage=new k9DrawImage(image,0);
TQGridLayout *l=new TQGridLayout(image,1,1);

@ -25,7 +25,7 @@ class k9ChapterEdit : public chapterEdit
TQ_OBJECT
public:
k9ChapterEdit(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
k9ChapterEdit(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9ChapterEdit();
/*$PUBLIC_FUNCTIONS$*/

@ -27,9 +27,9 @@
#include <kselect.h>
#include "k9processlist.h"
k9Import::k9Import(TQWidget* tqparent, const char* name,k9CdDrives *_drives)
: import(tqparent,name) {
m_parent=(k9Copy*) tqparent;
k9Import::k9Import(TQWidget* parent, const char* name,k9CdDrives *_drives)
: import(parent,name) {
m_parent=(k9Copy*) parent;
drives=_drives;
connect(&m_newDVD,TQT_SIGNAL(sigAddTitle()),this,TQT_SLOT(titleAdded()));

@ -37,7 +37,7 @@ private:
k9MenuEdit *m_menuEdit;
public:
k9Import(TQWidget* tqparent = 0, const char* name = 0,k9CdDrives *_drives=0 );
k9Import(TQWidget* parent = 0, const char* name = 0,k9CdDrives *_drives=0 );
~k9Import();
/*$PUBLIC_FUNCTIONS$*/
void init();

@ -18,8 +18,8 @@
#include "k9avifile.h"
#include "k9menuedit.h"
k9ImportFiles::k9ImportFiles(TQWidget *tqparent, const char *name)
: KMdiMainFrm( tqparent, name ,KMdi::IDEAlMode )
k9ImportFiles::k9ImportFiles(TQWidget *parent, const char *name)
: KMdiMainFrm( parent, name ,KMdi::IDEAlMode )
{
this->setCaption(kapp->makeStdCaption(i18n("Create new DVD"),true));
m_k9Import=new k9Import(this);

@ -30,7 +30,7 @@ class k9ImportFiles : public KMdiMainFrm
Q_OBJECT
TQ_OBJECT
public:
k9ImportFiles(TQWidget *tqparent = 0, const char *name = 0);
k9ImportFiles(TQWidget *parent = 0, const char *name = 0);
~k9ImportFiles();
private:

@ -12,8 +12,8 @@
#include "k9lvitemimport.h"
k9LvItemImport::k9LvItemImport( TQListViewItem *tqparent,eObjectType _objectType)
: TQListViewItem( tqparent) {
k9LvItemImport::k9LvItemImport( TQListViewItem *parent,eObjectType _objectType)
: TQListViewItem( parent) {
m_objectType=_objectType;
m_title=NULL;
m_aviFile=NULL;

@ -23,7 +23,7 @@ class k9LvItemImport: public TQListViewItem {
public:
enum eObjectType {ROOT,TITLE,CHAPTER};
k9LvItemImport( TQListViewItem *tqparent,eObjectType _objectType);
k9LvItemImport( TQListViewItem *parent,eObjectType _objectType);
~k9LvItemImport();
virtual int rtti () const;
eObjectType getObjectType() { return m_objectType;};

@ -19,8 +19,8 @@
#include <tqdom.h>
#include "k9tools.h"
k9Menu::k9Menu(TQObject *tqparent, const char *name)
: TQObject(tqparent, name),m_format(PAL) {
k9Menu::k9Menu(TQObject *parent, const char *name)
: TQObject(parent, name),m_format(PAL) {
m_buttons.setAutoDelete(false);
m_canvas=new TQCanvas(this);
TQPixmap pix(720,576);
@ -79,10 +79,10 @@ void k9Menu::createMenus(TQDomElement *_rootNode) {
penhi.setWidth(lineWidth*2);
phi.setPen(penhi);
phi.setBrush(TQt::NoBrush);
//create the hilite tqmask
TQBitmap tqmask(720,height);
tqmask.fill(TQt::color0);
TQPainter pmk(&tqmask);
//create the hilite mask
TQBitmap mask(720,height);
mask.fill(TQt::color0);
TQPainter pmk(&mask);
TQPen penmk;
penmk.setColor(TQt::color1);
penmk.setWidth(lineWidth*2);
@ -99,7 +99,7 @@ void k9Menu::createMenus(TQDomElement *_rootNode) {
pbg.end();
phi.end();
pmk.end();
pixhi.setMask(tqmask);
pixhi.setMask(mask);
//save menu image
TQString bgFileName=m_workDir+KApplication::randomString(8)+".jpg";
@ -117,7 +117,7 @@ void k9Menu::createMenus(TQDomElement *_rootNode) {
spumux(hiFileName,mpgFileName);
appendMenu(_rootNode);
// tqmask.save(m_workDir+"/tqmask.bmp","BMP",-1);
// mask.save(m_workDir+"/mask.bmp","BMP",-1);
TQFile::remove(bgFileName);
TQFile::remove(m2vFileName);

@ -36,7 +36,7 @@ public:
enum eFormat {
PAL=1,NTSC=2
};
k9Menu(TQObject *tqparent = 0, const char *name = 0);
k9Menu(TQObject *parent = 0, const char *name = 0);
~k9Menu();
k9MenuButton *addButton();
void createMenus(TQDomElement *_rootNode);

@ -99,10 +99,10 @@ void k9MenuButton::update() {
emit sigsetHeight(getHeight());
}
k9MenuButton::k9MenuButton(TQCanvas *tqparent, const char *name)
: TQObject(tqparent, name),m_width(0),m_height(0)
k9MenuButton::k9MenuButton(TQCanvas *parent, const char *name)
: TQObject(parent, name),m_width(0),m_height(0)
{
m_canvas=tqparent;
m_canvas=parent;
m_sprite=NULL;
m_pixmap=NULL;
m_text=new TQCanvasText("",m_canvas);

@ -42,7 +42,7 @@ class k9MenuButton : public TQObject {
public:
enum eTextPosition {BOTTOM=1,RIGHT=2};
k9MenuButton(TQCanvas *tqparent = 0, const char *name = 0);
k9MenuButton(TQCanvas *parent = 0, const char *name = 0);
~k9MenuButton();
void setWidth(int _value,bool _reload=true);

@ -30,8 +30,8 @@
k9MenuEdit::k9MenuEdit(TQWidget* tqparent, const char* name,TQCanvas *_canvas)
: menuEdit(tqparent,name) {
k9MenuEdit::k9MenuEdit(TQWidget* parent, const char* name,TQCanvas *_canvas)
: menuEdit(parent,name) {
bAddText->setPixmap (SmallIcon("add"));
m_noUpdate=false;
m_canvas=_canvas;
@ -263,7 +263,7 @@ void k9MenuEdit::titleSelected(k9Title *_title) {
m_endScripts << "g6=0; call vmgm menu;";
cbEnd->insertItem(i18n("Play Title Menu"));
m_endScripts << "call menu;";
k9NewDVD *newDVD=(k9NewDVD*)_title->tqparent() ;
k9NewDVD *newDVD=(k9NewDVD*)_title->parent() ;
k9NewDVDItems *items=newDVD->getTitles();
for (k9Title *title=items->first();title;title=items->next()) {
cbEnd->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1));

@ -31,7 +31,7 @@ public:
enum eFormat {PAL=1,NTSC=2};
enum eMenuType {ROOTMENU,TITLEMENU};
k9MenuEdit(TQWidget* tqparent = 0, const char* name = 0,TQCanvas *_canvas=0);
k9MenuEdit(TQWidget* parent = 0, const char* name = 0,TQCanvas *_canvas=0);
~k9MenuEdit();
/*$PUBLIC_FUNCTIONS$*/
void setBackgroundImage(const TQImage &_image);

@ -17,9 +17,9 @@
#include <tqcursor.h>
#include <kcursor.h>
k9MenuEditor::k9MenuEditor(
TQCanvas& c, TQWidget* tqparent,
TQCanvas& c, TQWidget* parent,
const char* name, WFlags f) :
TQCanvasView(&c,tqparent,name,f) {
TQCanvasView(&c,parent,name,f) {
this->setMaximumSize(TQSize(724,580));
moving=NULL;
m_canvasSelection=new k9CanvasSelection(this);

@ -26,7 +26,7 @@ class k9MenuEditor : public TQCanvasView {
TQ_OBJECT
public:
k9MenuEditor(TQCanvas&, TQWidget* tqparent=0, const char* name=0, WFlags f=0);
k9MenuEditor(TQCanvas&, TQWidget* parent=0, const char* name=0, WFlags f=0);
void clear();
k9MenuButton* getSelected() ;

@ -28,8 +28,8 @@
#include <tqthread.h>
#include <tqfileinfo.h>
k9NewDVD::k9NewDVD(TQObject *tqparent, const char *name)
: TQObject(tqparent, name) {
k9NewDVD::k9NewDVD(TQObject *parent, const char *name)
: TQObject(parent, name) {
m_workDir=locateLocal("tmp", "k9copy/" ) ;
m_rootMenu=new k9Menu(this);
m_format=PAL;

@ -40,7 +40,7 @@ class k9NewDVD : public TQObject {
TQ_OBJECT
public:
enum eFormat {NTSC=2,PAL=1};
k9NewDVD ( TQObject *tqparent = 0, const char *name = 0 );
k9NewDVD ( TQObject *parent = 0, const char *name = 0 );
~k9NewDVD();
k9NewDVDItems* getTitles() {
return &m_titles;

@ -23,8 +23,8 @@
#include "kpushbutton.h"
#include <kmessagebox.h>
#include <kcursor.h>
k9NewTitle::k9NewTitle(TQWidget* tqparent, const char* name, WFlags fl)
: newTitle(tqparent,name,fl) {
k9NewTitle::k9NewTitle(TQWidget* parent, const char* name, WFlags fl)
: newTitle(parent,name,fl) {
m_fileName="";
}

@ -28,7 +28,7 @@ private:
TQString m_fileName;
TQImage m_image;
public:
k9NewTitle(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
k9NewTitle(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9NewTitle();
void setK9Import ( k9Import* _value );

@ -13,13 +13,13 @@
#include "k9newdvd.h"
#include "k9menu.h"
k9Title::k9Title(k9NewDVD *tqparent, const char *name)
: TQObject(tqparent, name)
k9Title::k9Title(k9NewDVD *parent, const char *name)
: TQObject(parent, name)
{
m_num=tqparent->getTitles()->count();
tqparent->appendTitle(this);
m_num=parent->getTitles()->count();
parent->appendTitle(this);
m_menu=new k9Menu(this,0);
m_menu->setFormat((k9Menu::eFormat)tqparent->getFormat());
m_menu->setFormat((k9Menu::eFormat)parent->getFormat());
}

@ -32,7 +32,7 @@ class k9Title : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
k9Title(k9NewDVD *tqparent = 0, const char *name = 0);
k9Title(k9NewDVD *parent = 0, const char *name = 0);
~k9Title();
k9TitleItems *getFiles();

@ -26,11 +26,11 @@
#include "kcolorbutton.h"
/*
* Constructs a menuEdit as a child of 'tqparent', with the
* Constructs a menuEdit as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
menuEdit::menuEdit( TQWidget* tqparent, const char* name, WFlags fl )
: TQWidget( tqparent, name, fl )
menuEdit::menuEdit( TQWidget* parent, const char* name, WFlags fl )
: TQWidget( parent, name, fl )
{
if ( !name )
setName( "menuEdit" );

@ -28,11 +28,11 @@
#include "klineedit.h"
/*
* Constructs a newTitle as a child of 'tqparent', with the
* Constructs a newTitle as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
newTitle::newTitle( TQWidget* tqparent, const char* name, WFlags fl )
: TQWidget( tqparent, name, fl )
newTitle::newTitle( TQWidget* parent, const char* name, WFlags fl )
: TQWidget( parent, name, fl )
{
if ( !name )
setName( "newTitle" );

@ -197,7 +197,7 @@ static inline uint32_t arch_accel (void)
{
uint64_t no_mvi;
asm volatile ("atqmask %1, %0"
asm volatile ("amask %1, %0"
: "=r" (no_mvi)
: "rI" (256)); /* AMASK_MVI */
return no_mvi ? MPEG2_ACCEL_ALPHA : (MPEG2_ACCEL_ALPHA |

@ -158,7 +158,7 @@ static void inline idct_col (int16_t * const block)
void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride)
{
uint64_t clamptqmask;
uint64_t clampmask;
int i;
for (i = 0; i < 8; i++)
@ -167,18 +167,18 @@ void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride)
for (i = 0; i < 8; i++)
idct_col (block + i);
clamptqmask = zap (-1, 0xaa); /* 0x00ff00ff00ff00ff */
clampmask = zap (-1, 0xaa); /* 0x00ff00ff00ff00ff */
do {
uint64_t shorts0, shorts1;
shorts0 = ldq (block);
shorts0 = maxsw4 (shorts0, 0);
shorts0 = minsw4 (shorts0, clamptqmask);
shorts0 = minsw4 (shorts0, clampmask);
stl (pkwb (shorts0), dest);
shorts1 = ldq (block + 4);
shorts1 = maxsw4 (shorts1, 0);
shorts1 = minsw4 (shorts1, clamptqmask);
shorts1 = minsw4 (shorts1, clampmask);
stl (pkwb (shorts1), dest + 4);
stq (0, block);
@ -192,8 +192,8 @@ void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride)
void mpeg2_idct_add_mvi (const int last, int16_t * block,
uint8_t * dest, const int stride)
{
uint64_t clamptqmask;
uint64_t signtqmask;
uint64_t clampmask;
uint64_t signmask;
int i;
if (last != 129 || (block[0] & (7 << 4)) == (4 << 4)) {
@ -201,9 +201,9 @@ void mpeg2_idct_add_mvi (const int last, int16_t * block,
idct_row (block + 8 * i);
for (i = 0; i < 8; i++)
idct_col (block + i);
clamptqmask = zap (-1, 0xaa); /* 0x00ff00ff00ff00ff */
signtqmask = zap (-1, 0x33);
signtqmask ^= signtqmask >> 1; /* 0x8000800080008000 */
clampmask = zap (-1, 0xaa); /* 0x00ff00ff00ff00ff */
signmask = zap (-1, 0x33);
signmask ^= signmask >> 1; /* 0x8000800080008000 */
do {
uint64_t shorts0, pix0, signs0;
@ -214,22 +214,22 @@ void mpeg2_idct_add_mvi (const int last, int16_t * block,
pix0 = unpkbw (ldl (dest));
/* signed subword add (MMX paddw). */
signs0 = shorts0 & signtqmask;
shorts0 &= ~signtqmask;
signs0 = shorts0 & signmask;
shorts0 &= ~signmask;
shorts0 += pix0;
shorts0 ^= signs0;
/* clamp. */
shorts0 = maxsw4 (shorts0, 0);
shorts0 = minsw4 (shorts0, clamptqmask);
shorts0 = minsw4 (shorts0, clampmask);
/* next 4. */
pix1 = unpkbw (ldl (dest + 4));
signs1 = shorts1 & signtqmask;
shorts1 &= ~signtqmask;
signs1 = shorts1 & signmask;
shorts1 &= ~signmask;
shorts1 += pix1;
shorts1 ^= signs1;
shorts1 = maxsw4 (shorts1, 0);
shorts1 = minsw4 (shorts1, clamptqmask);
shorts1 = minsw4 (shorts1, clampmask);
stl (pkwb (shorts0), dest);
stl (pkwb (shorts1), dest + 4);

@ -52,7 +52,7 @@
*/
/* some rounding constants */
static mmx_t tqmask1 = {0xfefefefefefefefeLL};
static mmx_t mask1 = {0xfefefefefefefefeLL};
static mmx_t round4 = {0x0002000200020002LL};
/*
@ -81,7 +81,7 @@ static inline void mmx_average_2_U8 (uint8_t * dest, const uint8_t * src1,
movq_r2r (mm3, mm4); /* copy 8 src2 bytes */
pxor_r2r (mm1, mm3); /* xor src1 and src2 */
pand_m2r (tqmask1, mm3); /* tqmask lower bits */
pand_m2r (mask1, mm3); /* mask lower bits */
psrlq_i2r (1, mm3); /* /2 */
por_r2r (mm2, mm4); /* or src1 and src2 */
psubb_r2r (mm3, mm4); /* subtract subresults */
@ -104,14 +104,14 @@ static inline void mmx_interp_average_2_U8 (uint8_t * dest,
movq_r2r (mm5, mm6); /* copy 8 src2 bytes */
pxor_r2r (mm3, mm5); /* xor src1 and src2 */
pand_m2r (tqmask1, mm5); /* tqmask lower bits */
pand_m2r (mask1, mm5); /* mask lower bits */
psrlq_i2r (1, mm5); /* /2 */
por_r2r (mm4, mm6); /* or src1 and src2 */
psubb_r2r (mm5, mm6); /* subtract subresults */
movq_r2r (mm6, mm5); /* copy subresult */
pxor_r2r (mm1, mm5); /* xor srcavg and dest */
pand_m2r (tqmask1, mm5); /* tqmask lower bits */
pand_m2r (mask1, mm5); /* mask lower bits */
psrlq_i2r (1, mm5); /* /2 */
por_r2r (mm2, mm6); /* or srcavg and dest */
psubb_r2r (mm5, mm6); /* subtract subresults */
@ -228,7 +228,7 @@ static inline void mmx_interp_average_4_U8 (uint8_t * dest,
movq_r2r (mm1,mm2); /* copy subresult */
pxor_r2r (mm1, mm3); /* xor srcavg and dest */
pand_m2r (tqmask1, mm3); /* tqmask lower bits */
pand_m2r (mask1, mm3); /* mask lower bits */
psrlq_i2r (1, mm3); /* /2 */
por_r2r (mm2, mm4); /* or srcavg and dest */
psubb_r2r (mm3, mm4); /* subtract subresults */

@ -39,8 +39,8 @@
* This allows us to average 8 bytes at a time in a 64-bit FPU reg.
* 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
* VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating mask
* of '0xfe' is in f4, a repeating mask of '0x7f' is in f6, and
* the value 0x80808080 is in f8):
*
* fxor f0, f2, f10

@ -127,9 +127,9 @@ static inline void mmx_yuv2rgb (uint8_t * py, uint8_t * pu, uint8_t * pv)
static inline void mmx_unpack_16rgb (uint8_t * image, const int cpu)
{
static mmx_t mmx_bluetqmask = {0xf8f8f8f8f8f8f8f8LL};
static mmx_t mmx_greentqmask = {0xfcfcfcfcfcfcfcfcLL};
static mmx_t mmx_redtqmask = {0xf8f8f8f8f8f8f8f8LL};
static mmx_t mmx_bluemask = {0xf8f8f8f8f8f8f8f8LL};
static mmx_t mmx_greenmask = {0xfcfcfcfcfcfcfcfcLL};
static mmx_t mmx_redmask = {0xf8f8f8f8f8f8f8f8LL};
/*
* convert RGB plane to RGB 16 bits
@ -138,9 +138,9 @@ static inline void mmx_unpack_16rgb (uint8_t * image, const int cpu)
* mm6 -> GB, mm7 -> AR pixel 0-3
*/
pand_m2r (mmx_bluetqmask, mm0); /* mm0 = b7b6b5b4b3______ */
pand_m2r (mmx_greentqmask, mm2); /* mm2 = g7g6g5g4g3g2____ */
pand_m2r (mmx_redtqmask, mm1); /* mm1 = r7r6r5r4r3______ */
pand_m2r (mmx_bluemask, mm0); /* mm0 = b7b6b5b4b3______ */
pand_m2r (mmx_greenmask, mm2); /* mm2 = g7g6g5g4g3g2____ */
pand_m2r (mmx_redmask, mm1); /* mm1 = r7r6r5r4r3______ */
psrlq_i2r (3, mm0); /* mm0 = ______b7b6b5b4b3 */
pxor_r2r (mm4, mm4); /* mm4 = 0 */
movq_r2r (mm0, mm5); /* mm5 = ______b7b6b5b4b3 */

@ -205,8 +205,8 @@ void K9DBusDispatch::dispatch()
}
}
K9DBusDispatch::K9DBusDispatch(TQObject *tqparent, const char *name)
: TQObject(tqparent, name)
K9DBusDispatch::K9DBusDispatch(TQObject *parent, const char *name)
: TQObject(parent, name)
{
m_dispatcher = new TQTimer(this);
TQObject::connect(m_dispatcher, TQT_SIGNAL(timeout()), this, TQT_SLOT(dispatch()));

@ -45,7 +45,7 @@ class K9DBusDispatch : public TQObject
Q_OBJECT
TQ_OBJECT
public:
K9DBusDispatch(TQObject *tqparent = 0, const char *name = 0);
K9DBusDispatch(TQObject *parent = 0, const char *name = 0);
~K9DBusDispatch();
void setConnection(DBusConnection* _value);

@ -31,8 +31,8 @@ void halDeviceRemoved (LibHalContext *ctx, const char *udi) {
}
k9HalConnection::k9HalConnection(TQObject *tqparent, const char *name)
: TQObject(tqparent, name)
k9HalConnection::k9HalConnection(TQObject *parent, const char *name)
: TQObject(parent, name)
{
m_devices.setAutoDelete(true);
m_context =(void*) libhal_ctx_new();
@ -104,7 +104,7 @@ void k9HalConnection::testVolumeChanged( const char * udi) {
}
else
if( libhal_device_query_capability( (LibHalContext*) m_context, udi, "volume", 0 ) ) {
char* udiParent = libhal_device_get_property_string( (LibHalContext*) m_context, udi, "info.tqparent", 0 );
char* udiParent = libhal_device_get_property_string( (LibHalContext*) m_context, udi, "info.parent", 0 );
if( udiParent ) {
k9HalDevice *device=findDevice( udiParent);
libhal_free_string( udiParent );

@ -61,7 +61,7 @@ private:
K9DBusDispatch *m_dbusDispatch;
private:
k9HalConnection(TQObject *tqparent = 0, const char *name = 0);
k9HalConnection(TQObject *parent = 0, const char *name = 0);
~k9HalConnection();

@ -17,10 +17,10 @@
#include <hal/libhal.h>
#include <hal/libhal-storage.h>
k9HalDevice::k9HalDevice(TQObject *tqparent, const char *udi)
: TQObject(tqparent, udi) {
k9HalDevice::k9HalDevice(TQObject *parent, const char *udi)
: TQObject(parent, udi) {
m_connection=(k9HalConnection*)tqparent;
m_connection=(k9HalConnection*)parent;
getDriveProperties();
}

@ -31,7 +31,7 @@ Q_OBJECT
TQ_OBJECT
public:
k9HalDevice(TQObject *tqparent = 0, const char *name = 0);
k9HalDevice(TQObject *parent = 0, const char *name = 0);
~k9HalDevice();

@ -35,7 +35,7 @@
uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) {
uint64_t result = 0;
uint64_t bit_tqmask = 0;
uint64_t bit_mask = 0;
uint64_t examining = 0;
int32_t bits;
@ -50,12 +50,12 @@ uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) {
abort();
}
/* all ones, please */
bit_tqmask = ~bit_tqmask;
bit_tqmask >>= 63 - start;
bit_mask = ~bit_mask;
bit_mask >>= 63 - start;
bits = start + 1 - count;
examining = ((bit_tqmask >> bits) << bits );
examining = ((bit_mask >> bits) << bits );
command->examined |= examining;
result = (command->instruction & bit_tqmask) >> bits;
result = (command->instruction & bit_mask) >> bits;
return (uint32_t) result;
}

@ -120,22 +120,22 @@ int64_t dvdnav_convert_time(dvd_time_t *time);
*/
/*
* Sets the region tqmask (bit 0 set implies region 1, bit 1 set implies
* Sets the region mask (bit 0 set implies region 1, bit 1 set implies
* region 2, etc) of the virtual machine. Generally you will only need to set
* this if you are playing RCE discs which query the virtual machine as to its
* region setting.
*
* This has _nothing_ to do with the region setting of the DVD drive.
*/
dvdnav_status_t dvdnav_set_region_tqmask(dvdnav_t *self, int32_t region_tqmask);
dvdnav_status_t dvdnav_set_region_mask(dvdnav_t *self, int32_t region_mask);
/*
* Returns the region tqmask (bit 0 set implies region 1, bit 1 set implies
* Returns the region mask (bit 0 set implies region 1, bit 1 set implies
* region 2, etc) of the virtual machine.
*
* This has _nothing_ to do with the region setting of the DVD drive.
*/
dvdnav_status_t dvdnav_get_region_tqmask(dvdnav_t *self, int32_t *region_tqmask);
dvdnav_status_t dvdnav_get_region_mask(dvdnav_t *self, int32_t *region_mask);
/*
* Specify whether read-ahead caching should be used. You may not want this if your

@ -29,7 +29,7 @@
/* Characteristics/setting API calls */
dvdnav_status_t dvdnav_get_region_tqmask(dvdnav_t *this, int32_t *region) {
dvdnav_status_t dvdnav_get_region_mask(dvdnav_t *this, int32_t *region) {
if(!this || !region) {
printerr("Passed a NULL this pointer.");
return DVDNAV_STATUS_ERR;
@ -39,14 +39,14 @@ dvdnav_status_t dvdnav_get_region_tqmask(dvdnav_t *this, int32_t *region) {
return DVDNAV_STATUS_OK;
}
dvdnav_status_t dvdnav_set_region_tqmask(dvdnav_t *this, int32_t tqmask) {
dvdnav_status_t dvdnav_set_region_mask(dvdnav_t *this, int32_t mask) {
if(!this) {
printerr("Passed a NULL this pointer.");
return DVDNAV_STATUS_ERR;
}
pthread_mutex_lock(&this->vm_lock);
this->vm->state.registers.SPRM[20] = (tqmask & 0xff);
this->vm->state.registers.SPRM[20] = (mask & 0xff);
pthread_mutex_unlock(&this->vm_lock);
return DVDNAV_STATUS_OK;
}

@ -359,11 +359,11 @@ int vm_reset(vm_t *vm, const char *dvdroot) {
/* ifoRead_TXTDT_MGI(vmgi); Not implemented yet */
}
if (vm->vmgi) {
int i, tqmask;
fprintf(MSG_OUT, "libdvdnav: DVD disk reports itself with Region tqmask 0x%08x. Regions:",
int i, mask;
fprintf(MSG_OUT, "libdvdnav: DVD disk reports itself with Region mask 0x%08x. Regions:",
vm->vmgi->vmgi_mat->vmg_category);
for (i = 1, tqmask = 1; i <= 8; i++, tqmask <<= 1)
if (((vm->vmgi->vmgi_mat->vmg_category >> 16) & tqmask) == 0)
for (i = 1, mask = 1; i <= 8; i++, mask <<= 1)
if (((vm->vmgi->vmgi_mat->vmg_category >> 16) & mask) == 0)
fprintf(MSG_OUT, " %d", i);
fprintf(MSG_OUT, "\n");
}

@ -21,14 +21,14 @@
#include "kpushbutton.h"
/*
* Constructs a backupDlg as a child of 'tqparent', with the
* Constructs a backupDlg as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
backupDlg::backupDlg( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
: TQDialog( tqparent, name, modal, fl )
backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl )
: TQDialog( parent, name, modal, fl )
{
if ( !name )
setName( "backupDlg" );

@ -18,14 +18,14 @@
#include <tqwhatsthis.h>
/*
* Constructs a DVDProgress as a child of 'tqparent', with the
* Constructs a DVDProgress as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
DVDProgress::DVDProgress( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
: TQDialog( tqparent, name, modal, fl )
DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags fl )
: TQDialog( parent, name, modal, fl )
{
if ( !name )
setName( "DVDProgress" );

@ -26,8 +26,8 @@ public:
};
k9AudioCodecs::k9AudioCodecs(TQObject *tqparent, const char *name)
: TQObject(tqparent, name)
k9AudioCodecs::k9AudioCodecs(TQObject *parent, const char *name)
: TQObject(parent, name)
{
m_config=new k9Config();
TQStringList slLabels=m_config->getCodecLabelsAudio();

@ -26,7 +26,7 @@ class k9AudioCodecs : public TQObject
Q_OBJECT
TQ_OBJECT
public:
k9AudioCodecs(TQObject *tqparent = 0, const char *name = 0);
k9AudioCodecs(TQObject *parent = 0, const char *name = 0);
~k9AudioCodecs();
void save();

@ -34,8 +34,8 @@
#include <tqlayout.h>
#include "k9drawimage.h"
k9BackupDlg::k9BackupDlg(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
: backupDlg(tqparent,name, modal,fl) {
k9BackupDlg::k9BackupDlg(TQWidget* parent, const char* name, bool modal, WFlags fl)
: backupDlg(parent,name, modal,fl) {
Abort=false;
timer = new TQTimer( this );
time = new TQTime(0,0);

@ -34,7 +34,7 @@ class k9BackupDlg : public backupDlg
TQ_OBJECT
public:
k9BackupDlg(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
k9BackupDlg(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~k9BackupDlg();
/*$PUBLIC_FUNCTIONS$*/
void setTotalSteps(uint32_t _totalSteps);

@ -164,8 +164,8 @@ int k9Cell::isNavPack (uchar *_ptr) {
k9Cell::k9Cell(TQObject *tqparent, const char *name)
: TQObject(tqparent, name) {
k9Cell::k9Cell(TQObject *parent, const char *name)
: TQObject(parent, name) {
vobus.setAutoDelete(true);
numVobu=0;
@ -323,7 +323,7 @@ void k9Cell::addNewVobus(char *_buffer,uint32_t _len,uint32_t _position,int _vob
k9Vobu::k9Vobu(k9Cell *_parent,uint32_t _oldSector)
: TQObject(_parent,"") {
tqparent=_parent;
parent=_parent;
oldSector = _oldSector;
newSector = 0;
size=0;

@ -35,7 +35,7 @@ class k9Vobu : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
k9Vobu(k9Cell * tqparent,uint32_t _oldSector);
k9Vobu(k9Cell * parent,uint32_t _oldSector);
~k9Vobu();
uint32_t newSector;
uint32_t oldSector;
@ -44,7 +44,7 @@ public:
int firstSubp[32];
int firstVideo;
bool empty;
k9Cell *tqparent;
k9Cell *parent;
long vobPos;
int vobNum;
uchar frameType;
@ -65,7 +65,7 @@ class k9Cell : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
k9Cell(TQObject *tqparent = 0, const char *name = 0);
k9Cell(TQObject *parent = 0, const char *name = 0);
~k9Cell();
k9Vobu * addVobu(uint32_t _sector);
void addNewVobus(char *_buffer,uint32_t _len,uint32_t _position,int _vobNum,long _vobPos);

@ -12,8 +12,8 @@
#include "k9drawimage.h"
#include <tqpainter.h>
k9DrawImage::k9DrawImage(TQWidget *tqparent, const char *name)
: TQWidget(tqparent, name)
k9DrawImage::k9DrawImage(TQWidget *parent, const char *name)
: TQWidget(parent, name)
{
}

@ -23,7 +23,7 @@ class k9DrawImage : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
k9DrawImage(TQWidget *tqparent = 0, const char *name = 0);
k9DrawImage(TQWidget *parent = 0, const char *name = 0);
void setImage(TQString _fileName);
void setImage(const TQImage &_image);
~k9DrawImage();

@ -82,7 +82,7 @@ int k9DVD::getmenuSize() {
return m_menuSize;
}
k9DVD::k9DVD(TQObject *tqparent, const char *name,const TQStringList args) {
k9DVD::k9DVD(TQObject *parent, const char *name,const TQStringList args) {
m_error=false;
m_opened=false;
m_titles.setAutoDelete(true);

@ -81,7 +81,7 @@ private:
k9DVDTitle* m_start;
int m_titlesetCount;
public:
k9DVD(TQObject *tqparent=0,const char *name=0,const TQStringList args=0) ;
k9DVD(TQObject *parent=0,const char *name=0,const TQStringList args=0) ;
~k9DVD();
/**

@ -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;