diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:29:54 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-15 15:29:54 -0600 |
commit | b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8 (patch) | |
tree | 9beca7fe1a592f5f49be1e0bb4d03f0dfc1829c7 /libk9copy | |
parent | 23c5272c1c49acf0906f7c97a524333705f7be46 (diff) | |
download | k9copy-b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.tar.gz k9copy-b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.zip |
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'libk9copy')
-rw-r--r-- | libk9copy/backupdlg.cpp | 38 | ||||
-rw-r--r-- | libk9copy/backupdlg.ui | 18 | ||||
-rw-r--r-- | libk9copy/dvdprogress.cpp | 30 | ||||
-rwxr-xr-x | libk9copy/dvdprogress.ui | 10 | ||||
-rw-r--r-- | libk9copy/k9backupdlg.cpp | 2 | ||||
-rw-r--r-- | libk9copy/k9burndvd.cpp | 24 | ||||
-rw-r--r-- | libk9copy/k9cellcopylist.cpp | 8 | ||||
-rw-r--r-- | libk9copy/k9drawimage.cpp | 4 | ||||
-rwxr-xr-x | libk9copy/k9dvd.cpp | 20 | ||||
-rwxr-xr-x | libk9copy/k9dvdauthor.cpp | 44 | ||||
-rwxr-xr-x | libk9copy/k9dvdbackup.cpp | 18 | ||||
-rw-r--r-- | libk9copy/k9dvdread.cpp | 2 | ||||
-rw-r--r-- | libk9copy/k9ifo2.cpp | 2 | ||||
-rw-r--r-- | libk9copy/k9mp4dlg.cpp | 2 | ||||
-rw-r--r-- | libk9copy/k9mp4enc.cpp | 8 | ||||
-rw-r--r-- | libk9copy/k9processlist.cpp | 2 | ||||
-rw-r--r-- | libk9copy/k9progress.cpp | 2 | ||||
-rw-r--r-- | libk9copy/mp4dlg.cpp | 16 | ||||
-rw-r--r-- | libk9copy/mp4dlg.ui | 10 | ||||
-rw-r--r-- | libk9copy/processList.cpp | 6 | ||||
-rw-r--r-- | libk9copy/processList.ui | 2 | ||||
-rw-r--r-- | libk9copy/progress.cpp | 22 | ||||
-rw-r--r-- | libk9copy/progress.ui | 12 |
23 files changed, 151 insertions, 151 deletions
diff --git a/libk9copy/backupdlg.cpp b/libk9copy/backupdlg.cpp index e760dfa..065b050 100644 --- a/libk9copy/backupdlg.cpp +++ b/libk9copy/backupdlg.cpp @@ -15,7 +15,7 @@ #include <tqprogressbar.h> #include <kpushbutton.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.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" ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); textLabel1->setCursor( TQCursor( 3 ) ); textLabel1->setFrameShape( TQLabel::NoFrame ); textLabel1->setFrameShadow( TQLabel::Raised ); backupDlgLayout->addMultiCellWidget( textLabel1, 0, 0, 0, 3 ); - tqlayout3 = new TQVBoxLayout( 0, 0, 6, "tqlayout3"); + layout3 = new TQVBoxLayout( 0, 0, 6, "layout3"); lblStep = new TQLabel( this, "lblStep" ); - lblStep->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblStep->sizePolicy().hasHeightForWidth() ) ); + lblStep->setSizePolicy( 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 ) ); - tqlayout3->addWidget( lblStep ); + layout3->addWidget( lblStep ); pbStep = new TQProgressBar( this, "pbStep" ); pbStep->setCursor( TQCursor( 3 ) ); - tqlayout3->addWidget( pbStep ); + layout3->addWidget( pbStep ); pbTotal = new TQProgressBar( this, "pbTotal" ); pbTotal->setCursor( TQCursor( 3 ) ); pbTotal->setMargin( 0 ); pbTotal->setTotalSteps( 4400 ); pbTotal->setPercentageVisible( TRUE ); - tqlayout3->addWidget( pbTotal ); + layout3->addWidget( pbTotal ); - backupDlgLayout->addMultiCellLayout( tqlayout3, 3, 3, 0, 3 ); + backupDlgLayout->addMultiCellLayout( layout3, 3, 3, 0, 3 ); textLabel1_2 = new TQLabel( this, "textLabel1_2" ); - textLabel1_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) ); + textLabel1_2->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblTime->sizePolicy().hasHeightForWidth() ) ); + lblTime->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblTime->sizePolicy().hasHeightForWidth() ) ); lblTime->setCursor( TQCursor( 3 ) ); backupDlgLayout->addWidget( lblTime, 2, 1 ); - tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); + layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); spacer1 = new TQSpacerItem( 131, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout1->addItem( spacer1 ); + layout1->addItem( spacer1 ); bAbort = new KPushButton( this, "bAbort" ); - bAbort->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAbort->sizePolicy().hasHeightForWidth() ) ); + bAbort->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAbort->sizePolicy().hasHeightForWidth() ) ); bAbort->setCursor( TQCursor( 0 ) ); bAbort->setProperty( "stdItem", 26 ); - tqlayout1->addWidget( bAbort ); + layout1->addWidget( bAbort ); - backupDlgLayout->addMultiCellLayout( tqlayout1, 4, 4, 0, 3 ); + backupDlgLayout->addMultiCellLayout( layout1, 4, 4, 0, 3 ); lblFactor = new TQLabel( this, "lblFactor" ); lblFactor->setCursor( TQCursor( 3 ) ); @@ -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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) ); + bPlay->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, image->sizePolicy().hasHeightForWidth() ) ); + image->setSizePolicy( 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(tqminimumSizeHint()) ); + resize( TQSize(385, 425).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/libk9copy/backupdlg.ui b/libk9copy/backupdlg.ui index 6bb8af5..65eed10 100644 --- a/libk9copy/backupdlg.ui +++ b/libk9copy/backupdlg.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>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>tqlayout3</cstring> + <cstring>layout3</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>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <property name="cursor"> <cursor>3</cursor> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>131</width> <height>20</height> @@ -271,13 +271,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>25</width> <height>25</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>25</width> <height>25</height> @@ -309,7 +309,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>476</width> <height>20</height> @@ -354,7 +354,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>380</width> <height>20</height> diff --git a/libk9copy/dvdprogress.cpp b/libk9copy/dvdprogress.cpp index c48b96b..691ccfc 100644 --- a/libk9copy/dvdprogress.cpp +++ b/libk9copy/dvdprogress.cpp @@ -13,7 +13,7 @@ #include <tqpushbutton.h> #include <tqlabel.h> #include <tqprogressbar.h> -#include <tqlayout.h> +#include <layout.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" ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizePolicy( 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"); - tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); + layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); lblTotal = new TQLabel( this, "lblTotal" ); lblTotal->setCursor( TQCursor( 3 ) ); - tqlayout2->addWidget( lblTotal ); + layout2->addWidget( lblTotal ); pbTotal = new TQProgressBar( this, "pbTotal" ); pbTotal->setCursor( TQCursor( 3 ) ); pbTotal->setProgress( 100 ); pbTotal->setPercentageVisible( FALSE ); - tqlayout2->addWidget( pbTotal ); + layout2->addWidget( pbTotal ); - DVDProgressLayout->addLayout( tqlayout2, 1, 0 ); + DVDProgressLayout->addLayout( layout2, 1, 0 ); - tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1"); + layout1 = new TQVBoxLayout( 0, 0, 6, "layout1"); lblTitle = new TQLabel( this, "lblTitle" ); lblTitle->setCursor( TQCursor( 3 ) ); - tqlayout1->addWidget( lblTitle ); + layout1->addWidget( lblTitle ); pbTitle = new TQProgressBar( this, "pbTitle" ); pbTitle->setCursor( TQCursor( 3 ) ); @@ -61,16 +61,16 @@ DVDProgress::DVDProgress( TQWidget* parent, const char* name, bool modal, WFlags pbTitle->setProgress( 100 ); pbTitle->setCenterIndicator( TRUE ); pbTitle->setPercentageVisible( FALSE ); - tqlayout1->addWidget( pbTitle ); + layout1->addWidget( pbTitle ); - DVDProgressLayout->addLayout( tqlayout1, 0, 0 ); + DVDProgressLayout->addLayout( layout1, 0, 0 ); - lbltqStatus = new TQLabel( this, "lblStatus" ); - lbltqStatus->setCursor( TQCursor( 3 ) ); + lblStatus = new TQLabel( this, "lblStatus" ); + lblStatus->setCursor( TQCursor( 3 ) ); - DVDProgressLayout->addWidget( lbltqStatus, 2, 0 ); + DVDProgressLayout->addWidget( lblStatus, 2, 0 ); languageChange(); - resize( TQSize(278, 150).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(278, 150).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -91,7 +91,7 @@ void DVDProgress::languageChange() setCaption( tr2i18n( "k9Copy - DVD Analyze" ) ); lblTotal->setText( TQString() ); lblTitle->setText( TQString() ); - lbltqStatus->setText( TQString() ); + lblStatus->setText( TQString() ); } #include "dvdprogress.moc" diff --git a/libk9copy/dvdprogress.ui b/libk9copy/dvdprogress.ui index 8bb37b0..bd81a23 100755 --- a/libk9copy/dvdprogress.ui +++ b/libk9copy/dvdprogress.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>150</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>400</width> <height>150</height> @@ -44,7 +44,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <property name="cursor"> <cursor>3</cursor> @@ -82,7 +82,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <property name="cursor"> <cursor>3</cursor> @@ -126,7 +126,7 @@ </widget> <widget class="TQLabel" row="2" column="0"> <property name="name"> - <cstring>lbltqStatus</cstring> + <cstring>lblStatus</cstring> </property> <property name="cursor"> <cursor>3</cursor> diff --git a/libk9copy/k9backupdlg.cpp b/libk9copy/k9backupdlg.cpp index 71d2507..9095b72 100644 --- a/libk9copy/k9backupdlg.cpp +++ b/libk9copy/k9backupdlg.cpp @@ -31,7 +31,7 @@ #include <kguiitem.h> #include <tqlabel.h> #include <tqpainter.h> -#include <tqlayout.h> +#include <layout.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 b9114de..542f37d 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::tqfromLatin1( buffer,buflen);// (proc2->readStderr()); + TQString c=TQString::fromLatin1( buffer,buflen);// (proc2->readStderr()); imageSize=c.replace("\n",""); ; } void k9BurnDVD::mkisoSizeStdout(KProcess *proc, char *buffer, int buflen) { - TQString c=TQString::tqfromLatin1(buffer,buflen);// (proc2->readStdout()); + TQString c=TQString::fromLatin1(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").tqarg(m_speed); - *proc <<TQString("dev=%1").tqarg(burnDevice); - *proc <<TQString("tsize=%1s").tqarg(imageSize); + *proc << TQString("speed=%1").arg(m_speed); + *proc <<TQString("dev=%1").arg(burnDevice); + *proc <<TQString("tsize=%1s").arg(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").tqarg("genisoimage"), i18n("DVD burning") ); + KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg("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").tqarg(lastMsg) +"\n" +i18n("Insert an other DVD"); + c=i18n("An error occured while Burning DVD: %1").arg(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").tqarg(progname), i18n("DVD burning") ); + KMessageBox::error( 0, i18n("Error burning DVD :\n")+i18n("Unable to run %1").arg(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").tqarg(lastMsg) +"\n" +i18n("Insert an other DVD"); + c=i18n("An error occured while Burning DVD: %1").arg(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::tqfromLatin1( buffer,buflen);// (proc->readStderr()); + TQString c=TQString::fromLatin1( 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").tqarg(burnSpeed)); + progress->setLabelText(i18n("Current write speed :%1 x").arg(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::tqfromLatin1( buffer,buflen);// (proc->readStdout()); + TQString c=TQString::fromLatin1( buffer,buflen);// (proc->readStdout()); int pos; pos=c.find("STAT"); if (pos!=-1) { diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp index 736407f..99333e8 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)").tqarg(totalSize).tqarg(gettotalSize()).tqarg(menuSize).tqarg(fforced).tqarg(m_frcinbytes).tqarg(m_inbytes)); +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)); 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))").tqarg(minFactor).tqarg(fforced).tqarg(m_frcinbytes).tqarg(MaxSize).tqarg(totalSize).tqarg(m_outbytes).tqarg(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)); 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").tqarg(dvdSize).tqarg(m_outbytes).tqarg(fforcedsh).tqarg(dvdSize2)); + //qDebug(TQString("dvdSize (%1)- _outbytes(%2) - fforcedsh(%3)=%4").arg(dvdSize).arg(m_outbytes).arg(fforcedsh).arg(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").tqarg(factor).tqarg((double)i/(double)o)); + //qDebug(TQString("factor : %1 realise : %2").arg(factor).arg((double)i/(double)o)); if (factor<=1) factor=1; diff --git a/libk9copy/k9drawimage.cpp b/libk9copy/k9drawimage.cpp index 25593c5..a4d7cce 100644 --- a/libk9copy/k9drawimage.cpp +++ b/libk9copy/k9drawimage.cpp @@ -24,12 +24,12 @@ k9DrawImage::~k9DrawImage() void k9DrawImage::setImage(const TQImage &_image){ m_pixmap =_image; - tqrepaint(); + repaint(); } void k9DrawImage::setImage(TQString _fileName) { m_pixmap.load(_fileName); - tqrepaint(); + repaint(); } void k9DrawImage::paintEvent ( TQPaintEvent * ) { diff --git a/libk9copy/k9dvd.cpp b/libk9copy/k9dvd.cpp index c9beed3..34bece4 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 tqchildren")); + m_lsubpType.append(i18n("Director's comments for children")); 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").tqarg(dvd_device); + c=i18n("Couldn't open %1 for title\n").arg(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").tqarg( dvd_device); + c=i18n("Couldn't seek in %1 for title\n").arg( 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").tqarg( device); + c=i18n("Can't find device %1\n").arg( 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").tqarg(device); + c=i18n("Can't open disc %1!\n").arg(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").tqarg(indexedCount); - txt=i18n("Title %1").tqarg(numTitle); + //JMPtxt=i18n("Title %1").arg(indexedCount); + txt=i18n("Title %1").arg(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").tqarg(num); + track->name=i18n("Title %1").arg(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").tqarg( title); + c=i18n("Error opening vobs for title %1\n").arg( 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").tqarg(i); + c=i18n("ERROR reading block %1\n").arg(i); setError(c); break; } diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp index b35f063..5896075 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").tqarg(l_track->getname()); + sMsg=i18n("'%1' not selected").arg(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.tqarg(subtitle+63).tqarg(audio); + txtcmd=txtcmd.arg(subtitle+63).arg(audio); } else { txtcmd="subtitle=%1;\n g1=0;jump title 1;"; - txtcmd=txtcmd.tqarg(subtitle+63); + txtcmd=txtcmd.arg(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").tqarg(icell); - sChapter=TQString("--chapter %1").tqarg(numPart); + sCell = TQString("--cell %1").arg(icell); + sChapter=TQString("--chapter %1").arg(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 ") - .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); + .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); 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 |") - .tqarg(inject) - .tqarg(m_totalSize -m_forced ,0,'f',0) - .tqarg(((uint64_t)k9DVDSize::getMaxSize() *1024 *1024) - m_forcedsh,0,'f',0); + .arg(inject) + .arg(m_totalSize -m_forced ,0,'f',0) + .arg(((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").tqarg(l_next->getname()); + c=i18n("'%1' not selected").arg(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").tqarg("dvdauthor") , i18n("authoring")); + KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").arg("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::tqfromLatin1(buffer, buflen); + TQString m_stderr=TQString::fromLatin1(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").tqarg(m_copied).tqarg(m_totalSize*512)); + //qDebug(TQString("copied : %1 totalSize : %2").arg(m_copied).arg(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::tqfromLatin1( buffer,buflen); + TQString c=TQString::fromLatin1( buffer,buflen); //(proc->readStdout()); int pos; pos=c.find("STAT"); diff --git a/libk9copy/k9dvdbackup.cpp b/libk9copy/k9dvdbackup.cpp index a365efb..c1ef777 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").tqarg(_vts); + stmp=i18n("Unable to open titleset %1").arg(_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").tqarg(_vts); + c=i18n("Extracting titleset %1").arg(_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").tqarg(_vts); + stmp=i18n("Unable to open menu for titleset %1").arg(_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").tqarg(_vts); + c=i18n("Extracting menu for titleset %1").arg(_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)").tqarg((ptr+i)->start_sector).tqarg(menuLastSector); + //qDebug() << TQString("cell start sector (%1) exceed menu size (%2)").arg((ptr+i)->start_sector).arg(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").tqarg(vts_num); + stmp=i18n("Unable to open ifo file for titleset %1").arg(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").tqarg(vts_num); + c=i18n("Extracting titleset %1").arg(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").tqarg(vts_num); + stmp=i18n("Unable to open vobs for titleset %1").arg(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").tqarg(sName); + dbg=i18n("Updating vob %1").arg(sName); sName=output+"/"+sName; TQFileInfo finfo(sName); long fileSize=finfo.size(); diff --git a/libk9copy/k9dvdread.cpp b/libk9copy/k9dvdread.cpp index 54f1ad7..5d18420 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::tqfromLatin1((const char*)ID); + id=TQString::fromLatin1((const char*)ID); } return id; } diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp index a4b7fef..f121564 100644 --- a/libk9copy/k9ifo2.cpp +++ b/libk9copy/k9ifo2.cpp @@ -903,7 +903,7 @@ void k9Ifo2::navRead_PCI(pci_t *pci, uchar *buffer) { for(j = 0; j < 2; j++) B2N_32(pci->hli.btn_colit.btn_coli[i][j]); - /* NOTE: I've had to change the structure from the disk tqlayout to get + /* NOTE: I've had to change the structure from the disk layout to get * the packing to work with Sun's Forte C compiler. */ /* pci hli btni */ diff --git a/libk9copy/k9mp4dlg.cpp b/libk9copy/k9mp4dlg.cpp index 30dc6b9..000ef2f 100644 --- a/libk9copy/k9mp4dlg.cpp +++ b/libk9copy/k9mp4dlg.cpp @@ -16,7 +16,7 @@ #include <kprogress.h> #include <tqpainter.h> #include <kstandarddirs.h> -#include <tqlayout.h> +#include <layout.h> #include "k9drawimage.h" diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp index a59c37f..fc606af 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").tqarg(path).tqarg(ichapterCells.key()).tqarg(ichapterCells.value()).tqarg(ext); + //path=TQString("%1-chapter%2-cell%3%4").arg(path).arg(ichapterCells.key()).arg(ichapterCells.value()).arg(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").tqarg(m_width).tqarg(m_height); + *m_process <<"-vf" << TQString("scale=%1:%2").arg(m_width).arg(m_height); else - sVOption=sVOption.insert(pos+4,TQString("scale=%1:%2,").tqarg(m_width).tqarg(m_height)); + sVOption=sVOption.insert(pos+4,TQString("scale=%1:%2,").arg(m_width).arg(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::tqfromLatin1(buffer,buflen); + //m_stderr=TQString::fromLatin1(buffer,buflen); TQCString cstderr ( buffer,buflen+1 ); if ( cstderr.find ( "FATAL:" ) !=-1 ) diff --git a/libk9copy/k9processlist.cpp b/libk9copy/k9processlist.cpp index baa7af5..e39cf7b 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").tqarg(m_items.count()) ; + TQString name=TQString("process%1").arg(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 6a29fd5..76763b9 100644 --- a/libk9copy/k9progress.cpp +++ b/libk9copy/k9progress.cpp @@ -20,7 +20,7 @@ #include <tqpainter.h> #include <kstandarddirs.h> #include <tqmovie.h> -#include <tqlayout.h> +#include <layout.h> diff --git a/libk9copy/mp4dlg.cpp b/libk9copy/mp4dlg.cpp index 59f0571..a2a4dea 100644 --- a/libk9copy/mp4dlg.cpp +++ b/libk9copy/mp4dlg.cpp @@ -15,7 +15,7 @@ #include <kprogress.h> #include <tqframe.h> #include <kpushbutton.h> -#include <tqlayout.h> +#include <layout.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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)4, 0, 0, lblTitle->sizePolicy().hasHeightForWidth() ) ); + lblTitle->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) ); + frame3->setSizePolicy( 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->tqsetAlignment( int( TQLabel::AlignVCenter ) ); + lblfps->setAlignment( int( TQLabel::AlignVCenter ) ); frame3Layout->addWidget( lblfps, 2, 1 ); lblRemain = new TQLabel( frame3, "lblRemain" ); lblRemain->setCursor( TQCursor( 3 ) ); - lblRemain->tqsetAlignment( int( TQLabel::AlignVCenter ) ); + lblRemain->setAlignment( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) ); + bCancel->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, image->sizePolicy().hasHeightForWidth() ) ); + image->setSizePolicy( 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(tqminimumSizeHint()) ); + resize( TQSize(416, 475).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/libk9copy/mp4dlg.ui b/libk9copy/mp4dlg.ui index a5e124b..f46c4e9 100644 --- a/libk9copy/mp4dlg.ui +++ b/libk9copy/mp4dlg.ui @@ -89,7 +89,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -103,7 +103,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>225</width> <height>21</height> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -240,7 +240,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>250</height> diff --git a/libk9copy/processList.cpp b/libk9copy/processList.cpp index 35551c1..92b6255 100644 --- a/libk9copy/processList.cpp +++ b/libk9copy/processList.cpp @@ -13,7 +13,7 @@ #include <tqheader.h> #include <tqlistview.h> #include <kpushbutton.h> -#include <tqlayout.h> +#include <layout.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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) ); + bCancel->setSizePolicy( 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(tqminimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/libk9copy/processList.ui b/libk9copy/processList.ui index 8468f7b..0eaa9c0 100644 --- a/libk9copy/processList.ui +++ b/libk9copy/processList.ui @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>361</width> <height>20</height> diff --git a/libk9copy/progress.cpp b/libk9copy/progress.cpp index e71faf9..f7111fd 100644 --- a/libk9copy/progress.cpp +++ b/libk9copy/progress.cpp @@ -13,7 +13,7 @@ #include <tqlabel.h> #include <kpushbutton.h> #include <kprogress.h> -#include <tqlayout.h> +#include <layout.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" ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblTitle->sizePolicy().hasHeightForWidth() ) ); + lblTitle->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) ); + bCancel->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, image->sizePolicy().hasHeightForWidth() ) ); + image->setSizePolicy( 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->tqsetAlignment( int( TQLabel::AlignCenter ) ); + image->setAlignment( int( TQLabel::AlignCenter ) ); ProgressLayout->addMultiCellWidget( image, 1, 1, 0, 2 ); textLabel1 = new TQLabel( this, "textLabel1" ); - textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + textLabel1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); textLabel1->setCursor( TQCursor( 3 ) ); ProgressLayout->addWidget( textLabel1, 2, 0 ); lblElapsed = new TQLabel( this, "lblElapsed" ); - lblElapsed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lblElapsed->sizePolicy().hasHeightForWidth() ) ); + lblElapsed->setSizePolicy( 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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, LabelText->sizePolicy().hasHeightForWidth() ) ); + LabelText->setSizePolicy( 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->tqsetAlignment( int( TQLabel::AlignVCenter ) ); + LabelText->setAlignment( int( TQLabel::AlignVCenter ) ); ProgressLayout->addMultiCellWidget( LabelText, 3, 3, 0, 2 ); languageChange(); - resize( TQSize(473, 467).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(473, 467).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections diff --git a/libk9copy/progress.ui b/libk9copy/progress.ui index 91ca0de..789860c 100644 --- a/libk9copy/progress.ui +++ b/libk9copy/progress.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>161</width> <height>21</height> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -136,7 +136,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>250</height> @@ -155,7 +155,7 @@ <property name="frameShadow"> <enum>Plain</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -220,7 +220,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> |