diff --git a/dvdread/dvd_reader.h b/dvdread/dvd_reader.h index c090b32..d666e8a 100644 --- a/dvdread/dvd_reader.h +++ b/dvdread/dvd_reader.h @@ -285,7 +285,7 @@ int DVDDiscID( dvd_reader_t *, unsigned char * ); * * @param dvd A read handle to get the disc ID from * @param volid The buffer to put the VolumeIdentifier into. - * The VolumeIdentifier is latin-1 encoded (8bit tqunicode) + * The VolumeIdentifier is latin-1 encoded (8bit unicode) * null terminated and max 32 bytes (including '\0') * @param volid_size No more than volid_size bytes will be copied to volid. * If the VolumeIdentifier is truncated because of this diff --git a/dvdread/dvd_udf.c b/dvdread/dvd_udf.c index 20b55e4..9af6ad0 100644 --- a/dvdread/dvd_udf.c +++ b/dvdread/dvd_udf.c @@ -498,7 +498,7 @@ static int Unicodedecode( uint8_t *data, int len, char *target ) int p = 1, i = 0; if( ( data[ 0 ] == 8 ) || ( data[ 0 ] == 16 ) ) do { - if( data[ 0 ] == 16 ) p++; /* Ignore MSB of tqunicode16 */ + if( data[ 0 ] == 16 ) p++; /* Ignore MSB of unicode16 */ if( p < len ) { target[ i++ ] = data[ p++ ]; } @@ -1157,7 +1157,7 @@ static int UDFGetPVD(dvd_reader_t *device, struct pvd_t *pvd) } /** - * Gets the Volume Identifier string, in 8bit tqunicode (latin-1) + * Gets the Volume Identifier string, in 8bit unicode (latin-1) * volid, place to put the string * volid_size, size of the buffer volid points to * returns the size of buffer needed for all data diff --git a/dvdread/nav_read.c b/dvdread/nav_read.c index 8d664f2..54d9a11 100644 --- a/dvdread/nav_read.c +++ b/dvdread/nav_read.c @@ -63,7 +63,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) { for(j = 0; j < 2; j++) B2N_32(pci->hli.btn_colit.btn_coli[i][j]); - /* NOTE: I've had to change the structure from the disk tqlayout to get + /* NOTE: I've had to change the structure from the disk layout to get * the packing to work with Sun's Forte C compiler. */ /* pci hli btni */ diff --git a/dvdread/nav_types.h b/dvdread/nav_types.h index cfb81f3..12e19f8 100644 --- a/dvdread/nav_types.h +++ b/dvdread/nav_types.h @@ -5,7 +5,7 @@ /* * Copyright (C) 2000, 2001, 2002 H�kan Hjort * - * The data structures in this file should represent the tqlayout of the + * The data structures in this file should represent the layout of the * pci and dsi packets as they are stored in the stream. Information * found by reading the source to VOBDUMP is the base for the structure * and names of these data types. @@ -145,7 +145,7 @@ typedef struct { /** * Button Information * - * NOTE: I've had to change the structure from the disk tqlayout to get + * NOTE: I've had to change the structure from the disk layout to get * the packing to work with Sun's Forte C compiler. * The 4 and 7 bytes are 'rotated' was: ABC DEF GHIJ is: ABCG DEFH IJ */ diff --git a/k9Mplayer/mplayer.cpp b/k9Mplayer/mplayer.cpp index f43bb1a..27124bb 100644 --- a/k9Mplayer/mplayer.cpp +++ b/k9Mplayer/mplayer.cpp @@ -489,27 +489,27 @@ MPlayer::MPlayer( TQWidget* parent, const char* name, WFlags fl ) MPlayerLayout->addWidget( bSwitchAudio, 0, 2 ); - tqlayout6 = new TQHBoxLayout( 0, 0, 6, "tqlayout6"); + layout6 = new TQHBoxLayout( 0, 0, 6, "layout6"); bStop = new KPushButton( this, "bStop" ); bStop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) ); bStop->setMinimumSize( TQSize( 30, 30 ) ); bStop->setPixmap( image1 ); bStop->setFlat( TRUE ); - tqlayout6->addWidget( bStop ); + layout6->addWidget( bStop ); bPlay = new KPushButton( this, "bPlay" ); bPlay->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) ); bPlay->setMinimumSize( TQSize( 30, 30 ) ); bPlay->setPixmap( image2 ); bPlay->setFlat( TRUE ); - tqlayout6->addWidget( bPlay ); + layout6->addWidget( bPlay ); slider = new TQSlider( this, "slider" ); slider->setOrientation( Qt::Horizontal ); - tqlayout6->addWidget( slider ); + layout6->addWidget( slider ); - tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5"); + layout5 = new TQHBoxLayout( 0, 0, 6, "layout5"); bDown = new KPushButton( this, "bDown" ); bDown->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bDown->sizePolicy().hasHeightForWidth() ) ); @@ -519,13 +519,13 @@ MPlayer::MPlayer( TQWidget* parent, const char* name, WFlags fl ) bDown_font.setBold( TRUE ); bDown->setFont( bDown_font ); bDown->setFlat( TRUE ); - tqlayout5->addWidget( bDown ); + layout5->addWidget( bDown ); pixmapLabel1 = new TQLabel( this, "pixmapLabel1" ); pixmapLabel1->setMaximumSize( TQSize( 22, 22 ) ); pixmapLabel1->setPixmap( image3 ); pixmapLabel1->setScaledContents( TRUE ); - tqlayout5->addWidget( pixmapLabel1 ); + layout5->addWidget( pixmapLabel1 ); bUp = new KPushButton( this, "bUp" ); bUp->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bUp->sizePolicy().hasHeightForWidth() ) ); @@ -535,10 +535,10 @@ MPlayer::MPlayer( TQWidget* parent, const char* name, WFlags fl ) bUp_font.setBold( TRUE ); bUp->setFont( bUp_font ); bUp->setFlat( TRUE ); - tqlayout5->addWidget( bUp ); - tqlayout6->addLayout( tqlayout5 ); + layout5->addWidget( bUp ); + layout6->addLayout( layout5 ); - MPlayerLayout->addMultiCellLayout( tqlayout6, 4, 4, 0, 5 ); + MPlayerLayout->addMultiCellLayout( layout6, 4, 4, 0, 5 ); frame4 = new TQFrame( this, "frame4" ); frame4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) ); diff --git a/k9Mplayer/mplayer.ui b/k9Mplayer/mplayer.ui index f77cd52..87f779c 100644 --- a/k9Mplayer/mplayer.ui +++ b/k9Mplayer/mplayer.ui @@ -93,7 +93,7 @@ - tqlayout6 + layout6 @@ -168,7 +168,7 @@ - tqlayout5 + layout5 diff --git a/k9author/chapterEdit.cpp b/k9author/chapterEdit.cpp index 5aa9d03..5354561 100644 --- a/k9author/chapterEdit.cpp +++ b/k9author/chapterEdit.cpp @@ -84,26 +84,26 @@ chapterEdit::chapterEdit( TQWidget* parent, const char* name, WFlags fl ) spacer3 = new TQSpacerItem( 20, 31, TQSizePolicy::Minimum, TQSizePolicy::Fixed ); chapterEditLayout->addItem( spacer3, 3, 2 ); - tqlayout3 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout3"); + layout3 = new TQGridLayout( 0, 1, 1, 0, 6, "layout3"); lPosition = new TQLabel( this, "lPosition" ); lPosition->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lPosition->sizePolicy().hasHeightForWidth() ) ); - tqlayout3->addWidget( lPosition, 1, 1 ); + layout3->addWidget( lPosition, 1, 1 ); slider = new TQSlider( this, "slider" ); slider->setOrientation( Qt::Horizontal ); - tqlayout3->addWidget( slider, 1, 0 ); + layout3->addWidget( slider, 1, 0 ); image = new TQLabel( this, "image" ); image->setMinimumSize( TQSize( 320, 200 ) ); image->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) ); image->setScaledContents( TRUE ); - tqlayout3->addMultiCellWidget( image, 0, 0, 0, 1 ); + layout3->addMultiCellWidget( image, 0, 0, 0, 1 ); - chapterEditLayout->addMultiCellLayout( tqlayout3, 0, 6, 0, 0 ); + chapterEditLayout->addMultiCellLayout( layout3, 0, 6, 0, 0 ); bEnd = new KPushButton( this, "bEnd" ); bEnd->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bEnd->sizePolicy().hasHeightForWidth() ) ); diff --git a/k9author/chapterEdit.ui b/k9author/chapterEdit.ui index 1c389c8..2d7e337 100644 --- a/k9author/chapterEdit.ui +++ b/k9author/chapterEdit.ui @@ -185,7 +185,7 @@ - tqlayout3 + layout3 diff --git a/k9author/import.cpp b/k9author/import.cpp index cd87208..3c80ec6 100644 --- a/k9author/import.cpp +++ b/k9author/import.cpp @@ -39,7 +39,7 @@ import::import( TQWidget* parent, const char* name, WFlags fl ) importLayout->addWidget( textLabel1, 0, 0 ); - tqlayout2 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout2"); + layout2 = new TQGridLayout( 0, 1, 1, 0, 6, "layout2"); lvDVD = new TQListView( this, "lvDVD" ); lvDVD->addColumn( tr2i18n( "Video files" ) ); @@ -51,9 +51,9 @@ import::import( TQWidget* parent, const char* name, WFlags fl ) lvDVD->setRootIsDecorated( FALSE ); lvDVD->setResizeMode( TQListView::AllColumns ); - tqlayout2->addMultiCellWidget( lvDVD, 0, 1, 0, 0 ); + layout2->addMultiCellWidget( lvDVD, 0, 1, 0, 0 ); - importLayout->addMultiCellLayout( tqlayout2, 1, 1, 0, 3 ); + importLayout->addMultiCellLayout( layout2, 1, 1, 0, 3 ); cbOutputDev = new KComboBox( FALSE, this, "cbOutputDev" ); diff --git a/k9author/import.ui b/k9author/import.ui index 9ac3964..9047514 100644 --- a/k9author/import.ui +++ b/k9author/import.ui @@ -37,7 +37,7 @@ - tqlayout2 + layout2 diff --git a/k9author/newTitle.cpp b/k9author/newTitle.cpp index 786145a..b8edbeb 100644 --- a/k9author/newTitle.cpp +++ b/k9author/newTitle.cpp @@ -41,9 +41,9 @@ newTitle::newTitle( TQWidget* parent, const char* name, WFlags fl ) buttonGroup1 = new TQButtonGroup( this, "buttonGroup1" ); buttonGroup1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->tqlayout()->setSpacing( 6 ); - buttonGroup1->tqlayout()->setMargin( 11 ); - buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() ); + buttonGroup1->layout()->setSpacing( 6 ); + buttonGroup1->layout()->setMargin( 11 ); + buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() ); buttonGroup1Layout->setAlignment( TQt::AlignTop ); nbChapters = new KIntNumInput( buttonGroup1, "nbChapters" ); @@ -85,21 +85,21 @@ newTitle::newTitle( TQWidget* parent, const char* name, WFlags fl ) spacer2 = new TQSpacerItem( 470, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); newTitleLayout->addItem( spacer2, 2, 0 ); - tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); + layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); textLabel1 = new TQLabel( this, "textLabel1" ); textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); - tqlayout1->addWidget( textLabel1 ); + layout1->addWidget( textLabel1 ); urFile = new KURLRequester( this, "urFile" ); urFile->setMode( 25 ); - tqlayout1->addWidget( urFile ); + layout1->addWidget( urFile ); lTotalTime = new TQLabel( this, "lTotalTime" ); lTotalTime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotalTime->sizePolicy().hasHeightForWidth() ) ); - tqlayout1->addWidget( lTotalTime ); + layout1->addWidget( lTotalTime ); - newTitleLayout->addMultiCellLayout( tqlayout1, 0, 0, 0, 1 ); + newTitleLayout->addMultiCellLayout( layout1, 0, 0, 0, 1 ); languageChange(); resize( TQSize(605, 171).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); diff --git a/k9author/newTitle.ui b/k9author/newTitle.ui index 83a782e..78b1250 100644 --- a/k9author/newTitle.ui +++ b/k9author/newTitle.ui @@ -189,7 +189,7 @@ - tqlayout1 + layout1 diff --git a/libk9copy/backupdlg.cpp b/libk9copy/backupdlg.cpp index c111ceb..6d0539f 100644 --- a/libk9copy/backupdlg.cpp +++ b/libk9copy/backupdlg.cpp @@ -48,7 +48,7 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl backupDlgLayout->addMultiCellWidget( textLabel1, 0, 0, 0, 3 ); - tqlayout3 = new TQVBoxLayout( 0, 0, 6, "tqlayout3"); + layout3 = new TQVBoxLayout( 0, 0, 6, "layout3"); lblStep = new TQLabel( this, "lblStep" ); lblStep->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblStep->sizePolicy().hasHeightForWidth() ) ); @@ -56,20 +56,20 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl lblStep_font.setItalic( TRUE ); lblStep->setFont( lblStep_font ); lblStep->setCursor( TQCursor( 3 ) ); - tqlayout3->addWidget( lblStep ); + layout3->addWidget( lblStep ); pbStep = new TQProgressBar( this, "pbStep" ); pbStep->setCursor( TQCursor( 3 ) ); - tqlayout3->addWidget( pbStep ); + layout3->addWidget( pbStep ); pbTotal = new TQProgressBar( this, "pbTotal" ); pbTotal->setCursor( TQCursor( 3 ) ); pbTotal->setMargin( 0 ); pbTotal->setTotalSteps( 4400 ); pbTotal->setPercentageVisible( TRUE ); - tqlayout3->addWidget( pbTotal ); + layout3->addWidget( pbTotal ); - backupDlgLayout->addMultiCellLayout( tqlayout3, 3, 3, 0, 3 ); + backupDlgLayout->addMultiCellLayout( layout3, 3, 3, 0, 3 ); textLabel1_2 = new TQLabel( this, "textLabel1_2" ); textLabel1_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) ); @@ -83,17 +83,17 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl backupDlgLayout->addWidget( lblTime, 2, 1 ); - tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); + layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); spacer1 = new TQSpacerItem( 131, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout1->addItem( spacer1 ); + layout1->addItem( spacer1 ); bAbort = new KPushButton( this, "bAbort" ); bAbort->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAbort->sizePolicy().hasHeightForWidth() ) ); bAbort->setCursor( TQCursor( 0 ) ); bAbort->setProperty( "stdItem", 26 ); - tqlayout1->addWidget( bAbort ); + layout1->addWidget( bAbort ); - backupDlgLayout->addMultiCellLayout( tqlayout1, 4, 4, 0, 3 ); + backupDlgLayout->addMultiCellLayout( layout1, 4, 4, 0, 3 ); lblFactor = new TQLabel( this, "lblFactor" ); lblFactor->setCursor( TQCursor( 3 ) ); diff --git a/libk9copy/backupdlg.ui b/libk9copy/backupdlg.ui index e7381a2..65eed10 100644 --- a/libk9copy/backupdlg.ui +++ b/libk9copy/backupdlg.ui @@ -84,7 +84,7 @@ - tqlayout3 + layout3 @@ -181,7 +181,7 @@ - tqlayout1 + layout1 3 diff --git a/libk9copy/dvdprogress.cpp b/libk9copy/dvdprogress.cpp index ff914dc..f211fe3 100644 --- a/libk9copy/dvdprogress.cpp +++ b/libk9copy/dvdprogress.cpp @@ -35,25 +35,25 @@ DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags setCursor( TQCursor( 3 ) ); DVDProgressLayout = new TQGridLayout( this, 1, 1, 11, 6, "DVDProgressLayout"); - tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); + layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); lblTotal = new TQLabel( this, "lblTotal" ); lblTotal->setCursor( TQCursor( 3 ) ); - tqlayout2->addWidget( lblTotal ); + layout2->addWidget( lblTotal ); pbTotal = new TQProgressBar( this, "pbTotal" ); pbTotal->setCursor( TQCursor( 3 ) ); pbTotal->setProgress( 100 ); pbTotal->setPercentageVisible( FALSE ); - tqlayout2->addWidget( pbTotal ); + layout2->addWidget( pbTotal ); - DVDProgressLayout->addLayout( tqlayout2, 1, 0 ); + DVDProgressLayout->addLayout( layout2, 1, 0 ); - tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1"); + layout1 = new TQVBoxLayout( 0, 0, 6, "layout1"); lblTitle = new TQLabel( this, "lblTitle" ); lblTitle->setCursor( TQCursor( 3 ) ); - tqlayout1->addWidget( lblTitle ); + layout1->addWidget( lblTitle ); pbTitle = new TQProgressBar( this, "pbTitle" ); pbTitle->setCursor( TQCursor( 3 ) ); @@ -61,9 +61,9 @@ DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags pbTitle->setProgress( 100 ); pbTitle->setCenterIndicator( TRUE ); pbTitle->setPercentageVisible( FALSE ); - tqlayout1->addWidget( pbTitle ); + layout1->addWidget( pbTitle ); - DVDProgressLayout->addLayout( tqlayout1, 0, 0 ); + DVDProgressLayout->addLayout( layout1, 0, 0 ); lblStatus = new TQLabel( this, "lblStatus" ); lblStatus->setCursor( TQCursor( 3 ) ); diff --git a/libk9copy/dvdprogress.ui b/libk9copy/dvdprogress.ui index ec05e8c..bd81a23 100755 --- a/libk9copy/dvdprogress.ui +++ b/libk9copy/dvdprogress.ui @@ -44,7 +44,7 @@ - tqlayout2 + layout2 3 @@ -82,7 +82,7 @@ - tqlayout1 + layout1 3 diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp index a4b7fef..f121564 100644 --- a/libk9copy/k9ifo2.cpp +++ b/libk9copy/k9ifo2.cpp @@ -903,7 +903,7 @@ void k9Ifo2::navRead_PCI(pci_t *pci, uchar *buffer) { for(j = 0; j < 2; j++) B2N_32(pci->hli.btn_colit.btn_coli[i][j]); - /* NOTE: I've had to change the structure from the disk tqlayout to get + /* NOTE: I've had to change the structure from the disk layout to get * the packing to work with Sun's Forte C compiler. */ /* pci hli btni */ diff --git a/src/configDlg.cpp b/src/configDlg.cpp index 5ea0a84..01b9295 100644 --- a/src/configDlg.cpp +++ b/src/configDlg.cpp @@ -54,19 +54,19 @@ 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->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->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(minimumSizeHint()) ); clearWState( WState_Polished ); diff --git a/src/configDlg.ui b/src/configDlg.ui index 9778e0b..c02dfe1 100644 --- a/src/configDlg.ui +++ b/src/configDlg.ui @@ -114,7 +114,7 @@ - tqlayout4 + layout4 diff --git a/src/k9mainw.cpp b/src/k9mainw.cpp index f921acf..863c0af 100644 --- a/src/k9mainw.cpp +++ b/src/k9mainw.cpp @@ -100,23 +100,23 @@ MainDlg::MainDlg( TQWidget* parent, const char* name, WFlags fl ) 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->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->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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbOutputDev->sizePolicy().hasHeightForWidth() ) ); diff --git a/src/k9mainw.ui b/src/k9mainw.ui index 44be1e2..35ed354 100644 --- a/src/k9mainw.ui +++ b/src/k9mainw.ui @@ -258,7 +258,7 @@ - tqlayout2 + layout2 diff --git a/src/k9mainwsov.ui b/src/k9mainwsov.ui index 0a18fae..8580ee6 100644 --- a/src/k9mainwsov.ui +++ b/src/k9mainwsov.ui @@ -279,7 +279,7 @@ - tqlayout2 + layout2 diff --git a/src/prefAuthor.cpp b/src/prefAuthor.cpp index d7b0cf4..a4d8309 100644 --- a/src/prefAuthor.cpp +++ b/src/prefAuthor.cpp @@ -37,9 +37,9 @@ 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() ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); + groupBox1Layout = new TQGridLayout( groupBox1->layout() ); groupBox1Layout->setAlignment( TQt::AlignTop ); cbAudioFormat = new TQComboBox( FALSE, groupBox1, "cbAudioFormat" ); @@ -66,9 +66,9 @@ 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() ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 11 ); + groupBox2Layout = new TQGridLayout( groupBox2->layout() ); groupBox2Layout->setAlignment( TQt::AlignTop ); textLabel3 = new TQLabel( groupBox2, "textLabel3" ); diff --git a/src/prefMPEG4.cpp b/src/prefMPEG4.cpp index 525ab56..8d6ebc2 100644 --- a/src/prefMPEG4.cpp +++ b/src/prefMPEG4.cpp @@ -180,9 +180,9 @@ prefMPEG4::prefMPEG4( TQWidget* parent, const char* name, WFlags fl ) 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() ); + buttonGroup1->layout()->setSpacing( 6 ); + buttonGroup1->layout()->setMargin( 2 ); + buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() ); buttonGroup1Layout->setAlignment( TQt::AlignTop ); rbSize = new TQRadioButton( buttonGroup1, "rbSize" ); diff --git a/src/prefMencoder.cpp b/src/prefMencoder.cpp index 9700c4b..1c28707 100644 --- a/src/prefMencoder.cpp +++ b/src/prefMencoder.cpp @@ -33,7 +33,7 @@ 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) ); @@ -41,14 +41,14 @@ prefMencoder::prefMencoder( TQWidget* parent, const char* name, WFlags fl ) 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->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" ); @@ -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->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" ); @@ -181,22 +181,22 @@ 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->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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1_2_2_2->sizePolicy().hasHeightForWidth() ) ); diff --git a/src/prefMencoder.ui b/src/prefMencoder.ui index 72c59a6..1d4bbf9 100644 --- a/src/prefMencoder.ui +++ b/src/prefMencoder.ui @@ -21,7 +21,7 @@ - tqlayout2 + layout2 @@ -248,7 +248,7 @@ audio bitrate - tqlayout9 + layout9 @@ -303,7 +303,7 @@ audio bitrate - tqlayout10 + layout10 @@ -366,7 +366,7 @@ audio bitrate - tqlayout8 + layout8 @@ -527,7 +527,7 @@ audio bitrate - tqlayout11 + layout11 diff --git a/src/prefpreview.cpp b/src/prefpreview.cpp index 607d4fc..0793cfc 100644 --- a/src/prefpreview.cpp +++ b/src/prefpreview.cpp @@ -36,9 +36,9 @@ prefPreview::prefPreview( TQWidget* parent, const char* name, WFlags fl ) 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() ); + buttonGroup1->layout()->setSpacing( 6 ); + buttonGroup1->layout()->setMargin( 11 ); + buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() ); buttonGroup1Layout->setAlignment( TQt::AlignTop ); rbInternal = new TQRadioButton( buttonGroup1, "rbInternal" ); diff --git a/src/titlefactor.cpp b/src/titlefactor.cpp index a56d35b..eaf8c8b 100644 --- a/src/titlefactor.cpp +++ b/src/titlefactor.cpp @@ -271,9 +271,9 @@ titleFactor::titleFactor( TQWidget* parent, const char* name, WFlags fl ) gbTitle->setCheckable( TRUE ); gbTitle->setChecked( FALSE ); gbTitle->setColumnLayout(0, Qt::Vertical ); - gbTitle->tqlayout()->setSpacing( 1 ); - gbTitle->tqlayout()->setMargin( 6 ); - gbTitleLayout = new TQGridLayout( gbTitle->tqlayout() ); + gbTitle->layout()->setSpacing( 1 ); + gbTitle->layout()->setMargin( 6 ); + gbTitleLayout = new TQGridLayout( gbTitle->layout() ); gbTitleLayout->setAlignment( TQt::AlignTop ); tFactor = new TQLabel( gbTitle, "tFactor" );