diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 5660db4e68c904cc2dd01888775483189cda7a10 (patch) | |
tree | f8bb487ab12519611d3ddca1839a03396e954c77 /k9author | |
parent | 33e6166f7e62c479bad5d46ad240ea9704f848fd (diff) | |
download | k9copy-5660db4e68c904cc2dd01888775483189cda7a10.tar.gz k9copy-5660db4e68c904cc2dd01888775483189cda7a10.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
Diffstat (limited to 'k9author')
30 files changed, 65 insertions, 65 deletions
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" ); |