diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:29:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:29:54 -0600 |
| commit | b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8 (patch) | |
| tree | 9beca7fe1a592f5f49be1e0bb4d03f0dfc1829c7 /src | |
| parent | 23c5272c1c49acf0906f7c97a524333705f7be46 (diff) | |
| download | k9copy-b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.tar.gz k9copy-b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.zip | |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'src')
36 files changed, 283 insertions, 283 deletions
diff --git a/src/configDlg.cpp b/src/configDlg.cpp index 3a70e80..96be045 100644 --- a/src/configDlg.cpp +++ b/src/configDlg.cpp @@ -12,7 +12,7 @@ #include <tqvariant.h> #include <tqtable.h> #include <kpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include "kpushbutton.h" @@ -26,7 +26,7 @@ configDlg::configDlg( TQWidget* parent, const char* name, WFlags fl ) { if ( !name ) setName( "configDlg" ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); configDlgLayout = new TQGridLayout( this, 1, 1, 11, 6, "configDlgLayout"); Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); @@ -54,21 +54,21 @@ configDlg::configDlg( TQWidget* parent, const char* name, WFlags fl ) configDlgLayout->addMultiCellWidget( tblDevices, 1, 2, 0, 0 ); - tqlayout4 = new TQVBoxLayout( 0, 0, 6, "tqlayout4"); + layout4 = new TQVBoxLayout( 0, 0, 6, "layout4"); bAdd = new KPushButton( this, "bAdd" ); - bAdd->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) ); + bAdd->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) ); bAdd->setProperty( "stdItem", 27 ); - tqlayout4->addWidget( bAdd ); + layout4->addWidget( bAdd ); bRemove = new KPushButton( this, "bRemove" ); - bRemove->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bRemove->sizePolicy().hasHeightForWidth() ) ); + bRemove->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bRemove->sizePolicy().hasHeightForWidth() ) ); bRemove->setProperty( "stdItem", 28 ); - tqlayout4->addWidget( bRemove ); + layout4->addWidget( bRemove ); - configDlgLayout->addLayout( tqlayout4, 1, 1 ); + configDlgLayout->addLayout( layout4, 1, 1 ); languageChange(); - resize( TQSize(578, 342).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(578, 342).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/configDlg.ui b/src/configDlg.ui index 62f037f..c02dfe1 100644 --- a/src/configDlg.ui +++ b/src/configDlg.ui @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>190</height> @@ -114,7 +114,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> diff --git a/src/k9main.cpp b/src/k9main.cpp index e8cb4fa..1c9590b 100644 --- a/src/k9main.cpp +++ b/src/k9main.cpp @@ -35,7 +35,7 @@ #include "k9titleencopt.h" #include <kselect.h> #include <kcombobox.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqapplication.h> #include <tqlistview.h> #include <kurlrequester.h> @@ -392,7 +392,7 @@ void k9Main::Copy() if (getFreeSpace( m_prefOutput) < m_prefSize) { - if (KMessageBox::warningContinueCancel (this, i18n("Insufficient disk space on %1\n%2 mb expected.").tqarg(m_prefOutput).tqarg(m_prefSize),i18n("DVD Copy"))==KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel (this, i18n("Insufficient disk space on %1\n%2 mb expected.").arg(m_prefOutput).arg(m_prefSize),i18n("DVD Copy"))==KMessageBox::Cancel) return; } stopPreview(); @@ -583,7 +583,7 @@ void k9Main::Open() ckLvItem *tsItem = new ckLvItem(root,this,TITLESET); tsItem->setOpen(TRUE); TQString c; - c=i18n("Titleset %1").tqarg(i+1); + c=i18n("Titleset %1").arg(i+1); tsItem->setText(0,c); tsItem->setText(1," "+dvd->gettitleset(i)->getsize_mb() +" " +i18n("MB")); tsItem->obj=dvd->gettitleset(i) ; @@ -641,8 +641,8 @@ void k9Main::addChapters(TQListViewItem *_parent,k9DVDTitle *_title) for (int i=0;i< _title->getchapterCount();i++) { ckLvItem *it =new ckLvItem(chapter,this,CHAPTER); - it->setText(0,i18n("chapter %1").tqarg(++ch)); - it->setText(1,i18n("%1 MB").tqarg((double)(_title->getChapter(i)->getsectors()) /512)); + it->setText(0,i18n("chapter %1").arg(++ch)); + it->setText(1,i18n("%1 MB").arg((double)(_title->getChapter(i)->getsectors()) /512)); it->streamType=CHAP; it->obj=_title->getChapter(i); chItems.append( it); @@ -654,10 +654,10 @@ void k9Main::addChapters(TQListViewItem *_parent,k9DVDTitle *_title) for (int i=0;i< title2->getchapterCount();i++) { ckLvItem *it =new ckLvItem(chapter,this,CHAPTER); - it->setText(0,i18n("chapter %1").tqarg(++ch)); + it->setText(0,i18n("chapter %1").arg(++ch)); it->streamType=CHAP; it->obj=title2->getChapter(i); - it->setText(1,i18n("%1 MB").tqarg((double)(title2->getChapter(i)->getsectors()) /512)); + it->setText(1,i18n("%1 MB").arg((double)(title2->getChapter(i)->getsectors()) /512)); chItems.append( it); it->mainTitle=_title; } @@ -696,7 +696,7 @@ void k9Main::addTitle(k9DVDTitle *track) video->streamType=VID; addListItem(track,video,VID); video->setOpen( false ); - c=i18n("video %1 ").tqarg(track->getformat()); + c=i18n("video %1 ").arg(track->getformat()); c.append (" - " + track->gettotallength().toString("h:mm:ss")); video->setText(col1, c); c.sprintf("%.2f ", track->gettotalvideosize_mb()); @@ -707,7 +707,7 @@ void k9Main::addTitle(k9DVDTitle *track) for (i=0;i< track->getaudioStreamCount();i++) { l_auds=track->getaudioStream(i); - c=i18n("audio %1 ").tqarg(i+1); + c=i18n("audio %1 ").arg(i+1); c.append( l_auds->getlanguage() + " " +l_auds->getformat()+" " ); ch.sprintf("%dch ",l_auds->getchannels()); c.append(ch+l_auds->getfrequency()+" "+l_auds->getquantization()); @@ -716,7 +716,7 @@ void k9Main::addTitle(k9DVDTitle *track) item->language=l_auds->getlanguage(); addListItem(l_auds,item,AUD); item->setText( col1, c ); - c=i18n("%1 MB").tqarg(l_auds->getsize_mb()); + c=i18n("%1 MB").arg(l_auds->getsize_mb()); item->setText( col2,c); item->setText( col3,l_auds->getcontent()); item->setPixmap(col1,pxSound); @@ -727,14 +727,14 @@ void k9Main::addTitle(k9DVDTitle *track) for (i=0;i< track->getsubPictureCount();i++) { l_sub=track->getsubtitle(i); - c=i18n("subpicture %1 ").tqarg(i+1); + c=i18n("subpicture %1 ").arg(i+1); c.append( l_sub->getlanguage()); ckLvItem * item = new ckLvItem( itemTrack,this,STREAM); item->streamType=SUB; item->language=l_sub->getlanguage(); addListItem(l_sub,item,SUB); item->setText( col1, c ); - c=i18n("%1 MB").tqarg(l_sub->getsize_mb()); + c=i18n("%1 MB").arg(l_sub->getsize_mb()); item->setText( col2,c); item->setText( col3, l_sub->getcontent()); item->setPixmap(col1,pxText); @@ -1146,7 +1146,7 @@ void k9Main::CreateMP4() for (int i=0; i < dvd->gettitleCount();i++) { k9DVDTitle *t=dvd->gettitle(i); - changeStatusbar( i18n("Transcoding title : %1").tqarg(t->getname()) ,sbMessage); + changeStatusbar( i18n("Transcoding title : %1").arg(t->getname()) ,sbMessage); if (t->isSelected() && t->getIndexed() ) { diff --git a/src/k9mainw.cpp b/src/k9mainw.cpp index 24a9552..be1202b 100644 --- a/src/k9mainw.cpp +++ b/src/k9mainw.cpp @@ -18,7 +18,7 @@ #include <kcombobox.h> #include <tqcombobox.h> #include <kpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include "kselect.h" @@ -35,17 +35,17 @@ MainDlg::MainDlg( TQWidget* parent, const char* name, WFlags fl ) { if ( !name ) setName( "MainDlg" ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); setMinimumSize( TQSize( 0, 200 ) ); MainDlgLayout = new TQGridLayout( this, 1, 1, 2, 6, "MainDlgLayout"); lblInput_2 = new TQLabel( this, "lblInput_2" ); - lblInput_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblInput_2->sizePolicy().hasHeightForWidth() ) ); + lblInput_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblInput_2->sizePolicy().hasHeightForWidth() ) ); MainDlgLayout->addWidget( lblInput_2, 1, 0 ); lblInput = new TQLabel( this, "lblInput" ); - lblInput->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblInput->sizePolicy().hasHeightForWidth() ) ); + lblInput->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblInput->sizePolicy().hasHeightForWidth() ) ); MainDlgLayout->addWidget( lblInput, 0, 0 ); @@ -54,7 +54,7 @@ MainDlg::MainDlg( TQWidget* parent, const char* name, WFlags fl ) factor = new KGradientSelector( tab, "factor" ); factor->setEnabled( FALSE ); - factor->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)4, 0, 0, factor->sizePolicy().hasHeightForWidth() ) ); + factor->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)4, 0, 0, factor->sizePolicy().hasHeightForWidth() ) ); factor->setMinimumSize( TQSize( 0, 15 ) ); factor->setValue( 0 ); factor->setMinValue( 0 ); @@ -69,7 +69,7 @@ MainDlg::MainDlg( TQWidget* parent, const char* name, WFlags fl ) listView1->addColumn( tr2i18n( "Size" ) ); listView1->header()->setResizeEnabled( FALSE, listView1->header()->count() - 1 ); listView1->addColumn( tr2i18n( "Content" ) ); - listView1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, listView1->sizePolicy().hasHeightForWidth() ) ); + listView1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, listView1->sizePolicy().hasHeightForWidth() ) ); listView1->setMinimumSize( TQSize( 0, 200 ) ); listView1->setShowSortIndicator( TRUE ); @@ -78,54 +78,54 @@ MainDlg::MainDlg( TQWidget* parent, const char* name, WFlags fl ) MainDlgLayout->addMultiCellWidget( tab, 2, 2, 0, 4 ); textLabel2_2 = new TQLabel( this, "textLabel2_2" ); - textLabel2_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) ); + textLabel2_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) ); MainDlgLayout->addWidget( textLabel2_2, 1, 4 ); cbBurnSpeed = new KComboBox( FALSE, this, "cbBurnSpeed" ); - cbBurnSpeed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbBurnSpeed->sizePolicy().hasHeightForWidth() ) ); + cbBurnSpeed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbBurnSpeed->sizePolicy().hasHeightForWidth() ) ); cbBurnSpeed->setEditable( TRUE ); MainDlgLayout->addWidget( cbBurnSpeed, 1, 3 ); textLabel1_3 = new TQLabel( this, "textLabel1_3" ); - textLabel1_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1_3->sizePolicy().hasHeightForWidth() ) ); + textLabel1_3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1_3->sizePolicy().hasHeightForWidth() ) ); MainDlgLayout->addWidget( textLabel1_3, 1, 2 ); cbInputDev = new TQComboBox( FALSE, this, "cbInputDev" ); - cbInputDev->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbInputDev->sizePolicy().hasHeightForWidth() ) ); + cbInputDev->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbInputDev->sizePolicy().hasHeightForWidth() ) ); cbInputDev->setEditable( TRUE ); cbInputDev->setAutoCompletion( TRUE ); MainDlgLayout->addWidget( cbInputDev, 0, 1 ); - tqlayout2 = new TQHBoxLayout( 0, 0, 6, "tqlayout2"); + layout2 = new TQHBoxLayout( 0, 0, 6, "layout2"); bInputOpenDir = new KPushButton( this, "bInputOpenDir" ); - bInputOpenDir->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpenDir->sizePolicy().hasHeightForWidth() ) ); + bInputOpenDir->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpenDir->sizePolicy().hasHeightForWidth() ) ); bInputOpenDir->setMinimumSize( TQSize( 22, 22 ) ); bInputOpenDir->setMaximumSize( TQSize( 22, 22 ) ); - tqlayout2->addWidget( bInputOpenDir ); + layout2->addWidget( bInputOpenDir ); bInputOpen = new KPushButton( this, "bInputOpen" ); - bInputOpen->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpen->sizePolicy().hasHeightForWidth() ) ); + bInputOpen->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpen->sizePolicy().hasHeightForWidth() ) ); bInputOpen->setMinimumSize( TQSize( 22, 22 ) ); bInputOpen->setMaximumSize( TQSize( 22, 22 ) ); - tqlayout2->addWidget( bInputOpen ); + layout2->addWidget( bInputOpen ); spacer5_2 = new TQSpacerItem( 50, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout2->addItem( spacer5_2 ); + layout2->addItem( spacer5_2 ); - MainDlgLayout->addMultiCellLayout( tqlayout2, 0, 0, 2, 4 ); + MainDlgLayout->addMultiCellLayout( layout2, 0, 0, 2, 4 ); cbOutputDev = new TQComboBox( FALSE, this, "cbOutputDev" ); - cbOutputDev->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbOutputDev->sizePolicy().hasHeightForWidth() ) ); + cbOutputDev->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbOutputDev->sizePolicy().hasHeightForWidth() ) ); cbOutputDev->setEditable( FALSE ); cbOutputDev->setAutoCompletion( TRUE ); MainDlgLayout->addWidget( cbOutputDev, 1, 1 ); languageChange(); - resize( TQSize(743, 585).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(743, 585).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/k9mainw.ui b/src/k9mainw.ui index 1e6e0be..35ed354 100644 --- a/src/k9mainw.ui +++ b/src/k9mainw.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -97,7 +97,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>15</height> @@ -172,7 +172,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>200</height> @@ -258,7 +258,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="2" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -276,13 +276,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -307,13 +307,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -336,7 +336,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>21</height> diff --git a/src/k9mainwsov.ui b/src/k9mainwsov.ui index e4e82fc..8580ee6 100644 --- a/src/k9mainwsov.ui +++ b/src/k9mainwsov.ui @@ -189,7 +189,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>15</height> @@ -260,7 +260,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -279,7 +279,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="2" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -297,13 +297,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -325,13 +325,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -351,7 +351,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>21</height> diff --git a/src/k9mencodercmdgen.cpp b/src/k9mencodercmdgen.cpp index 941f37d..26d0cf5 100644 --- a/src/k9mencodercmdgen.cpp +++ b/src/k9mencodercmdgen.cpp @@ -24,7 +24,7 @@ #include <tqwidgetstack.h> #include <klocale.h> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -203,7 +203,7 @@ void k9MencoderCmdGen::addList(TQDomElement _eOpt) { bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,m_grid,TQString("ck%1").tqarg(m_row++) ); + TQCheckBox *ckLabel=new TQCheckBox(sName,m_grid,TQString("ck%1").arg(m_row++) ); ckLabel->setChecked(bSel); m_hbox=new TQGrid(2,m_grid); m_hbox->setFrameShape(TQFrame::StyledPanel); @@ -255,7 +255,7 @@ void k9MencoderCmdGen::addInt(TQDomElement _eOpt) { if (!aSel.isNull()) bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++) ); + TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++) ); ckLabel->setChecked(bSel); ckLabel->setBackgroundColor(parent->backgroundColor()); @@ -266,7 +266,7 @@ void k9MencoderCmdGen::addInt(TQDomElement _eOpt) { _eOpt.setAttribute("checkbox",ckLabel->name()); - KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,parent,TQString("int%1").tqarg(m_row++)); + KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,parent,TQString("int%1").arg(m_row++)); if (iMax <1000) sb->setFixedWidth(50); else @@ -301,7 +301,7 @@ void k9MencoderCmdGen::addFloat(TQDomElement _eOpt) { if (!aSel.isNull()) bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++)); + TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(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,parent,TQString("float%1").tqarg(m_row++)); + KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,parent,TQString("float%1").arg(m_row++)); if (dMax <1000) sb->setFixedWidth(80); else @@ -346,7 +346,7 @@ void k9MencoderCmdGen::addBool(TQDomElement _eOpt) { if (!aSel.isNull()) bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++)); + TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(m_row++)); if ( !_eOpt.attributeNode("description").isNull()) { TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); @@ -379,7 +379,7 @@ void k9MencoderCmdGen::addString(TQDomElement _eOpt) { if (!aSel.isNull()) bSel=aSel.value()=="true"; - TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++)); + TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").arg(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(parent,TQString("string%1").tqarg(m_row++)); + TQComboBox *cb=new TQComboBox(parent,TQString("string%1").arg(m_row++)); TQDomNodeList values=_eOpt.elementsByTagName("value"); int def=0; diff --git a/src/k9mencodercmdgen.h b/src/k9mencodercmdgen.h index 37ae9cd..074fe3d 100644 --- a/src/k9mencodercmdgen.h +++ b/src/k9mencodercmdgen.h @@ -17,7 +17,7 @@ #include <tqscrollview.h> #include <tqgrid.h> #include <tqdom.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqhbox.h> class _k9CheckListItem; diff --git a/src/k9play.cpp b/src/k9play.cpp index 08dff4b..36aaeb2 100644 --- a/src/k9play.cpp +++ b/src/k9play.cpp @@ -27,23 +27,23 @@ #include <ktempfile.h> #include <kstandarddirs.h> -void k9play::savetqStatus(k9play_st _status) { +void k9play::saveStatus(k9play_st _status) { TQFile fstatus(m_inject); fstatus.open(IO_WriteOnly); fstatus.writeBlock((const char*)&_status,sizeof(k9play_st)); fstatus.close(); - kdebug (TQString("saving status : %1 %2 %3 %4 %5 %6 %7\n").tqarg(_status.title).tqarg(_status.chapter).tqarg(_status.cell).tqarg(_status.sector).tqarg(_status.bytesWritten).tqarg(_status.bytesRead).tqarg(_status.bytesSkipped)); + kdebug (TQString("saving status : %1 %2 %3 %4 %5 %6 %7\n").arg(_status.title).arg(_status.chapter).arg(_status.cell).arg(_status.sector).arg(_status.bytesWritten).arg(_status.bytesRead).arg(_status.bytesSkipped)); } -void k9play::readtqStatus(k9play_st &_status) { +void k9play::readStatus(k9play_st &_status) { TQFile fstatus(m_inject); if (fstatus.open(IO_ReadOnly)) { fstatus.readBlock((char*)&_status,sizeof(k9play_st)); fstatus.close(); } else memset(&_status,0,sizeof(k9play_st)); - kdebug (TQString("reading status : title:%1 chapter:%2 cell:%3 sector:%4 written:%5 readen:%6 skipped:%7 chapters:%8 \n").tqarg(_status.title).tqarg(_status.chapter).tqarg(_status.cell).tqarg(_status.sector).tqarg(_status.bytesWritten).tqarg(_status.bytesRead).tqarg(_status.bytesSkipped).tqarg(_status.bytesChapters)); + kdebug (TQString("reading status : title:%1 chapter:%2 cell:%3 sector:%4 written:%5 readen:%6 skipped:%7 chapters:%8 \n").arg(_status.title).arg(_status.chapter).arg(_status.cell).arg(_status.sector).arg(_status.bytesWritten).arg(_status.bytesRead).arg(_status.bytesSkipped).arg(_status.bytesChapters)); } @@ -143,7 +143,7 @@ void k9play::setcell(TQString _value) { m_cell=_value.toUInt(); } -void k9play::setinittqStatus(bool _value) { +void k9play::setinitStatus(bool _value) { m_initstatus=_value; } @@ -234,7 +234,7 @@ void k9play::play() { if (m_initstatus) memset(&status,0,sizeof(k9play_st)); else { - readtqStatus( status); + readStatus( status); if (m_continue) m_startSector=status.sector; } @@ -277,11 +277,11 @@ void k9play::play() { double factor; factor = (double) (m_totalSize - (status.bytesRead +status.bytesSkipped)) / (double) (m_dvdSize-status.bytesWritten) ; if (factor <1) factor =1; - kdebug(TQString("shrink factor %1 totalSize:%2 (status.bytesRead +status.bytesSkipped):%3 m_dvdSize:%4 status.bytesWritten:%5").tqarg(factor).tqarg(m_totalSize).tqarg(status.bytesRead +status.bytesSkipped).tqarg(m_dvdSize).tqarg(status.bytesWritten) ); + kdebug(TQString("shrink factor %1 totalSize:%2 (status.bytesRead +status.bytesSkipped):%3 m_dvdSize:%4 status.bytesWritten:%5").arg(factor).arg(m_totalSize).arg(status.bytesRead +status.bytesSkipped).arg(m_dvdSize).arg(status.bytesWritten) ); vamps.setVapFactor(factor); } else { vamps.setVapFactor(m_vampsFactor); - kdebug(TQString("vamps factor %1\n").tqarg(m_vampsFactor)); + kdebug(TQString("vamps factor %1\n").arg(m_vampsFactor)); } @@ -302,7 +302,7 @@ void k9play::play() { /* set read ahead cache usage */ if (dvdnav_set_readahead_flag(dvdnav, DVD_READ_CACHE) != DVDNAV_STATUS_OK) { - writeOutput( TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); + writeOutput( TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").arg(dvdnav_err_to_string(dvdnav))); return; } @@ -310,14 +310,14 @@ void k9play::play() { if (dvdnav_menu_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK || dvdnav_audio_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK || dvdnav_spu_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK) { - writeOutput( TQString("ERR:Error on setting languages: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); + writeOutput( TQString("ERR:Error on setting languages: %1\n").arg(dvdnav_err_to_string(dvdnav))); return ; } /* set the PGC positioning flag to have position information relatively to the * whole feature instead of just relatively to the current chapter */ if (dvdnav_set_PGC_positioning_flag(dvdnav, 1) != DVDNAV_STATUS_OK) { - writeOutput(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); + writeOutput(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").arg(dvdnav_err_to_string(dvdnav))); return ; } @@ -351,7 +351,7 @@ void k9play::play() { if (result == DVDNAV_STATUS_ERR) { - writeOutput(TQString("ERR:Error getting next block: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); + writeOutput(TQString("ERR:Error getting next block: %1\n").arg(dvdnav_err_to_string(dvdnav))); return; } switch (event) { @@ -367,7 +367,7 @@ void k9play::play() { if ((m_endSector !=0xFFFFFFFF) && (((status.bytesRead+status.bytesSkipped)/2048) >m_endSector)) { finished=1; - kdebug(TQString("pos >m_endSector %1 %2").tqarg((status.bytesRead+status.bytesSkipped)/2048).tqarg(m_endSector)); + kdebug(TQString("pos >m_endSector %1 %2").arg((status.bytesRead+status.bytesSkipped)/2048).arg(m_endSector)); } if ((m_chapter !=0 && ptt !=m_chapter) || (tt != m_title)) finished=1; @@ -377,7 +377,7 @@ void k9play::play() { if (!finished && m_chapterList.count() >0) { if (m_chapterList.findIndex( TQString::number(ptt)) == -1) { dvdnav_part_play(dvdnav,tt, ptt+1); - kdebug( TQString("skipping chapter %1").tqarg(ptt)); + kdebug( TQString("skipping chapter %1").arg(ptt)); continue; //dvdnav_part_play(dvdnav_t *self, int32_t title, int32_t part); } @@ -386,7 +386,7 @@ void k9play::play() { if (m_continue) { dvdnav_sector_search(dvdnav,m_startSector , SEEK_SET); - kdebug (TQString("repositionning on %1").tqarg(m_startSector)); + kdebug (TQString("repositionning on %1").arg(m_startSector)); m_continue=false; finished=0; bcell=true; @@ -398,7 +398,7 @@ void k9play::play() { vamps.addData( buf,len); status.bytesRead +=len; if (!m_useCache) - writeOutput(TQString("\rINFOPOS: %1 %2").tqarg((status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN).tqarg(lgr)); + writeOutput(TQString("\rINFOPOS: %1 %2").arg((status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN).arg(lgr)); if (m_pos==0xFFFFFFFF) m_pos=(status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN; } @@ -521,7 +521,7 @@ void k9play::play() { status.bytesWritten +=vamps.getOutputBytes(); if (!m_firstPass) - savetqStatus( status); + saveStatus( status); delete bufferFile; } @@ -531,7 +531,7 @@ void k9play::flush(k9SaveImage &_saveImage ) { TQFile out; out.open(IO_WriteOnly,stdout); while(!m_output->atEnd()) { - writeOutput(TQString("\rINFOPOS: %1 %2").tqarg(m_pos).tqarg(m_length)); + writeOutput(TQString("\rINFOPOS: %1 %2").arg(m_pos).arg(m_length)); m_pos+=20; int l=m_output->readBlock(buffer,20*DVD_VIDEO_LB_LEN); if (l>0) { diff --git a/src/k9play.h b/src/k9play.h index c291151..21d39dc 100644 --- a/src/k9play.h +++ b/src/k9play.h @@ -63,8 +63,8 @@ private: bool readNavPack (k9DVDFile *fh, dsi_t *dsi,int sector, uchar *_buffer); void insert_dummy_pack (int8_t *buf); void insert_nav_pack (int8_t *buf); - void savetqStatus(k9play_st _status); - void readtqStatus(k9play_st &_status); + void saveStatus(k9play_st _status); + void readStatus(k9play_st &_status); void flush(k9SaveImage &_saveImage); public: k9play(); @@ -91,7 +91,7 @@ public: void setinject(TQString _value); void setdvdSize(TQString _value); void setchapterSize(TQString _value); - void setinittqStatus(bool _value); + void setinitStatus(bool _value); void setcontinue (bool _value); void setfirstPass (bool _value); void setforcedFactor(bool _value); diff --git a/src/k9playbackoptions.cpp b/src/k9playbackoptions.cpp index a4f197d..1831e09 100644 --- a/src/k9playbackoptions.cpp +++ b/src/k9playbackoptions.cpp @@ -153,7 +153,7 @@ void k9PlaybackOptions::lbSequenceChanged(TQListBoxItem *_item) { if (title->getaudioStream(i)->getselected()) { // if ( !title->getDefAudioSet()) // title->setDefAudio(title->getaudioStream(i)); - cbDefAudio->insertItem( TQString("%1 - %2").tqarg(title->getaudioStream(i)->getID()).tqarg(title->getaudioStream(i)->getlanguage())); + cbDefAudio->insertItem( TQString("%1 - %2").arg(title->getaudioStream(i)->getID()).arg(title->getaudioStream(i)->getlanguage())); if (title->getaudioStream(i)==title->getDefAudio()) { cbDefAudio->setCurrentItem(cbDefAudio->count()-1); } @@ -164,7 +164,7 @@ void k9PlaybackOptions::lbSequenceChanged(TQListBoxItem *_item) { for (int i=0;i < title->getsubPictureCount();i++) { if (title->getsubtitle(i)->getselected()) { TQPixmap icon; - cbDefSub->insertItem(TQString("%1 - %2").tqarg(title->getsubtitle(i)->getID().first()).tqarg(title->getsubtitle(i)->getlanguage())); + cbDefSub->insertItem(TQString("%1 - %2").arg(title->getsubtitle(i)->getID().first()).arg(title->getsubtitle(i)->getlanguage())); if (title->getsubtitle(i)==title->getDefSubtitle()) { cbDefSub->setCurrentItem(cbDefSub->count()-1); } diff --git a/src/k9prefmencoder.cpp b/src/k9prefmencoder.cpp index 0bf4d21..6a34ae5 100644 --- a/src/k9prefmencoder.cpp +++ b/src/k9prefmencoder.cpp @@ -13,7 +13,7 @@ #include "k9prefmencoder.h" #include <tqlistbox.h> -#include <tqtextedit.h> +#include <textedit.h> #include "k9mencodercmdgen.h" #include <kpushbutton.h> #include <kiconloader.h> diff --git a/src/k9settings.cpp b/src/k9settings.cpp index f3507aa..6646e46 100644 --- a/src/k9settings.cpp +++ b/src/k9settings.cpp @@ -16,7 +16,7 @@ #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> k9settings::k9settings(TQWidget *parent,const TQString &caption): KDialogBase (IconList,caption, Ok|Apply|Cancel, Ok) { diff --git a/src/k9titlefactor.cpp b/src/k9titlefactor.cpp index fbbf337..0789de1 100644 --- a/src/k9titlefactor.cpp +++ b/src/k9titlefactor.cpp @@ -86,9 +86,9 @@ void k9TitleFactor::slFactor_valueChanged( int ) { m_factor=-1; } if (m_current->getforceFactor()) - tFactor->setText(TQString("%1").tqarg(m_current->getfactor(),4,'f',2)); + tFactor->setText(TQString("%1").arg(m_current->getfactor(),4,'f',2)); else - tFactor->setText(TQString("%1").tqarg(getFactor(),4,'f',2)); + tFactor->setText(TQString("%1").arg(getFactor(),4,'f',2)); } } @@ -107,14 +107,14 @@ void k9TitleFactor::changedTitle(k9DVDTitle *_title) { gbTitle->setChecked(m_current->getforceFactor()); m_updating=false; - lbTitle->setText(TQString(i18n("Shrink Factor for %1")).tqarg(m_current->getname())); + lbTitle->setText(TQString(i18n("Shrink Factor for %1")).arg(m_current->getname())); if (m_current->getforceFactor()) { slFactor->setValue(m_current->getfactor()*100.0); - tFactor->setText(TQString("%1").tqarg(m_current->getfactor(),4,'f',2)); + tFactor->setText(TQString("%1").arg(m_current->getfactor(),4,'f',2)); setMinFactor(); } else { slFactor->setValue(getFactor()*100.0); - tFactor->setText(TQString("%1").tqarg(getFactor(),4,'f',2)); + tFactor->setText(TQString("%1").arg(getFactor(),4,'f',2)); slFactor->setMinValue(100); } diff --git a/src/kviewmpeg2.cpp b/src/kviewmpeg2.cpp index 20ca88e..00e2758 100755 --- a/src/kviewmpeg2.cpp +++ b/src/kviewmpeg2.cpp @@ -26,7 +26,7 @@ #include <tqslider.h> #include <tqapplication.h> #include <tqtoolbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <string.h> #include <sys/stat.h> @@ -48,7 +48,7 @@ k9Widget::k9Widget(TQWidget *parent):TQWidget(parent) { void k9Widget::setImage(TQImage *_image) { m_image=_image; //paintEvent( NULL); - tqrepaint(FALSE); + repaint(FALSE); } void k9Widget::paintEvent( TQPaintEvent *_event) { diff --git a/src/langselectw.cpp b/src/langselectw.cpp index 283bde1..555367e 100644 --- a/src/langselectw.cpp +++ b/src/langselectw.cpp @@ -12,7 +12,7 @@ #include <tqvariant.h> #include <tqheader.h> #include <tqlistview.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqimage.h> @@ -91,14 +91,14 @@ langSelect::langSelect( TQWidget* parent, const char* name, WFlags fl ) lvLanguages = new TQListView( this, "lvLanguages" ); lvLanguages->addColumn( tr2i18n( "Languages" ) ); lvLanguages->header()->setClickEnabled( FALSE, lvLanguages->header()->count() - 1 ); - lvLanguages->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)7, 0, 0, lvLanguages->sizePolicy().hasHeightForWidth() ) ); + lvLanguages->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)7, 0, 0, lvLanguages->sizePolicy().hasHeightForWidth() ) ); lvLanguages->setMinimumSize( TQSize( 208, 0 ) ); lvLanguages->setHScrollBarMode( TQListView::AlwaysOff ); lvLanguages->setResizeMode( TQListView::LastColumn ); langSelectLayout->addWidget( lvLanguages, 0, 0 ); languageChange(); - resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/src/langselectw.ui b/src/langselectw.ui index 352d52e..474dca7 100644 --- a/src/langselectw.ui +++ b/src/langselectw.ui @@ -48,7 +48,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>208</width> <height>0</height> diff --git a/src/main.cpp b/src/main.cpp index ee375b4..f5ee876 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -105,7 +105,7 @@ int main(int argc, char **argv) { bool redirect = args->isSet("redirect"); if (play) { k9play player; - player.setinittqStatus( args->isSet("initstatus")); + player.setinitStatus( args->isSet("initstatus")); player.setcontinue( args->isSet("continue")); player.setfirstPass(args->isSet("firstpass")); player.setuseCache(args->isSet("usecache")); diff --git a/src/mencoderCmdGen.cpp b/src/mencoderCmdGen.cpp index bd9addd..62235a4 100644 --- a/src/mencoderCmdGen.cpp +++ b/src/mencoderCmdGen.cpp @@ -15,7 +15,7 @@ #include <tqlistview.h> #include <tqwidgetstack.h> #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqimage.h> @@ -59,7 +59,7 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl listView->addColumn( TQString() ); listView->header()->setClickEnabled( FALSE, listView->header()->count() - 1 ); listView->header()->setResizeEnabled( FALSE, listView->header()->count() - 1 ); - listView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listView->sizePolicy().hasHeightForWidth() ) ); + listView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listView->sizePolicy().hasHeightForWidth() ) ); listView->setMinimumSize( TQSize( 200, 0 ) ); listView->setResizeMode( TQListView::LastColumn ); @@ -72,7 +72,7 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl MyDialog1Layout->addWidget( wsOptions, 0, 1 ); languageChange(); - resize( TQSize(655, 498).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(655, 498).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/mencoderCmdGen.ui b/src/mencoderCmdGen.ui index 6d18a21..3cc749b 100644 --- a/src/mencoderCmdGen.ui +++ b/src/mencoderCmdGen.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -159,7 +159,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> diff --git a/src/playbackoptionsw.cpp b/src/playbackoptionsw.cpp index 56b0f43..3ea783a 100644 --- a/src/playbackoptionsw.cpp +++ b/src/playbackoptionsw.cpp @@ -17,7 +17,7 @@ #include <kpushbutton.h> #include <tqlabel.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqimage.h> @@ -120,27 +120,27 @@ PlaybackOptionsw::PlaybackOptionsw( TQWidget* parent, const char* name, WFlags f frPlayback = new TQFrame( this, "frPlayback" ); frPlayback->setEnabled( FALSE ); - frPlayback->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, frPlayback->sizePolicy().hasHeightForWidth() ) ); + frPlayback->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, frPlayback->sizePolicy().hasHeightForWidth() ) ); frPlayback->setFrameShape( TQFrame::NoFrame ); frPlayback->setFrameShadow( TQFrame::Sunken ); frPlaybackLayout = new TQGridLayout( frPlayback, 1, 1, 0, 2, "frPlaybackLayout"); lbSequence = new TQListBox( frPlayback, "lbSequence" ); - lbSequence->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, lbSequence->sizePolicy().hasHeightForWidth() ) ); + lbSequence->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, lbSequence->sizePolicy().hasHeightForWidth() ) ); frPlaybackLayout->addMultiCellWidget( lbSequence, 1, 5, 0, 0 ); spacer5 = new TQSpacerItem( 20, 31, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); frPlaybackLayout->addMultiCell( spacer5, 0, 1, 1, 1 ); bSeqUp = new KPushButton( frPlayback, "bSeqUp" ); - bSeqUp->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bSeqUp->sizePolicy().hasHeightForWidth() ) ); + bSeqUp->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bSeqUp->sizePolicy().hasHeightForWidth() ) ); bSeqUp->setMinimumSize( TQSize( 21, 21 ) ); bSeqUp->setMaximumSize( TQSize( 21, 21 ) ); frPlaybackLayout->addMultiCellWidget( bSeqUp, 2, 2, 1, 2 ); bSeqDown = new KPushButton( frPlayback, "bSeqDown" ); - bSeqDown->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bSeqDown->sizePolicy().hasHeightForWidth() ) ); + bSeqDown->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bSeqDown->sizePolicy().hasHeightForWidth() ) ); bSeqDown->setMinimumSize( TQSize( 21, 21 ) ); bSeqDown->setMaximumSize( TQSize( 21, 21 ) ); @@ -149,7 +149,7 @@ PlaybackOptionsw::PlaybackOptionsw( TQWidget* parent, const char* name, WFlags f frPlaybackLayout->addItem( spacer7, 3, 1 ); textLabel4 = new TQLabel( frPlayback, "textLabel4" ); - textLabel4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) ); + textLabel4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) ); TQFont textLabel4_font( textLabel4->font() ); textLabel4_font.setBold( TRUE ); textLabel4->setFont( textLabel4_font ); @@ -157,14 +157,14 @@ PlaybackOptionsw::PlaybackOptionsw( TQWidget* parent, const char* name, WFlags f frPlaybackLayout->addWidget( textLabel4, 0, 0 ); frame4 = new TQFrame( frPlayback, "frame4" ); - frame4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) ); + frame4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) ); frame4->setMinimumSize( TQSize( 211, 100 ) ); frame4->setFrameShape( TQFrame::NoFrame ); frame4->setFrameShadow( TQFrame::Raised ); frame4Layout = new TQGridLayout( frame4, 1, 1, 0, 0, "frame4Layout"); textLabel1 = new TQLabel( frame4, "textLabel1" ); - textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); TQFont textLabel1_font( textLabel1->font() ); textLabel1_font.setBold( TRUE ); textLabel1->setFont( textLabel1_font ); @@ -172,22 +172,22 @@ PlaybackOptionsw::PlaybackOptionsw( TQWidget* parent, const char* name, WFlags f frame4Layout->addMultiCellWidget( textLabel1, 0, 0, 0, 2 ); cbDefSub = new TQComboBox( FALSE, frame4, "cbDefSub" ); - cbDefSub->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, cbDefSub->sizePolicy().hasHeightForWidth() ) ); + cbDefSub->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, cbDefSub->sizePolicy().hasHeightForWidth() ) ); frame4Layout->addWidget( cbDefSub, 2, 2 ); textLabel3 = new TQLabel( frame4, "textLabel3" ); - textLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel3->sizePolicy().hasHeightForWidth() ) ); + textLabel3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel3->sizePolicy().hasHeightForWidth() ) ); frame4Layout->addWidget( textLabel3, 2, 0 ); cbDefAudio = new TQComboBox( FALSE, frame4, "cbDefAudio" ); - cbDefAudio->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, cbDefAudio->sizePolicy().hasHeightForWidth() ) ); + cbDefAudio->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, cbDefAudio->sizePolicy().hasHeightForWidth() ) ); frame4Layout->addWidget( cbDefAudio, 1, 2 ); textLabel2_3 = new TQLabel( frame4, "textLabel2_3" ); - textLabel2_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel2_3->sizePolicy().hasHeightForWidth() ) ); + textLabel2_3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel2_3->sizePolicy().hasHeightForWidth() ) ); frame4Layout->addWidget( textLabel2_3, 1, 0 ); spacer4 = new TQSpacerItem( 16, 21, TQSizePolicy::Fixed, TQSizePolicy::Minimum ); @@ -199,7 +199,7 @@ PlaybackOptionsw::PlaybackOptionsw( TQWidget* parent, const char* name, WFlags f PlaybackOptionswLayout->addWidget( frPlayback, 0, 0 ); languageChange(); - resize( TQSize(328, 491).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(328, 491).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/playbackoptionsw.ui b/src/playbackoptionsw.ui index 19ebae5..d30fb3e 100644 --- a/src/playbackoptionsw.ui +++ b/src/playbackoptionsw.ui @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -109,13 +109,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>21</width> <height>21</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>21</width> <height>21</height> @@ -137,13 +137,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>21</width> <height>21</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>21</width> <height>21</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -203,7 +203,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>211</width> <height>100</height> @@ -314,7 +314,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>21</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>280</height> diff --git a/src/prefAuthor.cpp b/src/prefAuthor.cpp index 56f3657..9038248 100644 --- a/src/prefAuthor.cpp +++ b/src/prefAuthor.cpp @@ -17,7 +17,7 @@ #include <knuminput.h> #include <kpushbutton.h> #include <kcolorbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include "knuminput.h" @@ -37,10 +37,10 @@ prefAuthor::prefAuthor( TQWidget* parent, const char* name, WFlags fl ) groupBox1 = new TQGroupBox( this, "groupBox1" ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->tqlayout()->setSpacing( 6 ); - groupBox1->tqlayout()->setMargin( 11 ); - groupBox1Layout = new TQGridLayout( groupBox1->tqlayout() ); - groupBox1Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); + groupBox1Layout = new TQGridLayout( groupBox1->layout() ); + groupBox1Layout->setAlignment( TQt::AlignTop ); cbAudioFormat = new TQComboBox( FALSE, groupBox1, "cbAudioFormat" ); @@ -66,10 +66,10 @@ prefAuthor::prefAuthor( TQWidget* parent, const char* name, WFlags fl ) groupBox2 = new TQGroupBox( this, "groupBox2" ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 11 ); - groupBox2Layout = new TQGridLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 11 ); + groupBox2Layout = new TQGridLayout( groupBox2->layout() ); + groupBox2Layout->setAlignment( TQt::AlignTop ); textLabel3 = new TQLabel( groupBox2, "textLabel3" ); @@ -115,7 +115,7 @@ prefAuthor::prefAuthor( TQWidget* parent, const char* name, WFlags fl ) prefAuthorLayout->addWidget( groupBox2, 1, 0 ); languageChange(); - resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/prefAuthor.ui b/src/prefAuthor.ui index c108b20..0633a84 100644 --- a/src/prefAuthor.ui +++ b/src/prefAuthor.ui @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>151</width> <height>21</height> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>31</height> diff --git a/src/prefDVD.cpp b/src/prefDVD.cpp index 555c835..8b56e23 100644 --- a/src/prefDVD.cpp +++ b/src/prefDVD.cpp @@ -14,7 +14,7 @@ #include <kurlrequester.h> #include <tqcheckbox.h> #include <tqspinbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include "kurlrequester.h" @@ -33,12 +33,12 @@ prefDVD::prefDVD( TQWidget* parent, const char* name, WFlags fl ) prefDVDLayout = new TQGridLayout( this, 1, 1, 11, 6, "prefDVDLayout"); lblworkDir = new TQLabel( this, "lblworkDir" ); - lblworkDir->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblworkDir->sizePolicy().hasHeightForWidth() ) ); + lblworkDir->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblworkDir->sizePolicy().hasHeightForWidth() ) ); prefDVDLayout->addWidget( lblworkDir, 0, 0 ); urOutput = new KURLRequester( this, "urOutput" ); - urOutput->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, urOutput->sizePolicy().hasHeightForWidth() ) ); + urOutput->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, urOutput->sizePolicy().hasHeightForWidth() ) ); prefDVDLayout->addMultiCellWidget( urOutput, 0, 0, 1, 2 ); @@ -47,7 +47,7 @@ prefDVD::prefDVD( TQWidget* parent, const char* name, WFlags fl ) prefDVDLayout->addMultiCellWidget( ckK3b, 2, 2, 0, 2 ); ckAutoBurn = new TQCheckBox( this, "ckAutoBurn" ); - ckAutoBurn->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ckAutoBurn->sizePolicy().hasHeightForWidth() ) ); + ckAutoBurn->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ckAutoBurn->sizePolicy().hasHeightForWidth() ) ); prefDVDLayout->addMultiCellWidget( ckAutoBurn, 3, 3, 0, 2 ); @@ -56,7 +56,7 @@ prefDVD::prefDVD( TQWidget* parent, const char* name, WFlags fl ) prefDVDLayout->addWidget( textLabel1_2, 1, 0 ); sbSize = new TQSpinBox( this, "sbSize" ); - sbSize->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbSize->sizePolicy().hasHeightForWidth() ) ); + sbSize->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbSize->sizePolicy().hasHeightForWidth() ) ); sbSize->setMinimumSize( TQSize( 80, 0 ) ); sbSize->setMaxValue( 9000 ); sbSize->setLineStep( 100 ); @@ -78,7 +78,7 @@ prefDVD::prefDVD( TQWidget* parent, const char* name, WFlags fl ) prefDVDLayout->addMultiCellWidget( ckDelTmpFiles, 6, 6, 0, 2 ); languageChange(); - resize( TQSize(600, 347).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(600, 347).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/src/prefDVD.ui b/src/prefDVD.ui index 4b113b6..07e904f 100644 --- a/src/prefDVD.ui +++ b/src/prefDVD.ui @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> @@ -135,7 +135,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>110</height> diff --git a/src/prefMPEG4.cpp b/src/prefMPEG4.cpp index 6b4c858..2a5e367 100644 --- a/src/prefMPEG4.cpp +++ b/src/prefMPEG4.cpp @@ -19,7 +19,7 @@ #include <tqspinbox.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqimage.h> @@ -124,7 +124,7 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl ) tabVideoLayout->addWidget( textLabel1_4, 0, 0 ); cbMp4Codec = new TQComboBox( FALSE, tabVideo, "cbMp4Codec" ); - cbMp4Codec->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4Codec->sizePolicy().hasHeightForWidth() ) ); + cbMp4Codec->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4Codec->sizePolicy().hasHeightForWidth() ) ); tabVideoLayout->addMultiCellWidget( cbMp4Codec, 0, 0, 1, 2 ); @@ -137,16 +137,16 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl ) tabVideoLayout->addWidget( textLabel3_2_2, 2, 0 ); leMp4Width = new TQLineEdit( tabVideo, "leMp4Width" ); - leMp4Width->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, leMp4Width->sizePolicy().hasHeightForWidth() ) ); + leMp4Width->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, leMp4Width->sizePolicy().hasHeightForWidth() ) ); leMp4Width->setMinimumSize( TQSize( 0, 0 ) ); leMp4Width->setMaximumSize( TQSize( 70, 32767 ) ); leMp4Width->setMaxLength( 4 ); - leMp4Width->tqsetAlignment( int( TQLineEdit::AlignAuto ) ); + leMp4Width->setAlignment( int( TQLineEdit::AlignAuto ) ); tabVideoLayout->addWidget( leMp4Width, 1, 1 ); ckMp4AspectRatio = new TQCheckBox( tabVideo, "ckMp4AspectRatio" ); - ckMp4AspectRatio->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, ckMp4AspectRatio->sizePolicy().hasHeightForWidth() ) ); + ckMp4AspectRatio->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, ckMp4AspectRatio->sizePolicy().hasHeightForWidth() ) ); ckMp4AspectRatio->setChecked( TRUE ); tabVideoLayout->addMultiCellWidget( ckMp4AspectRatio, 1, 1, 3, 6 ); @@ -155,42 +155,42 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl ) leMp4Height = new TQLineEdit( tabVideo, "leMp4Height" ); leMp4Height->setEnabled( FALSE ); - leMp4Height->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4Height->sizePolicy().hasHeightForWidth() ) ); + leMp4Height->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4Height->sizePolicy().hasHeightForWidth() ) ); leMp4Height->setMinimumSize( TQSize( 0, 0 ) ); leMp4Height->setMaximumSize( TQSize( 70, 32767 ) ); leMp4Height->setMaxLength( 4 ); - leMp4Height->tqsetAlignment( int( TQLineEdit::AlignAuto ) ); + leMp4Height->setAlignment( int( TQLineEdit::AlignAuto ) ); tabVideoLayout->addWidget( leMp4Height, 2, 1 ); spacer8 = new TQSpacerItem( 21, 110, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabVideoLayout->addItem( spacer8, 4, 5 ); sbMp4NumberCD = new TQSpinBox( tabVideo, "sbMp4NumberCD" ); - sbMp4NumberCD->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4NumberCD->sizePolicy().hasHeightForWidth() ) ); + sbMp4NumberCD->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4NumberCD->sizePolicy().hasHeightForWidth() ) ); sbMp4NumberCD->setMaxValue( 9 ); sbMp4NumberCD->setMinValue( 1 ); tabVideoLayout->addWidget( sbMp4NumberCD, 3, 5 ); textLabel1 = new TQLabel( tabVideo, "textLabel1" ); - textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); tabVideoLayout->addWidget( textLabel1, 3, 4 ); buttonGroup1 = new TQButtonGroup( tabVideo, "buttonGroup1" ); buttonGroup1->setFrameShape( TQButtonGroup::NoFrame ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->tqlayout()->setSpacing( 6 ); - buttonGroup1->tqlayout()->setMargin( 2 ); - buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() ); - buttonGroup1Layout->tqsetAlignment( TQt::AlignTop ); + buttonGroup1->layout()->setSpacing( 6 ); + buttonGroup1->layout()->setMargin( 2 ); + buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() ); + buttonGroup1Layout->setAlignment( TQt::AlignTop ); rbSize = new TQRadioButton( buttonGroup1, "rbSize" ); buttonGroup1Layout->addWidget( rbSize, 0, 0 ); sbMp4Size = new TQSpinBox( buttonGroup1, "sbMp4Size" ); - sbMp4Size->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4Size->sizePolicy().hasHeightForWidth() ) ); + sbMp4Size->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4Size->sizePolicy().hasHeightForWidth() ) ); sbMp4Size->setMinimumSize( TQSize( 80, 0 ) ); sbMp4Size->setButtonSymbols( TQSpinBox::UpDownArrows ); sbMp4Size->setMaxValue( 9999 ); @@ -207,14 +207,14 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl ) buttonGroup1Layout->addMultiCell( spacer6, 0, 1, 2, 2 ); leMp4VideoBitrate = new TQLineEdit( buttonGroup1, "leMp4VideoBitrate" ); - leMp4VideoBitrate->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, leMp4VideoBitrate->sizePolicy().hasHeightForWidth() ) ); + leMp4VideoBitrate->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, leMp4VideoBitrate->sizePolicy().hasHeightForWidth() ) ); buttonGroup1Layout->addWidget( leMp4VideoBitrate, 1, 1 ); tabVideoLayout->addMultiCellWidget( buttonGroup1, 3, 3, 0, 3 ); spacer3 = new TQSpacerItem( 130, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tabVideoLayout->addItem( spacer3, 3, 6 ); - tabWidget->insertTab( tabVideo, TQString::tqfromLatin1("") ); + tabWidget->insertTab( tabVideo, TQString::fromLatin1("") ); tabAudio = new TQWidget( tabWidget, "tabAudio" ); tabAudioLayout = new TQGridLayout( tabAudio, 1, 1, 11, 6, "tabAudioLayout"); @@ -224,7 +224,7 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl ) tabAudioLayout->addWidget( textLabel1_4_2, 0, 0 ); cbMp4AudioCodec = new TQComboBox( FALSE, tabAudio, "cbMp4AudioCodec" ); - cbMp4AudioCodec->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4AudioCodec->sizePolicy().hasHeightForWidth() ) ); + cbMp4AudioCodec->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4AudioCodec->sizePolicy().hasHeightForWidth() ) ); tabAudioLayout->addMultiCellWidget( cbMp4AudioCodec, 0, 0, 1, 2 ); @@ -233,11 +233,11 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl ) tabAudioLayout->addWidget( textLabel1_5, 1, 0 ); leMp4AudioBitrate = new TQLineEdit( tabAudio, "leMp4AudioBitrate" ); - leMp4AudioBitrate->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4AudioBitrate->sizePolicy().hasHeightForWidth() ) ); + leMp4AudioBitrate->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4AudioBitrate->sizePolicy().hasHeightForWidth() ) ); leMp4AudioBitrate->setMinimumSize( TQSize( 0, 0 ) ); leMp4AudioBitrate->setMaximumSize( TQSize( 70, 32767 ) ); leMp4AudioBitrate->setMaxLength( 3 ); - leMp4AudioBitrate->tqsetAlignment( int( TQLineEdit::AlignAuto ) ); + leMp4AudioBitrate->setAlignment( int( TQLineEdit::AlignAuto ) ); tabAudioLayout->addWidget( leMp4AudioBitrate, 1, 1 ); spacer4 = new TQSpacerItem( 376, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -254,7 +254,7 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl ) tabAudioLayout->addWidget( textLabel1_2, 2, 0 ); spacer14 = new TQSpacerItem( 20, 61, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabAudioLayout->addItem( spacer14, 3, 3 ); - tabWidget->insertTab( tabAudio, TQString::tqfromLatin1("") ); + tabWidget->insertTab( tabAudio, TQString::fromLatin1("") ); prefMPEG4Layout->addWidget( tabWidget, 1, 0 ); @@ -262,7 +262,7 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl ) prefMPEG4Layout->addWidget( ckUseCache, 2, 0 ); languageChange(); - resize( TQSize(582, 460).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(582, 460).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/prefMPEG4.ui b/src/prefMPEG4.ui index 7f8116a..3259bb8 100644 --- a/src/prefMPEG4.ui +++ b/src/prefMPEG4.ui @@ -134,13 +134,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>70</width> <height>32767</height> @@ -152,7 +152,7 @@ <property name="maxLength"> <number>4</number> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <property name="inputMask"> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>380</width> <height>21</height> @@ -213,13 +213,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>70</width> <height>32767</height> @@ -228,7 +228,7 @@ <property name="maxLength"> <number>4</number> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> <property name="inputMask"> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>110</height> @@ -327,7 +327,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> @@ -373,7 +373,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -405,7 +405,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>21</height> @@ -491,13 +491,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>70</width> <height>32767</height> @@ -509,7 +509,7 @@ <property name="maxLength"> <number>3</number> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignAuto</set> </property> </widget> @@ -523,7 +523,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>376</width> <height>20</height> @@ -559,7 +559,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>61</height> diff --git a/src/prefMencoder.cpp b/src/prefMencoder.cpp index fa9a857..d4d9c0e 100644 --- a/src/prefMencoder.cpp +++ b/src/prefMencoder.cpp @@ -15,9 +15,9 @@ #include <tqtabwidget.h> #include <tqlistbox.h> #include <kpushbutton.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include "kpushbutton.h" @@ -33,22 +33,22 @@ prefMencoder::prefMencoder( TQWidget* parent, const char* name, WFlags fl ) setName( "prefMencoder" ); prefMencoderLayout = new TQGridLayout( this, 1, 1, 11, 6, "prefMencoderLayout"); - tqlayout2 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout2"); + layout2 = new TQGridLayout( 0, 1, 1, 0, 6, "layout2"); textLabel2 = new TQLabel( this, "textLabel2" ); - textLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) ); + textLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) ); TQFont textLabel2_font( textLabel2->font() ); textLabel2_font.setBold( TRUE ); textLabel2->setFont( textLabel2_font ); - tqlayout2->addWidget( textLabel2, 0, 0 ); + layout2->addWidget( textLabel2, 0, 0 ); textLabel2_2 = new TQLabel( this, "textLabel2_2" ); - textLabel2_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) ); + textLabel2_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) ); - tqlayout2->addWidget( textLabel2_2, 0, 1 ); + layout2->addWidget( textLabel2_2, 0, 1 ); - prefMencoderLayout->addLayout( tqlayout2, 2, 0 ); + prefMencoderLayout->addLayout( layout2, 2, 0 ); tabWidget2 = new TQTabWidget( this, "tabWidget2" ); @@ -60,13 +60,13 @@ prefMencoder::prefMencoder( TQWidget* parent, const char* name, WFlags fl ) tabLayout->addMultiCellWidget( lbvCodecs, 0, 4, 0, 1 ); btnDeleteV = new KPushButton( tab, "btnDeleteV" ); - btnDeleteV->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnDeleteV->sizePolicy().hasHeightForWidth() ) ); + btnDeleteV->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnDeleteV->sizePolicy().hasHeightForWidth() ) ); btnDeleteV->setProperty( "stdItem", 28 ); tabLayout->addWidget( btnDeleteV, 5, 1 ); btnAddV = new KPushButton( tab, "btnAddV" ); - btnAddV->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnAddV->sizePolicy().hasHeightForWidth() ) ); + btnAddV->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnAddV->sizePolicy().hasHeightForWidth() ) ); btnAddV->setProperty( "stdItem", 27 ); tabLayout->addWidget( btnAddV, 5, 0 ); @@ -83,62 +83,62 @@ prefMencoder::prefMencoder( TQWidget* parent, const char* name, WFlags fl ) tabLayout->addWidget( textLabel1_2_3, 3, 2 ); - tqlayout9 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout9"); + layout9 = new TQGridLayout( 0, 1, 1, 0, 6, "layout9"); teOpt2 = new TQTextEdit( tab, "teOpt2" ); teOpt2->setEnabled( TRUE ); - tqlayout9->addMultiCellWidget( teOpt2, 0, 1, 0, 0 ); + layout9->addMultiCellWidget( teOpt2, 0, 1, 0, 0 ); spacer5 = new TQSpacerItem( 20, 81, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout9->addItem( spacer5, 1, 1 ); + layout9->addItem( spacer5, 1, 1 ); btnOpt2 = new KPushButton( tab, "btnOpt2" ); btnOpt2->setMinimumSize( TQSize( 22, 22 ) ); btnOpt2->setMaximumSize( TQSize( 22, 22 ) ); - tqlayout9->addWidget( btnOpt2, 0, 1 ); + layout9->addWidget( btnOpt2, 0, 1 ); - tabLayout->addLayout( tqlayout9, 3, 3 ); + tabLayout->addLayout( layout9, 3, 3 ); - tqlayout10 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout10"); + layout10 = new TQGridLayout( 0, 1, 1, 0, 6, "layout10"); teOpt3 = new TQTextEdit( tab, "teOpt3" ); teOpt3->setEnabled( TRUE ); - tqlayout10->addMultiCellWidget( teOpt3, 0, 1, 0, 0 ); + layout10->addMultiCellWidget( teOpt3, 0, 1, 0, 0 ); btnOpt3 = new KPushButton( tab, "btnOpt3" ); btnOpt3->setMinimumSize( TQSize( 22, 22 ) ); btnOpt3->setMaximumSize( TQSize( 22, 22 ) ); - tqlayout10->addWidget( btnOpt3, 0, 1 ); + layout10->addWidget( btnOpt3, 0, 1 ); spacer6 = new TQSpacerItem( 20, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout10->addItem( spacer6, 1, 1 ); + layout10->addItem( spacer6, 1, 1 ); - tabLayout->addMultiCellLayout( tqlayout10, 4, 5, 3, 3 ); + tabLayout->addMultiCellLayout( layout10, 4, 5, 3, 3 ); textLabel1_2 = new TQLabel( tab, "textLabel1_2" ); tabLayout->addWidget( textLabel1_2, 2, 2 ); - tqlayout8 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout8"); + layout8 = new TQGridLayout( 0, 1, 1, 0, 6, "layout8"); spacer4 = new TQSpacerItem( 20, 90, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout8->addItem( spacer4, 1, 1 ); + layout8->addItem( spacer4, 1, 1 ); teOpt1 = new TQTextEdit( tab, "teOpt1" ); teOpt1->setEnabled( TRUE ); teOpt1->setWordWrap( TQTextEdit::WidgetWidth ); - tqlayout8->addMultiCellWidget( teOpt1, 0, 1, 0, 0 ); + layout8->addMultiCellWidget( teOpt1, 0, 1, 0, 0 ); btnOpt1 = new KPushButton( tab, "btnOpt1" ); - btnOpt1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnOpt1->sizePolicy().hasHeightForWidth() ) ); + btnOpt1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnOpt1->sizePolicy().hasHeightForWidth() ) ); btnOpt1->setMinimumSize( TQSize( 22, 22 ) ); btnOpt1->setMaximumSize( TQSize( 22, 22 ) ); - tqlayout8->addWidget( btnOpt1, 0, 1 ); + layout8->addWidget( btnOpt1, 0, 1 ); - tabLayout->addLayout( tqlayout8, 2, 3 ); + tabLayout->addLayout( layout8, 2, 3 ); textLabel1_2_3_2 = new TQLabel( tab, "textLabel1_2_3_2" ); @@ -152,19 +152,19 @@ prefMencoder::prefMencoder( TQWidget* parent, const char* name, WFlags fl ) leVLabel->setEnabled( TRUE ); tabLayout->addWidget( leVLabel, 0, 3 ); - tabWidget2->insertTab( tab, TQString::tqfromLatin1("") ); + tabWidget2->insertTab( tab, TQString::fromLatin1("") ); tab_2 = new TQWidget( tabWidget2, "tab_2" ); tabLayout_2 = new TQGridLayout( tab_2, 1, 1, 11, 6, "tabLayout_2"); btnDeleteA = new KPushButton( tab_2, "btnDeleteA" ); - btnDeleteA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnDeleteA->sizePolicy().hasHeightForWidth() ) ); + btnDeleteA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnDeleteA->sizePolicy().hasHeightForWidth() ) ); btnDeleteA->setProperty( "stdItem", 28 ); tabLayout_2->addWidget( btnDeleteA, 2, 1 ); btnAddA = new KPushButton( tab_2, "btnAddA" ); - btnAddA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnAddA->sizePolicy().hasHeightForWidth() ) ); + btnAddA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnAddA->sizePolicy().hasHeightForWidth() ) ); btnAddA->setProperty( "stdItem", 27 ); tabLayout_2->addWidget( btnAddA, 2, 0 ); @@ -181,33 +181,33 @@ prefMencoder::prefMencoder( TQWidget* parent, const char* name, WFlags fl ) tabLayout_2->addWidget( textLabel3, 0, 2 ); - tqlayout11 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout11"); + layout11 = new TQGridLayout( 0, 1, 1, 0, 6, "layout11"); teOptA = new TQTextEdit( tab_2, "teOptA" ); - tqlayout11->addMultiCellWidget( teOptA, 0, 1, 0, 0 ); + layout11->addMultiCellWidget( teOptA, 0, 1, 0, 0 ); spacer4_2 = new TQSpacerItem( 20, 78, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout11->addItem( spacer4_2, 1, 1 ); + layout11->addItem( spacer4_2, 1, 1 ); btnOptA = new KPushButton( tab_2, "btnOptA" ); - btnOptA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnOptA->sizePolicy().hasHeightForWidth() ) ); + btnOptA->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnOptA->sizePolicy().hasHeightForWidth() ) ); btnOptA->setMinimumSize( TQSize( 22, 22 ) ); btnOptA->setMaximumSize( TQSize( 22, 22 ) ); - tqlayout11->addWidget( btnOptA, 0, 1 ); + layout11->addWidget( btnOptA, 0, 1 ); - tabLayout_2->addMultiCellLayout( tqlayout11, 1, 2, 3, 3 ); + tabLayout_2->addMultiCellLayout( layout11, 1, 2, 3, 3 ); textLabel1_2_2_2 = new TQLabel( tab_2, "textLabel1_2_2_2" ); - textLabel1_2_2_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1_2_2_2->sizePolicy().hasHeightForWidth() ) ); + textLabel1_2_2_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1_2_2_2->sizePolicy().hasHeightForWidth() ) ); tabLayout_2->addMultiCellWidget( textLabel1_2_2_2, 1, 2, 2, 2 ); - tabWidget2->insertTab( tab_2, TQString::tqfromLatin1("") ); + tabWidget2->insertTab( tab_2, TQString::fromLatin1("") ); prefMencoderLayout->addMultiCellWidget( tabWidget2, 0, 0, 0, 2 ); textLabel1 = new TQLabel( this, "textLabel1" ); - textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); TQFont textLabel1_font( textLabel1->font() ); textLabel1_font.setBold( TRUE ); textLabel1->setFont( textLabel1_font ); @@ -215,14 +215,14 @@ prefMencoder::prefMencoder( TQWidget* parent, const char* name, WFlags fl ) prefMencoderLayout->addWidget( textLabel1, 1, 0 ); bReset = new KPushButton( this, "bReset" ); - bReset->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bReset->sizePolicy().hasHeightForWidth() ) ); + bReset->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bReset->sizePolicy().hasHeightForWidth() ) ); bReset->setProperty( "stdItem", 21 ); prefMencoderLayout->addMultiCellWidget( bReset, 1, 2, 2, 2 ); spacer5_2 = new TQSpacerItem( 121, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); prefMencoderLayout->addItem( spacer5_2, 1, 1 ); languageChange(); - resize( TQSize(672, 587).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(672, 587).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/prefMencoder.ui b/src/prefMencoder.ui index 1cab214..1d4bbf9 100644 --- a/src/prefMencoder.ui +++ b/src/prefMencoder.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -248,7 +248,7 @@ audio bitrate</string> </widget> <widget class="TQLayoutWidget" row="3" column="3"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -272,7 +272,7 @@ audio bitrate</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>81</height> @@ -283,13 +283,13 @@ audio bitrate</string> <property name="name"> <cstring>btnOpt2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -303,7 +303,7 @@ audio bitrate</string> </widget> <widget class="TQLayoutWidget" row="4" column="3" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -321,13 +321,13 @@ audio bitrate</string> <property name="name"> <cstring>btnOpt3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -347,7 +347,7 @@ audio bitrate</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -366,7 +366,7 @@ audio bitrate</string> </widget> <widget class="TQLayoutWidget" row="2" column="3"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -382,7 +382,7 @@ audio bitrate</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -415,13 +415,13 @@ audio bitrate</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -527,7 +527,7 @@ audio bitrate</string> </widget> <widget class="TQLayoutWidget" row="1" column="3" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -548,7 +548,7 @@ audio bitrate</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>78</height> @@ -567,13 +567,13 @@ audio bitrate</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>22</width> <height>22</height> @@ -651,7 +651,7 @@ audio bitrate</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>21</height> diff --git a/src/prefpreview.cpp b/src/prefpreview.cpp index 872d86e..c93d50a 100644 --- a/src/prefpreview.cpp +++ b/src/prefpreview.cpp @@ -17,7 +17,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -33,13 +33,13 @@ prefPreview::prefPreview( TQWidget* parent, const char* name, WFlags fl ) prefPreviewLayout = new TQGridLayout( this, 1, 1, 11, 6, "prefPreviewLayout"); buttonGroup1 = new TQButtonGroup( this, "buttonGroup1" ); - buttonGroup1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) ); + buttonGroup1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) ); buttonGroup1->setFrameShape( TQButtonGroup::NoFrame ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->tqlayout()->setSpacing( 6 ); - buttonGroup1->tqlayout()->setMargin( 11 ); - buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() ); - buttonGroup1Layout->tqsetAlignment( TQt::AlignTop ); + buttonGroup1->layout()->setSpacing( 6 ); + buttonGroup1->layout()->setMargin( 11 ); + buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() ); + buttonGroup1Layout->setAlignment( TQt::AlignTop ); rbInternal = new TQRadioButton( buttonGroup1, "rbInternal" ); @@ -54,7 +54,7 @@ prefPreview::prefPreview( TQWidget* parent, const char* name, WFlags fl ) prefPreviewLayout->addItem( spacer5, 2, 0 ); wsOptions = new TQWidgetStack( this, "wsOptions" ); - wsOptions->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, wsOptions->sizePolicy().hasHeightForWidth() ) ); + wsOptions->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, wsOptions->sizePolicy().hasHeightForWidth() ) ); wsOptions->setFrameShape( TQWidgetStack::NoFrame ); wsOptions->setFrameShadow( TQWidgetStack::Sunken ); wsOptions->setLineWidth( 1 ); @@ -85,7 +85,7 @@ prefPreview::prefPreview( TQWidget* parent, const char* name, WFlags fl ) wspMplayerLayout->addWidget( textLabel3, 1, 0 ); textLabel4 = new TQLabel( wspMplayer, "textLabel4" ); - textLabel4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) ); + textLabel4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) ); wspMplayerLayout->addWidget( textLabel4, 2, 0 ); @@ -94,7 +94,7 @@ prefPreview::prefPreview( TQWidget* parent, const char* name, WFlags fl ) wspMplayerLayout->addWidget( cbVout, 1, 1 ); cbAout = new TQComboBox( FALSE, wspMplayer, "cbAout" ); - cbAout->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbAout->sizePolicy().hasHeightForWidth() ) ); + cbAout->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbAout->sizePolicy().hasHeightForWidth() ) ); wspMplayerLayout->addWidget( cbAout, 2, 1 ); spacer3 = new TQSpacerItem( 81, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); @@ -114,7 +114,7 @@ prefPreview::prefPreview( TQWidget* parent, const char* name, WFlags fl ) spacer4 = new TQSpacerItem( 230, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); prefPreviewLayout->addItem( spacer4, 0, 1 ); languageChange(); - resize( TQSize(536, 470).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(536, 470).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/prefpreview.ui b/src/prefpreview.ui index ebef4fc..9230508 100644 --- a/src/prefpreview.ui +++ b/src/prefpreview.ui @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>210</height> @@ -148,7 +148,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>21</height> @@ -272,7 +272,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>21</height> diff --git a/src/titlefactor.cpp b/src/titlefactor.cpp index 774551e..d4c6b33 100644 --- a/src/titlefactor.cpp +++ b/src/titlefactor.cpp @@ -14,7 +14,7 @@ #include <tqlabel.h> #include <tqgroupbox.h> #include <tqslider.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqimage.h> @@ -265,16 +265,16 @@ titleFactor::titleFactor( TQWidget* parent, const char* name, WFlags fl ) titleFactorLayout->addWidget( lbTitle, 0, 0 ); gbTitle = new TQGroupBox( this, "gbTitle" ); - gbTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gbTitle->sizePolicy().hasHeightForWidth() ) ); - gbTitle->tqsetAlignment( int( TQGroupBox::AlignVCenter ) ); + gbTitle->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gbTitle->sizePolicy().hasHeightForWidth() ) ); + gbTitle->setAlignment( int( TQGroupBox::AlignVCenter ) ); gbTitle->setFlat( FALSE ); gbTitle->setCheckable( TRUE ); gbTitle->setChecked( FALSE ); gbTitle->setColumnLayout(0, Qt::Vertical ); - gbTitle->tqlayout()->setSpacing( 1 ); - gbTitle->tqlayout()->setMargin( 6 ); - gbTitleLayout = new TQGridLayout( gbTitle->tqlayout() ); - gbTitleLayout->tqsetAlignment( TQt::AlignTop ); + gbTitle->layout()->setSpacing( 1 ); + gbTitle->layout()->setMargin( 6 ); + gbTitleLayout = new TQGridLayout( gbTitle->layout() ); + gbTitleLayout->setAlignment( TQt::AlignTop ); tFactor = new TQLabel( gbTitle, "tFactor" ); @@ -293,7 +293,7 @@ titleFactor::titleFactor( TQWidget* parent, const char* name, WFlags fl ) spacer1 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); titleFactorLayout->addItem( spacer1, 2, 0 ); languageChange(); - resize( TQSize(551, 115).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(551, 115).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/titlefactor.ui b/src/titlefactor.ui index d7e804d..7d4f3e3 100644 --- a/src/titlefactor.ui +++ b/src/titlefactor.ui @@ -53,7 +53,7 @@ <property name="title"> <string>Change Factor</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> <property name="flat"> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/src/viewmpeg2.cpp b/src/viewmpeg2.cpp index 2313976..72a9f6f 100644 --- a/src/viewmpeg2.cpp +++ b/src/viewmpeg2.cpp @@ -15,7 +15,7 @@ #include <tqtoolbutton.h> #include <tqslider.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqimage.h> @@ -140,27 +140,27 @@ ViewMPEG2::ViewMPEG2( TQWidget* parent, const char* name, WFlags fl ) image2 = img; if ( !name ) setName( "ViewMPEG2" ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); setSizeIncrement( TQSize( 0, 0 ) ); setBaseSize( TQSize( 0, 0 ) ); setIcon( image0 ); ViewMPEG2Layout = new TQGridLayout( this, 1, 1, 2, 6, "ViewMPEG2Layout"); frame7 = new TQFrame( this, "frame7" ); - frame7->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame7->sizePolicy().hasHeightForWidth() ) ); + frame7->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame7->sizePolicy().hasHeightForWidth() ) ); frame7->setMaximumSize( TQSize( 32767, 50 ) ); frame7->setFrameShape( TQFrame::StyledPanel ); frame7->setFrameShadow( TQFrame::Raised ); frame7Layout = new TQGridLayout( frame7, 1, 1, 11, 6, "frame7Layout"); bStop = new TQToolButton( frame7, "bStop" ); - bStop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) ); + bStop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) ); bStop->setIconSet( TQIconSet( image1 ) ); frame7Layout->addWidget( bStop, 0, 0 ); bPlay = new TQToolButton( frame7, "bPlay" ); - bPlay->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) ); + bPlay->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) ); bPlay->setIconSet( TQIconSet( image2 ) ); frame7Layout->addWidget( bPlay, 0, 1 ); @@ -173,11 +173,11 @@ ViewMPEG2::ViewMPEG2( TQWidget* parent, const char* name, WFlags fl ) ViewMPEG2Layout->addWidget( frame7, 1, 0 ); label = new TQLabel( this, "label" ); - label->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)2, (TQSizePolicy::SizeType)2, 0, 0, label->sizePolicy().hasHeightForWidth() ) ); + label->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)2, (TQSizePolicy::SizeType)2, 0, 0, label->sizePolicy().hasHeightForWidth() ) ); ViewMPEG2Layout->addWidget( label, 0, 0 ); languageChange(); - resize( TQSize(320, 320).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(320, 320).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/src/viewmpeg2.ui b/src/viewmpeg2.ui index bdc4436..93566ac 100755 --- a/src/viewmpeg2.ui +++ b/src/viewmpeg2.ui @@ -57,7 +57,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>50</height> |