diff options
Diffstat (limited to 'src/rip/videodvd')
-rw-r--r-- | src/rip/videodvd/base_k3bvideodvdrippingwidget.ui | 122 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingdialog.cpp | 162 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingdialog.h | 19 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingjob.cpp | 50 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingjob.h | 17 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingpreview.cpp | 20 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingpreview.h | 13 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp | 144 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingtitlelistview.h | 11 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingview.cpp | 60 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingview.h | 11 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingwidget.cpp | 124 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingwidget.h | 17 |
13 files changed, 388 insertions, 382 deletions
diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui index 72b03b4..5d2ffdd 100644 --- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui +++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bVideoDVDRippingWidget</class> <author>Seastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -39,11 +39,11 @@ <bool>true</bool> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -54,7 +54,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -65,15 +65,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -81,7 +81,7 @@ <string>Video Size:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_comboVideoSize</cstring> </property> @@ -94,7 +94,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonCustomPictureSize</cstring> </property> @@ -104,15 +104,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -120,7 +120,7 @@ <string>Video Bitrate:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinVideoBitrate</cstring> </property> @@ -149,7 +149,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1_2</cstring> </property> @@ -168,7 +168,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -181,18 +181,18 @@ <cstring>m_editBaseDir</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>m_labelFreeSpace</cstring> </property> <property name="text"> <string>-</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -200,20 +200,20 @@ <string>Space needed:</string> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>m_labelNeededSpace</cstring> </property> <property name="text"> <string>-</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="1"> + <widget class="TQGroupBox" row="1" column="1"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -224,11 +224,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>m_stackAudioQuality</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_stackPageAudioQualityMp3</cstring> </property> @@ -242,7 +242,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkAudioVBR</cstring> </property> @@ -250,15 +250,15 @@ <string>Variable &Bitrate</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelAudioBitrate</cstring> </property> @@ -266,7 +266,7 @@ <string>Audio Bitrate:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_comboAudioBitrate</cstring> </property> @@ -278,7 +278,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_stackPageAudioQualityAC3Pt</cstring> </property> @@ -310,7 +310,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_stackPageAudioQualityAC3</cstring> </property> @@ -324,15 +324,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -340,7 +340,7 @@ <string>Audio Bitrate:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_spinAudioBitrate</cstring> </property> @@ -372,7 +372,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -384,7 +384,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -395,15 +395,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -421,15 +421,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -451,7 +451,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -462,15 +462,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -478,7 +478,7 @@ <string>Ripped files pattern:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_comboFilenamePattern</cstring> </property> @@ -509,19 +509,19 @@ <property name="text"> <string>See special strings</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkBlankReplace</cstring> </property> @@ -560,7 +560,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>5</width> <height>1</height> @@ -569,7 +569,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -580,7 +580,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkTwoPassEncoding</cstring> </property> @@ -602,7 +602,7 @@ <p>2-pass encoding results in a doubled encoding time.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkAutoClipping</cstring> </property> @@ -621,7 +621,7 @@ <p>Although this method is very reliable there may be problems if the source material is exceptionally short or dark.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkAudioResampling</cstring> </property> @@ -642,7 +642,7 @@ <p>If this option is checked K3b will change the sampling rate of the audio stream to 44100 Hz.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkLowPriority</cstring> </property> @@ -663,7 +663,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>1</height> @@ -706,7 +706,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index ddb5ff2..57f6426 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -34,14 +34,14 @@ #include <kconfig.h> #include <kmessagebox.h> -#include <qlayout.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qstyle.h> -#include <qfontmetrics.h> +#include <tqlayout.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> +#include <tqstyle.h> +#include <tqfontmetrics.h> -static QString videoCodecId( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) +static TQString videoCodecId( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) { switch( codec ) { case K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_FFMPEG_MPEG4: @@ -54,7 +54,7 @@ static QString videoCodecId( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ) } -static QString audioCodecId( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) +static TQString audioCodecId( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) { switch( codec ) { case K3bVideoDVDTitleTranscodingJob::AUDIO_CODEC_MP3: @@ -69,7 +69,7 @@ static QString audioCodecId( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ) } -static K3bVideoDVDTitleTranscodingJob::VideoCodec videoCodecFromId( const QString& codec ) +static K3bVideoDVDTitleTranscodingJob::VideoCodec videoCodecFromId( const TQString& codec ) { if( codec == "xvid" ) return K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_XVID; @@ -78,7 +78,7 @@ static K3bVideoDVDTitleTranscodingJob::VideoCodec videoCodecFromId( const QStrin } -static K3bVideoDVDTitleTranscodingJob::AudioCodec audioCodecFromId( const QString& codec ) +static K3bVideoDVDTitleTranscodingJob::AudioCodec audioCodecFromId( const TQString& codec ) { if( codec == "ac3_stereo" ) return K3bVideoDVDTitleTranscodingJob::AUDIO_CODEC_AC3_STEREO; @@ -90,7 +90,7 @@ static K3bVideoDVDTitleTranscodingJob::AudioCodec audioCodecFromId( const QStrin // resize according to aspect ratio -static QSize resizeTitle( const K3bVideoDVD::VideoStream& title, const QSize& size ) +static TQSize resizeTitle( const K3bVideoDVD::VideoStream& title, const TQSize& size ) { int w = size.width(); int h = size.height(); @@ -108,18 +108,18 @@ static QSize resizeTitle( const K3bVideoDVD::VideoStream& title, const QSize& si h = w * rh / rw; } - return QSize(w,h); + return TQSize(w,h); } -class K3bVideoDVDRippingDialog::AudioStreamViewItem : public QCheckListItem +class K3bVideoDVDRippingDialog::AudioStreamViewItem : public TQCheckListItem { public: AudioStreamViewItem( K3bVideoDVDRippingDialog* dlg, - QCheckListItem* parent, QListViewItem* after, const QString& text, + TQCheckListItem* tqparent, TQListViewItem* after, const TQString& text, int audioStream ) - : QCheckListItem( parent, after, text, RadioButton ), + : TQCheckListItem( tqparent, after, text, RadioButton ), m_audioStream( audioStream ), m_dlg( dlg ) { } @@ -127,7 +127,7 @@ public: private: void stateChange( bool ) { if( state() == On ) { - m_dlg->m_titleRipInfos[static_cast<QCheckListItem*>(parent())].audioStream = m_audioStream; + m_dlg->m_titleRipInfos[static_cast<TQCheckListItem*>(tqparent())].audioStream = m_audioStream; m_dlg->slotUpdateFilenames(); } } @@ -145,11 +145,11 @@ public: K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& dvd, - const QValueList<int>& titles, - QWidget* parent, const char* name ) - : K3bInteractionDialog( parent, name, + const TQValueList<int>& titles, + TQWidget* tqparent, const char* name ) + : K3bInteractionDialog( tqparent, name, i18n("Video DVD Ripping"), - QString::null, + TQString(), START_BUTTON|CANCEL_BUTTON, START_BUTTON, "VideoDVD Ripping" ), // config group @@ -157,22 +157,22 @@ K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& { d = new Private; - QWidget* frame = mainWidget(); - QHBoxLayout* frameLayout = new QHBoxLayout( frame ); + TQWidget* frame = mainWidget(); + TQHBoxLayout* frameLayout = new TQHBoxLayout( frame ); frameLayout->setMargin( 0 ); frameLayout->setAutoAdd( true ); m_w = new K3bVideoDVDRippingWidget( frame ); - connect( m_w, SIGNAL(changed()), - this, SLOT(slotUpdateFilesizes()) ); - connect( m_w, SIGNAL(changed()), - this, SLOT(slotUpdateFilenames()) ); - connect( m_w, SIGNAL(changed()), - this, SLOT(slotUpdateVideoSizes()) ); + connect( m_w, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotUpdateFilesizes()) ); + connect( m_w, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotUpdateFilenames()) ); + connect( m_w, TQT_SIGNAL(changed()), + this, TQT_SLOT(slotUpdateVideoSizes()) ); setTitle( i18n("Video DVD Ripping"), i18n("1 title from %1", "%n titles from %1", titles.count()) - .arg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) ); + .tqarg( k3bappcore->mediaCache()->medium(m_dvd.device()).beautifiedVolumeId() ) ); // populate list map populateTitleView( titles ); @@ -185,23 +185,23 @@ K3bVideoDVDRippingDialog::~K3bVideoDVDRippingDialog() } -void K3bVideoDVDRippingDialog::populateTitleView( const QValueList<int>& titles ) +void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles ) { m_w->m_titleView->clear(); m_titleRipInfos.clear(); - QCheckListItem* titleItem = 0; - for( QValueList<int>::const_iterator it = titles.begin(); it != titles.end(); ++it ) { - titleItem = new QCheckListItem( m_w->m_titleView, + TQCheckListItem* titleItem = 0; + for( TQValueList<int>::const_iterator it = titles.begin(); it != titles.end(); ++it ) { + titleItem = new TQCheckListItem( m_w->m_titleView, titleItem, i18n("Title %1 (%2)") - .arg(*it) - .arg(m_dvd[*it-1].playbackTime().toString()), - QCheckListItem::RadioButtonController ); - titleItem->setText( 1, QString("%1x%2") - .arg(m_dvd[*it-1].videoStream().realPictureWidth()) - .arg(m_dvd[*it-1].videoStream().realPictureHeight()) ); - titleItem->setText( 3, QString("%1 Title %2.avi").arg(m_dvd.volumeIdentifier()).arg(*it) ); + .tqarg(*it) + .tqarg(m_dvd[*it-1].playbackTime().toString()), + TQCheckListItem::RadioButtonController ); + titleItem->setText( 1, TQString("%1x%2") + .tqarg(m_dvd[*it-1].videoStream().realPictureWidth()) + .tqarg(m_dvd[*it-1].videoStream().realPictureHeight()) ); + titleItem->setText( 3, TQString("%1 Title %2.avi").tqarg(m_dvd.volumeIdentifier()).tqarg(*it) ); // now for the rip info K3bVideoDVDRippingJob::TitleRipInfo ri( *it ); @@ -219,30 +219,30 @@ void K3bVideoDVDRippingDialog::populateTitleView( const QValueList<int>& titles } } - QListViewItem* asI = 0; + TQListViewItem* asI = 0; for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) { - QString text = i18n("%1 %2Ch (%3%4)") - .arg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) ) - .arg( m_dvd[*it-1].audioStream(i).channels() ) - .arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty() + TQString text = i18n("%1 %2Ch (%3%4)") + .tqarg( K3bVideoDVD::audioFormatString( m_dvd[*it-1].audioStream(i).format() ) ) + .tqarg( m_dvd[*it-1].audioStream(i).channels() ) + .tqarg( m_dvd[*it-1].audioStream(i).langCode().isEmpty() ? i18n("unknown language") : KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) ) - .arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED - ? QString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() ) - : QString::null ); + .tqarg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED + ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() ) + : TQString() ); if( m_dvd[*it-1].audioStream(i).format() == K3bVideoDVD::AUDIO_FORMAT_DTS ) { - // width of the radio button from QCheckListItem::paintCell - int buttonSize = style().pixelMetric( QStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4; + // width of the radio button from TQCheckListItem::paintCell + int buttonSize = style().tqpixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4; int spaceWidth = fontMetrics().width( ' ' ); int numSpaces = buttonSize/spaceWidth; - asI = new QListViewItem( titleItem, asI, QString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" ); + asI = new TQListViewItem( titleItem, asI, TQString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" ); } else { asI = new AudioStreamViewItem( this, titleItem, asI, text, i ); if( ri.audioStream == (int)i ) - ((AudioStreamViewItem*)asI)->setState( QCheckListItem::On ); + ((AudioStreamViewItem*)asI)->setState( TQCheckListItem::On ); } } @@ -255,14 +255,14 @@ void K3bVideoDVDRippingDialog::populateTitleView( const QValueList<int>& titles void K3bVideoDVDRippingDialog::slotUpdateFilenames() { - QString baseDir = K3b::prepareDir( m_w->m_editBaseDir->url() ); + TQString baseDir = K3b::prepareDir( m_w->m_editBaseDir->url() ); d->fsInfo.setPath( baseDir ); - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { - QString f = d->fsInfo.fixupPath( createFilename( it.data(), m_w->m_comboFilenamePattern->currentText() ) ); + TQString f = d->fsInfo.fixupPath( createFilename( it.data(), m_w->m_comboFilenamePattern->currentText() ) ); if( m_w->m_checkBlankReplace->isChecked() ) - f.replace( QRegExp( "\\s" ), m_w->m_editBlankReplace->text() ); + f.tqreplace( TQRegExp( "\\s" ), m_w->m_editBlankReplace->text() ); it.data().filename = baseDir + f; it.key()->setText( 3, f ); } @@ -275,7 +275,7 @@ void K3bVideoDVDRippingDialog::slotUpdateFilesizes() KIO::filesize_t overallSize = 0ULL; // update file sizes - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { double sec = m_dvd[it.data().title-1].playbackTime().totalSeconds(); @@ -298,24 +298,24 @@ void K3bVideoDVDRippingDialog::slotUpdateFilesizes() void K3bVideoDVDRippingDialog::slotUpdateVideoSizes() { - QSize size = m_w->selectedPictureSize(); - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + TQSize size = m_w->selectedPictureSize(); + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { - QSize s( resizeTitle( m_dvd[it.data().title-1].videoStream(), size ) ); - it.key()->setText( 1, QString("%1x%2").arg(s.width()).arg(s.height()) ); + TQSize s( resizeTitle( m_dvd[it.data().title-1].videoStream(), size ) ); + it.key()->setText( 1, TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) ); } } -void K3bVideoDVDRippingDialog::setBaseDir( const QString& path ) +void K3bVideoDVDRippingDialog::setBaseDir( const TQString& path ) { m_w->m_editBaseDir->setURL( path ); } -QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const QString& pattern ) const +TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const TQString& pattern ) const { - QString f; + TQString f; const K3bVideoDVD::Title& title = m_dvd[info.title-1]; @@ -325,17 +325,17 @@ QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::T // if( pattern[i] == '%' ) { ++i; // skip the % - QChar c = pattern[i]; + TQChar c = pattern[i]; // // first check if we have a long keyword instead of a one-char // if( pattern[i] == '{' ) { - int j = pattern.find( '}', i ); + int j = pattern.tqfind( '}', i ); if( j < 0 ) // no closing bracket -> no valid pattern c = '*'; else { - QString keyword = pattern.mid( i+1, j-i-1 ); + TQString keyword = pattern.mid( i+1, j-i-1 ); if( keyword == "titlenumber" || keyword == "title_number" || keyword == "title" ) { @@ -422,7 +422,7 @@ QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::T switch( c ) { case PATTERN_TITLE_NUMBER: - f.append( QString::number(info.title).rightJustify( 2, '0' ) ); + f.append( TQString::number(info.title).rightJustify( 2, '0' ) ); break; case PATTERN_VOLUME_ID: f.append( m_dvd.volumeIdentifier() ); @@ -455,13 +455,13 @@ QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::T : 2 ) ); break; case PATTERN_ORIG_VIDEO_SIZE: - f.append( QString("%1x%2") - .arg(title.videoStream().pictureWidth()) - .arg(title.videoStream().pictureHeight()) ); + f.append( TQString("%1x%2") + .tqarg(title.videoStream().pictureWidth()) + .tqarg(title.videoStream().pictureHeight()) ); break; case PATTERN_VIDEO_SIZE: { - QSize s( resizeTitle( m_dvd[info.title-1].videoStream(), m_w->selectedPictureSize() ) ); - f.append( QString("%1x%2").arg(s.width()).arg(s.height()) ); + TQSize s( resizeTitle( m_dvd[info.title-1].videoStream(), m_w->selectedPictureSize() ) ); + f.append( TQString("%1x%2").tqarg(s.width()).tqarg(s.height()) ); break; } case PATTERN_ASPECT_RATIO: @@ -471,7 +471,7 @@ QString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::T f.append( "16:9" ); break; case PATTERN_CURRENT_DATE: - f.append( KGlobal::locale()->formatDate( QDate::currentDate() ) ); + f.append( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ); break; default: f.append( pattern[i-1] ); @@ -557,7 +557,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked() // We can only use the AC3 pass-through mode for AC3 streams // if( m_w->selectedAudioCodec() == K3bVideoDVDTitleTranscodingJob::AUDIO_CODEC_AC3_PASSTHROUGH ) { - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { if( m_dvd[it.data().title-1].numAudioStreams() > 0 && m_dvd[it.data().title-1].audioStream(it.data().audioStream).format() != K3bVideoDVD::AUDIO_FORMAT_AC3 ) { @@ -571,10 +571,10 @@ void K3bVideoDVDRippingDialog::slotStartClicked() } // check if we need to overwrite some files... - QStringList filesToOverwrite; - for( QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); + TQStringList filesToOverwrite; + for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { - if( QFile::exists( it.data().filename ) ) + if( TQFile::exists( it.data().filename ) ) filesToOverwrite.append( it.data().filename ); } @@ -586,10 +586,10 @@ void K3bVideoDVDRippingDialog::slotStartClicked() return; - QSize videoSize = m_w->selectedPictureSize(); + TQSize videoSize = m_w->selectedPictureSize(); int i = 0; - QValueVector<K3bVideoDVDRippingJob::TitleRipInfo> titles( m_titleRipInfos.count() ); - for( QMapConstIterator<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo> it = m_titleRipInfos.begin(); + TQValueVector<K3bVideoDVDRippingJob::TitleRipInfo> titles( m_titleRipInfos.count() ); + for( TQMapConstIterator<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo> it = m_titleRipInfos.begin(); it != m_titleRipInfos.end(); ++it ) { titles[i] = it.data(); titles[i].videoBitrate = 0; // use the global bitrate set below @@ -611,7 +611,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked() } // start the job - K3bJobProgressDialog dlg( parentWidget() ); + K3bJobProgressDialog dlg( tqparentWidget() ); K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, &dlg ); job->setVideoDVD( m_dvd ); job->setTitles( titles ); diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.h b/src/rip/videodvd/k3bvideodvdrippingdialog.h index 1acad53..bd8b7a0 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.h +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.h @@ -20,24 +20,25 @@ #include <k3bvideodvd.h> #include "k3bvideodvdrippingjob.h" -#include <qvaluelist.h> -#include <qmap.h> +#include <tqvaluelist.h> +#include <tqmap.h> class K3bVideoDVDRippingWidget; -class QCheckListItem; +class TQCheckListItem; class K3bVideoDVDRippingDialog : public K3bInteractionDialog { Q_OBJECT + TQ_OBJECT public: K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& dvd, - const QValueList<int>& titles, - QWidget *parent = 0, const char *name = 0 ); + const TQValueList<int>& titles, + TQWidget *tqparent = 0, const char *name = 0 ); ~K3bVideoDVDRippingDialog(); - void setBaseDir( const QString& path ); + void setBaseDir( const TQString& path ); enum FileNamingPattern { PATTERN_TITLE_NUMBER = 't', @@ -60,9 +61,9 @@ class K3bVideoDVDRippingDialog : public K3bInteractionDialog void slotUpdateVideoSizes(); private: - void populateTitleView( const QValueList<int>& titles ); + void populateTitleView( const TQValueList<int>& titles ); - QString createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const QString& pattern ) const; + TQString createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const TQString& pattern ) const; void loadK3bDefaults(); void loadUserDefaults( KConfigBase* ); @@ -71,7 +72,7 @@ class K3bVideoDVDRippingDialog : public K3bInteractionDialog K3bVideoDVDRippingWidget* m_w; K3bVideoDVD::VideoDVD m_dvd; - QMap<QCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo> m_titleRipInfos; + TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo> m_titleRipInfos; class AudioStreamViewItem; diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp index c10c127..1cc9e9e 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp @@ -38,7 +38,7 @@ K3bVideoDVDRippingJob::TitleRipInfo::TitleRipInfo() K3bVideoDVDRippingJob::TitleRipInfo::TitleRipInfo( int _title, int _audioStream, - const QString& fn, + const TQString& fn, int _width, int _height, int _videoBitrate, @@ -76,24 +76,24 @@ public: int failedTitles; - QValueVector<double> titleProgressParts; - QValueVector<double> titleClippingProgressParts; + TQValueVector<double> titleProgressParts; + TQValueVector<double> titleClippingProgressParts; }; -K3bVideoDVDRippingJob::K3bVideoDVDRippingJob( K3bJobHandler* hdl, QObject* parent ) - : K3bJob( hdl, parent ) +K3bVideoDVDRippingJob::K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* tqparent ) + : K3bJob( hdl, tqparent ) { d = new Private(); m_transcodingJob = new K3bVideoDVDTitleTranscodingJob( this, this ); connectSubJob( m_transcodingJob, - SLOT(slotTranscodingJobFinished(bool)), - SIGNAL(newTask(const QString&)), - SIGNAL(newSubTask(const QString&)), - SLOT(slotTranscodingProgress(int)), - SIGNAL(subPercent(int)), + TQT_SLOT(slotTranscodingJobFinished(bool)), + TQT_SIGNAL(newTask(const TQString&)), + TQT_SIGNAL(newSubTask(const TQString&)), + TQT_SLOT(slotTranscodingProgress(int)), + TQT_SIGNAL(subPercent(int)), 0, 0 ); m_detectClippingJob = 0; @@ -106,17 +106,17 @@ K3bVideoDVDRippingJob::~K3bVideoDVDRippingJob() } -QString K3bVideoDVDRippingJob::jobDescription() const +TQString K3bVideoDVDRippingJob::jobDescription() const { return i18n("Ripping Video DVD Titles"); } -QString K3bVideoDVDRippingJob::jobDetails() const +TQString K3bVideoDVDRippingJob::jobDetails() const { return i18n("Transcoding %n title to %1/%2", "Transcoding %n titles to %1/%2", m_titleRipInfos.count() ) - .arg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) ) - .arg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) ); + .tqarg( K3bVideoDVDTitleTranscodingJob::videoCodecString( m_transcodingJob->videoCodec() ) ) + .tqarg( K3bVideoDVDTitleTranscodingJob::audioCodecString( m_transcodingJob->audioCodec() ) ); } @@ -143,10 +143,10 @@ void K3bVideoDVDRippingJob::slotTranscodingJobFinished( bool success ) } else { if( success ) - emit infoMessage( i18n("Successfully ripped title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); + emit infoMessage( i18n("Successfully ripped title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); else { d->failedTitles++; - emit infoMessage( i18n("Failed to rip title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); + emit infoMessage( i18n("Failed to rip title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); } ++d->currentTitleInfoIndex ; @@ -176,11 +176,11 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success ) m_titleRipInfos[d->currentTitleInfoIndex].clipRight = 0; if( success ) { - emit infoMessage( i18n("Determined clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); + emit infoMessage( i18n("Determined clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), SUCCESS ); emit infoMessage( i18n("Top: %1, Bottom: %2") - .arg(m_detectClippingJob->clippingTop()).arg(m_detectClippingJob->clippingBottom()), INFO ); + .tqarg(m_detectClippingJob->clippingTop()).tqarg(m_detectClippingJob->clippingBottom()), INFO ); emit infoMessage( i18n("Left: %1, Right: %2") - .arg(m_detectClippingJob->clippingLeft()).arg(m_detectClippingJob->clippingRight()), INFO ); + .tqarg(m_detectClippingJob->clippingLeft()).tqarg(m_detectClippingJob->clippingRight()), INFO ); // let's see if the clipping values make sense if( m_detectClippingJob->clippingTop() + m_detectClippingJob->clippingBottom() @@ -197,7 +197,7 @@ void K3bVideoDVDRippingJob::slotDetectClippingJobFinished( bool success ) } } else - emit infoMessage( i18n("Failed to determine clipping values for title %1").arg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); + emit infoMessage( i18n("Failed to determine clipping values for title %1").tqarg(m_titleRipInfos[d->currentTitleInfoIndex].title), ERROR ); startTranscoding( d->currentTitleInfoIndex ); } @@ -234,11 +234,11 @@ void K3bVideoDVDRippingJob::startDetectClipping( int ripInfoIndex ) if( !m_detectClippingJob ) { m_detectClippingJob = new K3bVideoDVDTitleDetectClippingJob( this, this ); connectSubJob( m_detectClippingJob, - SLOT(slotDetectClippingJobFinished(bool)), - SIGNAL(newTask(const QString&)), - SIGNAL(newSubTask(const QString&)), - SLOT(slotDetectClippingProgress(int)), - SIGNAL(subPercent(int)), + TQT_SLOT(slotDetectClippingJobFinished(bool)), + TQT_SIGNAL(newTask(const TQString&)), + TQT_SIGNAL(newSubTask(const TQString&)), + TQT_SLOT(slotDetectClippingProgress(int)), + TQT_SIGNAL(subPercent(int)), 0, 0 ); } diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.h b/src/rip/videodvd/k3bvideodvdrippingjob.h index 7c9f4d2..93ec1b0 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.h +++ b/src/rip/videodvd/k3bvideodvdrippingjob.h @@ -20,7 +20,7 @@ #include <k3bvideodvd.h> #include <k3bvideodvdtitletranscodingjob.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> class K3bVideoDVDTitleDetectClippingJob; @@ -32,9 +32,10 @@ class K3bVideoDVDTitleDetectClippingJob; class K3bVideoDVDRippingJob : public K3bJob { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingJob( K3bJobHandler* hdl, QObject* parent ); + K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* tqparent ); ~K3bVideoDVDRippingJob(); class TitleRipInfo { @@ -42,7 +43,7 @@ class K3bVideoDVDRippingJob : public K3bJob TitleRipInfo(); TitleRipInfo( int title, int audioStream = 0, - const QString& fn = QString::null, + const TQString& fn = TQString(), int width = 0, // 0 -> no resize int height = 0, // 0 -> no resize int videoBitrate = 0, // 0 -> use default from job settings @@ -52,7 +53,7 @@ class K3bVideoDVDRippingJob : public K3bJob int clipRight = 0 ); int title; int audioStream; - QString filename; + TQString filename; int width; int height; int videoBitrate; @@ -62,15 +63,15 @@ class K3bVideoDVDRippingJob : public K3bJob int clipRight; }; - QString jobDescription() const; - QString jobDetails() const; + TQString jobDescription() const; + TQString jobDetails() const; public slots: void start(); void cancel(); void setVideoDVD( const K3bVideoDVD::VideoDVD& dvd ) { m_dvd = dvd; } - void setTitles( const QValueVector<TitleRipInfo>& titles ) { m_titleRipInfos = titles; } + void setTitles( const TQValueVector<TitleRipInfo>& titles ) { m_titleRipInfos = titles; } void setVideoCodec( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ); void setVideoBitrate( int bitrate ); @@ -94,7 +95,7 @@ class K3bVideoDVDRippingJob : public K3bJob void initProgressInfo(); K3bVideoDVD::VideoDVD m_dvd; - QValueVector<TitleRipInfo> m_titleRipInfos; + TQValueVector<TitleRipInfo> m_titleRipInfos; K3bVideoDVDTitleTranscodingJob* m_transcodingJob; K3bVideoDVDTitleDetectClippingJob* m_detectClippingJob; diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp index 3ba7582..a08ba51 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp @@ -23,12 +23,12 @@ #include <ktempdir.h> #include <kdebug.h> -#include <qdir.h> +#include <tqdir.h> -K3bVideoDVDRippingPreview::K3bVideoDVDRippingPreview( QObject* parent ) - : QObject( parent ), +K3bVideoDVDRippingPreview::K3bVideoDVDRippingPreview( TQObject* tqparent ) + : TQObject( tqparent ), m_tempDir( 0 ), m_process( 0 ) { @@ -60,7 +60,7 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv // auto-select a chapter // choose the center chapter, but not the first or last if possible if( chapter == 0 ) - chapter = QMIN( QMAX( dvd[title-1].numChapters()/2, 2 ), QMAX( dvd[title-1].numChapters() - 1, 1 ) ); + chapter = TQMIN( TQMAX( dvd[title-1].numChapters()/2, 2 ), TQMAX( dvd[title-1].numChapters() - 1, 1 ) ); // select a frame number unsigned int frame = 30; @@ -77,16 +77,16 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv m_process = new KProcess(); *m_process << bin->path; *m_process << "-i" << dvd.device()->blockDeviceName(); - *m_process << "-T" << QString("%1,%2").arg(title).arg(chapter); + *m_process << "-T" << TQString("%1,%2").tqarg(title).tqarg(chapter); *m_process << "-x" << "dvd,null"; *m_process << "--dvd_access_delay" << "0"; *m_process << "-y" << "ppm,null"; - *m_process << "-c" << QString("%1-%2").arg( frame ).arg( frame+1 ); + *m_process << "-c" << TQString("%1-%2").tqarg( frame ).tqarg( frame+1 ); *m_process << "-Z" << "x200"; *m_process << "-o" << m_tempDir->name(); - connect( m_process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotTranscodeFinished(KProcess*)) ); + connect( m_process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotTranscodeFinished(KProcess*)) ); if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout // something went wrong when starting the program // it "should" be the executable @@ -112,9 +112,9 @@ void K3bVideoDVDRippingPreview::cancel() void K3bVideoDVDRippingPreview::slotTranscodeFinished( KProcess* ) { // read the image - QString filename = m_tempDir->name() + "000000.ppm";// + tempQDir->entryList( QDir::Files ).first(); + TQString filename = m_tempDir->name() + "000000.ppm";// + tempTQDir->entryList( TQDir::Files ).first(); kdDebug() << "(K3bVideoDVDRippingPreview) reading from file " << filename << endl; - m_preview = QImage( filename ); + m_preview = TQImage( filename ); bool success = !m_preview.isNull() && !m_canceled; // remove temp files diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h index f5beb69..ab7b994 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.h +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h @@ -16,8 +16,8 @@ #ifndef _K3B_VIDEODVD_RIPPING_PREVIEW_H_ #define _K3B_VIDEODVD_RIPPING_PREVIEW_H_ -#include <qobject.h> -#include <qimage.h> +#include <tqobject.h> +#include <tqimage.h> #include <k3bvideodvd.h> @@ -25,15 +25,16 @@ class KTempDir; class KProcess; -class K3bVideoDVDRippingPreview : public QObject +class K3bVideoDVDRippingPreview : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingPreview( QObject* parent = 0 ); + K3bVideoDVDRippingPreview( TQObject* tqparent = 0 ); ~K3bVideoDVDRippingPreview(); - const QImage& preview() const { return m_preview; } + const TQImage& preview() const { return m_preview; } public slots: /** @@ -53,7 +54,7 @@ class K3bVideoDVDRippingPreview : public QObject void slotTranscodeFinished( KProcess* ); private: - QImage m_preview; + TQImage m_preview; KTempDir* m_tempDir; KProcess* m_process; int m_title; diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index 85379dc..244de2c 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -25,11 +25,11 @@ #include <k3bvideodvdvideostream.h> #include <k3bvideodvdsubpicturestream.h> -#include <qsimplerichtext.h> -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qheader.h> -#include <qtooltip.h> +#include <tqsimplerichtext.h> +#include <tqfontmetrics.h> +#include <tqpainter.h> +#include <tqheader.h> +#include <tqtooltip.h> #include <klocale.h> #include <kglobal.h> @@ -37,22 +37,22 @@ #include <kapplication.h> -static QString audioStreamString( const K3bVideoDVD::Title& title, unsigned int maxLines = 9999, bool includeExtInfo = true ) +static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int maxLines = 9999, bool includeExtInfo = true ) { - QString s = "<p>"; - for( unsigned int i = 0; i < QMIN( title.numAudioStreams(), maxLines ); ++i ) { + TQString s = "<p>"; + for( unsigned int i = 0; i < TQMIN( title.numAudioStreams(), maxLines ); ++i ) { if( i > 0 ) s += "<br>"; - s += QString::number(i+1) + ": " + s += TQString::number(i+1) + ": " + i18n("%1 %2Ch (%3<em>%4</em>)") - .arg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) ) - .arg( title.audioStream(i).channels() ) - .arg( title.audioStream(i).langCode().isEmpty() + .tqarg( K3bVideoDVD::audioFormatString( title.audioStream(i).format() ) ) + .tqarg( title.audioStream(i).channels() ) + .tqarg( title.audioStream(i).langCode().isEmpty() ? i18n("unknown language") : KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) ) - .arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED - ? QString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() ) - : QString::null ); + .tqarg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED + ? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() ) + : TQString() ); } if( title.numAudioStreams() > maxLines ) s += "..."; @@ -61,23 +61,23 @@ static QString audioStreamString( const K3bVideoDVD::Title& title, unsigned int } -static QString subpictureStreamString( const K3bVideoDVD::Title& title, unsigned int maxLines = 9999, bool includeExtInfo = true ) +static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigned int maxLines = 9999, bool includeExtInfo = true ) { - QString s = "<p>"; - for( unsigned int i = 0; i < QMIN( title.numSubPictureStreams(), maxLines ); ++i ) { + TQString s = "<p>"; + for( unsigned int i = 0; i < TQMIN( title.numSubPictureStreams(), maxLines ); ++i ) { if( i > 0 ) s += "<br>"; - s += QString::number(i+1) + ": " - + QString("%1 (%2<em>%3</em>)") - .arg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE + s += TQString::number(i+1) + ": " + + TQString("%1 (%2<em>%3</em>)") + .tqarg( title.subPictureStream(i).codeMode() == K3bVideoDVD::SUBPIC_CODE_MODE_RLE ? i18n("RLE") : i18n("Extended") ) - .arg( title.subPictureStream(i).langCode().isEmpty() + .tqarg( title.subPictureStream(i).langCode().isEmpty() ? i18n("unknown language") : KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) ) - .arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED - ? QString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() ) - : QString::null ); + .tqarg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED + ? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() ) + : TQString() ); } if( title.numSubPictureStreams() > maxLines ) s += "..."; @@ -90,8 +90,8 @@ static QString subpictureStreamString( const K3bVideoDVD::Title& title, unsigned class K3bVideoDVDRippingTitleListView::TitleViewItem : public K3bCheckListViewItem { public: - TitleViewItem( K3bVideoDVDRippingTitleListView* parent, QListViewItem* after, const K3bVideoDVD::Title& title ) - : K3bCheckListViewItem( parent, after ), + TitleViewItem( K3bVideoDVDRippingTitleListView* tqparent, TQListViewItem* after, const K3bVideoDVD::Title& title ) + : K3bCheckListViewItem( tqparent, after ), m_title( title ) { setMarginVertical( 4 ); @@ -113,39 +113,39 @@ public: // set a valid height int maxH = 0; for( int c = 1; c <= 4; ++c ) { - QSimpleRichText rt( text(c), listView()->font() ); + TQSimpleRichText rt( text(c), listView()->font() ); rt.setWidth( 600 ); // way to big to avoid line breaks - maxH = QMAX( maxH, rt.height() ); + maxH = TQMAX( maxH, rt.height() ); } setHeight( maxH + 2*marginVertical() ); } - int width( const QFontMetrics& fm, const QListView* lv, int c ) const { + int width( const TQFontMetrics& fm, const TQListView* lv, int c ) const { if( c == 0 ) return K3bCheckListViewItem::width( fm, lv, c ); else { - QSimpleRichText rt( text(c), lv->font() ); + TQSimpleRichText rt( text(c), lv->font() ); rt.setWidth( 600 ); // way to big to avoid line breaks return rt.widthUsed() + 2*marginHorizontal( c ); } } - void setPreview( const QImage& preview ) { + void setPreview( const TQImage& preview ) { m_preview = preview; - m_scaledPreview = QPixmap(); + m_scaledPreview = TQPixmap(); m_previewSet = true; - repaint(); + tqrepaint(); } - const QImage& preview() const { + const TQImage& preview() const { return m_preview; } protected: - void paintK3bCell( QPainter* p, const QColorGroup& cg, int col, int w, int align ) { + void paintK3bCell( TQPainter* p, const TQColorGroup& cg, int col, int w, int align ) { p->save(); if( col == 0 ) { @@ -155,7 +155,7 @@ protected: else if( col == 2 ) { if( isSelected() ) { p->fillRect( 0, 0, w, height(), - cg.brush( QColorGroup::Highlight ) ); + cg.brush( TQColorGroup::Highlight ) ); p->setPen( cg.highlightedText() ); } else { @@ -193,35 +193,35 @@ protected: preW = h*16/9; p->drawRect( ( w - preW ) / 2, ( height() - h ) / 2, preW, h ); - QPixmap noIcon = KApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true ); + TQPixmap noIcon = KApplication::kApplication()->iconLoader()->loadIcon( "no", KIcon::NoGroup, KIcon::SizeSmall, KIcon::DefaultState, 0, true ); p->drawPixmap( ( w - noIcon.width() ) / 2, ( height() - noIcon.height() ) / 2, noIcon ); } else { - p->drawText( 0, 0, w, height(), Qt::AlignCenter, "..." ); + p->drawText( 0, 0, w, height(), TQt::AlignCenter, "..." ); } } else { - QString s = text( col ); + TQString s = text( col ); if( s.isEmpty() ) K3bCheckListViewItem::paintK3bCell( p, cg, col, w, align ); else { - QColorGroup cg1( cg ); + TQColorGroup cg1( cg ); if( isSelected() ) { p->fillRect( 0, 0, w, height(), - cg.brush( QColorGroup::Highlight ) ); - cg1.setColor( QColorGroup::Text, cg.highlightedText() ); + cg.brush( TQColorGroup::Highlight ) ); + cg1.setColor( TQColorGroup::Text, cg.highlightedText() ); } else { p->fillRect( 0, 0, w, height(), cg.base() ); } - // paint using QSimpleRichText - QSimpleRichText rt( text(col), listView()->font() ); + // paint using TQSimpleRichText + TQSimpleRichText rt( text(col), listView()->font() ); rt.setWidth( 600 ); // way to big to avoid line breaks // normally we would have to clip the height to height()-2*marginVertical(). But if we do that - // some characters are cut (such as p or q). It seems as if QSimpleRichText does not properly + // some characters are cut (such as p or q). It seems as if TQSimpleRichText does not properly // calculate it's height... - rt.draw( p, 0, marginVertical(), QRect( 0, 0, w, height() ), cg1 ); + rt.draw( p, 0, marginVertical(), TQRect( 0, 0, w, height() ), cg1 ); } } @@ -229,7 +229,7 @@ protected: if( listView()->firstChild() != this ) { p->translate( -1*marginHorizontal(col), 0 ); // FIXME: modify the value from palette().disabled().foreground() to be lighter (or darker, depending on the background color ) - p->setPen( Qt::lightGray ); + p->setPen( TQt::lightGray ); p->drawLine( 0, 0, w+2*marginHorizontal(col), 0 ); } @@ -237,26 +237,26 @@ protected: } private: - QString text( int col ) const { + TQString text( int col ) const { switch( col ) { case 1: // Title X + length return i18n("<p><b>Title %1 (%2)</b><br>" "%3") - .arg( m_title.titleNumber(), 2 ) - .arg( m_title.playbackTime().toString( false ) ) - .arg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) ); + .tqarg( m_title.titleNumber(), 2 ) + .tqarg( m_title.playbackTime().toString( false ) ) + .tqarg( i18n("%n chapter", "%n chapters", m_title.numPTTs() ) ); case 3: // video stream info - return QString("<p>%1 %2x%3<br>%4%5") - .arg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") ) - .arg( m_title.videoStream().pictureWidth() ) - .arg( m_title.videoStream().pictureHeight() ) - .arg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" ) - .arg( m_title.videoStream().letterboxed() ? QString(" - <em>") + i18n("letterboxed") + QString("</em>"): + return TQString("<p>%1 %2x%3<br>%4%5") + .tqarg( m_title.videoStream().mpegVersion() == 0 ? i18n("MPEG1") : i18n("MPEG2") ) + .tqarg( m_title.videoStream().pictureWidth() ) + .tqarg( m_title.videoStream().pictureHeight() ) + .tqarg( m_title.videoStream().displayAspectRatio() == K3bVideoDVD::VIDEO_ASPECT_RATIO_4_3 ? "4:3" : "16:9" ) + .tqarg( m_title.videoStream().letterboxed() ? TQString(" - <em>") + i18n("letterboxed") + TQString("</em>"): m_title.videoStream().permittedDf() == K3bVideoDVD::VIDEO_PERMITTED_DF_LETTERBOXED - ? QString(" - <em>") + i18n("anamorph") + QString("</em>") : QString::null ); + ? TQString(" - <em>") + i18n("anamorph") + TQString("</em>") : TQString() ); case 4: // audio streams info @@ -280,8 +280,8 @@ private: K3bVideoDVD::Title m_title; bool m_previewSet; - QImage m_preview; - QPixmap m_scaledPreview; + TQImage m_preview; + TQPixmap m_scaledPreview; }; @@ -293,14 +293,14 @@ public: m_view( view ) { } - void maybeTip( const QPoint& pos ) { + void maybeTip( const TQPoint& pos ) { TitleViewItem* item = static_cast<TitleViewItem*>( m_view->itemAt( pos ) ); - QPoint contentsPos = m_view->viewportToContents( pos ); + TQPoint contentsPos = m_view->viewportToContents( pos ); if( !item ) return; int col = m_view->header()->sectionAt( contentsPos.x() ); - QRect r = m_view->itemRect( item ); + TQRect r = m_view->tqitemRect( item ); int headerPos = m_view->header()->sectionPos( col ); r.setLeft( headerPos ); r.setRight( headerPos + m_view->header()->sectionSize( col ) ); @@ -308,7 +308,7 @@ public: switch( col ) { case 2: if( !item->preview().isNull() ) { - QPixmap previewPix; + TQPixmap previewPix; if( previewPix.convertFromImage( item->preview() ) ) tip( r, previewPix, 0 ); } @@ -330,8 +330,8 @@ private: -K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( QWidget* parent ) - : K3bListView( parent ) +K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( TQWidget* tqparent ) + : K3bListView( tqparent ) { setFullWidth(true); setSorting(-1); @@ -346,15 +346,15 @@ K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( QWidget* paren addColumn( i18n("Subpicture") ); header()->setClickEnabled( false ); - setColumnWidthMode( 0, QListView::Manual ); + setColumnWidthMode( 0, TQListView::Manual ); setColumnWidth( 0, 20 ); header()->setResizeEnabled( false, 0 ); m_toolTip = new TitleToolTip( this ); m_previewGen = new K3bVideoDVDRippingPreview( this ); - connect( m_previewGen, SIGNAL(previewDone(bool)), - this, SLOT(slotPreviewDone(bool)) ); + connect( m_previewGen, TQT_SIGNAL(previewDone(bool)), + this, TQT_SLOT(slotPreviewDone(bool)) ); } @@ -385,7 +385,7 @@ void K3bVideoDVDRippingTitleListView::slotPreviewDone( bool success ) if( success ) m_itemMap[m_currentPreviewTitle-1]->setPreview( m_previewGen->preview() ); else - m_itemMap[m_currentPreviewTitle-1]->setPreview( QImage() ); + m_itemMap[m_currentPreviewTitle-1]->setPreview( TQImage() ); // cancel if we got hidden or if the medium changed. if( isVisible() && m_medium == k3bappcore->mediaCache()->medium( m_dvd.device() ) ) { @@ -396,7 +396,7 @@ void K3bVideoDVDRippingTitleListView::slotPreviewDone( bool success ) } -void K3bVideoDVDRippingTitleListView::hideEvent( QHideEvent* e ) +void K3bVideoDVDRippingTitleListView::hideEvent( TQHideEvent* e ) { // // For now we do it the easy way: just stop the preview generation diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h index 7c21815..2aa0dbc 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h @@ -20,18 +20,19 @@ #include <k3bvideodvd.h> #include <k3bmedium.h> -#include <qvaluevector.h> +#include <tqvaluevector.h> class K3bVideoDVDRippingPreview; -class QHideEvent; +class TQHideEvent; class K3bVideoDVDRippingTitleListView : public K3bListView { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingTitleListView( QWidget* parent ); + K3bVideoDVDRippingTitleListView( TQWidget* tqparent ); ~K3bVideoDVDRippingTitleListView(); void setVideoDVD( const K3bVideoDVD::VideoDVD& dvd ); @@ -40,14 +41,14 @@ class K3bVideoDVDRippingTitleListView : public K3bListView void slotPreviewDone( bool ); private: - void hideEvent( QHideEvent* ); + void hideEvent( TQHideEvent* ); class TitleViewItem; class TitleToolTip; TitleToolTip* m_toolTip; - QValueVector<TitleViewItem*> m_itemMap; + TQValueVector<TitleViewItem*> m_itemMap; K3bVideoDVDRippingPreview* m_previewGen; unsigned int m_currentPreviewTitle; diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index f6c8c8d..6753305 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -26,9 +26,9 @@ #include <k3bcore.h> #include <k3bexternalbinmanager.h> -#include <qcursor.h> -#include <qlayout.h> -#include <qlabel.h> +#include <tqcursor.h> +#include <tqlayout.h> +#include <tqlabel.h> #include <kapplication.h> #include <kmessagebox.h> @@ -37,24 +37,24 @@ #include <kconfig.h> -K3bVideoDVDRippingView::K3bVideoDVDRippingView( QWidget* parent, const char * name ) +K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* tqparent, const char * name ) : K3bMediaContentsView( true, K3bMedium::CONTENT_VIDEO_DVD, K3bDevice::MEDIA_DVD_ALL, K3bDevice::STATE_INCOMPLETE|K3bDevice::STATE_COMPLETE, - parent, name ) + tqparent, name ) { - QGridLayout* mainGrid = new QGridLayout( mainWidget() ); + TQGridLayout* mainGrid = new TQGridLayout( mainWidget() ); // toolbox // ---------------------------------------------------------------------------------- - QHBoxLayout* toolBoxLayout = new QHBoxLayout( 0, 0, 0, "toolBoxLayout" ); + TQHBoxLayout* toolBoxLayout = new TQHBoxLayout( 0, 0, 0, "toolBoxLayout" ); m_toolBox = new K3bToolBox( mainWidget() ); toolBoxLayout->addWidget( m_toolBox ); - QSpacerItem* spacer = new QSpacerItem( 10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum ); + TQSpacerItem* spacer = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); toolBoxLayout->addItem( spacer ); - m_labelLength = new QLabel( mainWidget() ); - m_labelLength->setAlignment( int( QLabel::AlignVCenter | QLabel::AlignRight ) ); + m_labelLength = new TQLabel( mainWidget() ); + m_labelLength->tqsetAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); toolBoxLayout->addWidget( m_labelLength ); @@ -62,10 +62,10 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( QWidget* parent, const char * na // ---------------------------------------------------------------------------------- m_titleView = new K3bVideoDVDRippingTitleListView( mainWidget() ); - connect( m_titleView, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&)) ); + connect( m_titleView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); - // general layout + // general tqlayout // ---------------------------------------------------------------------------------- mainGrid->addLayout( toolBoxLayout, 0, 0 ); mainGrid->addWidget( m_titleView, 1, 0 ); @@ -113,13 +113,13 @@ void K3bVideoDVDRippingView::reloadMedium() delete css; } - QApplication::setOverrideCursor( QCursor(Qt::WaitCursor) ); + TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) ); if( m_dvd.open( device() ) ) { setTitle( medium().beautifiedVolumeId() + " (" + i18n("Video DVD") + ")" ); m_labelLength->setText( i18n("%n title", "%n titles", m_dvd.numTitles() ) ); m_titleView->setVideoDVD( m_dvd ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); bool transcodeUsable = true; @@ -150,7 +150,7 @@ void K3bVideoDVDRippingView::reloadMedium() actionCollection()->action("start_rip")->setEnabled( transcodeUsable ); } else { - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); KMessageBox::error( this, i18n("Unable to read Video DVD contents.") ); } @@ -159,9 +159,9 @@ void K3bVideoDVDRippingView::reloadMedium() void K3bVideoDVDRippingView::slotStartRipping() { - QValueList<int> titles; + TQValueList<int> titles; int i = 1; - for( QListViewItemIterator it( m_titleView ); *it; ++it, ++i ) + for( TQListViewItemIterator it( m_titleView ); *it; ++it, ++i ) if( static_cast<K3bCheckListViewItem*>( *it )->isChecked() ) titles.append( i ); @@ -176,7 +176,7 @@ void K3bVideoDVDRippingView::slotStartRipping() } -void K3bVideoDVDRippingView::slotContextMenu( KListView*, QListViewItem*, const QPoint& p ) +void K3bVideoDVDRippingView::slotContextMenu( KListView*, TQListViewItem*, const TQPoint& p ) { m_popupMenu->popup(p); } @@ -184,22 +184,22 @@ void K3bVideoDVDRippingView::slotContextMenu( KListView*, QListViewItem*, const void K3bVideoDVDRippingView::slotCheckAll() { - for( QListViewItemIterator it( m_titleView ); it.current(); ++it ) + for( TQListViewItemIterator it( m_titleView ); it.current(); ++it ) dynamic_cast<K3bCheckListViewItem*>(it.current())->setChecked(true); } void K3bVideoDVDRippingView::slotUncheckAll() { - for( QListViewItemIterator it( m_titleView ); it.current(); ++it ) + for( TQListViewItemIterator it( m_titleView ); it.current(); ++it ) dynamic_cast<K3bCheckListViewItem*>(it.current())->setChecked(false); } void K3bVideoDVDRippingView::slotCheck() { - QPtrList<QListViewItem> items( m_titleView->selectedItems() ); - for( QPtrListIterator<QListViewItem> it( items ); + TQPtrList<TQListViewItem> items( m_titleView->selectedItems() ); + for( TQPtrListIterator<TQListViewItem> it( items ); it.current(); ++it ) dynamic_cast<K3bCheckListViewItem*>(it.current())->setChecked(true); } @@ -207,8 +207,8 @@ void K3bVideoDVDRippingView::slotCheck() void K3bVideoDVDRippingView::slotUncheck() { - QPtrList<QListViewItem> items( m_titleView->selectedItems() ); - for( QPtrListIterator<QListViewItem> it( items ); + TQPtrList<TQListViewItem> items( m_titleView->selectedItems() ); + for( TQPtrListIterator<TQListViewItem> it( items ); it.current(); ++it ) dynamic_cast<K3bCheckListViewItem*>(it.current())->setChecked(false); } @@ -219,19 +219,19 @@ void K3bVideoDVDRippingView::initActions() m_actionCollection = new KActionCollection( this ); KAction* actionSelectAll = new KAction( i18n("Check All"), 0, 0, this, - SLOT(slotCheckAll()), actionCollection(), + TQT_SLOT(slotCheckAll()), actionCollection(), "check_all" ); KAction* actionDeselectAll = new KAction( i18n("Uncheck All"), 0, 0, this, - SLOT(slotUncheckAll()), actionCollection(), + TQT_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); KAction* actionSelect = new KAction( i18n("Check Track"), 0, 0, this, - SLOT(slotCheck()), actionCollection(), + TQT_SLOT(slotCheck()), actionCollection(), "select_track" ); KAction* actionDeselect = new KAction( i18n("Uncheck Track"), 0, 0, this, - SLOT(slotUncheck()), actionCollection(), + TQT_SLOT(slotUncheck()), actionCollection(), "deselect_track" ); KAction* actionStartRip = new KAction( i18n("Start Ripping"), "gear", 0, this, - SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); + TQT_SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); actionStartRip->setToolTip( i18n("Open the Video DVD ripping dialog") ); diff --git a/src/rip/videodvd/k3bvideodvdrippingview.h b/src/rip/videodvd/k3bvideodvdrippingview.h index 679ea09..1bf58f3 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.h +++ b/src/rip/videodvd/k3bvideodvdrippingview.h @@ -22,18 +22,19 @@ class K3bVideoDVDRippingTitleListView; class K3bToolBox; -class QLabel; +class TQLabel; class KActionCollection; class KActionMenu; class KListView; -class QListViewItem; +class TQListViewItem; class K3bVideoDVDRippingView : public K3bMediaContentsView { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingView( QWidget* parent = 0, const char * name = 0 ); + K3bVideoDVDRippingView( TQWidget* tqparent = 0, const char * name = 0 ); ~K3bVideoDVDRippingView(); KActionCollection* actionCollection() const { return m_actionCollection; } @@ -41,7 +42,7 @@ class K3bVideoDVDRippingView : public K3bMediaContentsView private slots: void slotStartRipping(); - void slotContextMenu( KListView*, QListViewItem*, const QPoint& ); + void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ); void slotCheckAll(); void slotUncheckAll(); @@ -57,7 +58,7 @@ class K3bVideoDVDRippingView : public K3bMediaContentsView KActionMenu* m_popupMenu; K3bToolBox* m_toolBox; - QLabel* m_labelLength; + TQLabel* m_labelLength; K3bVideoDVDRippingTitleListView* m_titleView; K3bVideoDVD::VideoDVD m_dvd; diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index 721d191..06214a0 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -28,15 +28,15 @@ #include <kdialogbase.h> #include <klineedit.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qlabel.h> -#include <qtimer.h> -#include <qwhatsthis.h> -#include <qwidgetstack.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqlabel.h> +#include <tqtimer.h> +#include <tqwhatsthis.h> +#include <tqwidgetstack.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> static const int s_mp3Bitrates[] = { @@ -72,8 +72,8 @@ static const char* s_pictureSizeNames[] = { }; -K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( QWidget* parent ) - : base_K3bVideoDVDRippingWidget( parent ) +K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* tqparent ) + : base_K3bVideoDVDRippingWidget( tqparent ) { m_editBaseDir->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); @@ -86,15 +86,15 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( QWidget* parent ) // // Example filename pattern // - m_comboFilenamePattern->insertItem( QString( "%b - %1 %t (%n %a %c)" ).arg(i18n("Title") ) ); - m_comboFilenamePattern->insertItem( QString( "%{volumeid} (%{title})" ) ); + m_comboFilenamePattern->insertItem( TQString( "%b - %1 %t (%n %a %c)" ).tqarg(i18n("Title") ) ); + m_comboFilenamePattern->insertItem( TQString( "%{volumeid} (%{title})" ) ); // // Add the Audio bitrates // for( int i = 0; s_mp3Bitrates[i]; ++i ) - m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).arg(s_mp3Bitrates[i]) ); + m_comboAudioBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_mp3Bitrates[i]) ); for( int i = 0; i < K3bVideoDVDTitleTranscodingJob::VIDEO_CODEC_NUM_ENTRIES; ++i ) { @@ -118,32 +118,32 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( QWidget* parent ) slotAudioCodecChanged( m_comboAudioCodec->selectedValue() ); - connect( m_comboAudioBitrate, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - connect( m_spinVideoBitrate, SIGNAL(valueChanged(int)), - this, SIGNAL(changed()) ); - connect( m_checkBlankReplace, SIGNAL(toggled(bool)), - this, SIGNAL(changed()) ); - connect( m_editBlankReplace, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - connect( m_comboFilenamePattern, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - connect( m_editBaseDir, SIGNAL(textChanged(const QString&)), - this, SIGNAL(changed()) ); - - connect( m_comboAudioCodec, SIGNAL(valueChanged(int)), - this, SLOT(slotAudioCodecChanged(int)) ); - connect( m_specialStringsLabel, SIGNAL(leftClickedURL()), - this, SLOT(slotSeeSpecialStrings()) ); - connect( m_buttonCustomPictureSize, SIGNAL(clicked()), - this, SLOT(slotCustomPictureSize()) ); - connect( m_comboVideoSize, SIGNAL(activated(int)), - this, SLOT(slotVideoSizeChanged(int)) ); + connect( m_comboAudioBitrate, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + connect( m_spinVideoBitrate, TQT_SIGNAL(valueChanged(int)), + this, TQT_SIGNAL(changed()) ); + connect( m_checkBlankReplace, TQT_SIGNAL(toggled(bool)), + this, TQT_SIGNAL(changed()) ); + connect( m_editBlankReplace, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + connect( m_comboFilenamePattern, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SIGNAL(changed()) ); + + connect( m_comboAudioCodec, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotAudioCodecChanged(int)) ); + connect( m_specialStringsLabel, TQT_SIGNAL(leftClickedURL()), + this, TQT_SLOT(slotSeeSpecialStrings()) ); + connect( m_buttonCustomPictureSize, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotCustomPictureSize()) ); + connect( m_comboVideoSize, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotVideoSizeChanged(int)) ); // refresh every 2 seconds - m_freeSpaceUpdateTimer = new QTimer( this ); - connect( m_freeSpaceUpdateTimer, SIGNAL(timeout()), - this, SLOT(slotUpdateFreeTempSpace()) ); + m_freeSpaceUpdateTimer = new TQTimer( this ); + connect( m_freeSpaceUpdateTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(slotUpdateFreeTempSpace()) ); m_freeSpaceUpdateTimer->start(2000); slotUpdateFreeTempSpace(); } @@ -160,35 +160,35 @@ K3bVideoDVDTitleTranscodingJob::VideoCodec K3bVideoDVDRippingWidget::selectedVid } -QSize K3bVideoDVDRippingWidget::selectedPictureSize() const +TQSize K3bVideoDVDRippingWidget::selectedPictureSize() const { switch( m_comboVideoSize->currentItem() ) { case PICTURE_SIZE_ORIGINAL: - return QSize(0,0); + return TQSize(0,0); case PICTURE_SIZE_640: - return QSize(640,0); + return TQSize(640,0); case PICTURE_SIZE_320: - return QSize(320,0); + return TQSize(320,0); default: return m_customVideoSize; } } -void K3bVideoDVDRippingWidget::setSelectedPictureSize( const QSize& size ) +void K3bVideoDVDRippingWidget::setSelectedPictureSize( const TQSize& size ) { m_customVideoSize = size; - if( size == QSize(0,0) ) + if( size == TQSize(0,0) ) m_comboVideoSize->setCurrentItem( PICTURE_SIZE_ORIGINAL ); - else if( size == QSize(640,0) ) + else if( size == TQSize(640,0) ) m_comboVideoSize->setCurrentItem( PICTURE_SIZE_640 ); - else if( size == QSize(320,0) ) + else if( size == TQSize(320,0) ) m_comboVideoSize->setCurrentItem( PICTURE_SIZE_320 ); else { m_comboVideoSize->changeItem( i18n(s_pictureSizeNames[PICTURE_SIZE_CUSTOM]) - + QString(" (%1x%2)") - .arg(size.width() == 0 ? i18n("auto") : QString::number(size.width())) - .arg(size.height() == 0 ? i18n("auto") : QString::number(size.height())), + + TQString(" (%1x%2)") + .tqarg(size.width() == 0 ? i18n("auto") : TQString::number(size.width())) + .tqarg(size.height() == 0 ? i18n("auto") : TQString::number(size.height())), PICTURE_SIZE_CUSTOM ); m_comboVideoSize->setCurrentItem( PICTURE_SIZE_CUSTOM ); } @@ -246,16 +246,16 @@ void K3bVideoDVDRippingWidget::setSelectedAudioBitrate( int bitrate ) void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace() { - QString path = m_editBaseDir->url(); + TQString path = m_editBaseDir->url(); - if( !QFile::exists( path ) ) - path.truncate( path.findRev('/') ); + if( !TQFile::exists( path ) ) + path.truncate( path.tqfindRev('/') ); unsigned long size, avail; if( K3b::kbFreeOnFs( path, size, avail ) ) { m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) ); if( avail < m_neededSize/1024 ) - m_labelNeededSpace->setPaletteForegroundColor( Qt::red ); + m_labelNeededSpace->setPaletteForegroundColor( TQt::red ); else m_labelNeededSpace->setPaletteForegroundColor( paletteForegroundColor() ); } @@ -280,7 +280,7 @@ void K3bVideoDVDRippingWidget::setNeededSize( KIO::filesize_t size ) void K3bVideoDVDRippingWidget::slotSeeSpecialStrings() { - QWhatsThis::display( i18n( "<p><b>Pattern special strings:</b>" + TQWhatsThis::display( i18n( "<p><b>Pattern special strings:</b>" "<p>The following strings will be replaced with their respective meaning in every " "track name.<br>" "<p><table border=\"0\">" @@ -345,16 +345,16 @@ void K3bVideoDVDRippingWidget::slotCustomPictureSize() "Be aware that setting both the width and the height to fixed values " "will result in no aspect ratio correction to be performed."), dlg.plainPage() ); - QSpinBox* spinWidth = new QSpinBox( 0, 20000, 16, dlg.plainPage() ); - QSpinBox* spinHeight = new QSpinBox( 0, 20000, 16, dlg.plainPage() ); + TQSpinBox* spinWidth = new TQSpinBox( 0, 20000, 16, dlg.plainPage() ); + TQSpinBox* spinHeight = new TQSpinBox( 0, 20000, 16, dlg.plainPage() ); spinWidth->setSpecialValueText( i18n("Auto") ); spinHeight->setSpecialValueText( i18n("Auto") ); - QLabel* labelW = new QLabel( spinWidth, i18n("Width") + ':', dlg.plainPage() ); - QLabel* labelH = new QLabel( spinHeight, i18n("Height") + ':', dlg.plainPage() ); - labelW->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); - labelH->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); + TQLabel* labelW = new TQLabel( spinWidth, i18n("Width") + ':', dlg.plainPage() ); + TQLabel* labelH = new TQLabel( spinHeight, i18n("Height") + ':', dlg.plainPage() ); + labelW->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter ); + labelH->tqsetAlignment( TQt::AlignRight|TQt::AlignVCenter ); - QGridLayout* grid = new QGridLayout( dlg.plainPage() ); + TQGridLayout* grid = new TQGridLayout( dlg.plainPage() ); grid->setMargin( 0 ); grid->setSpacing( KDialog::spacingHint() ); grid->addMultiCellWidget( label, 0, 0, 0, 3 ); @@ -367,7 +367,7 @@ void K3bVideoDVDRippingWidget::slotCustomPictureSize() spinHeight->setValue( m_customVideoSize.height() ); if( dlg.exec() ) { - setSelectedPictureSize( QSize( spinWidth->value(), spinHeight->value() ) ); + setSelectedPictureSize( TQSize( spinWidth->value(), spinHeight->value() ) ); emit changed(); } } diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h index 2d10da7..5335b7c 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.h +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h @@ -20,30 +20,31 @@ #include <k3bvideodvdtitletranscodingjob.h> -#include <qvaluevector.h> -#include <qmap.h> +#include <tqvaluevector.h> +#include <tqmap.h> #include <kio/global.h> -class QTimer; +class TQTimer; class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget { Q_OBJECT + TQ_OBJECT public: - K3bVideoDVDRippingWidget( QWidget* parent ); + K3bVideoDVDRippingWidget( TQWidget* tqparent ); ~K3bVideoDVDRippingWidget(); K3bVideoDVDTitleTranscodingJob::VideoCodec selectedVideoCodec() const; K3bVideoDVDTitleTranscodingJob::AudioCodec selectedAudioCodec() const; int selectedAudioBitrate() const; - QSize selectedPictureSize() const; + TQSize selectedPictureSize() const; void setSelectedVideoCodec( K3bVideoDVDTitleTranscodingJob::VideoCodec codec ); void setSelectedAudioCodec( K3bVideoDVDTitleTranscodingJob::AudioCodec codec ); void setSelectedAudioBitrate( int bitrate ); - void setSelectedPictureSize( const QSize& ); + void setSelectedPictureSize( const TQSize& ); void setNeededSize( KIO::filesize_t ); @@ -58,10 +59,10 @@ class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget void slotCustomPictureSize(); private: - QTimer* m_freeSpaceUpdateTimer; + TQTimer* m_freeSpaceUpdateTimer; KIO::filesize_t m_neededSize; - QSize m_customVideoSize; + TQSize m_customVideoSize; }; #endif |