diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 23:37:00 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 23:37:00 +0000 |
| commit | b0e912c8b3d02a518fedda28c3180eb4794a7520 (patch) | |
| tree | 07d344862562fab58cbe2df39d13d16f2e4d2bea /libk9copy | |
| parent | 4d695ec81fe4d4335ee82c7a9346ad9c9e144ecc (diff) | |
| download | k9copy-b0e912c8b3d02a518fedda28c3180eb4794a7520.tar.gz k9copy-b0e912c8b3d02a518fedda28c3180eb4794a7520.zip | |
TQt4 convert k9copy
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1233843 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libk9copy')
63 files changed, 1388 insertions, 1359 deletions
diff --git a/libk9copy/backupdlg.cpp b/libk9copy/backupdlg.cpp index a124c9f..1cc01d2 100644 --- a/libk9copy/backupdlg.cpp +++ b/libk9copy/backupdlg.cpp @@ -9,134 +9,134 @@ #include "backupdlg.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qprogressbar.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqprogressbar.h> #include <kpushbutton.h> -#include <qframe.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include "kpushbutton.h" /* - * Constructs a backupDlg as a child of 'parent', with the + * Constructs a backupDlg as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -backupDlg::backupDlg( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) +backupDlg::backupDlg( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : TQDialog( tqparent, name, modal, fl ) { if ( !name ) setName( "backupDlg" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setMinimumSize( QSize( 0, 0 ) ); - setMaximumSize( QSize( 9999, 9999 ) ); - setBaseSize( QSize( 500, 230 ) ); - setCursor( QCursor( 3 ) ); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setMinimumSize( TQSize( 0, 0 ) ); + setMaximumSize( TQSize( 9999, 9999 ) ); + setBaseSize( TQSize( 500, 230 ) ); + setCursor( TQCursor( 3 ) ); setModal( TRUE ); - backupDlgLayout = new QGridLayout( this, 1, 1, 3, 8, "backupDlgLayout"); + backupDlgLayout = new TQGridLayout( this, 1, 1, 3, 8, "backupDlgLayout"); - textLabel1 = new QLabel( this, "textLabel1" ); - textLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); - textLabel1->setCursor( QCursor( 3 ) ); - textLabel1->setFrameShape( QLabel::NoFrame ); - textLabel1->setFrameShadow( QLabel::Raised ); + textLabel1 = new TQLabel( this, "textLabel1" ); + 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 QVBoxLayout( 0, 0, 6, "layout3"); + tqlayout3 = new TQVBoxLayout( 0, 0, 6, "tqlayout3"); - lblStep = new QLabel( this, "lblStep" ); - lblStep->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, lblStep->sizePolicy().hasHeightForWidth() ) ); - QFont lblStep_font( lblStep->font() ); + lblStep = new TQLabel( this, "lblStep" ); + 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( QCursor( 3 ) ); - layout3->addWidget( lblStep ); + lblStep->setCursor( TQCursor( 3 ) ); + tqlayout3->addWidget( lblStep ); - pbStep = new QProgressBar( this, "pbStep" ); - pbStep->setCursor( QCursor( 3 ) ); - layout3->addWidget( pbStep ); + pbStep = new TQProgressBar( this, "pbStep" ); + pbStep->setCursor( TQCursor( 3 ) ); + tqlayout3->addWidget( pbStep ); - pbTotal = new QProgressBar( this, "pbTotal" ); - pbTotal->setCursor( QCursor( 3 ) ); + 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 QLabel( this, "textLabel1_2" ); - textLabel1_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) ); - textLabel1_2->setCursor( QCursor( 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->setCursor( TQCursor( 3 ) ); backupDlgLayout->addWidget( textLabel1_2, 2, 0 ); - lblTime = new QLabel( this, "lblTime" ); - lblTime->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, lblTime->sizePolicy().hasHeightForWidth() ) ); - lblTime->setCursor( QCursor( 3 ) ); + lblTime = new TQLabel( this, "lblTime" ); + 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 QHBoxLayout( 0, 0, 6, "layout1"); - spacer1 = new QSpacerItem( 131, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); - layout1->addItem( spacer1 ); + tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); + spacer1 = new TQSpacerItem( 131, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + tqlayout1->addItem( spacer1 ); bAbort = new KPushButton( this, "bAbort" ); - bAbort->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bAbort->sizePolicy().hasHeightForWidth() ) ); - bAbort->setCursor( QCursor( 0 ) ); + 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 QLabel( this, "lblFactor" ); - lblFactor->setCursor( QCursor( 3 ) ); + lblFactor = new TQLabel( this, "lblFactor" ); + lblFactor->setCursor( TQCursor( 3 ) ); backupDlgLayout->addWidget( lblFactor, 2, 3 ); - frame3 = new QFrame( this, "frame3" ); - frame3->setCursor( QCursor( 3 ) ); - frame3->setFrameShape( QFrame::StyledPanel ); - frame3->setFrameShadow( QFrame::Raised ); + frame3 = new TQFrame( this, "frame3" ); + frame3->setCursor( TQCursor( 3 ) ); + frame3->setFrameShape( TQFrame::StyledPanel ); + frame3->setFrameShadow( TQFrame::Raised ); frame3->setMargin( 1 ); - frame3Layout = new QGridLayout( frame3, 1, 1, 2, 6, "frame3Layout"); + frame3Layout = new TQGridLayout( frame3, 1, 1, 2, 6, "frame3Layout"); bPlay = new KPushButton( frame3, "bPlay" ); - bPlay->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) ); - bPlay->setMinimumSize( QSize( 25, 25 ) ); - bPlay->setMaximumSize( QSize( 25, 25 ) ); - bPlay->setCursor( QCursor( 0 ) ); + 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 ) ); bPlay->setToggleButton( TRUE ); bPlay->setOn( TRUE ); bPlay->setFlat( FALSE ); frame3Layout->addWidget( bPlay, 1, 1 ); - spacer4 = new QSpacerItem( 476, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer4 = new TQSpacerItem( 476, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); frame3Layout->addItem( spacer4, 1, 0 ); - image = new QLabel( frame3, "image" ); - image->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, image->sizePolicy().hasHeightForWidth() ) ); - image->setPaletteBackgroundColor( QColor( 0, 0, 0 ) ); - image->setCursor( QCursor( 3 ) ); + image = new TQLabel( frame3, "image" ); + 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 ); frame3Layout->addMultiCellWidget( image, 0, 0, 0, 1 ); backupDlgLayout->addMultiCellWidget( frame3, 1, 1, 0, 3 ); - spacer3 = new QSpacerItem( 380, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer3 = new TQSpacerItem( 380, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); backupDlgLayout->addItem( spacer3, 2, 2 ); languageChange(); - resize( QSize(385, 425).expandedTo(minimumSizeHint()) ); + resize( TQSize(385, 425).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bAbort, SIGNAL( clicked() ), this, SLOT( bAbortClick() ) ); + connect( bAbort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bAbortClick() ) ); } /* @@ -144,7 +144,7 @@ backupDlg::backupDlg( QWidget* parent, const char* name, bool modal, WFlags fl ) */ backupDlg::~backupDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -158,7 +158,7 @@ void backupDlg::languageChange() lblStep->setText( tr2i18n( "Current step" ) ); textLabel1_2->setText( tr2i18n( "Elapsed Time" ) ); lblTime->setText( tr2i18n( "--:--:--" ) ); - bPlay->setText( QString::null ); + bPlay->setText( TQString() ); } void backupDlg::bAbortClick() diff --git a/libk9copy/backupdlg.ui b/libk9copy/backupdlg.ui index 1aad864..add373f 100644 --- a/libk9copy/backupdlg.ui +++ b/libk9copy/backupdlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>backupDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>backupDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -57,7 +57,7 @@ <property name="spacing"> <number>8</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -82,15 +82,15 @@ <string><p align="left"><b>DVD Backup</b></p></string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="4"> + <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"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblStep</cstring> </property> @@ -114,7 +114,7 @@ <string>Current step</string> </property> </widget> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>pbStep</cstring> </property> @@ -122,7 +122,7 @@ <cursor>3</cursor> </property> </widget> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>pbTotal</cstring> </property> @@ -141,7 +141,7 @@ </widget> </vbox> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -160,7 +160,7 @@ <string>Elapsed Time</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>lblTime</cstring> </property> @@ -179,9 +179,9 @@ <string>--:--:--</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="4"> + <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> @@ -228,7 +228,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="2" column="3"> + <widget class="TQLabel" row="2" column="3"> <property name="name"> <cstring>lblFactor</cstring> </property> @@ -236,7 +236,7 @@ <cursor>3</cursor> </property> </widget> - <widget class="QFrame" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQFrame" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>frame3</cstring> </property> @@ -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,14 +309,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>476</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>image</cstring> </property> @@ -354,7 +354,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>380</width> <height>20</height> @@ -371,11 +371,11 @@ <slot>bAbortClick()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>bAbortClick()</slot> <slot>bPlayToggled(bool state)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/libk9copy/dvdprogress.cpp b/libk9copy/dvdprogress.cpp index 273e551..83e37a5 100644 --- a/libk9copy/dvdprogress.cpp +++ b/libk9copy/dvdprogress.cpp @@ -9,68 +9,68 @@ #include "dvdprogress.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qprogressbar.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqprogressbar.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> /* - * Constructs a DVDProgress as a child of 'parent', with the + * Constructs a DVDProgress as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -DVDProgress::DVDProgress( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) +DVDProgress::DVDProgress( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : TQDialog( tqparent, name, modal, fl ) { if ( !name ) setName( "DVDProgress" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setMinimumSize( QSize( 0, 150 ) ); - setMaximumSize( QSize( 400, 150 ) ); - setCursor( QCursor( 3 ) ); - DVDProgressLayout = new QGridLayout( this, 1, 1, 11, 6, "DVDProgressLayout"); + 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 QVBoxLayout( 0, 0, 6, "layout2"); + tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); - lblTotal = new QLabel( this, "lblTotal" ); - lblTotal->setCursor( QCursor( 3 ) ); - layout2->addWidget( lblTotal ); + lblTotal = new TQLabel( this, "lblTotal" ); + lblTotal->setCursor( TQCursor( 3 ) ); + tqlayout2->addWidget( lblTotal ); - pbTotal = new QProgressBar( this, "pbTotal" ); - pbTotal->setCursor( QCursor( 3 ) ); + 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 QVBoxLayout( 0, 0, 6, "layout1"); + tqlayout1 = new TQVBoxLayout( 0, 0, 6, "tqlayout1"); - lblTitle = new QLabel( this, "lblTitle" ); - lblTitle->setCursor( QCursor( 3 ) ); - layout1->addWidget( lblTitle ); + lblTitle = new TQLabel( this, "lblTitle" ); + lblTitle->setCursor( TQCursor( 3 ) ); + tqlayout1->addWidget( lblTitle ); - pbTitle = new QProgressBar( this, "pbTitle" ); - pbTitle->setCursor( QCursor( 3 ) ); + pbTitle = new TQProgressBar( this, "pbTitle" ); + pbTitle->setCursor( TQCursor( 3 ) ); pbTitle->setTotalSteps( 100 ); 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 QLabel( this, "lblStatus" ); - lblStatus->setCursor( QCursor( 3 ) ); + lbltqStatus = new TQLabel( this, "lbltqStatus" ); + lbltqStatus->setCursor( TQCursor( 3 ) ); - DVDProgressLayout->addWidget( lblStatus, 2, 0 ); + DVDProgressLayout->addWidget( lbltqStatus, 2, 0 ); languageChange(); - resize( QSize(278, 150).expandedTo(minimumSizeHint()) ); + resize( TQSize(278, 150).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } @@ -79,7 +79,7 @@ DVDProgress::DVDProgress( QWidget* parent, const char* name, bool modal, WFlags */ DVDProgress::~DVDProgress() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -89,9 +89,9 @@ DVDProgress::~DVDProgress() void DVDProgress::languageChange() { setCaption( tr2i18n( "k9Copy - DVD Analyze" ) ); - lblTotal->setText( QString::null ); - lblTitle->setText( QString::null ); - lblStatus->setText( QString::null ); + lblTotal->setText( TQString() ); + lblTitle->setText( TQString() ); + lbltqStatus->setText( TQString() ); } #include "dvdprogress.moc" diff --git a/libk9copy/dvdprogress.ui b/libk9copy/dvdprogress.ui index dabdac2..ede8f81 100755 --- a/libk9copy/dvdprogress.ui +++ b/libk9copy/dvdprogress.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DVDProgress</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DVDProgress</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -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> @@ -42,9 +42,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <property name="cursor"> <cursor>3</cursor> @@ -53,7 +53,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblTotal</cstring> </property> @@ -64,7 +64,7 @@ <string></string> </property> </widget> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>pbTotal</cstring> </property> @@ -80,9 +80,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <property name="cursor"> <cursor>3</cursor> @@ -91,7 +91,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblTitle</cstring> </property> @@ -102,7 +102,7 @@ <string></string> </property> </widget> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>pbTitle</cstring> </property> @@ -124,9 +124,9 @@ </widget> </vbox> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> - <cstring>lblStatus</cstring> + <cstring>lbltqStatus</cstring> </property> <property name="cursor"> <cursor>3</cursor> @@ -137,5 +137,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/libk9copy/k9audiocodecs.cpp b/libk9copy/k9audiocodecs.cpp index 361fbf0..23098f2 100644 --- a/libk9copy/k9audiocodecs.cpp +++ b/libk9copy/k9audiocodecs.cpp @@ -11,27 +11,27 @@ // #include "k9audiocodecs.h" -#include <qstringlist.h> +#include <tqstringlist.h> class _k9AudioCodec { public: _k9AudioCodec():name(""),options(""){}; - _k9AudioCodec(QString _name,QString _options) { + _k9AudioCodec(TQString _name,TQString _options) { name=_name; options=_options; } - QString name; - QString options; + TQString name; + TQString options; }; -k9AudioCodecs::k9AudioCodecs(QObject *parent, const char *name) - : QObject(parent, name) +k9AudioCodecs::k9AudioCodecs(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { m_config=new k9Config(); - QStringList slLabels=m_config->getCodecLabelsAudio(); - QStringList slCodecs=m_config->getCodecAudio(); + TQStringList slLabels=m_config->getCodecLabelsAudio(); + TQStringList slCodecs=m_config->getCodecAudio(); //adds default codecs if (slLabels.count()==0) { reset(); @@ -39,10 +39,10 @@ k9AudioCodecs::k9AudioCodecs(QObject *parent, const char *name) slLabels=m_config->getCodecLabelsAudio(); slCodecs=m_config->getCodecAudio(); } - QStringList::iterator c=slCodecs.begin(); + TQStringList::iterator c=slCodecs.begin(); int cpt=0; - for (QStringList::iterator i=slLabels.begin();i!=slLabels.end() ;++i) { - QString o1=(*c); + for (TQStringList::iterator i=slLabels.begin();i!=slLabels.end() ;++i) { + TQString o1=(*c); c++; m_codecs[cpt++]=_k9AudioCodec((*i),o1); } @@ -65,9 +65,9 @@ void k9AudioCodecs::reset() { void k9AudioCodecs::save() { m_config=new k9Config(); - QStringList labels; - QStringList options; - for (QMap<int,_k9AudioCodec>::iterator i=m_codecs.begin();i!=m_codecs.end();++i) { + TQStringList labels; + TQStringList options; + for (TQMap<int,_k9AudioCodec>::iterator i=m_codecs.begin();i!=m_codecs.end();++i) { labels << i.data().name; options << i.data().options; } @@ -84,19 +84,19 @@ int k9AudioCodecs::count() { return m_codecs.count(); } -void k9AudioCodecs::setOptions(int _num,QString _value) { +void k9AudioCodecs::setOptions(int _num,TQString _value) { m_codecs[_num].options=_value; } -void k9AudioCodecs::setCodecName(int _num,QString _value) { +void k9AudioCodecs::setCodecName(int _num,TQString _value) { m_codecs[_num].name=_value; } -QString k9AudioCodecs::getOptions(int _num) { +TQString k9AudioCodecs::getOptions(int _num) { return m_codecs[_num].options; } -QString k9AudioCodecs::getCodecName(int _num) { +TQString k9AudioCodecs::getCodecName(int _num) { return m_codecs[_num].name; } diff --git a/libk9copy/k9audiocodecs.h b/libk9copy/k9audiocodecs.h index bf093a2..9727629 100644 --- a/libk9copy/k9audiocodecs.h +++ b/libk9copy/k9audiocodecs.h @@ -14,30 +14,31 @@ #include "k9common.h" #include "k9config.h" -#include <qobject.h> +#include <tqobject.h> /** @author Jean-Michel PETIT <[email protected]> */ class _k9AudioCodec; -class k9AudioCodecs : public QObject +class k9AudioCodecs : public TQObject { -Q_OBJECT + Q_OBJECT + TQ_OBJECT public: - k9AudioCodecs(QObject *parent = 0, const char *name = 0); + k9AudioCodecs(TQObject *tqparent = 0, const char *name = 0); ~k9AudioCodecs(); void save(); int count(); - void setOptions(int _num,QString _value); - void setCodecName(int _num,QString _value); - QString getOptions(int _num); - QString getCodecName(int _num); + void setOptions(int _num,TQString _value); + void setCodecName(int _num,TQString _value); + TQString getOptions(int _num); + TQString getCodecName(int _num); void remove(int _num); void reset(); private: - QMap <int,_k9AudioCodec> m_codecs; + TQMap <int,_k9AudioCodec> m_codecs; k9Config *m_config; }; diff --git a/libk9copy/k9backupdlg.cpp b/libk9copy/k9backupdlg.cpp index 8c101d8..e71033d 100644 --- a/libk9copy/k9backupdlg.cpp +++ b/libk9copy/k9backupdlg.cpp @@ -20,27 +20,27 @@ #include "k9backupdlg.h" #include "ac.h" -#include <qtimer.h> -#include <qdatetime.h> -#include <qapplication.h> -#include <qprogressbar.h> -#include <qlabel.h> +#include <tqtimer.h> +#include <tqdatetime.h> +#include <tqapplication.h> +#include <tqprogressbar.h> +#include <tqlabel.h> #include <kiconloader.h> #include <kpushbutton.h> #include <kstdguiitem.h> #include <kguiitem.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqpainter.h> +#include <tqlayout.h> #include "k9drawimage.h" -k9BackupDlg::k9BackupDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - : backupDlg(parent,name, modal,fl) { +k9BackupDlg::k9BackupDlg(TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : backupDlg(tqparent,name, modal,fl) { Abort=false; - timer = new QTimer( this ); - time = new QTime(0,0); + timer = new TQTimer( this ); + time = new TQTime(0,0); time->start(); - connect( timer, SIGNAL(timeout()), this, SLOT(timerDone()) ); + connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); timer->start(500, 0 ); bAbort->setIconSet(KStdGuiItem::cancel().iconSet()); bPlay->setIconSet(SmallIcon("player_play")); @@ -50,18 +50,18 @@ k9BackupDlg::k9BackupDlg(QWidget* parent, const char* name, bool modal, WFlags f m_totalSteps=0; m_factor=""; m_progress=0; - connect(&m_decoder, SIGNAL(pixmapReady(QImage *)), this, SLOT(drawPixmap(QImage *))); + connect(&m_decoder, TQT_SIGNAL(pixmapReady(TQImage *)), this, TQT_SLOT(drawPixmap(TQImage *))); m_stop=false; m_playmovie=true; m_cpt=0; m_wimage=new k9DrawImage(image,0); - QGridLayout *l=new QGridLayout(image,1,1); + TQGridLayout *l=new TQGridLayout(image,1,1); l->addWidget(m_wimage,0,0); m_data=NULL; m_dataSize=0; } -void k9BackupDlg::drawPixmap(QImage *_image) { +void k9BackupDlg::drawPixmap(TQImage *_image) { m_count++; if (m_count ==4) { @@ -125,11 +125,11 @@ void k9BackupDlg::timerDone() { m_cpt=0; m_playmovie=bPlay->isOn(); } - QTime time2(0,0); + TQTime time2(0,0); time2=time2.addMSecs(time->elapsed()); - QString remain("--:--:--"); + TQString remain("--:--:--"); if (m_progressTotal>0) { - QTime time3(0,0); + TQTime time3(0,0); time3=time3.addMSecs((time->elapsed()/m_progressTotal)*pbTotal->totalSteps()); remain=time3.toString("hh:mm:ss"); } @@ -158,7 +158,7 @@ void k9BackupDlg::setProgressTotal(uint32_t _position) { } -void k9BackupDlg::setProgressLabel(QString _text) { +void k9BackupDlg::setProgressLabel(TQString _text) { m_progressLabel=_text; update(); } @@ -173,7 +173,7 @@ void k9BackupDlg::bAbortClick() { } -void k9BackupDlg::setFactor(QString _factor) { +void k9BackupDlg::setFactor(TQString _factor) { m_factor=_factor; } /*$SPECIALIZATION$*/ diff --git a/libk9copy/k9backupdlg.h b/libk9copy/k9backupdlg.h index dae5b31..3e7a7f4 100644 --- a/libk9copy/k9backupdlg.h +++ b/libk9copy/k9backupdlg.h @@ -23,7 +23,7 @@ #include "k9common.h" #include "backupdlg.h" -#include <qmutex.h> +#include <tqmutex.h> #include "kdecmpeg2.h" class k9DrawImage; @@ -31,34 +31,35 @@ class k9DrawImage; class k9BackupDlg : public backupDlg { Q_OBJECT + TQ_OBJECT public: - k9BackupDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + k9BackupDlg(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~k9BackupDlg(); /*$PUBLIC_FUNCTIONS$*/ void setTotalSteps(uint32_t _totalSteps); void setProgress(uint32_t _position); - void setProgressLabel(QString _text); + void setProgressLabel(TQString _text); void setProgressTotal(uint32_t _position); void setTotalMax(uint32_t _max); - void setFactor(QString _factor); + void setFactor(TQString _factor); bool getAbort(); void playMovie(uchar *_data,uint32_t _size); public slots: /*$PUBLIC_SLOTS$*/ private : bool Abort; - QTimer *timer; - QTime *time; + TQTimer *timer; + TQTime *time; uint64_t totalCopied,m_progressTotal;; - QString m_progressLabel; + TQString m_progressLabel; uint32_t m_totalSteps,m_progress; - QString m_factor; + TQString m_factor; bool m_stop; void update(); kDecMPEG2 m_decoder; uint m_count; - QMutex mutex; + TQMutex mutex; bool m_playmovie; uint m_cpt; k9DrawImage *m_wimage; @@ -71,7 +72,7 @@ protected: protected slots: /*$PROTECTED_SLOTS$*/ void timerDone(); - void drawPixmap(QImage *image); + void drawPixmap(TQImage *image); }; #endif diff --git a/libk9copy/k9burndvd.cpp b/libk9copy/k9burndvd.cpp index 7d6f603..72be072 100644 --- a/libk9copy/k9burndvd.cpp +++ b/libk9copy/k9burndvd.cpp @@ -21,16 +21,16 @@ #include "k9burndvd.h" #include "k9burndvd.moc" #include "k9tools.h" -#include <qdir.h> +#include <tqdir.h> #include <kmessagebox.h> #include <kfiledialog.h> #include <klibloader.h> #include <kprocess.h> -#include <qapplication.h> +#include <tqapplication.h> #include <kstandarddirs.h> k9BurnDVD::k9BurnDVD() - : QObject(NULL,"") { + : TQObject(NULL,"") { cancelled=false; useK3b=false; autoBurn=false; @@ -38,7 +38,7 @@ k9BurnDVD::k9BurnDVD() iso=false; m_filename=""; progress=new k9Progress(NULL,"progress",NULL); - QString s= KGlobal::dirs()->findResource( "data", "k9copy/anim.mng"); + TQString s= KGlobal::dirs()->findResource( "data", "k9copy/anim.mng"); progress->setMovie(s); m_cdrkit=k9Tools::checkProgram("genisoimage") && k9Tools::checkProgram("wodim"); } @@ -48,28 +48,28 @@ k9BurnDVD::k9BurnDVD() k9BurnDVD::~k9BurnDVD() { } -/** Read property of QString burnDevice. */ -const QString& k9BurnDVD::getburnDevice() { +/** Read property of TQString burnDevice. */ +const TQString& k9BurnDVD::getburnDevice() { return burnDevice; } -/** Write property of QString burnDevice. */ -void k9BurnDVD::setburnDevice( const QString& _newVal) { +/** Write property of TQString burnDevice. */ +void k9BurnDVD::setburnDevice( const TQString& _newVal) { burnDevice = _newVal; } -/** Write property of QString workDir. */ -void k9BurnDVD::setworkDir( const QString& _newVal) { +/** Write property of TQString workDir. */ +void k9BurnDVD::setworkDir( const TQString& _newVal) { workDir = _newVal; if (workDir.right(1)!='/') workDir +='/'; } -void k9BurnDVD::makeIso(QString _filename) { +void k9BurnDVD::makeIso(TQString _filename) { iso=true; m_filename=_filename; } -void k9BurnDVD::setvolId(QString _newVal) { - volId=_newVal.replace(" ","_"); +void k9BurnDVD::setvolId(TQString _newVal) { + volId=_newVal.tqreplace(" ","_"); } void k9BurnDVD::setUseK3b(bool _newVal) { @@ -93,7 +93,7 @@ void k9BurnDVD::burnWithK3b() { KProcess *k3b = new KProcess(); *k3b << "k3b"; - *k3b << QDir::cleanDirPath(workDir +"/dvd/VIDEO_TS"); + *k3b << TQDir::cleanDirPath(workDir +"/dvd/VIDEO_TS"); *k3b << "-videodvd"; k3b->start(); k3b->detach(); @@ -101,19 +101,19 @@ void k9BurnDVD::burnWithK3b() { } void k9BurnDVD::mkisoSizeStderr(KProcess *proc, char *buffer, int buflen) { - QString c=QString::fromLatin1( buffer,buflen);// (proc2->readStderr()); - imageSize=c.replace("\n",""); + TQString c=TQString::tqfromLatin1( buffer,buflen);// (proc2->readStderr()); + imageSize=c.tqreplace("\n",""); ; } void k9BurnDVD::mkisoSizeStdout(KProcess *proc, char *buffer, int buflen) { - QString c=QString::fromLatin1(buffer,buflen);// (proc2->readStdout()); - imageSize=c.replace("\n",""); + TQString c=TQString::tqfromLatin1(buffer,buflen);// (proc2->readStdout()); + imageSize=c.tqreplace("\n",""); ; } -const QString &k9BurnDVD::getImageSize() { - QString c; +const TQString &k9BurnDVD::getImageSize() { + TQString c; c="mkisofs"; proc2=new k9Process; *proc2 << c; @@ -123,13 +123,13 @@ const QString &k9BurnDVD::getImageSize() { *proc2 <<"-udf"; *proc2 <<"-r"; *proc2 <<"-V "+volId; - *proc2 << QDir::cleanDirPath(workDir +"/dvd"); + *proc2 << TQDir::cleanDirPath(workDir +"/dvd"); - connect( proc2, SIGNAL(receivedStderr(KProcess *, char *, int )),this, SLOT(mkisoSizeStderr(KProcess *, char *, int)) ); - connect( proc2, SIGNAL(receivedStdout(KProcess *, char *, int)),this, SLOT(mkisoSizeStdout(KProcess *, char *, int)) ); + connect( proc2, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )),this, TQT_SLOT(mkisoSizeStderr(KProcess *, char *, int)) ); + connect( proc2, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(mkisoSizeStdout(KProcess *, char *, int)) ); if (proc2->start(KProcess::NotifyOnExit,KProcess::All)) { // while (proc2->isRunning()) { -// qApp->processEvents(); +// tqApp->processEvents(); // } proc2->sync(); if (proc2->exitStatus()==0) { @@ -141,8 +141,8 @@ const QString &k9BurnDVD::getImageSize() { return ""; } -void k9BurnDVD::getGenisoimageCmd(k9Process *proc,QString _fileName,bool _printSize) { - QString progname="genisoimage"; +void k9BurnDVD::getGenisoimageCmd(k9Process *proc,TQString _fileName,bool _printSize) { + TQString progname="genisoimage"; *proc << progname; *proc << "-gui"; *proc << "-graft-points"; @@ -158,14 +158,14 @@ void k9BurnDVD::getGenisoimageCmd(k9Process *proc,QString _fileName,bool _printS *proc <<"-o"; *proc <<_fileName; } - connect( proc, SIGNAL(receivedStderr(KProcess *, char *, int)),this, SLOT(growisoStderr(KProcess *, char *, int)) ); - connect( proc, SIGNAL(receivedStdout(KProcess *, char *, int)),this, SLOT(growisoStdout(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(growisoStderr(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(growisoStdout(KProcess *, char *, int)) ); } else { *proc << "-print-size" << "-quiet"; - connect( proc, SIGNAL(receivedStderr(KProcess *, char *, int )),this, SLOT(mkisoSizeStderr(KProcess *, char *, int)) ); - connect( proc, SIGNAL(receivedStdout(KProcess *, char *, int)),this, SLOT(mkisoSizeStdout(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int )),this, TQT_SLOT(mkisoSizeStderr(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(mkisoSizeStdout(KProcess *, char *, int)) ); } - *proc <<QDir::cleanDirPath(workDir +"/dvd"); + *proc <<TQDir::cleanDirPath(workDir +"/dvd"); } @@ -176,14 +176,14 @@ void k9BurnDVD::getWodimCmd(k9Process *proc) { *proc <<"-data"; if (m_speed !=i18n("default")) - *proc << QString("speed=%1").arg(m_speed); - *proc <<QString("dev=%1").arg(burnDevice); - *proc <<QString("tsize=%1s").arg(imageSize); + *proc << TQString("speed=%1").tqarg(m_speed); + *proc <<TQString("dev=%1").tqarg(burnDevice); + *proc <<TQString("tsize=%1s").tqarg(imageSize); *proc << "-"; } void k9BurnDVD::burnWithGenisoimage() { - time = new QTime(0,0); + time = new TQTime(0,0); time->start(); progress->setCaption(i18n("k9Copy - Burning DVD")); progress->setTitle(i18n("Burning DVD")); @@ -193,11 +193,11 @@ void k9BurnDVD::burnWithGenisoimage() { while (!cancelled && !bok) { burnSpeed=0; - QString fileName=""; + TQString fileName=""; if (iso) { fileName=m_filename; if (fileName =="") - fileName=KFileDialog::getSaveFileName (QDir::homeDirPath(),"*.iso", 0,i18n("Save image to disk")); + fileName=KFileDialog::getSaveFileName (TQDir::homeDirPath(),"*.iso", 0,i18n("Save image to disk")); if (fileName =="") { cancelled=true; } @@ -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) { @@ -231,9 +231,9 @@ void k9BurnDVD::burnWithGenisoimage() { //delete temporary files // clearOutput(workDir+"dvd"); } else { - QString c; + 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; } @@ -244,13 +244,13 @@ void k9BurnDVD::burnWithGenisoimage() { } void k9BurnDVD::burnWithGrowisofs() { - time = new QTime(0,0); + time = new TQTime(0,0); time->start(); //KLibFactory *factory; //factory = KLibLoader::self()->factory("libk9copy"); -// progress=static_cast<k9Progress *>(factory->create(qApp->mainWidget(),"progress", "k9Progress")); +// progress=static_cast<k9Progress *>(factory->create(tqApp->mainWidget(),"progress", "k9Progress")); progress->setCaption(i18n("k9Copy - Burning DVD")); progress->setTitle(i18n("Burning DVD")); @@ -259,7 +259,7 @@ void k9BurnDVD::burnWithGrowisofs() { while (!cancelled && !bok) { burnSpeed=0; - QString c,progname; + TQString c,progname; if (iso) progname="mkisofs"; else @@ -279,9 +279,9 @@ void k9BurnDVD::burnWithGrowisofs() { *proc <<"-speed=" + m_speed; } else { - QString fileName=m_filename; + TQString fileName=m_filename; if (fileName =="") - fileName=KFileDialog::getSaveFileName (QDir::homeDirPath(),"*.iso", 0,i18n("Save image to disk")); + fileName=KFileDialog::getSaveFileName (TQDir::homeDirPath(),"*.iso", 0,i18n("Save image to disk")); if (fileName !="") { *proc <<"-o"; *proc <<fileName; @@ -294,10 +294,10 @@ void k9BurnDVD::burnWithGrowisofs() { *proc <<"-udf"; *proc << "-r"; *proc <<"-V "+volId; - *proc <<QDir::cleanDirPath(workDir +"/dvd"); + *proc <<TQDir::cleanDirPath(workDir +"/dvd"); - connect( proc, SIGNAL(receivedStderr(KProcess *, char *, int)),this, SLOT(growisoStderr(KProcess *, char *, int)) ); - connect( proc, SIGNAL(receivedStdout(KProcess *, char *, int)),this, SLOT(growisoStdout(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(growisoStderr(KProcess *, char *, int)) ); + connect( proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(growisoStdout(KProcess *, char *, int)) ); if (!autoBurn && !iso) { c=i18n("Insert a recordable DVD"); if ( KMessageBox::warningContinueCancel ( 0,c, i18n("DVD burning"))!=KMessageBox::Continue) @@ -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) { @@ -315,9 +315,9 @@ void k9BurnDVD::burnWithGrowisofs() { //delete temporary files // clearOutput(workDir+"dvd"); } else { - QString c; + 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,34 +331,34 @@ void k9BurnDVD::burnWithGrowisofs() { /** No descriptions */ void k9BurnDVD::growisoStderr(KProcess *proc, char *buffer, int buflen) { - QString c=QString::fromLatin1( buffer,buflen);// (proc->readStderr()); + TQString c=TQString::tqfromLatin1( buffer,buflen);// (proc->readStderr()); char s[255]; int a,b; int pos; lastMsg=c; - if (c.contains("Current Write Speed")) { + if (c.tqcontains("Current Write Speed")) { sscanf(c.latin1(),"%s \"Current Write Speed\" is %d.%d",s,&a,&b); burnSpeed=a+b/10; } - if (c.contains("Speed set to")) { + if (c.tqcontains("Speed set to")) { sscanf(c.latin1(),"Speed set to %d",&a); burnSpeed=a/1385; } progress->setTitle(i18n("Burning DVD")); - progress->setLabelText(i18n("Current write speed :%1 x").arg(burnSpeed)); - if (c.contains("% done")) { - pos=c.find("%"); + progress->setLabelText(i18n("Current write speed :%1 x").tqarg(burnSpeed)); + if (c.tqcontains("% done")) { + pos=c.tqfind("%"); if (pos!=-1) { c=c.mid(1,pos-4); //progress->setLabelText(c); progress->setProgress(c.toInt(),100); float m_percent=c.toFloat()/100; - QTime time2(0,0); + TQTime time2(0,0); time2=time2.addMSecs(time->elapsed()); if (m_percent>0) { - QTime time3(0,0); - QString m_remain; + TQTime time3(0,0); + TQString m_remain; time3=time3.addMSecs((uint32_t)(time->elapsed()*(1/m_percent))); m_remain=time3.toString("hh:mm:ss"); progress->setElapsed(time2.toString("hh:mm:ss") +" / " +m_remain); @@ -371,9 +371,9 @@ void k9BurnDVD::growisoStderr(KProcess *proc, char *buffer, int buflen) { } } void k9BurnDVD::growisoStdout(KProcess *proc, char *buffer, int buflen) { - QString c=QString::fromLatin1( buffer,buflen);// (proc->readStdout()); + TQString c=TQString::tqfromLatin1( buffer,buflen);// (proc->readStdout()); int pos; - pos=c.find("STAT"); + pos=c.tqfind("STAT"); if (pos!=-1) { c=c.mid(pos); progress->setLabelText(c); diff --git a/libk9copy/k9burndvd.h b/libk9copy/k9burndvd.h index 6d9948c..e075bc1 100644 --- a/libk9copy/k9burndvd.h +++ b/libk9copy/k9burndvd.h @@ -29,36 +29,37 @@ /** @author Jean-Michel PETIT */ -class k9BurnDVD: public QObject +class k9BurnDVD: public TQObject { Q_OBJECT + TQ_OBJECT public: k9BurnDVD(); ~k9BurnDVD(); - virtual void setburnDevice( const QString& _newVal); - virtual const QString& getburnDevice(); - virtual QWidget* getDialog() {return progress;}; - void setworkDir( const QString& _newVal); - void setvolId(QString _newVal); + virtual void setburnDevice( const TQString& _newVal); + virtual const TQString& getburnDevice(); + virtual TQWidget* getDialog() {return progress;}; + void setworkDir( const TQString& _newVal); + void setvolId(TQString _newVal); void setUseK3b(bool _newVal); void setAutoBurn (bool _newVal); void burn(); - void makeIso(QString _filename); + void makeIso(TQString _filename); - void setSpeed(const QString& _value) { m_speed = _value;} + void setSpeed(const TQString& _value) { m_speed = _value;} private: - QTime *time; + TQTime *time; k9Progress *progress; k9Process *proc; k9Process *proc2; - QString volId; + TQString volId; float burnSpeed; - QString burnDevice; - QString lastMsg; - QString workDir; - QString m_filename; + TQString burnDevice; + TQString lastMsg; + TQString workDir; + TQString m_filename; bool cancelled; bool useK3b; bool autoBurn; @@ -66,13 +67,13 @@ private: bool m_cdrkit; void burnWithGrowisofs(); void burnWithGenisoimage(); - void getGenisoimageCmd(k9Process *proc,QString _fileName,bool _printSize); + void getGenisoimageCmd(k9Process *proc,TQString _fileName,bool _printSize); void getWodimCmd(k9Process *proc); void burnWithK3b(); - const QString &getImageSize(); - QString imageSize; - QString m_speed; + const TQString &getImageSize(); + TQString imageSize; + TQString m_speed; private slots: // Private slots void growisoStderr(KProcess *proc, char *buffer, int buflen); void growisoStdout(KProcess *proc, char *buffer, int buflen); diff --git a/libk9copy/k9cell.cpp b/libk9copy/k9cell.cpp index d757e26..4de41d8 100755 --- a/libk9copy/k9cell.cpp +++ b/libk9copy/k9cell.cpp @@ -20,7 +20,7 @@ #include "k9cell.h" #include "k9dvdtitleset.h" -int k9VobuList::compareItems ( QPtrCollection::Item item1, QPtrCollection::Item item2 ) { +int k9VobuList::compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) { return(((k9Vobu*)item1)->oldSector- ((k9Vobu*)item2)->oldSector); } @@ -164,8 +164,8 @@ int k9Cell::isNavPack (uchar *_ptr) { -k9Cell::k9Cell(QObject *parent, const char *name) - : QObject(parent, name) { +k9Cell::k9Cell(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { vobus.setAutoDelete(true); numVobu=0; @@ -280,7 +280,7 @@ void k9Cell::addNewVobus(char *_buffer,uint32_t _len,uint32_t _position,int _vob numVobu++; vobu->vobNum=_vobNum; vobu->vobPos=_vobPos; - //QString c; + //TQString c; //c.sprintf("vobu : %d old: %d new :%d",numVobu-1,vobu->oldSector,vobu->newSector); //qDebug (c.latin1()); @@ -322,8 +322,8 @@ void k9Cell::addNewVobus(char *_buffer,uint32_t _len,uint32_t _position,int _vob } k9Vobu::k9Vobu(k9Cell *_parent,uint32_t _oldSector) - : QObject(_parent,"") { - parent=_parent; + : TQObject(_parent,"") { + tqparent=_parent; oldSector = _oldSector; newSector = 0; size=0; diff --git a/libk9copy/k9cell.h b/libk9copy/k9cell.h index c253415..f5a6d45 100755 --- a/libk9copy/k9cell.h +++ b/libk9copy/k9cell.h @@ -31,10 +31,11 @@ enum streamType_t {stAudio,stVideo,stSubpicture,stOther}; class k9CellList; class k9Cell; class k9DVDTitleset; -class k9Vobu : public QObject { +class k9Vobu : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9Vobu(k9Cell * parent,uint32_t _oldSector); + k9Vobu(k9Cell * tqparent,uint32_t _oldSector); ~k9Vobu(); uint32_t newSector; uint32_t oldSector; @@ -43,7 +44,7 @@ public: int firstSubp[32]; int firstVideo; bool empty; - k9Cell *parent; + k9Cell *tqparent; long vobPos; int vobNum; uchar frameType; @@ -51,19 +52,20 @@ public: bool firstRefOk,secondRefOk,thirdRefOk; }; -class k9VobuList : public QPtrList <k9Vobu> { +class k9VobuList : public TQPtrList <k9Vobu> { public: k9Vobu *findVobu(uint32_t sector); private: k9Vobu * findVobu(uint32_t sector, uint32_t start, uint32_t end); protected: - int compareItems ( QPtrCollection::Item item1, QPtrCollection::Item item2 ) ; + int compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) ; }; -class k9Cell : public QObject { +class k9Cell : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9Cell(QObject *parent = 0, const char *name = 0); + k9Cell(TQObject *tqparent = 0, const char *name = 0); ~k9Cell(); k9Vobu * addVobu(uint32_t _sector); void addNewVobus(char *_buffer,uint32_t _len,uint32_t _position,int _vobNum,long _vobPos); @@ -91,18 +93,18 @@ public: int id; bool selected; bool copied; - QValueList<int> audio; - QValueList<int> subpicture; + TQValueList<int> audio; + TQValueList<int> subpicture; k9CellList *cellList; private: int numVobu; void addRefStream(k9Vobu *_vobu,uchar *_buffer,uint32_t _position); - QPtrList <k9DVDTitle> m_titles; + TQPtrList <k9DVDTitle> m_titles; }; -class k9CellList : public QPtrList <k9Cell> { +class k9CellList : public TQPtrList <k9Cell> { private: uint32_t m_position; k9Cell * findCell(uint32_t sector); diff --git a/libk9copy/k9cellcopylist.cpp b/libk9copy/k9cellcopylist.cpp index 656da5f..2297359 100644 --- a/libk9copy/k9cellcopylist.cpp +++ b/libk9copy/k9cellcopylist.cpp @@ -23,7 +23,7 @@ #include <kmessagebox.h> -int k9CellVTSList::compareItems ( QPtrCollection::Item item1, QPtrCollection::Item item2 ) { +int k9CellVTSList::compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) { k9CellCopyVTS * it1,*it2; it1=(k9CellCopyVTS *) item1; it2=(k9CellCopyVTS *)item2; @@ -50,7 +50,7 @@ uint64_t k9CellCopyVTS::getsize() { } k9CellCopyList::k9CellCopyList(k9DVDRead * _dvdHandle,k9DVD *_DVD) - : QObjectList() { + : TQObjectList() { setAutoDelete(true); DVD=_DVD; dvdHandle=_dvdHandle; @@ -167,7 +167,7 @@ void k9CellCopyList::addStreams(k9DVDTitle *_title,k9Cell *_cell) { for (int i=0;i<_title->getaudioStreamCount();i++) { l_auds=_title->getaudioStream(i); if (l_auds->getselected()) { - QValueList<int>::iterator it; + TQValueList<int>::iterator it; bool found=false; for ( it = _cell->audio.begin(); it != _cell->audio.end(); ++it ) { if (*it == l_auds->getID()) @@ -179,13 +179,13 @@ void k9CellCopyList::addStreams(k9DVDTitle *_title,k9Cell *_cell) { } for (int i=0;i<_title->getsubPictureCount();i++) { - QString c; + TQString c; l_sub=_title->getsubtitle(i); if (l_sub->getselected()) { - QValueList<int>::iterator it; + TQValueList<int>::iterator it; bool found=false; for ( it = _cell->subpicture.begin(); it != _cell->subpicture.end(); ++it ) { - if (l_sub->getID().contains(*it)) + if (l_sub->getID().tqcontains(*it)) found=true; } if (!found) @@ -294,10 +294,10 @@ double k9CellCopyList::getMinFactor(bool _withMenus) { double totalSize=gettotalSize()+menuSize - (fforced) -m_inbytes; totalSize/=2.50; -qDebug(QString("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(QString("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(QString("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(QString("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/k9cellcopylist.h b/libk9copy/k9cellcopylist.h index c338567..4ea4877 100644 --- a/libk9copy/k9cellcopylist.h +++ b/libk9copy/k9cellcopylist.h @@ -44,13 +44,13 @@ public: @author Jean-Michel PETIT */ -class k9CellVTSList : public QPtrList<k9CellCopyVTS> { +class k9CellVTSList : public TQPtrList<k9CellCopyVTS> { protected: - int compareItems ( QPtrCollection::Item item1, QPtrCollection::Item item2 ); + int compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ); }; -class k9CellCopyList : public QObjectList { +class k9CellCopyList : public TQObjectList { public: k9CellCopyList(k9DVDRead * _dvdHandle,k9DVD *_DVD); double getfactor(bool _withMenus,bool _streams); @@ -89,7 +89,7 @@ private: void addStreams(k9DVDTitle *_title,k9Cell *_cell); void setVTS(uint _numVTS,uint32_t _size); - //QPtrList <k9CellCopyVTS> VTSList; + //TQPtrList <k9CellCopyVTS> VTSList; void sortVTSList(); }; diff --git a/libk9copy/k9common.h b/libk9copy/k9common.h index 633e8d6..249cf8d 100644 --- a/libk9copy/k9common.h +++ b/libk9copy/k9common.h @@ -34,9 +34,9 @@ #include "nav_read.h" #include "nav_types.h" -#include <qobject.h> -#include <qobjectlist.h> -#include <qptrlist.h> +#include <tqobject.h> +#include <tqobjectlist.h> +#include <tqptrlist.h> #ifndef DVD_BLOCK_LEN #define DVD_BLOCK_LEN 2048 diff --git a/libk9copy/k9config.cpp b/libk9copy/k9config.cpp index 2824c37..679de16 100644 --- a/libk9copy/k9config.cpp +++ b/libk9copy/k9config.cpp @@ -79,8 +79,8 @@ void k9Config::read() { m_prefAudioBitrate=m_config->readNumEntry("audioBitrate",192); m_prefButtonWidth=m_config->readNumEntry("buttonWidth",50); m_prefButtonHeight=m_config->readNumEntry("buttonHeight",40); - m_prefButtonHiliteColor=m_config->readColorEntry("buttonHiliteColor",&QColor(Qt::yellow)); - m_prefButtonTextColor=m_config->readColorEntry("buttonTextColor",&QColor(Qt::yellow)); + m_prefButtonHiliteColor=m_config->readColorEntry("buttonHiliteColor",&TQColor(TQt::yellow)); + m_prefButtonTextColor=m_config->readColorEntry("buttonTextColor",&TQColor(TQt::yellow)); m_prefButtonFont=m_config->readFontEntry("buttonFont"); diff --git a/libk9copy/k9config.h b/libk9copy/k9config.h index 13af407..c81922e 100644 --- a/libk9copy/k9config.h +++ b/libk9copy/k9config.h @@ -25,8 +25,8 @@ private: int m_InputDev; int m_OutputDev; bool m_keepMenus; - QString m_prefOutput; - QString m_prefVersion; + TQString m_prefOutput; + TQString m_prefVersion; bool m_useDvdAuthor; bool m_quickScan; int m_prefSize; @@ -45,24 +45,24 @@ private: bool m_prefMp42Passes; bool m_prefDelTmpFiles; bool m_prefUseCellCache; - QString m_prefMp4Width; - QString m_prefMp4Height; - QString m_prefMp4AudioBitrate; - QString m_prefMp4VideoBitrate; - QString m_prefAudioFormat; - QStringList m_codecAudio; - QStringList m_codecLabelsAudio; - QStringList m_codecLabels; - QStringList m_codecVideo; - QString m_prefCodecAudio,m_prefCodecVideo,m_prefCodecLabel; - - QStringList m_devices; - QStringList m_devicesLabels; - QStringList m_devicesIO; - - QColor m_prefButtonHiliteColor; - QColor m_prefButtonTextColor; - QFont m_prefButtonFont; + TQString m_prefMp4Width; + TQString m_prefMp4Height; + TQString m_prefMp4AudioBitrate; + TQString m_prefMp4VideoBitrate; + TQString m_prefAudioFormat; + TQStringList m_codecAudio; + TQStringList m_codecLabelsAudio; + TQStringList m_codecLabels; + TQStringList m_codecVideo; + TQString m_prefCodecAudio,m_prefCodecVideo,m_prefCodecLabel; + + TQStringList m_devices; + TQStringList m_devicesLabels; + TQStringList m_devicesIO; + + TQColor m_prefButtonHiliteColor; + TQColor m_prefButtonTextColor; + TQFont m_prefButtonFont; bool m_useMplayer; bool m_useGL; @@ -101,27 +101,27 @@ public: return m_keepMenus; } - void setPrefOutput(const QString& _value) { + void setPrefOutput(const TQString& _value) { m_prefOutput = _value; } - QString getPrefOutput() const { + TQString getPrefOutput() const { return m_prefOutput; } - void setPrefAudioFormat( const QString &_value) { + void setPrefAudioFormat( const TQString &_value) { m_prefAudioFormat=_value; } - QString getPrefAudioFormat() const { + TQString getPrefAudioFormat() const { return m_prefAudioFormat; } - void setPrefVersion(const QString& _value) { + void setPrefVersion(const TQString& _value) { m_prefVersion = _value; } - QString getPrefVersion() const { + TQString getPrefVersion() const { return m_prefVersion; } @@ -238,104 +238,104 @@ public: return m_prefMp4NumberCD; } - void setPrefMp4Width(const QString& _value) { + void setPrefMp4Width(const TQString& _value) { m_prefMp4Width = _value; } - QString getPrefMp4Width() const { + TQString getPrefMp4Width() const { return m_prefMp4Width; } - void setPrefMp4Height(const QString& _value) { + void setPrefMp4Height(const TQString& _value) { m_prefMp4Height = _value; } - QString getPrefMp4Height() const { + TQString getPrefMp4Height() const { return m_prefMp4Height; } - void setPrefMp4AudioBitrate(const QString& _value) { + void setPrefMp4AudioBitrate(const TQString& _value) { m_prefMp4AudioBitrate = _value; } - QString getPrefMp4AudioBitrate() const { + TQString getPrefMp4AudioBitrate() const { return m_prefMp4AudioBitrate; } - void setPrefMp4VideoBitrate(const QString& _value) { + void setPrefMp4VideoBitrate(const TQString& _value) { m_prefMp4VideoBitrate = _value; } - QString getPrefMp4VideoBitrate() const { + TQString getPrefMp4VideoBitrate() const { return m_prefMp4VideoBitrate; } - void setCodecAudio(const QStringList& _value) { + void setCodecAudio(const TQStringList& _value) { m_codecAudio = _value; } - QStringList getCodecAudio() const { + TQStringList getCodecAudio() const { return m_codecAudio; } - void setCodecLabels(const QStringList& _value) { + void setCodecLabels(const TQStringList& _value) { m_codecLabels = _value; } - QStringList getCodecLabels() const { + TQStringList getCodecLabels() const { return m_codecLabels; } - void setCodecVideo(const QStringList& _value) { + void setCodecVideo(const TQStringList& _value) { m_codecVideo = _value; } - QStringList getCodecVideo() const { + TQStringList getCodecVideo() const { return m_codecVideo; } - void setCodecLabelsAudio(const QStringList& _value) { + void setCodecLabelsAudio(const TQStringList& _value) { m_codecLabelsAudio = _value; } - QStringList getCodecLabelsAudio() const { + TQStringList getCodecLabelsAudio() const { return m_codecLabelsAudio; } - void setDevices(const QStringList& _value) { + void setDevices(const TQStringList& _value) { m_devices = _value; } - QStringList getDevices() const { + TQStringList getDevices() const { return m_devices; } - void setDevicesLabels(const QStringList& _value) { + void setDevicesLabels(const TQStringList& _value) { m_devicesLabels = _value; } - QStringList getDevicesLabels() const { + TQStringList getDevicesLabels() const { return m_devicesLabels; } - void setDevicesIO(const QStringList& _value) { + void setDevicesIO(const TQStringList& _value) { m_devicesIO = _value; } - QStringList getDevicesIO() const { + TQStringList getDevicesIO() const { return m_devicesIO; } @@ -420,31 +420,31 @@ public: return m_prefButtonHeight; } - void setPrefButtonHiliteColor(const QColor& _value) { + void setPrefButtonHiliteColor(const TQColor& _value) { m_prefButtonHiliteColor = _value; } - QColor getPrefButtonHiliteColor() const { + TQColor getPrefButtonHiliteColor() const { return m_prefButtonHiliteColor; } - void setPrefButtonTextColor(const QColor& _value) { + void setPrefButtonTextColor(const TQColor& _value) { m_prefButtonTextColor = _value; } - QColor getPrefButtonTextColor() const { + TQColor getPrefButtonTextColor() const { return m_prefButtonTextColor; } - void setPrefButtonFont(const QFont& _value) { + void setPrefButtonFont(const TQFont& _value) { m_prefButtonFont = _value; } - QFont getPrefButtonFont() const { + TQFont getPrefButtonFont() const { return m_prefButtonFont; } diff --git a/libk9copy/k9drawimage.cpp b/libk9copy/k9drawimage.cpp index 89aba8f..4103df9 100644 --- a/libk9copy/k9drawimage.cpp +++ b/libk9copy/k9drawimage.cpp @@ -10,10 +10,10 @@ // // #include "k9drawimage.h" -#include <qpainter.h> +#include <tqpainter.h> -k9DrawImage::k9DrawImage(QWidget *parent, const char *name) - : QWidget(parent, name) +k9DrawImage::k9DrawImage(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { } @@ -22,19 +22,19 @@ k9DrawImage::~k9DrawImage() { } -void k9DrawImage::setImage(const QImage &_image){ +void k9DrawImage::setImage(const TQImage &_image){ m_pixmap =_image; - repaint(); + tqrepaint(); } -void k9DrawImage::setImage(QString _fileName) { +void k9DrawImage::setImage(TQString _fileName) { m_pixmap.load(_fileName); - repaint(); + tqrepaint(); } -void k9DrawImage::paintEvent ( QPaintEvent * ) { +void k9DrawImage::paintEvent ( TQPaintEvent * ) { int top,left; - QPainter p(this); + TQPainter p(this); double wratio=(double)width()/(double)m_pixmap.width(); double hratio=(double)height()/(double)m_pixmap.height(); diff --git a/libk9copy/k9drawimage.h b/libk9copy/k9drawimage.h index 87c8f9b..ebe0d9f 100644 --- a/libk9copy/k9drawimage.h +++ b/libk9copy/k9drawimage.h @@ -12,25 +12,26 @@ #ifndef K9DRAWIMAGE_H #define K9DRAWIMAGE_H -#include <qwidget.h> -#include <qpixmap.h> +#include <tqwidget.h> +#include <tqpixmap.h> /** @author Jean-Michel PETIT <[email protected]> */ -class k9DrawImage : public QWidget +class k9DrawImage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - k9DrawImage(QWidget *parent = 0, const char *name = 0); - void setImage(QString _fileName); - void setImage(const QImage &_image); + k9DrawImage(TQWidget *tqparent = 0, const char *name = 0); + void setImage(TQString _fileName); + void setImage(const TQImage &_image); ~k9DrawImage(); private: - QPixmap m_pixmap; + TQPixmap m_pixmap; protected: - void paintEvent ( QPaintEvent *); + void paintEvent ( TQPaintEvent *); }; #endif diff --git a/libk9copy/k9dvd.cpp b/libk9copy/k9dvd.cpp index 7ef0098..37a18ac 100755 --- a/libk9copy/k9dvd.cpp +++ b/libk9copy/k9dvd.cpp @@ -24,12 +24,13 @@ #include "k9cellcopylist.h" #include "k9dvdprogress.h" #include "k9ifo2.h" -#include <qapplication.h> +#include <tqapplication.h> #include <klocale.h> #include <kdebug.h> #include <sys/stat.h> +#include "k9dvd.moc" k9DVDTitle* k9DVD::gettitle(int num) { return ((k9DVDTitle*)m_titles.at(num)); @@ -54,12 +55,12 @@ k9DVDTitle *k9DVD::getlongestTitle() { return m_longestTitle; } -/** Read property of QString title. */ -const QString& k9DVD::getDVDTitle() { +/** Read property of TQString title. */ +const TQString& k9DVD::getDVDTitle() { return m_title; } -void k9DVD::setDVDTitle(const QString &_newVal) { +void k9DVD::setDVDTitle(const TQString &_newVal) { m_title=_newVal; } @@ -81,7 +82,7 @@ int k9DVD::getmenuSize() { return m_menuSize; } -k9DVD::k9DVD(QObject *parent, const char *name,const QStringList args) { +k9DVD::k9DVD(TQObject *tqparent, const char *name,const TQStringList args) { m_error=false; m_opened=false; m_titles.setAutoDelete(true); @@ -149,7 +150,7 @@ k9DVD::k9DVD(QObject *parent, const char *name,const QStringList 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; @@ -184,9 +185,9 @@ int k9DVD::dvdtime2msec(dvd_time_t *dt) { int k9DVD::get_title_name(const char* dvd_device, char* title) { FILE *filehandle = 0; int i; - QString c; + 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; @@ -194,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; @@ -217,8 +218,8 @@ int k9DVD::get_title_name(const char* dvd_device, char* title) { return 0; } -QString k9DVD::lang_name(const QString& code,const QString & name) { - QString c; +TQString k9DVD::lang_name(const TQString& code,const TQString & name) { + TQString c; int i=0; lng arrLng[] = { { " ", i18n("Not Specified") }, { "aa", i18n("Afar") }, { "ab", i18n("Abkhazian") }, { "af", i18n("Afrikaans") }, { "am", i18n("Amharic")}, @@ -276,7 +277,7 @@ int k9DVD::calcNumTitle(ifo_handle_t *ifo,int _vts,int _ttn) { } -int k9DVD::scandvd (const QString & device,bool _quickScan) { +int k9DVD::scandvd (const TQString & device,bool _quickScan) { char ctitle[255]; k9DVDChapter::setcptChapter(0); ifo_handle_t *ifo_zero, *ifo; @@ -293,7 +294,7 @@ int k9DVD::scandvd (const QString & device,bool _quickScan) { int max_length = 0; bool ok; tt_srpt_t *tt_srpt; - QString txt,c; + TQString txt,c; m_start=NULL; int menuSizes[100]; @@ -307,29 +308,29 @@ int k9DVD::scandvd (const QString & device,bool _quickScan) { m_errMsg=""; if (!_quickScan) { - m_progressDlg= new k9DVDProgress(qApp->mainWidget(),"progress",true); + m_progressDlg= new k9DVDProgress(tqApp->mainWidget(),"progress",true); m_progressDlg->setpbTitleStep(0); m_progressDlg->setpbTotalStep(0); - connect(this, SIGNAL(sigVobProgress(unsigned int,unsigned int)), this, SLOT(slotVobProgress(unsigned int,unsigned int))); - connect(this, SIGNAL(sigTitleProgress(unsigned int,unsigned int)), this, SLOT(slotTitleProgress(unsigned int,unsigned int))); - connect(this, SIGNAL(sigTitleText(QString&)), this, SLOT(slotTitleText(QString&))); - connect(this, SIGNAL(sigTotalText(QString&)), this, SLOT(slotTotalText(QString&))); + connect(this, TQT_SIGNAL(sigVobProgress(unsigned int,unsigned int)), this, TQT_SLOT(slotVobProgress(unsigned int,unsigned int))); + connect(this, TQT_SIGNAL(sigTitleProgress(unsigned int,unsigned int)), this, TQT_SLOT(slotTitleProgress(unsigned int,unsigned int))); + connect(this, TQT_SIGNAL(sigTitleText(TQString&)), this, TQT_SLOT(slotTitleText(TQString&))); + connect(this, TQT_SIGNAL(sigTotalText(TQString&)), this, TQT_SLOT(slotTotalText(TQString&))); m_progressDlg->show(); } else m_progressDlg=NULL; - qApp->processEvents(); + tqApp->processEvents(); k9DVDTitle *l_track; k9DVDAudioStream *l_auds; k9DVDChapter *l_chap; k9DVDSubtitle *l_sub; - QString sh,sm,ss; + TQString sh,sm,ss; /* 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; } @@ -339,7 +340,7 @@ int k9DVD::scandvd (const QString & 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; } @@ -392,8 +393,8 @@ int k9DVD::scandvd (const QString & 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; @@ -430,7 +431,7 @@ int k9DVD::scandvd (const QString & device,bool _quickScan) { l_track->FPS = m_frames_per_s[(pgc->playback_time.frame_u & 0xc0) >> 6]; l_track->format= (*m_lvideoFormat.at(video_attr->video_format)); m_format = l_track->format; - /* QStringList::Iterator it; + /* TQStringList::Iterator it; it= videoFormat.at(video_attr->video_format); c= (*it).latin1(); */ @@ -442,7 +443,7 @@ int k9DVD::scandvd (const QString & device,bool _quickScan) { l_track->DF = (*m_lpermittedDf.at(video_attr->permitted_df)); for (i=0; i<16; i++) { - QString pal; + TQString pal; pal.sprintf("%08x",pgc->palette[i]); l_track->palette.append(pal); } @@ -574,7 +575,7 @@ int k9DVD::scandvd (const QString & device,bool _quickScan) { l_chap->length.setHMS(hour,minute,second); l_chap->sectors=sectors; if (l_pchap!=NULL) { - QTime t; + TQTime t; int position; t.setHMS(0,0,0); position=t.secsTo(l_chap->length); @@ -599,10 +600,10 @@ int k9DVD::scandvd (const QString & device,bool _quickScan) { subpc=(pgc->subp_control[i]>>16) & 0x1F; l_sub->id.append(1+ subpc); subpc=(pgc->subp_control[i]>>8) & 0x1F; - if (! l_sub->id.contains(1+ subpc) && ! l_track->DF.contains("noletterbox")) + if (! l_sub->id.tqcontains(1+ subpc) && ! l_track->DF.tqcontains("noletterbox")) l_sub->id.append(1+ subpc); subpc=pgc->subp_control[i] & 0x1F; - if (! l_sub->id.contains(1+ subpc) && ! l_track->DF.contains("nopanscan")) + if (! l_sub->id.tqcontains(1+ subpc) && ! l_track->DF.tqcontains("nopanscan")) l_sub->id.append(1+ subpc); } kdDebug() << "VTS: " << l_track->VTS << " TTN: " << l_track->TTN << \ @@ -690,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++) { @@ -712,7 +713,7 @@ void k9DVD::calcStreamSize(k9DVDTitle & track) { k9DVDChapter *c_start,*c_stop; struct streamSize streamList[64]; int c, x; - QString pg; + TQString pg; for( x=0 ; x<64 ; x++ ) { // init stream usage list streams[x].id = 0; @@ -810,7 +811,7 @@ void k9DVD::calcStreamSize(k9DVDTitle & track) { break; int id=streamList[x].id; if ( (id >=0x20) && (id <=0x3f)) { - if ( l_sub->id.contains(id - 0x20 +1) ) { + if ( l_sub->id.tqcontains(id - 0x20 +1) ) { l_sub->size_mb = streamList[x].size_mb; break; } @@ -855,10 +856,10 @@ long k9DVD::stream_vob( int title, unsigned long startblock, unsigned long lastb long total=0; unsigned long i, x ,nbread=0; ssize_t size; - QString c; + 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; } @@ -869,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; } @@ -993,26 +994,26 @@ float k9DVD::getfactor(bool _withMenus,bool _streams,bool _useDvdAuthor) { void k9DVD::slotVobProgress(unsigned int position,unsigned int total) { m_progressDlg->setpbTitleStep(position); m_progressDlg->setpbTitleTotalSteps(total); - qApp->processEvents(); + tqApp->processEvents(); } void k9DVD::slotTitleProgress(unsigned int position,unsigned int total) { m_progressDlg->setpbTotalStep(position); m_progressDlg->setpbTotalTotalSteps(total); - qApp->processEvents(); + tqApp->processEvents(); } -void k9DVD::slotTitleText(QString& text) { +void k9DVD::slotTitleText(TQString& text) { m_progressDlg->setlblTitle(text); - qApp->processEvents(); + tqApp->processEvents(); } -void k9DVD::slotTotalText(QString& text) { +void k9DVD::slotTotalText(TQString& text) { m_progressDlg->setlblTotal(text); - qApp->processEvents(); + tqApp->processEvents(); } -const QString& k9DVD::getDevice() { +const TQString& k9DVD::getDevice() { return m_Device; } @@ -1020,11 +1021,11 @@ const bool& k9DVD::geterror() { return m_error; } -const QString& k9DVD::geterrMsg() { +const TQString& k9DVD::geterrMsg() { return m_errMsg; } -void k9DVD::setError(const QString & err) { +void k9DVD::setError(const TQString & err) { m_error=true; m_errMsg=err; if (m_progressDlg !=NULL) @@ -1036,7 +1037,7 @@ const bool& k9DVD::getopened() { } -QString &k9DVD::getFormat() { +TQString &k9DVD::getFormat() { return (m_format); } diff --git a/libk9copy/k9dvd.h b/libk9copy/k9dvd.h index 55182df..94ca07c 100755 --- a/libk9copy/k9dvd.h +++ b/libk9copy/k9dvd.h @@ -21,9 +21,9 @@ #define K9DVD_H #include "k9common.h" #include "k9dvdread.h" -#include <qstringlist.h> -#include <qdatetime.h> -#include <qvaluelist.h> +#include <tqstringlist.h> +#include <tqdatetime.h> +#include <tqvaluelist.h> struct streamSize { @@ -48,39 +48,40 @@ class k9DVDTitleset; *@author */ -class k9DVD : public QObject { -Q_OBJECT +class k9DVD : public TQObject { +Q_OBJECT +TQ_OBJECT private: - QObjectList m_titles; - QPtrList<k9DVDTitleset> m_titlesets; - QString m_title; + TQObjectList m_titles; + TQPtrList<k9DVDTitleset> m_titlesets; + TQString m_title; int m_titleCount; k9DVDTitle *m_longestTitle; - QStringList m_lvideoFormat; - QStringList m_laspectRatio; - QStringList m_lquantization; - QStringList m_lmpegVersion; - QStringList m_lvideoHeight; - QStringList m_lvideoWidth; - QStringList m_lpermittedDf; - QStringList m_laudioFormat; - QStringList m_lsampleFreq; - QStringList m_laudioType; - QStringList m_lsubpType; - QStringList m_langCode; - QStringList m_langName; + TQStringList m_lvideoFormat; + TQStringList m_laspectRatio; + TQStringList m_lquantization; + TQStringList m_lmpegVersion; + TQStringList m_lvideoHeight; + TQStringList m_lvideoWidth; + TQStringList m_lpermittedDf; + TQStringList m_laudioFormat; + TQStringList m_lsampleFreq; + TQStringList m_laudioType; + TQStringList m_lsubpType; + TQStringList m_langCode; + TQStringList m_langName; double m_frames_per_s[4]; uint m_menuSize; k9DVDProgress *m_progressDlg; - QString m_Device; + TQString m_Device; bool m_error; - QString m_errMsg; + TQString m_errMsg; bool m_opened; - QString m_format; + TQString m_format; k9DVDTitle* m_start; int m_titlesetCount; public: - k9DVD(QObject *parent=0,const char *name=0,const QStringList args=0) ; + k9DVD(TQObject *tqparent=0,const char *name=0,const TQStringList args=0) ; ~k9DVD(); /** @@ -88,19 +89,19 @@ public: * @param device input device * @return return code (0=ok) */ - virtual int scandvd (const QString & device,bool _quickScan); + virtual int scandvd (const TQString & device,bool _quickScan); /** * gets the title of the DVD * @return DVD title */ - virtual const QString& getDVDTitle(); + virtual const TQString& getDVDTitle(); /** * set the title of the DVD * @param _newVal the new DVD title */ - virtual void setDVDTitle(const QString &_newVal); + virtual void setDVDTitle(const TQString &_newVal); /** * @@ -130,12 +131,12 @@ public: virtual k9DVDTitle* gettitleByNum(int num); virtual k9DVDTitle *getlongestTitle(); virtual float getfactor(bool withMenus,bool _streams,bool _useDvdAuthor); - virtual const QString& getDevice(); + virtual const TQString& getDevice(); virtual const bool& geterror(); - virtual const QString& geterrMsg(); + virtual const TQString& geterrMsg(); virtual const bool& getopened(); virtual uint64_t getsizeSelected(bool _streams); - virtual QString &getFormat(); + virtual TQString &getFormat(); virtual k9DVDTitle* getstart(); virtual void setstart(k9DVDTitle* title); virtual int getnewTitleNum(k9DVDTitle *title); @@ -143,7 +144,7 @@ public: virtual void close(); virtual k9DVDTitleset *gettitleset(int num); virtual k9DVDRead * getdvd() {return &m_dvd;} - static QString lang_name(const QString & code,const QString & name); + static TQString lang_name(const TQString & code,const TQString & name); private: // Private methods k9DVDRead m_dvd; k9DVDTitle* addTitle(k9DVDTitleset *titleset,int id,int num,int _VTS,int _pgc,uint32_t _startSector, bool _indexed); @@ -153,22 +154,22 @@ private: // Private methods int dvdtime2msec(dvd_time_t *dt); int get_title_name(const char* dvd_device, char* title); void calcStreamSize(k9DVDTitle & title); - void setError(const QString &err); + void setError(const TQString &err); int getVampsID(int type); int calcNumTitle(ifo_handle_t *ifo,int _vts,int _ttn); public slots: // Public slots void slotVobProgress(unsigned int position,unsigned int total); void slotTitleProgress(unsigned int position,unsigned int total); - void slotTitleText(QString &text); - void slotTotalText(QString &text); + void slotTitleText(TQString &text); + void slotTotalText(TQString &text); signals: // Signals void sigVobProgress(unsigned int position,unsigned int total); void sigTitleProgress(unsigned int position,unsigned int total); - void sigTitleText(QString &text); - void sigTotalText(QString &text); + void sigTitleText(TQString &text); + void sigTotalText(TQString &text); }; -typedef struct lng { char code[3]; QString name;}; +typedef struct lng { char code[3]; TQString name;}; #endif diff --git a/libk9copy/k9dvdauthor.cpp b/libk9copy/k9dvdauthor.cpp index 8ee4959..51aa324 100755 --- a/libk9copy/k9dvdauthor.cpp +++ b/libk9copy/k9dvdauthor.cpp @@ -25,36 +25,36 @@ #include <sys/types.h> #include <sys/stat.h> -#include <qdom.h> -#include <qfile.h> -#include <qnamespace.h> -#include <qprocess.h> -#include <qdir.h> -#include <qdatetime.h> -#include <qdatastream.h> -#include <qfile.h> -#include <qlabel.h> -#include <qprogressdialog.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqnamespace.h> +#include <tqprocess.h> +#include <tqdir.h> +#include <tqdatetime.h> +#include <tqdatastream.h> +#include <tqfile.h> +#include <tqlabel.h> +#include <tqprogressdialog.h> #include <signal.h> #include <klocale.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <kstandarddirs.h> -#include <qapplication.h> +#include <tqapplication.h> class k9Progress; -k9DVDAuthor::k9DVDAuthor(QObject *DVDStruct,const char* name,const QStringList& args) { +k9DVDAuthor::k9DVDAuthor(TQObject *DVDStruct,const char* name,const TQStringList& args) { DVD=(k9DVD*)DVDStruct; xml=NULL; cancelled=false; error=false; - progress = new k9Progress(qApp->mainWidget(),"progress",NULL); + progress = new k9Progress(tqApp->mainWidget(),"progress",NULL); files.setAutoDelete(true); } k9DVDAuthor::~k9DVDAuthor() { - QPtrListIterator <KTempFile> it (files); + TQPtrListIterator <KTempFile> it (files); KTempFile *file; while ( (file = it.current()) != 0 ) { ++it; @@ -69,14 +69,14 @@ void k9DVDAuthor::createXML() { int i; if (xml!=NULL) delete xml; - xml=new QDomDocument(); + xml=new TQDomDocument(); - QDomElement root = xml->createElement( "dvdauthor" ); + TQDomElement root = xml->createElement( "dvdauthor" ); root.setAttribute ("dest",workDir+"dvd"); xml->appendChild( root ); // Create vmgm menu - QDomElement vmgm = xml->createElement("vmgm"); + TQDomElement vmgm = xml->createElement("vmgm"); root.appendChild(vmgm); addMenus(vmgm); @@ -118,24 +118,24 @@ void k9DVDAuthor::createXML() { addTitle(root,tmp); } - QString x = xml->toString(); + TQString x = xml->toString(); - //QFile file( locateLocal("tmp", "k9copy/k9author.xml" )); + //TQFile file( locateLocal("tmp", "k9copy/k9author.xml" )); // if ( file.open( IO_WriteOnly ) ) { - QTextStream stream( m_xml->file() ); + TQTextStream stream( m_xml->file() ); xml->save(stream,1); m_xml->file()->close(); // } } -void k9DVDAuthor::addMenus(QDomElement &titleSet) { +void k9DVDAuthor::addMenus(TQDomElement &titleSet) { int i; - QDomElement menu,video,pgc,pre,vob,button; - QDomText precmd; - QDomText buttonText; - QTime max(0,0); - QString c,start; + TQDomElement menu,video,pgc,pre,vob,button; + TQDomText precmd; + TQDomText buttonText; + TQTime max(0,0); + TQString c,start; k9DVDTitle * l_track= DVD->getstart(); if (l_track==NULL) { @@ -143,9 +143,9 @@ void k9DVDAuthor::addMenus(QDomElement &titleSet) { } else { if( DVD->getnewTitleNum(l_track)==-1) { error=true; - QString sMsg; - //sMsg.QString::sprintf(tr2i18n("'%s' not selected"),l_track->getname().latin1()); - sMsg=i18n("'%1' not selected").arg(l_track->getname()); + TQString sMsg; + //sMsg.TQString::sprintf(tr2i18n("'%s' not selected"),l_track->getname().latin1()); + 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)); @@ -159,7 +159,7 @@ void k9DVDAuthor::addMenus(QDomElement &titleSet) { pre=xml->createElement("pre"); pgc.appendChild(pre); precmd=xml->createTextNode(""); - QString cmd="if (g0==0) \n { \n subtitle=0; \n g0=1;\n "+start+"\n}\n"; + TQString cmd="if (g0==0) \n { \n subtitle=0; \n g0=1;\n "+start+"\n}\n"; pre.appendChild(precmd); int numt=0; @@ -174,14 +174,14 @@ void k9DVDAuthor::addMenus(QDomElement &titleSet) { } /** No descriptions */ -void k9DVDAuthor::addTitle(QDomElement &root, k9DVDTitle *title) { +void k9DVDAuthor::addTitle(TQDomElement &root, k9DVDTitle *title) { int i,j; k9DVDSubtitle *l_sub; k9DVDAudioStream *l_auds; k9DVDTitle *l_track= title; - QDomElement e,t,pgc; - QString caud="",csub="",c,palette; + TQDomElement e,t,pgc; + TQString caud="",csub="",c,palette; if (l_track->isSelected() && l_track->getIndexed()) { double titleFactor; @@ -189,15 +189,15 @@ void k9DVDAuthor::addTitle(QDomElement &root, k9DVDTitle *title) { titleFactor=l_track->getfactor(); else titleFactor=factor; - QDomElement titleSet = xml->createElement("titleset"); + TQDomElement titleSet = xml->createElement("titleset"); root.appendChild(titleSet); - QDomElement titleMenu = xml->createElement("menus"); + TQDomElement titleMenu = xml->createElement("menus"); titleSet.appendChild(titleMenu); - QDomElement pgc = xml->createElement("pgc"); + TQDomElement pgc = xml->createElement("pgc"); titleMenu.appendChild(pgc); - QDomElement pre = xml->createElement("pre"); + TQDomElement pre = xml->createElement("pre"); pgc.appendChild(pre); - QDomText precmd=xml->createTextNode(""); + TQDomText precmd=xml->createTextNode(""); int subtitle=0,audio=-1; if (l_track->getDefSubtitle() != NULL) { @@ -219,13 +219,13 @@ void k9DVDAuthor::addTitle(QDomElement &root, k9DVDTitle *title) { } } - QString txtcmd; + 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); @@ -239,7 +239,7 @@ void k9DVDAuthor::addTitle(QDomElement &root, k9DVDTitle *title) { //palette.sprintf("palette%d.yuv",l_track->getnumTitle()); //palette= locateLocal("tmp", "k9copy/k9" +palette); - QTextStream stream( paletteFile->file() ); + TQTextStream stream( paletteFile->file() ); for (j=0;j<16;j++) { l_track->getpalette(j,c); stream << c+"\n"; @@ -334,28 +334,28 @@ void k9DVDAuthor::addTitle(QDomElement &root, k9DVDTitle *title) { bool first=true; uint32_t chapterSize= (l_chap->getendSector()-l_chap->getstartSector())*DVD_VIDEO_LB_LEN; - QString sChapter,sCell; + TQString sChapter,sCell; for (k9ChapterCell *cell =l_chap->cells.first();cell ;cell =l_chap->cells.next() ) { icell++; - sCell = QString("--cell %1").arg(icell); - sChapter=QString("--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; - QString file; + TQString file; e=xml->createElement("vob"); - file=QString("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); + 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); if (m_firsttitle) { file +=" --initstatus "; m_firsttitle=false; @@ -363,10 +363,10 @@ void k9DVDAuthor::addTitle(QDomElement &root, k9DVDTitle *title) { if (l_track->getforceFactor()) { file +=" --ffactor "; } - file +=QString(" --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); + 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); e.setAttribute("file",file); if (first) @@ -378,16 +378,16 @@ void k9DVDAuthor::addTitle(QDomElement &root, k9DVDTitle *title) { } } - QDomElement post = xml->createElement("post"); + TQDomElement post = xml->createElement("post"); pgc.appendChild(post); - QDomText postcmd=xml->createTextNode(""); + TQDomText postcmd=xml->createTextNode(""); k9DVDTitle * l_next=l_track->getnextTitle(); if (l_next!=NULL) { 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")); } @@ -399,10 +399,10 @@ void k9DVDAuthor::addTitle(QDomElement &root, k9DVDTitle *title) { } -const QString& k9DVDAuthor::getworkDir() { +const TQString& k9DVDAuthor::getworkDir() { return workDir; } -void k9DVDAuthor::setworkDir( const QString& _newVal) { +void k9DVDAuthor::setworkDir( const TQString& _newVal) { workDir = _newVal; if (workDir.right(1)!='/') workDir +='/'; @@ -411,7 +411,7 @@ void k9DVDAuthor::setworkDir( const QString& _newVal) { void k9DVDAuthor::author() { if ( ! k9Tools::checkProgram("dvdauthor")) { - KMessageBox::error (qApp->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; } @@ -421,7 +421,7 @@ void k9DVDAuthor::author() { //nettoyage du répertoire de sortie k9Tools::clearOutput(workDir+"dvd"); - time = new QTime(0,0); + time = new TQTime(0,0); time->start(); progress->setTitle(i18n("Authoring")); @@ -441,14 +441,14 @@ void k9DVDAuthor::author() { //run dvdauthor if (!cancelled && !error) { - QString c("dvdauthor"); - proc=progress->getProcess();// new QProcess(c,0); + TQString c("dvdauthor"); + proc=progress->getProcess();// new TQProcess(c,0); *proc << c << "-x" << m_xml->name(); //locateLocal("tmp", "k9copy/k9author.xml"); - connect( proc, SIGNAL(receivedStderr(KProcess *, char *, int)), - this, SLOT(DVDAuthorStderr(KProcess *, char *, int )) ); - connect( proc, SIGNAL(receivedStdout(KProcess *, char *, int )), - this, SLOT(DVDAuthorStdout(KProcess *, char *, int)) ); - // connect(progress, SIGNAL(cancelled()), this, SLOT(stopProcess())); + connect( proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), + this, TQT_SLOT(DVDAuthorStderr(KProcess *, char *, int )) ); + connect( proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), + this, TQT_SLOT(DVDAuthorStdout(KProcess *, char *, int)) ); + // connect(progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(stopProcess())); m_copied=0; m_lastPos=0; @@ -465,7 +465,7 @@ void k9DVDAuthor::author() { burnOk=true; } else { if (cancelled) { - //QMessageBox::critical( 0, tr2i18n("authoring"), tr2i18n("Authoring canceled")); + //TQMessageBox::critical( 0, tr2i18n("authoring"), tr2i18n("Authoring canceled")); KMessageBox::error( 0, tr2i18n("Authoring cancelled"),tr2i18n("authoring")); } else @@ -490,29 +490,29 @@ void k9DVDAuthor::author() { /** No descriptions */ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { - //QString m_stderr(proc->readStderr()); - QString m_stderr=QString::fromLatin1(buffer, buflen); + //TQString m_stderr(proc->readStderr()); + TQString m_stderr=TQString::tqfromLatin1(buffer, buflen); float m_percent; - QString m_remain; + TQString m_remain; - int pos=m_stderr.find("INFOPOS:"); + int pos=m_stderr.tqfind("INFOPOS:"); if (pos!=-1) { progress->setTitle(i18n("Authoring")); - QString tmp=m_stderr.mid(pos); + TQString tmp=m_stderr.mid(pos); uint32_t totalBytes,totalSize; sscanf(tmp.latin1(),"INFOPOS: %d %d",&totalBytes,&totalSize); //if (totalBytes>m_lastPos) // m_copied+=totalBytes - m_lastPos; m_copied=totalBytes; m_lastPos=totalBytes; - //qDebug(QString("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 ); - QTime time2(0,0); + TQTime time2(0,0); time2=time2.addMSecs(time->elapsed()); if (m_percent>0) { - QTime time3(0,0); + TQTime time3(0,0); time3=time3.addMSecs((uint32_t)(time->elapsed()*(1/m_percent))); m_remain=time3.toString("hh:mm:ss"); } @@ -532,12 +532,12 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { int end; lastMsg=m_stderr; - if (m_stderr.contains("STAT:")) { - pos=m_stderr.find("fixing VOBU"); + if (m_stderr.tqcontains("STAT:")) { + pos=m_stderr.tqfind("fixing VOBU"); if (pos!=-1) { progress->setTitle(i18n("Authoring")); progress->setLabelText(i18n("Fixing VOBUS")); - end=m_stderr.find("%"); + end=m_stderr.tqfind("%"); if (end!=-1) { pos =end -2; m_stderr=m_stderr.mid(pos,end-pos); @@ -548,7 +548,7 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { } } - pos=m_stderr.find("INFOIMAGE:"); + pos=m_stderr.tqfind("INFOIMAGE:"); if (pos!=-1) { progress->setImage(m_stderr.mid(pos+10)); } @@ -558,14 +558,14 @@ void k9DVDAuthor::DVDAuthorStderr(KProcess *proc, char *buffer, int buflen ) { } void k9DVDAuthor::DVDAuthorStdout(KProcess *proc, char *buffer, int buflen) { - QString c=QString::fromLatin1( buffer,buflen); + TQString c=TQString::tqfromLatin1( buffer,buflen); //(proc->readStdout()); int pos; - pos=c.find("STAT"); + pos=c.tqfind("STAT"); if (pos!=-1) { c=c.mid(pos); progress->setLabelText(c); - qApp->processEvents(); + tqApp->processEvents(); } } diff --git a/libk9copy/k9dvdauthor.h b/libk9copy/k9dvdauthor.h index 83a5265..60fdd26 100755 --- a/libk9copy/k9dvdauthor.h +++ b/libk9copy/k9dvdauthor.h @@ -24,37 +24,38 @@ #include "k9dvd.h" #include "k9progress.h" -#include <qdom.h> +#include <tqdom.h> #include "k9process.h" -#include <qdatastream.h> -#include <qprogressdialog.h> +#include <tqdatastream.h> +#include <tqprogressdialog.h> #include <klocale.h> #include <ktempfile.h> /** *@author */ -class k9DVDAuthor : public QObject { +class k9DVDAuthor : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9DVDAuthor(QObject *DVDStruct,const char* name=0,const QStringList& args=0) ; + k9DVDAuthor(TQObject *DVDStruct,const char* name=0,const TQStringList& args=0) ; ~k9DVDAuthor(); - virtual void setworkDir( const QString& _newVal); - virtual const QString& getworkDir(); + virtual void setworkDir( const TQString& _newVal); + virtual const TQString& getworkDir(); virtual bool getError(); virtual void author(); virtual void setburnDVD( const bool& _newVal); virtual const bool& getburnDVD(); - virtual QWidget *getDialog(){return progress;}; + virtual TQWidget *getDialog(){return progress;}; private: // Private attributes /** */ - QTime *time; + TQTime *time; k9DVD* DVD; double factor; - QDomDocument *xml; - QString lastMsg,totSize,inject; + TQDomDocument *xml; + TQString lastMsg,totSize,inject; k9Process *proc; - QString workDir; + TQString workDir; k9Progress *progress; bool cancelled; bool error; @@ -65,11 +66,11 @@ private: // Private attributes uint32_t m_copied,m_lastPos; uint64_t m_totalPartSize; KTempFile *m_xml,*m_inject; - QPtrList <KTempFile> files; + TQPtrList <KTempFile> files; void createXML(); - void addTitle(QDomElement &root, k9DVDTitle *title); + void addTitle(TQDomElement &root, k9DVDTitle *title); void createMenus(bool preview); - void addMenus(QDomElement &titleSet); + void addMenus(TQDomElement &titleSet); void processMenu(); void spumux(); private slots: // Private slots diff --git a/libk9copy/k9dvdbackup.cpp b/libk9copy/k9dvdbackup.cpp index a651475..48a1463 100755 --- a/libk9copy/k9dvdbackup.cpp +++ b/libk9copy/k9dvdbackup.cpp @@ -26,8 +26,8 @@ #include "k9dvdtitleset.h" #include <kmessagebox.h> #include <kapplication.h> -#include <qapplication.h> -#include <qfileinfo.h> +#include <tqapplication.h> +#include <tqfileinfo.h> #include <stdio.h> #include <stdlib.h> @@ -35,7 +35,7 @@ #include <errno.h> #include <string.h> #include <klocale.h> -#include <qdir.h> +#include <tqdir.h> #include <kstandarddirs.h> #include "k9backupdlg.h" #include "dvdread.h" @@ -47,13 +47,13 @@ #include "k9dvdbackup.moc" -int k9CadtList::compareItems(QPtrCollection::Item item1,QPtrCollection::Item item2) { +int k9CadtList::compareItems(TQPtrCollection::Item item1,TQPtrCollection::Item item2) { cell_adr_t * it1=(cell_adr_t*)item1; cell_adr_t * it2=(cell_adr_t*)item2; return it1->start_sector - it2->start_sector; }; -int k9TitleSetList::compareItems ( QPtrCollection::Item item1, QPtrCollection::Item item2 ) { +int k9TitleSetList::compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ) { k9TitleSet * it1,*it2; it1=(k9TitleSet *) item1; it2=(k9TitleSet *)item2; @@ -67,7 +67,7 @@ int k9TitleSetList::compareItems ( QPtrCollection::Item item1, QPtrCollection::I } */ -k9TitleSet::k9TitleSet(int _VTS):QObject(NULL,"") { +k9TitleSet::k9TitleSet(int _VTS):TQObject(NULL,"") { startSector=0; lastSector=0; VTS=_VTS; @@ -90,8 +90,8 @@ uint32_t k9TitleSet::getSize() { } -k9DVDBackup::k9DVDBackup(QObject* _dvd,const char* name,const QStringList& ) - : QObject(NULL, name) { +k9DVDBackup::k9DVDBackup(TQObject* _dvd,const char* name,const TQStringList& ) + : TQObject(NULL, name) { DVD = (k9DVD*)_dvd; m_dvdread=DVD->getdvd(); currVTS=0; @@ -99,7 +99,7 @@ k9DVDBackup::k9DVDBackup(QObject* _dvd,const char* name,const QStringList& ) currTS=NULL; errMsg=""; error=false; - backupDlg = new k9BackupDlg(qApp->mainWidget(),"",true); + backupDlg = new k9BackupDlg(tqApp->mainWidget(),"",true); // cells.setAutoDelete(true); vamps=new k9vamps(this); m_withMenu=false; @@ -125,13 +125,13 @@ bool k9DVDBackup::geterror() { return error; } -void k9DVDBackup::seterror(const QString &_msg) { +void k9DVDBackup::seterror(const TQString &_msg) { error=true; errMsg=_msg; } -QString k9DVDBackup::getErrMsg() { +TQString k9DVDBackup::getErrMsg() { return(errMsg); } @@ -196,10 +196,10 @@ void k9DVDBackup::prepareVTS(int _VTS) { delete outputFile; } - QString filename; + TQString filename; filename.sprintf("/VTS_%02d_1.VOB",_VTS); filename=output+filename; - outputFile=new QFile(filename); + outputFile=new TQFile(filename); if (! outputFile->open(IO_WriteOnly)) { seterror(tr2i18n("Unable to open file ") + filename); return; @@ -249,7 +249,7 @@ void k9DVDBackup::copyCell(int _VTS,k9Cell * _cell,bool _empty) { vamps->reset(); vamps->setPreserve(true); vamps->setInputSize(argSize); - QValueList<int>::iterator it; + TQValueList<int>::iterator it; for ( it = _cell->audio.begin(); it != _cell->audio.end(); ++it ) { if (m_preserve) vamps->addAudio(*it); @@ -262,12 +262,12 @@ void k9DVDBackup::copyCell(int _VTS,k9Cell * _cell,bool _empty) { } vamps->setVapFactor(argFactor); - vamps->start(QThread::NormalPriority); + vamps->start(TQThread::NormalPriority); } playCell(_VTS,_cell,_empty); } else copyEmptyPgc(_VTS,_cell); - qApp->processEvents(); + tqApp->processEvents(); } void k9DVDBackup::copyEmptyPgc(int _vts,k9Cell *_cell) { @@ -279,14 +279,14 @@ void k9DVDBackup::copyEmptyPgc(int _vts,k9Cell *_cell) { k9DVDFile *dvdfile; if ((dvdfile = m_dvdread->openTitle( _vts))== 0) { - QString stmp; - stmp=i18n("Unable to open titleset %1").arg(_vts); + TQString stmp; + 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); - QString c; - c=i18n("Extracting titleset %1").arg(_vts); + TQString c; + c=i18n("Extracting titleset %1").tqarg(_vts); backupDlg->setProgressLabel(c); backupDlg->show(); @@ -351,7 +351,7 @@ void k9DVDBackup::getOutput(uchar * buffer, uint32_t buflen) { m_cellCopyList->addFrcoutbytes( buflen); uchar *temp =buffer; - QString sName; + TQString sName; if ((buflen %2048) !=0) qDebug("getOutput, buffer : %u",buflen); uint end=0; @@ -368,7 +368,7 @@ void k9DVDBackup::getOutput(uchar * buffer, uint32_t buflen) { k9Vobu * vobu = vobuQueue.dequeue(); - cellOut=vobu->parent; + cellOut=vobu->tqparent; dsi_t dsiPack; navRead_DSI (&dsiPack, (uchar*)(temp+itemp) + DSI_START_BYTE); @@ -382,7 +382,7 @@ void k9DVDBackup::getOutput(uchar * buffer, uint32_t buflen) { else sName.sprintf("/VTS_%02d_%d.VOB",(int)currVTS,(int)currVOB); sName=output+sName; - outputFile=new QFile(sName); + outputFile=new TQFile(sName); if ( !outputFile->open(IO_WriteOnly)) { seterror(tr2i18n("Unable to open file ") + sName); mutex.unlock(); @@ -403,18 +403,18 @@ void k9DVDBackup::getOutput(uchar * buffer, uint32_t buflen) { /*! -\fn k9DVDBackup::setDevice(QString _device) +\fn k9DVDBackup::setDevice(TQString _device) */ -void k9DVDBackup::setDevice(QString _device) { +void k9DVDBackup::setDevice(TQString _device) { device=_device; } /*! -\fn k9DVDBackup::setOutput(QString _output) +\fn k9DVDBackup::setOutput(TQString _output) */ -void k9DVDBackup::setOutput(QString _output) { - output=QDir::cleanDirPath(_output); +void k9DVDBackup::setOutput(TQString _output) { + output=TQDir::cleanDirPath(_output); } @@ -441,7 +441,7 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) { m_position=0; m_copyMenu=true; - QString targetName; + TQString targetName; if (_vts == 0) { targetName="VIDEO_TS.VOB"; } else { @@ -449,7 +449,7 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) { } targetName=output+"/"+targetName; - outputFile=new QFile(targetName); + outputFile=new TQFile(targetName); if (! outputFile->open(IO_WriteOnly)) { seterror(tr2i18n("Unable to open file ") + targetName); return 0; @@ -457,8 +457,8 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) { k9DVDFile *dvdfile; if ((dvdfile = m_dvdread->openMenu( _vts))== 0) { - QString stmp; - stmp=i18n("Unable to open menu for titleset %1").arg(_vts); + TQString stmp; + stmp=i18n("Unable to open menu for titleset %1").tqarg(_vts); seterror (stmp); return 0; } @@ -483,8 +483,8 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) { uint32_t sector, dsi_next_vobu = 0; uint32_t imax=length/sizeof(cell_adr_t); - QString c; - c=i18n("Extracting menu for titleset %1").arg(_vts); + TQString c; + 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() << QString("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(); @@ -516,7 +516,7 @@ uint32_t k9DVDBackup::copyMenu2(int _vts) { vamps->setVapFactor(argFactor); vamps->setInputSize(msize*2048); - vamps->start(QThread::NormalPriority); + vamps->start(TQThread::NormalPriority); // while(!vamps->running() && !vamps->finished()); for(uint32_t i = 0; i < nbCells; i++) { @@ -576,16 +576,16 @@ void k9DVDBackup::playCell (int vts_num, k9Cell *_cell,bool _empty) { // vts_handle = ifoOpen (dvd_handle, vts_num); vts_handle=currTS->ifoTitle->getIFO(); if (!vts_handle) { - QString stmp; - stmp=i18n("Unable to open ifo file for titleset %1").arg(vts_num); + TQString stmp; + stmp=i18n("Unable to open ifo file for titleset %1").tqarg(vts_num); seterror (stmp); //JMP vamps->setNoData(); return; } backupDlg->setTotalSteps( vts_handle->vtsi_mat->vts_last_sector-vts_handle->vtsi_mat->vtstt_vobs -1); - QString c; - c=i18n("Extracting titleset %1").arg(vts_num); + TQString c; + c=i18n("Extracting titleset %1").tqarg(vts_num); backupDlg->setProgressLabel(c); backupDlg->show(); } else { @@ -598,8 +598,8 @@ void k9DVDBackup::playCell (int vts_num, k9Cell *_cell,bool _empty) { /* open VTS data */ dvdfile = m_dvdread->openTitle (vts_num); if (! dvdfile) { - QString stmp; - stmp=i18n("Unable to open vobs for titleset %1").arg(vts_num); + TQString stmp; + stmp=i18n("Unable to open vobs for titleset %1").tqarg(vts_num); seterror( stmp); //JMP vamps->setNoData(); return; @@ -807,7 +807,7 @@ uint32_t k9DVDBackup::copyVobu(k9DVDFile *_fileHandle,uint32_t _startSector,k9V m_cellCopyList->addFrcinbytes( nsectors*DVD_VIDEO_LB_LEN); mutex.lock(); - qApp->processEvents(); + tqApp->processEvents(); mutex.unlock(); return (end+1); @@ -817,13 +817,13 @@ uint32_t k9DVDBackup::copyVobu(k9DVDFile *_fileHandle,uint32_t _startSector,k9V k9Vobu * k9DVDBackup::remapVobu(uint32_t *value) { k9Vobu *vobu=NULL; - uint32_t sector,mask; + uint32_t sector,tqmask; if ( (*value & 0x80000000) == 0x80000000) { sector = *value & 0x7FFFFFFF; - mask=0x80000000; + tqmask=0x80000000; } else { sector =*value; - mask=0; + tqmask=0; } *value=0; k9CellList *lstCell; @@ -837,7 +837,7 @@ k9Vobu * k9DVDBackup::remapVobu(uint32_t *value) { } vobu=lstCell->findVobu(sector); if (vobu !=NULL) { - *value = vobu->newSector | mask; + *value = vobu->newSector | tqmask; return vobu; } @@ -850,22 +850,22 @@ k9Vobu * k9DVDBackup::remapVobu(uint32_t *value) { k9Vobu * k9DVDBackup::remapOffset(uint32_t _sector,uint32_t *_offset,int _dir) { k9Vobu *vobu1=NULL, *vobu2=NULL; uint32_t offset,sector; - uint32_t maskOffset1=0,maskOffset2=0,maskSector=0; + uint32_t tqmaskOffset1=0,tqmaskOffset2=0,tqmaskSector=0; if ((*_offset!= 0xbfffffff) && (*_offset!=0x3fffffff) && (*_offset!=0x7fffffff)) { if ( (*_offset & 0x80000000) == 0x80000000) - maskOffset1= 0x80000000; + tqmaskOffset1= 0x80000000; if ( (*_offset & 0x40000000) == 0x40000000) - maskOffset2= 0x40000000; + tqmaskOffset2= 0x40000000; offset = *_offset & 0x3FFFFFFF; if ( (_sector & 0x80000000) == 0x80000000) { sector = _sector & 0x7FFFFFFF; - maskSector=0x80000000; + tqmaskSector=0x80000000; } else { sector =_sector; - maskSector=0; + tqmaskSector=0; } k9CellList *lstCell; @@ -883,8 +883,8 @@ k9Vobu * k9DVDBackup::remapOffset(uint32_t _sector,uint32_t *_offset,int _dir) { if ((vobu1 !=NULL) && (vobu2!=NULL)) { - *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ; - *_offset |= maskOffset2; + *_offset = abs(vobu1->newSector - vobu2->newSector) | tqmaskOffset1 ; + *_offset |= tqmaskOffset2; return vobu2; } @@ -1099,7 +1099,7 @@ void k9DVDBackup::update4Menu(ifo_handle_t *_hifo) { qDebug ("Error : could not find startSector"); else { if (remapVobu(&lastSect)==NULL) - lastSect=vobu->parent->lastSector; + lastSect=vobu->tqparent->lastSector; else lastSect--; ptr[i].start_sector = startSect; @@ -1312,7 +1312,7 @@ void k9DVDBackup::updateIfo() { qDebug ("Error : could not find startSector"); else { if (remapVobu(&lastSect)==NULL) - lastSect= vobu->parent->lastSector; + lastSect= vobu->tqparent->lastSector; else lastSect--; ptr[i].start_sector = startSect; @@ -1347,10 +1347,10 @@ void k9DVDBackup::updateIfo() { newPos=0; for(uint32_t j = 0; j < vts_tmapt->tmap[i].nr_of_entries; j++) { //bit 31 indicates whether VOBU time codes are discontinous with previous - uint32_t mask=map_ent[j] & 0x80000000 ; + uint32_t tqmask=map_ent[j] & 0x80000000 ; uint32_t value=map_ent[j] & 0x7FFFFFFF; if (remapVobu(&value) !=NULL) { - map_ent[j]=value | mask; + map_ent[j]=value | tqmask; map_ent[newPos]=map_ent[j]; newPos++; } else @@ -1371,15 +1371,15 @@ void k9DVDBackup::updateVob(k9CellList *cellLst) { int nbVobuUpdated=0; uchar buffer[DVD_VIDEO_LB_LEN]; - QFile *file=NULL; - QString dbg; + TQFile *file=NULL; + TQString dbg; int pVobNum=-1; //for (uint iCell=0;iCell<currTS->cells.count();iCell++) { // k9Cell *cell=currTS->cells.at(iCell); for (uint iCell=0;iCell< cellLst->count();iCell++) { k9Cell *cell=cellLst->at(iCell); for (uint ivobu=0; ivobu<cell->vobus.count();ivobu++) { - qApp->processEvents(); + tqApp->processEvents(); k9Vobu * vobu = cell->vobus.at(ivobu); int VobNum=vobu->vobNum; if (error) @@ -1390,19 +1390,19 @@ void k9DVDBackup::updateVob(k9CellList *cellLst) { delete file; } //fclose(file); - QString sName; + TQString sName; if (currVTS==0) 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; - QFileInfo finfo(sName); + TQFileInfo finfo(sName); long fileSize=finfo.size(); backupDlg->setTotalSteps(fileSize); backupDlg->setProgressLabel(dbg); - file =new QFile(sName); + file =new TQFile(sName); file->open( IO_ReadWrite); //file=fopen(sName,"r+b"); pVobNum=VobNum; @@ -1509,12 +1509,12 @@ void k9DVDBackup::updateVob(k9CellList *cellLst) { if (dsiPack.sml_pbi.ilvu_sa !=0) { k9Vobu *vobu2=remapOffset(sector,&dsiPack.sml_pbi.ilvu_sa,1); if (vobu2!= NULL) { - QFile *file2; + TQFile *file2; if ( vobu2->vobNum != VobNum) { - QString sName; + TQString sName; sName.sprintf("/VTS_%02d_%d.VOB",(int)currVTS,(int)vobu2->vobNum); sName=output+sName; - file2=new QFile(sName); + file2=new TQFile(sName); file2->open(IO_ReadWrite); //file2=fopen(sName,"rb"); } else @@ -1622,7 +1622,7 @@ uint k9DVDBackup::getLastCell(k9CellCopyList *_cellCopyList, uint _index) { memset(subpOrig,0,sizeof(uchar)*32); ; - QValueList<int>::iterator it; + TQValueList<int>::iterator it; for ( it = orig->audio.begin(); it != orig->audio.end(); ++it ) audioOrig[*it -1]=1; @@ -1647,7 +1647,7 @@ uint k9DVDBackup::getLastCell(k9CellCopyList *_cellCopyList, uint _index) { memset(audio,0,sizeof(uchar)*8); memset(subp,0,sizeof(uchar)*32); ; - QValueList<int>::iterator it; + TQValueList<int>::iterator it; for ( it = cell->audio.begin(); it != cell->audio.end(); ++it ) audio[*it -1]=1; @@ -1670,7 +1670,7 @@ uint k9DVDBackup::getLastCell(k9CellCopyList *_cellCopyList, uint _index) { void k9DVDBackup::calcFactor() { double factor=m_cellCopyList->getfactor(m_withMenu,false); - QString sFactor; + TQString sFactor; sFactor.sprintf("%.2f",factor); backupDlg->setFactor(sFactor); argFactor = factor; @@ -1682,7 +1682,7 @@ void k9DVDBackup::forceFactor(double _factor) { double minFactor=m_cellCopyList->getMinFactor( m_withMenu); if (factor<minFactor) factor=minFactor; - QString sFactor; + TQString sFactor; sFactor.sprintf("%.2f",factor); backupDlg->setFactor(sFactor); argFactor = factor; @@ -1692,19 +1692,19 @@ void k9DVDBackup::forceFactor(double _factor) { void k9DVDBackup::execute() { - QString sOutput=output; + TQString sOutput=output; - output=QDir::cleanDirPath(output +"/dvd"); + output=TQDir::cleanDirPath(output +"/dvd"); - QDir root("/"); + TQDir root("/"); root.mkdir(output); k9Tools::clearOutput(output); - QDir dir(output); + TQDir dir(output); dir.mkdir("VIDEO_TS"); dir.mkdir("AUDIO_TS"); - output=QDir::cleanDirPath(output +"/VIDEO_TS"); + output=TQDir::cleanDirPath(output +"/VIDEO_TS"); m_dvdread->openDevice(device); if (!m_dvdread->opened()) { diff --git a/libk9copy/k9dvdbackup.h b/libk9copy/k9dvdbackup.h index 36349ef..1b56e17 100755 --- a/libk9copy/k9dvdbackup.h +++ b/libk9copy/k9dvdbackup.h @@ -24,9 +24,9 @@ #include "k9cell.h" #include "k9cellcopylist.h" #include "k9dvdread.h" -#include <qptrqueue.h> -#include <qmutex.h> -#include <qfile.h> +#include <tqptrqueue.h> +#include <tqmutex.h> +#include <tqfile.h> /** @author Jean-Michel Petit */ @@ -34,8 +34,9 @@ class k9BackupDlg; class k9Ifo2; -class k9TitleSet : public QObject { +class k9TitleSet : public TQObject { Q_OBJECT + TQ_OBJECT public: k9TitleSet(int _VTS); ~k9TitleSet(); @@ -50,37 +51,38 @@ public: private: }; -class k9TitleSetList:public QPtrList <k9TitleSet> { +class k9TitleSetList:public TQPtrList <k9TitleSet> { protected: - int compareItems ( QPtrCollection::Item item1, QPtrCollection::Item item2 ); + int compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ); }; -class k9CadtList:public QPtrList<cell_adr_t> { +class k9CadtList:public TQPtrList<cell_adr_t> { protected: - int compareItems(QPtrCollection::Item item1,QPtrCollection::Item item2); + int compareItems(TQPtrCollection::Item item1,TQPtrCollection::Item item2); }; class k9vamps; -class k9DVDBackup : public QObject { +class k9DVDBackup : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9DVDBackup(QObject *_dvd,const char* name=0,const QStringList& args=0) ; + k9DVDBackup(TQObject *_dvd,const char* name=0,const TQStringList& args=0) ; ~k9DVDBackup(); - virtual void setDevice(QString _device); - virtual void setOutput(QString _output); - virtual QString getErrMsg(); + virtual void setDevice(TQString _device); + virtual void setOutput(TQString _output); + virtual TQString getErrMsg(); virtual void execute(); virtual bool geterror(); virtual void setWithMenus(bool _value); - virtual QWidget *getDialog() {return (QWidget*)backupDlg;}; + virtual TQWidget *getDialog() {return (TQWidget*)backupDlg;}; public slots: void getOutput(uchar *buffer,uint32_t size); protected: - QString device; - QString output; + TQString device; + TQString output; bool wrote; private: k9DVDRead *m_dvdread; @@ -88,9 +90,9 @@ private: bool m_withMenu; bool m_forcedFactor; k9DVD *DVD; - QString errMsg; - QString vampsMsg; - QFile* outputFile; + TQString errMsg; + TQString vampsMsg; + TQFile* outputFile; long cellSize; long currVTS; k9TitleSet *currTS; @@ -129,10 +131,10 @@ private: void calcFactor(); void forceFactor(double _factor); bool error; - void seterror(const QString &_msg); + void seterror(const TQString &_msg); k9vamps *vamps; - QPtrQueue <k9Vobu> vobuQueue; - QMutex mutex; + TQPtrQueue <k9Vobu> vobuQueue; + TQMutex mutex; }; diff --git a/libk9copy/k9dvdchapter.cpp b/libk9copy/k9dvdchapter.cpp index e96385e..9268bbe 100644 --- a/libk9copy/k9dvdchapter.cpp +++ b/libk9copy/k9dvdchapter.cpp @@ -18,8 +18,8 @@ const int& k9DVDChapter::getnum() { return num; } -/** Read property of QTime length. */ -const QTime& k9DVDChapter::getlength() +/** Read property of TQTime length. */ +const TQTime& k9DVDChapter::getlength() { return length; } @@ -30,7 +30,7 @@ const int& k9DVDChapter::getsectors() return sectors; } -const QTime& k9DVDChapter::gettime() +const TQTime& k9DVDChapter::gettime() { return time; } diff --git a/libk9copy/k9dvdchapter.h b/libk9copy/k9dvdchapter.h index b7e2826..9b8affc 100644 --- a/libk9copy/k9dvdchapter.h +++ b/libk9copy/k9dvdchapter.h @@ -14,7 +14,7 @@ #include "k9common.h" #include "k9dvd.h" -#include <qptrlist.h> +#include <tqptrlist.h> static int cptChapter=0; @@ -22,9 +22,10 @@ static int cptChapter=0; enum angleBlock_t {angleNone=0,angleInside=1,angleStart=3,angleEnd=5}; class k9DVDTitle; -class k9ChapterCell :public QObject +class k9ChapterCell :public TQObject { Q_OBJECT + TQ_OBJECT public: k9ChapterCell(uint _id,uint _angle){ m_id=_id;m_angle=_angle;m_angleBlock=angleNone;}; virtual uint getid() {return m_id;}; @@ -43,9 +44,10 @@ private: uint32_t m_startSector,m_lastSector; }; -class k9DVDChapter : public QObject +class k9DVDChapter : public TQObject { Q_OBJECT + TQ_OBJECT friend class k9DVDTitle; friend class k9DVD; private: // Private attributes @@ -53,8 +55,8 @@ private: // Private attributes int num; int id; /** */ - QTime length; - QTime time; + TQTime length; + TQTime time; /** */ int sectors; unsigned long startSector; @@ -67,13 +69,13 @@ public: // Public methods k9DVDChapter(); /** Read property of int num. */ virtual const int& getnum(); - /** Read property of QTime length. */ - virtual const QTime& getlength(); + /** Read property of TQTime length. */ + virtual const TQTime& getlength(); /** Read property of int sectors. */ virtual const int& getsectors(); - QPtrList<k9ChapterCell> cells; - QValueList<uint32_t> startSectors; - virtual const QTime & gettime(); + TQPtrList<k9ChapterCell> cells; + TQValueList<uint32_t> startSectors; + virtual const TQTime & gettime(); virtual k9DVDTitle * getTitle(); unsigned long getstartSector() { return startSector;}; unsigned long getendSector() {return endSector;}; diff --git a/libk9copy/k9dvdprogress.cpp b/libk9copy/k9dvdprogress.cpp index 43c3ad8..08e8a70 100755 --- a/libk9copy/k9dvdprogress.cpp +++ b/libk9copy/k9dvdprogress.cpp @@ -19,11 +19,11 @@ ***************************************************************************/ #include "k9dvdprogress.h" -#include <qprogressbar.h> -#include <qlabel.h> +#include <tqprogressbar.h> +#include <tqlabel.h> -k9DVDProgress::k9DVDProgress(QWidget* parent, const char* name, bool modal, WFlags fl) - : DVDProgress( parent, name, modal, fl ) +k9DVDProgress::k9DVDProgress(TQWidget* tqparent, const char* name, bool modal, WFlags fl) + : DVDProgress( tqparent, name, modal, fl ) { } @@ -47,15 +47,15 @@ void k9DVDProgress::setpbTotalStep(int position){ pbTotal->setProgress(position); } /** No descriptions */ -void k9DVDProgress::setlblTitle(QString & text){ +void k9DVDProgress::setlblTitle(TQString & text){ lblTitle->setText(text); } /** No descriptions */ -void k9DVDProgress::setlblTotal(QString& text){ +void k9DVDProgress::setlblTotal(TQString& text){ lblTotal->setText(text); } -void k9DVDProgress::closeEvent( QCloseEvent* ce ) +void k9DVDProgress::closeEvent( TQCloseEvent* ce ) { ce->ignore(); return; diff --git a/libk9copy/k9dvdprogress.h b/libk9copy/k9dvdprogress.h index 3458278..6d4ebc3 100755 --- a/libk9copy/k9dvdprogress.h +++ b/libk9copy/k9dvdprogress.h @@ -29,8 +29,9 @@ class k9DVDProgress : public DVDProgress { Q_OBJECT + TQ_OBJECT public: - k9DVDProgress(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + k9DVDProgress(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~k9DVDProgress(); /** No descriptions */ void setpbTitleTotalSteps(unsigned int total); @@ -41,11 +42,11 @@ public: /** No descriptions */ void setpbTotalStep(int position); /** No descriptions */ - void setlblTitle(QString & text); + void setlblTitle(TQString & text); /** No descriptions */ - void setlblTotal(QString& text); + void setlblTotal(TQString& text); protected: - void closeEvent( QCloseEvent* ce ); + void closeEvent( TQCloseEvent* ce ); }; #endif diff --git a/libk9copy/k9dvdread.cpp b/libk9copy/k9dvdread.cpp index 1ec173d..54f1ad7 100644 --- a/libk9copy/k9dvdread.cpp +++ b/libk9copy/k9dvdread.cpp @@ -36,9 +36,9 @@ k9DVDFile::~k9DVDFile() { } /*! - \fn k9DVDRead::openDevice(const QString & _device) + \fn k9DVDRead::openDevice(const TQString & _device) */ -void k9DVDRead::openDevice(const QString & _device) { +void k9DVDRead::openDevice(const TQString & _device) { m_dvd=DVDOpen(_device.utf8()); //turn UDF cache off //DVDUDFCacheLevel(m_dvd, 0 ); @@ -63,12 +63,12 @@ k9Ifo2 *k9DVDRead::getIfo(int _num) { return ifo; } -QString k9DVDRead::getDiscId() { +TQString k9DVDRead::getDiscId() { uchar ID[17]; -QString id=""; +TQString id=""; if (DVDDiscID(m_dvd,ID) !=-1) { ID[16]=0; - id=QString::fromLatin1((const char*)ID); + id=TQString::tqfromLatin1((const char*)ID); } return id; } diff --git a/libk9copy/k9dvdread.h b/libk9copy/k9dvdread.h index b962c12..38bd6e0 100644 --- a/libk9copy/k9dvdread.h +++ b/libk9copy/k9dvdread.h @@ -13,7 +13,7 @@ #define K9DVDREAD_H #include "k9common.h" -#include <qlibrary.h> +#include <tqlibrary.h> /** @author Jean-Michel PETIT <[email protected]> @@ -27,7 +27,7 @@ friend class k9DVDRead; private: dvd_file_t *m_file; k9DVDRead *m_dvd; - QLibrary *m_library; + TQLibrary *m_library; void openIfo(uint _vts); void openMenu(uint _vts); void openTitle(uint _vts); @@ -45,17 +45,17 @@ class k9DVDRead{ friend class k9DVDTitle; private: dvd_reader_t *m_dvd; - QPtrList <k9DVDFile> files; - QPtrList <k9Ifo2> ifos; + TQPtrList <k9DVDFile> files; + TQPtrList <k9Ifo2> ifos; public: k9DVDRead(); ~k9DVDRead(); - void openDevice(const QString & _device); + void openDevice(const TQString & _device); k9DVDFile *openIfo(uint _vts); k9DVDFile *openMenu(uint _vts); k9DVDFile *openTitle(uint _vts); k9Ifo2 *getIfo(int _num); - QString getDiscId(); + TQString getDiscId(); void close(); bool opened(); diff --git a/libk9copy/k9dvdsize.cpp b/libk9copy/k9dvdsize.cpp index 41360cc..ae872ed 100644 --- a/libk9copy/k9dvdsize.cpp +++ b/libk9copy/k9dvdsize.cpp @@ -13,7 +13,7 @@ int DVD_MAX_SIZE=4400; -k9DVDSize::k9DVDSize(QObject *parent,const char *name,const QStringList args) +k9DVDSize::k9DVDSize(TQObject *tqparent,const char *name,const TQStringList args) { } diff --git a/libk9copy/k9dvdsize.h b/libk9copy/k9dvdsize.h index fee2278..ddb6aad 100644 --- a/libk9copy/k9dvdsize.h +++ b/libk9copy/k9dvdsize.h @@ -12,17 +12,18 @@ #ifndef K9DVDSIZE_H #define K9DVDSIZE_H -#include <qobject.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstringlist.h> /** @author Jean-Michel PETIT */ -class k9DVDSize:public QObject { +class k9DVDSize:public TQObject { Q_OBJECT + TQ_OBJECT private: static int m_size; public: - k9DVDSize(QObject *parent=0,const char *name=0,const QStringList args=0) ; + k9DVDSize(TQObject *tqparent=0,const char *name=0,const TQStringList args=0) ; static int getMaxSize(); static void setMaxSize(int _size); virtual int getMaxSizeDyn(); diff --git a/libk9copy/k9dvdtitle.cpp b/libk9copy/k9dvdtitle.cpp index acd2bdb..21a8e79 100644 --- a/libk9copy/k9dvdtitle.cpp +++ b/libk9copy/k9dvdtitle.cpp @@ -20,14 +20,14 @@ #include "k9dvdtitle.h" -#include <qapplication.h> +#include <tqapplication.h> #include <string.h> #include <sys/stat.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> #include "k9dvdtitleset.h" #include "k9titleencopt.h" @@ -37,17 +37,17 @@ k9DVDAudioStream::k9DVDAudioStream() { selected=false; } -/** Read property of QString format. */ -const QString& k9DVDAudioStream::getformat() { +/** Read property of TQString format. */ +const TQString& k9DVDAudioStream::getformat() { return format; } -/** Read property of QString frequency. */ -const QString& k9DVDAudioStream::getfrequency() { +/** Read property of TQString frequency. */ +const TQString& k9DVDAudioStream::getfrequency() { return frequency; } -/** Read property of QString quantization. */ -const QString& k9DVDAudioStream::getquantization() { +/** Read property of TQString quantization. */ +const TQString& k9DVDAudioStream::getquantization() { return quantization; } /** Read property of int channels. */ @@ -58,8 +58,8 @@ const int& k9DVDAudioStream::getchannels() { const int& k9DVDAudioStream::getappMode() { return appMode; } -/** Read property of QString content. */ -const QString& k9DVDAudioStream::getcontent() { +/** Read property of TQString content. */ +const TQString& k9DVDAudioStream::getcontent() { return content; } @@ -84,12 +84,12 @@ void k9DVDAudioStream::setselected( const bool& _newVal) { title->selectChapters( after); } -/** Read property of QString langCod. */ -const QString& k9DVDAudioStream::getlangCod() { +/** Read property of TQString langCod. */ +const TQString& k9DVDAudioStream::getlangCod() { return langCod; } -/** Read property of QString language. */ -const QString& k9DVDAudioStream::getlanguage() { +/** Read property of TQString language. */ +const TQString& k9DVDAudioStream::getlanguage() { return language; } @@ -109,20 +109,20 @@ k9DVDSubtitle::k9DVDSubtitle() { } -/** Read property of QString langCod. */ -const QString& k9DVDSubtitle::getlangCod() { +/** Read property of TQString langCod. */ +const TQString& k9DVDSubtitle::getlangCod() { return langCod; } -/** Read property of QString language. */ -const QString& k9DVDSubtitle::getlanguage() { +/** Read property of TQString language. */ +const TQString& k9DVDSubtitle::getlanguage() { return language; } /** Read property of int num. */ const int& k9DVDSubtitle::getnum() { return num; } -/** Read property of QString content. */ -const QString& k9DVDSubtitle::getcontent() { +/** Read property of TQString content. */ +const TQString& k9DVDSubtitle::getcontent() { return content; } @@ -153,7 +153,7 @@ k9DVDTitle * k9DVDSubtitle::gettitle() { /*! \fn k9DVDSubtitle::getID() */ -QValueList<int>& k9DVDSubtitle::getID() { +TQValueList<int>& k9DVDSubtitle::getID() { return id; } @@ -219,7 +219,7 @@ const int& k9DVDTitle::getsubPictureCount() { return subPictureCount; } /** Read property of int streamCount. */ -const QTime& k9DVDTitle::getlength() { +const TQTime& k9DVDTitle::getlength() { return length; } @@ -283,11 +283,11 @@ const float k9DVDTitle::gettotalvideosize_mb() { } -QTime k9DVDTitle::gettotallength() { - QTime totalTime=getlength(); +TQTime k9DVDTitle::gettotallength() { + TQTime totalTime=getlength(); for (uint i=0;i<m_titles.count();i++) { k9DVDTitle *tmp=m_titles.at(i); - QTime t; + TQTime t; int msecs= t.msecsTo(tmp->getlength()); totalTime=totalTime.addMSecs(msecs); } @@ -295,11 +295,11 @@ QTime k9DVDTitle::gettotallength() { } -QTime k9DVDTitle::getSelectedLength() { - QTime totalTime(0,0); +TQTime k9DVDTitle::getSelectedLength() { + TQTime totalTime(0,0); for (k9DVDChapter *chapter=chapters.first();chapter;chapter=chapters.next()) { if (chapter->getSelected()) { - QTime t; + TQTime t; int msecs= t.msecsTo(chapter->getlength()); totalTime=totalTime.addMSecs(msecs); } @@ -308,10 +308,10 @@ QTime k9DVDTitle::getSelectedLength() { for (uint i=0;i<m_titles.count();i++) { k9DVDTitle *tmp=m_titles.at(i); - QPtrList <k9DVDChapter> tchapters=tmp->getChapters(); + TQPtrList <k9DVDChapter> tchapters=tmp->getChapters(); for (k9DVDChapter *chapter=tchapters.first();chapter;chapter=tchapters.next()) { if (chapter->getSelected()) { - QTime t; + TQTime t; int msecs= t.msecsTo(chapter->getlength()); totalTime=totalTime.addMSecs(msecs); } @@ -340,28 +340,28 @@ const int& k9DVDTitle::getTTN() { const float& k9DVDTitle::getFPS() { return FPS; } -/** Read property of QString format. */ -const QString& k9DVDTitle::getformat() { +/** Read property of TQString format. */ +const TQString& k9DVDTitle::getformat() { return format; } -/** Read property of QString aspectRatio. */ -const QString& k9DVDTitle::getaspectRatio() { +/** Read property of TQString aspectRatio. */ +const TQString& k9DVDTitle::getaspectRatio() { return aspectRatio; } -/** Read property of QString width. */ -const QString& k9DVDTitle::getwidth() { +/** Read property of TQString width. */ +const TQString& k9DVDTitle::getwidth() { return width; } -/** Read property of QString height. */ -const QString& k9DVDTitle::getheight() { +/** Read property of TQString height. */ +const TQString& k9DVDTitle::getheight() { return height; } -/** Read property of QString palette. */ -void k9DVDTitle::getpalette(int i,QString & c) { +/** Read property of TQString palette. */ +void k9DVDTitle::getpalette(int i,TQString & c) { c=*palette.at(i); } -/** Read property of QString DF. */ -const QString& k9DVDTitle::getDF() { +/** Read property of TQString DF. */ +const TQString& k9DVDTitle::getDF() { return DF; } /** Read property of int angleCount. */ @@ -406,12 +406,12 @@ bool k9DVDTitle::isSelected() { } -/** Read property of QString name. */ -const QString& k9DVDTitle::getname() { +/** Read property of TQString name. */ +const TQString& k9DVDTitle::getname() { return name; } -/** Write property of QString name. */ -void k9DVDTitle::setname( const QString& _newVal) { +/** Write property of TQString name. */ +void k9DVDTitle::setname( const TQString& _newVal) { name = _newVal; } diff --git a/libk9copy/k9dvdtitle.h b/libk9copy/k9dvdtitle.h index 9b29f53..4e74ddc 100644 --- a/libk9copy/k9dvdtitle.h +++ b/libk9copy/k9dvdtitle.h @@ -23,41 +23,43 @@ #include "k9common.h" #include "k9dvd.h" #include "k9dvdchapter.h" -#include <qdatetime.h> -#include <qstringlist.h> -#include <qptrlist.h> +#include <tqdatetime.h> +#include <tqstringlist.h> +#include <tqptrlist.h> class k9DVDTitleSet; -class k9DVDVideoStream : public QObject{ +class k9DVDVideoStream : public TQObject{ Q_OBJECT +TQ_OBJECT friend class k9DVDTitle; private: // Private attributes public: // Public methods }; -class k9DVDAudioStream : public QObject{ +class k9DVDAudioStream : public TQObject{ Q_OBJECT +TQ_OBJECT friend class k9DVDTitle; friend class k9DVD; private: // Private attributes /** */ - QString langCod; + TQString langCod; /** */ - QString language; + TQString language; /** */ - QString format; + TQString format; /** */ - QString frequency; + TQString frequency; /** */ - QString quantization; + TQString quantization; /** */ int channels; /** */ int appMode; /** */ - QString content; + TQString content; /** */ float size_mb; /** */ @@ -67,22 +69,22 @@ private: // Private attributes int m_streamId; public: // Public methods k9DVDAudioStream(); - /** Read property of QString langCod. */ - virtual const QString& getlangCod(); - /** Read property of QString language. */ - virtual const QString& getlanguage(); - /** Read property of QString format. */ - virtual const QString& getformat(); - /** Read property of QString frequency. */ - virtual const QString& getfrequency(); - /** Read property of QString quantization. */ - virtual const QString& getquantization(); + /** Read property of TQString langCod. */ + virtual const TQString& getlangCod(); + /** Read property of TQString language. */ + virtual const TQString& getlanguage(); + /** Read property of TQString format. */ + virtual const TQString& getformat(); + /** Read property of TQString frequency. */ + virtual const TQString& getfrequency(); + /** Read property of TQString quantization. */ + virtual const TQString& getquantization(); /** Read property of int channels. */ virtual const int& getchannels(); /** Read property of int appMode. */ virtual const int& getappMode(); - /** Read property of QString content. */ - virtual const QString& getcontent(); + /** Read property of TQString content. */ + virtual const TQString& getcontent(); /** Read property of float size_mb. */ virtual const float& getsize_mb(); /** Write property of bool selected. */ @@ -97,35 +99,36 @@ public: // Public methods }; -class k9DVDSubtitle : public QObject{ +class k9DVDSubtitle : public TQObject{ Q_OBJECT +TQ_OBJECT friend class k9DVDTitle; friend class k9DVD; private: // Private attributes /** */ - QString langCod; + TQString langCod; /** */ - QString language; + TQString language; /** */ int num; /** */ - QString content; + TQString content; /** */ float size_mb; /** */ bool selected; - QValueList<int> id; + TQValueList<int> id; k9DVDTitle *title; public: // Public methods k9DVDSubtitle(); - /** Read property of QString langCod. */ - virtual const QString& getlangCod(); - /** Read property of QString language. */ - virtual const QString& getlanguage(); + /** Read property of TQString langCod. */ + virtual const TQString& getlangCod(); + /** Read property of TQString language. */ + virtual const TQString& getlanguage(); /** Read property of int num. */ virtual const int& getnum(); - /** Read property of QString content. */ - virtual const QString& getcontent(); + /** Read property of TQString content. */ + virtual const TQString& getcontent(); /** Read property of float size_mb. */ virtual const float& getsize_mb(); /** Write property of bool selected. */ @@ -133,15 +136,16 @@ public: // Public methods /** Read property of bool selected. */ virtual const bool& getselected(); virtual k9DVDTitle* gettitle(); - virtual QValueList<int>& getID(); + virtual TQValueList<int>& getID(); }; class k9TitleEncOpt; -class k9DVDTitle : public QObject{ -Q_OBJECT +class k9DVDTitle : public TQObject{ +Q_OBJECT +TQ_OBJECT friend class k9DVD; private: // Public attributes unsigned int ts_nr; @@ -149,25 +153,25 @@ private: // Public attributes int streamCount; int audioStreamCount; int subPictureCount; - QTime length; + TQTime length; k9DVDVideoStream videoStream; - QObjectList audioStreams; - QObjectList subtitles; + TQObjectList audioStreams; + TQObjectList subtitles; int VTS; int TTN; float FPS; - QString format; - QString aspectRatio; + TQString format; + TQString aspectRatio; int numTitle; - QString width; - QString height; - QStringList palette; - QString DF; + TQString width; + TQString height; + TQStringList palette; + TQString DF; float size_mb; int angleCount; float videosize_mb; float vobusize_mb; - QString name; + TQString name; k9DVDTitle* nextTitle; int id; k9DVDTitleset *m_titleset; @@ -175,7 +179,7 @@ private: // Public attributes k9DVDSubtitle *m_defSubtitle; bool m_defAudioSet; bool m_defSubtitleSet; - QPtrList <k9DVDTitle> m_titles; + TQPtrList <k9DVDTitle> m_titles; uint32_t m_sectors; bool m_forceFactor; float m_factor; @@ -187,19 +191,19 @@ public: // Public methods virtual const int& getstreamCount(); virtual const int& getaudioStreamCount(); virtual const int& getsubPictureCount(); - virtual const QTime& getlength(); - virtual QTime gettotallength(); - virtual QTime getSelectedLength(); + virtual const TQTime& getlength(); + virtual TQTime gettotallength(); + virtual TQTime getSelectedLength(); virtual const int& getVTS(); virtual const int& getTTN(); virtual const float& getFPS(); - virtual const QString& getformat(); - virtual const QString& getaspectRatio(); - virtual const QString& getwidth(); - virtual const QString& getheight(); - virtual void getpalette(int i,QString & c); - virtual const QString& getDF(); + virtual const TQString& getformat(); + virtual const TQString& getaspectRatio(); + virtual const TQString& getwidth(); + virtual const TQString& getheight(); + virtual void getpalette(int i,TQString & c); + virtual const TQString& getDF(); virtual const int& getangleCount(); virtual const int& getnumTitle(); virtual k9DVDAudioStream *getaudioStream(int num); @@ -211,8 +215,8 @@ public: // Public methods virtual const uint64_t getChaptersSize(bool _selected); virtual const float& getvideosize_mb(); virtual bool isSelected(); - virtual void setname( const QString& _newVal); - virtual const QString& getname(); + virtual void setname( const TQString& _newVal); + virtual const TQString& getname(); virtual int getpgc(); virtual void setnextTitle(k9DVDTitle * nTitle); virtual k9DVDTitle* getnextTitle(); @@ -226,12 +230,12 @@ public: // Public methods virtual k9DVDSubtitle* getDefSubtitle() const; virtual bool getDefAudioSet() const {return m_defAudioSet;}; virtual bool getDefSubtitleSet() const {return m_defSubtitleSet;}; - virtual QPtrList< k9DVDTitle > getTitles() const {return m_titles;}; + virtual TQPtrList< k9DVDTitle > getTitles() const {return m_titles;}; virtual uint32_t getsectors() { return m_sectors;}; virtual float getfactor() { return m_factor;}; virtual bool getforceFactor() { return m_forceFactor;}; virtual void selectChapters(bool _state); - virtual QPtrList< k9DVDChapter > getChapters() const {return chapters;}; + virtual TQPtrList< k9DVDChapter > getChapters() const {return chapters;}; virtual k9TitleEncOpt* getEncOpt() ; public slots: @@ -244,7 +248,7 @@ private: // Private methods k9DVDAudioStream* addAudioStream(); k9DVDChapter* addChapter(int num); k9DVDSubtitle* addSubtitle(int num); - QPtrList <k9DVDChapter> chapters; + TQPtrList <k9DVDChapter> chapters; bool indexed; bool forceSelection; int pgc; diff --git a/libk9copy/k9dvdtitleset.cpp b/libk9copy/k9dvdtitleset.cpp index cfa445a..eb295ac 100644 --- a/libk9copy/k9dvdtitleset.cpp +++ b/libk9copy/k9dvdtitleset.cpp @@ -16,7 +16,7 @@ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> k9DVDTitleset::k9DVDTitleset( uint _num,uint32_t _size) { m_num=_num; @@ -28,10 +28,10 @@ k9DVDTitleset::k9DVDTitleset( uint _num,uint32_t _size) { }; -const QString k9DVDTitleset::getsize_mb() +const TQString k9DVDTitleset::getsize_mb() { double size_mb=(double)m_size /512; - QString c; + TQString c; c.sprintf("%.2f",size_mb); return c; } diff --git a/libk9copy/k9dvdtitleset.h b/libk9copy/k9dvdtitleset.h index 7e42522..1e32902 100644 --- a/libk9copy/k9dvdtitleset.h +++ b/libk9copy/k9dvdtitleset.h @@ -14,18 +14,19 @@ #include "k9common.h" #include "k9dvd.h" -#include <qdatetime.h> -#include <qstringlist.h> -#include <qptrlist.h> +#include <tqdatetime.h> +#include <tqstringlist.h> +#include <tqptrlist.h> #include "k9dvdtitle.h" -class k9DVDTitleset :public QObject +class k9DVDTitleset :public TQObject { Q_OBJECT + TQ_OBJECT private: int m_num; uint32_t m_size; - QPtrList <k9DVDTitle> titles; + TQPtrList <k9DVDTitle> titles; bool m_selected; bool m_updating; bool m_audioStreams[8]; @@ -35,7 +36,7 @@ public: virtual int count(); virtual k9DVDTitle *gettitle(uint _pos); virtual uint32_t getsize(); - virtual const QString getsize_mb(); + virtual const TQString getsize_mb(); virtual bool getselected(); virtual void setselected(bool state); virtual void updateSelection(); diff --git a/libk9copy/k9ifo2.cpp b/libk9copy/k9ifo2.cpp index 56ba072..8d5672e 100644 --- a/libk9copy/k9ifo2.cpp +++ b/libk9copy/k9ifo2.cpp @@ -23,7 +23,7 @@ k9Ifo2::k9Ifo2(k9DVDRead *_dvdread) - : QObject(NULL,"") { + : TQObject(NULL,"") { _ifo=NULL; m_dvd=_dvdread; } @@ -36,17 +36,17 @@ k9Ifo2::~k9Ifo2() { } /*! - \fn k9Ifo2::setDevice(QString &_device) + \fn k9Ifo2::setDevice(TQString &_device) */ -void k9Ifo2::setDevice(QString &_device) { +void k9Ifo2::setDevice(TQString &_device) { device=_device; } /*! - \fn k9Ifo2::setOutput(QString &_output) + \fn k9Ifo2::setOutput(TQString &_output) */ -void k9Ifo2::setOutput(QString &_output) { +void k9Ifo2::setOutput(TQString &_output) { output=_output; } @@ -85,7 +85,7 @@ void k9Ifo2::saveIFO() { k9DVDFile *dvdfile; bool mainIfo = (numIfo==0); - QString filename,filename2; + TQString filename,filename2; if (mainIfo) { filename="/VIDEO_TS/VIDEO_TS.IFO"; } else { @@ -174,17 +174,17 @@ void k9Ifo2::saveIFO() { filename2=output + filename2; } - QFile ifofile (filename); + TQFile ifofile (filename); ifofile.open(IO_WriteOnly); if (ifofile.writeBlock((char*)m_buffer,m_position) == -1) { - QString sError("erreur"); + TQString sError("erreur"); } ifofile.close(); - QFile ifofile2 (filename2); + TQFile ifofile2 (filename2); ifofile2.open(IO_WriteOnly); if (ifofile2.writeBlock((char*)m_buffer,m_position) == -1) { - QString sError("erreur"); + TQString sError("erreur"); } ifofile2.close(); @@ -419,7 +419,7 @@ void k9Ifo2::updateTT_SRPT(uchar *_buffer) { for(int i = 0; i < tt_srpt->nr_of_srpts; i++) { B2N_16(title_info[i].nr_of_ptts); - B2N_16(title_info[i].parental_id); + B2N_16(title_info[i].tqparental_id); B2N_32(title_info[i].title_set_sector); } memcpy(m_buffer+offset+TT_SRPT_SIZE,title_info,info_length); @@ -511,7 +511,7 @@ void k9Ifo2::updatePGCIT_internal(uchar *_buffer, pgcit_t *_pgcit, int _offset) m_position+=_pgcit->nr_of_pgci_srp*PGCI_SRP_SIZE; for(int i = 0; i < _pgcit->nr_of_pgci_srp; i++) { - B2N_16(pgci_srp[i].ptl_id_mask); + B2N_16(pgci_srp[i].ptl_id_tqmask); pgci_srp[i].pgc_start_byte=m_position-_offset; B2N_32(pgci_srp[i].pgc_start_byte); //JMP:faux updatePGC(_buffer,_pgcit->pgci_srp[i].pgc,m_position); @@ -856,7 +856,7 @@ void k9Ifo2::updateVTS_TMAPT(uchar *_buffer) { } -void k9Ifo2::checkBuffer(QString lib,uchar* _buffer) { +void k9Ifo2::checkBuffer(TQString lib,uchar* _buffer) { /* for (int j=0;j<bufCopySize;j++) { uchar *c,*c2; c=(uchar*) (_buffer+j); @@ -868,7 +868,7 @@ void k9Ifo2::checkBuffer(QString lib,uchar* _buffer) { */ return; if (memcmp(bufCopy,_buffer,bufCopySize)!=0) { - QString c; + TQString c; c="Buffer de sortie altéré: " +lib; qDebug(c.latin1()); } @@ -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/k9ifo2.h b/libk9copy/k9ifo2.h index da04944..2fbcf20 100644 --- a/libk9copy/k9ifo2.h +++ b/libk9copy/k9ifo2.h @@ -21,20 +21,21 @@ #define K9IFO2_H #include "k9common.h" #include "k9dvdread.h" -#include <qfile.h> +#include <tqfile.h> #include <stdlib.h> /** @author Jean-Michel Petit */ -class k9Ifo2 : public QObject { +class k9Ifo2 : public TQObject { Q_OBJECT + TQ_OBJECT public: k9Ifo2(k9DVDRead *_dvdread); ~k9Ifo2(); - void setDevice(QString &_device); - void setOutput(QString &_output); + void setDevice(TQString &_device); + void setOutput(TQString &_output); ifo_handle_t * openIFO(int _num); void closeIFO(); void saveIFO(); @@ -44,12 +45,12 @@ public: protected: - QString device; - QString output; + TQString device; + TQString output; ifo_handle_t *_ifo; int numIfo; private: - QFile* outputFile; + TQFile* outputFile; long cellSize; uchar * bufCopy,*m_buffer; int bufCopySize; @@ -78,7 +79,7 @@ private: void updateVTS_TMAPT(uchar *_buffer) ; void updateC_ADT_Internal(uchar *_buffer,c_adt_t *_c_adt,int _sector); void updateVOBU_ADMAP_Internal(uchar *_buffer,vobu_admap_t *_vobu_admap,int _sector); - void checkBuffer(QString lib,uchar *_buffer); + void checkBuffer(TQString lib,uchar *_buffer); }; diff --git a/libk9copy/k9mp4dlg.cpp b/libk9copy/k9mp4dlg.cpp index d8b5bda..407d4e9 100644 --- a/libk9copy/k9mp4dlg.cpp +++ b/libk9copy/k9mp4dlg.cpp @@ -12,19 +12,19 @@ #include "k9mp4dlg.h" -#include <qlabel.h> +#include <tqlabel.h> #include <kprogress.h> -#include <qpainter.h> +#include <tqpainter.h> #include <kstandarddirs.h> -#include <qlayout.h> +#include <tqlayout.h> #include "k9drawimage.h" -k9MP4Dlg::k9MP4Dlg(QWidget* parent, const char* name) -: MP4Dlg(parent,name, true) +k9MP4Dlg::k9MP4Dlg(TQWidget* tqparent, const char* name) +: MP4Dlg(tqparent,name, true) { m_wimage=new k9DrawImage(image,0); - QGridLayout *l=new QGridLayout(image,1,1); + TQGridLayout *l=new TQGridLayout(image,1,1); l->addWidget(m_wimage,0,0); m_timer.start(); } @@ -36,20 +36,20 @@ k9MP4Dlg::~k9MP4Dlg() /*$SPECIALIZATION$*/ void k9MP4Dlg::Cancel() { - //QDialog::accept(); + //TQDialog::accept(); emit sigCancel(); } -void k9MP4Dlg::setTitleLabel(QString _titleLabel) { +void k9MP4Dlg::setTitleLabel(TQString _titleLabel) { lblTitle->setText(_titleLabel); } -void k9MP4Dlg::setfps(QString _fps) { +void k9MP4Dlg::setfps(TQString _fps) { lblfps->setText(_fps); } -void k9MP4Dlg::setremain(QString _remain) { +void k9MP4Dlg::setremain(TQString _remain) { if (m_timer.elapsed() >=1000) { lblRemain->setText(_remain); m_timer.restart(); @@ -61,16 +61,16 @@ void k9MP4Dlg::setProgress(int _progress) { } -void k9MP4Dlg::setbitrate(QString _bitrate) { +void k9MP4Dlg::setbitrate(TQString _bitrate) { lblbitrate->setText(_bitrate); } -void k9MP4Dlg::setsize( QString _size) { +void k9MP4Dlg::setsize( TQString _size) { lblsize->setText(_size); } -void k9MP4Dlg::setImage(QString _fileName) { +void k9MP4Dlg::setImage(TQString _fileName) { m_wimage->setImage(_fileName); } diff --git a/libk9copy/k9mp4dlg.h b/libk9copy/k9mp4dlg.h index 266ed47..2b2e1b3 100644 --- a/libk9copy/k9mp4dlg.h +++ b/libk9copy/k9mp4dlg.h @@ -13,34 +13,35 @@ #ifndef K9MP4DLG_H #define K9MP4DLG_H #include "mp4dlg.h" -#include <qimage.h> -#include <qdatetime.h> +#include <tqimage.h> +#include <tqdatetime.h> class k9DrawImage; class k9MP4Dlg : public MP4Dlg { Q_OBJECT + TQ_OBJECT public: - k9MP4Dlg(QWidget* parent = 0, const char* name = 0); + k9MP4Dlg(TQWidget* tqparent = 0, const char* name = 0); ~k9MP4Dlg(); /*$PUBLIC_FUNCTIONS$*/ - void setfps(QString _fps); - void setsize(QString _size); - void setbitrate(QString _bitrate); - void setremain(QString _remain); + void setfps(TQString _fps); + void setsize(TQString _size); + void setbitrate(TQString _bitrate); + void setremain(TQString _remain); void setProgress(int _progress); - void setTitleLabel(QString _titleLabel); + void setTitleLabel(TQString _titleLabel); void Cancel(); - void setImage(QString _fileName) ; + void setImage(TQString _fileName) ; signals: /*$PUBLIC_SLOTS$*/ void sigCancel(); private: k9DrawImage *m_wimage; - QTime m_timer; + TQTime m_timer; protected: /*$PROTECTED_FUNCTIONS$*/ }; diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp index 7d82c4f..5d8c51c 100644 --- a/libk9copy/k9mp4enc.cpp +++ b/libk9copy/k9mp4enc.cpp @@ -12,23 +12,23 @@ #include "k9mp4enc.h" #include "k9mp4dlg.h" #include "k9config.h" -#include <qcstring.h> -#include <qapplication.h> +#include <tqcstring.h> +#include <tqapplication.h> #include <klocale.h> -#include <qstringlist.h> -#include <qdir.h> +#include <tqstringlist.h> +#include <tqdir.h> #include <kfiledialog.h> #include <kmessagebox.h> -#include <qstringlist.h> +#include <tqstringlist.h> #include <ktempfile.h> #include <kstandarddirs.h> #include "k9tools.h" #include "k9audiocodecs.h" #include "k9videocodecs.h" -#include <qcstring.h> +#include <tqcstring.h> -k9MP4Enc::k9MP4Enc ( QObject *parent, const char *name,const QStringList& ) - : QObject ( parent, name ) +k9MP4Enc::k9MP4Enc ( TQObject *tqparent, const char *name,const TQStringList& ) + : TQObject ( tqparent, name ) { m_fourcc=m_height=m_width=m_audioBitrate=m_videoBitrate=m_filename=""; m_codec=0; //lavc_mp4; @@ -36,27 +36,27 @@ k9MP4Enc::k9MP4Enc ( QObject *parent, const char *name,const QStringList& ) m_cpt=-1; m_parts=1; - QStringList laudio; - QStringList llabels; - QStringList lvideo; + TQStringList laudio; + TQStringList llabels; + TQStringList lvideo; k9Config config; m_lstAudio=config.getCodecAudio(); m_lstCodecs=config.getCodecLabels(); m_lstVideo=config.getCodecVideo(); - timer = new QTimer ( this ); - connect ( timer, SIGNAL ( timeout() ), this, SLOT ( timerDone() ) ); - m_progress=new k9MP4Dlg ( qApp->mainWidget(),0 ); + timer = new TQTimer ( this ); + connect ( timer, TQT_SIGNAL ( timeout() ), this, TQT_SLOT ( timerDone() ) ); + m_progress=new k9MP4Dlg ( tqApp->mainWidget(),0 ); } -QString k9MP4Enc::round16 ( QString _wh ) +TQString k9MP4Enc::round16 ( TQString _wh ) { if ( _wh !="" ) { int value=_wh.toInt() /16; - return QString::number ( value*16 ); + return TQString::number ( value*16 ); } else @@ -65,18 +65,18 @@ QString k9MP4Enc::round16 ( QString _wh ) } -QString k9MP4Enc::getChapterList ( k9DVDTitle *_title ) +TQString k9MP4Enc::getChapterList ( k9DVDTitle *_title ) { - QString res=""; - QPtrList <k9DVDChapter> chapters=_title->getChapters(); + TQString res=""; + TQPtrList <k9DVDChapter> chapters=_title->getChapters(); for ( k9DVDChapter *chapter=chapters.first();chapter;chapter=chapters.next() ) { if ( chapter->getSelected() ) { - res+=res=="" ? QString::number ( chapter->getnum() ) : ","+QString::number ( chapter->getnum() ); + res+=res=="" ? TQString::number ( chapter->getnum() ) : ","+TQString::number ( chapter->getnum() ); } } - QPtrList <k9DVDTitle> titles=_title->getTitles(); + TQPtrList <k9DVDTitle> titles=_title->getTitles(); for ( k9DVDTitle *title=titles.first();title;title=titles.next() ) { @@ -85,7 +85,7 @@ QString k9MP4Enc::getChapterList ( k9DVDTitle *_title ) { if ( chapter->getSelected() ) { - res+=res=="" ? QString::number ( chapter->getnum() ) : ","+QString::number ( chapter->getnum() ); + res+=res=="" ? TQString::number ( chapter->getnum() ) : ","+TQString::number ( chapter->getnum() ); } } } @@ -121,18 +121,18 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) if ( ! k9Tools::checkProgram ( "mencoder" ) && ! m_mpeg2 ) { - KMessageBox::error ( qApp->mainWidget(),i18n ( "Unable to run %1" ).arg ( "mencoder" ) , i18n ( "Encoding error" ) ); + KMessageBox::error ( tqApp->mainWidget(),i18n ( "Unable to run %1" ).arg ( "mencoder" ) , i18n ( "Encoding error" ) ); error = TRUE; return; } - time = new QTime ( 0,0 ); + time = new TQTime ( 0,0 ); m_percent=0; m_remain="--:--:--"; m_totalSize=_title->getChaptersSize ( true ); - QString injectName; + TQString injectName; KTempFile injectFile ( locateLocal ( "tmp", "k9copy/k9v" ), "" ); injectFile.setAutoDelete ( true ); injectFile.close(); @@ -143,17 +143,17 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) int pass=0; //build the cell list for mpeg2 extraction - QMap<QString,int> chapterCells; - QMap<QString, int>::iterator ichapterCells; - QStringList chapters; + TQMap<TQString,int> chapterCells; + TQMap<TQString, int>::iterator ichapterCells; + TQStringList chapters; if ( m_mpeg2 && m_mpegChapters ) { m_parts=0; - chapters=QStringList::split ( ",", getChapterList ( _title ) ); + chapters=TQStringList::split ( ",", getChapterList ( _title ) ); for ( unsigned int idxChap = 0; idxChap < chapters.size(); idxChap++ ) { - QString chapter = chapters[idxChap]; - //foreach (QString chapter,chapters) { + TQString chapter = chapters[idxChap]; + //foreach (TQString chapter,chapters) { int iCell=0; k9DVDChapter *chap=_title->getChapter ( chapter.toInt()-1 ); //foreach(k9ChapterCell *cell ,chap->cells) { @@ -196,31 +196,31 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) if ( m_size=="" ) m_size="700"; if ( m_filename=="" ) - m_filename=KFileDialog::getSaveFileName ( QDir::homeDirPath(),"*.avi", 0,i18n ( "Save file to disk" ) ); + m_filename=KFileDialog::getSaveFileName ( TQDir::homeDirPath(),"*.avi", 0,i18n ( "Save file to disk" ) ); if ( m_filename =="" ) return; - QDir d=QDir::root(); + TQDir d=TQDir::root(); if ( d.exists ( m_filename ) ) d.remove ( m_filename ); - m_progress->setbitrate ( QString::number ( getBitRate ( _title ) ) ); + m_progress->setbitrate ( TQString::number ( getBitRate ( _title ) ) ); if ( !m_mpeg2 ) - m_progress->setsize ( m_size +i18n ( "MB" ) +" X " +QString::number ( m_parts ) ); + m_progress->setsize ( m_size +i18n ( "MB" ) +" X " +TQString::number ( m_parts ) ); else m_progress->setsize ( m_size +i18n ( "MB" ) +" X " ); m_process=new k9Process ( this,0 ); m_process->setUseShell ( true ); - *m_process << "k9copy" << "--play" << "--endsector" << QString::number ( endSector ) ; + *m_process << "k9copy" << "--play" << "--endsector" << TQString::number ( endSector ) ; *m_process << "--inject" << injectName; //"/tmp/kde-jmp/inject"; *m_process << "--input" << "'"+m_device+"'"; - *m_process << "--dvdtitle" << QString::number ( _title->getnumTitle() ); + *m_process << "--dvdtitle" << TQString::number ( _title->getnumTitle() ); if ( m_mpegChapters && m_mpeg2 ) { *m_process << "--chapter" << ichapterCells.key();//chapters.at(m_part-1); - //*m_process << "--cell" << QString::number(ichapterCells.value()); + //*m_process << "--cell" << TQString::number(ichapterCells.value()); } else *m_process << "--chapterlist" << getChapterList ( _title ); @@ -237,7 +237,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) { if ( _title->getaudioStream ( i )->getselected() ) { - *m_process << "--audiofilter" << QString::number ( _title->getaudioStream ( i )->getID() ); + *m_process << "--audiofilter" << TQString::number ( _title->getaudioStream ( i )->getID() ); break; } } @@ -245,9 +245,9 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) if ( getselectedSubp ( _title ) !=-1 ) { *m_process << "--subpicturefilter" ; - QString s=""; + TQString s=""; for ( int i=1; i<=_title->getsubPictureCount();i++ ) - s+= ( i>1?",":"" ) + QString::number ( i ); + s+= ( i>1?",":"" ) + TQString::number ( i ); *m_process << s; } @@ -262,20 +262,20 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) if ( _title->getforceFactor() ) { size = _title->getChaptersSize_mb ( true ) /_title->getfactor(); - *m_process << "--vampsfactor" << QString::number ( _title->getfactor() ) << "--ffactor"; + *m_process << "--vampsfactor" << TQString::number ( _title->getfactor() ) << "--ffactor"; } else size = _title->getChaptersSize_mb ( true ); - m_progress->setsize ( QString::number ( size ) +i18n ( "MB" ) ); - QString path=m_filename; + m_progress->setsize ( TQString::number ( size ) +i18n ( "MB" ) ); + TQString path=m_filename; if ( m_parts>1 ) { - QString ext=m_filename.section ( ".",-1 ); + TQString ext=m_filename.section ( ".",-1 ); if ( ext!="" ) ext="."+ext; path=m_filename.left ( m_filename.length()-ext.length() ); - //path=QString("%1-chapter%2-cell%3%4").arg(path).arg(ichapterCells.key()).arg(ichapterCells.value()).arg(ext); - path=QString ( "%1-chapter%2%3" ).arg ( path ).arg ( ichapterCells.key() ).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; } *m_process << "> "+path; @@ -286,13 +286,13 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) *m_process << "-passlogfile" << passLogFile.name(); bool audio=false; - QString sPass=""; - QString sCodec=""; + TQString sPass=""; + TQString sCodec=""; k9AudioCodecs *audioCodecs=new k9AudioCodecs ( 0,0 ); k9VideoCodecs *videoCodecs=new k9VideoCodecs ( 0,0 ); - QString sVOption; + TQString sVOption; m_pass=pass; switch ( pass ) { @@ -310,15 +310,15 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) sVOption=sVOption.simplifyWhiteSpace(); int pos; //*m_process << "-ovc" << sVOption; - /* int pos=sVOption.find("-vf"); + /* int pos=sVOption.tqfind("-vf"); if (pos==-1) - *m_process <<"-vf" << QString("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,QString("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; - QString sAOption=replaceParams ( audioCodecs->getOptions ( m_audioCodec ) ).simplifyWhiteSpace(); + TQString sAOption=replaceParams ( audioCodecs->getOptions ( m_audioCodec ) ).simplifyWhiteSpace(); @@ -341,11 +341,11 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) if ( _title->getaudioStream ( i )->getselected() ) { //*m_process << "-oac" << sAOption; - pos=sAOption.find ( "-af" ); + pos=sAOption.tqfind ( "-af" ); if ( pos==-1 ) - *m_process << QString ( "-af volume=%1" ).arg ( m_audioGain ); + *m_process << TQString ( "-af volume=%1" ).arg ( m_audioGain ); else - sAOption=sAOption.insert ( pos+4,QString ( "volume=%1," ).arg ( m_audioGain ) ); + sAOption=sAOption.insert ( pos+4,TQString ( "volume=%1," ).arg ( m_audioGain ) ); *m_process << sAOption; audio=true; @@ -355,20 +355,20 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) if ( getselectedSubp ( _title ) !=-1 ) { - *m_process << "-sid" << QString::number ( getselectedSubp ( _title ) ); + *m_process << "-sid" << TQString::number ( getselectedSubp ( _title ) ); } if ( !audio ) *m_process << "-nosound"; - QString path=m_filename; + TQString path=m_filename; if ( m_parts>1 ) { - QString ext=m_filename.section ( ".",-1 ); + TQString ext=m_filename.section ( ".",-1 ); if ( ext!="" ) ext="."+ext; path=m_filename.left ( m_filename.length()-ext.length() ); - path=path+QString::number ( m_part ) +ext; + path=path+TQString::number ( m_part ) +ext; } if ( pass==1 ) *m_process << "-o" << "/dev/null"; @@ -386,19 +386,19 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) //*m_process << "-of" << "avi"; } - QString s=""; + TQString s=""; for ( uint i=0; i< m_process->args().count();i++ ) { - QCString str=* ( m_process->args().at ( i ) ); - s +=QString ( str ) +" "; + TQCString str=* ( m_process->args().at ( i ) ); + s +=TQString ( str ) +" "; } qDebug ( s ); time->start(); m_timer3.start(); - connect ( m_process, SIGNAL ( receivedStdout ( KProcess *, char *, int ) ),this, SLOT ( getStdout ( KProcess *, char *, int ) ) ); - connect ( m_process, SIGNAL ( receivedStderr ( KProcess *, char *, int ) ),this, SLOT ( getStderr ( KProcess *, char *, int ) ) ); - //connect(m_process, SIGNAL(processExited(KProcess*)),this,SLOT(exited(KProcess*))); - connect ( m_progress,SIGNAL ( sigCancel() ),this,SLOT ( slotCancel() ) ); + connect ( m_process, TQT_SIGNAL ( receivedStdout ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStdout ( KProcess *, char *, int ) ) ); + connect ( m_process, TQT_SIGNAL ( receivedStderr ( KProcess *, char *, int ) ),this, TQT_SLOT ( getStderr ( KProcess *, char *, int ) ) ); + //connect(m_process, TQT_SIGNAL(processExited(KProcess*)),this,TQT_SLOT(exited(KProcess*))); + connect ( m_progress,TQT_SIGNAL ( sigCancel() ),this,TQT_SLOT ( slotCancel() ) ); m_canceled=false; m_progress->show(); m_process->start ( KProcess::OwnGroup, KProcess::All ); @@ -412,12 +412,12 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) } if ( m_canceled ) { - KMessageBox::information ( qApp->mainWidget(),i18n ( "MPEG-4 Encoding cancelled" ), i18n ( "MPEG-4 Encoding" ) ); + KMessageBox::information ( tqApp->mainWidget(),i18n ( "MPEG-4 Encoding cancelled" ), i18n ( "MPEG-4 Encoding" ) ); error=true; } else if ( !m_process->normalExit() ) { - KMessageBox::error ( qApp->mainWidget(),"<b>"+i18n ( "Error while running mencoder :" ) +"</b><br>"+m_stderr, i18n ( "Encoding error" ) ); + KMessageBox::error ( tqApp->mainWidget(),"<b>"+i18n ( "Error while running mencoder :" ) +"</b><br>"+m_stderr, i18n ( "Encoding error" ) ); error=true; } if ( maxPass >0 ) @@ -436,14 +436,14 @@ void k9MP4Enc::slotCancel() } -QString k9MP4Enc::replaceParams ( QString _value ) +TQString k9MP4Enc::replaceParams ( TQString _value ) { - QString str=_value; - str.replace ( "$PASS",QString::number ( m_pass ) ); - str.replace ( "$WIDTH",m_width ); - str.replace ( "$HEIGHT",m_height ); - str.replace ( "$VIDBR",QString::number ( getBitRate ( m_title ) ) ); - str.replace ( "$AUDBR",m_audioBitrate ); + TQString str=_value; + str.tqreplace ( "$PASS",TQString::number ( m_pass ) ); + str.tqreplace ( "$WIDTH",m_width ); + str.tqreplace ( "$HEIGHT",m_height ); + str.tqreplace ( "$VIDBR",TQString::number ( getBitRate ( m_title ) ) ); + str.tqreplace ( "$AUDBR",m_audioBitrate ); return str; } @@ -462,8 +462,8 @@ int k9MP4Enc::getBitRate ( k9DVDTitle *_title ) float titleSize=_title->getChaptersSize_mb ( true ); if ( titleSize< ( float ) size ) size= ( int ) ( titleSize/m_parts ) ; - m_progress->setsize ( QString::number ( size ) +i18n ( "MB" ) +" X " +QString::number ( m_parts ) ); - QTime t1 ( 0,0 ); + m_progress->setsize ( TQString::number ( size ) +i18n ( "MB" ) +" X " +TQString::number ( m_parts ) ); + TQTime t1 ( 0,0 ); int sec=t1.secsTo ( _title->getSelectedLength() ); //int bitrate=(int)( ((size*m_parts) * 8388.608)/sec - m_audioBitrate.toInt()); int bitrate=8* ( ( ( size*m_parts*1024 )- ( m_audioBitrate.toInt() *sec/8 ) ) /sec ); @@ -475,7 +475,7 @@ int k9MP4Enc::getBitRate ( k9DVDTitle *_title ) void k9MP4Enc::getStdout ( KProcess *, char *buffer, int buflen ) { - QCString tmp ( buffer,buflen ); + TQCString tmp ( buffer,buflen ); m_cpt++; if ( m_cpt==100 ) m_cpt=0; @@ -483,19 +483,19 @@ void k9MP4Enc::getStdout ( KProcess *, char *buffer, int buflen ) if ( m_cpt!=0 ) return; - int pos=tmp.find ( "Pos:" ); + int pos=tmp.tqfind ( "Pos:" ); if ( pos!=-1 ) { - QString tmp2=tmp.mid ( pos ); + TQString tmp2=tmp.mid ( pos ); float t; int frame; int fps; sscanf ( tmp2.latin1(),"Pos: %f%*s%d",&t,&frame ); - tmp2=tmp2.mid ( tmp2.find ( "(" ) +1 ); - tmp2=tmp2.mid ( tmp2.find ( ")" ) +1 ); + tmp2=tmp2.mid ( tmp2.tqfind ( "(" ) +1 ); + tmp2=tmp2.mid ( tmp2.tqfind ( ")" ) +1 ); sscanf ( tmp2.latin1(),"%d",&fps ); - m_progress->setfps ( QString::number ( fps ) ); + m_progress->setfps ( TQString::number ( fps ) ); } @@ -503,32 +503,32 @@ void k9MP4Enc::getStdout ( KProcess *, char *buffer, int buflen ) void k9MP4Enc::getStderr ( KProcess *proc, char *buffer, int buflen ) { - //m_stderr=QString::fromLatin1(buffer,buflen); - QCString cstderr ( buffer,buflen+1 ); + //m_stderr=TQString::tqfromLatin1(buffer,buflen); + TQCString cstderr ( buffer,buflen+1 ); - if ( cstderr.find ( "FATAL:" ) !=-1 ) + if ( cstderr.tqfind ( "FATAL:" ) !=-1 ) { proc->kill(); } - int pos=cstderr.find ( "INFOPOS:" ); + int pos=cstderr.tqfind ( "INFOPOS:" ); if ( pos!=-1 ) { if ( m_timer3.elapsed() >500 ) { m_timer3.restart(); - QString tmp=cstderr.mid ( pos ); + TQString tmp=cstderr.mid ( pos ); uint32_t totalBytes,totalSize; sscanf ( tmp.latin1(),"INFOPOS: %d %d",&totalBytes,&totalSize ); if ( totalSize !=0 ) m_percent= ( float ) totalBytes / ( float ) m_totalSize; - QTime time2 ( 0,0 ); + TQTime time2 ( 0,0 ); time2=time2.addMSecs ( time->elapsed() ); if ( m_percent>0 ) { - QTime time3 ( 0,0 ); + TQTime time3 ( 0,0 ); time3=time3.addMSecs ( ( uint32_t ) ( time->elapsed() * ( 1/m_percent ) ) ); m_remain=time3.toString ( "hh:mm:ss" ); } @@ -540,7 +540,7 @@ void k9MP4Enc::getStderr ( KProcess *proc, char *buffer, int buflen ) } else { - pos=cstderr.find ( "INFOIMAGE:" ); + pos=cstderr.tqfind ( "INFOIMAGE:" ); if ( pos!=-1 ) { m_progress->setImage ( cstderr.mid ( pos+10 ) ); @@ -553,7 +553,7 @@ void k9MP4Enc::getStderr ( KProcess *proc, char *buffer, int buflen ) void k9MP4Enc::timerDone() { - QTime time2 ( 0,0 ); + TQTime time2 ( 0,0 ); time2=time2.addMSecs ( time->elapsed() ); m_progress->setremain ( time2.toString ( "hh:mm:ss" ) +" / " +m_remain ); diff --git a/libk9copy/k9mp4enc.h b/libk9copy/k9mp4enc.h index 91a80a2..346a88d 100644 --- a/libk9copy/k9mp4enc.h +++ b/libk9copy/k9mp4enc.h @@ -14,36 +14,37 @@ #include "k9common.h" #include "k9dvdtitle.h" -#include <qobject.h> +#include <tqobject.h> #include <k9process.h> -#include <qtimer.h> -#include <qstringlist.h> +#include <tqtimer.h> +#include <tqstringlist.h> class k9MP4Dlg; /** @author Jean-Michel PETIT <[email protected]> */ -class k9MP4Enc : public QObject { +class k9MP4Enc : public TQObject { Q_OBJECT + TQ_OBJECT private: k9Process *m_process; k9MP4Dlg *m_progress; k9DVDTitle *m_title; int getBitRate(k9DVDTitle *_title); - QString m_txt; - QString m_device; - QString m_filename; - QString m_height; - QString m_width; - QString m_size; - QString m_audioBitrate; - QString m_videoBitrate; - QString m_audioGain; - QString m_fourcc; - QString m_stderr; + TQString m_txt; + TQString m_device; + TQString m_filename; + TQString m_height; + TQString m_width; + TQString m_size; + TQString m_audioBitrate; + TQString m_videoBitrate; + TQString m_audioGain; + TQString m_fourcc; + TQString m_stderr; int m_parts; float m_percent; - QTimer *timer; - QString m_remain; + TQTimer *timer; + TQString m_remain; uint32_t m_totalSize; bool m_2pass; int m_pass; @@ -54,12 +55,12 @@ private: bool m_mpeg2; bool m_mpegChapters; - QStringList m_lstVideo,m_lstAudio,m_lstCodecs; + TQStringList m_lstVideo,m_lstAudio,m_lstCodecs; int m_cpt; - QTime *time,m_timer3; - QString replaceParams(QString _input); - QString round16(QString _wh); - QString getChapterList(k9DVDTitle *_title); + TQTime *time,m_timer3; + TQString replaceParams(TQString _input); + TQString round16(TQString _wh); + TQString getChapterList(k9DVDTitle *_title); int getselectedSubp(k9DVDTitle *_title); private slots: @@ -69,41 +70,41 @@ private slots: void slotCancel(); public: - k9MP4Enc(QObject *parent = 0, const char *name = 0,const QStringList& args=0); + k9MP4Enc(TQObject *tqparent = 0, const char *name = 0,const TQStringList& args=0); ~k9MP4Enc(); virtual void execute(k9DVDTitle *_title ); - virtual void setNumberCD(const QString & _value) { + virtual void setNumberCD(const TQString & _value) { m_parts = _value.toInt(); if (m_parts==0) m_parts=1; } - virtual void setDevice(const QString& _value) { + virtual void setDevice(const TQString& _value) { m_device = _value.stripWhiteSpace(); }; - virtual void setFilename(const QString& _value) { + virtual void setFilename(const TQString& _value) { m_filename = _value.stripWhiteSpace(); }; - virtual void setHeight(const QString& _value) { + virtual void setHeight(const TQString& _value) { m_height = _value.stripWhiteSpace(); }; - virtual void setWidth(const QString& _value) { + virtual void setWidth(const TQString& _value) { m_width = _value.stripWhiteSpace(); }; - virtual void setSize(const QString& _value) { + virtual void setSize(const TQString& _value) { m_size = _value.stripWhiteSpace(); }; - virtual void setAudioBitrate(const QString& _value) { + virtual void setAudioBitrate(const TQString& _value) { m_audioBitrate = _value.stripWhiteSpace(); }; - virtual void setVideoBitrate(const QString& _value) { + virtual void setVideoBitrate(const TQString& _value) { m_videoBitrate = _value.stripWhiteSpace(); }; - virtual void setAudioGain(const QString& _value) { + virtual void setAudioGain(const TQString& _value) { m_audioGain = _value.stripWhiteSpace(); }; - virtual void setfourcc(const QString& _value) { + virtual void setfourcc(const TQString& _value) { m_fourcc = _value.stripWhiteSpace(); }; @@ -123,7 +124,7 @@ public: virtual void setAudioCodec(const int& _value) {m_audioCodec = _value;}; - virtual QWidget *getDialog() {return (QWidget*)m_progress;}; + virtual TQWidget *getDialog() {return (TQWidget*)m_progress;}; virtual bool isCanceled(); }; diff --git a/libk9copy/k9process.cpp b/libk9copy/k9process.cpp index 5b17545..d358656 100644 --- a/libk9copy/k9process.cpp +++ b/libk9copy/k9process.cpp @@ -10,14 +10,14 @@ // // #include "k9process.h" -#include <qobject.h> -#include <qapplication.h> -#include <qeventloop.h> +#include <tqobject.h> +#include <tqapplication.h> +#include <tqeventloop.h> -k9Process::k9Process(QObject *parent, const char *name) - : KProcess(parent, name),m_waitSync(false) +k9Process::k9Process(TQObject *tqparent, const char *name) + : KProcess(tqparent, name),m_waitSync(false) { - connect(this,SIGNAL(processExited( KProcess* )),this,SLOT(slotProcessExited( KProcess* ))); + connect(this,TQT_SIGNAL(processExited( KProcess* )),this,TQT_SLOT(slotProcessExited( KProcess* ))); } @@ -28,18 +28,18 @@ k9Process::~k9Process() void k9Process::sync() { m_waitSync=true; - QApplication::eventLoop()->enterLoop(); + TQApplication::eventLoop()->enterLoop(); } void k9Process::slotProcessExited( KProcess * proc) { if (m_waitSync) { - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); m_waitSync=false; } } -const QString & k9Process::debug() { +const TQString & k9Process::debug() { m_debug=""; for (int i=0;i<arguments.count();i++ ){ m_debug +=" "+ *(arguments.at(i)); diff --git a/libk9copy/k9process.h b/libk9copy/k9process.h index 540aafd..2512822 100644 --- a/libk9copy/k9process.h +++ b/libk9copy/k9process.h @@ -13,24 +13,25 @@ #define K9PROCESS_H #include <kprocess.h> -#include <qdatetime.h> +#include <tqdatetime.h> /** @author Jean-Michel PETIT <[email protected]> */ class k9Process : public KProcess { Q_OBJECT + TQ_OBJECT public: - k9Process(QObject *parent = 0, const char *name = 0); + k9Process(TQObject *tqparent = 0, const char *name = 0); void sync(); - const QString & debug(); + const TQString & debug(); ~k9Process(); int getElapsed() const; virtual bool start (RunMode runmode=NotifyOnExit, Communication comm=NoCommunication); private: bool m_waitSync; - QString m_debug; - QTime m_elapsed; + TQString m_debug; + TQTime m_elapsed; private slots: void slotProcessExited(KProcess *proc); }; diff --git a/libk9copy/k9processlist.cpp b/libk9copy/k9processlist.cpp index 8947cc5..4441548 100644 --- a/libk9copy/k9processlist.cpp +++ b/libk9copy/k9processlist.cpp @@ -12,45 +12,45 @@ #include "k9processlist.h" -#include <qstyle.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qlistview.h> -#include <qrect.h> -#include <qprogressbar.h> -#include <qpixmap.h> -#include <qapplication.h> -#include <qeventloop.h> +#include <tqstyle.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqlistview.h> +#include <tqrect.h> +#include <tqprogressbar.h> +#include <tqpixmap.h> +#include <tqapplication.h> +#include <tqeventloop.h> #include <kpushbutton.h> -class _k9ProcessListItem : public QListViewItem { +class _k9ProcessListItem : public TQListViewItem { public: - _k9ProcessListItem(QListView *_listview,const QString & _text):QListViewItem(_listview,_text) { + _k9ProcessListItem(TQListView *_listview,const TQString & _text):TQListViewItem(_listview,_text) { m_fileName=""; m_pos=0; m_num=_listview->childCount(); } - void setFileName(const QString &_fileName) { m_fileName=_fileName;} + void setFileName(const TQString &_fileName) { m_fileName=_fileName;} void setPos(double _pos) { m_pos=_pos;} - QString getFileName() const { return m_fileName;} + TQString getFileName() const { return m_fileName;} double getPos() const { return m_pos;} - int compare ( QListViewItem * i, int col, bool ascending ) const { + int compare ( TQListViewItem * i, int col, bool ascending ) const { return m_num-((_k9ProcessListItem*)i)->m_num; } private: - QString m_fileName; + TQString m_fileName; double m_pos; int m_num; }; -k9ProcessList::k9ProcessList(QWidget* parent, const char* name, WFlags fl) : processList(parent,name,fl) +k9ProcessList::k9ProcessList(TQWidget* tqparent, const char* name, WFlags fl) : processList(tqparent,name,fl) { m_processes.setAutoDelete(true); m_maxProcess=4; - connect(&m_timer,SIGNAL(timeout()),this,SLOT(timeout())); + connect(&m_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(timeout())); bCancel->setEnabled(false); } @@ -60,7 +60,7 @@ k9ProcessList::~k9ProcessList() /*$SPECIALIZATION$*/ void k9ProcessList::timeout() { if (m_waitSync) { - QApplication::eventLoop()->exitLoop(); + TQApplication::eventLoop()->exitLoop(); m_waitSync=false; } } @@ -77,7 +77,7 @@ void k9ProcessList::bCancelClick() { void k9ProcessList::wait(int _msec) { m_waitSync=true; m_timer.start(_msec,true); - QApplication::eventLoop()->enterLoop(); + TQApplication::eventLoop()->enterLoop(); } int k9ProcessList::getNbRunning() { @@ -96,7 +96,7 @@ void k9ProcessList::execute() { m_cancel=false; m_error=false; k9Process *p=NULL; - for (QPtrListStdIterator <k9Process> it=m_processes.begin() ;it!=m_processes.end() ;++it ) { + for (TQPtrListStdIterator <k9Process> it=m_processes.begin() ;it!=m_processes.end() ;++it ) { p=(*it); while (getNbRunning() >=m_maxProcess && ! m_cancel) { wait(1000); @@ -114,28 +114,28 @@ void k9ProcessList::execute() { bCancel->setEnabled(false); } -void k9ProcessList::addProgress(const QString &_text) { - QListViewItem *item = new _k9ProcessListItem(lProcess,_text); - QProgressBar b(this); +void k9ProcessList::addProgress(const TQString &_text) { + TQListViewItem *item = new _k9ProcessListItem(lProcess,_text); + TQProgressBar b(this); b.setProgress(100,100); b.resize(100,40); - item->setPixmap(0,QPixmap::grabWidget(&b,0,0,b.width(),b.height())); + item->setPixmap(0,TQPixmap::grabWidget(&b,0,0,b.width(),b.height())); } void k9ProcessList::setProgress (k9Process * _process,int _position, int _total) { - QProgressBar b(this); + TQProgressBar b(this); b.setProgress(_position,_total); b.resize(100,40); - QListViewItem *it =m_items[_process]; - it->setPixmap(0,QPixmap::grabWidget(&b,0,0,b.width(),b.height())); + TQListViewItem *it =m_items[_process]; + it->setPixmap(0,TQPixmap::grabWidget(&b,0,0,b.width(),b.height())); } -void k9ProcessList::setText(k9Process *_process, const QString &_text,int _col) { - QListViewItem *it =m_items[_process]; +void k9ProcessList::setText(k9Process *_process, const TQString &_text,int _col) { + TQListViewItem *it =m_items[_process]; it->setText(_col,_text); } -void k9ProcessList::setFileName(k9Process *_process,const QString &_fileName) { +void k9ProcessList::setFileName(k9Process *_process,const TQString &_fileName) { _k9ProcessListItem *it = (_k9ProcessListItem*)m_items[_process]; it->setFileName(_fileName); @@ -146,14 +146,14 @@ void k9ProcessList::setPos(k9Process *_process,double _pos) { it->setPos(_pos); } -k9Process *k9ProcessList::addProcess(const QString &label) { - QString name=QString("process%1").arg(m_items.count()) ; - k9Process *process=new k9Process(this,name.latin1()); +k9Process *k9ProcessList::addProcess(const TQString &label) { + TQString name=TQString("process%1").tqarg(m_items.count()) ; + k9Process *process=new k9Process(TQT_TQOBJECT(this),name.latin1()); m_processes.append(process); - QListViewItem *item = new _k9ProcessListItem(lProcess,label); + TQListViewItem *item = new _k9ProcessListItem(lProcess,label); m_items[process]=item; setProgress(process,0,100); - connect(process,SIGNAL(processExited( KProcess* )),this,SLOT(processExited(KProcess*))); + connect(process,TQT_SIGNAL(processExited( KProcess* )),this,TQT_SLOT(processExited(KProcess*))); return process; } diff --git a/libk9copy/k9processlist.h b/libk9copy/k9processlist.h index cbcc754..bd18119 100644 --- a/libk9copy/k9processlist.h +++ b/libk9copy/k9processlist.h @@ -15,22 +15,23 @@ #include "k9common.h" #include "../libk9copy/processList.h" #include "k9process.h" -#include <qmap.h> -#include <qtimer.h> +#include <tqmap.h> +#include <tqtimer.h> class k9ProcessList : public processList { Q_OBJECT + TQ_OBJECT public: - k9ProcessList(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9ProcessList(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9ProcessList(); /*$PUBLIC_FUNCTIONS$*/ void execute(); - void addProgress(const QString &_text); + void addProgress(const TQString &_text); void setProgress (k9Process * _process,int _position, int _total); - void setText(k9Process *_process, const QString &_text,int _col); - void setFileName(k9Process *_process,const QString &_fileName); + void setText(k9Process *_process, const TQString &_text,int _col); + void setFileName(k9Process *_process,const TQString &_fileName); void setPos(k9Process *_process,double _pos); - k9Process *addProcess(const QString &label); + k9Process *addProcess(const TQString &label); void setMaxProcess(int _value); int getMaxProcess() const; @@ -45,9 +46,9 @@ public slots: protected: /*$PROTECTED_FUNCTIONS$*/ int m_maxProcess; - QMap <k9Process*,QListViewItem*> m_items; - QPtrList <k9Process> m_processes; - QTimer m_timer; + TQMap <k9Process*,TQListViewItem*> m_items; + TQPtrList <k9Process> m_processes; + TQTimer m_timer; bool m_cancel; bool m_error; bool m_waitSync; diff --git a/libk9copy/k9progress.cpp b/libk9copy/k9progress.cpp index d2c46ac..9a8bb95 100644 --- a/libk9copy/k9progress.cpp +++ b/libk9copy/k9progress.cpp @@ -13,22 +13,22 @@ #include "k9progress.h" #include <kprogress.h> -#include <qlabel.h> -#include <qapplication.h> -#include <qeventloop.h> -#include <qimage.h> -#include <qpainter.h> +#include <tqlabel.h> +#include <tqapplication.h> +#include <tqeventloop.h> +#include <tqimage.h> +#include <tqpainter.h> #include <kstandarddirs.h> -#include <qmovie.h> -#include <qlayout.h> +#include <tqmovie.h> +#include <tqlayout.h> -k9Progress::k9Progress(QWidget* parent, const char* name,const QStringList &args) - : Progress(parent,name,0) { - m_process=new k9Process(this,0); +k9Progress::k9Progress(TQWidget* tqparent, const char* name,const TQStringList &args) + : Progress(tqparent,name,0) { + m_process=new k9Process(TQT_TQOBJECT(this),0); m_wimage=new k9DrawImage(image,0); - QGridLayout *l=new QGridLayout(image,1,1); + TQGridLayout *l=new TQGridLayout(image,1,1); l->addWidget(m_wimage,0,0); @@ -40,16 +40,16 @@ k9Progress::~k9Progress() { } -void k9Progress::setElapsed(const QString _text) { +void k9Progress::setElapsed(const TQString _text) { lblElapsed->setText(_text); } -void k9Progress::setTitle(const QString _text) { +void k9Progress::setTitle(const TQString _text) { lblTitle->setText(_text); } -void k9Progress::setLabelText(const QString _text) { +void k9Progress::setLabelText(const TQString _text) { LabelText->setText(_text); } @@ -90,18 +90,18 @@ k9Process* k9Progress::getProcess() const { /*$SPECIALIZATION$*/ -void k9Progress::setImage(QString _fileName) { +void k9Progress::setImage(TQString _fileName) { m_wimage->setImage(_fileName); } -void k9Progress::setImage(const QImage &_image) { +void k9Progress::setImage(const TQImage &_image) { m_wimage->setImage(_image); } -void k9Progress::setMovie(QString _fileName) { +void k9Progress::setMovie(TQString _fileName) { image->setPaletteBackgroundColor(this->paletteBackgroundColor()); - QMovie mv(_fileName,2048); + TQMovie mv(_fileName,2048); mv.setBackgroundColor(this->paletteBackgroundColor()); image->setMovie(mv); m_wimage->hide(); diff --git a/libk9copy/k9progress.h b/libk9copy/k9progress.h index 9c88490..bf6c9d7 100644 --- a/libk9copy/k9progress.h +++ b/libk9copy/k9progress.h @@ -16,24 +16,25 @@ #include "k9common.h" #include "../libk9copy/progress.h" #include <k9process.h> -#include <qimage.h> -#include <qtimer.h> +#include <tqimage.h> +#include <tqtimer.h> #include "k9drawimage.h" class k9Progress : public Progress { Q_OBJECT + TQ_OBJECT public: - k9Progress(QWidget* parent = 0, const char* name = 0, const QStringList &args=0); + k9Progress(TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args=0); ~k9Progress(); virtual k9Process * getProcess() const; virtual void setProgress(long _position,long _total); - virtual void setLabelText(const QString _text); - virtual void setElapsed(const QString _text); - virtual void setTitle(const QString _text); - virtual void setImage(QString _fileName) ; - virtual void setImage(const QImage &_image); - virtual void setMovie(QString _fileName); + virtual void setLabelText(const TQString _text); + virtual void setElapsed(const TQString _text); + virtual void setTitle(const TQString _text); + virtual void setImage(TQString _fileName) ; + virtual void setImage(const TQImage &_image); + virtual void setMovie(TQString _fileName); virtual int execute(); diff --git a/libk9copy/k9saveimage.cpp b/libk9copy/k9saveimage.cpp index b919510..edc4162 100644 --- a/libk9copy/k9saveimage.cpp +++ b/libk9copy/k9saveimage.cpp @@ -13,10 +13,10 @@ #include "kdecmpeg2.h" #include <stdio.h> -#include <qimage.h> +#include <tqimage.h> #include <kstandarddirs.h> -void k9SaveImage::drawImage(QImage *_image) { +void k9SaveImage::drawImage(TQImage *_image) { m_cpt++; if (m_cpt ==20) { m_image=*_image; @@ -26,12 +26,12 @@ void k9SaveImage::drawImage(QImage *_image) { k9SaveImage::k9SaveImage() - : QObject(),QThread() + : TQObject(),TQThread() { m_tempFile= new KTempFile(locateLocal("tmp", "k9copy/k9p"), ""); m_tempFile->setAutoDelete(true); m_decoder=new kDecMPEG2(); - connect(m_decoder, SIGNAL(pixmapReady(QImage *)), this, SLOT(drawImage(QImage *))); + connect(m_decoder, TQT_SIGNAL(pixmapReady(TQImage *)), this, TQT_SLOT(drawImage(TQImage *))); } @@ -73,7 +73,7 @@ void k9SaveImage::run() { m_cpt=0; m_decoder->decode(m_buffer ,m_buffer+m_size,0); delete m_buffer; - QString sFileName=m_tempFile->name(); + TQString sFileName=m_tempFile->name(); m_image.save(sFileName,"PNG"); sFileName="\rINFOIMAGE:"+sFileName; fprintf(stderr,sFileName.utf8()); diff --git a/libk9copy/k9saveimage.h b/libk9copy/k9saveimage.h index 9733577..e37aa1d 100644 --- a/libk9copy/k9saveimage.h +++ b/libk9copy/k9saveimage.h @@ -13,13 +13,13 @@ #define K9SAVEIMAGE_H #include "k9common.h" -#include <qthread.h> -#include <qobject.h> -#include <qdatetime.h> +#include <tqthread.h> +#include <tqobject.h> +#include <tqdatetime.h> #include "k9fifo.h" #include <ktempfile.h> -#include <qimage.h> +#include <tqimage.h> /** @@ -29,9 +29,10 @@ typedef enum { FrameType_B=0x18,FrameType_I=0x08,FrameType_P=0x10,FrameType_D=0 class kDecMPEG2; -class k9SaveImage : public QObject,QThread +class k9SaveImage : public TQObject,TQThread { Q_OBJECT + TQ_OBJECT public: k9SaveImage(); ~k9SaveImage(); @@ -42,19 +43,19 @@ public: protected: void run(); public slots: - void drawImage(QImage*); + void drawImage(TQImage*); private: kDecMPEG2 *m_decoder; k9fifo m_fifo; bool m_stop; - QTime m_timer; + TQTime m_timer; uint m_cpt; KTempFile *m_tempFile; uchar *m_buffer; uint32_t m_size; - QMutex m_mutex; - QImage m_image; + TQMutex m_mutex; + TQImage m_image; }; #endif diff --git a/libk9copy/k9titleencopt.cpp b/libk9copy/k9titleencopt.cpp index 8e75919..c9bb1be 100644 --- a/libk9copy/k9titleencopt.cpp +++ b/libk9copy/k9titleencopt.cpp @@ -14,10 +14,10 @@ #include "k9config.h" #include "k9dvdtitle.h" -k9TitleEncOpt::k9TitleEncOpt(k9DVDTitle *parent) - : QObject(parent, "") +k9TitleEncOpt::k9TitleEncOpt(k9DVDTitle *tqparent) + : TQObject(tqparent, "") { - connect (parent,SIGNAL(selectionChanged()),this,SLOT(load())); + connect (tqparent,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(load())); load(); } @@ -85,34 +85,34 @@ void k9TitleEncOpt::setAudioGain(int _value) { m_audioGain=_value; } -const QString & k9TitleEncOpt::getWidth() { +const TQString & k9TitleEncOpt::getWidth() { return m_width; } -void k9TitleEncOpt::setWidth(QString _value) { +void k9TitleEncOpt::setWidth(TQString _value) { m_width=_value; } -const QString & k9TitleEncOpt::getHeight() { +const TQString & k9TitleEncOpt::getHeight() { return m_height; } -void k9TitleEncOpt::setHeight(QString _value) { +void k9TitleEncOpt::setHeight(TQString _value) { m_height=_value; } -const QString & k9TitleEncOpt::getAudioBr() { +const TQString & k9TitleEncOpt::getAudioBr() { return m_audioBr; } -void k9TitleEncOpt::setAudioBr(QString _value) { +void k9TitleEncOpt::setAudioBr(TQString _value) { m_audioBr=_value; } -const QString & k9TitleEncOpt::getVideoBr() { +const TQString & k9TitleEncOpt::getVideoBr() { return m_videoBr; } -void k9TitleEncOpt::setVideoBr(QString _value) { +void k9TitleEncOpt::setVideoBr(TQString _value) { m_videoBr=_value; } diff --git a/libk9copy/k9titleencopt.h b/libk9copy/k9titleencopt.h index cb4cde3..faf72c1 100644 --- a/libk9copy/k9titleencopt.h +++ b/libk9copy/k9titleencopt.h @@ -12,7 +12,7 @@ #ifndef K9TITLEENCOPT_H #define K9TITLEENCOPT_H -#include <qobject.h> +#include <tqobject.h> /** @@ -21,13 +21,14 @@ class k9DVDTitle; -class k9TitleEncOpt : public QObject +class k9TitleEncOpt : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9TitleEncOpt(k9DVDTitle *parent ); + k9TitleEncOpt(k9DVDTitle *tqparent ); ~k9TitleEncOpt(); - k9DVDTitle *getTitle() { return (k9DVDTitle*)parent();}; + k9DVDTitle *getTitle() { return (k9DVDTitle*)tqparent();}; public: int getMaxSize(); @@ -39,17 +40,17 @@ public: int getAudioGain(); void setAudioGain(int); - const QString & getWidth(); - void setWidth(QString); + const TQString & getWidth(); + void setWidth(TQString); - const QString & getHeight(); - void setHeight(QString); + const TQString & getHeight(); + void setHeight(TQString); - const QString & getAudioBr(); - void setAudioBr(QString); + const TQString & getAudioBr(); + void setAudioBr(TQString); - const QString & getVideoBr(); - void setVideoBr(QString); + const TQString & getVideoBr(); + void setVideoBr(TQString); bool getKeepAspectRatio(); void setKeepAspectRatio(bool); @@ -70,11 +71,11 @@ public: private: int m_maxSize; int m_numParts; - QString m_width; - QString m_height; + TQString m_width; + TQString m_height; bool m_keepAspectRatio; bool m_2Passes; - QString m_audioBr,m_videoBr; + TQString m_audioBr,m_videoBr; int m_codec,m_audioCodec; int m_audioGain; bool m_useCache; diff --git a/libk9copy/k9tools.cpp b/libk9copy/k9tools.cpp index 1464553..4a74e13 100644 --- a/libk9copy/k9tools.cpp +++ b/libk9copy/k9tools.cpp @@ -11,24 +11,24 @@ // #include "k9tools.h" #include <kstandarddirs.h> -#include <qdir.h> +#include <tqdir.h> -bool k9Tools::checkProgram(QString _progName) { +bool k9Tools::checkProgram(TQString _progName) { return KStandardDirs::findExe( _progName,NULL,false) !=NULL ; } -void k9Tools::clearOutput(QString name) { - QDir dir(name); +void k9Tools::clearOutput(TQString name) { + TQDir dir(name); //delete files in directory - QStringList lst = dir.entryList( "*",QDir::Files |QDir::Hidden ); - for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { - //QString c(( *it ).latin1() ); + TQStringList lst = dir.entryList( "*",TQDir::Files |TQDir::Hidden ); + for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + //TQString c(( *it ).latin1() ); dir.remove (*it); } //scanning subdir - QStringList lstdir = dir.entryList( "*",QDir::Dirs ); - for ( QStringList::Iterator it = lstdir.begin(); it != lstdir.end(); ++it ) { - QString c=*it; + TQStringList lstdir = dir.entryList( "*",TQDir::Dirs ); + for ( TQStringList::Iterator it = lstdir.begin(); it != lstdir.end(); ++it ) { + TQString c=*it; if ((c!=".") && c!="..") { clearOutput(dir.absFilePath(c)); dir.rmdir(c); diff --git a/libk9copy/k9tools.h b/libk9copy/k9tools.h index 9548511..7d9672b 100644 --- a/libk9copy/k9tools.h +++ b/libk9copy/k9tools.h @@ -12,7 +12,7 @@ #ifndef K9TOOLS_H #define K9TOOLS_H -#include <qstring.h> +#include <tqstring.h> /** @author Jean-Michel PETIT <[email protected]> @@ -22,8 +22,8 @@ private: k9Tools() {}; ~k9Tools(){}; public: - static bool checkProgram(QString _progName); - static void clearOutput(QString name); + static bool checkProgram(TQString _progName); + static void clearOutput(TQString name); }; #endif diff --git a/libk9copy/k9videocodecs.cpp b/libk9copy/k9videocodecs.cpp index 8e91793..306b1da 100644 --- a/libk9copy/k9videocodecs.cpp +++ b/libk9copy/k9videocodecs.cpp @@ -10,33 +10,33 @@ // // #include "k9videocodecs.h" -#include <qstringlist.h> +#include <tqstringlist.h> class _k9VideoCodec { public: _k9VideoCodec():name(""),fourcc(""),optPass1(""),optPass2(""),optOnePass(""){}; - _k9VideoCodec(QString _name,QString _fourcc,QString _optOnePass,QString _optPass1,QString _optPass2) { + _k9VideoCodec(TQString _name,TQString _fourcc,TQString _optOnePass,TQString _optPass1,TQString _optPass2) { name=_name; fourcc=_fourcc; optOnePass=_optOnePass; optPass1=_optPass1; optPass2=_optPass2; } - QString name; - QString fourcc; - QString optOnePass; - QString optPass1; - QString optPass2; + TQString name; + TQString fourcc; + TQString optOnePass; + TQString optPass1; + TQString optPass2; }; -k9VideoCodecs::k9VideoCodecs(QObject *parent, const char *name) - : QObject(parent, name) +k9VideoCodecs::k9VideoCodecs(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { m_config=new k9Config(); - QStringList slLabels=m_config->getCodecLabels(); - QStringList slCodecs=m_config->getCodecVideo(); + TQStringList slLabels=m_config->getCodecLabels(); + TQStringList slCodecs=m_config->getCodecVideo(); bool bReset; bReset=slLabels.count()==0; if (!bReset) @@ -49,16 +49,16 @@ k9VideoCodecs::k9VideoCodecs(QObject *parent, const char *name) slCodecs=m_config->getCodecVideo(); } - QStringList::iterator c=slCodecs.begin(); + TQStringList::iterator c=slCodecs.begin(); int cpt=0; - for (QStringList::iterator i=slLabels.begin();i!=slLabels.end() ;++i) { - QString fourcc=(*c); + for (TQStringList::iterator i=slLabels.begin();i!=slLabels.end() ;++i) { + TQString fourcc=(*c); c++; - QString o1=(*c); + TQString o1=(*c); c++; - QString o2=(*c); + TQString o2=(*c); c++; - QString o3=(*c); + TQString o3=(*c); c++; m_codecs[cpt++]=_k9VideoCodec((*i),fourcc,o1,o2,o3); @@ -97,9 +97,9 @@ void k9VideoCodecs::reset() { void k9VideoCodecs::save() { m_config=new k9Config(); - QStringList labels; - QStringList options; - for (QMap<int,_k9VideoCodec>::iterator i=m_codecs.begin();i!=m_codecs.end();++i) { + TQStringList labels; + TQStringList options; + for (TQMap<int,_k9VideoCodec>::iterator i=m_codecs.begin();i!=m_codecs.end();++i) { labels << i.data().name; options << i.data().fourcc; options << i.data().optOnePass; @@ -119,39 +119,39 @@ int k9VideoCodecs::count() { return m_codecs.count(); } -void k9VideoCodecs::setFourcc(int _num,QString _value) { +void k9VideoCodecs::setFourcc(int _num,TQString _value) { m_codecs[_num].fourcc=_value; } -void k9VideoCodecs::setOptions0(int _num,QString _value) { +void k9VideoCodecs::setOptions0(int _num,TQString _value) { m_codecs[_num].optOnePass=_value; } -void k9VideoCodecs::setOptions1(int _num,QString _value) { +void k9VideoCodecs::setOptions1(int _num,TQString _value) { m_codecs[_num].optPass1=_value; } -void k9VideoCodecs::setOptions2(int _num,QString _value) { +void k9VideoCodecs::setOptions2(int _num,TQString _value) { m_codecs[_num].optPass2=_value; } -void k9VideoCodecs::setCodecName(int _num,QString _value) { +void k9VideoCodecs::setCodecName(int _num,TQString _value) { m_codecs[_num].name=_value; } -QString k9VideoCodecs::getFourcc(int _num) { +TQString k9VideoCodecs::getFourcc(int _num) { return m_codecs[_num].fourcc; } -QString k9VideoCodecs::getOptions0(int _num) { +TQString k9VideoCodecs::getOptions0(int _num) { return m_codecs[_num].optOnePass; } -QString k9VideoCodecs::getOptions1(int _num) { +TQString k9VideoCodecs::getOptions1(int _num) { return m_codecs[_num].optPass1; } -QString k9VideoCodecs::getOptions2(int _num) { +TQString k9VideoCodecs::getOptions2(int _num) { return m_codecs[_num].optPass2; } -QString k9VideoCodecs::getCodecName(int _num) { +TQString k9VideoCodecs::getCodecName(int _num) { return m_codecs[_num].name; } diff --git a/libk9copy/k9videocodecs.h b/libk9copy/k9videocodecs.h index 4ef7c77..21422d2 100644 --- a/libk9copy/k9videocodecs.h +++ b/libk9copy/k9videocodecs.h @@ -13,8 +13,8 @@ #define K9VIDEOCODECS_H #include "k9common.h" -#include <qobject.h> -#include <qmap.h> +#include <tqobject.h> +#include <tqmap.h> #include "k9config.h" /** @@ -22,30 +22,31 @@ */ class _k9VideoCodec; -class k9VideoCodecs : public QObject +class k9VideoCodecs : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9VideoCodecs(QObject *parent = 0, const char *name = 0); + k9VideoCodecs(TQObject *tqparent = 0, const char *name = 0); ~k9VideoCodecs(); void save(); - void setFourcc(int _num,QString _value); - void setOptions0(int _num,QString _value); - void setOptions1(int _num,QString _value); - void setOptions2(int _num,QString _value); - void setCodecName(int _num,QString _value); + void setFourcc(int _num,TQString _value); + void setOptions0(int _num,TQString _value); + void setOptions1(int _num,TQString _value); + void setOptions2(int _num,TQString _value); + void setCodecName(int _num,TQString _value); void remove(int _num); - QString getFourcc(int _num); - QString getOptions0(int _num); - QString getOptions1(int _num); - QString getOptions2(int _num); - QString getCodecName(int _num); + TQString getFourcc(int _num); + TQString getOptions0(int _num); + TQString getOptions1(int _num); + TQString getOptions2(int _num); + TQString getCodecName(int _num); int count(); void reset(); private: - QMap <int,_k9VideoCodec> m_codecs; + TQMap <int,_k9VideoCodec> m_codecs; k9Config *m_config; diff --git a/libk9copy/mp4dlg.cpp b/libk9copy/mp4dlg.cpp index a5854d7..252c9f0 100644 --- a/libk9copy/mp4dlg.cpp +++ b/libk9copy/mp4dlg.cpp @@ -9,120 +9,120 @@ #include "mp4dlg.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qlabel.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqlabel.h> #include <kprogress.h> -#include <qframe.h> +#include <tqframe.h> #include <kpushbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include "kprogress.h" #include "kpushbutton.h" /* - * Constructs a MP4Dlg as a child of 'parent', with the + * Constructs a MP4Dlg as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -MP4Dlg::MP4Dlg( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +MP4Dlg::MP4Dlg( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "MP4Dlg" ); - setCursor( QCursor( 3 ) ); - MP4DlgLayout = new QGridLayout( this, 1, 1, 11, 6, "MP4DlgLayout"); + setCursor( TQCursor( 3 ) ); + MP4DlgLayout = new TQGridLayout( this, 1, 1, 11, 6, "MP4DlgLayout"); - lblTitle = new QLabel( this, "lblTitle" ); - lblTitle->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)4, (QSizePolicy::SizeType)4, 0, 0, lblTitle->sizePolicy().hasHeightForWidth() ) ); - QFont lblTitle_font( lblTitle->font() ); + lblTitle = new TQLabel( this, "lblTitle" ); + 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 ); - lblTitle->setCursor( QCursor( 3 ) ); + lblTitle->setCursor( TQCursor( 3 ) ); MP4DlgLayout->addWidget( lblTitle, 0, 0 ); pbProgress = new KProgress( this, "pbProgress" ); - pbProgress->setCursor( QCursor( 3 ) ); + pbProgress->setCursor( TQCursor( 3 ) ); MP4DlgLayout->addMultiCellWidget( pbProgress, 3, 3, 0, 2 ); - frame3 = new QFrame( this, "frame3" ); - frame3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) ); - frame3->setCursor( QCursor( 3 ) ); - frame3->setFrameShape( QFrame::NoFrame ); - frame3->setFrameShadow( QFrame::Raised ); - frame3Layout = new QGridLayout( frame3, 1, 1, 11, 6, "frame3Layout"); + frame3 = new TQFrame( this, "frame3" ); + 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 ); + frame3Layout = new TQGridLayout( frame3, 1, 1, 11, 6, "frame3Layout"); - lblfps = new QLabel( frame3, "lblfps" ); - lblfps->setCursor( QCursor( 3 ) ); - lblfps->setAlignment( int( QLabel::AlignVCenter ) ); + lblfps = new TQLabel( frame3, "lblfps" ); + lblfps->setCursor( TQCursor( 3 ) ); + lblfps->tqsetAlignment( int( TQLabel::AlignVCenter ) ); frame3Layout->addWidget( lblfps, 2, 1 ); - lblRemain = new QLabel( frame3, "lblRemain" ); - lblRemain->setCursor( QCursor( 3 ) ); - lblRemain->setAlignment( int( QLabel::AlignVCenter ) ); + lblRemain = new TQLabel( frame3, "lblRemain" ); + lblRemain->setCursor( TQCursor( 3 ) ); + lblRemain->tqsetAlignment( int( TQLabel::AlignVCenter ) ); frame3Layout->addWidget( lblRemain, 3, 1 ); - lblsize = new QLabel( frame3, "lblsize" ); - lblsize->setCursor( QCursor( 3 ) ); + lblsize = new TQLabel( frame3, "lblsize" ); + lblsize->setCursor( TQCursor( 3 ) ); frame3Layout->addWidget( lblsize, 0, 1 ); - lblbitrate = new QLabel( frame3, "lblbitrate" ); - lblbitrate->setCursor( QCursor( 3 ) ); + lblbitrate = new TQLabel( frame3, "lblbitrate" ); + lblbitrate->setCursor( TQCursor( 3 ) ); frame3Layout->addWidget( lblbitrate, 1, 1 ); - textLabel2 = new QLabel( frame3, "textLabel2" ); - textLabel2->setCursor( QCursor( 3 ) ); + textLabel2 = new TQLabel( frame3, "textLabel2" ); + textLabel2->setCursor( TQCursor( 3 ) ); frame3Layout->addWidget( textLabel2, 2, 0 ); - textLabel2_2 = new QLabel( frame3, "textLabel2_2" ); - textLabel2_2->setCursor( QCursor( 3 ) ); + textLabel2_2 = new TQLabel( frame3, "textLabel2_2" ); + textLabel2_2->setCursor( TQCursor( 3 ) ); frame3Layout->addWidget( textLabel2_2, 3, 0 ); - textLabel1 = new QLabel( frame3, "textLabel1" ); - textLabel1->setCursor( QCursor( 3 ) ); + textLabel1 = new TQLabel( frame3, "textLabel1" ); + textLabel1->setCursor( TQCursor( 3 ) ); frame3Layout->addWidget( textLabel1, 1, 0 ); - textLabel3 = new QLabel( frame3, "textLabel3" ); - textLabel3->setCursor( QCursor( 3 ) ); + textLabel3 = new TQLabel( frame3, "textLabel3" ); + textLabel3->setCursor( TQCursor( 3 ) ); frame3Layout->addWidget( textLabel3, 0, 0 ); MP4DlgLayout->addMultiCellWidget( frame3, 2, 2, 0, 2 ); bCancel = new KPushButton( this, "bCancel" ); - bCancel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) ); - bCancel->setCursor( QCursor( 0 ) ); + bCancel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) ); + bCancel->setCursor( TQCursor( 0 ) ); bCancel->setProperty( "stdItem", 26 ); MP4DlgLayout->addWidget( bCancel, 5, 2 ); - spacer1 = new QSpacerItem( 225, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1 = new TQSpacerItem( 225, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); MP4DlgLayout->addMultiCell( spacer1, 5, 5, 0, 1 ); - spacer2 = new QSpacerItem( 20, 16, QSizePolicy::Minimum, QSizePolicy::Fixed ); + spacer2 = new TQSpacerItem( 20, 16, TQSizePolicy::Minimum, TQSizePolicy::Fixed ); MP4DlgLayout->addItem( spacer2, 4, 1 ); - image = new QLabel( this, "image" ); - image->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, image->sizePolicy().hasHeightForWidth() ) ); - image->setMinimumSize( QSize( 0, 250 ) ); - image->setPaletteBackgroundColor( QColor( 0, 0, 0 ) ); - image->setCursor( QCursor( 3 ) ); + image = new TQLabel( this, "image" ); + 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 ) ); image->setScaledContents( TRUE ); MP4DlgLayout->addMultiCellWidget( image, 1, 1, 0, 2 ); languageChange(); - resize( QSize(416, 475).expandedTo(minimumSizeHint()) ); + resize( TQSize(416, 475).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bCancel, SIGNAL( clicked() ), this, SLOT( Cancel() ) ); + connect( bCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( Cancel() ) ); } /* @@ -130,7 +130,7 @@ MP4Dlg::MP4Dlg( QWidget* parent, const char* name, WFlags fl ) */ MP4Dlg::~MP4Dlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -141,10 +141,10 @@ void MP4Dlg::languageChange() { setCaption( tr2i18n( "k9Copy - transcoding" ) ); lblTitle->setText( tr2i18n( "Encoding" ) ); - lblfps->setText( QString::null ); - lblRemain->setText( QString::null ); - lblsize->setText( QString::null ); - lblbitrate->setText( QString::null ); + lblfps->setText( TQString() ); + lblRemain->setText( TQString() ); + lblsize->setText( TQString() ); + lblbitrate->setText( TQString() ); textLabel2->setText( tr2i18n( "fps" ) ); textLabel2_2->setText( tr2i18n( "Elapsed Time" ) ); textLabel1->setText( tr2i18n( "Bitrate" ) ); diff --git a/libk9copy/mp4dlg.ui b/libk9copy/mp4dlg.ui index 87390ed..a6e0e2a 100644 --- a/libk9copy/mp4dlg.ui +++ b/libk9copy/mp4dlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MP4Dlg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MP4Dlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblTitle</cstring> </property> @@ -54,7 +54,7 @@ <cursor>3</cursor> </property> </widget> - <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>frame3</cstring> </property> @@ -79,7 +79,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>lblfps</cstring> </property> @@ -89,11 +89,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>lblRemain</cstring> </property> @@ -103,11 +103,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblsize</cstring> </property> @@ -118,7 +118,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblbitrate</cstring> </property> @@ -129,7 +129,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -140,7 +140,7 @@ <string>fps</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -151,7 +151,7 @@ <string>Elapsed Time</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -162,7 +162,7 @@ <string>Bitrate</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -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,14 +221,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>image</cstring> </property> @@ -240,7 +240,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>250</height> @@ -270,10 +270,10 @@ <slot>Cancel()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>Cancel()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/libk9copy/processList.cpp b/libk9copy/processList.cpp index b5aa5e0..c95df4f 100644 --- a/libk9copy/processList.cpp +++ b/libk9copy/processList.cpp @@ -9,27 +9,27 @@ #include "processList.h" -#include <qvariant.h> -#include <qheader.h> -#include <qlistview.h> +#include <tqvariant.h> +#include <tqheader.h> +#include <tqlistview.h> #include <kpushbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include "kpushbutton.h" /* - * Constructs a processList as a child of 'parent', with the + * Constructs a processList as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -processList::processList( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +processList::processList( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "processList" ); - processListLayout = new QGridLayout( this, 1, 1, 11, 6, "processListLayout"); + processListLayout = new TQGridLayout( this, 1, 1, 11, 6, "processListLayout"); - lProcess = new QListView( this, "lProcess" ); + lProcess = new TQListView( this, "lProcess" ); lProcess->addColumn( tr2i18n( "Processes" ) ); lProcess->addColumn( tr2i18n( "Elapsed" ) ); lProcess->addColumn( tr2i18n( "..." ) ); @@ -37,18 +37,18 @@ processList::processList( QWidget* parent, const char* name, WFlags fl ) processListLayout->addMultiCellWidget( lProcess, 0, 0, 0, 1 ); bCancel = new KPushButton( this, "bCancel" ); - bCancel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::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 QSpacerItem( 361, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1 = new TQSpacerItem( 361, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); processListLayout->addItem( spacer1, 1, 0 ); languageChange(); - resize( QSize(600, 480).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bCancel, SIGNAL( clicked() ), this, SLOT( bCancelClick() ) ); + connect( bCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bCancelClick() ) ); } /* @@ -56,7 +56,7 @@ processList::processList( QWidget* parent, const char* name, WFlags fl ) */ processList::~processList() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -70,7 +70,7 @@ void processList::languageChange() lProcess->header()->setLabel( 1, tr2i18n( "Elapsed" ) ); lProcess->header()->setLabel( 2, tr2i18n( "..." ) ); bCancel->setText( tr2i18n( "&Cancel" ) ); - bCancel->setAccel( QKeySequence( tr2i18n( "Alt+C" ) ) ); + bCancel->setAccel( TQKeySequence( tr2i18n( "Alt+C" ) ) ); } void processList::bCancelClick() diff --git a/libk9copy/processList.ui b/libk9copy/processList.ui index efd924c..351cc44 100644 --- a/libk9copy/processList.ui +++ b/libk9copy/processList.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>processList</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>processList</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQListView" row="0" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>Processes</string> @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>361</width> <height>20</height> @@ -106,10 +106,10 @@ <slot>bCancelClick()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>bCancelClick()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/libk9copy/progress.cpp b/libk9copy/progress.cpp index f4794a6..24f5c68 100644 --- a/libk9copy/progress.cpp +++ b/libk9copy/progress.cpp @@ -9,93 +9,93 @@ #include "progress.h" -#include <qvariant.h> -#include <qlabel.h> +#include <tqvariant.h> +#include <tqlabel.h> #include <kpushbutton.h> #include <kprogress.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include "kpushbutton.h" #include "kprogress.h" /* - * Constructs a Progress as a child of 'parent', with the + * Constructs a Progress as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -Progress::Progress( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +Progress::Progress( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "Progress" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setMinimumSize( QSize( 0, 0 ) ); - setCursor( QCursor( 3 ) ); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setMinimumSize( TQSize( 0, 0 ) ); + setCursor( TQCursor( 3 ) ); setMouseTracking( FALSE ); - ProgressLayout = new QGridLayout( this, 1, 1, 11, 6, "ProgressLayout"); + ProgressLayout = new TQGridLayout( this, 1, 1, 11, 6, "ProgressLayout"); - lblTitle = new QLabel( this, "lblTitle" ); - lblTitle->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, lblTitle->sizePolicy().hasHeightForWidth() ) ); - QFont lblTitle_font( lblTitle->font() ); + lblTitle = new TQLabel( this, "lblTitle" ); + 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 ); - lblTitle->setCursor( QCursor( 3 ) ); + lblTitle->setCursor( TQCursor( 3 ) ); ProgressLayout->addMultiCellWidget( lblTitle, 0, 0, 0, 2 ); bCancel = new KPushButton( this, "bCancel" ); - bCancel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) ); - bCancel->setCursor( QCursor( 0 ) ); + bCancel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bCancel->sizePolicy().hasHeightForWidth() ) ); + bCancel->setCursor( TQCursor( 0 ) ); bCancel->setProperty( "stdItem", 26 ); ProgressLayout->addWidget( bCancel, 6, 2 ); - spacer1 = new QSpacerItem( 161, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1 = new TQSpacerItem( 161, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); ProgressLayout->addMultiCell( spacer1, 6, 6, 0, 1 ); ProgressBar = new KProgress( this, "ProgressBar" ); - ProgressBar->setCursor( QCursor( 3 ) ); + ProgressBar->setCursor( TQCursor( 3 ) ); ProgressLayout->addMultiCellWidget( ProgressBar, 4, 4, 0, 2 ); - spacer2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed ); + spacer2 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Fixed ); ProgressLayout->addItem( spacer2, 5, 1 ); - image = new QLabel( this, "image" ); - image->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, image->sizePolicy().hasHeightForWidth() ) ); - image->setMinimumSize( QSize( 0, 250 ) ); - image->setPaletteBackgroundColor( QColor( 0, 0, 0 ) ); - image->setFrameShape( QLabel::NoFrame ); - image->setFrameShadow( QLabel::Plain ); - image->setAlignment( int( QLabel::AlignCenter ) ); + image = new TQLabel( this, "image" ); + 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->tqsetAlignment( int( TQLabel::AlignCenter ) ); ProgressLayout->addMultiCellWidget( image, 1, 1, 0, 2 ); - textLabel1 = new QLabel( this, "textLabel1" ); - textLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); - textLabel1->setCursor( QCursor( 3 ) ); + textLabel1 = new TQLabel( this, "textLabel1" ); + 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 QLabel( this, "lblElapsed" ); - lblElapsed->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, lblElapsed->sizePolicy().hasHeightForWidth() ) ); - lblElapsed->setCursor( QCursor( 3 ) ); + lblElapsed = new TQLabel( this, "lblElapsed" ); + 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 QLabel( this, "LabelText" ); - LabelText->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, LabelText->sizePolicy().hasHeightForWidth() ) ); - QFont LabelText_font( LabelText->font() ); + LabelText = new TQLabel( this, "LabelText" ); + 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( QCursor( 3 ) ); - LabelText->setAlignment( int( QLabel::AlignVCenter ) ); + LabelText->setCursor( TQCursor( 3 ) ); + LabelText->tqsetAlignment( int( TQLabel::AlignVCenter ) ); ProgressLayout->addMultiCellWidget( LabelText, 3, 3, 0, 2 ); languageChange(); - resize( QSize(473, 467).expandedTo(minimumSizeHint()) ); + resize( TQSize(473, 467).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bCancel, SIGNAL( clicked() ), this, SLOT( bCancelClick() ) ); + connect( bCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bCancelClick() ) ); } /* @@ -103,7 +103,7 @@ Progress::Progress( QWidget* parent, const char* name, WFlags fl ) */ Progress::~Progress() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -113,10 +113,10 @@ Progress::~Progress() void Progress::languageChange() { setCaption( tr2i18n( "k9Copy" ) ); - lblTitle->setText( QString::null ); + lblTitle->setText( TQString() ); textLabel1->setText( tr2i18n( "Elapsed Time" ) ); - lblElapsed->setText( QString::null ); - LabelText->setText( QString::null ); + lblElapsed->setText( TQString() ); + LabelText->setText( TQString() ); } void Progress::bCancelClick() diff --git a/libk9copy/progress.ui b/libk9copy/progress.ui index 21ee06b..8c10c3e 100644 --- a/libk9copy/progress.ui +++ b/libk9copy/progress.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Progress</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Progress</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>lblTitle</cstring> </property> @@ -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,14 +117,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>image</cstring> </property> @@ -136,7 +136,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>250</height> @@ -155,11 +155,11 @@ <property name="frameShadow"> <enum>Plain</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -178,7 +178,7 @@ <string>Elapsed Time</string> </property> </widget> - <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lblElapsed</cstring> </property> @@ -197,7 +197,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>LabelText</cstring> </property> @@ -220,7 +220,7 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -234,10 +234,10 @@ <slot>bCancelClick()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>bCancelClick()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kprogress.h</includehint> |