summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit5660db4e68c904cc2dd01888775483189cda7a10 (patch)
treef8bb487ab12519611d3ddca1839a03396e954c77
parent33e6166f7e62c479bad5d46ad240ea9704f848fd (diff)
downloadk9copy-5660db4e.tar.gz
k9copy-5660db4e.zip
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
-rw-r--r--dvdread/ifo_read.c2
-rw-r--r--dvdread/ifo_types.h2
-rw-r--r--k9Mplayer/k9mplayer.cpp2
-rw-r--r--k9Mplayer/k9mplayer.h4
-rw-r--r--k9Mplayer/mplayer.cpp6
-rw-r--r--k9author/chapterEdit.cpp6
-rw-r--r--k9author/import.cpp6
-rw-r--r--k9author/k9avidecode.cpp4
-rw-r--r--k9author/k9avidecode.h2
-rw-r--r--k9author/k9avifile.cpp8
-rw-r--r--k9author/k9avifile.h2
-rw-r--r--k9author/k9chapteredit.cpp4
-rw-r--r--k9author/k9chapteredit.h2
-rw-r--r--k9author/k9import.cpp6
-rw-r--r--k9author/k9import.h2
-rw-r--r--k9author/k9importfiles.cpp4
-rw-r--r--k9author/k9importfiles.h2
-rw-r--r--k9author/k9lvitemimport.cpp4
-rw-r--r--k9author/k9lvitemimport.h2
-rw-r--r--k9author/k9menu.cpp16
-rw-r--r--k9author/k9menu.h2
-rw-r--r--k9author/k9menubutton.cpp6
-rw-r--r--k9author/k9menubutton.h2
-rw-r--r--k9author/k9menuedit.cpp6
-rw-r--r--k9author/k9menuedit.h2
-rw-r--r--k9author/k9menueditor.cpp4
-rw-r--r--k9author/k9menueditor.h2
-rw-r--r--k9author/k9newdvd.cpp4
-rw-r--r--k9author/k9newdvd.h2
-rw-r--r--k9author/k9newtitle.cpp4
-rw-r--r--k9author/k9newtitle.h2
-rw-r--r--k9author/k9title.cpp10
-rw-r--r--k9author/k9title.h2
-rw-r--r--k9author/menuEdit.cpp6
-rw-r--r--k9author/newTitle.cpp6
-rwxr-xr-xk9decmpeg/cpu_accel.cpp2
-rwxr-xr-xk9decmpeg/idct_alpha.cpp30
-rwxr-xr-xk9decmpeg/motion_comp_mmx.cpp10
-rwxr-xr-xk9decmpeg/motion_comp_vis.cpp4
-rwxr-xr-xk9decmpeg/rgb_mmx.cpp12
-rw-r--r--k9devices/k9dbusdispatch.cpp4
-rw-r--r--k9devices/k9dbusdispatch.h2
-rw-r--r--k9devices/k9halconnection.cpp6
-rw-r--r--k9devices/k9halconnection.h2
-rw-r--r--k9devices/k9haldevice.cpp6
-rw-r--r--k9devices/k9haldevice.h2
-rw-r--r--libdvdnav/decoder.c10
-rw-r--r--libdvdnav/dvdnav.h8
-rw-r--r--libdvdnav/settings.c6
-rw-r--r--libdvdnav/vm.c8
-rw-r--r--libk9copy/backupdlg.cpp6
-rw-r--r--libk9copy/dvdprogress.cpp6
-rw-r--r--libk9copy/k9audiocodecs.cpp4
-rw-r--r--libk9copy/k9audiocodecs.h2
-rw-r--r--libk9copy/k9backupdlg.cpp4
-rw-r--r--libk9copy/k9backupdlg.h2
-rwxr-xr-xlibk9copy/k9cell.cpp6
-rwxr-xr-xlibk9copy/k9cell.h6
-rw-r--r--libk9copy/k9drawimage.cpp4
-rw-r--r--libk9copy/k9drawimage.h2
-rwxr-xr-xlibk9copy/k9dvd.cpp2
-rwxr-xr-xlibk9copy/k9dvd.h2
-rwxr-xr-xlibk9copy/k9dvdbackup.cpp18
-rwxr-xr-xlibk9copy/k9dvdprogress.cpp4
-rwxr-xr-xlibk9copy/k9dvdprogress.h2
-rw-r--r--libk9copy/k9dvdsize.cpp2
-rw-r--r--libk9copy/k9dvdsize.h2
-rw-r--r--libk9copy/k9ifo2.cpp2
-rw-r--r--libk9copy/k9mp4dlg.cpp4
-rw-r--r--libk9copy/k9mp4dlg.h2
-rw-r--r--libk9copy/k9mp4enc.cpp4
-rw-r--r--libk9copy/k9mp4enc.h2
-rw-r--r--libk9copy/k9process.cpp4
-rw-r--r--libk9copy/k9process.h2
-rw-r--r--libk9copy/k9processlist.cpp2
-rw-r--r--libk9copy/k9processlist.h2
-rw-r--r--libk9copy/k9progress.cpp4
-rw-r--r--libk9copy/k9progress.h2
-rw-r--r--libk9copy/k9titleencopt.cpp6
-rw-r--r--libk9copy/k9titleencopt.h4
-rw-r--r--libk9copy/k9videocodecs.cpp4
-rw-r--r--libk9copy/k9videocodecs.h2
-rw-r--r--libk9copy/mp4dlg.cpp6
-rw-r--r--libk9copy/processList.cpp6
-rw-r--r--libk9copy/progress.cpp6
-rw-r--r--src/configDlg.cpp6
-rw-r--r--src/k9glwidget.cpp6
-rw-r--r--src/k9glwidget.h10
-rw-r--r--src/k9langselect.cpp4
-rw-r--r--src/k9langselect.h6
-rw-r--r--src/k9main.cpp26
-rw-r--r--src/k9main.h18
-rw-r--r--src/k9mainw.cpp6
-rw-r--r--src/k9mencodercmdgen.cpp48
-rw-r--r--src/k9mencodercmdgen.h2
-rw-r--r--src/k9mp4title.cpp4
-rw-r--r--src/k9mp4title.h2
-rw-r--r--src/k9playbackoptions.cpp4
-rw-r--r--src/k9playbackoptions.h2
-rw-r--r--src/k9prefauthor.cpp4
-rw-r--r--src/k9prefauthor.h2
-rw-r--r--src/k9prefdvd.cpp4
-rw-r--r--src/k9prefdvd.h2
-rw-r--r--src/k9prefmencoder.cpp4
-rw-r--r--src/k9prefmencoder.h2
-rw-r--r--src/k9prefmpeg4.cpp4
-rw-r--r--src/k9prefmpeg4.h2
-rw-r--r--src/k9prefpreview.cpp4
-rw-r--r--src/k9prefpreview.h2
-rw-r--r--src/k9settings.cpp2
-rw-r--r--src/k9settings.h2
-rw-r--r--src/k9titlefactor.cpp4
-rw-r--r--src/k9titlefactor.h2
-rw-r--r--src/k9updatefactor.cpp4
-rw-r--r--src/k9updatefactor.h2
-rw-r--r--src/kconfigdlg.cpp4
-rw-r--r--src/kconfigdlg.h2
-rwxr-xr-xsrc/kviewmpeg2.cpp2
-rw-r--r--src/langselectw.cpp6
-rw-r--r--src/mencoderCmdGen.cpp6
-rw-r--r--src/playbackoptionsw.cpp6
-rw-r--r--src/prefAuthor.cpp6
-rw-r--r--src/prefDVD.cpp6
-rw-r--r--src/prefMPEG4.cpp6
-rw-r--r--src/prefMencoder.cpp6
-rw-r--r--src/prefpreview.cpp6
-rw-r--r--src/titlefactor.cpp6
-rw-r--r--src/viewmpeg2.cpp6
128 files changed, 327 insertions, 327 deletions
diff --git a/dvdread/ifo_read.c b/dvdread/ifo_read.c
index 4c0e315..e58b913 100644
--- a/dvdread/ifo_read.c
+++ b/dvdread/ifo_read.c
@@ -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);
}
diff --git a/dvdread/ifo_types.h b/dvdread/ifo_types.h
index dccfed5..ec4937d 100644
--- a/dvdread/ifo_types.h
+++ b/dvdread/ifo_types.h
@@ -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;
diff --git a/k9Mplayer/k9mplayer.cpp b/k9Mplayer/k9mplayer.cpp
index 7e80427..24bc9a9 100644
--- a/k9Mplayer/k9mplayer.cpp
+++ b/k9Mplayer/k9mplayer.cpp
@@ -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;
diff --git a/k9Mplayer/k9mplayer.h b/k9Mplayer/k9mplayer.h
index 241af0d..62bebec 100644
--- a/k9Mplayer/k9mplayer.h
+++ b/k9Mplayer/k9mplayer.h
@@ -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);
diff --git a/k9Mplayer/mplayer.cpp b/k9Mplayer/mplayer.cpp
index 109c3f7..cd033e2 100644
--- a/k9Mplayer/mplayer.cpp
+++ b/k9Mplayer/mplayer.cpp
@@ -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" );
diff --git a/k9author/chapterEdit.cpp b/k9author/chapterEdit.cpp
index a219b64..04eec11 100644
--- a/k9author/chapterEdit.cpp
+++ b/k9author/chapterEdit.cpp
@@ -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" );
diff --git a/k9author/import.cpp b/k9author/import.cpp
index 48593bd..69ebdbc 100644
--- a/k9author/import.cpp
+++ b/k9author/import.cpp
@@ -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" );
diff --git a/k9author/k9avidecode.cpp b/k9author/k9avidecode.cpp
index 979cedb..bfb13ac 100644
--- a/k9author/k9avidecode.cpp
+++ b/k9author/k9avidecode.cpp
@@ -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);
diff --git a/k9author/k9avidecode.h b/k9author/k9avidecode.h
index 67614a3..06004f7 100644
--- a/k9author/k9avidecode.h
+++ b/k9author/k9avidecode.h
@@ -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);
diff --git a/k9author/k9avifile.cpp b/k9author/k9avifile.cpp
index 0e9bf76..32fff6f 100644
--- a/k9author/k9avifile.cpp
+++ b/k9author/k9avifile.cpp
@@ -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;
diff --git a/k9author/k9avifile.h b/k9author/k9avifile.h
index 21f1e6a..4a06f1e 100644
--- a/k9author/k9avifile.h
+++ b/k9author/k9avifile.h
@@ -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();
diff --git a/k9author/k9chapteredit.cpp b/k9author/k9chapteredit.cpp
index ff22b8d..3453cf5 100644
--- a/k9author/k9chapteredit.cpp
+++ b/k9author/k9chapteredit.cpp
@@ -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);
diff --git a/k9author/k9chapteredit.h b/k9author/k9chapteredit.h
index 29a919b..2af1415 100644
--- a/k9author/k9chapteredit.h
+++ b/k9author/k9chapteredit.h
@@ -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$*/
diff --git a/k9author/k9import.cpp b/k9author/k9import.cpp
index 13976e7..654ce5d 100644
--- a/k9author/k9import.cpp
+++ b/k9author/k9import.cpp
@@ -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()));
diff --git a/k9author/k9import.h b/k9author/k9import.h
index 9a46704..02a43be 100644
--- a/k9author/k9import.h
+++ b/k9author/k9import.h
@@ -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();
diff --git a/k9author/k9importfiles.cpp b/k9author/k9importfiles.cpp
index c3ed6c4..addf207 100644
--- a/k9author/k9importfiles.cpp
+++ b/k9author/k9importfiles.cpp
@@ -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);
diff --git a/k9author/k9importfiles.h b/k9author/k9importfiles.h
index d7fd672..305b5b3 100644
--- a/k9author/k9importfiles.h
+++ b/k9author/k9importfiles.h
@@ -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:
diff --git a/k9author/k9lvitemimport.cpp b/k9author/k9lvitemimport.cpp
index 38b1855..7f2b737 100644
--- a/k9author/k9lvitemimport.cpp
+++ b/k9author/k9lvitemimport.cpp
@@ -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;
diff --git a/k9author/k9lvitemimport.h b/k9author/k9lvitemimport.h
index 2b882f1..d466458 100644
--- a/k9author/k9lvitemimport.h
+++ b/k9author/k9lvitemimport.h
@@ -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;};
diff --git a/k9author/k9menu.cpp b/k9author/k9menu.cpp
index a911e97..82e1010 100644
--- a/k9author/k9menu.cpp
+++ b/k9author/k9menu.cpp
@@ -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);
diff --git a/k9author/k9menu.h b/k9author/k9menu.h
index c6d783f..d34150e 100644
--- a/k9author/k9menu.h
+++ b/k9author/k9menu.h
@@ -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);
diff --git a/k9author/k9menubutton.cpp b/k9author/k9menubutton.cpp
index 5256983..9a6014a 100644
--- a/k9author/k9menubutton.cpp
+++ b/k9author/k9menubutton.cpp
@@ -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);
diff --git a/k9author/k9menubutton.h b/k9author/k9menubutton.h
index 06b58c2..80d5cf3 100644
--- a/k9author/k9menubutton.h
+++ b/k9author/k9menubutton.h
@@ -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);
diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp
index ec53c03..e9a018b 100644
--- a/k9author/k9menuedit.cpp
+++ b/k9author/k9menuedit.cpp
@@ -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));
diff --git a/k9author/k9menuedit.h b/k9author/k9menuedit.h
index c5a1cd3..349a20e 100644
--- a/k9author/k9menuedit.h
+++ b/k9author/k9menuedit.h
@@ -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);
diff --git a/k9author/k9menueditor.cpp b/k9author/k9menueditor.cpp
index f0ea2b3..0099a51 100644
--- a/k9author/k9menueditor.cpp
+++ b/k9author/k9menueditor.cpp
@@ -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);
diff --git a/k9author/k9menueditor.h b/k9author/k9menueditor.h
index d4332dd..dc06f3a 100644
--- a/k9author/k9menueditor.h
+++ b/k9author/k9menueditor.h
@@ -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() ;
diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp
index 5f0500e..e4c747f 100644
--- a/k9author/k9newdvd.cpp
+++ b/k9author/k9newdvd.cpp
@@ -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;
diff --git a/k9author/k9newdvd.h b/k9author/k9newdvd.h
index ce7e729..cacbe99 100644
--- a/k9author/k9newdvd.h
+++ b/k9author/k9newdvd.h
@@ -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;
diff --git a/k9author/k9newtitle.cpp b/k9author/k9newtitle.cpp
index 81faf3a..a3db200 100644
--- a/k9author/k9newtitle.cpp
+++ b/k9author/k9newtitle.cpp
@@ -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="";
}
diff --git a/k9author/k9newtitle.h b/k9author/k9newtitle.h
index 2b24d02..7b2ed9a 100644
--- a/k9author/k9newtitle.h
+++ b/k9author/k9newtitle.h
@@ -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 );
diff --git a/k9author/k9title.cpp b/k9author/k9title.cpp
index 47d4563..f585291 100644
--- a/k9author/k9title.cpp
+++ b/k9author/k9title.cpp
@@ -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());
}
diff --git a/k9author/k9title.h b/k9author/k9title.h
index f28677f..109fd67 100644
--- a/k9author/k9title.h
+++ b/k9author/k9title.h
@@ -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();
diff --git a/k9author/menuEdit.cpp b/k9author/menuEdit.cpp
index d9a74c4..3f65a27 100644
--- a/k9author/menuEdit.cpp
+++ b/k9author/menuEdit.cpp
@@ -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" );
diff --git a/k9author/newTitle.cpp b/k9author/newTitle.cpp
index e838b01..154e5ef 100644
--- a/k9author/newTitle.cpp
+++ b/k9author/newTitle.cpp
@@ -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" );
diff --git a/k9decmpeg/cpu_accel.cpp b/k9decmpeg/cpu_accel.cpp
index 6af9558..9589868 100755
--- a/k9decmpeg/cpu_accel.cpp
+++ b/k9decmpeg/cpu_accel.cpp
@@ -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 |
diff --git a/k9decmpeg/idct_alpha.cpp b/k9decmpeg/idct_alpha.cpp
index 7105089..4f1e88f 100755
--- a/k9decmpeg/idct_alpha.cpp
+++ b/k9decmpeg/idct_alpha.cpp
@@ -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);
diff --git a/k9decmpeg/motion_comp_mmx.cpp b/k9decmpeg/motion_comp_mmx.cpp
index e6c8f78..97828c4 100755
--- a/k9decmpeg/motion_comp_mmx.cpp
+++ b/k9decmpeg/motion_comp_mmx.cpp
@@ -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 */
diff --git a/k9decmpeg/motion_comp_vis.cpp b/k9decmpeg/motion_comp_vis.cpp
index eb01501..218af8a 100755
--- a/k9decmpeg/motion_comp_vis.cpp
+++ b/k9decmpeg/motion_comp_vis.cpp
@@ -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
diff --git a/k9decmpeg/rgb_mmx.cpp b/k9decmpeg/rgb_mmx.cpp
index 59b7c6e..957708c 100755
--- a/k9decmpeg/rgb_mmx.cpp
+++ b/k9decmpeg/rgb_mmx.cpp
@@ -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 */
diff --git a/k9devices/k9dbusdispatch.cpp b/k9devices/k9dbusdispatch.cpp
index 32f8df8..9c148fe 100644
--- a/k9devices/k9dbusdispatch.cpp
+++ b/k9devices/k9dbusdispatch.cpp
@@ -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()));
diff --git a/k9devices/k9dbusdispatch.h b/k9devices/k9dbusdispatch.h
index d9d210e..8e86426 100644
--- a/k9devices/k9dbusdispatch.h
+++ b/k9devices/k9dbusdispatch.h
@@ -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);
diff --git a/k9devices/k9halconnection.cpp b/k9devices/k9halconnection.cpp
index 12d23cb..e420472 100644
--- a/k9devices/k9halconnection.cpp
+++ b/k9devices/k9halconnection.cpp
@@ -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 );
diff --git a/k9devices/k9halconnection.h b/k9devices/k9halconnection.h
index ac44db4..6c532d8 100644
--- a/k9devices/k9halconnection.h
+++ b/k9devices/k9halconnection.h
@@ -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();
diff --git a/k9devices/k9haldevice.cpp b/k9devices/k9haldevice.cpp
index f42ead8..3c35adc 100644
--- a/k9devices/k9haldevice.cpp
+++ b/k9devices/k9haldevice.cpp
@@ -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();
}
diff --git a/k9devices/k9haldevice.h b/k9devices/k9haldevice.h
index c2c0e0c..e77adef 100644
--- a/k9devices/k9haldevice.h
+++ b/k9devices/k9haldevice.h
@@ -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();
diff --git a/libdvdnav/decoder.c b/libdvdnav/decoder.c
index 007fe35..1c21f60 100644
--- a/libdvdnav/decoder.c
+++ b/libdvdnav/decoder.c
@@ -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;
}
diff --git a/libdvdnav/dvdnav.h b/libdvdnav/dvdnav.h
index b8618d9..b9812ad 100644
--- a/libdvdnav/dvdnav.h
+++ b/libdvdnav/dvdnav.h
@@ -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
diff --git a/libdvdnav/settings.c b/libdvdnav/settings.c
index a760b96..4af8aea 100644
--- a/libdvdnav/settings.c
+++ b/libdvdnav/settings.c
@@ -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;
}
diff --git a/libdvdnav/vm.c b/libdvdnav/vm.c
index 0df5f0b..dbebafa 100644
--- a/libdvdnav/vm.c
+++ b/libdvdnav/vm.c
@@ -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");
}
diff --git a/libk9copy/backupdlg.cpp b/libk9copy/backupdlg.cpp
index 1cc01d2..e760dfa 100644
--- a/libk9copy/backupdlg.cpp
+++ b/libk9copy/backupdlg.cpp
@@ -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" );
diff --git a/libk9copy/dvdprogress.cpp b/libk9copy/dvdprogress.cpp
index 83e37a5..3c85363 100644
--- a/libk9copy/dvdprogress.cpp
+++ b/libk9copy/dvdprogress.cpp
@@ -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" );
diff --git a/libk9copy/k9audiocodecs.cpp b/libk9copy/k9audiocodecs.cpp
index 23098f2..b3323d5 100644
--- a/libk9copy/k9audiocodecs.cpp
+++ b/libk9copy/k9audiocodecs.cpp
@@ -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();
diff --git a/libk9copy/k9audiocodecs.h b/libk9copy/k9audiocodecs.h
index 9727629..007bd7c 100644
--- a/libk9copy/k9audiocodecs.h
+++ b/libk9copy/k9audiocodecs.h
@@ -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();
diff --git a/libk9copy/k9backupdlg.cpp b/libk9copy/k9backupdlg.cpp
index e71033d..71d2507 100644
--- a/libk9copy/k9backupdlg.cpp
+++ b/libk9copy/k9backupdlg.cpp
@@ -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);
diff --git a/libk9copy/k9backupdlg.h b/libk9copy/k9backupdlg.h
index 3e7a7f4..6e92ce5 100644
--- a/libk9copy/k9backupdlg.h
+++ b/libk9copy/k9backupdlg.h
@@ -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);
diff --git a/libk9copy/k9cell.cpp b/libk9copy/k9cell.cpp
index 4de41d8..c7a6433 100755
--- a/libk9copy/k9cell.cpp
+++ b/libk9copy/k9cell.cpp
@@ -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;
diff --git a/libk9copy/k9cell.h b/libk9copy/k9cell.h
index f5a6d45..d62a870 100755
--- a/libk9copy/k9cell.h
+++ b/libk9copy/k9cell.h
@@ -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);
diff --git a/libk9copy/k9drawimage.cpp b/libk9copy/k9drawimage.cpp
index 4103df9..25593c5 100644
--- a/libk9copy/k9drawimage.cpp
+++ b/libk9copy/k9drawimage.cpp
@@ -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)
{
}
diff --git a/libk9copy/k9drawimage.h b/libk9copy/k9drawimage.h
index ebe0d9f..dc51c67 100644
--- a/libk9copy/k9drawimage.h
+++ b/libk9copy/k9drawimage.h
@@ -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();
diff --git a/libk9copy/k9dvd.cpp b/libk9copy/k9dvd.cpp
index ded75c9..c9beed3 100755
--- a/libk9copy/k9dvd.cpp
+++ b/libk9copy/k9dvd.cpp
@@ -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);
diff --git a/libk9copy/k9dvd.h b/libk9copy/k9dvd.h
index 94ca07c..e8c7d2e 100755
--- a/libk9copy/k9dvd.h
+++ b/libk9copy/k9dvd.h
@@ -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();
/**
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
diff --git a/libk9copy/k9dvdprogress.cpp b/libk9copy/k9dvdprogress.cpp
index 08e8a70..9a35821 100755
--- a/libk9copy/k9dvdprogress.cpp
+++ b/libk9copy/k9dvdprogress.cpp
@@ -22,8 +22,8 @@
#include <tqprogressbar.h>
#include <tqlabel.h>
-k9DVDProgress::k9DVDProgress(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
- : DVDProgress( tqparent, name, modal, fl )
+k9DVDProgress::k9DVDProgress(TQWidget* parent, const char* name, bool modal, WFlags fl)
+ : DVDProgress( parent, name, modal, fl )
{
}
diff --git a/libk9copy/k9dvdprogress.h b/libk9copy/k9dvdprogress.h
index 6d4ebc3..98ab463 100755
--- a/libk9copy/k9dvdprogress.h
+++ b/libk9copy/k9dvdprogress.h
@@ -31,7 +31,7 @@ class k9DVDProgress : public DVDProgress {
Q_OBJECT
TQ_OBJECT
public:
- k9DVDProgress(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ k9DVDProgress(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~k9DVDProgress();
/** No descriptions */
void setpbTitleTotalSteps(unsigned int total);
diff --git a/libk9copy/k9dvdsize.cpp b/libk9copy/k9dvdsize.cpp
index ae872ed..0e671b3 100644
--- a/libk9copy/k9dvdsize.cpp
+++ b/libk9copy/k9dvdsize.cpp
@@ -13,7 +13,7 @@
int DVD_MAX_SIZE=4400;
-k9DVDSize::k9DVDSize(TQObject *tqparent,const char *name,const TQStringList args)
+k9DVDSize::k9DVDSize(TQObject *parent,const char *name,const TQStringList args)
{
}
diff --git a/libk9copy/k9dvdsize.h b/libk9copy/k9dvdsize.h
index ddb6aad..ab6c73c 100644
--- a/libk9copy/k9dvdsize.h
+++ b/libk9copy/k9dvdsize.h
@@ -23,7 +23,7 @@ Q_OBJECT
private:
static int m_size;
public:
- k9DVDSize(TQObject *tqparent=0,const char *name=0,const TQStringList args=0) ;
+ k9DVDSize(TQObject *parent=0,const char *name=0,const TQStringList args=0) ;
static int getMaxSize();
static void setMaxSize(int _size);
virtual int getMaxSizeDyn();
diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp
index 2fb8dbb..a4b7fef 100644
--- a/libk9copy/k9ifo2.cpp
+++ b/libk9copy/k9ifo2.cpp
@@ -511,7 +511,7 @@ void k9Ifo2::updatePGCIT_internal(uchar *_buffer, pgcit_t *_pgcit, int _offset)
m_position+=_pgcit->nr_of_pgci_srp*PGCI_SRP_SIZE;
for(int i = 0; i < _pgcit->nr_of_pgci_srp; i++) {
- B2N_16(pgci_srp[i].ptl_id_tqmask);
+ B2N_16(pgci_srp[i].ptl_id_mask);
pgci_srp[i].pgc_start_byte=m_position-_offset;
B2N_32(pgci_srp[i].pgc_start_byte); //JMP:faux
updatePGC(_buffer,_pgcit->pgci_srp[i].pgc,m_position);
diff --git a/libk9copy/k9mp4dlg.cpp b/libk9copy/k9mp4dlg.cpp
index 407d4e9..30dc6b9 100644
--- a/libk9copy/k9mp4dlg.cpp
+++ b/libk9copy/k9mp4dlg.cpp
@@ -20,8 +20,8 @@
#include "k9drawimage.h"
-k9MP4Dlg::k9MP4Dlg(TQWidget* tqparent, const char* name)
-: MP4Dlg(tqparent,name, true)
+k9MP4Dlg::k9MP4Dlg(TQWidget* parent, const char* name)
+: MP4Dlg(parent,name, true)
{
m_wimage=new k9DrawImage(image,0);
TQGridLayout *l=new TQGridLayout(image,1,1);
diff --git a/libk9copy/k9mp4dlg.h b/libk9copy/k9mp4dlg.h
index 2b2e1b3..1de9c2f 100644
--- a/libk9copy/k9mp4dlg.h
+++ b/libk9copy/k9mp4dlg.h
@@ -24,7 +24,7 @@ class k9MP4Dlg : public MP4Dlg
TQ_OBJECT
public:
- k9MP4Dlg(TQWidget* tqparent = 0, const char* name = 0);
+ k9MP4Dlg(TQWidget* parent = 0, const char* name = 0);
~k9MP4Dlg();
/*$PUBLIC_FUNCTIONS$*/
void setfps(TQString _fps);
diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp
index dd23076..a59c37f 100644
--- a/libk9copy/k9mp4enc.cpp
+++ b/libk9copy/k9mp4enc.cpp
@@ -27,8 +27,8 @@
#include "k9videocodecs.h"
#include <tqcstring.h>
-k9MP4Enc::k9MP4Enc ( TQObject *tqparent, const char *name,const TQStringList& )
- : TQObject ( tqparent, name )
+k9MP4Enc::k9MP4Enc ( TQObject *parent, const char *name,const TQStringList& )
+ : TQObject ( parent, name )
{
m_fourcc=m_height=m_width=m_audioBitrate=m_videoBitrate=m_filename="";
m_codec=0; //lavc_mp4;
diff --git a/libk9copy/k9mp4enc.h b/libk9copy/k9mp4enc.h
index 346a88d..e75446e 100644
--- a/libk9copy/k9mp4enc.h
+++ b/libk9copy/k9mp4enc.h
@@ -70,7 +70,7 @@ private slots:
void slotCancel();
public:
- k9MP4Enc(TQObject *tqparent = 0, const char *name = 0,const TQStringList& args=0);
+ k9MP4Enc(TQObject *parent = 0, const char *name = 0,const TQStringList& args=0);
~k9MP4Enc();
virtual void execute(k9DVDTitle *_title );
diff --git a/libk9copy/k9process.cpp b/libk9copy/k9process.cpp
index d358656..060f6cf 100644
--- a/libk9copy/k9process.cpp
+++ b/libk9copy/k9process.cpp
@@ -14,8 +14,8 @@
#include <tqapplication.h>
#include <tqeventloop.h>
-k9Process::k9Process(TQObject *tqparent, const char *name)
- : KProcess(tqparent, name),m_waitSync(false)
+k9Process::k9Process(TQObject *parent, const char *name)
+ : KProcess(parent, name),m_waitSync(false)
{
connect(this,TQT_SIGNAL(processExited( KProcess* )),this,TQT_SLOT(slotProcessExited( KProcess* )));
diff --git a/libk9copy/k9process.h b/libk9copy/k9process.h
index 2512822..47f577e 100644
--- a/libk9copy/k9process.h
+++ b/libk9copy/k9process.h
@@ -22,7 +22,7 @@ class k9Process : public KProcess
Q_OBJECT
TQ_OBJECT
public:
- k9Process(TQObject *tqparent = 0, const char *name = 0);
+ k9Process(TQObject *parent = 0, const char *name = 0);
void sync();
const TQString & debug();
~k9Process();
diff --git a/libk9copy/k9processlist.cpp b/libk9copy/k9processlist.cpp
index 4441548..baa7af5 100644
--- a/libk9copy/k9processlist.cpp
+++ b/libk9copy/k9processlist.cpp
@@ -46,7 +46,7 @@ private:
};
-k9ProcessList::k9ProcessList(TQWidget* tqparent, const char* name, WFlags fl) : processList(tqparent,name,fl)
+k9ProcessList::k9ProcessList(TQWidget* parent, const char* name, WFlags fl) : processList(parent,name,fl)
{
m_processes.setAutoDelete(true);
m_maxProcess=4;
diff --git a/libk9copy/k9processlist.h b/libk9copy/k9processlist.h
index bd18119..5ee0c31 100644
--- a/libk9copy/k9processlist.h
+++ b/libk9copy/k9processlist.h
@@ -22,7 +22,7 @@ class k9ProcessList : public processList {
TQ_OBJECT
public:
- k9ProcessList(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9ProcessList(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9ProcessList();
/*$PUBLIC_FUNCTIONS$*/
void execute();
diff --git a/libk9copy/k9progress.cpp b/libk9copy/k9progress.cpp
index 9a8bb95..6a29fd5 100644
--- a/libk9copy/k9progress.cpp
+++ b/libk9copy/k9progress.cpp
@@ -24,8 +24,8 @@
-k9Progress::k9Progress(TQWidget* tqparent, const char* name,const TQStringList &args)
- : Progress(tqparent,name,0) {
+k9Progress::k9Progress(TQWidget* parent, const char* name,const TQStringList &args)
+ : Progress(parent,name,0) {
m_process=new k9Process(TQT_TQOBJECT(this),0);
m_wimage=new k9DrawImage(image,0);
TQGridLayout *l=new TQGridLayout(image,1,1);
diff --git a/libk9copy/k9progress.h b/libk9copy/k9progress.h
index bf6c9d7..a39a298 100644
--- a/libk9copy/k9progress.h
+++ b/libk9copy/k9progress.h
@@ -25,7 +25,7 @@ class k9Progress : public Progress {
TQ_OBJECT
public:
- k9Progress(TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args=0);
+ k9Progress(TQWidget* parent = 0, const char* name = 0, const TQStringList &args=0);
~k9Progress();
virtual k9Process * getProcess() const;
virtual void setProgress(long _position,long _total);
diff --git a/libk9copy/k9titleencopt.cpp b/libk9copy/k9titleencopt.cpp
index c9bb1be..451eea2 100644
--- a/libk9copy/k9titleencopt.cpp
+++ b/libk9copy/k9titleencopt.cpp
@@ -14,10 +14,10 @@
#include "k9config.h"
#include "k9dvdtitle.h"
-k9TitleEncOpt::k9TitleEncOpt(k9DVDTitle *tqparent)
- : TQObject(tqparent, "")
+k9TitleEncOpt::k9TitleEncOpt(k9DVDTitle *parent)
+ : TQObject(parent, "")
{
- connect (tqparent,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(load()));
+ connect (parent,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(load()));
load();
}
diff --git a/libk9copy/k9titleencopt.h b/libk9copy/k9titleencopt.h
index faf72c1..71e4aa5 100644
--- a/libk9copy/k9titleencopt.h
+++ b/libk9copy/k9titleencopt.h
@@ -26,9 +26,9 @@ class k9TitleEncOpt : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- k9TitleEncOpt(k9DVDTitle *tqparent );
+ k9TitleEncOpt(k9DVDTitle *parent );
~k9TitleEncOpt();
- k9DVDTitle *getTitle() { return (k9DVDTitle*)tqparent();};
+ k9DVDTitle *getTitle() { return (k9DVDTitle*)parent();};
public:
int getMaxSize();
diff --git a/libk9copy/k9videocodecs.cpp b/libk9copy/k9videocodecs.cpp
index 306b1da..ff3a87e 100644
--- a/libk9copy/k9videocodecs.cpp
+++ b/libk9copy/k9videocodecs.cpp
@@ -31,8 +31,8 @@ public:
};
-k9VideoCodecs::k9VideoCodecs(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name)
+k9VideoCodecs::k9VideoCodecs(TQObject *parent, const char *name)
+ : TQObject(parent, name)
{
m_config=new k9Config();
TQStringList slLabels=m_config->getCodecLabels();
diff --git a/libk9copy/k9videocodecs.h b/libk9copy/k9videocodecs.h
index 21422d2..163f3b9 100644
--- a/libk9copy/k9videocodecs.h
+++ b/libk9copy/k9videocodecs.h
@@ -27,7 +27,7 @@ class k9VideoCodecs : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- k9VideoCodecs(TQObject *tqparent = 0, const char *name = 0);
+ k9VideoCodecs(TQObject *parent = 0, const char *name = 0);
~k9VideoCodecs();
void save();
diff --git a/libk9copy/mp4dlg.cpp b/libk9copy/mp4dlg.cpp
index 252c9f0..59f0571 100644
--- a/libk9copy/mp4dlg.cpp
+++ b/libk9copy/mp4dlg.cpp
@@ -22,11 +22,11 @@
#include "kpushbutton.h"
/*
- * Constructs a MP4Dlg as a child of 'tqparent', with the
+ * Constructs a MP4Dlg as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-MP4Dlg::MP4Dlg( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+MP4Dlg::MP4Dlg( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "MP4Dlg" );
diff --git a/libk9copy/processList.cpp b/libk9copy/processList.cpp
index c95df4f..35551c1 100644
--- a/libk9copy/processList.cpp
+++ b/libk9copy/processList.cpp
@@ -19,11 +19,11 @@
#include "kpushbutton.h"
/*
- * Constructs a processList as a child of 'tqparent', with the
+ * Constructs a processList as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-processList::processList( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+processList::processList( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "processList" );
diff --git a/libk9copy/progress.cpp b/libk9copy/progress.cpp
index 24f5c68..e71faf9 100644
--- a/libk9copy/progress.cpp
+++ b/libk9copy/progress.cpp
@@ -20,11 +20,11 @@
#include "kprogress.h"
/*
- * Constructs a Progress as a child of 'tqparent', with the
+ * Constructs a Progress as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-Progress::Progress( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+Progress::Progress( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "Progress" );
diff --git a/src/configDlg.cpp b/src/configDlg.cpp
index 0df4a87..3a70e80 100644
--- a/src/configDlg.cpp
+++ b/src/configDlg.cpp
@@ -18,11 +18,11 @@
#include "kpushbutton.h"
/*
- * Constructs a configDlg as a child of 'tqparent', with the
+ * Constructs a configDlg as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-configDlg::configDlg( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+configDlg::configDlg( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "configDlg" );
diff --git a/src/k9glwidget.cpp b/src/k9glwidget.cpp
index 9594e62..2d536b1 100644
--- a/src/k9glwidget.cpp
+++ b/src/k9glwidget.cpp
@@ -20,7 +20,7 @@
#include "ac.h"
#include <X11/Xlib.h>
-k9GLWidget::k9GLWidget(TQWidget *tqparent, const char *name):TQGLWidget(tqparent, name) {
+k9GLWidget::k9GLWidget(TQWidget *parent, const char *name):TQGLWidget(parent, name) {
XMapRaised(x11Display(),winId());
m_buffer=NULL;
@@ -45,9 +45,9 @@ k9GLWidget::k9GLWidget(TQWidget *tqparent, const char *name):TQGLWidget(tqparent
glGetString=(glGetString_t)library->resolve("glGetString");
}
-k9GLWidget* k9GLWidget::createWidget(TQWidget *tqparent , const char *name ) {
+k9GLWidget* k9GLWidget::createWidget(TQWidget *parent , const char *name ) {
//XInitThreads();
- return new k9GLWidget(tqparent,name);
+ return new k9GLWidget(parent,name);
}
k9GLWidget::~k9GLWidget() {
diff --git a/src/k9glwidget.h b/src/k9glwidget.h
index e032ed8..f7be0e0 100644
--- a/src/k9glwidget.h
+++ b/src/k9glwidget.h
@@ -49,7 +49,7 @@ Q_OBJECT
TQ_OBJECT
public:
void setImage(uchar *_buffer,int _width,int _height,int _len);
- static k9GLWidget * createWidget(TQWidget *tqparent = 0, const char *name = 0);
+ static k9GLWidget * createWidget(TQWidget *parent = 0, const char *name = 0);
~k9GLWidget();
protected:
void draw();
@@ -57,7 +57,7 @@ protected:
void initializeGL();
void paintGL();
private:
- k9GLWidget(TQWidget *tqparent = 0, const char *name = 0);
+ k9GLWidget(TQWidget *parent = 0, const char *name = 0);
TQImage m_image;
TQMutex m_mutex;
int m_width,m_height;
@@ -89,12 +89,12 @@ private:
class k9GLWidget:public TQWidget
{
public:
- static k9GLWidget * createWidget(TQWidget *tqparent = 0, const char *name = 0) {
- return new k9GLWidget(tqparent,name);
+ static k9GLWidget * createWidget(TQWidget *parent = 0, const char *name = 0) {
+ return new k9GLWidget(parent,name);
}
void setImage(uchar *_buffer,int _width,int _height,int _len){};
private:
- k9GLWidget(TQWidget *tqparent = 0, const char *name = 0){};
+ k9GLWidget(TQWidget *parent = 0, const char *name = 0){};
};
diff --git a/src/k9langselect.cpp b/src/k9langselect.cpp
index 6dbe66a..3bf249c 100644
--- a/src/k9langselect.cpp
+++ b/src/k9langselect.cpp
@@ -16,8 +16,8 @@
#include "k9dvdtitle.h"
#include "k9main.h"
#include <kstandarddirs.h>
-k9LangSelect::k9LangSelect(k9Main *mainWindow,TQWidget* tqparent, const char* name, WFlags fl)
-: langSelect(tqparent,name,fl)
+k9LangSelect::k9LangSelect(k9Main *mainWindow,TQWidget* parent, const char* name, WFlags fl)
+: langSelect(parent,name,fl)
{
setMain( mainWindow);
m_main->setLangSelect( this);
diff --git a/src/k9langselect.h b/src/k9langselect.h
index 71697bb..6ed0d11 100644
--- a/src/k9langselect.h
+++ b/src/k9langselect.h
@@ -24,8 +24,8 @@ class k9DVD;
class ckLvLangItem : public TQCheckListItem {
public:
- ckLvLangItem( TQListViewItem *tqparent,k9Main *dlg)
- : TQCheckListItem( tqparent,"",TQCheckListItem::CheckBox) {
+ ckLvLangItem( TQListViewItem *parent,k9Main *dlg)
+ : TQCheckListItem( parent,"",TQCheckListItem::CheckBox) {
mainDlg=dlg;
streamType=NONE;
}
@@ -44,7 +44,7 @@ class k9LangSelect : public langSelect
TQ_OBJECT
public:
- k9LangSelect(k9Main *mainWindow,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9LangSelect(k9Main *mainWindow,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9LangSelect();
void setMain(k9Main* _value);
diff --git a/src/k9main.cpp b/src/k9main.cpp
index 20b35fc..74c1a0a 100644
--- a/src/k9main.cpp
+++ b/src/k9main.cpp
@@ -88,12 +88,12 @@ k9DVDListItem::k9DVDListItem(TQObject *DVD,ckLvItem *List,eStreamType type)
streamType=type;
}
-k9Main::k9Main(TQWidget* tqparent, const char* name, k9CdDrives *_drives)
- : MainDlg(tqparent,name),pxVideo((const char **) img_video), pxSound((const char **) img_sound),
+k9Main::k9Main(TQWidget* parent, const char* name, k9CdDrives *_drives)
+ : MainDlg(parent,name),pxVideo((const char **) img_video), pxSound((const char **) img_sound),
pxText((const char **) img_text)
{
drives=_drives;
- m_parent=(k9Copy*)tqparent;
+ m_parent=(k9Copy*)parent;
TQImage img;
img.loadFromData( img_chapter, sizeof( img_chapter ), "PNG" );
pxChapter.convertFromImage( img);
@@ -812,7 +812,7 @@ void k9Main::checkLang(TQString lang,eStreamType streamType,bool state)
checked=state;
k9DVDTitle *title=(k9DVDTitle*)litem->listItem->obj;
- ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->tqparent()->tqparent();
+ ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->parent()->parent();
itemtitleset->setOn(title->gettitleset()->getselected());
}
break;
@@ -826,7 +826,7 @@ void k9Main::checkLang(TQString lang,eStreamType streamType,bool state)
checked=state;
k9DVDTitle *title=(k9DVDTitle*)litem->listItem->obj;
- ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->tqparent()->tqparent();
+ ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->parent()->parent();
itemtitleset->setOn(title->gettitleset()->getselected());
}
break;
@@ -839,7 +839,7 @@ void k9Main::checkLang(TQString lang,eStreamType streamType,bool state)
for (uint j=0; j<items.count();j++)
{
k9DVDListItem *litem2=(k9DVDListItem*)items.at(j);
- if (litem2->listItem->tqparent()==litem->listItem->tqparent() && litem2->streamType==VID )
+ if (litem2->listItem->parent()==litem->listItem->parent() && litem2->streamType==VID )
{
litem2->title->setforceSelection(state);
litem2->listItem->setOn(state);
@@ -883,7 +883,7 @@ void k9Main::checkTitle(bool state, ckLvItem *_item)
for (uint i=0;i<items.count();i++)
{
litem=(k9DVDListItem*)items.at(i);
- if (litem->listItem->tqparent() == _item->tqparent())
+ if (litem->listItem->parent() == _item->parent())
{
//if current item is video and is unchecked, uncheck audio and subtitles
if (!state && _item->streamType==VID)
@@ -928,9 +928,9 @@ void k9Main::checkTitle(bool state, ckLvItem *_item)
{
ckLvItem * itemtitleset;
if (_item->streamType==CHAP)
- itemtitleset=(ckLvItem*)_item->tqparent()->tqparent()->tqparent();
+ itemtitleset=(ckLvItem*)_item->parent()->parent()->parent();
else
- itemtitleset=(ckLvItem*)_item->tqparent()->tqparent();
+ itemtitleset=(ckLvItem*)_item->parent()->parent();
itemtitleset->setOn(titleset->getselected());
}
@@ -964,7 +964,7 @@ void k9Main::checkAll(bool state)
litem->listItem->setOn(state);
// k9DVDTitle *title=(k9DVDTitle*)litem->listItem->obj;
- ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->tqparent()->tqparent();
+ ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->parent()->parent();
l_title->gettitleset()->setselected(state);
itemtitleset->setOn(l_title->gettitleset()->getselected());
}
@@ -992,7 +992,7 @@ void k9Main::checkTS( bool _state,ckLvItem *_item )
for (uint i=0;i<items.count();i++)
{
litem=(k9DVDListItem*)items.at(i);
- if (litem->listItem->tqparent ()->tqparent() == _item)
+ if (litem->listItem->parent ()->parent() == _item)
{
litem->listItem->setOn(_state);
}
@@ -1339,8 +1339,8 @@ void k9Main::listView1CurrentChanged( TQListViewItem *newItem )
ckLvItem *ckit = (ckLvItem*) newItem;
if (((ckLvItem*)newItem)->streamType==CHAP)
{
- LvItem *tqparent=(LvItem*)(ckit->tqparent()->tqparent());
- title=(k9DVDTitle*)tqparent->obj;
+ LvItem *parent=(LvItem*)(ckit->parent()->parent());
+ title=(k9DVDTitle*)parent->obj;
}
else
title=(k9DVDTitle*)ckit->obj;
diff --git a/src/k9main.h b/src/k9main.h
index 547cbdf..1c2f3da 100644
--- a/src/k9main.h
+++ b/src/k9main.h
@@ -34,12 +34,12 @@ enum eObjectType {TITLE,CHAPTER,TITLESET,STREAM,ROOT};
class LvItem : public TQListViewItem {
public:
- LvItem( TQListViewItem *tqparent,eObjectType _objectType)
- : TQListViewItem( tqparent), obj( NULL ) {
+ LvItem( TQListViewItem *parent,eObjectType _objectType)
+ : TQListViewItem( parent), obj( NULL ) {
objectType=_objectType;
}
- LvItem( TQListView *tqparent,eObjectType _objectType)
- : TQListViewItem( tqparent), obj( NULL ) {
+ LvItem( TQListView *parent,eObjectType _objectType)
+ : TQListViewItem( parent), obj( NULL ) {
objectType=_objectType;
}
eObjectType objectType;
@@ -61,8 +61,8 @@ class k9UpdateFactor;
class ckLvItem : public TQCheckListItem {
public:
- ckLvItem( TQListViewItem *tqparent,k9Main *dlg,eObjectType _objectType)
- : TQCheckListItem( tqparent,"",TQCheckListItem::CheckBox) {
+ ckLvItem( TQListViewItem *parent,k9Main *dlg,eObjectType _objectType)
+ : TQCheckListItem( parent,"",TQCheckListItem::CheckBox) {
mainDlg=dlg;
obj=NULL;
stream=NULL;
@@ -70,8 +70,8 @@ public:
language="";
objectType=_objectType;
}
- ckLvItem( TQListView *tqparent,k9Main *dlg,eObjectType _objectType)
- : TQCheckListItem( tqparent,"",TQCheckListItem::CheckBox) {
+ ckLvItem( TQListView *parent,k9Main *dlg,eObjectType _objectType)
+ : TQCheckListItem( parent,"",TQCheckListItem::CheckBox) {
mainDlg=dlg;
obj=NULL;
stream=NULL;
@@ -118,7 +118,7 @@ class k9Main : public MainDlg {
public:
- k9Main(TQWidget* tqparent = 0, const char* name = 0, k9CdDrives *_drives=0 );
+ k9Main(TQWidget* parent = 0, const char* name = 0, k9CdDrives *_drives=0 );
~k9Main();
/*$PUBLIC_FUNCTIONS$*/
void addTitle(k9DVDTitle *track);
diff --git a/src/k9mainw.cpp b/src/k9mainw.cpp
index f2e685c..24a9552 100644
--- a/src/k9mainw.cpp
+++ b/src/k9mainw.cpp
@@ -27,11 +27,11 @@
#include "kpushbutton.h"
/*
- * Constructs a MainDlg as a child of 'tqparent', with the
+ * Constructs a MainDlg as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-MainDlg::MainDlg( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+MainDlg::MainDlg( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "MainDlg" );
diff --git a/src/k9mencodercmdgen.cpp b/src/k9mencodercmdgen.cpp
index 6de1a67..941f37d 100644
--- a/src/k9mencodercmdgen.cpp
+++ b/src/k9mencodercmdgen.cpp
@@ -49,8 +49,8 @@ void _k9CheckListItem::stateChange(bool _state) {
}
-k9MencoderCmdGen::k9MencoderCmdGen(TQWidget* tqparent, const TQString &_cmd, bool modal, WFlags fl)
-: MyDialog1(tqparent,"", modal,fl)
+k9MencoderCmdGen::k9MencoderCmdGen(TQWidget* parent, const TQString &_cmd, bool modal, WFlags fl)
+: MyDialog1(parent,"", modal,fl)
{
setCaption(kapp->makeStdCaption(i18n("MEncoder options")));
m_row=0; m_page=1;
@@ -125,7 +125,7 @@ k9MencoderCmdGen::~k9MencoderCmdGen()
/*$SPECIALIZATION$*/
void k9MencoderCmdGen::listViewCurrentChanged(TQListViewItem *_item) {
- if (_item->tqparent() == NULL)
+ if (_item->parent() == NULL)
wsOptions->raiseWidget(0);
else if (_item->rtti()==1001) {
_k9CheckListItem *item=(_k9CheckListItem*) _item;
@@ -244,20 +244,20 @@ void k9MencoderCmdGen::addInt(TQDomElement _eOpt) {
int iMax=_eOpt.attributeNode("max").value().toInt();
int iDefault=_eOpt.attributeNode("default").value().toInt();
- TQWidget *tqparent;
+ TQWidget *parent;
if (!blist) {
- tqparent=m_grid;
+ parent=m_grid;
} else
- tqparent=m_hbox;
+ parent=m_hbox;
bool bSel=false;
TQDomAttr aSel=_eOpt.attributeNode("selected");
if (!aSel.isNull())
bSel=aSel.value()=="true";
- TQCheckBox *ckLabel=new TQCheckBox(sName,tqparent,TQString("ck%1").tqarg(m_row++) );
+ TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++) );
ckLabel->setChecked(bSel);
- ckLabel->setBackgroundColor(tqparent->backgroundColor());
+ ckLabel->setBackgroundColor(parent->backgroundColor());
if ( !_eOpt.attributeNode("description").isNull()) {
TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
@@ -266,7 +266,7 @@ void k9MencoderCmdGen::addInt(TQDomElement _eOpt) {
_eOpt.setAttribute("checkbox",ckLabel->name());
- KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,tqparent,TQString("int%1").tqarg(m_row++));
+ KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,parent,TQString("int%1").tqarg(m_row++));
if (iMax <1000)
sb->setFixedWidth(50);
else
@@ -292,16 +292,16 @@ void k9MencoderCmdGen::addFloat(TQDomElement _eOpt) {
if (_eOpt.nodeName()=="subopt")
blist=true;
- TQWidget *tqparent;
+ TQWidget *parent;
if (!blist) {
- tqparent=m_grid;
+ parent=m_grid;
} else
- tqparent=m_hbox;
+ parent=m_hbox;
TQDomAttr aSel=_eOpt.attributeNode("selected");
if (!aSel.isNull())
bSel=aSel.value()=="true";
- TQCheckBox *ckLabel=new TQCheckBox(sName,tqparent,TQString("ck%1").tqarg(m_row++));
+ TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++));
ckLabel->setChecked(bSel);
if ( !_eOpt.attributeNode("description").isNull()) {
TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
@@ -317,7 +317,7 @@ void k9MencoderCmdGen::addFloat(TQDomElement _eOpt) {
if (!_eOpt.attributeNode("precision").isNull()) {
iPrecision=_eOpt.attributeNode("precision").value().toInt();
}
- KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,tqparent,TQString("float%1").tqarg(m_row++));
+ KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,parent,TQString("float%1").tqarg(m_row++));
if (dMax <1000)
sb->setFixedWidth(80);
else
@@ -336,23 +336,23 @@ void k9MencoderCmdGen::addBool(TQDomElement _eOpt) {
blist=true;
bool bSel=false;
- TQWidget *tqparent;
+ TQWidget *parent;
if (!blist) {
- tqparent = m_grid;
+ parent = m_grid;
} else
- tqparent = m_hbox;
+ parent = m_hbox;
TQDomAttr aSel=_eOpt.attributeNode("selected");
if (!aSel.isNull())
bSel=aSel.value()=="true";
- TQCheckBox *ckLabel=new TQCheckBox(sName,tqparent,TQString("ck%1").tqarg(m_row++));
+ TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++));
if ( !_eOpt.attributeNode("description").isNull()) {
TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
TQWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value());
}
- TQWidget *w=new TQWidget(tqparent);
+ TQWidget *w=new TQWidget(parent);
if ((_eOpt.attributeNode("default").value()=="true") && bSel)
ckLabel->setChecked(true);
@@ -368,18 +368,18 @@ void k9MencoderCmdGen::addString(TQDomElement _eOpt) {
blist=true;
TQString sDefault=_eOpt.attributeNode("default").value();
- TQWidget *tqparent;
+ TQWidget *parent;
if( !blist) {
- tqparent=m_grid;
+ parent=m_grid;
} else
- tqparent=m_hbox;
+ parent=m_hbox;
bool bSel=false;
TQDomAttr aSel=_eOpt.attributeNode("selected");
if (!aSel.isNull())
bSel=aSel.value()=="true";
- TQCheckBox *ckLabel=new TQCheckBox(sName,tqparent,TQString("ck%1").tqarg(m_row++));
+ TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++));
ckLabel->setChecked(bSel);
if ( !_eOpt.attributeNode("description").isNull()) {
TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
@@ -387,7 +387,7 @@ void k9MencoderCmdGen::addString(TQDomElement _eOpt) {
}
_eOpt.setAttribute("checkbox",ckLabel->name());
- TQComboBox *cb=new TQComboBox(tqparent,TQString("string%1").tqarg(m_row++));
+ TQComboBox *cb=new TQComboBox(parent,TQString("string%1").tqarg(m_row++));
TQDomNodeList values=_eOpt.elementsByTagName("value");
int def=0;
diff --git a/src/k9mencodercmdgen.h b/src/k9mencodercmdgen.h
index f13e3a0..37ae9cd 100644
--- a/src/k9mencodercmdgen.h
+++ b/src/k9mencodercmdgen.h
@@ -28,7 +28,7 @@ class k9MencoderCmdGen : public MyDialog1
TQ_OBJECT
public:
- k9MencoderCmdGen(TQWidget* tqparent, const TQString &_cmd, bool modal = FALSE, WFlags fl = 0 );
+ k9MencoderCmdGen(TQWidget* parent, const TQString &_cmd, bool modal = FALSE, WFlags fl = 0 );
~k9MencoderCmdGen();
/*$PUBLIC_FUNCTIONS$*/
static bool getMencoderOptions(TQString &_cmd);
diff --git a/src/k9mp4title.cpp b/src/k9mp4title.cpp
index e4cf7d6..606e508 100644
--- a/src/k9mp4title.cpp
+++ b/src/k9mp4title.cpp
@@ -26,8 +26,8 @@
#include <tqtabwidget.h>
#include <tqradiobutton.h>
-k9MP4Title::k9MP4Title(TQWidget* tqparent, const char* name, WFlags fl)
-: prefMPEG4(tqparent,name,fl)
+k9MP4Title::k9MP4Title(TQWidget* parent, const char* name, WFlags fl)
+: prefMPEG4(parent,name,fl)
{
m_titleEncOpt=NULL;
load();
diff --git a/src/k9mp4title.h b/src/k9mp4title.h
index 63bda0f..b54d793 100644
--- a/src/k9mp4title.h
+++ b/src/k9mp4title.h
@@ -25,7 +25,7 @@ class k9MP4Title : public prefMPEG4
TQ_OBJECT
public:
- k9MP4Title(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9MP4Title(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9MP4Title();
/*$PUBLIC_FUNCTIONS$*/
private:
diff --git a/src/k9playbackoptions.cpp b/src/k9playbackoptions.cpp
index 846daba..a4f197d 100644
--- a/src/k9playbackoptions.cpp
+++ b/src/k9playbackoptions.cpp
@@ -16,8 +16,8 @@
#include <kpushbutton.h>
#include <kiconloader.h>
-k9PlaybackOptions::k9PlaybackOptions(k9Main *mainWindow, TQWidget* tqparent, const char* name, WFlags fl)
-: PlaybackOptionsw(tqparent,name,fl)
+k9PlaybackOptions::k9PlaybackOptions(k9Main *mainWindow, TQWidget* parent, const char* name, WFlags fl)
+: PlaybackOptionsw(parent,name,fl)
{
setMain( mainWindow);
diff --git a/src/k9playbackoptions.h b/src/k9playbackoptions.h
index 2d5dba5..b356797 100644
--- a/src/k9playbackoptions.h
+++ b/src/k9playbackoptions.h
@@ -44,7 +44,7 @@ class k9PlaybackOptions : public PlaybackOptionsw
TQ_OBJECT
public:
- k9PlaybackOptions(k9Main *mainWindow,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9PlaybackOptions(k9Main *mainWindow,TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9PlaybackOptions();
/*$PUBLIC_FUNCTIONS$*/
void fillTitleList();
diff --git a/src/k9prefauthor.cpp b/src/k9prefauthor.cpp
index 9dd14ea..a3f9f4c 100644
--- a/src/k9prefauthor.cpp
+++ b/src/k9prefauthor.cpp
@@ -17,8 +17,8 @@
#include <kcolorbutton.h>
#include <kfontdialog.h>
-k9prefAuthor::k9prefAuthor(TQWidget* tqparent, const char* name, WFlags fl)
-: prefAuthor(tqparent,name,fl)
+k9prefAuthor::k9prefAuthor(TQWidget* parent, const char* name, WFlags fl)
+: prefAuthor(parent,name,fl)
{
load();
}
diff --git a/src/k9prefauthor.h b/src/k9prefauthor.h
index 7581bf3..b59747d 100644
--- a/src/k9prefauthor.h
+++ b/src/k9prefauthor.h
@@ -22,7 +22,7 @@ class k9prefAuthor : public prefAuthor
TQ_OBJECT
public:
- k9prefAuthor(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9prefAuthor(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9prefAuthor();
/*$PUBLIC_FUNCTIONS$*/
void load();
diff --git a/src/k9prefdvd.cpp b/src/k9prefdvd.cpp
index 889a83f..03aca00 100644
--- a/src/k9prefdvd.cpp
+++ b/src/k9prefdvd.cpp
@@ -19,8 +19,8 @@
#include <tqspinbox.h>
#include <klocale.h>
-k9prefDVD::k9prefDVD(TQWidget* tqparent, const char* name, WFlags fl)
-: prefDVD(tqparent,name,fl)
+k9prefDVD::k9prefDVD(TQWidget* parent, const char* name, WFlags fl)
+: prefDVD(parent,name,fl)
{
k9Config config;
urOutput->setMode(2);
diff --git a/src/k9prefdvd.h b/src/k9prefdvd.h
index 3668d79..42b9f6d 100644
--- a/src/k9prefdvd.h
+++ b/src/k9prefdvd.h
@@ -21,7 +21,7 @@ class k9prefDVD : public prefDVD
TQ_OBJECT
public:
- k9prefDVD(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9prefDVD(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9prefDVD();
/*$PUBLIC_FUNCTIONS$*/
void save();
diff --git a/src/k9prefmencoder.cpp b/src/k9prefmencoder.cpp
index d4594fe..0bf4d21 100644
--- a/src/k9prefmencoder.cpp
+++ b/src/k9prefmencoder.cpp
@@ -19,8 +19,8 @@
#include <kiconloader.h>
#include <klocale.h>
-k9prefMencoder::k9prefMencoder(TQWidget* tqparent, const char* name, WFlags fl)
-: prefMencoder(tqparent,name,fl)
+k9prefMencoder::k9prefMencoder(TQWidget* parent, const char* name, WFlags fl)
+: prefMencoder(parent,name,fl)
{
m_update=false;
load();
diff --git a/src/k9prefmencoder.h b/src/k9prefmencoder.h
index 308ecf5..0e3456f 100644
--- a/src/k9prefmencoder.h
+++ b/src/k9prefmencoder.h
@@ -27,7 +27,7 @@ class k9prefMencoder : public prefMencoder
TQ_OBJECT
public:
- k9prefMencoder(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9prefMencoder(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9prefMencoder();
/*$PUBLIC_FUNCTIONS$*/
void save(void);
diff --git a/src/k9prefmpeg4.cpp b/src/k9prefmpeg4.cpp
index b61d40d..d716ffe 100644
--- a/src/k9prefmpeg4.cpp
+++ b/src/k9prefmpeg4.cpp
@@ -21,8 +21,8 @@
#include <klocale.h>
#include <tqradiobutton.h>
-k9prefMPEG4::k9prefMPEG4(TQWidget* tqparent, const char* name, WFlags fl)
-: prefMPEG4(tqparent,name,fl)
+k9prefMPEG4::k9prefMPEG4(TQWidget* parent, const char* name, WFlags fl)
+: prefMPEG4(parent,name,fl)
{
load();
}
diff --git a/src/k9prefmpeg4.h b/src/k9prefmpeg4.h
index 5ac285f..99a58c4 100644
--- a/src/k9prefmpeg4.h
+++ b/src/k9prefmpeg4.h
@@ -21,7 +21,7 @@ class k9prefMPEG4 : public prefMPEG4
TQ_OBJECT
public:
- k9prefMPEG4(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9prefMPEG4(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9prefMPEG4();
/*$PUBLIC_FUNCTIONS$*/
void save();
diff --git a/src/k9prefpreview.cpp b/src/k9prefpreview.cpp
index 19bff88..bff816b 100644
--- a/src/k9prefpreview.cpp
+++ b/src/k9prefpreview.cpp
@@ -19,8 +19,8 @@
#include <tqcheckbox.h>
#include <klocale.h>
-k9prefPreview::k9prefPreview(TQWidget* tqparent, const char* name, WFlags fl)
-: prefPreview(tqparent,name,fl)
+k9prefPreview::k9prefPreview(TQWidget* parent, const char* name, WFlags fl)
+: prefPreview(parent,name,fl)
{ load();
}
diff --git a/src/k9prefpreview.h b/src/k9prefpreview.h
index 264b5a6..4027fd9 100644
--- a/src/k9prefpreview.h
+++ b/src/k9prefpreview.h
@@ -22,7 +22,7 @@ class k9prefPreview : public prefPreview
TQ_OBJECT
public:
- k9prefPreview(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9prefPreview(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9prefPreview();
/*$PUBLIC_FUNCTIONS$*/
void save();
diff --git a/src/k9settings.cpp b/src/k9settings.cpp
index bbbb7bc..f3507aa 100644
--- a/src/k9settings.cpp
+++ b/src/k9settings.cpp
@@ -18,7 +18,7 @@
#include <klocale.h>
#include <tqlayout.h>
-k9settings::k9settings(TQWidget *tqparent,const TQString &caption): KDialogBase (IconList,caption,
+k9settings::k9settings(TQWidget *parent,const TQString &caption): KDialogBase (IconList,caption,
Ok|Apply|Cancel, Ok) {
setInitialSize(TQSize(750,350), false);
diff --git a/src/k9settings.h b/src/k9settings.h
index e86ae3c..f43939d 100644
--- a/src/k9settings.h
+++ b/src/k9settings.h
@@ -28,7 +28,7 @@ class k9settings:public KDialogBase{
Q_OBJECT
TQ_OBJECT
public:
- k9settings(TQWidget *tqparent,const TQString &caption);
+ k9settings(TQWidget *parent,const TQString &caption);
virtual ~k9settings();
diff --git a/src/k9titlefactor.cpp b/src/k9titlefactor.cpp
index ffb4add..fbbf337 100644
--- a/src/k9titlefactor.cpp
+++ b/src/k9titlefactor.cpp
@@ -22,8 +22,8 @@
-k9TitleFactor::k9TitleFactor(TQWidget* tqparent, const char* name, WFlags fl)
- : titleFactor(tqparent,name,fl) {
+k9TitleFactor::k9TitleFactor(TQWidget* parent, const char* name, WFlags fl)
+ : titleFactor(parent,name,fl) {
m_current=NULL;
m_slFactorPressed=false;
m_factor=-1;
diff --git a/src/k9titlefactor.h b/src/k9titlefactor.h
index 2c2e961..29466ab 100644
--- a/src/k9titlefactor.h
+++ b/src/k9titlefactor.h
@@ -25,7 +25,7 @@ class k9TitleFactor : public titleFactor
TQ_OBJECT
public:
- k9TitleFactor(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+ k9TitleFactor(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~k9TitleFactor();
/*$PUBLIC_FUNCTIONS$*/
private :
diff --git a/src/k9updatefactor.cpp b/src/k9updatefactor.cpp
index 74dba8a..9bd9603 100644
--- a/src/k9updatefactor.cpp
+++ b/src/k9updatefactor.cpp
@@ -11,8 +11,8 @@
//
#include "k9updatefactor.h"
-k9UpdateFactor::k9UpdateFactor(TQObject *tqparent, const char *name)
- : TQObject(tqparent, name), TQThread()
+k9UpdateFactor::k9UpdateFactor(TQObject *parent, const char *name)
+ : TQObject(parent, name), TQThread()
{
}
diff --git a/src/k9updatefactor.h b/src/k9updatefactor.h
index 6cec823..28df90d 100644
--- a/src/k9updatefactor.h
+++ b/src/k9updatefactor.h
@@ -31,7 +31,7 @@ private:
protected:
void run();
public:
- k9UpdateFactor(TQObject *tqparent = 0, const char *name = 0);
+ k9UpdateFactor(TQObject *parent = 0, const char *name = 0);
~k9UpdateFactor();
void updateFactor();
diff --git a/src/kconfigdlg.cpp b/src/kconfigdlg.cpp
index c5527e5..f0a39bb 100644
--- a/src/kconfigdlg.cpp
+++ b/src/kconfigdlg.cpp
@@ -28,8 +28,8 @@
#include <kguiitem.h>
#include "k9config.h"
-kConfigDlg::kConfigDlg(TQWidget *tqparent)
- : configDlg(tqparent)
+kConfigDlg::kConfigDlg(TQWidget *parent)
+ : configDlg(parent)
{
TQStringList ldev;
TQStringList llabels;
diff --git a/src/kconfigdlg.h b/src/kconfigdlg.h
index ce58a0f..6bf098e 100644
--- a/src/kconfigdlg.h
+++ b/src/kconfigdlg.h
@@ -32,7 +32,7 @@
class kConfigDlg : public configDlg
{
public:
- kConfigDlg(TQWidget *tqparent);
+ kConfigDlg(TQWidget *parent);
~kConfigDlg();
void bAddClick();
diff --git a/src/kviewmpeg2.cpp b/src/kviewmpeg2.cpp
index 84008e4..20ca88e 100755
--- a/src/kviewmpeg2.cpp
+++ b/src/kviewmpeg2.cpp
@@ -41,7 +41,7 @@
-k9Widget::k9Widget(TQWidget *tqparent):TQWidget(tqparent) {
+k9Widget::k9Widget(TQWidget *parent):TQWidget(parent) {
m_image=NULL;
}
diff --git a/src/langselectw.cpp b/src/langselectw.cpp
index 8faa67d..283bde1 100644
--- a/src/langselectw.cpp
+++ b/src/langselectw.cpp
@@ -74,11 +74,11 @@ static const unsigned char img0_langselectw[] = {
/*
- * Constructs a langSelect as a child of 'tqparent', with the
+ * Constructs a langSelect as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-langSelect::langSelect( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+langSelect::langSelect( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
TQImage img;
img.loadFromData( img0_langselectw, sizeof( img0_langselectw ), "PNG" );
diff --git a/src/mencoderCmdGen.cpp b/src/mencoderCmdGen.cpp
index 744e527..bd9addd 100644
--- a/src/mencoderCmdGen.cpp
+++ b/src/mencoderCmdGen.cpp
@@ -24,14 +24,14 @@
#include "kpushbutton.h"
/*
- * Constructs a MyDialog1 as a child of 'tqparent', with the
+ * Constructs a MyDialog1 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.
*/
-MyDialog1::MyDialog1( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
- : TQDialog( tqparent, name, modal, fl )
+MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl )
+ : TQDialog( parent, name, modal, fl )
{
if ( !name )
setName( "MyDialog1" );
diff --git a/src/playbackoptionsw.cpp b/src/playbackoptionsw.cpp
index 66de7d4..56b0f43 100644
--- a/src/playbackoptionsw.cpp
+++ b/src/playbackoptionsw.cpp
@@ -100,11 +100,11 @@ static const unsigned char img0_playbackoptionsw[] = {
/*
- * Constructs a PlaybackOptionsw as a child of 'tqparent', with the
+ * Constructs a PlaybackOptionsw as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-PlaybackOptionsw::PlaybackOptionsw( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+PlaybackOptionsw::PlaybackOptionsw( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
TQImage img;
img.loadFromData( img0_playbackoptionsw, sizeof( img0_playbackoptionsw ), "PNG" );
diff --git a/src/prefAuthor.cpp b/src/prefAuthor.cpp
index 98d3d36..56f3657 100644
--- a/src/prefAuthor.cpp
+++ b/src/prefAuthor.cpp
@@ -25,11 +25,11 @@
#include "kcolorbutton.h"
/*
- * Constructs a prefAuthor as a child of 'tqparent', with the
+ * Constructs a prefAuthor as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-prefAuthor::prefAuthor( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+prefAuthor::prefAuthor( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "prefAuthor" );
diff --git a/src/prefDVD.cpp b/src/prefDVD.cpp
index 03c81dd..555c835 100644
--- a/src/prefDVD.cpp
+++ b/src/prefDVD.cpp
@@ -22,11 +22,11 @@
#include "kpushbutton.h"
/*
- * Constructs a prefDVD as a child of 'tqparent', with the
+ * Constructs a prefDVD as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-prefDVD::prefDVD( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+prefDVD::prefDVD( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "prefDVD" );
diff --git a/src/prefMPEG4.cpp b/src/prefMPEG4.cpp
index 05540d3..6b4c858 100644
--- a/src/prefMPEG4.cpp
+++ b/src/prefMPEG4.cpp
@@ -89,11 +89,11 @@ static const unsigned char img0_prefMPEG4[] = {
/*
- * Constructs a prefMPEG4 as a child of 'tqparent', with the
+ * Constructs a prefMPEG4 as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-prefMPEG4::prefMPEG4( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
TQImage img;
img.loadFromData( img0_prefMPEG4, sizeof( img0_prefMPEG4 ), "PNG" );
diff --git a/src/prefMencoder.cpp b/src/prefMencoder.cpp
index 63de9a1..fa9a857 100644
--- a/src/prefMencoder.cpp
+++ b/src/prefMencoder.cpp
@@ -23,11 +23,11 @@
#include "kpushbutton.h"
/*
- * Constructs a prefMencoder as a child of 'tqparent', with the
+ * Constructs a prefMencoder as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-prefMencoder::prefMencoder( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+prefMencoder::prefMencoder( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "prefMencoder" );
diff --git a/src/prefpreview.cpp b/src/prefpreview.cpp
index cb2fad6..872d86e 100644
--- a/src/prefpreview.cpp
+++ b/src/prefpreview.cpp
@@ -22,11 +22,11 @@
#include <tqwhatsthis.h>
/*
- * Constructs a prefPreview as a child of 'tqparent', with the
+ * Constructs a prefPreview as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-prefPreview::prefPreview( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+prefPreview::prefPreview( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
if ( !name )
setName( "prefPreview" );
diff --git a/src/titlefactor.cpp b/src/titlefactor.cpp
index 0d48c28..774551e 100644
--- a/src/titlefactor.cpp
+++ b/src/titlefactor.cpp
@@ -243,11 +243,11 @@ static const unsigned char img0_titlefactor[] = {
/*
- * Constructs a titleFactor as a child of 'tqparent', with the
+ * Constructs a titleFactor as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-titleFactor::titleFactor( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+titleFactor::titleFactor( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
TQImage img;
img.loadFromData( img0_titlefactor, sizeof( img0_titlefactor ), "PNG" );
diff --git a/src/viewmpeg2.cpp b/src/viewmpeg2.cpp
index ae8c0f7..2313976 100644
--- a/src/viewmpeg2.cpp
+++ b/src/viewmpeg2.cpp
@@ -125,11 +125,11 @@ static const unsigned char img2_viewmpeg2[] = {
/*
- * Constructs a ViewMPEG2 as a child of 'tqparent', with the
+ * Constructs a ViewMPEG2 as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
-ViewMPEG2::ViewMPEG2( TQWidget* tqparent, const char* name, WFlags fl )
- : TQWidget( tqparent, name, fl )
+ViewMPEG2::ViewMPEG2( TQWidget* parent, const char* name, WFlags fl )
+ : TQWidget( parent, name, fl )
{
TQImage img;
img.loadFromData( img0_viewmpeg2, sizeof( img0_viewmpeg2 ), "PNG" );