summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:55:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:55:52 -0600
commita372f822fe1b3fad682bf6796cb62da4f13a31db (patch)
treea3ac24d6627eebc22e3c9490e7742f594f17d8ad
parentb8a4f26c42f6d41e8251b60357f1a6990c1e8ad8 (diff)
downloadk9copy-a372f822fe1b3fad682bf6796cb62da4f13a31db.tar.gz
k9copy-a372f822fe1b3fad682bf6796cb62da4f13a31db.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.
-rw-r--r--dvdread/dvd_reader.h2
-rw-r--r--dvdread/dvd_udf.c6
-rw-r--r--dvdread/nav_read.c2
-rw-r--r--dvdread/nav_types.h4
-rw-r--r--k9Mplayer/k9mplayer.cpp18
-rw-r--r--k9Mplayer/mplayer.cpp40
-rw-r--r--k9Mplayer/mplayer.ui24
-rw-r--r--k9author/chapterEdit.cpp30
-rw-r--r--k9author/chapterEdit.ui12
-rw-r--r--k9author/import.cpp20
-rw-r--r--k9author/import.ui6
-rw-r--r--k9author/k9avidecode.cpp6
-rw-r--r--k9author/k9chapteredit.cpp2
-rw-r--r--k9author/k9menu.cpp6
-rw-r--r--k9author/k9menuedit.cpp18
-rw-r--r--k9author/k9newdvd.cpp14
-rw-r--r--k9author/k9newtitle.cpp8
-rw-r--r--k9author/menuEdit.cpp20
-rw-r--r--k9author/menuEdit.ui6
-rw-r--r--k9author/newTitle.cpp34
-rw-r--r--k9author/newTitle.ui10
-rw-r--r--k9decmpeg/k9plaympeg2.cpp10
-rw-r--r--k9devices/k9halconnection.cpp2
-rw-r--r--k9devices/k9haldevice.cpp2
-rwxr-xr-xk9vamps/k9vamps.cpp20
-rw-r--r--libdvdnav/dvdnav.h2
-rw-r--r--libdvdnav/read_cache.c2
-rw-r--r--libk9copy/backupdlg.cpp38
-rw-r--r--libk9copy/backupdlg.ui18
-rw-r--r--libk9copy/dvdprogress.cpp30
-rwxr-xr-xlibk9copy/dvdprogress.ui10
-rw-r--r--libk9copy/k9backupdlg.cpp2
-rw-r--r--libk9copy/k9burndvd.cpp24
-rw-r--r--libk9copy/k9cellcopylist.cpp8
-rw-r--r--libk9copy/k9drawimage.cpp4
-rwxr-xr-xlibk9copy/k9dvd.cpp20
-rwxr-xr-xlibk9copy/k9dvdauthor.cpp44
-rwxr-xr-xlibk9copy/k9dvdbackup.cpp18
-rw-r--r--libk9copy/k9dvdread.cpp2
-rw-r--r--libk9copy/k9ifo2.cpp2
-rw-r--r--libk9copy/k9mp4dlg.cpp2
-rw-r--r--libk9copy/k9mp4enc.cpp8
-rw-r--r--libk9copy/k9processlist.cpp2
-rw-r--r--libk9copy/k9progress.cpp2
-rw-r--r--libk9copy/mp4dlg.cpp16
-rw-r--r--libk9copy/mp4dlg.ui10
-rw-r--r--libk9copy/processList.cpp6
-rw-r--r--libk9copy/processList.ui2
-rw-r--r--libk9copy/progress.cpp22
-rw-r--r--libk9copy/progress.ui12
-rw-r--r--src/configDlg.cpp18
-rw-r--r--src/configDlg.ui4
-rw-r--r--src/k9main.cpp26
-rw-r--r--src/k9mainw.cpp38
-rw-r--r--src/k9mainw.ui18
-rw-r--r--src/k9mainwsov.ui16
-rw-r--r--src/k9mencodercmdgen.cpp18
-rw-r--r--src/k9mencodercmdgen.h2
-rw-r--r--src/k9play.cpp36
-rw-r--r--src/k9play.h6
-rw-r--r--src/k9playbackoptions.cpp4
-rw-r--r--src/k9prefmencoder.cpp2
-rw-r--r--src/k9settings.cpp2
-rw-r--r--src/k9titlefactor.cpp10
-rwxr-xr-xsrc/kviewmpeg2.cpp4
-rw-r--r--src/langselectw.cpp6
-rw-r--r--src/langselectw.ui2
-rwxr-xr-xsrc/main.cpp2
-rw-r--r--src/mencoderCmdGen.cpp6
-rw-r--r--src/mencoderCmdGen.ui4
-rw-r--r--src/playbackoptionsw.cpp26
-rw-r--r--src/playbackoptionsw.ui18
-rw-r--r--src/prefAuthor.cpp20
-rw-r--r--src/prefAuthor.ui6
-rw-r--r--src/prefDVD.cpp12
-rw-r--r--src/prefDVD.ui4
-rw-r--r--src/prefMPEG4.cpp42
-rw-r--r--src/prefMPEG4.ui32
-rw-r--r--src/prefMencoder.cpp80
-rw-r--r--src/prefMencoder.ui36
-rw-r--r--src/prefpreview.cpp20
-rw-r--r--src/prefpreview.ui10
-rw-r--r--src/titlefactor.cpp16
-rw-r--r--src/titlefactor.ui4
-rw-r--r--src/viewmpeg2.cpp14
-rwxr-xr-xsrc/viewmpeg2.ui2
86 files changed, 597 insertions, 597 deletions
diff --git a/dvdread/dvd_reader.h b/dvdread/dvd_reader.h
index d666e8a..c090b32 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 unicode)
+ * The VolumeIdentifier is latin-1 encoded (8bit tqunicode)
* 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 9af6ad0..9c9b5ef 100644
--- a/dvdread/dvd_udf.c
+++ b/dvdread/dvd_udf.c
@@ -88,7 +88,7 @@ extern void SetAlignHandle(dvd_reader_t *device, void *align);
* this function should be rewritten to use posix_memalign or similar.
* It's just needed for aligning memory for small block reads from
* raw/O_DIRECT devices.
- * We assume that 2048 is enough alignment for all systems at the moment.
+ * We assume that 2048 is enough tqalignment for all systems at the moment.
* Not thread safe. Only use this from one thread.
* Depends on sizeof(unsigned long) being at least as large as sizeof(void *)
*/
@@ -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 unicode16 */
+ if( data[ 0 ] == 16 ) p++; /* Ignore MSB of tqunicode16 */
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 unicode (latin-1)
+ * Gets the Volume Identifier string, in 8bit tqunicode (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 54d9a11..8d664f2 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 layout to get
+ /* NOTE: I've had to change the structure from the disk tqlayout 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 12e19f8..cfb81f3 100644
--- a/dvdread/nav_types.h
+++ b/dvdread/nav_types.h
@@ -5,7 +5,7 @@
/*
* Copyright (C) 2000, 2001, 2002 H�kan Hjort <d95hjort@dtek.chalmers.se>
*
- * The data structures in this file should represent the layout of the
+ * The data structures in this file should represent the tqlayout 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 layout to get
+ * NOTE: I've had to change the structure from the disk tqlayout 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/k9mplayer.cpp b/k9Mplayer/k9mplayer.cpp
index 2eacf0e..24bc9a9 100644
--- a/k9Mplayer/k9mplayer.cpp
+++ b/k9Mplayer/k9mplayer.cpp
@@ -1,7 +1,7 @@
#include "k9common.h"
#include "k9config.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <tqslider.h>
#include <kselect.h>
#include "k9mplayer.h"
@@ -92,9 +92,9 @@ void K9Mplayer::setTitle( const TQString & _numTitle,const TQString &_numChapter
if (_numChapter !="")
*m_process << "-chapter" << _numChapter;
- *m_process << TQString("dvd://%1").arg(_numTitle);
+ *m_process << TQString("dvd://%1").tqarg(_numTitle);
if (!m_process->start( KProcess::NotifyOnExit,KProcess::All)) {
- KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").arg("mplayer") , i18n("Preview"));
+ KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").tqarg("mplayer") , i18n("Preview"));
}
m_canwrite=TRUE;
@@ -108,7 +108,7 @@ void K9Mplayer::setTitle( const TQString & _numTitle,const TQString &_numChapter
/*$SPECIALIZATION$*/
void K9Mplayer::receivedStdout (KProcess *proc, char *buffer, int buflen) {
- TQString buf = TQString::fromLatin1(buffer, buflen);
+ TQString buf = TQString::tqfromLatin1(buffer, buflen);
sscanf(buf.latin1(),"ANS_PERCENT_POSITION=%d",&m_position);
if (!m_seeking && m_position>0) {
slider->setValue(m_position);
@@ -134,7 +134,7 @@ void K9Mplayer::slotNewPosition(int _pos,const TQTime & _time) {
}
void K9Mplayer::sliderReleased() {
- sendCmd( TQString("seek %1 1").arg((int)slider->value()));
+ sendCmd( TQString("seek %1 1").tqarg((int)slider->value()));
m_seeking=FALSE;
}
@@ -175,12 +175,12 @@ void K9Mplayer::open( k9DVD *_dvd,k9DVDTitle *_title,int chapter) {
cbAudio->clear();
for (int i=0; i< _title->getaudioStreamCount();i++) {
k9DVDAudioStream *aud=_title->getaudioStream(i);
- cbAudio->insertItem(NULL,TQString("%1-%2").arg(aud->getID()).arg(aud->getlanguage()),-1);
+ cbAudio->insertItem(NULL,TQString("%1-%2").tqarg(aud->getID()).tqarg(aud->getlanguage()),-1);
}
for (int i=0; i< _title->getsubPictureCount();i++) {
k9DVDSubtitle *sub=_title->getsubtitle(i);
- cbSub->insertItem(NULL,TQString("%1-%2").arg(sub->getID().first()).arg(sub->getlanguage()),-1);
+ cbSub->insertItem(NULL,TQString("%1-%2").tqarg(sub->getID().first()).tqarg(sub->getlanguage()),-1);
}
if(_title->getaspectRatio()=="16:9")
@@ -207,12 +207,12 @@ void K9Mplayer::titleChanged() {}
void K9Mplayer::cbAudioActivated( int _value) {
if (m_dvdTitle) {
int value=m_dvdTitle->getaudioStream( _value)->getStreamId();
- sendCmd(TQString( "switch_audio %1").arg(value));
+ sendCmd(TQString( "switch_audio %1").tqarg(value));
}
}
void K9Mplayer::cbSubActivated( int _value) {
- sendCmd(TQString("sub_select %1").arg(_value));
+ sendCmd(TQString("sub_select %1").tqarg(_value));
}
diff --git a/k9Mplayer/mplayer.cpp b/k9Mplayer/mplayer.cpp
index 11a1fd7..cd033e2 100644
--- a/k9Mplayer/mplayer.cpp
+++ b/k9Mplayer/mplayer.cpp
@@ -16,7 +16,7 @@
#include <kpushbutton.h>
#include <tqslider.h>
#include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include <tqimage.h>
@@ -489,79 +489,79 @@ MPlayer::MPlayer( TQWidget* parent, const char* name, WFlags fl )
MPlayerLayout->addWidget( bSwitchAudio, 0, 2 );
- layout6 = new TQHBoxLayout( 0, 0, 6, "layout6");
+ tqlayout6 = new TQHBoxLayout( 0, 0, 6, "tqlayout6");
bStop = new KPushButton( this, "bStop" );
- bStop->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) );
+ bStop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) );
bStop->setMinimumSize( TQSize( 30, 30 ) );
bStop->setPixmap( image1 );
bStop->setFlat( TRUE );
- layout6->addWidget( bStop );
+ tqlayout6->addWidget( bStop );
bPlay = new KPushButton( this, "bPlay" );
- bPlay->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) );
+ bPlay->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) );
bPlay->setMinimumSize( TQSize( 30, 30 ) );
bPlay->setPixmap( image2 );
bPlay->setFlat( TRUE );
- layout6->addWidget( bPlay );
+ tqlayout6->addWidget( bPlay );
slider = new TQSlider( this, "slider" );
slider->setOrientation( Qt::Horizontal );
- layout6->addWidget( slider );
+ tqlayout6->addWidget( slider );
- layout5 = new TQHBoxLayout( 0, 0, 6, "layout5");
+ tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5");
bDown = new KPushButton( this, "bDown" );
- bDown->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bDown->sizePolicy().hasHeightForWidth() ) );
+ bDown->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bDown->sizePolicy().hasHeightForWidth() ) );
bDown->setMinimumSize( TQSize( 22, 22 ) );
bDown->setMaximumSize( TQSize( 22, 22 ) );
TQFont bDown_font( bDown->font() );
bDown_font.setBold( TRUE );
bDown->setFont( bDown_font );
bDown->setFlat( TRUE );
- layout5->addWidget( bDown );
+ tqlayout5->addWidget( bDown );
pixmapLabel1 = new TQLabel( this, "pixmapLabel1" );
pixmapLabel1->setMaximumSize( TQSize( 22, 22 ) );
pixmapLabel1->setPixmap( image3 );
pixmapLabel1->setScaledContents( TRUE );
- layout5->addWidget( pixmapLabel1 );
+ tqlayout5->addWidget( pixmapLabel1 );
bUp = new KPushButton( this, "bUp" );
- bUp->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bUp->sizePolicy().hasHeightForWidth() ) );
+ bUp->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bUp->sizePolicy().hasHeightForWidth() ) );
bUp->setMinimumSize( TQSize( 22, 22 ) );
bUp->setMaximumSize( TQSize( 22, 22 ) );
TQFont bUp_font( bUp->font() );
bUp_font.setBold( TRUE );
bUp->setFont( bUp_font );
bUp->setFlat( TRUE );
- layout5->addWidget( bUp );
- layout6->addLayout( layout5 );
+ tqlayout5->addWidget( bUp );
+ tqlayout6->addLayout( tqlayout5 );
- MPlayerLayout->addMultiCellLayout( layout6, 4, 4, 0, 5 );
+ MPlayerLayout->addMultiCellLayout( tqlayout6, 4, 4, 0, 5 );
frame4 = new TQFrame( this, "frame4" );
- frame4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) );
+ frame4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) );
frame4->setFrameShape( TQFrame::HLine );
frame4->setFrameShadow( TQFrame::Raised );
MPlayerLayout->addMultiCellWidget( frame4, 1, 1, 0, 5 );
Label = new TQLabel( this, "Label" );
- Label->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, Label->sizePolicy().hasHeightForWidth() ) );
+ Label->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, Label->sizePolicy().hasHeightForWidth() ) );
Label->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) );
- Label->setAlignment( int( TQLabel::AlignCenter ) );
+ Label->tqsetAlignment( int( TQLabel::AlignCenter ) );
MPlayerLayout->addMultiCellWidget( Label, 2, 2, 0, 5 );
frame3 = new TQFrame( this, "frame3" );
- frame3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) );
+ frame3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) );
frame3->setFrameShape( TQFrame::HLine );
frame3->setFrameShadow( TQFrame::Raised );
MPlayerLayout->addMultiCellWidget( frame3, 3, 3, 0, 5 );
languageChange();
- resize( TQSize(559, 458).expandedTo(minimumSizeHint()) );
+ resize( TQSize(559, 458).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/k9Mplayer/mplayer.ui b/k9Mplayer/mplayer.ui
index 87f779c..c0c6854 100644
--- a/k9Mplayer/mplayer.ui
+++ b/k9Mplayer/mplayer.ui
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>190</width>
<height>20</height>
@@ -78,7 +78,7 @@
<property name="name">
<cstring>bSwitchAudio</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -93,7 +93,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="6">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>tqlayout6</cstring>
</property>
<hbox>
<property name="name">
@@ -111,7 +111,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>30</width>
<height>30</height>
@@ -139,7 +139,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>30</width>
<height>30</height>
@@ -168,7 +168,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>tqlayout5</cstring>
</property>
<hbox>
<property name="name">
@@ -186,13 +186,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -217,7 +217,7 @@
<property name="name">
<cstring>pixmapLabel1</cstring>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -242,13 +242,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -314,7 +314,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/k9author/chapterEdit.cpp b/k9author/chapterEdit.cpp
index 0c14441..04eec11 100644
--- a/k9author/chapterEdit.cpp
+++ b/k9author/chapterEdit.cpp
@@ -17,7 +17,7 @@
#include <kpushbutton.h>
#include <tqcheckbox.h>
#include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "ktimewidget.h"
@@ -34,11 +34,11 @@ chapterEdit::chapterEdit( TQWidget* parent, const char* name, WFlags fl )
{
if ( !name )
setName( "chapterEdit" );
- setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
chapterEditLayout = new TQGridLayout( this, 1, 1, 11, 6, "chapterEditLayout");
twstart = new KTimeWidget( this, "twstart" );
- twstart->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twstart->sizePolicy().hasHeightForWidth() ) );
+ twstart->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twstart->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( twstart, 1, 2 );
@@ -51,13 +51,13 @@ chapterEdit::chapterEdit( TQWidget* parent, const char* name, WFlags fl )
chapterEditLayout->addWidget( textLabel3, 0, 1 );
urFile = new KURLRequester( this, "urFile" );
- urFile->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)5, 0, 0, urFile->sizePolicy().hasHeightForWidth() ) );
+ urFile->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)5, 0, 0, urFile->sizePolicy().hasHeightForWidth() ) );
urFile->setMinimumSize( TQSize( 200, 0 ) );
chapterEditLayout->addMultiCellWidget( urFile, 0, 0, 2, 4 );
bStart = new KPushButton( this, "bStart" );
- bStart->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStart->sizePolicy().hasHeightForWidth() ) );
+ bStart->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStart->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( bStart, 1, 3 );
spacer2 = new TQSpacerItem( 16, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -78,44 +78,44 @@ chapterEdit::chapterEdit( TQWidget* parent, const char* name, WFlags fl )
chapterEditLayout->addMultiCellWidget( ckBreakEnd, 5, 5, 2, 3 );
twend = new KTimeWidget( this, "twend" );
- twend->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twend->sizePolicy().hasHeightForWidth() ) );
+ twend->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twend->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( twend, 4, 2 );
spacer3 = new TQSpacerItem( 20, 31, TQSizePolicy::Minimum, TQSizePolicy::Fixed );
chapterEditLayout->addItem( spacer3, 3, 2 );
- layout3 = new TQGridLayout( 0, 1, 1, 0, 6, "layout3");
+ tqlayout3 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout3");
lPosition = new TQLabel( this, "lPosition" );
- lPosition->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lPosition->sizePolicy().hasHeightForWidth() ) );
+ lPosition->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lPosition->sizePolicy().hasHeightForWidth() ) );
- layout3->addWidget( lPosition, 1, 1 );
+ tqlayout3->addWidget( lPosition, 1, 1 );
slider = new TQSlider( this, "slider" );
slider->setOrientation( Qt::Horizontal );
- layout3->addWidget( slider, 1, 0 );
+ tqlayout3->addWidget( slider, 1, 0 );
image = new TQLabel( this, "image" );
image->setMinimumSize( TQSize( 320, 200 ) );
image->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) );
image->setScaledContents( TRUE );
- layout3->addMultiCellWidget( image, 0, 0, 0, 1 );
+ tqlayout3->addMultiCellWidget( image, 0, 0, 0, 1 );
- chapterEditLayout->addMultiCellLayout( layout3, 0, 6, 0, 0 );
+ chapterEditLayout->addMultiCellLayout( tqlayout3, 0, 6, 0, 0 );
bEnd = new KPushButton( this, "bEnd" );
- bEnd->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bEnd->sizePolicy().hasHeightForWidth() ) );
+ bEnd->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bEnd->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( bEnd, 4, 3 );
bTitleButton = new TQPushButton( this, "bTitleButton" );
- bTitleButton->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bTitleButton->sizePolicy().hasHeightForWidth() ) );
+ bTitleButton->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bTitleButton->sizePolicy().hasHeightForWidth() ) );
chapterEditLayout->addWidget( bTitleButton, 7, 0 );
languageChange();
- resize( TQSize(627, 300).expandedTo(minimumSizeHint()) );
+ resize( TQSize(627, 300).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/k9author/chapterEdit.ui b/k9author/chapterEdit.ui
index 2d7e337..1307bdc 100644
--- a/k9author/chapterEdit.ui
+++ b/k9author/chapterEdit.ui
@@ -68,7 +68,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>200</width>
<height>0</height>
@@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>60</height>
@@ -176,7 +176,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -185,7 +185,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="7" colspan="1">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<grid>
<property name="name">
@@ -219,7 +219,7 @@
<property name="name">
<cstring>image</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>320</width>
<height>200</height>
diff --git a/k9author/import.cpp b/k9author/import.cpp
index 294192c..69ebdbc 100644
--- a/k9author/import.cpp
+++ b/k9author/import.cpp
@@ -17,7 +17,7 @@
#include <kcombobox.h>
#include <tqcombobox.h>
#include <kselect.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "kcombobox.h"
@@ -35,43 +35,43 @@ import::import( TQWidget* parent, const char* name, WFlags fl )
importLayout = new TQGridLayout( this, 1, 1, 11, 6, "importLayout");
textLabel1 = new TQLabel( this, "textLabel1" );
- textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
importLayout->addWidget( textLabel1, 0, 0 );
- layout2 = new TQGridLayout( 0, 1, 1, 0, 6, "layout2");
+ tqlayout2 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout2");
lvDVD = new TQListView( this, "lvDVD" );
lvDVD->addColumn( tr2i18n( "Video files" ) );
lvDVD->header()->setClickEnabled( FALSE, lvDVD->header()->count() - 1 );
lvDVD->addColumn( tr2i18n( "..." ) );
lvDVD->header()->setClickEnabled( FALSE, lvDVD->header()->count() - 1 );
- lvDVD->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, lvDVD->sizePolicy().hasHeightForWidth() ) );
+ lvDVD->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, lvDVD->sizePolicy().hasHeightForWidth() ) );
lvDVD->setMinimumSize( TQSize( 0, 200 ) );
lvDVD->setRootIsDecorated( FALSE );
lvDVD->setResizeMode( TQListView::AllColumns );
- layout2->addMultiCellWidget( lvDVD, 0, 1, 0, 0 );
+ tqlayout2->addMultiCellWidget( lvDVD, 0, 1, 0, 0 );
- importLayout->addMultiCellLayout( layout2, 1, 1, 0, 3 );
+ importLayout->addMultiCellLayout( tqlayout2, 1, 1, 0, 3 );
cbOutputDev = new KComboBox( FALSE, this, "cbOutputDev" );
importLayout->addWidget( cbOutputDev, 0, 1 );
cbFormat = new TQComboBox( FALSE, this, "cbFormat" );
- cbFormat->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbFormat->sizePolicy().hasHeightForWidth() ) );
+ cbFormat->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbFormat->sizePolicy().hasHeightForWidth() ) );
importLayout->addWidget( cbFormat, 0, 2 );
lTotal = new TQLabel( this, "lTotal" );
- lTotal->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotal->sizePolicy().hasHeightForWidth() ) );
+ lTotal->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotal->sizePolicy().hasHeightForWidth() ) );
importLayout->addWidget( lTotal, 2, 3 );
gsTotal = new KGradientSelector( this, "gsTotal" );
gsTotal->setEnabled( FALSE );
- gsTotal->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gsTotal->sizePolicy().hasHeightForWidth() ) );
+ gsTotal->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gsTotal->sizePolicy().hasHeightForWidth() ) );
gsTotal->setMaximumSize( TQSize( 32767, 13 ) );
gsTotal->setValue( 0 );
gsTotal->setMaxValue( 180 );
@@ -80,7 +80,7 @@ import::import( TQWidget* parent, const char* name, WFlags fl )
importLayout->addMultiCellWidget( gsTotal, 2, 2, 0, 2 );
languageChange();
- resize( TQSize(524, 416).expandedTo(minimumSizeHint()) );
+ resize( TQSize(524, 416).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/k9author/import.ui b/k9author/import.ui
index 9047514..4569542 100644
--- a/k9author/import.ui
+++ b/k9author/import.ui
@@ -37,7 +37,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<grid>
<property name="name">
@@ -77,7 +77,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>200</height>
@@ -151,7 +151,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>13</height>
diff --git a/k9author/k9avidecode.cpp b/k9author/k9avidecode.cpp
index d4d2cdb..1ac2f4e 100644
--- a/k9author/k9avidecode.cpp
+++ b/k9author/k9avidecode.cpp
@@ -54,11 +54,11 @@ k9AviDecode::k9AviDecode(TQObject *parent, const char *name)
FormatHandle=dlopen("libavformat.so",RTLD_LAZY | RTLD_GLOBAL);
}
if (!CodecHandle) {
- m_error =i18n("Cannot open then library %1").arg("libavcodec");
+ m_error =i18n("Cannot open then library %1").tqarg("libavcodec");
return;
}
if (!FormatHandle) {
- m_error =i18n("Cannot open then library %1").arg("libavformat");
+ m_error =i18n("Cannot open then library %1").tqarg("libavformat");
return;
}
m_error="";
@@ -111,7 +111,7 @@ bool k9AviDecode::open(const TQString & _fileName) {
// Open video file
if (av_open_input_file(&m_FormatCtx, _fileName.utf8(), NULL, 0, NULL)!=0) {
- m_error=i18n("Couldn't open the file %1").arg(_fileName);
+ m_error=i18n("Couldn't open the file %1").tqarg(_fileName);
return false; // Couldn't open file}
}
// Retrieve stream information
diff --git a/k9author/k9chapteredit.cpp b/k9author/k9chapteredit.cpp
index a066dab..3453cf5 100644
--- a/k9author/k9chapteredit.cpp
+++ b/k9author/k9chapteredit.cpp
@@ -17,7 +17,7 @@
#include <tqlabel.h>
#include <tqpixmap.h>
#include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kurlrequester.h>
#include <tqcheckbox.h>
#include "k9title.h"
diff --git a/k9author/k9menu.cpp b/k9author/k9menu.cpp
index 26a399c..82e1010 100644
--- a/k9author/k9menu.cpp
+++ b/k9author/k9menu.cpp
@@ -25,7 +25,7 @@ k9Menu::k9Menu(TQObject *parent, const char *name)
m_canvas=new TQCanvas(this);
TQPixmap pix(720,576);
pix.fill(TQt::black);
- m_canvas->setBackgroundPixmap(pix);
+ m_canvas->tqsetBackgroundPixmap(pix);
m_startScript=m_startScript2=m_endScript="";
}
@@ -202,7 +202,7 @@ void k9Menu::spumux(const TQString &_hiFileName,const TQString &_mpgFileName) {
for (k9MenuButton *button=m_buttons.first();button;button=m_buttons.next()) {
TQDomElement eButton = xml.createElement("button");
spu.appendChild(eButton);
- eButton.setAttribute("name",TQString("button%1").arg(i));
+ eButton.setAttribute("name",TQString("button%1").tqarg(i));
eButton.setAttribute("x0", TQString::number(button->getLeft()));
eButton.setAttribute("y0",TQString::number(button->getTop()));
eButton.setAttribute("x1",TQString::number(button->getLeft()+button->getWidth()));
@@ -261,7 +261,7 @@ void k9Menu::appendMenu(TQDomElement *_rootNode) {
pgc.appendChild(eButton);
TQDomText eButtonTxt=doc.createTextNode(button->getScript());
eButton.appendChild(eButtonTxt);
- eButton.setAttribute("name",TQString("button%1").arg(i));
+ eButton.setAttribute("name",TQString("button%1").tqarg(i));
i++;
}
diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp
index b50bcc9..e9a018b 100644
--- a/k9author/k9menuedit.cpp
+++ b/k9author/k9menuedit.cpp
@@ -17,7 +17,7 @@
#include "k9title.h"
#include "k9newdvd.h"
#include <tqwmatrix.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kfontdialog.h>
#include "k9menubutton.h"
#include <kurlrequester.h>
@@ -153,7 +153,7 @@ void k9MenuEdit::cbPosTitleActivated(int _value) {
void k9MenuEdit::setBackgroundImage(const TQImage &_image) {
m_background=_image;
- m_canvas->setBackgroundPixmap(TQPixmap(_image));
+ m_canvas->tqsetBackgroundPixmap(TQPixmap(_image));
emit backgroundImageChanged(_image);
}
@@ -219,7 +219,7 @@ void k9MenuEdit::setFormat(const eFormat& _value) {
TQImage img=pix.convertToImage().smoothScale(720,m_imageHeight);
m_canvas->resize(720,m_imageHeight);
m_menuEditor->setMaximumSize(TQSize(724,m_imageHeight+4));
- m_canvas->setBackgroundPixmap(TQPixmap(img));
+ m_canvas->tqsetBackgroundPixmap(TQPixmap(img));
}
@@ -242,7 +242,7 @@ void k9MenuEdit::titleSelected(k9Title *_title) {
disconnect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),0,0);
cbEnd->setEnabled(true);
m_menuEditor->clearSelection();
- lTitle->setText(i18n("Title %1 Menu").arg(_title->getNum()+1));
+ lTitle->setText(i18n("Title %1 Menu").tqarg(_title->getNum()+1));
setCanvas(_title->getMenu()->getCanvas());
m_menuType=TITLEMENU;
cbStart->clear();
@@ -266,8 +266,8 @@ void k9MenuEdit::titleSelected(k9Title *_title) {
k9NewDVD *newDVD=(k9NewDVD*)_title->parent() ;
k9NewDVDItems *items=newDVD->getTitles();
for (k9Title *title=items->first();title;title=items->next()) {
- cbEnd->insertItem(i18n("Play Title %1").arg(title->getNum()+1));
- TQString script=TQString("g6=%1; call vmgm menu;" ).arg(title->getNum()+1);
+ cbEnd->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1));
+ TQString script=TQString("g6=%1; call vmgm menu;" ).tqarg(title->getNum()+1);
m_endScripts << script;
}
for (int i=0;i<m_endScripts.count();i++ ){
@@ -292,9 +292,9 @@ void k9MenuEdit::rootSelected(k9NewDVD *_newDVD) {
m_startScripts << "";
k9NewDVDItems *items=_newDVD->getTitles();
for (k9Title *title=items->first();title;title=items->next()) {
- cbStart->insertItem(i18n("Play Title %1").arg(title->getNum()+1));
- // TQString script=TQString("if (g5==0) {g5=1; jump title %1;}" ).arg(title->getNum()+1);
- TQString script=TQString("g6=%1;" ).arg(title->getNum()+1);
+ cbStart->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1));
+ // TQString script=TQString("if (g5==0) {g5=1; jump title %1;}" ).tqarg(title->getNum()+1);
+ TQString script=TQString("g6=%1;" ).tqarg(title->getNum()+1);
m_startScripts << script;
if (script==_newDVD->getRootMenu()->getStartScript())
cbStart->setCurrentItem(cbStart->count()-1);
diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp
index 5e7d085..e4c747f 100644
--- a/k9author/k9newdvd.cpp
+++ b/k9author/k9newdvd.cpp
@@ -14,7 +14,7 @@
#include "k9tools.h"
#include <tqfile.h>
#include <stdio.h>
-#include <textstream.h>
+#include <tqtextstream.h>
#include <kstandarddirs.h>
#include <tqapplication.h>
#include <ktempfile.h>
@@ -157,7 +157,7 @@ void k9NewDVD::addTitles (TQDomElement &_root) {
TQString menuFileName=m_workDir+KApplication::randomString(8)+".mpg";
m_tmpFiles << menuFileName,
menu->setMenuFileName(menuFileName);
- m_processList->addProgress(i18n("Creating menu for title %1").arg(title->getNum()+1));
+ m_processList->addProgress(i18n("Creating menu for title %1").tqarg(title->getNum()+1));
menu->createMenus(&titleSet);
TQDomElement eTitle=m_xml->createElement("titles");
@@ -244,7 +244,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *
break;
}
- k9Process *process=m_processList->addProcess(i18n("Encoding %1").arg(_aviFile->getFileName()));
+ k9Process *process=m_processList->addProcess(i18n("Encoding %1").tqarg(_aviFile->getFileName()));
m_processList->setFileName(process,_aviFile->getFileName());
TQTime t(0,0);
@@ -255,7 +255,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *
//m_process->clearArguments();
*process << "mencoder" << "-oac" << "lavc" << "-ovc" << "lavc" << "-of" << "mpeg" <<"-afm" <<"libmad";
*process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000";
- *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").arg(m_videoBitrate).arg(m_config->getPrefAudioBitrate()).arg(m_config->getPrefAudioFormat().lower());
+ *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").tqarg(m_videoBitrate).tqarg(m_config->getPrefAudioBitrate()).tqarg(m_config->getPrefAudioFormat().lower());
*process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName();
qDebug(process->debug());
/*
@@ -376,15 +376,15 @@ void k9NewDVD::appendTitle(k9Title *_title) {
btn->setLeft(left*(m_config->getPrefButtonWidth()+50) +50);
btn->setWidth(m_config->getPrefButtonWidth());
btn->setHeight(m_config->getPrefButtonHeight());
- btn->setScript(TQString("g1=0;jump titleset %1 menu;").arg(_title->getNum()+1));
+ btn->setScript(TQString("g1=0;jump titleset %1 menu;").tqarg(_title->getNum()+1));
btn->setTextPosition(k9MenuButton::RIGHT);
- btn->setText(i18n("title %1").arg(_title->getNum()+1));
+ btn->setText(i18n("title %1").tqarg(_title->getNum()+1));
btn->setColor(m_config->getPrefButtonTextColor());
btn->setFont(m_config->getPrefButtonFont());
TQString script="\n";
for (k9Title *t = m_titles.first();t;t=m_titles.next()) {
- script +=TQString("if (g6== %1) { g6=0; jump titleset %2 menu;}\n").arg(t->getNum()+1).arg(t->getNum()+1);
+ script +=TQString("if (g6== %1) { g6=0; jump titleset %2 menu;}\n").tqarg(t->getNum()+1).tqarg(t->getNum()+1);
}
m_rootMenu->setStartScript2(script);
emit sigAddTitle();
diff --git a/k9author/k9newtitle.cpp b/k9author/k9newtitle.cpp
index 1882e9c..a3db200 100644
--- a/k9author/k9newtitle.cpp
+++ b/k9author/k9newtitle.cpp
@@ -60,7 +60,7 @@ void k9NewTitle::bAddClicked() {
k9LvItemImport * item=new k9LvItemImport(m_k9Import->getRoot(),k9LvItemImport::TITLE);
item->setOpen(true);
k9Title *title=new k9Title( m_k9Import->getNewDVD());
- item->setText(0,i18n("title %1").arg(title->getNum() +1));
+ item->setText(0,i18n("title %1").tqarg(title->getNum() +1));
connect( title->getButton(),TQT_SIGNAL(sigsetImage(k9MenuButton*, const TQImage&)),m_k9Import,TQT_SLOT(buttonUpdated(k9MenuButton*, const TQImage&)));
item->setTitle(title);
@@ -114,7 +114,7 @@ void k9NewTitle::bAddClicked() {
pos+=increment;
file->setEnd(t.addMSecs(TQMIN(pos,fileInfo.getDuration()) *1000));
k9LvItemImport * itemch=new k9LvItemImport(item,k9LvItemImport::CHAPTER);
- itemch->setText(0,i18n("chapter %1").arg(i+1));
+ itemch->setText(0,i18n("chapter %1").tqarg(i+1));
itemch->setText(1,file->getStart().toString("hh:mm:ss") +" - "+file->getEnd().toString("hh:mm:ss") );
itemch->setAviFile(file);
itemch->setTitle(title);
@@ -134,9 +134,9 @@ void k9NewTitle::bAddClicked() {
btn->setLeft(left);
btn->setWidth(width);
btn->setHeight(height);
- btn->setScript(TQString("jump title 1 chapter %1 ;").arg(i+1));
+ btn->setScript(TQString("jump title 1 chapter %1 ;").tqarg(i+1));
btn->setTextPosition(k9MenuButton::BOTTOM);
- btn->setText(i18n("chapter %1").arg(i+1));
+ btn->setText(i18n("chapter %1").tqarg(i+1));
btn->setColor(config.getPrefButtonTextColor());
btn->setFont(config.getPrefButtonFont());
connect(file,TQT_SIGNAL(imageChanged(const TQImage&)),btn,TQT_SLOT(setImage(const TQImage&)));
diff --git a/k9author/menuEdit.cpp b/k9author/menuEdit.cpp
index e7798c1..3f65a27 100644
--- a/k9author/menuEdit.cpp
+++ b/k9author/menuEdit.cpp
@@ -17,7 +17,7 @@
#include <tqcombobox.h>
#include <tqlineedit.h>
#include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "kurlrequester.h"
@@ -37,12 +37,12 @@ menuEdit::menuEdit( TQWidget* parent, const char* name, WFlags fl )
menuEditLayout = new TQGridLayout( this, 1, 1, 2, 6, "menuEditLayout");
textLabel2 = new TQLabel( this, "textLabel2" );
- textLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) );
+ textLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addMultiCellWidget( textLabel2, 5, 6, 0, 0 );
textLabel1 = new TQLabel( this, "textLabel1" );
- textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addWidget( textLabel1, 4, 0 );
@@ -51,17 +51,17 @@ menuEdit::menuEdit( TQWidget* parent, const char* name, WFlags fl )
menuEditLayout->addMultiCellWidget( urBackground, 4, 4, 1, 5 );
cbColor = new KColorButton( this, "cbColor" );
- cbColor->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbColor->sizePolicy().hasHeightForWidth() ) );
+ cbColor->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbColor->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addWidget( cbColor, 6, 1 );
bFont = new KPushButton( this, "bFont" );
- bFont->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bFont->sizePolicy().hasHeightForWidth() ) );
+ bFont->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bFont->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addWidget( bFont, 6, 2 );
cbPosTitle = new TQComboBox( FALSE, this, "cbPosTitle" );
- cbPosTitle->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbPosTitle->sizePolicy().hasHeightForWidth() ) );
+ cbPosTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbPosTitle->sizePolicy().hasHeightForWidth() ) );
menuEditLayout->addWidget( cbPosTitle, 6, 3 );
spacer1 = new TQSpacerItem( 51, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
@@ -72,14 +72,14 @@ menuEdit::menuEdit( TQWidget* parent, const char* name, WFlags fl )
menuEditLayout->addMultiCellWidget( leTitle, 5, 5, 1, 4 );
bAddText = new KPushButton( this, "bAddText" );
- bAddText->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)4, 0, 0, bAddText->sizePolicy().hasHeightForWidth() ) );
+ bAddText->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)4, 0, 0, bAddText->sizePolicy().hasHeightForWidth() ) );
bAddText->setMinimumSize( TQSize( 24, 24 ) );
bAddText->setMaximumSize( TQSize( 24, 24 ) );
menuEditLayout->addWidget( bAddText, 5, 5 );
lTitle = new TQLabel( this, "lTitle" );
- lTitle->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lTitle->sizePolicy().hasHeightForWidth() ) );
+ lTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lTitle->sizePolicy().hasHeightForWidth() ) );
TQFont lTitle_font( lTitle->font() );
lTitle_font.setBold( TRUE );
lTitle->setFont( lTitle_font );
@@ -103,13 +103,13 @@ menuEdit::menuEdit( TQWidget* parent, const char* name, WFlags fl )
menuEditLayout->addMultiCellWidget( cbEnd, 3, 3, 1, 5 );
frame = new TQFrame( this, "frame" );
- frame->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, frame->sizePolicy().hasHeightForWidth() ) );
+ frame->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, frame->sizePolicy().hasHeightForWidth() ) );
frame->setFrameShape( TQFrame::StyledPanel );
frame->setFrameShadow( TQFrame::Raised );
menuEditLayout->addMultiCellWidget( frame, 1, 1, 0, 5 );
languageChange();
- resize( TQSize(576, 682).expandedTo(minimumSizeHint()) );
+ resize( TQSize(576, 682).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/k9author/menuEdit.ui b/k9author/menuEdit.ui
index 7f34593..14abb77 100644
--- a/k9author/menuEdit.ui
+++ b/k9author/menuEdit.ui
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -148,13 +148,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>24</width>
<height>24</height>
diff --git a/k9author/newTitle.cpp b/k9author/newTitle.cpp
index 1f9f72c..154e5ef 100644
--- a/k9author/newTitle.cpp
+++ b/k9author/newTitle.cpp
@@ -18,7 +18,7 @@
#include <kpushbutton.h>
#include <tqlabel.h>
#include <kurlrequester.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "knuminput.h"
@@ -39,15 +39,15 @@ newTitle::newTitle( TQWidget* parent, const char* name, WFlags fl )
newTitleLayout = new TQGridLayout( this, 1, 1, 11, 6, "newTitleLayout");
buttonGroup1 = new TQButtonGroup( this, "buttonGroup1" );
- buttonGroup1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) );
+ buttonGroup1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
- buttonGroup1->layout()->setSpacing( 6 );
- buttonGroup1->layout()->setMargin( 11 );
- buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() );
- buttonGroup1Layout->setAlignment( TQt::AlignTop );
+ buttonGroup1->tqlayout()->setSpacing( 6 );
+ buttonGroup1->tqlayout()->setMargin( 11 );
+ buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() );
+ buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
nbChapters = new KIntNumInput( buttonGroup1, "nbChapters" );
- nbChapters->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, nbChapters->sizePolicy().hasHeightForWidth() ) );
+ nbChapters->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, nbChapters->sizePolicy().hasHeightForWidth() ) );
nbChapters->setMinValue( 1 );
nbChapters->setMaxValue( 99 );
@@ -55,7 +55,7 @@ newTitle::newTitle( TQWidget* parent, const char* name, WFlags fl )
twLength = new KTimeWidget( buttonGroup1, "twLength" );
twLength->setEnabled( FALSE );
- twLength->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, twLength->sizePolicy().hasHeightForWidth() ) );
+ twLength->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, twLength->sizePolicy().hasHeightForWidth() ) );
buttonGroup1Layout->addWidget( twLength, 1, 1 );
@@ -78,30 +78,30 @@ newTitle::newTitle( TQWidget* parent, const char* name, WFlags fl )
bAdd = new KPushButton( this, "bAdd" );
bAdd->setEnabled( FALSE );
- bAdd->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) );
+ bAdd->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) );
bAdd->setProperty( "stdItem", 27 );
newTitleLayout->addWidget( bAdd, 2, 1 );
spacer2 = new TQSpacerItem( 470, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
newTitleLayout->addItem( spacer2, 2, 0 );
- layout1 = new TQHBoxLayout( 0, 0, 6, "layout1");
+ tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1");
textLabel1 = new TQLabel( this, "textLabel1" );
- textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
- layout1->addWidget( textLabel1 );
+ textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ tqlayout1->addWidget( textLabel1 );
urFile = new KURLRequester( this, "urFile" );
urFile->setMode( 25 );
- layout1->addWidget( urFile );
+ tqlayout1->addWidget( urFile );
lTotalTime = new TQLabel( this, "lTotalTime" );
- lTotalTime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotalTime->sizePolicy().hasHeightForWidth() ) );
- layout1->addWidget( lTotalTime );
+ lTotalTime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotalTime->sizePolicy().hasHeightForWidth() ) );
+ tqlayout1->addWidget( lTotalTime );
- newTitleLayout->addMultiCellLayout( layout1, 0, 0, 0, 1 );
+ newTitleLayout->addMultiCellLayout( tqlayout1, 0, 0, 0, 1 );
languageChange();
- resize( TQSize(605, 171).expandedTo(minimumSizeHint()) );
+ resize( TQSize(605, 171).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/k9author/newTitle.ui b/k9author/newTitle.ui
index 78b1250..7115c31 100644
--- a/k9author/newTitle.ui
+++ b/k9author/newTitle.ui
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>16</height>
@@ -138,7 +138,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -180,7 +180,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>470</width>
<height>20</height>
@@ -189,7 +189,7 @@
</spacer>
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<hbox>
<property name="name">
diff --git a/k9decmpeg/k9plaympeg2.cpp b/k9decmpeg/k9plaympeg2.cpp
index e18f4ae..f5ff3d7 100644
--- a/k9decmpeg/k9plaympeg2.cpp
+++ b/k9decmpeg/k9plaympeg2.cpp
@@ -55,7 +55,7 @@ void k9PlayMPEG2::playTitle() {
/* set read ahead cache usage */
if (dvdnav_set_readahead_flag(dvdnav, DVD_READ_CACHE) != DVDNAV_STATUS_OK) {
- setError(TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").arg(dvdnav_err_to_string(dvdnav)));
+ setError(TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
return;
}
@@ -63,14 +63,14 @@ void k9PlayMPEG2::playTitle() {
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) {
- setError(TQString("ERR:Error on setting languages: %1\n").arg(dvdnav_err_to_string(dvdnav)));
+ setError(TQString("ERR:Error on setting languages: %1\n").tqarg(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) {
- setError(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").arg(dvdnav_err_to_string(dvdnav)));
+ setError(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
return ;
}
@@ -105,7 +105,7 @@ void k9PlayMPEG2::playTitle() {
if (result == DVDNAV_STATUS_ERR) {
- setError(TQString("ERR:Error getting next block: %1\n").arg(dvdnav_err_to_string(dvdnav)));
+ setError(TQString("ERR:Error getting next block: %1\n").tqarg(dvdnav_err_to_string(dvdnav)));
return;
}
@@ -254,7 +254,7 @@ void k9PlayMPEG2::open (dvd_reader_t *dvd,const TQString & device,k9DVDTitle * t
m_lastSector=0;
ret = stat(device.utf8(), &dvd_stat);
/* if ( ret < 0 ) {
- c=i18n("Can't find device %1\n").arg(device.latin1());
+ c=i18n("Can't find device %1\n").tqarg(device.latin1());
setError(c);
return;
}
diff --git a/k9devices/k9halconnection.cpp b/k9devices/k9halconnection.cpp
index df56b4f..e420472 100644
--- a/k9devices/k9halconnection.cpp
+++ b/k9devices/k9halconnection.cpp
@@ -41,7 +41,7 @@ k9HalConnection::k9HalConnection(TQObject *parent, const char *name)
dbus_error_init( &error );
m_dbusConnect = dbus_bus_get( DBUS_BUS_SYSTEM, &error );
if( dbus_error_is_set(&error) ) {
- qDebug(TQString("Error connecting to DBUS : %1").arg(error.message));
+ qDebug(TQString("Error connecting to DBUS : %1").tqarg(error.message));
return;
}
diff --git a/k9devices/k9haldevice.cpp b/k9devices/k9haldevice.cpp
index a5f8dbd..3c35adc 100644
--- a/k9devices/k9haldevice.cpp
+++ b/k9devices/k9haldevice.cpp
@@ -95,7 +95,7 @@ void k9HalDevice::getDriveProperties() {
m_canReadDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDROM)==LIBHAL_DRIVE_CDROM_CAPS_DVDROM;
m_canBurnDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDR)==LIBHAL_DRIVE_CDROM_CAPS_DVDR;
m_model=TQString(libhal_drive_get_model(drive));
- // qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").arg(m_canReadDvd).arg(m_canBurnDvd).arg(m_model));
+ // qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model));
libhal_drive_free(drive);
diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp
index 4d41146..f5e537a 100755
--- a/k9vamps/k9vamps.cpp
+++ b/k9vamps/k9vamps.cpp
@@ -185,7 +185,7 @@ void k9vamps::run () {
vobuf = (uchar*) malloc (vbuf_size);
if (vibuf == NULL || vobuf == NULL)
- fatal (TQString("Allocation of video buffers failed: %1").arg(strerror (errno)));
+ fatal (TQString("Allocation of video buffers failed: %1").tqarg(strerror (errno)));
// actually do vaporization
@@ -357,18 +357,18 @@ int k9vamps::check_video_packet (uchar *ptr) {
vid_packet_start_code |= (uint32_t) (ptr [3]);
if (vid_packet_start_code != 0x000001e0)
- fatal(TQString ("Bad video packet start code at %1: %2").arg(rtell(ptr)).arg(vid_packet_start_code,0,16));
+ fatal(TQString ("Bad video packet start code at %1: %2").tqarg(rtell(ptr)).tqarg(vid_packet_start_code,0,16));
vid_packet_length = ptr [4] << 8;
vid_packet_length |= ptr [5];
vid_packet_length += 6;
if ((ptr [6] & 0xc0) != 0x80)
- fatal (TQString("Not an MPEG2 video packet at %1").arg(rtell (ptr)));
+ fatal (TQString("Not an MPEG2 video packet at %1").tqarg(rtell (ptr)));
if (ptr [7]) {
if ((ptr [7] & 0xc0) != 0xc0)
- qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").arg(rtell (ptr)).arg(ptr [7]));
+ qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7]));
else {
sequence_header_code = (uint32_t) (ptr [6 + 3 + ptr [8] + 0]) << 24;
sequence_header_code |= (uint32_t) (ptr [6 + 3 + ptr [8] + 1]) << 16;
@@ -399,7 +399,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
pad_packet_start_code |= (uint32_t) (ptr [3]);
if (pad_packet_start_code != 0x000001be)
- qDebug (TQString("Bad padding packet start code at %1: %2").arg(rtell (ptr + vid_packet_length)).arg(pad_packet_start_code));
+ qDebug (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code));
else {
pad_packet_length = ptr [4] << 8;
pad_packet_length |= ptr [5];
@@ -409,7 +409,7 @@ int k9vamps::check_video_packet (uchar *ptr) {
// length of video packet plus padding packet must always match sector size
if (14 + vid_packet_length + pad_packet_length != SECT_SIZE)
- qDebug (TQString("Bad video packet length at %1: %2").arg(rtell (ptr)).arg(vid_packet_length));
+ qDebug (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length));
return rc;
}
@@ -636,7 +636,7 @@ void k9vamps::vap_leader () {
data_length |= ptr [5];
if (14 + data_length != SECT_SIZE - 6)
- fatal (TQString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length));
+ fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length));
//JMP:à vérifier
skip (SECT_SIZE);
@@ -681,7 +681,7 @@ void k9vamps::vap_trailer (int length) {
data_length |= ptr [5];
if (14 + data_length != SECT_SIZE - 6)
- fatal (TQString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length));
+ fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length));
skip (SECT_SIZE);
} else {
copy (SECT_SIZE);
@@ -802,7 +802,7 @@ int k9vamps::vap_phase1 (void) {
data_length |= ptr [5];
if (14 + data_length != SECT_SIZE - 6)
- fatal (TQString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length));
+ fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length));
break;
@@ -938,7 +938,7 @@ void k9vamps::vap_phase2 (int seq_length) {
data_length |= ptr [5];
if (14 + data_length != SECT_SIZE - 6)
- fatal (TQString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length));
+ fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length));
//JMP: à vérifier
skip (SECT_SIZE);
break;
diff --git a/libdvdnav/dvdnav.h b/libdvdnav/dvdnav.h
index 1e39d0b..b9812ad 100644
--- a/libdvdnav/dvdnav.h
+++ b/libdvdnav/dvdnav.h
@@ -52,7 +52,7 @@ extern "C" {
*/
typedef struct dvdnav_s dvdnav_t;
-/* Status as reported by most of libdvdnav's functions */
+/* tqStatus as reported by most of libdvdnav's functions */
typedef int32_t dvdnav_status_t;
/*
diff --git a/libdvdnav/read_cache.c b/libdvdnav/read_cache.c
index 1941c3c..685a440 100644
--- a/libdvdnav/read_cache.c
+++ b/libdvdnav/read_cache.c
@@ -47,7 +47,7 @@
typedef struct read_cache_chunk_s {
uint8_t *cache_buffer;
- uint8_t *cache_buffer_base; /* used in malloc and free for alignment */
+ uint8_t *cache_buffer_base; /* used in malloc and free for tqalignment */
int32_t cache_start_sector; /* -1 means cache invalid */
int32_t cache_read_count; /* this many sectors are already read */
size_t cache_block_count; /* this many sectors will go in this chunk */
diff --git a/libk9copy/backupdlg.cpp b/libk9copy/backupdlg.cpp
index 065b050..e760dfa 100644
--- a/libk9copy/backupdlg.cpp
+++ b/libk9copy/backupdlg.cpp
@@ -15,7 +15,7 @@
#include <tqprogressbar.h>
#include <kpushbutton.h>
#include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "kpushbutton.h"
@@ -32,7 +32,7 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl
{
if ( !name )
setName( "backupDlg" );
- setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
setMinimumSize( TQSize( 0, 0 ) );
setMaximumSize( TQSize( 9999, 9999 ) );
setBaseSize( TQSize( 500, 230 ) );
@@ -41,59 +41,59 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl
backupDlgLayout = new TQGridLayout( this, 1, 1, 3, 8, "backupDlgLayout");
textLabel1 = new TQLabel( this, "textLabel1" );
- textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
textLabel1->setCursor( TQCursor( 3 ) );
textLabel1->setFrameShape( TQLabel::NoFrame );
textLabel1->setFrameShadow( TQLabel::Raised );
backupDlgLayout->addMultiCellWidget( textLabel1, 0, 0, 0, 3 );
- layout3 = new TQVBoxLayout( 0, 0, 6, "layout3");
+ tqlayout3 = new TQVBoxLayout( 0, 0, 6, "tqlayout3");
lblStep = new TQLabel( this, "lblStep" );
- lblStep->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblStep->sizePolicy().hasHeightForWidth() ) );
+ lblStep->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblStep->sizePolicy().hasHeightForWidth() ) );
TQFont lblStep_font( lblStep->font() );
lblStep_font.setItalic( TRUE );
lblStep->setFont( lblStep_font );
lblStep->setCursor( TQCursor( 3 ) );
- layout3->addWidget( lblStep );
+ tqlayout3->addWidget( lblStep );
pbStep = new TQProgressBar( this, "pbStep" );
pbStep->setCursor( TQCursor( 3 ) );
- layout3->addWidget( pbStep );
+ tqlayout3->addWidget( pbStep );
pbTotal = new TQProgressBar( this, "pbTotal" );
pbTotal->setCursor( TQCursor( 3 ) );
pbTotal->setMargin( 0 );
pbTotal->setTotalSteps( 4400 );
pbTotal->setPercentageVisible( TRUE );
- layout3->addWidget( pbTotal );
+ tqlayout3->addWidget( pbTotal );
- backupDlgLayout->addMultiCellLayout( layout3, 3, 3, 0, 3 );
+ backupDlgLayout->addMultiCellLayout( tqlayout3, 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() ) );
+ textLabel1_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) );
textLabel1_2->setCursor( TQCursor( 3 ) );
backupDlgLayout->addWidget( textLabel1_2, 2, 0 );
lblTime = new TQLabel( this, "lblTime" );
- lblTime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblTime->sizePolicy().hasHeightForWidth() ) );
+ lblTime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblTime->sizePolicy().hasHeightForWidth() ) );
lblTime->setCursor( TQCursor( 3 ) );
backupDlgLayout->addWidget( lblTime, 2, 1 );
- layout1 = new TQHBoxLayout( 0, 0, 6, "layout1");
+ tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1");
spacer1 = new TQSpacerItem( 131, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- layout1->addItem( spacer1 );
+ tqlayout1->addItem( spacer1 );
bAbort = new KPushButton( this, "bAbort" );
- bAbort->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAbort->sizePolicy().hasHeightForWidth() ) );
+ bAbort->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAbort->sizePolicy().hasHeightForWidth() ) );
bAbort->setCursor( TQCursor( 0 ) );
bAbort->setProperty( "stdItem", 26 );
- layout1->addWidget( bAbort );
+ tqlayout1->addWidget( bAbort );
- backupDlgLayout->addMultiCellLayout( layout1, 4, 4, 0, 3 );
+ backupDlgLayout->addMultiCellLayout( tqlayout1, 4, 4, 0, 3 );
lblFactor = new TQLabel( this, "lblFactor" );
lblFactor->setCursor( TQCursor( 3 ) );
@@ -108,7 +108,7 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl
frame3Layout = new TQGridLayout( frame3, 1, 1, 2, 6, "frame3Layout");
bPlay = new KPushButton( frame3, "bPlay" );
- bPlay->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) );
+ bPlay->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) );
bPlay->setMinimumSize( TQSize( 25, 25 ) );
bPlay->setMaximumSize( TQSize( 25, 25 ) );
bPlay->setCursor( TQCursor( 0 ) );
@@ -121,7 +121,7 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl
frame3Layout->addItem( spacer4, 1, 0 );
image = new TQLabel( frame3, "image" );
- image->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, image->sizePolicy().hasHeightForWidth() ) );
+ image->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, image->sizePolicy().hasHeightForWidth() ) );
image->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) );
image->setCursor( TQCursor( 3 ) );
image->setScaledContents( TRUE );
@@ -132,7 +132,7 @@ backupDlg::backupDlg( TQWidget* parent, const char* name, bool modal, WFlags fl
spacer3 = new TQSpacerItem( 380, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
backupDlgLayout->addItem( spacer3, 2, 2 );
languageChange();
- resize( TQSize(385, 425).expandedTo(minimumSizeHint()) );
+ resize( TQSize(385, 425).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/libk9copy/backupdlg.ui b/libk9copy/backupdlg.ui
index 65eed10..6bb8af5 100644
--- a/libk9copy/backupdlg.ui
+++ b/libk9copy/backupdlg.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>9999</width>
<height>9999</height>
@@ -84,7 +84,7 @@
</widget>
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="4">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<vbox>
<property name="name">
@@ -181,7 +181,7 @@
</widget>
<widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="4">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<property name="cursor">
<cursor>3</cursor>
@@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>131</width>
<height>20</height>
@@ -271,13 +271,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>25</width>
<height>25</height>
@@ -309,7 +309,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>476</width>
<height>20</height>
@@ -354,7 +354,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>380</width>
<height>20</height>
diff --git a/libk9copy/dvdprogress.cpp b/libk9copy/dvdprogress.cpp
index 691ccfc..c48b96b 100644
--- a/libk9copy/dvdprogress.cpp
+++ b/libk9copy/dvdprogress.cpp
@@ -13,7 +13,7 @@
#include <tqpushbutton.h>
#include <tqlabel.h>
#include <tqprogressbar.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -29,31 +29,31 @@ DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags
{
if ( !name )
setName( "DVDProgress" );
- setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
setMinimumSize( TQSize( 0, 150 ) );
setMaximumSize( TQSize( 400, 150 ) );
setCursor( TQCursor( 3 ) );
DVDProgressLayout = new TQGridLayout( this, 1, 1, 11, 6, "DVDProgressLayout");
- layout2 = new TQVBoxLayout( 0, 0, 6, "layout2");
+ tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2");
lblTotal = new TQLabel( this, "lblTotal" );
lblTotal->setCursor( TQCursor( 3 ) );
- layout2->addWidget( lblTotal );
+ tqlayout2->addWidget( lblTotal );
pbTotal = new TQProgressBar( this, "pbTotal" );
pbTotal->setCursor( TQCursor( 3 ) );
pbTotal->setProgress( 100 );
pbTotal->setPercentageVisible( FALSE );
- layout2->addWidget( pbTotal );
+ tqlayout2->addWidget( pbTotal );
- DVDProgressLayout->addLayout( layout2, 1, 0 );
+ DVDProgressLayout->addLayout( tqlayout2, 1, 0 );
- layout1 = new TQVBoxLayout( 0, 0, 6, "layout1");
+ tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1");
lblTitle = new TQLabel( this, "lblTitle" );
lblTitle->setCursor( TQCursor( 3 ) );
- layout1->addWidget( lblTitle );
+ tqlayout1->addWidget( lblTitle );
pbTitle = new TQProgressBar( this, "pbTitle" );
pbTitle->setCursor( TQCursor( 3 ) );
@@ -61,16 +61,16 @@ DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags
pbTitle->setProgress( 100 );
pbTitle->setCenterIndicator( TRUE );
pbTitle->setPercentageVisible( FALSE );
- layout1->addWidget( pbTitle );
+ tqlayout1->addWidget( pbTitle );
- DVDProgressLayout->addLayout( layout1, 0, 0 );
+ DVDProgressLayout->addLayout( tqlayout1, 0, 0 );
- lblStatus = new TQLabel( this, "lblStatus" );
- lblStatus->setCursor( TQCursor( 3 ) );
+ lbltqStatus = new TQLabel( this, "lblStatus" );
+ lbltqStatus->setCursor( TQCursor( 3 ) );
- DVDProgressLayout->addWidget( lblStatus, 2, 0 );
+ DVDProgressLayout->addWidget( lbltqStatus, 2, 0 );
languageChange();
- resize( TQSize(278, 150).expandedTo(minimumSizeHint()) );
+ resize( TQSize(278, 150).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
}
@@ -91,7 +91,7 @@ void DVDProgress::languageChange()
setCaption( tr2i18n( "k9Copy - DVD Analyze" ) );
lblTotal->setText( TQString() );
lblTitle->setText( TQString() );
- lblStatus->setText( TQString() );
+ lbltqStatus->setText( TQString() );
}
#include "dvdprogress.moc"
diff --git a/libk9copy/dvdprogress.ui b/libk9copy/dvdprogress.ui
index bd81a23..8bb37b0 100755
--- a/libk9copy/dvdprogress.ui
+++ b/libk9copy/dvdprogress.ui
@@ -20,13 +20,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>150</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>400</width>
<height>150</height>
@@ -44,7 +44,7 @@
</property>
<widget class="TQLayoutWidget" row="1" column="0">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<property name="cursor">
<cursor>3</cursor>
@@ -82,7 +82,7 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<property name="cursor">
<cursor>3</cursor>
@@ -126,7 +126,7 @@
</widget>
<widget class="TQLabel" row="2" column="0">
<property name="name">
- <cstring>lblStatus</cstring>
+ <cstring>lbltqStatus</cstring>
</property>
<property name="cursor">
<cursor>3</cursor>
diff --git a/libk9copy/k9backupdlg.cpp b/libk9copy/k9backupdlg.cpp
index 9095b72..71d2507 100644
--- a/libk9copy/k9backupdlg.cpp
+++ b/libk9copy/k9backupdlg.cpp
@@ -31,7 +31,7 @@
#include <kguiitem.h>
#include <tqlabel.h>
#include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
#include "k9drawimage.h"
k9BackupDlg::k9BackupDlg(TQWidget* parent, const char* name, bool modal, WFlags fl)
diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp
index 542f37d..b9114de 100644
--- a/libk9copy/k9burndvd.cpp
+++ b/libk9copy/k9burndvd.cpp
@@ -101,13 +101,13 @@ void k9BurnDVD::burnWithK3b() {
}
void k9BurnDVD::mkisoSizeStderr(KProcess *proc, char *buffer, int buflen) {
- TQString c=TQString::fromLatin1( buffer,buflen);// (proc2->readStderr());
+ TQString c=TQString::tqfromLatin1( buffer,buflen);// (proc2->readStderr());
imageSize=c.replace("\n","");
;
}
void k9BurnDVD::mkisoSizeStdout(KProcess *proc, char *buffer, int buflen) {
- TQString c=TQString::fromLatin1(buffer,buflen);// (proc2->readStdout());
+ TQString c=TQString::tqfromLatin1(buffer,buflen);// (proc2->readStdout());
imageSize=c.replace("\n","");
;
}
@@ -176,9 +176,9 @@ void k9BurnDVD::getWodimCmd(k9Process *proc) {
*proc <<"-data";
if (m_speed !=i18n("default"))
- *proc << TQString("speed=%1").arg(m_speed);
- *proc <<TQString("dev=%1").arg(burnDevice);
- *proc <<TQString("tsize=%1s").arg(imageSize);
+ *proc << TQString("speed=%1").tqarg(m_speed);
+ *proc <<TQString("dev=%1").tqarg(burnDevice);
+ *proc <<TQString("tsize=%1s").tqarg(imageSize);
*proc << "-";
}
@@ -222,7 +222,7 @@ void k9BurnDVD::burnWithGenisoimage() {
if (!cancelled) {
int res=progress->execute();
if ( res==-1 ) {
- KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg("genisoimage"), i18n("DVD burning") );
+ KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").tqarg("genisoimage"), i18n("DVD burning") );
cancelled=true;
} else {
if (proc->exitStatus()==0) {
@@ -233,7 +233,7 @@ void k9BurnDVD::burnWithGenisoimage() {
} else {
TQString c;
- c=i18n("An error occured while Burning DVD: %1").arg(lastMsg) +"\n" +i18n("Insert an other DVD");
+ c=i18n("An error occured while Burning DVD: %1").tqarg(lastMsg) +"\n" +i18n("Insert an other DVD");
if ( KMessageBox::warningContinueCancel ( 0,c, i18n("authoring"))!=KMessageBox::Continue) {
cancelled=true;
}
@@ -306,7 +306,7 @@ void k9BurnDVD::burnWithGrowisofs() {
if (!cancelled) {
int res=progress->execute();
if ( res==-1 ) {
- KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg(progname), i18n("DVD burning") );
+ KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").tqarg(progname), i18n("DVD burning") );
cancelled=true;
} else {
if (proc->exitStatus()==0) {
@@ -317,7 +317,7 @@ void k9BurnDVD::burnWithGrowisofs() {
} else {
TQString c;
- c=i18n("An error occured while Burning DVD: %1").arg(lastMsg) +"\n" +i18n("Insert an other DVD");
+ c=i18n("An error occured while Burning DVD: %1").tqarg(lastMsg) +"\n" +i18n("Insert an other DVD");
if ( KMessageBox::warningContinueCancel ( 0,c, i18n("authoring"))!=KMessageBox::Continue) {
cancelled=true;
}
@@ -331,7 +331,7 @@ void k9BurnDVD::burnWithGrowisofs() {
/** No descriptions */
void k9BurnDVD::growisoStderr(KProcess *proc, char *buffer, int buflen) {
- TQString c=TQString::fromLatin1( buffer,buflen);// (proc->readStderr());
+ TQString c=TQString::tqfromLatin1( buffer,buflen);// (proc->readStderr());
char s[255];
int a,b;
int pos;
@@ -346,7 +346,7 @@ void k9BurnDVD::growisoStderr(KProcess *proc, char *buffer, int buflen) {
}
progress->setTitle(i18n("Burning DVD"));
- progress->setLabelText(i18n("Current write speed :%1 x").arg(burnSpeed));
+ progress->setLabelText(i18n("Current write speed :%1 x").tqarg(burnSpeed));
if (c.contains("% done")) {
pos=c.find("%");
if (pos!=-1) {
@@ -371,7 +371,7 @@ void k9BurnDVD::growisoStderr(KProcess *proc, char *buffer, int buflen) {
}
}
void k9BurnDVD::growisoStdout(KProcess *proc, char *buffer, int buflen) {
- TQString c=TQString::fromLatin1( buffer,buflen);// (proc->readStdout());
+ TQString c=TQString::tqfromLatin1( buffer,buflen);// (proc->readStdout());
int pos;
pos=c.find("STAT");
if (pos!=-1) {
diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp
index 99333e8..736407f 100644
--- a/libk9copy/k9cellcopylist.cpp
+++ b/libk9copy/k9cellcopylist.cpp
@@ -294,10 +294,10 @@ double k9CellCopyList::getMinFactor(bool _withMenus) {
double totalSize=gettotalSize()+menuSize - (fforced) -m_inbytes;
totalSize/=2.50;
-qDebug(TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").arg(totalSize).arg(gettotalSize()).arg(menuSize).arg(fforced).arg(m_frcinbytes).arg(m_inbytes));
+qDebug(TQString("totalSize(%1)=gettotalSize()(%2)+menuSize(%3) -(fforced(%4))-m_inbytes(%6)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes));
double minFactor=(fforced-m_frcinbytes) /(MaxSize- (totalSize +m_outbytes) - m_frcoutbytes) ;
- qDebug(TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").arg(minFactor).arg(fforced).arg(m_frcinbytes).arg(MaxSize).arg(totalSize).arg(m_outbytes).arg(m_frcoutbytes));
+ qDebug(TQString("minfactor(%1)=(fforced(%2) -m_frinbytes(%3))/(MacSize(%4)-totalSize(%5)-m_outbytes(%6) - m_frcoutbytes(%7))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(m_frcoutbytes));
if (minFactor<1)
minFactor=1;
@@ -347,7 +347,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
if (dvdSize2 <0) {
factor=2.5;
- //qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").arg(dvdSize).arg(m_outbytes).arg(fforcedsh).arg(dvdSize2));
+ //qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2));
}
else {
factor=(totalSize +menuSize - fforced -m_inbytes)/ dvdSize2 ;
@@ -361,7 +361,7 @@ double k9CellCopyList::getfactor(bool _withMenus,bool _streams) {
uint64_t i=m_inbytes;
//if (o==0)
// o=1;
- //qDebug(TQString("factor : %1 realise : %2").arg(factor).arg((double)i/(double)o));
+ //qDebug(TQString("factor : %1 realise : %2").tqarg(factor).tqarg((double)i/(double)o));
if (factor<=1)
factor=1;
diff --git a/libk9copy/k9drawimage.cpp b/libk9copy/k9drawimage.cpp
index a4d7cce..25593c5 100644
--- a/libk9copy/k9drawimage.cpp
+++ b/libk9copy/k9drawimage.cpp
@@ -24,12 +24,12 @@ k9DrawImage::~k9DrawImage()
void k9DrawImage::setImage(const TQImage &_image){
m_pixmap =_image;
- repaint();
+ tqrepaint();
}
void k9DrawImage::setImage(TQString _fileName) {
m_pixmap.load(_fileName);
- repaint();
+ tqrepaint();
}
void k9DrawImage::paintEvent ( TQPaintEvent * ) {
diff --git a/libk9copy/k9dvd.cpp b/libk9copy/k9dvd.cpp
index 34bece4..c9beed3 100755
--- a/libk9copy/k9dvd.cpp
+++ b/libk9copy/k9dvd.cpp
@@ -150,7 +150,7 @@ k9DVD::k9DVD(TQObject *parent, const char *name,const TQStringList args) {
m_lsubpType.append(i18n("reserved"));
m_lsubpType.append(i18n("Director's comments"));
m_lsubpType.append(i18n("Large director's comments"));
- m_lsubpType.append(i18n("Director's comments for children"));
+ m_lsubpType.append(i18n("Director's comments for tqchildren"));
m_frames_per_s[0]=-1.0;
@@ -187,7 +187,7 @@ int k9DVD::get_title_name(const char* dvd_device, char* title) {
int i;
TQString c;
if (! (filehandle = fopen(dvd_device, "r"))) {
- c=i18n("Couldn't open %1 for title\n").arg(dvd_device);
+ c=i18n("Couldn't open %1 for title\n").tqarg(dvd_device);
// setError(c );
strcpy(title, i18n("unknown").latin1());
return -1;
@@ -195,7 +195,7 @@ int k9DVD::get_title_name(const char* dvd_device, char* title) {
if ( fseek(filehandle, 32808, SEEK_SET )) {
fclose(filehandle);
- c=i18n("Couldn't seek in %1 for title\n").arg( dvd_device);
+ c=i18n("Couldn't seek in %1 for title\n").tqarg( dvd_device);
setError(c);
strcpy(title, i18n("unknown").latin1());
return -1;
@@ -330,7 +330,7 @@ int k9DVD::scandvd (const TQString & device,bool _quickScan) {
/*
ret = stat(device.latin1(), &dvd_stat);
if ( ret < 0 ) {
- c=i18n("Can't find device %1\n").arg( device);
+ c=i18n("Can't find device %1\n").tqarg( device);
setError(c);
return 1;
}
@@ -340,7 +340,7 @@ int k9DVD::scandvd (const TQString & device,bool _quickScan) {
m_dvd.close();
m_dvd.openDevice(device);
if( !m_dvd.opened() ) {
- c=i18n("Can't open disc %1!\n").arg(device);
+ c=i18n("Can't open disc %1!\n").tqarg(device);
setError(c);
return 2;
}
@@ -393,8 +393,8 @@ int k9DVD::scandvd (const TQString & device,bool _quickScan) {
m_titleCount++;
vts_ttn = ttn;//ifo->vts_ptt_srpt->title[j].ptt[0].pgcn; //ifo_zero->tt_srpt->title[j].vts_ttn;
- //JMPtxt=i18n("Title %1").arg(indexedCount);
- txt=i18n("Title %1").arg(numTitle);
+ //JMPtxt=i18n("Title %1").tqarg(indexedCount);
+ txt=i18n("Title %1").tqarg(numTitle);
emit sigTotalText (txt);
emit sigTitleProgress(numTitle,ltitles);
video_attr = &vtsi_mat->vts_video_attr;
@@ -691,7 +691,7 @@ k9DVDTitle* k9DVD::addTitle(k9DVDTitleset *_titleset,int id,int num,int _VTS,int
}
if (bappend)
m_titles.append(track);
- track->name=i18n("Title %1").arg(num);
+ track->name=i18n("Title %1").tqarg(num);
if (!_indexed) {
for (uint i=0;i<m_titles.count();i++) {
@@ -859,7 +859,7 @@ long k9DVD::stream_vob( int title, unsigned long startblock, unsigned long lastb
TQString c;
dvdfile =m_dvd.openTitle( title);
if( !dvdfile ) {
- c=i18n("Error opening vobs for title %1\n").arg( title);
+ c=i18n("Error opening vobs for title %1\n").tqarg( title);
setError(c);
return 0;
}
@@ -870,7 +870,7 @@ long k9DVD::stream_vob( int title, unsigned long startblock, unsigned long lastb
emit sigVobProgress(i-startblock,lastblock-startblock);
total+=size;
if( !size ) {
- c=i18n("ERROR reading block %1\n").arg(i);
+ c=i18n("ERROR reading block %1\n").tqarg(i);
setError(c);
break;
}
diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp
index 5896075..b35f063 100755
--- a/libk9copy/k9dvdauthor.cpp
+++ b/libk9copy/k9dvdauthor.cpp
@@ -145,7 +145,7 @@ void k9DVDAuthor::addMenus(TQDomElement &titleSet) {
error=true;
TQString sMsg;
//sMsg.TQString::sprintf(tr2i18n("'%s' not selected"),l_track->getname().latin1());
- sMsg=i18n("'%1' not selected").arg(l_track->getname());
+ sMsg=i18n("'%1' not selected").tqarg(l_track->getname());
KMessageBox::error( 0,sMsg, tr2i18n("authoring"));
}
start.sprintf("jump titleset %d menu;",DVD->getnewTitleNum(l_track));
@@ -222,10 +222,10 @@ void k9DVDAuthor::addTitle(TQDomElement &root, k9DVDTitle *title) {
TQString txtcmd;
if (audio !=-1) {
txtcmd="subtitle=%1;\n audio=%2;\n g1=0;jump title 1;";
- txtcmd=txtcmd.arg(subtitle+63).arg(audio);
+ txtcmd=txtcmd.tqarg(subtitle+63).tqarg(audio);
} else {
txtcmd="subtitle=%1;\n g1=0;jump title 1;";
- txtcmd=txtcmd.arg(subtitle+63);
+ txtcmd=txtcmd.tqarg(subtitle+63);
}
precmd.setNodeValue(txtcmd);
@@ -339,23 +339,23 @@ void k9DVDAuthor::addTitle(TQDomElement &root, k9DVDTitle *title) {
for (k9ChapterCell *cell =l_chap->cells.first();cell ;cell =l_chap->cells.next() ) {
icell++;
- sCell = TQString("--cell %1").arg(icell);
- sChapter=TQString("--chapter %1").arg(numPart);
+ sCell = TQString("--cell %1").tqarg(icell);
+ sChapter=TQString("--chapter %1").tqarg(numPart);
//test
uint32_t itotSize = (cell->getlastSector()-cell->getstartSector())* DVD_VIDEO_LB_LEN;
TQString file;
e=xml->createElement("vob");
file=TQString("k9copy --play --input %1 --dvdtitle %2 %3 %4 %5 %6 --vampsfactor %7 --inputsize %8 --chaptersize %9 ")
- .arg(DVD->getDevice())
- .arg(title->getnumTitle())
- .arg(sChapter)
- .arg(sCell)
- .arg(caud)
- .arg(csub)
- .arg(titleFactor,0,'f',2)
- .arg(itotSize,0,'f',0)
- .arg(chapterSize,0,'f',0);
+ .tqarg(DVD->getDevice())
+ .tqarg(title->getnumTitle())
+ .tqarg(sChapter)
+ .tqarg(sCell)
+ .tqarg(caud)
+ .tqarg(csub)
+ .tqarg(titleFactor,0,'f',2)
+ .tqarg(itotSize,0,'f',0)
+ .tqarg(chapterSize,0,'f',0);
if (m_firsttitle) {
file +=" --initstatus ";
m_firsttitle=false;
@@ -364,9 +364,9 @@ void k9DVDAuthor::addTitle(TQDomElement &root, k9DVDTitle *title) {
file +=" --ffactor ";
}
file +=TQString(" --inject %1 --totalsize %2 --dvdsize %3 |")
- .arg(inject)
- .arg(m_totalSize -m_forced ,0,'f',0)
- .arg(((uint64_t)k9DVDSize::getMaxSize() *1024 *1024) - m_forcedsh,0,'f',0);
+ .tqarg(inject)
+ .tqarg(m_totalSize -m_forced ,0,'f',0)
+ .tqarg(((uint64_t)k9DVDSize::getMaxSize() *1024 *1024) - m_forcedsh,0,'f',0);
e.setAttribute("file",file);
if (first)
@@ -387,7 +387,7 @@ void k9DVDAuthor::addTitle(TQDomElement &root, k9DVDTitle *title) {
c.sprintf("g1=%d;\ncall vmgm menu;",DVD->getnewTitleNum(l_next));
if( DVD->getnewTitleNum(l_next)==-1) {
error=true;
- c=i18n("'%1' not selected").arg(l_next->getname());
+ c=i18n("'%1' not selected").tqarg(l_next->getname());
KMessageBox::error( 0, c, tr2i18n("authoring"));
}
@@ -411,7 +411,7 @@ void k9DVDAuthor::setworkDir( const TQString& _newVal) {
void k9DVDAuthor::author() {
if ( ! k9Tools::checkProgram("dvdauthor")) {
- KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").arg("dvdauthor") , i18n("authoring"));
+ KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").tqarg("dvdauthor") , i18n("authoring"));
error = TRUE;
return;
}
@@ -491,7 +491,7 @@ void k9DVDAuthor::author() {
void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
//TQString m_stderr(proc->readStderr());
- TQString m_stderr=TQString::fromLatin1(buffer, buflen);
+ TQString m_stderr=TQString::tqfromLatin1(buffer, buflen);
float m_percent;
TQString m_remain;
@@ -505,7 +505,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
// m_copied+=totalBytes - m_lastPos;
m_copied=totalBytes;
m_lastPos=totalBytes;
- //qDebug(TQString("copied : %1 totalSize : %2").arg(m_copied).arg(m_totalSize*512));
+ //qDebug(TQString("copied : %1 totalSize : %2").tqarg(m_copied).tqarg(m_totalSize*512));
m_percent=(float)m_copied / (float)(m_totalSize/DVD_VIDEO_LB_LEN );
@@ -558,7 +558,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) {
}
void k9DVDAuthor::DVDAuthorStdout(KProcess *proc, char *buffer, int buflen) {
- TQString c=TQString::fromLatin1( buffer,buflen);
+ TQString c=TQString::tqfromLatin1( buffer,buflen);
//(proc->readStdout());
int pos;
pos=c.find("STAT");
diff --git a/libk9copy/k9dvdbackup.cpp b/libk9copy/k9dvdbackup.cpp
index c1ef777..a365efb 100755
--- a/libk9copy/k9dvdbackup.cpp
+++ b/libk9copy/k9dvdbackup.cpp
@@ -280,13 +280,13 @@ void k9DVDBackup::copyEmptyPgc(int _vts,k9Cell *_cell) {
k9DVDFile *dvdfile;
if ((dvdfile = m_dvdread->openTitle( _vts))== 0) {
TQString stmp;
- stmp=i18n("Unable to open titleset %1").arg(_vts);
+ stmp=i18n("Unable to open titleset %1").tqarg(_vts);
seterror(stmp);
return ;
}
backupDlg->setTotalSteps(vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs -1);
TQString c;
- c=i18n("Extracting titleset %1").arg(_vts);
+ c=i18n("Extracting titleset %1").tqarg(_vts);
backupDlg->setProgressLabel(c);
backupDlg->show();
@@ -458,7 +458,7 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) {
k9DVDFile *dvdfile;
if ((dvdfile = m_dvdread->openMenu( _vts))== 0) {
TQString stmp;
- stmp=i18n("Unable to open menu for titleset %1").arg(_vts);
+ stmp=i18n("Unable to open menu for titleset %1").tqarg(_vts);
seterror (stmp);
return 0;
}
@@ -484,7 +484,7 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) {
uint32_t sector, dsi_next_vobu = 0;
uint32_t imax=length/sizeof(cell_adr_t);
TQString c;
- c=i18n("Extracting menu for titleset %1").arg(_vts);
+ c=i18n("Extracting menu for titleset %1").tqarg(_vts);
backupDlg->setProgressLabel(c);
backupDlg->show();
@@ -502,7 +502,7 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) {
nbCells++;
}
//else
- //qDebug() << TQString("cell start sector (%1) exceed menu size (%2)").arg((ptr+i)->start_sector).arg(menuLastSector);
+ //qDebug() << TQString("cell start sector (%1) exceed menu size (%2)").tqarg((ptr+i)->start_sector).tqarg(menuLastSector);
}
cadr.sort();
vamps->reset();
@@ -577,7 +577,7 @@ void k9DVDBackup::playCell (int vts_num, k9Cell *_cell,bool _empty) {
vts_handle=currTS->ifoTitle->getIFO();
if (!vts_handle) {
TQString stmp;
- stmp=i18n("Unable to open ifo file for titleset %1").arg(vts_num);
+ stmp=i18n("Unable to open ifo file for titleset %1").tqarg(vts_num);
seterror (stmp);
//JMP vamps->setNoData();
return;
@@ -585,7 +585,7 @@ void k9DVDBackup::playCell (int vts_num, k9Cell *_cell,bool _empty) {
backupDlg->setTotalSteps( vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs -1);
TQString c;
- c=i18n("Extracting titleset %1").arg(vts_num);
+ c=i18n("Extracting titleset %1").tqarg(vts_num);
backupDlg->setProgressLabel(c);
backupDlg->show();
} else {
@@ -599,7 +599,7 @@ void k9DVDBackup::playCell (int vts_num, k9Cell *_cell,bool _empty) {
dvdfile = m_dvdread->openTitle (vts_num);
if (! dvdfile) {
TQString stmp;
- stmp=i18n("Unable to open vobs for titleset %1").arg(vts_num);
+ stmp=i18n("Unable to open vobs for titleset %1").tqarg(vts_num);
seterror( stmp);
//JMP vamps->setNoData();
return;
@@ -1395,7 +1395,7 @@ void k9DVDBackup::updateVob(k9CellList *cellLst) {
sName="VIDEO_TS.VOB";
else
sName.sprintf("VTS_%02d_%d.VOB",(int)currVTS,(int)VobNum);
- dbg=i18n("Updating vob %1").arg(sName);
+ dbg=i18n("Updating vob %1").tqarg(sName);
sName=output+"/"+sName;
TQFileInfo finfo(sName);
long fileSize=finfo.size();
diff --git a/libk9copy/k9dvdread.cpp b/libk9copy/k9dvdread.cpp
index 5d18420..54f1ad7 100644
--- a/libk9copy/k9dvdread.cpp
+++ b/libk9copy/k9dvdread.cpp
@@ -68,7 +68,7 @@ uchar ID[17];
TQString id="";
if (DVDDiscID(m_dvd,ID) !=-1) {
ID[16]=0;
- id=TQString::fromLatin1((const char*)ID);
+ id=TQString::tqfromLatin1((const char*)ID);
}
return id;
}
diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp
index f121564..a4b7fef 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 layout to get
+ /* NOTE: I've had to change the structure from the disk tqlayout to get
* the packing to work with Sun's Forte C compiler. */
/* pci hli btni */
diff --git a/libk9copy/k9mp4dlg.cpp b/libk9copy/k9mp4dlg.cpp
index 000ef2f..30dc6b9 100644
--- a/libk9copy/k9mp4dlg.cpp
+++ b/libk9copy/k9mp4dlg.cpp
@@ -16,7 +16,7 @@
#include <kprogress.h>
#include <tqpainter.h>
#include <kstandarddirs.h>
-#include <layout.h>
+#include <tqlayout.h>
#include "k9drawimage.h"
diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp
index fc606af..a59c37f 100644
--- a/libk9copy/k9mp4enc.cpp
+++ b/libk9copy/k9mp4enc.cpp
@@ -274,7 +274,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
if ( ext!="" )
ext="."+ext;
path=m_filename.left ( m_filename.length()-ext.length() );
- //path=TQString("%1-chapter%2-cell%3%4").arg(path).arg(ichapterCells.key()).arg(ichapterCells.value()).arg(ext);
+ //path=TQString("%1-chapter%2-cell%3%4").tqarg(path).tqarg(ichapterCells.key()).tqarg(ichapterCells.value()).tqarg(ext);
path=TQString ( "%1-chapter%2%3" ).arg ( path ).arg ( ichapterCells.key() ).arg ( ext );
++ichapterCells;
}
@@ -312,9 +312,9 @@ void k9MP4Enc::execute ( k9DVDTitle *_title )
//*m_process << "-ovc" << sVOption;
/* int pos=sVOption.find("-vf");
if (pos==-1)
- *m_process <<"-vf" << TQString("scale=%1:%2").arg(m_width).arg(m_height);
+ *m_process <<"-vf" << TQString("scale=%1:%2").tqarg(m_width).tqarg(m_height);
else
- sVOption=sVOption.insert(pos+4,TQString("scale=%1:%2,").arg(m_width).arg(m_height));
+ sVOption=sVOption.insert(pos+4,TQString("scale=%1:%2,").tqarg(m_width).tqarg(m_height));
*/
*m_process << sVOption;
@@ -503,7 +503,7 @@ void k9MP4Enc::getStdout ( KProcess *, char *buffer, int buflen )
void k9MP4Enc::getStderr ( KProcess *proc, char *buffer, int buflen )
{
- //m_stderr=TQString::fromLatin1(buffer,buflen);
+ //m_stderr=TQString::tqfromLatin1(buffer,buflen);
TQCString cstderr ( buffer,buflen+1 );
if ( cstderr.find ( "FATAL:" ) !=-1 )
diff --git a/libk9copy/k9processlist.cpp b/libk9copy/k9processlist.cpp
index e39cf7b..baa7af5 100644
--- a/libk9copy/k9processlist.cpp
+++ b/libk9copy/k9processlist.cpp
@@ -147,7 +147,7 @@ void k9ProcessList::setPos(k9Process *_process,double _pos) {
}
k9Process *k9ProcessList::addProcess(const TQString &label) {
- TQString name=TQString("process%1").arg(m_items.count()) ;
+ TQString name=TQString("process%1").tqarg(m_items.count()) ;
k9Process *process=new k9Process(TQT_TQOBJECT(this),name.latin1());
m_processes.append(process);
TQListViewItem *item = new _k9ProcessListItem(lProcess,label);
diff --git a/libk9copy/k9progress.cpp b/libk9copy/k9progress.cpp
index 76763b9..6a29fd5 100644
--- a/libk9copy/k9progress.cpp
+++ b/libk9copy/k9progress.cpp
@@ -20,7 +20,7 @@
#include <tqpainter.h>
#include <kstandarddirs.h>
#include <tqmovie.h>
-#include <layout.h>
+#include <tqlayout.h>
diff --git a/libk9copy/mp4dlg.cpp b/libk9copy/mp4dlg.cpp
index a2a4dea..59f0571 100644
--- a/libk9copy/mp4dlg.cpp
+++ b/libk9copy/mp4dlg.cpp
@@ -15,7 +15,7 @@
#include <kprogress.h>
#include <tqframe.h>
#include <kpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "kprogress.h"
@@ -34,7 +34,7 @@ MP4Dlg::MP4Dlg( TQWidget* parent, const char* name, WFlags fl )
MP4DlgLayout = new TQGridLayout( this, 1, 1, 11, 6, "MP4DlgLayout");
lblTitle = new TQLabel( this, "lblTitle" );
- lblTitle->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)4, 0, 0, lblTitle->sizePolicy().hasHeightForWidth() ) );
+ lblTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)4, 0, 0, lblTitle->sizePolicy().hasHeightForWidth() ) );
TQFont lblTitle_font( lblTitle->font() );
lblTitle_font.setBold( TRUE );
lblTitle->setFont( lblTitle_font );
@@ -48,7 +48,7 @@ MP4Dlg::MP4Dlg( TQWidget* parent, const char* name, WFlags fl )
MP4DlgLayout->addMultiCellWidget( pbProgress, 3, 3, 0, 2 );
frame3 = new TQFrame( this, "frame3" );
- frame3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) );
+ frame3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) );
frame3->setCursor( TQCursor( 3 ) );
frame3->setFrameShape( TQFrame::NoFrame );
frame3->setFrameShadow( TQFrame::Raised );
@@ -56,13 +56,13 @@ MP4Dlg::MP4Dlg( TQWidget* parent, const char* name, WFlags fl )
lblfps = new TQLabel( frame3, "lblfps" );
lblfps->setCursor( TQCursor( 3 ) );
- lblfps->setAlignment( int( TQLabel::AlignVCenter ) );
+ lblfps->tqsetAlignment( int( TQLabel::AlignVCenter ) );
frame3Layout->addWidget( lblfps, 2, 1 );
lblRemain = new TQLabel( frame3, "lblRemain" );
lblRemain->setCursor( TQCursor( 3 ) );
- lblRemain->setAlignment( int( TQLabel::AlignVCenter ) );
+ lblRemain->tqsetAlignment( int( TQLabel::AlignVCenter ) );
frame3Layout->addWidget( lblRemain, 3, 1 );
@@ -99,7 +99,7 @@ MP4Dlg::MP4Dlg( TQWidget* parent, const char* name, WFlags fl )
MP4DlgLayout->addMultiCellWidget( frame3, 2, 2, 0, 2 );
bCancel = new KPushButton( this, "bCancel" );
- bCancel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) );
+ bCancel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) );
bCancel->setCursor( TQCursor( 0 ) );
bCancel->setProperty( "stdItem", 26 );
@@ -110,7 +110,7 @@ MP4Dlg::MP4Dlg( TQWidget* parent, const char* name, WFlags fl )
MP4DlgLayout->addItem( spacer2, 4, 1 );
image = new TQLabel( this, "image" );
- image->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, image->sizePolicy().hasHeightForWidth() ) );
+ image->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, image->sizePolicy().hasHeightForWidth() ) );
image->setMinimumSize( TQSize( 0, 250 ) );
image->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) );
image->setCursor( TQCursor( 3 ) );
@@ -118,7 +118,7 @@ MP4Dlg::MP4Dlg( TQWidget* parent, const char* name, WFlags fl )
MP4DlgLayout->addMultiCellWidget( image, 1, 1, 0, 2 );
languageChange();
- resize( TQSize(416, 475).expandedTo(minimumSizeHint()) );
+ resize( TQSize(416, 475).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/libk9copy/mp4dlg.ui b/libk9copy/mp4dlg.ui
index f46c4e9..a5e124b 100644
--- a/libk9copy/mp4dlg.ui
+++ b/libk9copy/mp4dlg.ui
@@ -89,7 +89,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter</set>
</property>
</widget>
@@ -103,7 +103,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter</set>
</property>
</widget>
@@ -204,7 +204,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>225</width>
<height>21</height>
@@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -240,7 +240,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>250</height>
diff --git a/libk9copy/processList.cpp b/libk9copy/processList.cpp
index 92b6255..35551c1 100644
--- a/libk9copy/processList.cpp
+++ b/libk9copy/processList.cpp
@@ -13,7 +13,7 @@
#include <tqheader.h>
#include <tqlistview.h>
#include <kpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "kpushbutton.h"
@@ -37,14 +37,14 @@ processList::processList( TQWidget* parent, const char* name, WFlags fl )
processListLayout->addMultiCellWidget( lProcess, 0, 0, 0, 1 );
bCancel = new KPushButton( this, "bCancel" );
- bCancel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) );
+ bCancel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) );
bCancel->setProperty( "stdItem", 2 );
processListLayout->addWidget( bCancel, 1, 1 );
spacer1 = new TQSpacerItem( 361, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
processListLayout->addItem( spacer1, 1, 0 );
languageChange();
- resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
+ resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/libk9copy/processList.ui b/libk9copy/processList.ui
index 0eaa9c0..8468f7b 100644
--- a/libk9copy/processList.ui
+++ b/libk9copy/processList.ui
@@ -89,7 +89,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>361</width>
<height>20</height>
diff --git a/libk9copy/progress.cpp b/libk9copy/progress.cpp
index f7111fd..e71faf9 100644
--- a/libk9copy/progress.cpp
+++ b/libk9copy/progress.cpp
@@ -13,7 +13,7 @@
#include <tqlabel.h>
#include <kpushbutton.h>
#include <kprogress.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
#include "kpushbutton.h"
@@ -28,14 +28,14 @@ Progress::Progress( TQWidget* parent, const char* name, WFlags fl )
{
if ( !name )
setName( "Progress" );
- setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) );
setMinimumSize( TQSize( 0, 0 ) );
setCursor( TQCursor( 3 ) );
setMouseTracking( FALSE );
ProgressLayout = new TQGridLayout( this, 1, 1, 11, 6, "ProgressLayout");
lblTitle = new TQLabel( this, "lblTitle" );
- lblTitle->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblTitle->sizePolicy().hasHeightForWidth() ) );
+ lblTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblTitle->sizePolicy().hasHeightForWidth() ) );
TQFont lblTitle_font( lblTitle->font() );
lblTitle_font.setBold( TRUE );
lblTitle->setFont( lblTitle_font );
@@ -44,7 +44,7 @@ Progress::Progress( TQWidget* parent, const char* name, WFlags fl )
ProgressLayout->addMultiCellWidget( lblTitle, 0, 0, 0, 2 );
bCancel = new KPushButton( this, "bCancel" );
- bCancel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) );
+ bCancel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) );
bCancel->setCursor( TQCursor( 0 ) );
bCancel->setProperty( "stdItem", 26 );
@@ -60,38 +60,38 @@ Progress::Progress( TQWidget* parent, const char* name, WFlags fl )
ProgressLayout->addItem( spacer2, 5, 1 );
image = new TQLabel( this, "image" );
- image->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, image->sizePolicy().hasHeightForWidth() ) );
+ image->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, image->sizePolicy().hasHeightForWidth() ) );
image->setMinimumSize( TQSize( 0, 250 ) );
image->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) );
image->setFrameShape( TQLabel::NoFrame );
image->setFrameShadow( TQLabel::Plain );
- image->setAlignment( int( TQLabel::AlignCenter ) );
+ image->tqsetAlignment( int( TQLabel::AlignCenter ) );
ProgressLayout->addMultiCellWidget( image, 1, 1, 0, 2 );
textLabel1 = new TQLabel( this, "textLabel1" );
- textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
textLabel1->setCursor( TQCursor( 3 ) );
ProgressLayout->addWidget( textLabel1, 2, 0 );
lblElapsed = new TQLabel( this, "lblElapsed" );
- lblElapsed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblElapsed->sizePolicy().hasHeightForWidth() ) );
+ lblElapsed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblElapsed->sizePolicy().hasHeightForWidth() ) );
lblElapsed->setCursor( TQCursor( 3 ) );
ProgressLayout->addMultiCellWidget( lblElapsed, 2, 2, 1, 2 );
LabelText = new TQLabel( this, "LabelText" );
- LabelText->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, LabelText->sizePolicy().hasHeightForWidth() ) );
+ LabelText->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, LabelText->sizePolicy().hasHeightForWidth() ) );
TQFont LabelText_font( LabelText->font() );
LabelText_font.setItalic( TRUE );
LabelText->setFont( LabelText_font );
LabelText->setCursor( TQCursor( 3 ) );
- LabelText->setAlignment( int( TQLabel::AlignVCenter ) );
+ LabelText->tqsetAlignment( int( TQLabel::AlignVCenter ) );
ProgressLayout->addMultiCellWidget( LabelText, 3, 3, 0, 2 );
languageChange();
- resize( TQSize(473, 467).expandedTo(minimumSizeHint()) );
+ resize( TQSize(473, 467).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/libk9copy/progress.ui b/libk9copy/progress.ui
index 789860c..91ca0de 100644
--- a/libk9copy/progress.ui
+++ b/libk9copy/progress.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -92,7 +92,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>161</width>
<height>21</height>
@@ -117,7 +117,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -136,7 +136,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>250</height>
@@ -155,7 +155,7 @@
<property name="frameShadow">
<enum>Plain</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -220,7 +220,7 @@
<property name="text">
<string></string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter</set>
</property>
</widget>
diff --git a/src/configDlg.cpp b/src/configDlg.cpp
index 96be045..3a70e80 100644
--- a/src/configDlg.cpp
+++ b/src/configDlg.cpp
@@ -12,7 +12,7 @@
#include <tqvariant.h>
#include <tqtable.h>
#include <kpushbutton.h>
-#include <layout.h>
+#include <tqlayout.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" );
- setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ tqsetSizePolicy( 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 );
- layout4 = new TQVBoxLayout( 0, 0, 6, "layout4");
+ tqlayout4 = new TQVBoxLayout( 0, 0, 6, "tqlayout4");
bAdd = new KPushButton( this, "bAdd" );
- bAdd->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) );
+ bAdd->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) );
bAdd->setProperty( "stdItem", 27 );
- layout4->addWidget( bAdd );
+ tqlayout4->addWidget( bAdd );
bRemove = new KPushButton( this, "bRemove" );
- bRemove->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bRemove->sizePolicy().hasHeightForWidth() ) );
+ bRemove->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bRemove->sizePolicy().hasHeightForWidth() ) );
bRemove->setProperty( "stdItem", 28 );
- layout4->addWidget( bRemove );
+ tqlayout4->addWidget( bRemove );
- configDlgLayout->addLayout( layout4, 1, 1 );
+ configDlgLayout->addLayout( tqlayout4, 1, 1 );
languageChange();
- resize( TQSize(578, 342).expandedTo(minimumSizeHint()) );
+ resize( TQSize(578, 342).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/configDlg.ui b/src/configDlg.ui
index c02dfe1..62f037f 100644
--- a/src/configDlg.ui
+++ b/src/configDlg.ui
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>190</height>
@@ -114,7 +114,7 @@
</widget>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<vbox>
<property name="name">
diff --git a/src/k9main.cpp b/src/k9main.cpp
index 1c9590b..e8cb4fa 100644
--- a/src/k9main.cpp
+++ b/src/k9main.cpp
@@ -35,7 +35,7 @@
#include "k9titleencopt.h"
#include <kselect.h>
#include <kcombobox.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.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.").arg(m_prefOutput).arg(m_prefSize),i18n("DVD Copy"))==KMessageBox::Cancel)
+ 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)
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").arg(i+1);
+ c=i18n("Titleset %1").tqarg(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").arg(++ch));
- it->setText(1,i18n("%1 MB").arg((double)(_title->getChapter(i)->getsectors()) /512));
+ it->setText(0,i18n("chapter %1").tqarg(++ch));
+ it->setText(1,i18n("%1 MB").tqarg((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").arg(++ch));
+ it->setText(0,i18n("chapter %1").tqarg(++ch));
it->streamType=CHAP;
it->obj=title2->getChapter(i);
- it->setText(1,i18n("%1 MB").arg((double)(title2->getChapter(i)->getsectors()) /512));
+ it->setText(1,i18n("%1 MB").tqarg((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 ").arg(track->getformat());
+ c=i18n("video %1 ").tqarg(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 ").arg(i+1);
+ c=i18n("audio %1 ").tqarg(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").arg(l_auds->getsize_mb());
+ c=i18n("%1 MB").tqarg(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 ").arg(i+1);
+ c=i18n("subpicture %1 ").tqarg(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").arg(l_sub->getsize_mb());
+ c=i18n("%1 MB").tqarg(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").arg(t->getname()) ,sbMessage);
+ changeStatusbar( i18n("Transcoding title : %1").tqarg(t->getname()) ,sbMessage);
if (t->isSelected() && t->getIndexed() )
{
diff --git a/src/k9mainw.cpp b/src/k9mainw.cpp
index be1202b..24a9552 100644
--- a/src/k9mainw.cpp
+++ b/src/k9mainw.cpp
@@ -18,7 +18,7 @@
#include <kcombobox.h>
#include <tqcombobox.h>
#include <kpushbutton.h>
-#include <layout.h>
+#include <tqlayout.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" );
- setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblInput_2->sizePolicy().hasHeightForWidth() ) );
+ lblInput_2->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblInput->sizePolicy().hasHeightForWidth() ) );
+ lblInput->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)4, 0, 0, factor->sizePolicy().hasHeightForWidth() ) );
+ factor->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, listView1->sizePolicy().hasHeightForWidth() ) );
+ listView1->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) );
+ textLabel2_2->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbBurnSpeed->sizePolicy().hasHeightForWidth() ) );
+ cbBurnSpeed->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1_3->sizePolicy().hasHeightForWidth() ) );
+ textLabel1_3->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbInputDev->sizePolicy().hasHeightForWidth() ) );
+ cbInputDev->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbInputDev->sizePolicy().hasHeightForWidth() ) );
cbInputDev->setEditable( TRUE );
cbInputDev->setAutoCompletion( TRUE );
MainDlgLayout->addWidget( cbInputDev, 0, 1 );
- layout2 = new TQHBoxLayout( 0, 0, 6, "layout2");
+ tqlayout2 = new TQHBoxLayout( 0, 0, 6, "tqlayout2");
bInputOpenDir = new KPushButton( this, "bInputOpenDir" );
- bInputOpenDir->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpenDir->sizePolicy().hasHeightForWidth() ) );
+ bInputOpenDir->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpenDir->sizePolicy().hasHeightForWidth() ) );
bInputOpenDir->setMinimumSize( TQSize( 22, 22 ) );
bInputOpenDir->setMaximumSize( TQSize( 22, 22 ) );
- layout2->addWidget( bInputOpenDir );
+ tqlayout2->addWidget( bInputOpenDir );
bInputOpen = new KPushButton( this, "bInputOpen" );
- bInputOpen->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpen->sizePolicy().hasHeightForWidth() ) );
+ bInputOpen->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpen->sizePolicy().hasHeightForWidth() ) );
bInputOpen->setMinimumSize( TQSize( 22, 22 ) );
bInputOpen->setMaximumSize( TQSize( 22, 22 ) );
- layout2->addWidget( bInputOpen );
+ tqlayout2->addWidget( bInputOpen );
spacer5_2 = new TQSpacerItem( 50, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- layout2->addItem( spacer5_2 );
+ tqlayout2->addItem( spacer5_2 );
- MainDlgLayout->addMultiCellLayout( layout2, 0, 0, 2, 4 );
+ MainDlgLayout->addMultiCellLayout( tqlayout2, 0, 0, 2, 4 );
cbOutputDev = new TQComboBox( FALSE, this, "cbOutputDev" );
- cbOutputDev->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbOutputDev->sizePolicy().hasHeightForWidth() ) );
+ cbOutputDev->tqsetSizePolicy( 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(minimumSizeHint()) );
+ resize( TQSize(743, 585).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/k9mainw.ui b/src/k9mainw.ui
index 35ed354..1e6e0be 100644
--- a/src/k9mainw.ui
+++ b/src/k9mainw.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>200</height>
@@ -97,7 +97,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>15</height>
@@ -172,7 +172,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<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>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -276,13 +276,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -307,13 +307,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -336,7 +336,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>50</width>
<height>21</height>
diff --git a/src/k9mainwsov.ui b/src/k9mainwsov.ui
index 8580ee6..e4e82fc 100644
--- a/src/k9mainwsov.ui
+++ b/src/k9mainwsov.ui
@@ -189,7 +189,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>15</height>
@@ -260,7 +260,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<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>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<hbox>
<property name="name">
@@ -297,13 +297,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -325,13 +325,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -351,7 +351,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>50</width>
<height>21</height>
diff --git a/src/k9mencodercmdgen.cpp b/src/k9mencodercmdgen.cpp
index 26d0cf5..941f37d 100644
--- a/src/k9mencodercmdgen.cpp
+++ b/src/k9mencodercmdgen.cpp
@@ -24,7 +24,7 @@
#include <tqwidgetstack.h>
#include <klocale.h>
#include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.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").arg(m_row++) );
+ TQCheckBox *ckLabel=new TQCheckBox(sName,m_grid,TQString("ck%1").tqarg(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").arg(m_row++) );
+ TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(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").arg(m_row++));
+ KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,parent,TQString("int%1").tqarg(m_row++));
if (iMax <1000)
sb->setFixedWidth(50);
else
@@ -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").arg(m_row++));
+ TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++));
ckLabel->setChecked(bSel);
if ( !_eOpt.attributeNode("description").isNull()) {
TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
@@ -317,7 +317,7 @@ void k9MencoderCmdGen::addFloat(TQDomElement _eOpt) {
if (!_eOpt.attributeNode("precision").isNull()) {
iPrecision=_eOpt.attributeNode("precision").value().toInt();
}
- KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,parent,TQString("float%1").arg(m_row++));
+ KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,parent,TQString("float%1").tqarg(m_row++));
if (dMax <1000)
sb->setFixedWidth(80);
else
@@ -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").arg(m_row++));
+ TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++));
if ( !_eOpt.attributeNode("description").isNull()) {
TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
@@ -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").arg(m_row++));
+ TQCheckBox *ckLabel=new TQCheckBox(sName,parent,TQString("ck%1").tqarg(m_row++));
ckLabel->setChecked(bSel);
if ( !_eOpt.attributeNode("description").isNull()) {
TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value());
@@ -387,7 +387,7 @@ void k9MencoderCmdGen::addString(TQDomElement _eOpt) {
}
_eOpt.setAttribute("checkbox",ckLabel->name());
- TQComboBox *cb=new TQComboBox(parent,TQString("string%1").arg(m_row++));
+ TQComboBox *cb=new TQComboBox(parent,TQString("string%1").tqarg(m_row++));
TQDomNodeList values=_eOpt.elementsByTagName("value");
int def=0;
diff --git a/src/k9mencodercmdgen.h b/src/k9mencodercmdgen.h
index 074fe3d..37ae9cd 100644
--- a/src/k9mencodercmdgen.h
+++ b/src/k9mencodercmdgen.h
@@ -17,7 +17,7 @@
#include <tqscrollview.h>
#include <tqgrid.h>
#include <tqdom.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlistview.h>
#include <tqhbox.h>
class _k9CheckListItem;
diff --git a/src/k9play.cpp b/src/k9play.cpp
index 36aaeb2..08dff4b 100644
--- a/src/k9play.cpp
+++ b/src/k9play.cpp
@@ -27,23 +27,23 @@
#include <ktempfile.h>
#include <kstandarddirs.h>
-void k9play::saveStatus(k9play_st _status) {
+void k9play::savetqStatus(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").arg(_status.title).arg(_status.chapter).arg(_status.cell).arg(_status.sector).arg(_status.bytesWritten).arg(_status.bytesRead).arg(_status.bytesSkipped));
+ 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));
}
-void k9play::readStatus(k9play_st &_status) {
+void k9play::readtqStatus(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").arg(_status.title).arg(_status.chapter).arg(_status.cell).arg(_status.sector).arg(_status.bytesWritten).arg(_status.bytesRead).arg(_status.bytesSkipped).arg(_status.bytesChapters));
+ 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));
}
@@ -143,7 +143,7 @@ void k9play::setcell(TQString _value) {
m_cell=_value.toUInt();
}
-void k9play::setinitStatus(bool _value) {
+void k9play::setinittqStatus(bool _value) {
m_initstatus=_value;
}
@@ -234,7 +234,7 @@ void k9play::play() {
if (m_initstatus)
memset(&status,0,sizeof(k9play_st));
else {
- readStatus( status);
+ readtqStatus( 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").arg(factor).arg(m_totalSize).arg(status.bytesRead +status.bytesSkipped).arg(m_dvdSize).arg(status.bytesWritten) );
+ 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) );
vamps.setVapFactor(factor);
} else {
vamps.setVapFactor(m_vampsFactor);
- kdebug(TQString("vamps factor %1\n").arg(m_vampsFactor));
+ kdebug(TQString("vamps factor %1\n").tqarg(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").arg(dvdnav_err_to_string(dvdnav)));
+ writeOutput( TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").tqarg(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").arg(dvdnav_err_to_string(dvdnav)));
+ writeOutput( TQString("ERR:Error on setting languages: %1\n").tqarg(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").arg(dvdnav_err_to_string(dvdnav)));
+ writeOutput(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").tqarg(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").arg(dvdnav_err_to_string(dvdnav)));
+ writeOutput(TQString("ERR:Error getting next block: %1\n").tqarg(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").arg((status.bytesRead+status.bytesSkipped)/2048).arg(m_endSector));
+ kdebug(TQString("pos >m_endSector %1 %2").tqarg((status.bytesRead+status.bytesSkipped)/2048).tqarg(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").arg(ptt));
+ kdebug( TQString("skipping chapter %1").tqarg(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").arg(m_startSector));
+ kdebug (TQString("repositionning on %1").tqarg(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").arg((status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN).arg(lgr));
+ writeOutput(TQString("\rINFOPOS: %1 %2").tqarg((status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN).tqarg(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)
- saveStatus( status);
+ savetqStatus( 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").arg(m_pos).arg(m_length));
+ writeOutput(TQString("\rINFOPOS: %1 %2").tqarg(m_pos).tqarg(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 21d39dc..c291151 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 saveStatus(k9play_st _status);
- void readStatus(k9play_st &_status);
+ void savetqStatus(k9play_st _status);
+ void readtqStatus(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 setinitStatus(bool _value);
+ void setinittqStatus(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 1831e09..a4f197d 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").arg(title->getaudioStream(i)->getID()).arg(title->getaudioStream(i)->getlanguage()));
+ cbDefAudio->insertItem( TQString("%1 - %2").tqarg(title->getaudioStream(i)->getID()).tqarg(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").arg(title->getsubtitle(i)->getID().first()).arg(title->getsubtitle(i)->getlanguage()));
+ cbDefSub->insertItem(TQString("%1 - %2").tqarg(title->getsubtitle(i)->getID().first()).tqarg(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 6a34ae5..0bf4d21 100644
--- a/src/k9prefmencoder.cpp
+++ b/src/k9prefmencoder.cpp
@@ -13,7 +13,7 @@
#include "k9prefmencoder.h"
#include <tqlistbox.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include "k9mencodercmdgen.h"
#include <kpushbutton.h>
#include <kiconloader.h>
diff --git a/src/k9settings.cpp b/src/k9settings.cpp
index 6646e46..f3507aa 100644
--- a/src/k9settings.cpp
+++ b/src/k9settings.cpp
@@ -16,7 +16,7 @@
#include <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <layout.h>
+#include <tqlayout.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 0789de1..fbbf337 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").arg(m_current->getfactor(),4,'f',2));
+ tFactor->setText(TQString("%1").tqarg(m_current->getfactor(),4,'f',2));
else
- tFactor->setText(TQString("%1").arg(getFactor(),4,'f',2));
+ tFactor->setText(TQString("%1").tqarg(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")).arg(m_current->getname()));
+ lbTitle->setText(TQString(i18n("Shrink Factor for %1")).tqarg(m_current->getname()));
if (m_current->getforceFactor()) {
slFactor->setValue(m_current->getfactor()*100.0);
- tFactor->setText(TQString("%1").arg(m_current->getfactor(),4,'f',2));
+ tFactor->setText(TQString("%1").tqarg(m_current->getfactor(),4,'f',2));
setMinFactor();
} else {
slFactor->setValue(getFactor()*100.0);
- tFactor->setText(TQString("%1").arg(getFactor(),4,'f',2));
+ tFactor->setText(TQString("%1").tqarg(getFactor(),4,'f',2));
slFactor->setMinValue(100);
}
diff --git a/src/kviewmpeg2.cpp b/src/kviewmpeg2.cpp
index 00e2758..20ca88e 100755
--- a/src/kviewmpeg2.cpp
+++ b/src/kviewmpeg2.cpp
@@ -26,7 +26,7 @@
#include <tqslider.h>
#include <tqapplication.h>
#include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.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);
- repaint(FALSE);
+ tqrepaint(FALSE);
}
void k9Widget::paintEvent( TQPaintEvent *_event) {
diff --git a/src/langselectw.cpp b/src/langselectw.cpp
index 555367e..283bde1 100644
--- a/src/langselectw.cpp
+++ b/src/langselectw.cpp
@@ -12,7 +12,7 @@
#include <tqvariant.h>
#include <tqheader.h>
#include <tqlistview.h>
-#include <layout.h>
+#include <tqlayout.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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)7, 0, 0, lvLanguages->sizePolicy().hasHeightForWidth() ) );
+ lvLanguages->tqsetSizePolicy( 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(minimumSizeHint()) );
+ resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
}
diff --git a/src/langselectw.ui b/src/langselectw.ui
index 474dca7..352d52e 100644
--- a/src/langselectw.ui
+++ b/src/langselectw.ui
@@ -48,7 +48,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>208</width>
<height>0</height>
diff --git a/src/main.cpp b/src/main.cpp
index f5ee876..ee375b4 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.setinitStatus( args->isSet("initstatus"));
+ player.setinittqStatus( 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 62235a4..bd9addd 100644
--- a/src/mencoderCmdGen.cpp
+++ b/src/mencoderCmdGen.cpp
@@ -15,7 +15,7 @@
#include <tqlistview.h>
#include <tqwidgetstack.h>
#include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listView->sizePolicy().hasHeightForWidth() ) );
+ listView->tqsetSizePolicy( 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(minimumSizeHint()) );
+ resize( TQSize(655, 498).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/mencoderCmdGen.ui b/src/mencoderCmdGen.ui
index 3cc749b..6d18a21 100644
--- a/src/mencoderCmdGen.ui
+++ b/src/mencoderCmdGen.ui
@@ -46,7 +46,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -159,7 +159,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>200</width>
<height>0</height>
diff --git a/src/playbackoptionsw.cpp b/src/playbackoptionsw.cpp
index 3ea783a..56b0f43 100644
--- a/src/playbackoptionsw.cpp
+++ b/src/playbackoptionsw.cpp
@@ -17,7 +17,7 @@
#include <kpushbutton.h>
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, frPlayback->sizePolicy().hasHeightForWidth() ) );
+ frPlayback->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, lbSequence->sizePolicy().hasHeightForWidth() ) );
+ lbSequence->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bSeqUp->sizePolicy().hasHeightForWidth() ) );
+ bSeqUp->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bSeqDown->sizePolicy().hasHeightForWidth() ) );
+ bSeqDown->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) );
+ textLabel4->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) );
+ frame4->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ textLabel1->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, cbDefSub->sizePolicy().hasHeightForWidth() ) );
+ cbDefSub->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, cbDefSub->sizePolicy().hasHeightForWidth() ) );
frame4Layout->addWidget( cbDefSub, 2, 2 );
textLabel3 = new TQLabel( frame4, "textLabel3" );
- textLabel3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel3->sizePolicy().hasHeightForWidth() ) );
+ textLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel3->sizePolicy().hasHeightForWidth() ) );
frame4Layout->addWidget( textLabel3, 2, 0 );
cbDefAudio = new TQComboBox( FALSE, frame4, "cbDefAudio" );
- cbDefAudio->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, cbDefAudio->sizePolicy().hasHeightForWidth() ) );
+ cbDefAudio->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel2_3->sizePolicy().hasHeightForWidth() ) );
+ textLabel2_3->tqsetSizePolicy( 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(minimumSizeHint()) );
+ resize( TQSize(328, 491).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/playbackoptionsw.ui b/src/playbackoptionsw.ui
index d30fb3e..19ebae5 100644
--- a/src/playbackoptionsw.ui
+++ b/src/playbackoptionsw.ui
@@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>31</height>
@@ -109,13 +109,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>21</width>
<height>21</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>21</width>
<height>21</height>
@@ -137,13 +137,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>21</width>
<height>21</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>21</width>
<height>21</height>
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -203,7 +203,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>211</width>
<height>100</height>
@@ -314,7 +314,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>21</height>
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>280</height>
diff --git a/src/prefAuthor.cpp b/src/prefAuthor.cpp
index 9038248..56f3657 100644
--- a/src/prefAuthor.cpp
+++ b/src/prefAuthor.cpp
@@ -17,7 +17,7 @@
#include <knuminput.h>
#include <kpushbutton.h>
#include <kcolorbutton.h>
-#include <layout.h>
+#include <tqlayout.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->layout()->setSpacing( 6 );
- groupBox1->layout()->setMargin( 11 );
- groupBox1Layout = new TQGridLayout( groupBox1->layout() );
- groupBox1Layout->setAlignment( TQt::AlignTop );
+ groupBox1->tqlayout()->setSpacing( 6 );
+ groupBox1->tqlayout()->setMargin( 11 );
+ groupBox1Layout = new TQGridLayout( groupBox1->tqlayout() );
+ groupBox1Layout->tqsetAlignment( 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->layout()->setSpacing( 6 );
- groupBox2->layout()->setMargin( 11 );
- groupBox2Layout = new TQGridLayout( groupBox2->layout() );
- groupBox2Layout->setAlignment( TQt::AlignTop );
+ groupBox2->tqlayout()->setSpacing( 6 );
+ groupBox2->tqlayout()->setMargin( 11 );
+ groupBox2Layout = new TQGridLayout( groupBox2->tqlayout() );
+ groupBox2Layout->tqsetAlignment( 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(minimumSizeHint()) );
+ resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/prefAuthor.ui b/src/prefAuthor.ui
index 0633a84..c108b20 100644
--- a/src/prefAuthor.ui
+++ b/src/prefAuthor.ui
@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>151</width>
<height>21</height>
@@ -110,7 +110,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>121</width>
<height>31</height>
diff --git a/src/prefDVD.cpp b/src/prefDVD.cpp
index 8b56e23..555c835 100644
--- a/src/prefDVD.cpp
+++ b/src/prefDVD.cpp
@@ -14,7 +14,7 @@
#include <kurlrequester.h>
#include <tqcheckbox.h>
#include <tqspinbox.h>
-#include <layout.h>
+#include <tqlayout.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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblworkDir->sizePolicy().hasHeightForWidth() ) );
+ lblworkDir->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblworkDir->sizePolicy().hasHeightForWidth() ) );
prefDVDLayout->addWidget( lblworkDir, 0, 0 );
urOutput = new KURLRequester( this, "urOutput" );
- urOutput->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, urOutput->sizePolicy().hasHeightForWidth() ) );
+ urOutput->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ckAutoBurn->sizePolicy().hasHeightForWidth() ) );
+ ckAutoBurn->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbSize->sizePolicy().hasHeightForWidth() ) );
+ sbSize->tqsetSizePolicy( 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(minimumSizeHint()) );
+ resize( TQSize(600, 347).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
}
diff --git a/src/prefDVD.ui b/src/prefDVD.ui
index 07e904f..4b113b6 100644
--- a/src/prefDVD.ui
+++ b/src/prefDVD.ui
@@ -98,7 +98,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>80</width>
<height>0</height>
@@ -135,7 +135,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>110</height>
diff --git a/src/prefMPEG4.cpp b/src/prefMPEG4.cpp
index 2a5e367..6b4c858 100644
--- a/src/prefMPEG4.cpp
+++ b/src/prefMPEG4.cpp
@@ -19,7 +19,7 @@
#include <tqspinbox.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
-#include <layout.h>
+#include <tqlayout.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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4Codec->sizePolicy().hasHeightForWidth() ) );
+ cbMp4Codec->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, leMp4Width->sizePolicy().hasHeightForWidth() ) );
+ leMp4Width->tqsetSizePolicy( 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->setAlignment( int( TQLineEdit::AlignAuto ) );
+ leMp4Width->tqsetAlignment( int( TQLineEdit::AlignAuto ) );
tabVideoLayout->addWidget( leMp4Width, 1, 1 );
ckMp4AspectRatio = new TQCheckBox( tabVideo, "ckMp4AspectRatio" );
- ckMp4AspectRatio->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, ckMp4AspectRatio->sizePolicy().hasHeightForWidth() ) );
+ ckMp4AspectRatio->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4Height->sizePolicy().hasHeightForWidth() ) );
+ leMp4Height->tqsetSizePolicy( 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->setAlignment( int( TQLineEdit::AlignAuto ) );
+ leMp4Height->tqsetAlignment( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4NumberCD->sizePolicy().hasHeightForWidth() ) );
+ sbMp4NumberCD->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ textLabel1->tqsetSizePolicy( 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->layout()->setSpacing( 6 );
- buttonGroup1->layout()->setMargin( 2 );
- buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() );
- buttonGroup1Layout->setAlignment( TQt::AlignTop );
+ buttonGroup1->tqlayout()->setSpacing( 6 );
+ buttonGroup1->tqlayout()->setMargin( 2 );
+ buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() );
+ buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
rbSize = new TQRadioButton( buttonGroup1, "rbSize" );
buttonGroup1Layout->addWidget( rbSize, 0, 0 );
sbMp4Size = new TQSpinBox( buttonGroup1, "sbMp4Size" );
- sbMp4Size->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4Size->sizePolicy().hasHeightForWidth() ) );
+ sbMp4Size->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, leMp4VideoBitrate->sizePolicy().hasHeightForWidth() ) );
+ leMp4VideoBitrate->tqsetSizePolicy( 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::fromLatin1("") );
+ tabWidget->insertTab( tabVideo, TQString::tqfromLatin1("") );
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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4AudioCodec->sizePolicy().hasHeightForWidth() ) );
+ cbMp4AudioCodec->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4AudioBitrate->sizePolicy().hasHeightForWidth() ) );
+ leMp4AudioBitrate->tqsetSizePolicy( 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->setAlignment( int( TQLineEdit::AlignAuto ) );
+ leMp4AudioBitrate->tqsetAlignment( 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::fromLatin1("") );
+ tabWidget->insertTab( tabAudio, TQString::tqfromLatin1("") );
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(minimumSizeHint()) );
+ resize( TQSize(582, 460).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/prefMPEG4.ui b/src/prefMPEG4.ui
index 3259bb8..7f8116a 100644
--- a/src/prefMPEG4.ui
+++ b/src/prefMPEG4.ui
@@ -134,13 +134,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>70</width>
<height>32767</height>
@@ -152,7 +152,7 @@
<property name="maxLength">
<number>4</number>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignAuto</set>
</property>
<property name="inputMask">
@@ -191,7 +191,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>380</width>
<height>21</height>
@@ -213,13 +213,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>70</width>
<height>32767</height>
@@ -228,7 +228,7 @@
<property name="maxLength">
<number>4</number>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignAuto</set>
</property>
<property name="inputMask">
@@ -245,7 +245,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>110</height>
@@ -327,7 +327,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>80</width>
<height>0</height>
@@ -373,7 +373,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>51</width>
<height>20</height>
@@ -405,7 +405,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>130</width>
<height>21</height>
@@ -491,13 +491,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>70</width>
<height>32767</height>
@@ -509,7 +509,7 @@
<property name="maxLength">
<number>3</number>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignAuto</set>
</property>
</widget>
@@ -523,7 +523,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>376</width>
<height>20</height>
@@ -559,7 +559,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>61</height>
diff --git a/src/prefMencoder.cpp b/src/prefMencoder.cpp
index d4d9c0e..fa9a857 100644
--- a/src/prefMencoder.cpp
+++ b/src/prefMencoder.cpp
@@ -15,9 +15,9 @@
#include <tqtabwidget.h>
#include <tqlistbox.h>
#include <kpushbutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.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");
- layout2 = new TQGridLayout( 0, 1, 1, 0, 6, "layout2");
+ tqlayout2 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout2");
textLabel2 = new TQLabel( this, "textLabel2" );
- textLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) );
+ textLabel2->tqsetSizePolicy( 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 );
- layout2->addWidget( textLabel2, 0, 0 );
+ tqlayout2->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() ) );
+ textLabel2_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) );
- layout2->addWidget( textLabel2_2, 0, 1 );
+ tqlayout2->addWidget( textLabel2_2, 0, 1 );
- prefMencoderLayout->addLayout( layout2, 2, 0 );
+ prefMencoderLayout->addLayout( tqlayout2, 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnDeleteV->sizePolicy().hasHeightForWidth() ) );
+ btnDeleteV->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnAddV->sizePolicy().hasHeightForWidth() ) );
+ btnAddV->tqsetSizePolicy( 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 );
- layout9 = new TQGridLayout( 0, 1, 1, 0, 6, "layout9");
+ tqlayout9 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout9");
teOpt2 = new TQTextEdit( tab, "teOpt2" );
teOpt2->setEnabled( TRUE );
- layout9->addMultiCellWidget( teOpt2, 0, 1, 0, 0 );
+ tqlayout9->addMultiCellWidget( teOpt2, 0, 1, 0, 0 );
spacer5 = new TQSpacerItem( 20, 81, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
- layout9->addItem( spacer5, 1, 1 );
+ tqlayout9->addItem( spacer5, 1, 1 );
btnOpt2 = new KPushButton( tab, "btnOpt2" );
btnOpt2->setMinimumSize( TQSize( 22, 22 ) );
btnOpt2->setMaximumSize( TQSize( 22, 22 ) );
- layout9->addWidget( btnOpt2, 0, 1 );
+ tqlayout9->addWidget( btnOpt2, 0, 1 );
- tabLayout->addLayout( layout9, 3, 3 );
+ tabLayout->addLayout( tqlayout9, 3, 3 );
- layout10 = new TQGridLayout( 0, 1, 1, 0, 6, "layout10");
+ tqlayout10 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout10");
teOpt3 = new TQTextEdit( tab, "teOpt3" );
teOpt3->setEnabled( TRUE );
- layout10->addMultiCellWidget( teOpt3, 0, 1, 0, 0 );
+ tqlayout10->addMultiCellWidget( teOpt3, 0, 1, 0, 0 );
btnOpt3 = new KPushButton( tab, "btnOpt3" );
btnOpt3->setMinimumSize( TQSize( 22, 22 ) );
btnOpt3->setMaximumSize( TQSize( 22, 22 ) );
- layout10->addWidget( btnOpt3, 0, 1 );
+ tqlayout10->addWidget( btnOpt3, 0, 1 );
spacer6 = new TQSpacerItem( 20, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
- layout10->addItem( spacer6, 1, 1 );
+ tqlayout10->addItem( spacer6, 1, 1 );
- tabLayout->addMultiCellLayout( layout10, 4, 5, 3, 3 );
+ tabLayout->addMultiCellLayout( tqlayout10, 4, 5, 3, 3 );
textLabel1_2 = new TQLabel( tab, "textLabel1_2" );
tabLayout->addWidget( textLabel1_2, 2, 2 );
- layout8 = new TQGridLayout( 0, 1, 1, 0, 6, "layout8");
+ tqlayout8 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout8");
spacer4 = new TQSpacerItem( 20, 90, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
- layout8->addItem( spacer4, 1, 1 );
+ tqlayout8->addItem( spacer4, 1, 1 );
teOpt1 = new TQTextEdit( tab, "teOpt1" );
teOpt1->setEnabled( TRUE );
teOpt1->setWordWrap( TQTextEdit::WidgetWidth );
- layout8->addMultiCellWidget( teOpt1, 0, 1, 0, 0 );
+ tqlayout8->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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnOpt1->sizePolicy().hasHeightForWidth() ) );
btnOpt1->setMinimumSize( TQSize( 22, 22 ) );
btnOpt1->setMaximumSize( TQSize( 22, 22 ) );
- layout8->addWidget( btnOpt1, 0, 1 );
+ tqlayout8->addWidget( btnOpt1, 0, 1 );
- tabLayout->addLayout( layout8, 2, 3 );
+ tabLayout->addLayout( tqlayout8, 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::fromLatin1("") );
+ tabWidget2->insertTab( tab, TQString::tqfromLatin1("") );
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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnDeleteA->sizePolicy().hasHeightForWidth() ) );
+ btnDeleteA->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnAddA->sizePolicy().hasHeightForWidth() ) );
+ btnAddA->tqsetSizePolicy( 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 );
- layout11 = new TQGridLayout( 0, 1, 1, 0, 6, "layout11");
+ tqlayout11 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout11");
teOptA = new TQTextEdit( tab_2, "teOptA" );
- layout11->addMultiCellWidget( teOptA, 0, 1, 0, 0 );
+ tqlayout11->addMultiCellWidget( teOptA, 0, 1, 0, 0 );
spacer4_2 = new TQSpacerItem( 20, 78, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
- layout11->addItem( spacer4_2, 1, 1 );
+ tqlayout11->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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnOptA->sizePolicy().hasHeightForWidth() ) );
btnOptA->setMinimumSize( TQSize( 22, 22 ) );
btnOptA->setMaximumSize( TQSize( 22, 22 ) );
- layout11->addWidget( btnOptA, 0, 1 );
+ tqlayout11->addWidget( btnOptA, 0, 1 );
- tabLayout_2->addMultiCellLayout( layout11, 1, 2, 3, 3 );
+ tabLayout_2->addMultiCellLayout( tqlayout11, 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() ) );
+ textLabel1_2_2_2->tqsetSizePolicy( 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::fromLatin1("") );
+ tabWidget2->insertTab( tab_2, TQString::tqfromLatin1("") );
prefMencoderLayout->addMultiCellWidget( tabWidget2, 0, 0, 0, 2 );
textLabel1 = new TQLabel( this, "textLabel1" );
- textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) );
+ textLabel1->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bReset->sizePolicy().hasHeightForWidth() ) );
+ bReset->tqsetSizePolicy( 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(minimumSizeHint()) );
+ resize( TQSize(672, 587).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/prefMencoder.ui b/src/prefMencoder.ui
index 1d4bbf9..1cab214 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>layout2</cstring>
+ <cstring>tqlayout2</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>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<grid>
<property name="name">
@@ -272,7 +272,7 @@ audio bitrate</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>81</height>
@@ -283,13 +283,13 @@ audio bitrate</string>
<property name="name">
<cstring>btnOpt2</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<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>layout10</cstring>
+ <cstring>tqlayout10</cstring>
</property>
<grid>
<property name="name">
@@ -321,13 +321,13 @@ audio bitrate</string>
<property name="name">
<cstring>btnOpt3</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -347,7 +347,7 @@ audio bitrate</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<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>layout8</cstring>
+ <cstring>tqlayout8</cstring>
</property>
<grid>
<property name="name">
@@ -382,7 +382,7 @@ audio bitrate</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -415,13 +415,13 @@ audio bitrate</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<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>layout11</cstring>
+ <cstring>tqlayout11</cstring>
</property>
<grid>
<property name="name">
@@ -548,7 +548,7 @@ audio bitrate</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>78</height>
@@ -567,13 +567,13 @@ audio bitrate</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>22</width>
<height>22</height>
@@ -651,7 +651,7 @@ audio bitrate</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>121</width>
<height>21</height>
diff --git a/src/prefpreview.cpp b/src/prefpreview.cpp
index c93d50a..872d86e 100644
--- a/src/prefpreview.cpp
+++ b/src/prefpreview.cpp
@@ -17,7 +17,7 @@
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) );
+ buttonGroup1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) );
buttonGroup1->setFrameShape( TQButtonGroup::NoFrame );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
- buttonGroup1->layout()->setSpacing( 6 );
- buttonGroup1->layout()->setMargin( 11 );
- buttonGroup1Layout = new TQGridLayout( buttonGroup1->layout() );
- buttonGroup1Layout->setAlignment( TQt::AlignTop );
+ buttonGroup1->tqlayout()->setSpacing( 6 );
+ buttonGroup1->tqlayout()->setMargin( 11 );
+ buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() );
+ buttonGroup1Layout->tqsetAlignment( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, wsOptions->sizePolicy().hasHeightForWidth() ) );
+ wsOptions->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) );
+ textLabel4->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbAout->sizePolicy().hasHeightForWidth() ) );
+ cbAout->tqsetSizePolicy( 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(minimumSizeHint()) );
+ resize( TQSize(536, 470).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/prefpreview.ui b/src/prefpreview.ui
index 9230508..ebef4fc 100644
--- a/src/prefpreview.ui
+++ b/src/prefpreview.ui
@@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>210</height>
@@ -148,7 +148,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -255,7 +255,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>81</width>
<height>21</height>
@@ -272,7 +272,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>21</height>
@@ -305,7 +305,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>230</width>
<height>21</height>
diff --git a/src/titlefactor.cpp b/src/titlefactor.cpp
index d4c6b33..774551e 100644
--- a/src/titlefactor.cpp
+++ b/src/titlefactor.cpp
@@ -14,7 +14,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
#include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gbTitle->sizePolicy().hasHeightForWidth() ) );
- gbTitle->setAlignment( int( TQGroupBox::AlignVCenter ) );
+ gbTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gbTitle->sizePolicy().hasHeightForWidth() ) );
+ gbTitle->tqsetAlignment( int( TQGroupBox::AlignVCenter ) );
gbTitle->setFlat( FALSE );
gbTitle->setCheckable( TRUE );
gbTitle->setChecked( FALSE );
gbTitle->setColumnLayout(0, Qt::Vertical );
- gbTitle->layout()->setSpacing( 1 );
- gbTitle->layout()->setMargin( 6 );
- gbTitleLayout = new TQGridLayout( gbTitle->layout() );
- gbTitleLayout->setAlignment( TQt::AlignTop );
+ gbTitle->tqlayout()->setSpacing( 1 );
+ gbTitle->tqlayout()->setMargin( 6 );
+ gbTitleLayout = new TQGridLayout( gbTitle->tqlayout() );
+ gbTitleLayout->tqsetAlignment( 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(minimumSizeHint()) );
+ resize( TQSize(551, 115).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/titlefactor.ui b/src/titlefactor.ui
index 7d4f3e3..d7e804d 100644
--- a/src/titlefactor.ui
+++ b/src/titlefactor.ui
@@ -53,7 +53,7 @@
<property name="title">
<string>Change Factor</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignVCenter</set>
</property>
<property name="flat">
@@ -115,7 +115,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/src/viewmpeg2.cpp b/src/viewmpeg2.cpp
index 72a9f6f..2313976 100644
--- a/src/viewmpeg2.cpp
+++ b/src/viewmpeg2.cpp
@@ -15,7 +15,7 @@
#include <tqtoolbutton.h>
#include <tqslider.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.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" );
- setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame7->sizePolicy().hasHeightForWidth() ) );
+ frame7->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) );
+ bStop->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) );
+ bPlay->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)2, (TQSizePolicy::SizeType)2, 0, 0, label->sizePolicy().hasHeightForWidth() ) );
+ label->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)2, (TQSizePolicy::SizeType)2, 0, 0, label->sizePolicy().hasHeightForWidth() ) );
ViewMPEG2Layout->addWidget( label, 0, 0 );
languageChange();
- resize( TQSize(320, 320).expandedTo(minimumSizeHint()) );
+ resize( TQSize(320, 320).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/viewmpeg2.ui b/src/viewmpeg2.ui
index 93566ac..bdc4436 100755
--- a/src/viewmpeg2.ui
+++ b/src/viewmpeg2.ui
@@ -57,7 +57,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize">
+ <property name="tqmaximumSize">
<size>
<width>32767</width>
<height>50</height>