From b0e912c8b3d02a518fedda28c3180eb4794a7520 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 27 May 2011 23:37:00 +0000 Subject: [PATCH] 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 --- dvdread/dvd_reader.h | 2 +- dvdread/dvd_udf.c | 6 +- dvdread/ifo_read.c | 4 +- dvdread/ifo_types.h | 4 +- dvdread/nav_read.c | 2 +- dvdread/nav_types.h | 4 +- k9Mplayer/k9mplayer.cpp | 80 ++++---- k9Mplayer/k9mplayer.h | 25 +-- k9Mplayer/mplayer.cpp | 158 +++++++-------- k9Mplayer/mplayer.ui | 56 +++--- k9author/chapterEdit.cpp | 118 +++++------ k9author/chapterEdit.ui | 60 +++--- k9author/import.cpp | 76 +++---- k9author/import.ui | 38 ++-- k9author/k9avidecode.cpp | 22 +-- k9author/k9avidecode.h | 21 +- k9author/k9avifile.cpp | 28 +-- k9author/k9avifile.h | 43 ++-- k9author/k9canvasselection.cpp | 56 +++--- k9author/k9canvasselection.h | 15 +- k9author/k9chapteredit.cpp | 48 ++--- k9author/k9chapteredit.h | 15 +- k9author/k9import.cpp | 48 ++--- k9author/k9import.h | 21 +- k9author/k9importfiles.cpp | 6 +- k9author/k9importfiles.h | 5 +- k9author/k9lvitemimport.cpp | 10 +- k9author/k9lvitemimport.h | 8 +- k9author/k9menu.cpp | 164 +++++++-------- k9author/k9menu.h | 67 +++---- k9author/k9menubutton.cpp | 46 ++--- k9author/k9menubutton.h | 59 +++--- k9author/k9menuedit.cpp | 104 +++++----- k9author/k9menuedit.h | 53 ++--- k9author/k9menueditor.cpp | 86 ++++---- k9author/k9menueditor.h | 37 ++-- k9author/k9newdvd.cpp | 154 +++++++-------- k9author/k9newdvd.h | 45 ++--- k9author/k9newtitle.cpp | 38 ++-- k9author/k9newtitle.h | 13 +- k9author/k9title.cpp | 12 +- k9author/k9title.h | 13 +- k9author/menuEdit.cpp | 110 +++++------ k9author/menuEdit.ui | 54 ++--- k9author/newTitle.cpp | 92 ++++----- k9author/newTitle.ui | 38 ++-- k9decmpeg/cpu_accel.cpp | 2 +- k9decmpeg/header.cpp | 44 ++--- k9decmpeg/idct_alpha.cpp | 30 +-- k9decmpeg/k9decodethread.h | 12 +- k9decmpeg/k9plaympeg2.cpp | 24 +-- k9decmpeg/k9plaympeg2.h | 19 +- k9decmpeg/kdecmpeg2.cpp | 14 +- k9decmpeg/kdecmpeg2.h | 33 ++-- k9decmpeg/mmx.h | 2 +- k9decmpeg/motion_comp_mmx.cpp | 24 +-- k9decmpeg/motion_comp_vis.cpp | 6 +- k9decmpeg/mpeg2.h | 26 +-- k9decmpeg/mpeg2_internal.h | 2 +- k9decmpeg/rgb_mmx.cpp | 12 +- k9decmpeg/slice.cpp | 4 +- k9decmpeg/vlc.h | 14 +- k9devices/k9cddrive.cpp | 38 ++-- k9devices/k9cddrive.h | 28 +-- k9devices/k9dbusdispatch.cpp | 32 +-- k9devices/k9dbusdispatch.h | 29 +-- k9devices/k9halconnection.cpp | 18 +- k9devices/k9halconnection.h | 22 ++- k9devices/k9haldevice.cpp | 26 +-- k9devices/k9haldevice.h | 34 ++-- k9vamps/getvlc.h | 16 +- k9vamps/k9fifo.h | 4 +- k9vamps/k9requant.cpp | 22 +-- k9vamps/k9requant.h | 20 +- k9vamps/k9requant2.h | 10 +- k9vamps/k9vamps.cpp | 30 +-- k9vamps/k9vamps.h | 32 +-- k9vamps/tcmemcpy.cpp | 4 +- libdvdnav/decoder.c | 14 +- libdvdnav/dvdnav.h | 10 +- libdvdnav/read_cache.c | 2 +- libdvdnav/settings.c | 6 +- libdvdnav/vm.c | 8 +- libk9copy/backupdlg.cpp | 138 ++++++------- libk9copy/backupdlg.ui | 50 ++--- libk9copy/dvdprogress.cpp | 78 ++++---- libk9copy/dvdprogress.ui | 30 +-- libk9copy/k9audiocodecs.cpp | 36 ++-- libk9copy/k9audiocodecs.h | 19 +- libk9copy/k9backupdlg.cpp | 42 ++-- libk9copy/k9backupdlg.h | 21 +- libk9copy/k9burndvd.cpp | 124 ++++++------ libk9copy/k9burndvd.h | 37 ++-- libk9copy/k9cell.cpp | 12 +- libk9copy/k9cell.h | 24 +-- libk9copy/k9cellcopylist.cpp | 20 +- libk9copy/k9cellcopylist.h | 8 +- libk9copy/k9common.h | 6 +- libk9copy/k9config.cpp | 4 +- libk9copy/k9config.h | 108 +++++----- libk9copy/k9drawimage.cpp | 18 +- libk9copy/k9drawimage.h | 17 +- libk9copy/k9dvd.cpp | 91 ++++----- libk9copy/k9dvd.h | 77 ++++---- libk9copy/k9dvdauthor.cpp | 182 ++++++++--------- libk9copy/k9dvdauthor.h | 31 +-- libk9copy/k9dvdbackup.cpp | 154 +++++++-------- libk9copy/k9dvdbackup.h | 46 ++--- libk9copy/k9dvdchapter.cpp | 6 +- libk9copy/k9dvdchapter.h | 22 ++- libk9copy/k9dvdprogress.cpp | 14 +- libk9copy/k9dvdprogress.h | 9 +- libk9copy/k9dvdread.cpp | 10 +- libk9copy/k9dvdread.h | 12 +- libk9copy/k9dvdsize.cpp | 2 +- libk9copy/k9dvdsize.h | 9 +- libk9copy/k9dvdtitle.cpp | 92 ++++----- libk9copy/k9dvdtitle.h | 128 ++++++------ libk9copy/k9dvdtitleset.cpp | 6 +- libk9copy/k9dvdtitleset.h | 13 +- libk9copy/k9ifo2.cpp | 30 +-- libk9copy/k9ifo2.h | 17 +- libk9copy/k9mp4dlg.cpp | 26 +-- libk9copy/k9mp4dlg.h | 21 +- libk9copy/k9mp4enc.cpp | 188 +++++++++--------- libk9copy/k9mp4enc.h | 69 +++---- libk9copy/k9process.cpp | 18 +- libk9copy/k9process.h | 11 +- libk9copy/k9processlist.cpp | 70 +++---- libk9copy/k9processlist.h | 21 +- libk9copy/k9progress.cpp | 36 ++-- libk9copy/k9progress.h | 19 +- libk9copy/k9saveimage.cpp | 10 +- libk9copy/k9saveimage.h | 19 +- libk9copy/k9titleencopt.cpp | 22 +-- libk9copy/k9titleencopt.h | 31 +-- libk9copy/k9tools.cpp | 20 +- libk9copy/k9tools.h | 6 +- libk9copy/k9videocodecs.cpp | 60 +++--- libk9copy/k9videocodecs.h | 31 +-- libk9copy/mp4dlg.cpp | 114 +++++------ libk9copy/mp4dlg.ui | 42 ++-- libk9copy/processList.cpp | 34 ++-- libk9copy/processList.ui | 14 +- libk9copy/progress.cpp | 90 ++++----- libk9copy/progress.ui | 32 +-- src/configDlg.cpp | 58 +++--- src/configDlg.ui | 20 +- src/images.h | 122 ++++++------ src/k9copy.cpp | 94 ++++----- src/k9copy.h | 21 +- src/k9glwidget.cpp | 22 +-- src/k9glwidget.h | 37 ++-- src/k9langselect.cpp | 26 +-- src/k9langselect.h | 19 +- src/k9main.cpp | 262 ++++++++++++------------ src/k9main.h | 118 +++++------ src/k9mainw.cpp | 128 ++++++------ src/k9mainw.ui | 58 +++--- src/k9mainwsov.ui | 48 ++--- src/k9mencodercmdgen.cpp | 350 ++++++++++++++++----------------- src/k9mencodercmdgen.h | 49 ++--- src/k9mp4title.cpp | 34 ++-- src/k9mp4title.h | 11 +- src/k9play.cpp | 90 ++++----- src/k9play.h | 54 ++--- src/k9playbackoptions.cpp | 18 +- src/k9playbackoptions.h | 21 +- src/k9prefauthor.cpp | 8 +- src/k9prefauthor.h | 7 +- src/k9prefdvd.cpp | 8 +- src/k9prefdvd.h | 3 +- src/k9prefmencoder.cpp | 26 +-- src/k9prefmencoder.h | 19 +- src/k9prefmpeg4.cpp | 20 +- src/k9prefmpeg4.h | 11 +- src/k9prefpreview.cpp | 12 +- src/k9prefpreview.h | 3 +- src/k9redirect.cpp | 4 +- src/k9redirect.h | 2 +- src/k9settings.cpp | 36 ++-- src/k9settings.h | 3 +- src/k9titlefactor.cpp | 22 +-- src/k9titlefactor.h | 3 +- src/k9updatefactor.cpp | 4 +- src/k9updatefactor.h | 13 +- src/kconfigdlg.cpp | 40 ++-- src/kconfigdlg.h | 8 +- src/kviewmpeg2.cpp | 66 +++---- src/kviewmpeg2.h | 46 ++--- src/langselectw.cpp | 40 ++-- src/langselectw.ui | 10 +- src/main.cpp | 34 ++-- src/mencoderCmdGen.cpp | 78 ++++---- src/mencoderCmdGen.ui | 28 +-- src/playbackoptionsw.cpp | 136 ++++++------- src/playbackoptionsw.ui | 54 ++--- src/prefAuthor.cpp | 76 +++---- src/prefAuthor.ui | 36 ++-- src/prefDVD.cpp | 64 +++--- src/prefDVD.ui | 26 +-- src/prefMPEG4.cpp | 232 +++++++++++----------- src/prefMPEG4.ui | 118 +++++------ src/prefMencoder.cpp | 254 ++++++++++++------------ src/prefMencoder.ui | 130 ++++++------ src/prefpreview.cpp | 110 +++++------ src/prefpreview.ui | 46 ++--- src/titlefactor.cpp | 70 +++---- src/titlefactor.ui | 22 +-- src/viewmpeg2.cpp | 86 ++++---- src/viewmpeg2.ui | 22 +-- 211 files changed, 4683 insertions(+), 4597 deletions(-) diff --git a/dvdread/dvd_reader.h b/dvdread/dvd_reader.h index d666e8a..c090b32 100644 --- a/dvdread/dvd_reader.h +++ b/dvdread/dvd_reader.h @@ -285,7 +285,7 @@ int DVDDiscID( dvd_reader_t *, unsigned char * ); * * @param dvd A read handle to get the disc ID from * @param volid The buffer to put the VolumeIdentifier into. - * The VolumeIdentifier is latin-1 encoded (8bit unicode) + * The VolumeIdentifier is latin-1 encoded (8bit tqunicode) * null terminated and max 32 bytes (including '\0') * @param volid_size No more than volid_size bytes will be copied to volid. * If the VolumeIdentifier is truncated because of this diff --git a/dvdread/dvd_udf.c b/dvdread/dvd_udf.c index 9af6ad0..9c9b5ef 100644 --- a/dvdread/dvd_udf.c +++ b/dvdread/dvd_udf.c @@ -88,7 +88,7 @@ extern void SetAlignHandle(dvd_reader_t *device, void *align); * this function should be rewritten to use posix_memalign or similar. * It's just needed for aligning memory for small block reads from * raw/O_DIRECT devices. - * We assume that 2048 is enough alignment for all systems at the moment. + * We assume that 2048 is enough tqalignment for all systems at the moment. * Not thread safe. Only use this from one thread. * Depends on sizeof(unsigned long) being at least as large as sizeof(void *) */ @@ -498,7 +498,7 @@ static int Unicodedecode( uint8_t *data, int len, char *target ) int p = 1, i = 0; if( ( data[ 0 ] == 8 ) || ( data[ 0 ] == 16 ) ) do { - if( data[ 0 ] == 16 ) p++; /* Ignore MSB of unicode16 */ + if( data[ 0 ] == 16 ) p++; /* Ignore MSB of tqunicode16 */ if( p < len ) { target[ i++ ] = data[ p++ ]; } @@ -1157,7 +1157,7 @@ static int UDFGetPVD(dvd_reader_t *device, struct pvd_t *pvd) } /** - * Gets the Volume Identifier string, in 8bit unicode (latin-1) + * Gets the Volume Identifier string, in 8bit tqunicode (latin-1) * volid, place to put the string * volid_size, size of the buffer volid points to * returns the size of buffer needed for all data diff --git a/dvdread/ifo_read.c b/dvdread/ifo_read.c index e58b913..41c797b 100644 --- a/dvdread/ifo_read.c +++ b/dvdread/ifo_read.c @@ -969,7 +969,7 @@ int ifoRead_TT_SRPT(ifo_handle_t *ifofile) { for(i = 0; i < tt_srpt->nr_of_srpts; i++) { B2N_16(tt_srpt->title[i].nr_of_ptts); - B2N_16(tt_srpt->title[i].parental_id); + B2N_16(tt_srpt->title[i].tqparental_id); B2N_32(tt_srpt->title[i].title_set_sector); } @@ -1778,7 +1778,7 @@ static int ifoRead_PGCIT_internal(ifo_handle_t *ifofile, pgcit_t *pgcit, for(i = 0; i < pgcit->nr_of_pgci_srp; i++) { memcpy(&pgcit->pgci_srp[i], ptr, PGCI_SRP_SIZE); ptr += PGCI_SRP_SIZE; - B2N_16(pgcit->pgci_srp[i].ptl_id_mask); + B2N_16(pgcit->pgci_srp[i].ptl_id_tqmask); B2N_32(pgcit->pgci_srp[i].pgc_start_byte); CHECK_VALUE(pgcit->pgci_srp[i].unknown1 == 0); } diff --git a/dvdread/ifo_types.h b/dvdread/ifo_types.h index ec4937d..53ffc05 100644 --- a/dvdread/ifo_types.h +++ b/dvdread/ifo_types.h @@ -444,7 +444,7 @@ typedef struct { unsigned int block_type : 2; unsigned int block_mode : 2; #endif - uint16_t ptl_id_mask; + uint16_t ptl_id_tqmask; uint32_t pgc_start_byte; pgc_t *pgc; } ATTRIBUTE_PACKED pgci_srp_t; @@ -596,7 +596,7 @@ typedef struct { playback_type_t pb_ty; uint8_t nr_of_angles; uint16_t nr_of_ptts; - uint16_t parental_id; + uint16_t tqparental_id; uint8_t title_set_nr; uint8_t vts_ttn; uint32_t title_set_sector; diff --git a/dvdread/nav_read.c b/dvdread/nav_read.c index 54d9a11..8d664f2 100644 --- a/dvdread/nav_read.c +++ b/dvdread/nav_read.c @@ -63,7 +63,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) { for(j = 0; j < 2; j++) B2N_32(pci->hli.btn_colit.btn_coli[i][j]); - /* NOTE: I've had to change the structure from the disk layout to get + /* NOTE: I've had to change the structure from the disk tqlayout to get * the packing to work with Sun's Forte C compiler. */ /* pci hli btni */ diff --git a/dvdread/nav_types.h b/dvdread/nav_types.h index 12e19f8..cfb81f3 100644 --- a/dvdread/nav_types.h +++ b/dvdread/nav_types.h @@ -5,7 +5,7 @@ /* * Copyright (C) 2000, 2001, 2002 H�kan Hjort * - * The data structures in this file should represent the layout of the + * The data structures in this file should represent the tqlayout of the * pci and dsi packets as they are stored in the stream. Information * found by reading the source to VOBDUMP is the base for the structure * and names of these data types. @@ -145,7 +145,7 @@ typedef struct { /** * Button Information * - * NOTE: I've had to change the structure from the disk layout to get + * NOTE: I've had to change the structure from the disk tqlayout to get * the packing to work with Sun's Forte C compiler. * The 4 and 7 bytes are 'rotated' was: ABC DEF GHIJ is: ABCG DEFH IJ */ diff --git a/k9Mplayer/k9mplayer.cpp b/k9Mplayer/k9mplayer.cpp index c5f501e..053d82d 100644 --- a/k9Mplayer/k9mplayer.cpp +++ b/k9Mplayer/k9mplayer.cpp @@ -1,29 +1,29 @@ #include "k9common.h" #include "k9config.h" -#include -#include +#include +#include #include #include "k9mplayer.h" -#include +#include #include #include #include "k9dvd.h" #include "k9dvdtitle.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -K9Mplayer::K9Mplayer(QObject *parent,const char *name,const QStringList args):MPlayer((QWidget*)parent) { +K9Mplayer::K9Mplayer(TQObject *tqparent,const char *name,const TQStringList args):MPlayer((TQWidget*)tqparent) { m_seeking=FALSE; m_initVol=TRUE; m_title=0; - m_process=new KProcess(this); + m_process=new KProcess(TQT_TQOBJECT(this)); m_ratio=4.0/3.0; slider->setRange(0, 100); @@ -31,17 +31,17 @@ K9Mplayer::K9Mplayer(QObject *parent,const char *name,const QStringList args):M bPlay->setPixmap(SmallIcon("player_play")); bStop->setPixmap(SmallIcon("player_stop")); bSwitchAudio->setPixmap(SmallIcon("cycle")); - connect(m_process,SIGNAL(receivedStdout( KProcess*, char*, int )),this,SLOT(receivedStdout( KProcess*, char*, int ))); - m_timer=new QTimer(this); - connect(m_process,SIGNAL(wroteStdin( KProcess* )),this,SLOT(wroteStdin( KProcess* ))); - connect(m_timer,SIGNAL(timeout()),this,SLOT(timeout())); - m_container=new QWidget(Label); + connect(m_process,TQT_SIGNAL(receivedStdout( KProcess*, char*, int )),this,TQT_SLOT(receivedStdout( KProcess*, char*, int ))); + m_timer=new TQTimer(this); + connect(m_process,TQT_SIGNAL(wroteStdin( KProcess* )),this,TQT_SLOT(wroteStdin( KProcess* ))); + connect(m_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(timeout())); + m_container=new TQWidget(Label); } K9Mplayer::~K9Mplayer() {} -void K9Mplayer::resizeEvent ( QResizeEvent * _resizeEvent) { +void K9Mplayer::resizeEvent ( TQResizeEvent * _resizeEvent) { int w,h; w=Label->width(); h=Label->width() /m_ratio; @@ -64,37 +64,37 @@ void K9Mplayer::timeout() { } -void K9Mplayer::setDevice(const QString & _device) { +void K9Mplayer::setDevice(const TQString & _device) { m_device=_device; } -void K9Mplayer::setTitle( const QString & _numTitle,const QString &_numChapter) { +void K9Mplayer::setTitle( const TQString & _numTitle,const TQString &_numChapter) { if (m_process->isRunning()) { sendCmd("quit"); m_process->wait( 1000); } k9Config config; - QString vout[]= {"x11","xv","gl2","sdl"}; - QString aout[]= {"alsa","oss","sdl"}; - QString vo=vout[config.getMplayerVout()]; - QString ao=aout[config.getMplayerAout()]; + TQString vout[]= {"x11","xv","gl2","sdl"}; + TQString aout[]= {"alsa","oss","sdl"}; + TQString vo=vout[config.getMplayerVout()]; + TQString ao=aout[config.getMplayerAout()]; m_process->clearArguments(); *m_process << "mplayer"; *m_process << "-vo" << vo << "-ao" << ao << "-sws" << "0"; *m_process << "-framedrop"; - *m_process << "-wid" << QString::number(m_container->winId()) ; + *m_process << "-wid" << TQString::number(m_container->winId()) ; *m_process << "-slave" ; *m_process << "-idle"; *m_process << "-dvd-device" << m_device; if (_numChapter !="") *m_process << "-chapter" << _numChapter; - *m_process << QString("dvd://%1").arg(_numTitle); + *m_process << TQString("dvd://%1").tqarg(_numTitle); if (!m_process->start( KProcess::NotifyOnExit,KProcess::All)) { - KMessageBox::error (qApp->mainWidget(),i18n("Unable to run %1").arg("mplayer") , i18n("Preview")); + KMessageBox::error (tqApp->mainWidget(),i18n("Unable to run %1").tqarg("mplayer") , i18n("Preview")); } m_canwrite=TRUE; @@ -108,13 +108,13 @@ void K9Mplayer::setTitle( const QString & _numTitle,const QString &_numChapter) /*$SPECIALIZATION$*/ void K9Mplayer::receivedStdout (KProcess *proc, char *buffer, int buflen) { - QString buf = QString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); sscanf(buf.latin1(),"ANS_PERCENT_POSITION=%d",&m_position); if (!m_seeking && m_position>0) { slider->setValue(m_position); } int audio=0; - if (buf.contains("ANS_switch_audio")) + if (buf.tqcontains("ANS_switch_audio")) sscanf(buf.latin1(),"ANS_switch_audio=%d",&audio); if (audio >0) { for (int i=0;i < m_dvdTitle->getaudioStreamCount();i++) { @@ -128,13 +128,13 @@ void K9Mplayer::receivedStdout (KProcess *proc, char *buffer, int buflen) { void K9Mplayer::slotLengthChanged() {} -void K9Mplayer::slotNewPosition(int _pos,const QTime & _time) { +void K9Mplayer::slotNewPosition(int _pos,const TQTime & _time) { slider->setValue(_pos); } void K9Mplayer::sliderReleased() { - sendCmd( QString("seek %1 1").arg((int)slider->value())); + sendCmd( TQString("seek %1 1").tqarg((int)slider->value())); m_seeking=FALSE; } @@ -146,7 +146,7 @@ void K9Mplayer::sliderPressed() { } void K9Mplayer::bPlayClick() { - setTitle(QString::number( m_title),""); + setTitle(TQString::number( m_title),""); } void K9Mplayer::bStopClick() { @@ -155,17 +155,17 @@ void K9Mplayer::bStopClick() { void K9Mplayer::bDownClick() { - sendCmd( QString("volume -1")); + sendCmd( TQString("volume -1")); } void K9Mplayer::bSwitchAudioClick() { - sendCmd( QString("switch_audio")); - sendCmd( QString("get_property switch_audio")); + sendCmd( TQString("switch_audio")); + sendCmd( TQString("get_property switch_audio")); } void K9Mplayer::bUpClick() { - sendCmd( QString("volume +1")); + sendCmd( TQString("volume +1")); } @@ -175,12 +175,12 @@ void K9Mplayer::open( k9DVD *_dvd,k9DVDTitle *_title,int chapter) { cbAudio->clear(); for (int i=0; i< _title->getaudioStreamCount();i++) { k9DVDAudioStream *aud=_title->getaudioStream(i); - cbAudio->insertItem(NULL,QString("%1-%2").arg(aud->getID()).arg(aud->getlanguage()),-1); + cbAudio->insertItem(NULL,TQString("%1-%2").tqarg(aud->getID()).tqarg(aud->getlanguage()),-1); } for (int i=0; i< _title->getsubPictureCount();i++) { k9DVDSubtitle *sub=_title->getsubtitle(i); - cbSub->insertItem(NULL,QString("%1-%2").arg(sub->getID().first()).arg(sub->getlanguage()),-1); + cbSub->insertItem(NULL,TQString("%1-%2").tqarg(sub->getID().first()).tqarg(sub->getlanguage()),-1); } if(_title->getaspectRatio()=="16:9") @@ -192,7 +192,7 @@ void K9Mplayer::open( k9DVD *_dvd,k9DVDTitle *_title,int chapter) { setDevice( _dvd->getDevice()); m_dvdTitle=_title; m_title=_title->getnumTitle(); - setTitle( QString::number(m_title),QString::number(chapter)); + setTitle( TQString::number(m_title),TQString::number(chapter)); if (_title->getaudioStreamCount() >0) cbAudioActivated( 0); if (_title->getsubPictureCount() >0) @@ -207,19 +207,19 @@ void K9Mplayer::titleChanged() {} void K9Mplayer::cbAudioActivated( int _value) { if (m_dvdTitle) { int value=m_dvdTitle->getaudioStream( _value)->getStreamId(); - sendCmd(QString( "switch_audio %1").arg(value)); + sendCmd(TQString( "switch_audio %1").tqarg(value)); } } void K9Mplayer::cbSubActivated( int _value) { - sendCmd(QString("sub_select %1").arg(_value)); + sendCmd(TQString("sub_select %1").tqarg(_value)); } -void K9Mplayer::sendCmd( QString _cmd) { +void K9Mplayer::sendCmd( TQString _cmd) { while (!m_canwrite) { - qApp->processEvents(); + tqApp->processEvents(); if ( !m_process->isRunning()) return; } diff --git a/k9Mplayer/k9mplayer.h b/k9Mplayer/k9mplayer.h index c4723e8..241af0d 100644 --- a/k9Mplayer/k9mplayer.h +++ b/k9Mplayer/k9mplayer.h @@ -9,34 +9,35 @@ class k9DVD; class k9DVDTitle; class KProcess; -class QTimer; -class QResizeEvent; +class TQTimer; +class TQResizeEvent; class K9Mplayer : public MPlayer { Q_OBJECT + TQ_OBJECT private: KProcess *m_process; bool m_seeking,m_initVol; int m_title; k9DVDTitle *m_dvdTitle; - QString m_device; - QTimer *m_timer; - void sendCmd(QString _cmd); + TQString m_device; + TQTimer *m_timer; + void sendCmd(TQString _cmd); int m_position; bool m_canwrite; - QWidget *m_container; + TQWidget *m_container; float m_ratio; public: - //K9Mplayer(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - K9Mplayer(QObject *parent=0,const char *name=0,const QStringList args=0); + //K9Mplayer(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + K9Mplayer(TQObject *tqparent=0,const char *name=0,const TQStringList args=0); ~K9Mplayer(); /*$PUBLIC_FUNCTIONS$*/ - void setDevice(const QString & _device); - void setTitle(const QString & _numTitle,const QString &_numChapter); + void setDevice(const TQString & _device); + void setTitle(const TQString & _numTitle,const TQString &_numChapter); private slots: void slotLengthChanged(); - void slotNewPosition(int _pos,const QTime & _time); + void slotNewPosition(int _pos,const TQTime & _time); void receivedStdout (KProcess *proc, char *buffer, int buflen); void wroteStdin(KProcess *_process); void timeout(); @@ -56,7 +57,7 @@ public slots: virtual void bSwitchAudioClick(); protected: /*$PROTECTED_FUNCTIONS$*/ - void resizeEvent ( QResizeEvent * _resiseEvent); + void resizeEvent ( TQResizeEvent * _resiseEvent); protected slots: /*$PROTECTED_SLOTS$*/ diff --git a/k9Mplayer/mplayer.cpp b/k9Mplayer/mplayer.cpp index fcde29b..109c3f7 100644 --- a/k9Mplayer/mplayer.cpp +++ b/k9Mplayer/mplayer.cpp @@ -9,18 +9,18 @@ #include "mplayer.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "kicondialog.h" #include "kpushbutton.h" @@ -444,13 +444,13 @@ static const unsigned char img3_mplayer[] = { /* - * Constructs a MPlayer as a child of 'parent', with the + * Constructs a MPlayer as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -MPlayer::MPlayer( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +MPlayer::MPlayer( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { - QImage img; + TQImage img; img.loadFromData( img0_mplayer, sizeof( img0_mplayer ), "PNG" ); image0 = img; img.loadFromData( img1_mplayer, sizeof( img1_mplayer ), "PNG" ); @@ -463,118 +463,118 @@ MPlayer::MPlayer( QWidget* parent, const char* name, WFlags fl ) setName( "MPlayer" ); setEnabled( TRUE ); setIcon( image0 ); - MPlayerLayout = new QGridLayout( this, 1, 1, 3, 3, "MPlayerLayout"); + MPlayerLayout = new TQGridLayout( this, 1, 1, 3, 3, "MPlayerLayout"); - textLabel1 = new QLabel( this, "textLabel1" ); + textLabel1 = new TQLabel( this, "textLabel1" ); MPlayerLayout->addWidget( textLabel1, 0, 0 ); - cbAudio = new QComboBox( FALSE, this, "cbAudio" ); + cbAudio = new TQComboBox( FALSE, this, "cbAudio" ); MPlayerLayout->addWidget( cbAudio, 0, 1 ); - spacer1 = new QSpacerItem( 190, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1 = new TQSpacerItem( 190, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); MPlayerLayout->addItem( spacer1, 0, 5 ); - cbSub = new QComboBox( FALSE, this, "cbSub" ); + cbSub = new TQComboBox( FALSE, this, "cbSub" ); MPlayerLayout->addWidget( cbSub, 0, 4 ); - textLabel1_2 = new QLabel( this, "textLabel1_2" ); + textLabel1_2 = new TQLabel( this, "textLabel1_2" ); MPlayerLayout->addWidget( textLabel1_2, 0, 3 ); bSwitchAudio = new KPushButton( this, "bSwitchAudio" ); - bSwitchAudio->setMaximumSize( QSize( 22, 22 ) ); + bSwitchAudio->setMaximumSize( TQSize( 22, 22 ) ); bSwitchAudio->setFlat( TRUE ); MPlayerLayout->addWidget( bSwitchAudio, 0, 2 ); - layout6 = new QHBoxLayout( 0, 0, 6, "layout6"); + tqlayout6 = new TQHBoxLayout( 0, 0, 6, "tqlayout6"); bStop = new KPushButton( this, "bStop" ); - bStop->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) ); - bStop->setMinimumSize( QSize( 30, 30 ) ); + bStop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) ); + bStop->setMinimumSize( TQSize( 30, 30 ) ); bStop->setPixmap( image1 ); bStop->setFlat( TRUE ); - layout6->addWidget( bStop ); + tqlayout6->addWidget( bStop ); bPlay = new KPushButton( this, "bPlay" ); - bPlay->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) ); - bPlay->setMinimumSize( QSize( 30, 30 ) ); + bPlay->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) ); + bPlay->setMinimumSize( TQSize( 30, 30 ) ); bPlay->setPixmap( image2 ); bPlay->setFlat( TRUE ); - layout6->addWidget( bPlay ); + tqlayout6->addWidget( bPlay ); - slider = new QSlider( this, "slider" ); - slider->setOrientation( QSlider::Horizontal ); - layout6->addWidget( slider ); + slider = new TQSlider( this, "slider" ); + slider->setOrientation( Qt::Horizontal ); + tqlayout6->addWidget( slider ); - layout5 = new QHBoxLayout( 0, 0, 6, "layout5"); + tqlayout5 = new TQHBoxLayout( 0, 0, 6, "tqlayout5"); bDown = new KPushButton( this, "bDown" ); - bDown->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, bDown->sizePolicy().hasHeightForWidth() ) ); - bDown->setMinimumSize( QSize( 22, 22 ) ); - bDown->setMaximumSize( QSize( 22, 22 ) ); - QFont bDown_font( bDown->font() ); + bDown->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bDown->sizePolicy().hasHeightForWidth() ) ); + bDown->setMinimumSize( TQSize( 22, 22 ) ); + bDown->setMaximumSize( TQSize( 22, 22 ) ); + TQFont bDown_font( bDown->font() ); bDown_font.setBold( TRUE ); bDown->setFont( bDown_font ); bDown->setFlat( TRUE ); - layout5->addWidget( bDown ); + tqlayout5->addWidget( bDown ); - pixmapLabel1 = new QLabel( this, "pixmapLabel1" ); - pixmapLabel1->setMaximumSize( QSize( 22, 22 ) ); + pixmapLabel1 = new TQLabel( this, "pixmapLabel1" ); + pixmapLabel1->setMaximumSize( TQSize( 22, 22 ) ); pixmapLabel1->setPixmap( image3 ); pixmapLabel1->setScaledContents( TRUE ); - layout5->addWidget( pixmapLabel1 ); + tqlayout5->addWidget( pixmapLabel1 ); bUp = new KPushButton( this, "bUp" ); - bUp->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, bUp->sizePolicy().hasHeightForWidth() ) ); - bUp->setMinimumSize( QSize( 22, 22 ) ); - bUp->setMaximumSize( QSize( 22, 22 ) ); - QFont bUp_font( bUp->font() ); + bUp->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bUp->sizePolicy().hasHeightForWidth() ) ); + bUp->setMinimumSize( TQSize( 22, 22 ) ); + bUp->setMaximumSize( TQSize( 22, 22 ) ); + TQFont bUp_font( bUp->font() ); bUp_font.setBold( TRUE ); bUp->setFont( bUp_font ); bUp->setFlat( TRUE ); - layout5->addWidget( bUp ); - layout6->addLayout( layout5 ); + tqlayout5->addWidget( bUp ); + tqlayout6->addLayout( tqlayout5 ); - MPlayerLayout->addMultiCellLayout( layout6, 4, 4, 0, 5 ); + MPlayerLayout->addMultiCellLayout( tqlayout6, 4, 4, 0, 5 ); - frame4 = new QFrame( this, "frame4" ); - frame4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) ); - frame4->setFrameShape( QFrame::HLine ); - frame4->setFrameShadow( QFrame::Raised ); + frame4 = new TQFrame( this, "frame4" ); + frame4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) ); + frame4->setFrameShape( TQFrame::HLine ); + frame4->setFrameShadow( TQFrame::Raised ); MPlayerLayout->addMultiCellWidget( frame4, 1, 1, 0, 5 ); - Label = new QLabel( this, "Label" ); - Label->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, Label->sizePolicy().hasHeightForWidth() ) ); - Label->setPaletteBackgroundColor( QColor( 0, 0, 0 ) ); - Label->setAlignment( int( QLabel::AlignCenter ) ); + Label = new TQLabel( this, "Label" ); + Label->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, Label->sizePolicy().hasHeightForWidth() ) ); + Label->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) ); + Label->tqsetAlignment( int( TQLabel::AlignCenter ) ); MPlayerLayout->addMultiCellWidget( Label, 2, 2, 0, 5 ); - frame3 = new QFrame( this, "frame3" ); - frame3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) ); - frame3->setFrameShape( QFrame::HLine ); - frame3->setFrameShadow( QFrame::Raised ); + frame3 = new TQFrame( this, "frame3" ); + frame3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, frame3->sizePolicy().hasHeightForWidth() ) ); + frame3->setFrameShape( TQFrame::HLine ); + frame3->setFrameShadow( TQFrame::Raised ); MPlayerLayout->addMultiCellWidget( frame3, 3, 3, 0, 5 ); languageChange(); - resize( QSize(559, 458).expandedTo(minimumSizeHint()) ); + resize( TQSize(559, 458).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bStop, SIGNAL( clicked() ), this, SLOT( bStopClick() ) ); - connect( bPlay, SIGNAL( clicked() ), this, SLOT( bPlayClick() ) ); - connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); - connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); - connect( slider, SIGNAL( valueChanged(int) ), this, SLOT( sliderChanged(int) ) ); - connect( cbAudio, SIGNAL( activated(int) ), this, SLOT( cbAudioActivated(int) ) ); - connect( cbSub, SIGNAL( activated(int) ), this, SLOT( cbSubActivated(int) ) ); - connect( bDown, SIGNAL( clicked() ), this, SLOT( bDownClick() ) ); - connect( bUp, SIGNAL( clicked() ), this, SLOT( bUpClick() ) ); - connect( bSwitchAudio, SIGNAL( clicked() ), this, SLOT( bSwitchAudioClick() ) ); + connect( bStop, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bStopClick() ) ); + connect( bPlay, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bPlayClick() ) ); + connect( slider, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( sliderReleased() ) ); + connect( slider, TQT_SIGNAL( sliderPressed() ), this, TQT_SLOT( sliderPressed() ) ); + connect( slider, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( sliderChanged(int) ) ); + connect( cbAudio, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbAudioActivated(int) ) ); + connect( cbSub, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbSubActivated(int) ) ); + connect( bDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bDownClick() ) ); + connect( bUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bUpClick() ) ); + connect( bSwitchAudio, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bSwitchAudioClick() ) ); } /* @@ -582,7 +582,7 @@ MPlayer::MPlayer( QWidget* parent, const char* name, WFlags fl ) */ MPlayer::~MPlayer() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -594,15 +594,15 @@ void MPlayer::languageChange() setCaption( tr2i18n( "Preview" ) ); textLabel1->setText( tr2i18n( "Audio" ) ); textLabel1_2->setText( tr2i18n( "Subpicture" ) ); - bSwitchAudio->setText( QString::null ); - bStop->setText( QString::null ); - bPlay->setText( QString::null ); - bPlay->setAccel( QKeySequence( QString::null ) ); + bSwitchAudio->setText( TQString() ); + bStop->setText( TQString() ); + bPlay->setText( TQString() ); + bPlay->setAccel( TQKeySequence( TQString() ) ); bDown->setText( tr2i18n( "-" ) ); - bDown->setAccel( QKeySequence( QString::null ) ); + bDown->setAccel( TQKeySequence( TQString() ) ); bUp->setText( tr2i18n( "+" ) ); - bUp->setAccel( QKeySequence( QString::null ) ); - Label->setText( QString::null ); + bUp->setAccel( TQKeySequence( TQString() ) ); + Label->setText( TQString() ); } void MPlayer::bStopClick() diff --git a/k9Mplayer/mplayer.ui b/k9Mplayer/mplayer.ui index 5c79975..19457a2 100644 --- a/k9Mplayer/mplayer.ui +++ b/k9Mplayer/mplayer.ui @@ -1,13 +1,13 @@ MPlayer - + MPlayer true - + 0 0 @@ -31,7 +31,7 @@ 3 - + textLabel1 @@ -39,7 +39,7 @@ Audio - + cbAudio @@ -54,19 +54,19 @@ Expanding - + 190 20 - + cbSub - + textLabel1_2 @@ -78,7 +78,7 @@ bSwitchAudio - + 22 22 @@ -91,9 +91,9 @@ true - + - layout6 + tqlayout6 @@ -111,7 +111,7 @@ 0 - + 30 30 @@ -139,7 +139,7 @@ 0 - + 30 30 @@ -158,7 +158,7 @@ true - + slider @@ -166,9 +166,9 @@ Horizontal - + - layout5 + tqlayout5 @@ -186,13 +186,13 @@ 0 - + 22 22 - + 22 22 @@ -213,11 +213,11 @@ true - + pixmapLabel1 - + 22 22 @@ -242,13 +242,13 @@ 0 - + 22 22 - + 22 22 @@ -273,7 +273,7 @@ - + frame4 @@ -292,7 +292,7 @@ Raised - + Label @@ -314,11 +314,11 @@ - + AlignCenter - + frame3 @@ -415,7 +415,7 @@ bSwitchAudioClick() - + bStopClick() cbAudioActivated(int) slider_sliderReleased() @@ -427,8 +427,8 @@ bUpClick() bDownClick() bSwitchAudioClick() - - + + kicondialog.h kpushbutton.h diff --git a/k9author/chapterEdit.cpp b/k9author/chapterEdit.cpp index d344b5e..a219b64 100644 --- a/k9author/chapterEdit.cpp +++ b/k9author/chapterEdit.cpp @@ -9,126 +9,126 @@ #include "chapterEdit.h" -#include -#include +#include +#include #include -#include +#include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "ktimewidget.h" #include "kurlrequester.h" #include "klineedit.h" #include "kpushbutton.h" /* - * Constructs a chapterEdit as a child of 'parent', with the + * Constructs a chapterEdit as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -chapterEdit::chapterEdit( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +chapterEdit::chapterEdit( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "chapterEdit" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); - chapterEditLayout = new QGridLayout( this, 1, 1, 11, 6, "chapterEditLayout"); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, sizePolicy().hasHeightForWidth() ) ); + chapterEditLayout = new TQGridLayout( this, 1, 1, 11, 6, "chapterEditLayout"); twstart = new KTimeWidget( this, "twstart" ); - twstart->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, twstart->sizePolicy().hasHeightForWidth() ) ); + twstart->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twstart->sizePolicy().hasHeightForWidth() ) ); chapterEditLayout->addWidget( twstart, 1, 2 ); - textLabel1 = new QLabel( this, "textLabel1" ); + textLabel1 = new TQLabel( this, "textLabel1" ); chapterEditLayout->addWidget( textLabel1, 1, 1 ); - textLabel3 = new QLabel( this, "textLabel3" ); + textLabel3 = new TQLabel( this, "textLabel3" ); chapterEditLayout->addWidget( textLabel3, 0, 1 ); urFile = new KURLRequester( this, "urFile" ); - urFile->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)5, 0, 0, urFile->sizePolicy().hasHeightForWidth() ) ); - urFile->setMinimumSize( QSize( 200, 0 ) ); + urFile->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)5, 0, 0, urFile->sizePolicy().hasHeightForWidth() ) ); + urFile->setMinimumSize( TQSize( 200, 0 ) ); chapterEditLayout->addMultiCellWidget( urFile, 0, 0, 2, 4 ); bStart = new KPushButton( this, "bStart" ); - bStart->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bStart->sizePolicy().hasHeightForWidth() ) ); + bStart->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bStart->sizePolicy().hasHeightForWidth() ) ); chapterEditLayout->addWidget( bStart, 1, 3 ); - spacer2 = new QSpacerItem( 16, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer2 = new TQSpacerItem( 16, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); chapterEditLayout->addMultiCell( spacer2, 1, 2, 4, 4 ); - ckBreakStart = new QCheckBox( this, "ckBreakStart" ); + ckBreakStart = new TQCheckBox( this, "ckBreakStart" ); chapterEditLayout->addMultiCellWidget( ckBreakStart, 2, 2, 2, 3 ); - spacer1 = new QSpacerItem( 21, 60, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer1 = new TQSpacerItem( 21, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); chapterEditLayout->addItem( spacer1, 6, 2 ); - textLabel2 = new QLabel( this, "textLabel2" ); + textLabel2 = new TQLabel( this, "textLabel2" ); chapterEditLayout->addWidget( textLabel2, 4, 1 ); - ckBreakEnd = new QCheckBox( this, "ckBreakEnd" ); + ckBreakEnd = new TQCheckBox( this, "ckBreakEnd" ); chapterEditLayout->addMultiCellWidget( ckBreakEnd, 5, 5, 2, 3 ); twend = new KTimeWidget( this, "twend" ); - twend->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, twend->sizePolicy().hasHeightForWidth() ) ); + twend->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, twend->sizePolicy().hasHeightForWidth() ) ); chapterEditLayout->addWidget( twend, 4, 2 ); - spacer3 = new QSpacerItem( 20, 31, QSizePolicy::Minimum, QSizePolicy::Fixed ); + spacer3 = new TQSpacerItem( 20, 31, TQSizePolicy::Minimum, TQSizePolicy::Fixed ); chapterEditLayout->addItem( spacer3, 3, 2 ); - layout3 = new QGridLayout( 0, 1, 1, 0, 6, "layout3"); + tqlayout3 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout3"); - lPosition = new QLabel( this, "lPosition" ); - lPosition->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, lPosition->sizePolicy().hasHeightForWidth() ) ); + lPosition = new TQLabel( this, "lPosition" ); + lPosition->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lPosition->sizePolicy().hasHeightForWidth() ) ); - layout3->addWidget( lPosition, 1, 1 ); + tqlayout3->addWidget( lPosition, 1, 1 ); - slider = new QSlider( this, "slider" ); - slider->setOrientation( QSlider::Horizontal ); + slider = new TQSlider( this, "slider" ); + slider->setOrientation( Qt::Horizontal ); - layout3->addWidget( slider, 1, 0 ); + tqlayout3->addWidget( slider, 1, 0 ); - image = new QLabel( this, "image" ); - image->setMinimumSize( QSize( 320, 200 ) ); - image->setPaletteBackgroundColor( QColor( 0, 0, 0 ) ); + image = new TQLabel( this, "image" ); + image->setMinimumSize( TQSize( 320, 200 ) ); + image->setPaletteBackgroundColor( TQColor( 0, 0, 0 ) ); image->setScaledContents( TRUE ); - layout3->addMultiCellWidget( image, 0, 0, 0, 1 ); + tqlayout3->addMultiCellWidget( image, 0, 0, 0, 1 ); - chapterEditLayout->addMultiCellLayout( layout3, 0, 6, 0, 0 ); + chapterEditLayout->addMultiCellLayout( tqlayout3, 0, 6, 0, 0 ); bEnd = new KPushButton( this, "bEnd" ); - bEnd->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bEnd->sizePolicy().hasHeightForWidth() ) ); + bEnd->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bEnd->sizePolicy().hasHeightForWidth() ) ); chapterEditLayout->addWidget( bEnd, 4, 3 ); - bTitleButton = new QPushButton( this, "bTitleButton" ); - bTitleButton->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bTitleButton->sizePolicy().hasHeightForWidth() ) ); + bTitleButton = new TQPushButton( this, "bTitleButton" ); + bTitleButton->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bTitleButton->sizePolicy().hasHeightForWidth() ) ); chapterEditLayout->addWidget( bTitleButton, 7, 0 ); languageChange(); - resize( QSize(627, 300).expandedTo(minimumSizeHint()) ); + resize( TQSize(627, 300).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( urFile, SIGNAL( urlSelected(const QString&) ), this, SLOT( urlSelected(const QString&) ) ); - connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); - connect( slider, SIGNAL( valueChanged(int) ), this, SLOT( sliderChanged() ) ); - connect( bStart, SIGNAL( clicked() ), this, SLOT( bStartClick() ) ); - connect( bEnd, SIGNAL( clicked() ), this, SLOT( bEndClick() ) ); - connect( twstart, SIGNAL( valueChanged(const QTime&) ), this, SLOT( startChanged(const QTime&) ) ); - connect( twend, SIGNAL( valueChanged(const QTime&) ), this, SLOT( endChanged(const QTime&) ) ); - connect( ckBreakEnd, SIGNAL( clicked() ), this, SLOT( ckBreakEndClick() ) ); - connect( ckBreakStart, SIGNAL( clicked() ), this, SLOT( ckBreakStartClick() ) ); - connect( bTitleButton, SIGNAL( clicked() ), this, SLOT( bTitleButtonClick() ) ); + connect( urFile, TQT_SIGNAL( urlSelected(const TQString&) ), this, TQT_SLOT( urlSelected(const TQString&) ) ); + connect( slider, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( sliderReleased() ) ); + connect( slider, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( sliderChanged() ) ); + connect( bStart, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bStartClick() ) ); + connect( bEnd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bEndClick() ) ); + connect( twstart, TQT_SIGNAL( valueChanged(const TQTime&) ), this, TQT_SLOT( startChanged(const TQTime&) ) ); + connect( twend, TQT_SIGNAL( valueChanged(const TQTime&) ), this, TQT_SLOT( endChanged(const TQTime&) ) ); + connect( ckBreakEnd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( ckBreakEndClick() ) ); + connect( ckBreakStart, TQT_SIGNAL( clicked() ), this, TQT_SLOT( ckBreakStartClick() ) ); + connect( bTitleButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bTitleButtonClick() ) ); } /* @@ -136,7 +136,7 @@ chapterEdit::chapterEdit( QWidget* parent, const char* name, WFlags fl ) */ chapterEdit::~chapterEdit() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -159,9 +159,9 @@ void chapterEdit::languageChange() bTitleButton->setText( tr2i18n( "set Title button" ) ); } -void chapterEdit::urlSelected(const QString&) +void chapterEdit::urlSelected(const TQString&) { - qWarning( "chapterEdit::urlSelected(const QString&): Not implemented yet" ); + qWarning( "chapterEdit::urlSelected(const TQString&): Not implemented yet" ); } void chapterEdit::sliderReleased() @@ -179,14 +179,14 @@ void chapterEdit::bStartClick() qWarning( "chapterEdit::bStartClick(): Not implemented yet" ); } -void chapterEdit::startChanged(const QTime&) +void chapterEdit::startChanged(const TQTime&) { - qWarning( "chapterEdit::startChanged(const QTime&): Not implemented yet" ); + qWarning( "chapterEdit::startChanged(const TQTime&): Not implemented yet" ); } -void chapterEdit::endChanged(const QTime&) +void chapterEdit::endChanged(const TQTime&) { - qWarning( "chapterEdit::endChanged(const QTime&): Not implemented yet" ); + qWarning( "chapterEdit::endChanged(const TQTime&): Not implemented yet" ); } void chapterEdit::bEndClick() diff --git a/k9author/chapterEdit.ui b/k9author/chapterEdit.ui index d61622b..8940ff3 100644 --- a/k9author/chapterEdit.ui +++ b/k9author/chapterEdit.ui @@ -1,10 +1,10 @@ chapterEdit - + chapterEdit - + 0 0 @@ -40,7 +40,7 @@ - + textLabel1 @@ -48,7 +48,7 @@ start - + textLabel3 @@ -68,7 +68,7 @@ 0 - + 200 0 @@ -105,14 +105,14 @@ Expanding - + 16 20 - + ckBreakStart @@ -130,14 +130,14 @@ Expanding - + 21 60 - + textLabel2 @@ -145,7 +145,7 @@ end - + ckBreakEnd @@ -176,22 +176,22 @@ Fixed - + 20 31 - + - layout3 + tqlayout3 unnamed - + lPosition @@ -207,7 +207,7 @@ --:--:-- - + slider @@ -215,11 +215,11 @@ Horizontal - + image - + 320 200 @@ -254,7 +254,7 @@ set Current Frame - + bTitleButton @@ -275,9 +275,9 @@ urFile - urlSelected(const QString&) + urlSelected(const TQString&) chapterEdit - urlSelected(const QString&) + urlSelected(const TQString&) slider @@ -305,15 +305,15 @@ twstart - valueChanged(const QTime&) + valueChanged(const TQTime&) chapterEdit - startChanged(const QTime&) + startChanged(const TQTime&) twend - valueChanged(const QTime&) + valueChanged(const TQTime&) chapterEdit - endChanged(const QTime&) + endChanged(const TQTime&) ckBreakEnd @@ -334,19 +334,19 @@ bTitleButtonClick() - - urlSelected( const QString &) + + urlSelected( const TQString &) sliderReleased() sliderChanged() bStartClick() - startChanged(const QTime &) - endChanged(const QTime &) + startChanged(const TQTime &) + endChanged(const TQTime &) bEndClick() ckBreakStartClick() ckBreakEndClick() bTitleButtonClick() - - + + ktimewidget.h kurlrequester.h diff --git a/k9author/import.cpp b/k9author/import.cpp index b81705a..48593bd 100644 --- a/k9author/import.cpp +++ b/k9author/import.cpp @@ -9,83 +9,83 @@ #include "import.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include "kcombobox.h" #include "kselect.h" /* - * Constructs a import as a child of 'parent', with the + * Constructs a import as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -import::import( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +import::import( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "import" ); - importLayout = new QGridLayout( this, 1, 1, 11, 6, "importLayout"); + importLayout = new TQGridLayout( this, 1, 1, 11, 6, "importLayout"); - textLabel1 = new QLabel( this, "textLabel1" ); - textLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + textLabel1 = new TQLabel( this, "textLabel1" ); + textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); importLayout->addWidget( textLabel1, 0, 0 ); - layout2 = new QGridLayout( 0, 1, 1, 0, 6, "layout2"); + tqlayout2 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout2"); - lvDVD = new QListView( this, "lvDVD" ); + lvDVD = new TQListView( this, "lvDVD" ); lvDVD->addColumn( tr2i18n( "Video files" ) ); lvDVD->header()->setClickEnabled( FALSE, lvDVD->header()->count() - 1 ); lvDVD->addColumn( tr2i18n( "..." ) ); lvDVD->header()->setClickEnabled( FALSE, lvDVD->header()->count() - 1 ); - lvDVD->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, lvDVD->sizePolicy().hasHeightForWidth() ) ); - lvDVD->setMinimumSize( QSize( 0, 200 ) ); + lvDVD->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, lvDVD->sizePolicy().hasHeightForWidth() ) ); + lvDVD->setMinimumSize( TQSize( 0, 200 ) ); lvDVD->setRootIsDecorated( FALSE ); - lvDVD->setResizeMode( QListView::AllColumns ); + lvDVD->setResizeMode( TQListView::AllColumns ); - layout2->addMultiCellWidget( lvDVD, 0, 1, 0, 0 ); + tqlayout2->addMultiCellWidget( lvDVD, 0, 1, 0, 0 ); - importLayout->addMultiCellLayout( layout2, 1, 1, 0, 3 ); + importLayout->addMultiCellLayout( tqlayout2, 1, 1, 0, 3 ); cbOutputDev = new KComboBox( FALSE, this, "cbOutputDev" ); importLayout->addWidget( cbOutputDev, 0, 1 ); - cbFormat = new QComboBox( FALSE, this, "cbFormat" ); - cbFormat->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, cbFormat->sizePolicy().hasHeightForWidth() ) ); + cbFormat = new TQComboBox( FALSE, this, "cbFormat" ); + cbFormat->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbFormat->sizePolicy().hasHeightForWidth() ) ); importLayout->addWidget( cbFormat, 0, 2 ); - lTotal = new QLabel( this, "lTotal" ); - lTotal->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, lTotal->sizePolicy().hasHeightForWidth() ) ); + lTotal = new TQLabel( this, "lTotal" ); + lTotal->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotal->sizePolicy().hasHeightForWidth() ) ); importLayout->addWidget( lTotal, 2, 3 ); gsTotal = new KGradientSelector( this, "gsTotal" ); gsTotal->setEnabled( FALSE ); - gsTotal->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, gsTotal->sizePolicy().hasHeightForWidth() ) ); - gsTotal->setMaximumSize( QSize( 32767, 13 ) ); + gsTotal->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gsTotal->sizePolicy().hasHeightForWidth() ) ); + gsTotal->setMaximumSize( TQSize( 32767, 13 ) ); gsTotal->setValue( 0 ); gsTotal->setMaxValue( 180 ); - gsTotal->setFirstColor( QColor( 255, 77, 6 ) ); - gsTotal->setSecondColor( QColor( 85, 255, 0 ) ); + gsTotal->setFirstColor( TQColor( 255, 77, 6 ) ); + gsTotal->setSecondColor( TQColor( 85, 255, 0 ) ); importLayout->addMultiCellWidget( gsTotal, 2, 2, 0, 2 ); languageChange(); - resize( QSize(524, 416).expandedTo(minimumSizeHint()) ); + resize( TQSize(524, 416).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( lvDVD, SIGNAL( selectionChanged(QListViewItem*) ), this, SLOT( lvDVDItemSelected(QListViewItem*) ) ); - connect( cbFormat, SIGNAL( activated(const QString&) ), this, SLOT( cbFormatActivated(const QString&) ) ); + connect( lvDVD, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), this, TQT_SLOT( lvDVDItemSelected(TQListViewItem*) ) ); + connect( cbFormat, TQT_SIGNAL( activated(const TQString&) ), this, TQT_SLOT( cbFormatActivated(const TQString&) ) ); } /* @@ -93,7 +93,7 @@ import::import( QWidget* parent, const char* name, WFlags fl ) */ import::~import() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -112,9 +112,9 @@ void import::languageChange() lTotal->setText( tr2i18n( "--:--:--" ) ); } -void import::lvDVDItemSelected(QListViewItem*) +void import::lvDVDItemSelected(TQListViewItem*) { - qWarning( "import::lvDVDItemSelected(QListViewItem*): Not implemented yet" ); + qWarning( "import::lvDVDItemSelected(TQListViewItem*): Not implemented yet" ); } void import::bAddClick() @@ -122,9 +122,9 @@ void import::bAddClick() qWarning( "import::bAddClick(): Not implemented yet" ); } -void import::cbFormatActivated(const QString&) +void import::cbFormatActivated(const TQString&) { - qWarning( "import::cbFormatActivated(const QString&): Not implemented yet" ); + qWarning( "import::cbFormatActivated(const TQString&): Not implemented yet" ); } #include "import.moc" diff --git a/k9author/import.ui b/k9author/import.ui index fc42a9e..f9123bd 100644 --- a/k9author/import.ui +++ b/k9author/import.ui @@ -1,10 +1,10 @@ import - + import - + 0 0 @@ -19,7 +19,7 @@ unnamed - + textLabel1 @@ -35,15 +35,15 @@ Output - + - layout2 + tqlayout2 unnamed - + Video files @@ -77,7 +77,7 @@ 0 - + 0 200 @@ -97,7 +97,7 @@ cbOutputDev - + PAL @@ -120,7 +120,7 @@ - + lTotal @@ -151,7 +151,7 @@ 0 - + 32767 13 @@ -183,23 +183,23 @@ lvDVD - selectionChanged(QListViewItem*) + selectionChanged(TQListViewItem*) import - lvDVDItemSelected(QListViewItem*) + lvDVDItemSelected(TQListViewItem*) cbFormat - activated(const QString&) + activated(const TQString&) import - cbFormatActivated(const QString&) + cbFormatActivated(const TQString&) - - lvDVDItemSelected(QListViewItem *) + + lvDVDItemSelected(TQListViewItem *) bAddClick() - cbFormatActivated(const QString &) - - + cbFormatActivated(const TQString &) + + kcombobox.h kselect.h diff --git a/k9author/k9avidecode.cpp b/k9author/k9avidecode.cpp index b89acc1..22019b4 100644 --- a/k9author/k9avidecode.cpp +++ b/k9author/k9avidecode.cpp @@ -19,7 +19,7 @@ #include #endif -#include +#include #include #include #include @@ -41,18 +41,18 @@ void av_free_packet(AVPacket *pkt) #endif #endif -k9AviDecode::k9AviDecode(QObject *parent, const char *name) - : QObject(parent, name) { +k9AviDecode::k9AviDecode(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { if (glibref==0) { CodecHandle=dlopen("libavcodec.so",RTLD_LAZY | RTLD_GLOBAL); FormatHandle=dlopen("libavformat.so",RTLD_LAZY | RTLD_GLOBAL); } if (!CodecHandle) { - m_error =i18n("Cannot open then library %1").arg("libavcodec"); + m_error =i18n("Cannot open then library %1").tqarg("libavcodec"); return; } if (!FormatHandle) { - m_error =i18n("Cannot open then library %1").arg("libavformat"); + m_error =i18n("Cannot open then library %1").tqarg("libavformat"); return; } m_error=""; @@ -98,14 +98,14 @@ k9AviDecode::~k9AviDecode() { #include "k9avidecode.moc" -bool k9AviDecode::open(const QString & _fileName) { +bool k9AviDecode::open(const TQString & _fileName) { m_error=""; if (m_opened) close(); // Open video file if (av_open_input_file(&m_FormatCtx, _fileName.utf8(), NULL, 0, NULL)!=0) { - m_error=i18n("Couldn't open the file %1").arg(_fileName); + m_error=i18n("Couldn't open the file %1").tqarg(_fileName); return false; // Couldn't open file} } // Retrieve stream information @@ -211,7 +211,7 @@ void k9AviDecode::readFrame(double _seconds) { (AVPicture*)m_Frame, m_CodecCtx->pix_fmt, m_CodecCtx->width, m_CodecCtx->height); - // convert frame to QImage + // convert frame to TQImage SaveFrame(m_FrameRGB, m_CodecCtx->width, m_CodecCtx->height); } @@ -225,7 +225,7 @@ void k9AviDecode::readFrame(double _seconds) { } void k9AviDecode::SaveFrame(AVFrame *pFrame, int width, int height) { - QImage pix; + TQImage pix; int len =(int) (3*width*height); char c[255]; // Write header @@ -268,11 +268,11 @@ bool k9AviDecode::opened() const { } -QString k9AviDecode::getFileName() const { +TQString k9AviDecode::getFileName() const { return m_fileName; } -QString k9AviDecode::getError() const { +TQString k9AviDecode::getError() const { return m_error; } diff --git a/k9author/k9avidecode.h b/k9author/k9avidecode.h index 53f6029..67614a3 100644 --- a/k9author/k9avidecode.h +++ b/k9author/k9avidecode.h @@ -13,7 +13,7 @@ #define K9AVIDECODE_H #include "k9common.h" -#include +#include #ifdef OLD_FFMPEG #include #endif @@ -22,7 +22,7 @@ #endif -#include +#include /** @author Jean-Michel PETIT @@ -54,23 +54,24 @@ typedef void (*avcodec_flush_buffers_t)(AVCodecContext *); -class k9AviDecode : public QObject +class k9AviDecode : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9AviDecode(QObject *parent = 0, const char *name = 0); + k9AviDecode(TQObject *tqparent = 0, const char *name = 0); ~k9AviDecode(); - bool open(const QString & _fileName); + bool open(const TQString & _fileName); void readFrame(double _seconds); void seek(double _seconds); void close(); double getDuration() const; bool opened() const; - QString getFileName() const; + TQString getFileName() const; - QString getError() const; + TQString getError() const; private: av_register_all_t av_register_all; @@ -102,11 +103,11 @@ private: int m_videoStream; bool m_opened; double m_duration; - QString m_fileName; - QString m_error; + TQString m_fileName; + TQString m_error; void SaveFrame(AVFrame *pFrame, int width, int height); signals: - void drawFrame(QImage*); + void drawFrame(TQImage*); }; #endif diff --git a/k9author/k9avifile.cpp b/k9author/k9avifile.cpp index 1ace5f6..0e9bf76 100644 --- a/k9author/k9avifile.cpp +++ b/k9author/k9avifile.cpp @@ -13,11 +13,11 @@ #include "k9avifile.h" #include "k9title.h" -k9AviFile::k9AviFile(k9Title *parent, const char *name) - : QObject(parent, name) +k9AviFile::k9AviFile(k9Title *tqparent, const char *name) + : TQObject(tqparent, name) { - m_num=parent->getFiles()->count(); - setTitle(parent); + m_num=tqparent->getFiles()->count(); + setTitle(tqparent); m_previous=NULL; m_next=NULL; m_breakNext=false; @@ -33,52 +33,52 @@ k9AviFile::~k9AviFile() #include "k9avifile.moc" -QString k9AviFile::getFileName() const +TQString k9AviFile::getFileName() const { return m_fileName; } -void k9AviFile::setFileName ( const QString& _value ) +void k9AviFile::setFileName ( const TQString& _value ) { m_fileName = _value; emit aviFileUpdated (this); } -QTime k9AviFile::getStart() const +TQTime k9AviFile::getStart() const { return m_start; } -void k9AviFile::setStart ( const QTime& _value ) +void k9AviFile::setStart ( const TQTime& _value ) { m_start = _value; emit aviFileUpdated (this); } -QTime k9AviFile::getEnd() const +TQTime k9AviFile::getEnd() const { return m_end; } -void k9AviFile::setEnd ( const QTime& _value ) +void k9AviFile::setEnd ( const TQTime& _value ) { m_end = _value; emit aviFileUpdated (this); } -QString k9AviFile::getLabel() const +TQString k9AviFile::getLabel() const { return m_label; } -void k9AviFile::setLabel ( const QString& _value ) +void k9AviFile::setLabel ( const TQString& _value ) { m_label = _value; emit aviFileUpdated (this); @@ -173,12 +173,12 @@ bool k9AviFile::getBreakNext() { -QImage k9AviFile::getImage() const { +TQImage k9AviFile::getImage() const { return m_image; } -void k9AviFile::setImage(const QImage& _value) { +void k9AviFile::setImage(const TQImage& _value) { m_image = _value; emit aviFileUpdated (this); emit imageChanged(_value); diff --git a/k9author/k9avifile.h b/k9author/k9avifile.h index 83a6f17..21f1e6a 100644 --- a/k9author/k9avifile.h +++ b/k9author/k9avifile.h @@ -12,33 +12,34 @@ #ifndef K9AVIFILE_H #define K9AVIFILE_H -#include -#include -#include +#include +#include +#include /** @author Jean-Michel PETIT */ class k9Title; -class k9AviFile : public QObject +class k9AviFile : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9AviFile(k9Title *parent = 0, const char *name = 0); + k9AviFile(k9Title *tqparent = 0, const char *name = 0); ~k9AviFile(); - void setFileName ( const QString& _value ); - QString getFileName() const; + void setFileName ( const TQString& _value ); + TQString getFileName() const; - void setStart ( const QTime& _value ); - QTime getStart() const; + void setStart ( const TQTime& _value ); + TQTime getStart() const; - void setEnd ( const QTime& _value ); - QTime getEnd() const; + void setEnd ( const TQTime& _value ); + TQTime getEnd() const; - void setLabel ( const QString& _value ); - QString getLabel() const; + void setLabel ( const TQString& _value ); + TQString getLabel() const; k9Title* getTitle() const; @@ -56,17 +57,17 @@ public: void setBreakNext(bool _state); bool getBreakNext(); - void setImage(const QImage& _value); - QImage getImage() const; + void setImage(const TQImage& _value); + TQImage getImage() const; private: - QString m_fileName; - QTime m_start; - QString m_label; - QTime m_end; + TQString m_fileName; + TQTime m_start; + TQString m_label; + TQTime m_end; k9Title *m_title; - QImage m_image; + TQImage m_image; int m_num; bool m_breakNext,m_breakPrevious; k9AviFile *m_previous; @@ -74,7 +75,7 @@ private: void setTitle ( k9Title* _value ); signals: void aviFileUpdated(k9AviFile *_aviFile); - void imageChanged(const QImage &); + void imageChanged(const TQImage &); }; #endif diff --git a/k9author/k9canvasselection.cpp b/k9author/k9canvasselection.cpp index 8b9d72f..8405917 100644 --- a/k9author/k9canvasselection.cpp +++ b/k9author/k9canvasselection.cpp @@ -12,7 +12,7 @@ #include "k9canvasselection.h" #include "k9menubutton.h" -k9CanvasSelectionRedim::k9CanvasSelectionRedim (ePosition _position,int _x,int _y,int _w,int _h,QCanvas *canvas,k9CanvasSelection *selection):QCanvasRectangle(_x,_y,_w,_h,canvas) { +k9CanvasSelectionRedim::k9CanvasSelectionRedim (ePosition _position,int _x,int _y,int _w,int _h,TQCanvas *canvas,k9CanvasSelection *selection):TQCanvasRectangle(_x,_y,_w,_h,canvas) { m_position=_position; m_selection=selection; } @@ -20,7 +20,7 @@ k9CanvasSelectionRedim::k9CanvasSelectionRedim (ePosition _position,int _x,int _ void k9CanvasSelectionRedim::moveBy(double _x,double _y) { m_offsetX=_x; m_offsetY=_y; - QCanvasRectangle::moveBy(_x,_y); + TQCanvasRectangle::moveBy(_x,_y); } void k9CanvasSelectionRedim::updateSelection() { @@ -98,7 +98,7 @@ void k9CanvasSelectionRedim::updateSelection() { k9CanvasSelection::k9CanvasSelection(k9MenuEditor *_editor) - : QObject(_editor) { + : TQObject(_editor) { m_rect=NULL; m_editor=_editor; } @@ -106,45 +106,45 @@ k9CanvasSelection::k9CanvasSelection(k9MenuEditor *_editor) k9CanvasSelection::~k9CanvasSelection() {} -void k9CanvasSelection::setPosition(QPoint _p) { +void k9CanvasSelection::setPosition(TQPoint _p) { if (m_rect==NULL) { - QCanvas *m_canvas=m_editor->canvas(); - m_rect=new QCanvasRectangle(m_editor->canvas()); - QBrush brush(Qt::green); + TQCanvas *m_canvas=m_editor->canvas(); + m_rect=new TQCanvasRectangle(m_editor->canvas()); + TQBrush brush(TQt::green); m_rm=new k9CanvasSelectionRedim(k9CanvasSelectionRedim::RedimMiddleRight,0,0,10,10,m_canvas,this); - m_rm->setPen(Qt::black); + m_rm->setPen(TQt::black); m_rm->setBrush(brush); m_lt=new k9CanvasSelectionRedim(k9CanvasSelectionRedim::RedimTopLeft,0,0,10,10,m_canvas,this); - m_lt->setPen(Qt::black); + m_lt->setPen(TQt::black); m_lt->setBrush(brush); m_mt=new k9CanvasSelectionRedim(k9CanvasSelectionRedim::RedimTopMiddle,0,0,10,10,m_canvas,this); - m_mt->setPen(Qt::black); + m_mt->setPen(TQt::black); m_mt->setBrush(brush); m_mt=new k9CanvasSelectionRedim(k9CanvasSelectionRedim::RedimTopMiddle,0,0,10,10,m_canvas,this); - m_mt->setPen(Qt::black); + m_mt->setPen(TQt::black); m_mt->setBrush(brush); m_rt=new k9CanvasSelectionRedim(k9CanvasSelectionRedim::RedimTopRight,0,0,10,10,m_canvas,this); - m_rt->setPen(Qt::black); + m_rt->setPen(TQt::black); m_rt->setBrush(brush); m_lm=new k9CanvasSelectionRedim(k9CanvasSelectionRedim::RedimMiddleLeft,0,0,10,10,m_canvas,this); - m_lm->setPen(Qt::black); + m_lm->setPen(TQt::black); m_lm->setBrush(brush); m_lb=new k9CanvasSelectionRedim(k9CanvasSelectionRedim::RedimBottomLeft,0,0,10,10,m_canvas,this); - m_lb->setPen(Qt::black); + m_lb->setPen(TQt::black); m_lb->setBrush(brush); m_mb=new k9CanvasSelectionRedim(k9CanvasSelectionRedim::RedimBottomMiddle,0,0,10,10,m_canvas,this); - m_mb->setPen(Qt::black); + m_mb->setPen(TQt::black); m_mb->setBrush(brush); m_rb=new k9CanvasSelectionRedim(k9CanvasSelectionRedim::RedimBottomRight,0,0,10,10,m_canvas,this); - m_rb->setPen(Qt::black); + m_rb->setPen(TQt::black); m_rb->setBrush(brush); } else { m_rect->setCanvas(m_editor->canvas()); @@ -158,7 +158,7 @@ void k9CanvasSelection::setPosition(QPoint _p) { m_rb->setCanvas(m_editor->canvas()); ; } - m_rect->setPen(QPen(Qt::red)); + m_rect->setPen(TQPen(TQt::red)); m_rect->setX(_p.x()); m_rect->setY(_p.y()); m_rect->setSize(0,0); @@ -179,13 +179,13 @@ void k9CanvasSelection::release() { void k9CanvasSelection::drawSelection() { int left=720,top=576,right=0,bottom=0; - QPtrList *selection=m_editor->getSelection(); + TQPtrList *selection=m_editor->getSelection(); for (k9MenuButton *b=selection->first();b;b=selection->next()) { - left=QMIN(left,b->getLeft()); - top=QMIN(top,b->getTop()); - right=QMAX(right,b->getWidth()+b->getLeft()); - bottom=QMAX(bottom,b->getTop()+b->getHeight()); + left=TQMIN(left,b->getLeft()); + top=TQMIN(top,b->getTop()); + right=TQMAX(right,b->getWidth()+b->getLeft()); + bottom=TQMAX(bottom,b->getTop()+b->getHeight()); } m_rect->setX(left-2); m_rect->setY(top-2); @@ -227,9 +227,9 @@ void k9CanvasSelection::update() { m_rect->setZ(count--); - QCanvasItemList l=m_editor->canvas()->allItems(); - for (QCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { - QCanvasItem *item=*it; + TQCanvasItemList l=m_editor->canvas()->allItems(); + for (TQCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { + TQCanvasItem *item=*it; if (item != m_rect && item !=m_lt && item !=m_rt && item != m_mt && item !=m_lm && item != m_rm && item != m_lb && item != m_mb && item !=m_rb) item->setZ(count--); } @@ -239,7 +239,7 @@ void k9CanvasSelection::update() { } void k9CanvasSelection::scale(int _x,int _y,int _w, int _h) { - QPtrList *buttons=m_editor->getSelection(); + TQPtrList *buttons=m_editor->getSelection(); for (k9MenuButton *b=buttons->first();b;b=buttons->next()) { b->moveBy(_x,_y,false); if (b->getWidth() + _w >10) @@ -251,7 +251,7 @@ void k9CanvasSelection::scale(int _x,int _y,int _w, int _h) { } bool k9CanvasSelection::canScale(int _w, int _h) { - QPtrList *buttons=m_editor->getSelection(); + TQPtrList *buttons=m_editor->getSelection(); for (k9MenuButton *b=buttons->first();b;b=buttons->next()) { if (b->getWidth() + _w <10) return false; @@ -298,7 +298,7 @@ void k9CanvasSelection::setSize(int _w,int _h) { m_rect->setSize(_w,_h); } -QRect k9CanvasSelection::getRect() { +TQRect k9CanvasSelection::getRect() { return m_rect->rect(); } diff --git a/k9author/k9canvasselection.h b/k9author/k9canvasselection.h index e5ff0fb..35d0179 100644 --- a/k9author/k9canvasselection.h +++ b/k9author/k9canvasselection.h @@ -13,16 +13,16 @@ #define K9CANVASSELECTION_H #include "k9menueditor.h" -#include +#include /** @author Jean-Michel PETIT */ class k9CanvasSelection; -class k9CanvasSelectionRedim : public QCanvasRectangle { +class k9CanvasSelectionRedim : public TQCanvasRectangle { public: enum ePosition { RedimTopLeft=2002,RedimTopMiddle=2003,RedimTopRight=2004,RedimMiddleLeft=2005,RedimBottomLeft=2006,RedimBottomMiddle=2007,RedimBottomRight=2008,RedimMiddleRight=2009} ; - k9CanvasSelectionRedim (ePosition _position,int _x,int _y,int _w,int _h,QCanvas *canvas,k9CanvasSelection *selection); + k9CanvasSelectionRedim (ePosition _position,int _x,int _y,int _w,int _h,TQCanvas *canvas,k9CanvasSelection *selection); void updateSelection(); virtual int rtti() const { return m_position; @@ -35,21 +35,22 @@ private: }; -class k9CanvasSelection : public QObject +class k9CanvasSelection : public TQObject { Q_OBJECT + TQ_OBJECT public: k9CanvasSelection(k9MenuEditor *_editor); ~k9CanvasSelection(); - void setPosition (QPoint _p); + void setPosition (TQPoint _p); void release(); void hide(); void hideRedim(); void showRedim(); void show(); void setSize(int _w,int _h); - QRect getRect(); + TQRect getRect(); void moveBy(int _x,int _y); int getWidth(); void setWidth(int _w); @@ -64,7 +65,7 @@ public: private: k9MenuEditor *m_editor; - QCanvasRectangle *m_rect; + TQCanvasRectangle *m_rect; k9CanvasSelectionRedim *m_lt,*m_mt,*m_rt,*m_lm,*m_rm,*m_lb,*m_mb,*m_rb; }; diff --git a/k9author/k9chapteredit.cpp b/k9author/k9chapteredit.cpp index e199477..ff22b8d 100644 --- a/k9author/k9chapteredit.cpp +++ b/k9author/k9chapteredit.cpp @@ -14,24 +14,24 @@ #include "k9chapteredit.h" #include "k9drawimage.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include "k9title.h" #include #include -k9ChapterEdit::k9ChapterEdit(QWidget* parent, const char* name, WFlags fl) -: chapterEdit(parent,name,fl) +k9ChapterEdit::k9ChapterEdit(TQWidget* tqparent, const char* name, WFlags fl) +: chapterEdit(tqparent,name,fl) { 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_wimage->setPaletteBackgroundColor(Qt::black); - connect(&m_aviDecode,SIGNAL(drawFrame(QImage*)),this,SLOT(drawImage(QImage*))); + m_wimage->setPaletteBackgroundColor(TQt::black); + connect(&m_aviDecode,TQT_SIGNAL(drawFrame(TQImage*)),this,TQT_SLOT(drawImage(TQImage*))); bTitleButton->setIconSet (SmallIcon("frame_image")); } @@ -50,14 +50,14 @@ void k9ChapterEdit::sliderChanged() { if (m_aviDecode.opened()) { //m_aviDecode.seek((double)slider->value() / 100); m_aviDecode.readFrame((double)slider->value() / 1000); - QTime t; + TQTime t; t=t.addMSecs((double)slider->value()); lPosition->setText(t.toString("hh:mm:ss")); } } -void k9ChapterEdit::urlSelected(const QString& _fileName) { +void k9ChapterEdit::urlSelected(const TQString& _fileName) { m_aviDecode.open(_fileName); if (!m_noUpdate) { if (_fileName !=m_aviFile->getFileName()) { @@ -69,7 +69,7 @@ void k9ChapterEdit::urlSelected(const QString& _fileName) { m_aviFile->setFileName(_fileName); } - QTime t; + TQTime t; int sec=t.msecsTo(m_aviFile->getStart()); slider->setMaxValue((int)(m_aviDecode.getDuration()*1000)); @@ -77,22 +77,22 @@ void k9ChapterEdit::urlSelected(const QString& _fileName) { } -void k9ChapterEdit::drawImage(QImage * _image) { - //QPixmap p(*_image); +void k9ChapterEdit::drawImage(TQImage * _image) { + //TQPixmap p(*_image); //image->setPixmap(p); m_wimage->setImage(*_image); m_image=*_image; } void k9ChapterEdit::bStartClick() { - QTime t; + TQTime t; int secs=slider->value()/1000; t=t.addSecs(secs); twstart->setTime(t); } void k9ChapterEdit::bEndClick() { - QTime t; + TQTime t; int secs=slider->value()/1000; t=t.addSecs(secs); twend->setTime(t); @@ -138,9 +138,9 @@ void k9ChapterEdit::setAviFile(k9AviFile *_aviFile) { } -void k9ChapterEdit::startChanged(const QTime& _time) { +void k9ChapterEdit::startChanged(const TQTime& _time) { if (!m_noUpdate) { - QTime t=_time; + TQTime t=_time; if (t > m_maxTime ) t=m_maxTime; else if (t < m_minTime) @@ -153,15 +153,15 @@ void k9ChapterEdit::startChanged(const QTime& _time) { if (!m_aviFile->getBreakPrevious() && m_aviFile->getPrevious()!=NULL) { m_aviFile->getPrevious()->setEnd(t); } - QTime t2; + TQTime t2; slider->setValue(t2.msecsTo(t)); m_aviFile->setImage(m_image); } } -void k9ChapterEdit::endChanged(const QTime& _time) { +void k9ChapterEdit::endChanged(const TQTime& _time) { if (!m_noUpdate) { - QTime t=_time; + TQTime t=_time; if (t > m_maxTime ) t=m_maxTime; else if (t < m_minTime) @@ -171,9 +171,9 @@ void k9ChapterEdit::endChanged(const QTime& _time) { if (t!=_time) twend->setTime(t); m_aviFile->setEnd(t); - QTime t2; + TQTime t2; if (!m_aviFile->getBreakNext() && m_aviFile->getNext()!=NULL) { - QImage i=m_image; + TQImage i=m_image; m_aviDecode.readFrame((double)t2.msecsTo(t)/1000.0); m_aviFile->getNext()->setImage(m_image); m_image=i; diff --git a/k9author/k9chapteredit.h b/k9author/k9chapteredit.h index 87be4f8..29a919b 100644 --- a/k9author/k9chapteredit.h +++ b/k9author/k9chapteredit.h @@ -22,9 +22,10 @@ class k9DrawImage; class k9ChapterEdit : public chapterEdit { Q_OBJECT + TQ_OBJECT public: - k9ChapterEdit(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9ChapterEdit(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9ChapterEdit(); /*$PUBLIC_FUNCTIONS$*/ @@ -34,9 +35,9 @@ private: k9AviDecode m_aviDecode; k9DrawImage *m_wimage; k9AviFile *m_aviFile; - QTime m_minTime,m_maxTime; + TQTime m_minTime,m_maxTime; bool m_noUpdate; - QImage m_image; + TQImage m_image; protected: /*$PROTECTED_FUNCTIONS$*/ virtual void sliderReleased(); @@ -45,13 +46,13 @@ protected: virtual void bEndClick(); virtual void ckBreakStartClick(); virtual void ckBreakEndClick(); - virtual void urlSelected(const QString&); - virtual void startChanged(const QTime&); - virtual void endChanged(const QTime&); + virtual void urlSelected(const TQString&); + virtual void startChanged(const TQTime&); + virtual void endChanged(const TQTime&); virtual void bTitleButtonClick(); protected slots: /*$PROTECTED_SLOTS$*/ - void drawImage(QImage *); + void drawImage(TQImage *); public slots: void setAviFile(k9AviFile *_aviFile); }; diff --git a/k9author/k9import.cpp b/k9author/k9import.cpp index 774bc8e..993f2d1 100644 --- a/k9author/k9import.cpp +++ b/k9author/k9import.cpp @@ -20,19 +20,19 @@ #include "k9haldevice.h" #include "k9config.h" #include "k9burndvd.h" -#include +#include #include #include #include #include #include "k9processlist.h" -k9Import::k9Import(QWidget* parent, const char* name,k9CdDrives *_drives) - : import(parent,name) { - m_parent=(k9Copy*) parent; +k9Import::k9Import(TQWidget* tqparent, const char* name,k9CdDrives *_drives) + : import(tqparent,name) { + m_parent=(k9Copy*) tqparent; drives=_drives; - connect(&m_newDVD,SIGNAL(sigAddTitle()),this,SLOT(titleAdded())); + connect(&m_newDVD,TQT_SIGNAL(sigAddTitle()),this,TQT_SLOT(titleAdded())); } k9Import::~k9Import() {} @@ -42,13 +42,13 @@ k9Import::~k9Import() {} /*$SPECIALIZATION$*/ void k9Import::init() { - m_root=new QListViewItem(lvDVD,i18n("Root Menu")); + m_root=new TQListViewItem(lvDVD,i18n("Root Menu")); m_root->setOpen(true); m_root->setPixmap(0,SmallIcon("dvd_unmount")); emit aviFileSelected(NULL); - connect(drives,SIGNAL(deviceAdded( k9CdDrive*)),this,SLOT(deviceAdded( k9CdDrive* ))); - connect(drives,SIGNAL(deviceRemoved( k9CdDrive*)),this,SLOT(deviceRemoved( k9CdDrive* ))); + connect(drives,TQT_SIGNAL(deviceAdded( k9CdDrive*)),this,TQT_SLOT(deviceAdded( k9CdDrive* ))); + connect(drives,TQT_SIGNAL(deviceRemoved( k9CdDrive*)),this,TQT_SLOT(deviceRemoved( k9CdDrive* ))); readDrives(); m_root->setSelected(true); @@ -73,7 +73,7 @@ void k9Import::deviceAdded(k9CdDrive *_drive) { void k9Import::deviceRemoved(k9CdDrive *_drive) { - int i=recorderList.find(_drive); + int i=recorderList.tqfind(_drive); recorderList.remove( i); cbOutputDev->removeItem(i+2); @@ -83,7 +83,7 @@ void k9Import::addDrive(k9CdDrive *drive) { #ifdef HAVE_HAL if (drive->getDevice()!=NULL) { k9HalDevice *dev=drive->getDevice(); - connect(dev,SIGNAL(volumeChanged( const QString &,const QString &)),this,SLOT(volumeChanged(const QString&,const QString&))); + connect(dev,TQT_SIGNAL(volumeChanged( const TQString &,const TQString &)),this,TQT_SLOT(volumeChanged(const TQString&,const TQString&))); } #endif if (drive->canWriteDVD) { @@ -93,14 +93,14 @@ void k9Import::addDrive(k9CdDrive *drive) { } -void k9Import::volumeChanged(const QString &device,const QString &volumeName) {} +void k9Import::volumeChanged(const TQString &device,const TQString &volumeName) {} #include "k9import.moc" -QListViewItem* k9Import::getRoot() const { +TQListViewItem* k9Import::getRoot() const { return m_root; } @@ -112,7 +112,7 @@ void k9Import::aviFileUpdated(k9AviFile *_aviFile) { while (itemChapter) { if (itemChapter->getAviFile()==_aviFile) { itemChapter->setText(1,_aviFile->getStart().toString("hh:mm:ss") +" - "+_aviFile->getEnd().toString("hh:mm:ss")); - itemChapter->setPixmap(0,QPixmap(_aviFile->getImage().smoothScale(50,40))); + itemChapter->setPixmap(0,TQPixmap(_aviFile->getImage().smoothScale(50,40))); } itemChapter=(k9LvItemImport*)itemChapter->nextSibling(); } @@ -121,12 +121,12 @@ void k9Import::aviFileUpdated(k9AviFile *_aviFile) { updateTotalTime(); } -void k9Import::buttonUpdated(k9MenuButton *_button, const QImage &_image) { +void k9Import::buttonUpdated(k9MenuButton *_button, const TQImage &_image) { k9LvItemImport *itemTitle = (k9LvItemImport*)m_root->firstChild(); while (itemTitle) { if (itemTitle->getTitle()->getButton()==_button) { - QImage img=_image.smoothScale(50,40,QImage::ScaleFree); - QPixmap pix(img); + TQImage img=_image.smoothScale(50,40,TQ_ScaleFree); + TQPixmap pix(img); itemTitle->setPixmap(0,pix); } itemTitle=(k9LvItemImport*)itemTitle->nextSibling(); @@ -135,7 +135,7 @@ void k9Import::buttonUpdated(k9MenuButton *_button, const QImage &_image) { -void k9Import::lvDVDItemSelected (QListViewItem *_item) { +void k9Import::lvDVDItemSelected (TQListViewItem *_item) { k9LvItemImport *item=(k9LvItemImport*)_item; switch (_item->rtti()) { @@ -152,7 +152,7 @@ void k9Import::lvDVDItemSelected (QListViewItem *_item) { } } -void k9Import::setProgressWindow(QWidget *_widget) { +void k9Import::setProgressWindow(TQWidget *_widget) { m_toolView=m_parent->setToolWindow(_widget,KDockWidget::DockRight,i18n("processing"),i18n("processing")); m_dockWidget = m_parent->getVisibleDock(); m_parent->setActions( false); @@ -171,15 +171,15 @@ void k9Import::removeProgressWindow() { } void k9Import::execute() { - QString filename; + TQString filename; k9Config config; - QString outputDir=config.getPrefOutput(); + TQString outputDir=config.getPrefOutput(); if (cbOutputDev->currentItem() ==0) { - 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 =="") return; } else if (cbOutputDev->currentItem()==1) { - outputDir= KFileDialog::getExistingDirectory(QDir::homeDirPath()); + outputDir= KFileDialog::getExistingDirectory(TQDir::homeDirPath()); if (outputDir=="") return; } @@ -218,7 +218,7 @@ void k9Import::execute() { } -void k9Import::cbFormatActivated(const QString &_format) { +void k9Import::cbFormatActivated(const TQString &_format) { if (_format == "PAL") { m_newDVD.setFormat(k9NewDVD::PAL); m_menuEdit->setFormat(k9MenuEdit::PAL); @@ -244,7 +244,7 @@ void k9Import::titleAdded() { void k9Import::updateTotalTime() { int total=m_newDVD.getTotalTime(); gsTotal->setValue(total/60); - QTime t(0,0,0); + TQTime t(0,0,0); t=t.addSecs(total); lTotal->setText(t.toString("hh:mm:ss")); } diff --git a/k9author/k9import.h b/k9author/k9import.h index e883bed..9a46704 100644 --- a/k9author/k9import.h +++ b/k9author/k9import.h @@ -14,7 +14,7 @@ #define K9IMPORT_H #include "k9common.h" -#include +#include #include "k9copy.h" #include "../k9author/import.h" #include "../k9author/k9newdvd.h" @@ -25,23 +25,24 @@ class k9MenuButton; class k9MenuEdit; class k9Import : public import { Q_OBJECT + TQ_OBJECT private: - QListViewItem *m_root; + TQListViewItem *m_root; k9NewDVD m_newDVD; KMdiToolViewAccessor *m_toolView; KDockWidget *m_dockWidget; k9Copy *m_parent; - QPtrList recorderList; + TQPtrList recorderList; k9CdDrives *drives; k9MenuEdit *m_menuEdit; public: - k9Import(QWidget* parent = 0, const char* name = 0,k9CdDrives *_drives=0 ); + k9Import(TQWidget* tqparent = 0, const char* name = 0,k9CdDrives *_drives=0 ); ~k9Import(); /*$PUBLIC_FUNCTIONS$*/ void init(); void execute(); - QListViewItem* getRoot() const; + TQListViewItem* getRoot() const; k9NewDVD *getNewDVD() { return &m_newDVD; } @@ -49,25 +50,25 @@ public: public slots: /*$PUBLIC_SLOTS$*/ void aviFileUpdated(k9AviFile *_aviFile); - void buttonUpdated(k9MenuButton *_button, const QImage &_image); + void buttonUpdated(k9MenuButton *_button, const TQImage &_image); void setMenuEdit(k9MenuEdit* _value); void setEnableCreate(bool _state); void updateTotalTime(); void titleAdded(); protected: /*$PROTECTED_FUNCTIONS$*/ - void setProgressWindow(QWidget *_widget); + void setProgressWindow(TQWidget *_widget); void removeProgressWindow(); void readDrives(); void addDrive (k9CdDrive *_drive); protected slots: /*$PROTECTED_SLOTS$*/ - void lvDVDItemSelected (QListViewItem *); - void cbFormatActivated(const QString &_format); + void lvDVDItemSelected (TQListViewItem *); + void cbFormatActivated(const TQString &_format); virtual void deviceAdded(k9CdDrive *_drive); virtual void deviceRemoved(k9CdDrive *_drive); - virtual void volumeChanged(const QString &device,const QString &volumeName); + virtual void volumeChanged(const TQString &device,const TQString &volumeName); signals: void aviFileSelected(k9AviFile *_aviFile); diff --git a/k9author/k9importfiles.cpp b/k9author/k9importfiles.cpp index 2cb6138..c3ed6c4 100644 --- a/k9author/k9importfiles.cpp +++ b/k9author/k9importfiles.cpp @@ -18,8 +18,8 @@ #include "k9avifile.h" #include "k9menuedit.h" -k9ImportFiles::k9ImportFiles(QWidget *parent, const char *name) - : KMdiMainFrm( parent, name ,KMdi::IDEAlMode ) +k9ImportFiles::k9ImportFiles(TQWidget *tqparent, const char *name) + : KMdiMainFrm( tqparent, name ,KMdi::IDEAlMode ) { this->setCaption(kapp->makeStdCaption(i18n("Create new DVD"),true)); m_k9Import=new k9Import(this); @@ -33,7 +33,7 @@ k9ImportFiles::k9ImportFiles(QWidget *parent, const char *name) k9ChapterEdit *ch=new k9ChapterEdit(this); addToolWindow(ch, KDockWidget::DockBottom, getMainDockWidget(),0,i18n("Chapter properties"),i18n("Chapter properties")); - connect(m_k9Import,SIGNAL(aviFileSelected(k9AviFile*)),ch,SLOT(setAviFile(k9AviFile*))); + connect(m_k9Import,TQT_SIGNAL(aviFileSelected(k9AviFile*)),ch,TQT_SLOT(setAviFile(k9AviFile*))); m_k9NewTitle=new k9NewTitle(this); m_k9NewTitle->setK9Import(m_k9Import); diff --git a/k9author/k9importfiles.h b/k9author/k9importfiles.h index 136c131..d7fd672 100644 --- a/k9author/k9importfiles.h +++ b/k9author/k9importfiles.h @@ -14,7 +14,7 @@ #include "k9common.h" -#include +#include #include #include #include @@ -28,8 +28,9 @@ class k9NewTitle; class k9ImportFiles : public KMdiMainFrm { Q_OBJECT + TQ_OBJECT public: - k9ImportFiles(QWidget *parent = 0, const char *name = 0); + k9ImportFiles(TQWidget *tqparent = 0, const char *name = 0); ~k9ImportFiles(); private: diff --git a/k9author/k9lvitemimport.cpp b/k9author/k9lvitemimport.cpp index e946c8a..38b1855 100644 --- a/k9author/k9lvitemimport.cpp +++ b/k9author/k9lvitemimport.cpp @@ -12,8 +12,8 @@ #include "k9lvitemimport.h" -k9LvItemImport::k9LvItemImport( QListViewItem *parent,eObjectType _objectType) - : QListViewItem( parent) { +k9LvItemImport::k9LvItemImport( TQListViewItem *tqparent,eObjectType _objectType) + : TQListViewItem( tqparent) { m_objectType=_objectType; m_title=NULL; m_aviFile=NULL; @@ -30,7 +30,7 @@ int k9LvItemImport::rtti () const { } } -int k9LvItemImport::compare(QListViewItem *i,int col,bool ascending) const { +int k9LvItemImport::compare(TQListViewItem *i,int col,bool ascending) const { int res; if (i->rtti()== 1001) { k9LvItemImport *item2=(k9LvItemImport*)i; @@ -40,13 +40,13 @@ int k9LvItemImport::compare(QListViewItem *i,int col,bool ascending) const { k9LvItemImport *item2=(k9LvItemImport*)i; return this->getAviFile()->getNum() - item2->getAviFile()->getNum() ; } - return QListViewItem::compare(i,col,ascending); + return TQListViewItem::compare(i,col,ascending); } void k9LvItemImport::setTitle(k9Title* _value) { m_title = _value; - QPixmap pix(m_title->getButton()->getImage()); + TQPixmap pix(m_title->getButton()->getImage()); setPixmap(0,pix); } diff --git a/k9author/k9lvitemimport.h b/k9author/k9lvitemimport.h index 22aa3a2..2b882f1 100644 --- a/k9author/k9lvitemimport.h +++ b/k9author/k9lvitemimport.h @@ -13,17 +13,17 @@ #define K9LVITEMIMPORT_H #include "k9common.h" -#include +#include #include "k9avifile.h" #include "k9title.h" /** @author Jean-Michel PETIT */ -class k9LvItemImport: public QListViewItem { +class k9LvItemImport: public TQListViewItem { public: enum eObjectType {ROOT,TITLE,CHAPTER}; - k9LvItemImport( QListViewItem *parent,eObjectType _objectType); + k9LvItemImport( TQListViewItem *tqparent,eObjectType _objectType); ~k9LvItemImport(); virtual int rtti () const; eObjectType getObjectType() { return m_objectType;}; @@ -33,7 +33,7 @@ public: void setTitle(k9Title* _value); k9Title* getTitle() const { return m_title;} - virtual int compare (QListViewItem *i,int col,bool ascending) const; + virtual int compare (TQListViewItem *i,int col,bool ascending) const; private: eObjectType m_objectType; k9AviFile *m_aviFile; diff --git a/k9author/k9menu.cpp b/k9author/k9menu.cpp index b219ba3..a911e97 100644 --- a/k9author/k9menu.cpp +++ b/k9author/k9menu.cpp @@ -12,20 +12,20 @@ #include "k9menu.h" #include "k9menubutton.h" #include "k9process.h" -#include -#include +#include +#include #include -#include -#include +#include +#include #include "k9tools.h" -k9Menu::k9Menu(QObject *parent, const char *name) - : QObject(parent, name),m_format(PAL) { +k9Menu::k9Menu(TQObject *tqparent, const char *name) + : TQObject(tqparent, name),m_format(PAL) { m_buttons.setAutoDelete(false); - m_canvas=new QCanvas(this); - QPixmap pix(720,576); - pix.fill(Qt::black); - m_canvas->setBackgroundPixmap(pix); + m_canvas=new TQCanvas(this); + TQPixmap pix(720,576); + pix.fill(TQt::black); + m_canvas->tqsetBackgroundPixmap(pix); m_startScript=m_startScript2=m_endScript=""; } @@ -46,48 +46,48 @@ k9MenuButton *k9Menu::addButton() { -void k9Menu::createMenus(QDomElement *_rootNode) { +void k9Menu::createMenus(TQDomElement *_rootNode) { m_config=new k9Config(); int height=m_format==PAL?576:480; - QImage img; + TQImage img; //create menu image - QCanvasItemList l=m_canvas->allItems(); - for (QCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { - if ( (*it)->rtti() > 1001 || (*it)->rtti()==QCanvasItem::Rtti_Rectangle ) + TQCanvasItemList l=m_canvas->allItems(); + for (TQCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { + if ( (*it)->rtti() > 1001 || (*it)->rtti()==TQCanvasItem::Rtti_Rectangle ) (*it)->hide(); } - QPixmap pixbg(720,height); - QPainter pbg(&pixbg); + TQPixmap pixbg(720,height); + TQPainter pbg(&pixbg); m_canvas->resize(720,height); m_canvas->update(); - m_canvas->drawArea(QRect(0,0,720,height),&pbg); + m_canvas->drawArea(TQRect(0,0,720,height),&pbg); //create the hilite picture int lineWidth=2; - img.create(720,height,8,3,QImage::IgnoreEndian); - QPixmap pixhi; + img.create(720,height,8,3,TQImage::IgnoreEndian); + TQPixmap pixhi; pixhi.convertFromImage(img,0); - pixhi.fill(Qt::white); - QPainter phi(&pixhi); - QPen penhi; + pixhi.fill(TQt::white); + TQPainter phi(&pixhi); + TQPen penhi; penhi.setColor(m_config->getPrefButtonHiliteColor()); penhi.setWidth(lineWidth*2); phi.setPen(penhi); - phi.setBrush(Qt::NoBrush); - //create the hilite mask - QBitmap mask(720,height); - mask.fill(Qt::color0); - QPainter pmk(&mask); - QPen penmk; - penmk.setColor(Qt::color1); + phi.setBrush(TQt::NoBrush); + //create the hilite tqmask + TQBitmap tqmask(720,height); + tqmask.fill(TQt::color0); + TQPainter pmk(&tqmask); + TQPen penmk; + penmk.setColor(TQt::color1); penmk.setWidth(lineWidth*2); pmk.setPen(penmk); - pmk.setBrush(Qt::NoBrush); + pmk.setBrush(TQt::NoBrush); //draw buttons for (k9MenuButton *button=m_buttons.first();button;button=m_buttons.next()) { @@ -99,14 +99,14 @@ void k9Menu::createMenus(QDomElement *_rootNode) { pbg.end(); phi.end(); pmk.end(); - pixhi.setMask(mask); + pixhi.setMask(tqmask); //save menu image - QString bgFileName=m_workDir+KApplication::randomString(8)+".jpg"; - QString hiFileName=m_workDir+KApplication::randomString(8)+".png"; - QString m2vFileName= m_workDir+KApplication::randomString(8)+".m2v"; - QString mpaFileName= m_workDir+KApplication::randomString(8)+".m2v"; - QString mpgFileName= m_workDir+KApplication::randomString(8)+".mpg"; + TQString bgFileName=m_workDir+KApplication::randomString(8)+".jpg"; + TQString hiFileName=m_workDir+KApplication::randomString(8)+".png"; + TQString m2vFileName= m_workDir+KApplication::randomString(8)+".m2v"; + TQString mpaFileName= m_workDir+KApplication::randomString(8)+".m2v"; + TQString mpgFileName= m_workDir+KApplication::randomString(8)+".mpg"; pixbg.save(bgFileName,"JPEG",-1); pixhi.save(hiFileName,"PNG",-1); @@ -117,17 +117,17 @@ void k9Menu::createMenus(QDomElement *_rootNode) { spumux(hiFileName,mpgFileName); appendMenu(_rootNode); -// mask.save(m_workDir+"/mask.bmp","BMP",-1); +// tqmask.save(m_workDir+"/tqmask.bmp","BMP",-1); - QFile::remove(bgFileName); - QFile::remove(m2vFileName); - QFile::remove(mpaFileName); - QFile::remove(mpgFileName); - QFile::remove(hiFileName); + TQFile::remove(bgFileName); + TQFile::remove(m2vFileName); + TQFile::remove(mpaFileName); + TQFile::remove(mpgFileName); + TQFile::remove(hiFileName); delete m_config; } -void k9Menu::convertJpegToMpeg(const QString &_imageJpg,const QString &_imageMpg) { +void k9Menu::convertJpegToMpeg(const TQString &_imageJpg,const TQString &_imageMpg) { k9Process *process=new k9Process(0,0); process->setWorkingDirectory(m_workDir); process->setUseShell(true); @@ -146,7 +146,7 @@ void k9Menu::convertJpegToMpeg(const QString &_imageJpg,const QString &_imageMpg qDebug(process->debug().latin1()); } -void k9Menu::createAudio(const QString & _audioFile) { +void k9Menu::createAudio(const TQString & _audioFile) { k9Process *process=new k9Process(0,0); process->setWorkingDirectory(m_workDir); process->setUseShell(true); @@ -161,7 +161,7 @@ void k9Menu::createAudio(const QString & _audioFile) { qDebug("error creating audio stream"); } } -void k9Menu::multiplex(const QString &_audio, const QString &_video, const QString _result) { +void k9Menu::multiplex(const TQString &_audio, const TQString &_video, const TQString _result) { k9Process *process=new k9Process(0,0); process->setWorkingDirectory(m_workDir); process->setUseShell(true); @@ -173,12 +173,12 @@ void k9Menu::multiplex(const QString &_audio, const QString &_video, const QStri } } -void k9Menu::spumux(const QString &_hiFileName,const QString &_mpgFileName) { - QDomElement stream,spu; +void k9Menu::spumux(const TQString &_hiFileName,const TQString &_mpgFileName) { + TQDomElement stream,spu; - QDomDocument xml; + TQDomDocument xml; - QDomElement root = xml.createElement( "subpictures" ); + TQDomElement root = xml.createElement( "subpictures" ); xml.appendChild( root ); stream=xml.createElement("stream"); @@ -200,20 +200,20 @@ void k9Menu::spumux(const QString &_hiFileName,const QString &_mpgFileName) { int i=1; for (k9MenuButton *button=m_buttons.first();button;button=m_buttons.next()) { - QDomElement eButton = xml.createElement("button"); + TQDomElement eButton = xml.createElement("button"); spu.appendChild(eButton); - eButton.setAttribute("name",QString("button%1").arg(i)); - eButton.setAttribute("x0", QString::number(button->getLeft())); - eButton.setAttribute("y0",QString::number(button->getTop())); - eButton.setAttribute("x1",QString::number(button->getLeft()+button->getWidth())); - eButton.setAttribute("y1",QString::number(button->getTop()+button->getHeight())); + eButton.setAttribute("name",TQString("button%1").tqarg(i)); + eButton.setAttribute("x0", TQString::number(button->getLeft())); + eButton.setAttribute("y0",TQString::number(button->getTop())); + eButton.setAttribute("x1",TQString::number(button->getLeft()+button->getWidth())); + eButton.setAttribute("y1",TQString::number(button->getTop()+button->getHeight())); i++; } - QString spuFileName(m_workDir + KApplication::randomString(8)+ ".xml"); - QFile file( spuFileName ); + TQString spuFileName(m_workDir + KApplication::randomString(8)+ ".xml"); + TQFile file( spuFileName ); if ( file.open( IO_WriteOnly ) ) { - QTextStream stream( &file ); + TQTextStream stream( &file ); xml.save(stream,1); file.close(); } @@ -233,10 +233,10 @@ void k9Menu::spumux(const QString &_hiFileName,const QString &_mpgFileName) { file.remove(); } -void k9Menu::appendMenu(QDomElement *_rootNode) { - QDomDocument doc=_rootNode->ownerDocument(); - QDomNodeList l=_rootNode->elementsByTagName("menus"); - QDomNode menus; +void k9Menu::appendMenu(TQDomElement *_rootNode) { + TQDomDocument doc=_rootNode->ownerDocument(); + TQDomNodeList l=_rootNode->elementsByTagName("menus"); + TQDomNode menus; if (l.count()==0) { menus=doc.createElement("menus"); _rootNode->appendChild(menus); @@ -244,36 +244,36 @@ void k9Menu::appendMenu(QDomElement *_rootNode) { menus=l.item(0); } - QDomElement pgc=doc.createElement("pgc"); + TQDomElement pgc=doc.createElement("pgc"); menus.appendChild(pgc); - QDomElement pre=doc.createElement("pre"); + TQDomElement pre=doc.createElement("pre"); pgc.appendChild(pre); - QDomText txt=doc.createTextNode(m_startScript +m_startScript2); + TQDomText txt=doc.createTextNode(m_startScript +m_startScript2); pre.appendChild(txt); - QDomElement vob=doc.createElement("vob"); + TQDomElement vob=doc.createElement("vob"); pgc.appendChild(vob); vob.setAttribute("file",m_menuFileName); vob.setAttribute("pause","inf"); int i=1; for (k9MenuButton *button=m_buttons.first();button;button=m_buttons.next()) { - QDomElement eButton = doc.createElement("button"); + TQDomElement eButton = doc.createElement("button"); pgc.appendChild(eButton); - QDomText eButtonTxt=doc.createTextNode(button->getScript()); + TQDomText eButtonTxt=doc.createTextNode(button->getScript()); eButton.appendChild(eButtonTxt); - eButton.setAttribute("name",QString("button%1").arg(i)); + eButton.setAttribute("name",TQString("button%1").tqarg(i)); i++; } } -QString k9Menu::getWorkDir() const { +TQString k9Menu::getWorkDir() const { return m_workDir; } -void k9Menu::setWorkDir(const QString& _value) { +void k9Menu::setWorkDir(const TQString& _value) { m_workDir = _value; } @@ -283,51 +283,51 @@ void k9Menu::setFormat(const eFormat& _value) { } -QString k9Menu::getMenuFileName() const { +TQString k9Menu::getMenuFileName() const { return m_menuFileName; } -void k9Menu::setMenuFileName(const QString& _value) { +void k9Menu::setMenuFileName(const TQString& _value) { m_menuFileName = _value; } -QCanvas* k9Menu::getCanvas() const { +TQCanvas* k9Menu::getCanvas() const { return m_canvas; } -void k9Menu::setCanvas(QCanvas* _value) { +void k9Menu::setCanvas(TQCanvas* _value) { m_canvas = _value; } -void k9Menu::setStartScript(const QString &_value) { +void k9Menu::setStartScript(const TQString &_value) { m_startScript=_value; } -QString k9Menu::getStartScript() const { +TQString k9Menu::getStartScript() const { return m_startScript; } -void k9Menu::setStartScript2(const QString &_value) { +void k9Menu::setStartScript2(const TQString &_value) { m_startScript2=_value; } -QString k9Menu::getStartScript2() const { +TQString k9Menu::getStartScript2() const { return m_startScript2; } -QString k9Menu::getEndScript() const { +TQString k9Menu::getEndScript() const { return m_endScript; } -void k9Menu::setEndScript(const QString& _value) { +void k9Menu::setEndScript(const TQString& _value) { m_endScript = _value; } diff --git a/k9author/k9menu.h b/k9author/k9menu.h index 91e8a20..c6d783f 100644 --- a/k9author/k9menu.h +++ b/k9author/k9menu.h @@ -14,58 +14,59 @@ #include "k9common.h" #include "k9config.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /** @author Jean-Michel PETIT */ class k9MenuButton; -class k9Menu : public QObject { +class k9Menu : public TQObject { Q_OBJECT + TQ_OBJECT public slots: - void setStartScript(const QString &); - void setStartScript2(const QString &); - void setEndScript(const QString& _value); + void setStartScript(const TQString &); + void setStartScript2(const TQString &); + void setEndScript(const TQString& _value); public: enum eFormat { PAL=1,NTSC=2 }; - k9Menu(QObject *parent = 0, const char *name = 0); + k9Menu(TQObject *tqparent = 0, const char *name = 0); ~k9Menu(); k9MenuButton *addButton(); - void createMenus(QDomElement *_rootNode); - void setWorkDir(const QString& _value); - QString getWorkDir() const; + void createMenus(TQDomElement *_rootNode); + void setWorkDir(const TQString& _value); + TQString getWorkDir() const; void setFormat(const eFormat& _value); - void setMenuFileName(const QString& _value); - QString getMenuFileName() const; + void setMenuFileName(const TQString& _value); + TQString getMenuFileName() const; - void setCanvas(QCanvas* _value); - QCanvas* getCanvas() const; + void setCanvas(TQCanvas* _value); + TQCanvas* getCanvas() const; - QString getStartScript() const; - QString getEndScript() const; - QString getStartScript2() const; + TQString getStartScript() const; + TQString getEndScript() const; + TQString getStartScript2() const; private: - QPtrList m_buttons; - QString m_workDir; - QString m_menuFileName; + TQPtrList m_buttons; + TQString m_workDir; + TQString m_menuFileName; eFormat m_format; - QCanvas *m_canvas; - QString m_startScript; - QString m_startScript2; - QString m_endScript; + TQCanvas *m_canvas; + TQString m_startScript; + TQString m_startScript2; + TQString m_endScript; k9Config *m_config; - void convertJpegToMpeg(const QString &_imageJpg,const QString &_imageMpg) ; - void createAudio(const QString & _audioFile); - void multiplex(const QString &_audio, const QString &_video, const QString _result); - void spumux(const QString &_hiFileName,const QString &_mpgFileName); - void appendMenu(QDomElement *_rootNode); + void convertJpegToMpeg(const TQString &_imageJpg,const TQString &_imageMpg) ; + void createAudio(const TQString & _audioFile); + void multiplex(const TQString &_audio, const TQString &_video, const TQString _result); + void spumux(const TQString &_hiFileName,const TQString &_mpgFileName); + void appendMenu(TQDomElement *_rootNode); }; #endif diff --git a/k9author/k9menubutton.cpp b/k9author/k9menubutton.cpp index 73908e9..5256983 100644 --- a/k9author/k9menubutton.cpp +++ b/k9author/k9menubutton.cpp @@ -10,11 +10,11 @@ // // #include "k9menubutton.h" -#include -#include -#include +#include +#include +#include -k9CanvasSprite::k9CanvasSprite (QCanvasPixmapArray *a,QCanvas *canvas,k9MenuButton *button) : QCanvasSprite(a,canvas) { +k9CanvasSprite::k9CanvasSprite (TQCanvasPixmapArray *a,TQCanvas *canvas,k9MenuButton *button) : TQCanvasSprite(a,canvas) { m_button=button; } @@ -99,14 +99,14 @@ void k9MenuButton::update() { emit sigsetHeight(getHeight()); } -k9MenuButton::k9MenuButton(QCanvas *parent, const char *name) - : QObject(parent, name),m_width(0),m_height(0) +k9MenuButton::k9MenuButton(TQCanvas *tqparent, const char *name) + : TQObject(tqparent, name),m_width(0),m_height(0) { - m_canvas=parent; + m_canvas=tqparent; m_sprite=NULL; m_pixmap=NULL; - m_text=new QCanvasText("",m_canvas); - m_text->setColor(Qt::yellow); + m_text=new TQCanvasText("",m_canvas); + m_text->setColor(TQt::yellow); } @@ -115,31 +115,31 @@ k9MenuButton::~k9MenuButton() { } -void k9MenuButton::setImage(const QImage &_image) { +void k9MenuButton::setImage(const TQImage &_image) { m_image=_image; emit sigsetImage(this,_image); loadImage(); } -void k9MenuButton::setImage(const QString &_fileName){ +void k9MenuButton::setImage(const TQString &_fileName){ m_image.load(_fileName); emit sigsetImage(this,m_image); loadImage(); } void k9MenuButton::loadImage() { - QImage tmp=m_image.smoothScale(m_width,m_height); + TQImage tmp=m_image.smoothScale(m_width,m_height); int x=0,y=0; if (m_sprite) { x=m_sprite->x(); y=m_sprite->y(); delete m_sprite; } - QPixmap pix; + TQPixmap pix; pix.convertFromImage(tmp); - m_pixmap=new QCanvasPixmap(pix,QPoint(0,0)); + m_pixmap=new TQCanvasPixmap(pix,TQPoint(0,0)); m_pixmapArray.setImage(0,m_pixmap); @@ -194,35 +194,35 @@ int k9MenuButton::getLeft() { return m_sprite->x(); } -void k9MenuButton::setFont(QFont _font) { +void k9MenuButton::setFont(TQFont _font) { m_text->setFont(_font); update(); m_canvas->update(); emit sigsetFont(_font); } -QFont k9MenuButton::getFont() { +TQFont k9MenuButton::getFont() { return m_text->font(); } -void k9MenuButton::setColor(QColor _color) { +void k9MenuButton::setColor(TQColor _color) { m_text->setColor(_color); m_canvas->update(); emit sigsetColor(_color); } -QColor k9MenuButton::getColor() { +TQColor k9MenuButton::getColor() { return m_text->color(); } -void k9MenuButton::setText(QString _text) { +void k9MenuButton::setText(TQString _text) { m_text->setText(_text); update(); m_canvas->update(); emit sigsetText(_text); } -QString k9MenuButton::getText() { +TQString k9MenuButton::getText() { return m_text->text(); } @@ -256,17 +256,17 @@ void k9MenuButton::setTextPosition(const eTextPosition& _value) { } -QImage k9MenuButton::getImage() const { +TQImage k9MenuButton::getImage() const { return m_image; } -QString k9MenuButton::getScript() const { +TQString k9MenuButton::getScript() const { return m_script; } -void k9MenuButton::setScript(const QString& _value) { +void k9MenuButton::setScript(const TQString& _value) { m_script = _value; } diff --git a/k9author/k9menubutton.h b/k9author/k9menubutton.h index 135340e..06b58c2 100644 --- a/k9author/k9menubutton.h +++ b/k9author/k9menubutton.h @@ -12,18 +12,18 @@ #ifndef K9MENUBUTTON_H #define K9MENUBUTTON_H -#include -#include -#include -#include +#include +#include +#include +#include /** @author Jean-Michel PETIT */ class k9MenuButton; -class k9CanvasSprite : public QCanvasSprite { +class k9CanvasSprite : public TQCanvasSprite { public: - k9CanvasSprite (QCanvasPixmapArray *a,QCanvas *canvas,k9MenuButton *button); + k9CanvasSprite (TQCanvasPixmapArray *a,TQCanvas *canvas,k9MenuButton *button); virtual int rtti() const { return 1000; } @@ -36,12 +36,13 @@ private: }; -class k9MenuButton : public QObject { +class k9MenuButton : public TQObject { Q_OBJECT + TQ_OBJECT public: enum eTextPosition {BOTTOM=1,RIGHT=2}; - k9MenuButton(QCanvas *parent = 0, const char *name = 0); + k9MenuButton(TQCanvas *tqparent = 0, const char *name = 0); ~k9MenuButton(); void setWidth(int _value,bool _reload=true); @@ -50,12 +51,12 @@ public: int getHeight(); void setTop(int _value,bool _reload=true); void setLeft(int _value,bool _reload=true); - void setFont(QFont _font); - QFont getFont(); - void setColor(QColor _color); - QColor getColor(); - void setText(QString _text); - QString getText(); + void setFont(TQFont _font); + TQFont getFont(); + void setColor(TQColor _color); + TQColor getColor(); + void setText(TQString _text); + TQString getText(); void select(bool); int getTop(); int getLeft(); @@ -63,16 +64,16 @@ public: void moveBy(int x,int y,bool _reload=true); void update(); public slots: - void setImage(const QImage &_image); - void setImage(const QString &_fileName); + void setImage(const TQImage &_image); + void setImage(const TQString &_fileName); void setTextPosition(const eTextPosition& _value); eTextPosition getTextPosition() const; - QImage getImage() const; + TQImage getImage() const; - void setScript(const QString& _value); - QString getScript() const; + void setScript(const TQString& _value); + TQString getScript() const; void setAngle(int _value); int getAngle() const; @@ -87,18 +88,18 @@ public slots: private: - QCanvas *m_canvas; - QCanvasPixmapArray m_pixmapArray; - QCanvasPixmap *m_pixmap; + TQCanvas *m_canvas; + TQCanvasPixmapArray m_pixmapArray; + TQCanvasPixmap *m_pixmap; k9CanvasSprite *m_sprite; int m_num; - QCanvasText *m_text; - QImage m_image; + TQCanvasText *m_text; + TQImage m_image; int m_width; int m_height; int m_angle; eTextPosition m_textPosition; - QString m_script; + TQString m_script; void loadImage(); signals: void sigsetTop(int); @@ -106,10 +107,10 @@ signals: void sigsetWidth(int); void sigsetHeight(int); - void sigsetFont(const QFont &); - void sigsetColor(const QColor &); - void sigsetImage(k9MenuButton *,const QImage &); - void sigsetText(const QString &); + void sigsetFont(const TQFont &); + void sigsetColor(const TQColor &); + void sigsetImage(k9MenuButton *,const TQImage &); + void sigsetText(const TQString &); void sigsetTextPosition(int); }; diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp index 8ab0bc5..1cd5a81 100644 --- a/k9author/k9menuedit.cpp +++ b/k9author/k9menuedit.cpp @@ -16,37 +16,37 @@ #include "k9menu.h" #include "k9title.h" #include "k9newdvd.h" -#include -#include +#include +#include #include #include "k9menubutton.h" #include #include -#include +#include #include -#include +#include #include -k9MenuEdit::k9MenuEdit(QWidget* parent, const char* name,QCanvas *_canvas) - : menuEdit(parent,name) { +k9MenuEdit::k9MenuEdit(TQWidget* tqparent, const char* name,TQCanvas *_canvas) + : menuEdit(tqparent,name) { bAddText->setPixmap (SmallIcon("add")); m_noUpdate=false; m_canvas=_canvas; m_format=PAL; m_imageHeight=576; - QGridLayout *grid=new QGridLayout(frame,1,1); + TQGridLayout *grid=new TQGridLayout(frame,1,1); m_menuEditor=new k9MenuEditor(*m_canvas,frame); grid->addWidget(m_menuEditor,0,0); m_canvas->resize(720,m_imageHeight); m_text=NULL; m_menuEditor->setMenu(this); - connect(m_menuEditor,SIGNAL(itemSelected()),this,SLOT(itemSelected())); + connect(m_menuEditor,TQT_SIGNAL(itemSelected()),this,TQT_SLOT(itemSelected())); cbPosTitle->setEnabled(false); } -void k9MenuEdit::updateTextPos(const QPoint &_point) { +void k9MenuEdit::updateTextPos(const TQPoint &_point) { emit updatePos(_point); } @@ -64,8 +64,8 @@ void k9MenuEdit::itemSelected() { urBackground->setEnabled(true); m_canvas->update(); } else if (m_menuEditor->getMoving()) { - if (m_menuEditor->getMoving()->rtti()==QCanvasItem::Rtti_Text) { - m_text=(QCanvasText*)m_menuEditor->getMoving(); + if (m_menuEditor->getMoving()->rtti()==TQCanvasItem::Rtti_Text) { + m_text=(TQCanvasText*)m_menuEditor->getMoving(); leTitle->setText(m_text->text()); cbColor->setColor(m_text->color()); cbPosTitle->setEnabled(false); @@ -90,17 +90,17 @@ k9MenuEdit::~k9MenuEdit() {} void k9MenuEdit::bFontClick() { if (m_menuEditor->getSelected()) { k9MenuButton *b=m_menuEditor->getSelected(); - QFont myFont(b->getFont()); + TQFont myFont(b->getFont()); int result = KFontDialog::getFont( myFont ); if ( result == KFontDialog::Accepted && m_menuEditor->getSelected() ) { - QPtrList *l=m_menuEditor->getSelection(); + TQPtrList *l=m_menuEditor->getSelection(); for (b=l->first();b;b=l->next()) { b->setFont(myFont); } } } else { if (m_text) { - QFont myFont(m_text->font()); + TQFont myFont(m_text->font()); int result = KFontDialog::getFont( myFont ); if ( result == KFontDialog::Accepted ) setFont(myFont); @@ -109,27 +109,27 @@ void k9MenuEdit::bFontClick() { } } -void k9MenuEdit::urBackgroundSelected(const QString &_fileName) { +void k9MenuEdit::urBackgroundSelected(const TQString &_fileName) { if ( m_menuEditor->getSelected() ) { //If a button is selected, set the button image ... k9MenuButton *b=(k9MenuButton*)m_menuEditor->getSelected(); - QImage img; + TQImage img; img.load(_fileName); b->setImage(img); } else { //...otherwise, set the menu background image - QImage img; + TQImage img; img.load(_fileName); - img=img.smoothScale(720,m_imageHeight,QImage::ScaleMax); + img=img.smoothScale(720,m_imageHeight,TQ_ScaleMax); setBackgroundImage(img); } } -void k9MenuEdit::cbColorChanged(const QColor &_color) { +void k9MenuEdit::cbColorChanged(const TQColor &_color) { if (m_noUpdate) return; if ( m_menuEditor->getSelected() ) { - QPtrList *l=m_menuEditor->getSelection(); + TQPtrList *l=m_menuEditor->getSelection(); for (k9MenuButton *b=l->first();b;b=l->next()) { b->setColor(_color); } @@ -144,27 +144,27 @@ void k9MenuEdit::cbPosTitleActivated(int _value) { if (m_noUpdate) return; if ( m_menuEditor->getSelected() ) { - QPtrList *l=m_menuEditor->getSelection(); + TQPtrList *l=m_menuEditor->getSelection(); for (k9MenuButton *b=l->first();b;b=l->next()) { b->setTextPosition((k9MenuButton::eTextPosition)(_value+1)); } } } -void k9MenuEdit::setBackgroundImage(const QImage &_image) { +void k9MenuEdit::setBackgroundImage(const TQImage &_image) { m_background=_image; - m_canvas->setBackgroundPixmap(QPixmap(_image)); + m_canvas->tqsetBackgroundPixmap(TQPixmap(_image)); emit backgroundImageChanged(_image); } -void k9MenuEdit::leTitleChanged(const QString &_value) { +void k9MenuEdit::leTitleChanged(const TQString &_value) { if (m_noUpdate) return; if ( m_menuEditor->getSelected() ) { - QPtrList *l=m_menuEditor->getSelection(); + TQPtrList *l=m_menuEditor->getSelection(); for (k9MenuButton *b=l->first();b;b=l->next()) { - QString c=_value; - b->setText(c.replace("%n",QString::number(b->getNum()))); + TQString c=_value; + b->setText(c.tqreplace("%n",TQString::number(b->getNum()))); } //m_menuEditor->getSelected()->setText(_value); } else { @@ -178,28 +178,28 @@ void k9MenuEdit::leTitleChanged(const QString &_value) { -void k9MenuEdit::setText(const QString &_value) { +void k9MenuEdit::setText(const TQString &_value) { if (m_text) m_text->setText(_value); m_canvas->update(); emit textChanged(_value); } -void k9MenuEdit::setFont(const QFont &_value) { +void k9MenuEdit::setFont(const TQFont &_value) { if (m_text) m_text->setFont(_value); m_canvas->update(); emit textFontChanged(_value); } -void k9MenuEdit::setColor(const QColor &_value) { +void k9MenuEdit::setColor(const TQColor &_value) { if (m_text) m_text->setColor(_value); m_canvas->update(); emit textColorChanged(_value); } -QCanvasText* k9MenuEdit::getText() const { +TQCanvasText* k9MenuEdit::getText() const { return m_text; } @@ -215,20 +215,20 @@ void k9MenuEdit::setFormat(const eFormat& _value) { m_imageHeight=480; else m_imageHeight=576; - QPixmap pix=m_canvas->backgroundPixmap(); - QImage img=pix.convertToImage().smoothScale(720,m_imageHeight); + TQPixmap pix=m_canvas->backgroundPixmap(); + TQImage img=pix.convertToImage().smoothScale(720,m_imageHeight); m_canvas->resize(720,m_imageHeight); - m_menuEditor->setMaximumSize(QSize(724,m_imageHeight+4)); - m_canvas->setBackgroundPixmap(QPixmap(img)); + m_menuEditor->setMaximumSize(TQSize(724,m_imageHeight+4)); + m_canvas->tqsetBackgroundPixmap(TQPixmap(img)); } -QCanvas *k9MenuEdit::getCanvas() { +TQCanvas *k9MenuEdit::getCanvas() { return m_canvas; } -void k9MenuEdit::setCanvas(QCanvas* _value) { +void k9MenuEdit::setCanvas(TQCanvas* _value) { m_canvas = _value; m_text=NULL; m_menuEditor->setCanvas(_value); @@ -238,11 +238,11 @@ void k9MenuEdit::setCanvas(QCanvas* _value) { } void k9MenuEdit::titleSelected(k9Title *_title) { - disconnect (this,SIGNAL(startScriptChanged(const QString&)),0,0); - disconnect (this,SIGNAL(endScriptChanged(const QString&)),0,0); + disconnect (this,TQT_SIGNAL(startScriptChanged(const TQString&)),0,0); + disconnect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),0,0); cbEnd->setEnabled(true); m_menuEditor->clearSelection(); - lTitle->setText(i18n("Title %1 Menu").arg(_title->getNum()+1)); + lTitle->setText(i18n("Title %1 Menu").tqarg(_title->getNum()+1)); setCanvas(_title->getMenu()->getCanvas()); m_menuType=TITLEMENU; cbStart->clear(); @@ -257,30 +257,30 @@ void k9MenuEdit::titleSelected(k9Title *_title) { m_startScripts << "if (g1==0) {g1=1; jump title 1 chapter 1;}"; if (_title->getMenu()->getStartScript() !="") cbStart->setCurrentItem(cbStart->count()-1); - connect (this,SIGNAL(startScriptChanged(const QString&)),_title->getMenu(),SLOT(setStartScript(const QString&))); + connect (this,TQT_SIGNAL(startScriptChanged(const TQString&)),_title->getMenu(),TQT_SLOT(setStartScript(const TQString&))); cbEnd->insertItem(i18n("Play Root Menu")); m_endScripts << "g6=0; call vmgm menu;"; cbEnd->insertItem(i18n("Play Title Menu")); m_endScripts << "call menu;"; - k9NewDVD *newDVD=(k9NewDVD*)_title->parent() ; + k9NewDVD *newDVD=(k9NewDVD*)_title->tqparent() ; k9NewDVDItems *items=newDVD->getTitles(); for (k9Title *title=items->first();title;title=items->next()) { - cbEnd->insertItem(i18n("Play Title %1").arg(title->getNum()+1)); - QString script=QString("g6=%1; call vmgm menu;" ).arg(title->getNum()+1); + cbEnd->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1)); + TQString script=TQString("g6=%1; call vmgm menu;" ).tqarg(title->getNum()+1); m_endScripts << script; } for (int i=0;igetMenu()->getEndScript()== *(m_endScripts.at(i))) cbEnd->setCurrentItem(i); } - connect (this,SIGNAL(endScriptChanged(const QString&)),_title->getMenu(),SLOT(setEndScript(const QString&))); + connect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),_title->getMenu(),TQT_SLOT(setEndScript(const TQString&))); } void k9MenuEdit::rootSelected(k9NewDVD *_newDVD) { - disconnect (this,SIGNAL(startScriptChanged(const QString&)),0,0); - disconnect (this,SIGNAL(endScriptChanged(const QString&)),0,0); + disconnect (this,TQT_SIGNAL(startScriptChanged(const TQString&)),0,0); + disconnect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),0,0); cbEnd->setEnabled(false); m_menuEditor->clearSelection(); lTitle->setText(i18n("Root Menu")); @@ -292,18 +292,18 @@ void k9MenuEdit::rootSelected(k9NewDVD *_newDVD) { m_startScripts << ""; k9NewDVDItems *items=_newDVD->getTitles(); for (k9Title *title=items->first();title;title=items->next()) { - cbStart->insertItem(i18n("Play Title %1").arg(title->getNum()+1)); - // QString script=QString("if (g5==0) {g5=1; jump title %1;}" ).arg(title->getNum()+1); - QString script=QString("g6=%1;" ).arg(title->getNum()+1); + cbStart->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1)); + // TQString script=TQString("if (g5==0) {g5=1; jump title %1;}" ).tqarg(title->getNum()+1); + TQString script=TQString("g6=%1;" ).tqarg(title->getNum()+1); m_startScripts << script; if (script==_newDVD->getRootMenu()->getStartScript()) cbStart->setCurrentItem(cbStart->count()-1); } - connect (this,SIGNAL(startScriptChanged(const QString&)),_newDVD->getRootMenu(),SLOT(setStartScript(const QString&))); + connect (this,TQT_SIGNAL(startScriptChanged(const TQString&)),_newDVD->getRootMenu(),TQT_SLOT(setStartScript(const TQString&))); } void k9MenuEdit::bAddTextClick() { - m_text=new QCanvasText(m_canvas); + m_text=new TQCanvasText(m_canvas); m_text->show(); m_menuEditor->setMoving(m_text); setText(leTitle->text()); diff --git a/k9author/k9menuedit.h b/k9author/k9menuedit.h index f11a6b7..c5a1cd3 100644 --- a/k9author/k9menuedit.h +++ b/k9author/k9menuedit.h @@ -14,8 +14,8 @@ #define K9MENUEDIT_H #include "../k9author/menuEdit.h" -#include -#include +#include +#include class k9MenuButton; class k9MenuEdit; @@ -26,59 +26,60 @@ class k9MenuEditor; class k9MenuEdit : public menuEdit { Q_OBJECT + TQ_OBJECT public: enum eFormat {PAL=1,NTSC=2}; enum eMenuType {ROOTMENU,TITLEMENU}; - k9MenuEdit(QWidget* parent = 0, const char* name = 0,QCanvas *_canvas=0); + k9MenuEdit(TQWidget* tqparent = 0, const char* name = 0,TQCanvas *_canvas=0); ~k9MenuEdit(); /*$PUBLIC_FUNCTIONS$*/ - void setBackgroundImage(const QImage &_image); - void setText(const QString &_value); - void setFont(const QFont &_value); - void setColor(const QColor &_value); - void updateTextPos(const QPoint &_point); + void setBackgroundImage(const TQImage &_image); + void setText(const TQString &_value); + void setFont(const TQFont &_value); + void setColor(const TQColor &_value); + void updateTextPos(const TQPoint &_point); public slots: /*$PUBLIC_SLOTS$*/ void itemSelected(); - QCanvasText* getText() const; + TQCanvasText* getText() const; void setFormat(const eFormat& _value); k9MenuEdit::eFormat getFormat() const; - QCanvas *getCanvas(); - void setCanvas(QCanvas* _value); + TQCanvas *getCanvas(); + void setCanvas(TQCanvas* _value); void titleSelected(k9Title *); void rootSelected(k9NewDVD *); protected: /*$PROTECTED_FUNCTIONS$*/ virtual void bFontClick(); - virtual void urBackgroundSelected(const QString &_fileName); - virtual void cbColorChanged(const QColor &_color); - virtual void leTitleChanged(const QString &_value); + virtual void urBackgroundSelected(const TQString &_fileName); + virtual void cbColorChanged(const TQColor &_color); + virtual void leTitleChanged(const TQString &_value); virtual void cbPosTitleActivated(int _value); virtual void bAddTextClick(); virtual void cbStartActivated (int _value); virtual void cbEndActivated (int _value); k9MenuEditor *m_menuEditor; - QCanvas *m_canvas; - QImage m_background; - QCanvasText *m_text; + TQCanvas *m_canvas; + TQImage m_background; + TQCanvasText *m_text; eFormat m_format; int m_imageHeight; eMenuType m_menuType; - QStringList m_startScripts; - QStringList m_endScripts; + TQStringList m_startScripts; + TQStringList m_endScripts; bool m_noUpdate; protected slots: /*$PROTECTED_SLOTS$*/ signals: - void backgroundImageChanged(const QImage &); - void textChanged(const QString&); - void startScriptChanged(const QString&); - void endScriptChanged(const QString&); - void textColorChanged(const QColor &); - void textFontChanged(const QFont&); - void updatePos(const QPoint &); + void backgroundImageChanged(const TQImage &); + void textChanged(const TQString&); + void startScriptChanged(const TQString&); + void endScriptChanged(const TQString&); + void textColorChanged(const TQColor &); + void textFontChanged(const TQFont&); + void updatePos(const TQPoint &); }; #endif diff --git a/k9author/k9menueditor.cpp b/k9author/k9menueditor.cpp index 1af07a1..fa227d0 100644 --- a/k9author/k9menueditor.cpp +++ b/k9author/k9menueditor.cpp @@ -13,34 +13,34 @@ #include "k9menubutton.h" #include "k9menuedit.h" #include "k9canvasselection.h" -#include -#include +#include +#include #include k9MenuEditor::k9MenuEditor( - QCanvas& c, QWidget* parent, + TQCanvas& c, TQWidget* tqparent, const char* name, WFlags f) : - QCanvasView(&c,parent,name,f) { - this->setMaximumSize(QSize(724,580)); + TQCanvasView(&c,tqparent,name,f) { + this->setMaximumSize(TQSize(724,580)); moving=NULL; m_canvasSelection=new k9CanvasSelection(this); viewport()->setMouseTracking(true); } -void k9MenuEditor::contentsMouseReleaseEvent(QMouseEvent* e) { +void k9MenuEditor::contentsMouseReleaseEvent(TQMouseEvent* e) { m_canvasSelection->release(); emit itemSelected(); } -void k9MenuEditor::contentsMousePressEvent(QMouseEvent* e) { - QPoint p = inverseWorldMatrix().map(e->pos()); +void k9MenuEditor::contentsMousePressEvent(TQMouseEvent* e) { + TQPoint p = inverseWorldMatrix().map(e->pos()); moving_start = p; - QCanvasItemList l=canvas()->collisions(p); + TQCanvasItemList l=canvas()->collisions(p); moving=0; - for (QCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { - QCanvasItem *item=*it; - if (item->rtti()==QCanvasItem::Rtti_Rectangle) + for (TQCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { + TQCanvasItem *item=*it; + if (item->rtti()==TQCanvasItem::Rtti_Rectangle) moving = item; if (item->rtti()>2000) { moving=item; @@ -49,12 +49,12 @@ void k9MenuEditor::contentsMousePressEvent(QMouseEvent* e) { } if (moving) return; - for (QCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { -// if ((*it)->rtti()==QCanvasItem::Rtti_Rectangle) + for (TQCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { +// if ((*it)->rtti()==TQCanvasItem::Rtti_Rectangle) // continue; moving = *it; if (moving->rtti()==1000) { - if (e->state() & QMouseEvent::ControlButton) + if (e->state() & TQt::ControlButton) addSelection(moving); else { if (!isSelected(moving)) { @@ -75,8 +75,8 @@ void k9MenuEditor::contentsMousePressEvent(QMouseEvent* e) { } void k9MenuEditor::clear() { - QCanvasItemList list = canvas()->allItems(); - QCanvasItemList::Iterator it = list.begin(); + TQCanvasItemList list = canvas()->allItems(); + TQCanvasItemList::Iterator it = list.begin(); for (; it != list.end(); ++it) { if ( *it ) delete *it; @@ -89,19 +89,19 @@ void k9MenuEditor::clearSelection() { m_selection.clear(); } -bool k9MenuEditor::isSelected(QCanvasItem *_item) { +bool k9MenuEditor::isSelected(TQCanvasItem *_item) { k9CanvasSprite *s=(k9CanvasSprite *)_item; k9MenuButton *button=s->getButton(); - if (m_selection.find(button) !=-1) + if (m_selection.tqfind(button) !=-1) return true; else return false; } -void k9MenuEditor::addSelection(QCanvasItem *_item) { +void k9MenuEditor::addSelection(TQCanvasItem *_item) { k9CanvasSprite *s=(k9CanvasSprite *)_item; k9MenuButton *button=s->getButton(); - if (m_selection.find(button) !=-1) { + if (m_selection.tqfind(button) !=-1) { button->select(false); m_selection.remove(button); } else { @@ -110,13 +110,13 @@ void k9MenuEditor::addSelection(QCanvasItem *_item) { } } -void k9MenuEditor::updateCursor(QMouseEvent *e) { - QPoint p = inverseWorldMatrix().map(e->pos()); - QCanvasItemList l=canvas()->collisions(p); - for (QCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { - QCanvasItem *item=*it; +void k9MenuEditor::updateCursor(TQMouseEvent *e) { + TQPoint p = inverseWorldMatrix().map(e->pos()); + TQCanvasItemList l=canvas()->collisions(p); + for (TQCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { + TQCanvasItem *item=*it; switch (item->rtti()) { - case QCanvasItem::Rtti_Rectangle : + case TQCanvasItem::Rtti_Rectangle : setCursor(KCursor::sizeAllCursor()); return; case 2002 : @@ -142,15 +142,15 @@ void k9MenuEditor::updateCursor(QMouseEvent *e) { setCursor(KCursor::arrowCursor()); } -void k9MenuEditor::contentsMouseMoveEvent(QMouseEvent* e) { +void k9MenuEditor::contentsMouseMoveEvent(TQMouseEvent* e) { updateCursor(e); if ( moving && (e->state() & Qt::LeftButton ==Qt::LeftButton) ) { - if (moving->rtti() !=QCanvasItem::Rtti_Text || moving==m_menu->getText()) { - QPoint p = inverseWorldMatrix().map(e->pos()); + if (moving->rtti() !=TQCanvasItem::Rtti_Text || moving==m_menu->getText()) { + TQPoint p = inverseWorldMatrix().map(e->pos()); int offsetX=p.x() - moving_start.x(); int offsetY=p.y() - moving_start.y(); moving_start = p; - if (moving->rtti()==1000 || moving->rtti() == QCanvasItem::Rtti_Rectangle) { + if (moving->rtti()==1000 || moving->rtti() == TQCanvasItem::Rtti_Rectangle) { for (k9MenuButton *b=m_selection.first();b;b=m_selection.next()) { k9CanvasSprite*spr=b->getSprite(); spr->moveBy(offsetX,offsetY); @@ -163,29 +163,29 @@ void k9MenuEditor::contentsMouseMoveEvent(QMouseEvent* e) { if (moving->rtti() >2001 && moving->rtti() <2010) { k9CanvasSelectionRedim *ssr=(k9CanvasSelectionRedim*)moving; ssr->updateSelection(); - } else if (moving->rtti() != QCanvasItem::Rtti_Text ){ + } else if (moving->rtti() != TQCanvasItem::Rtti_Text ){ //if selection not resized, move the selection m_canvasSelection->moveBy(offsetX,offsetY); m_canvasSelection->update(); } if (moving==m_menu->getText()) - emit m_menu->updateTextPos(QPoint(moving->x(),moving->y())); + emit m_menu->updateTextPos(TQPoint(moving->x(),moving->y())); canvas()->update(); } } else if ((e->state() & Qt::LeftButton) ==Qt::LeftButton ) { m_canvasSelection->hide(); canvas()->update(); - QPoint p = inverseWorldMatrix().map(e->pos()); + TQPoint p = inverseWorldMatrix().map(e->pos()); int offsetX=p.x() - moving_start.x(); int offsetY=p.y() - moving_start.y(); m_canvasSelection->setSize(offsetX,offsetY); m_canvasSelection->show(); canvas()->update(); clearSelection(); - QCanvasItemList l=canvas()->collisions(m_canvasSelection->getRect()); - for (QCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { - QCanvasItem *item = *it; + TQCanvasItemList l=canvas()->collisions(m_canvasSelection->getRect()); + for (TQCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { + TQCanvasItem *item = *it; if (item->rtti()==1000) { addSelection(item); } @@ -193,11 +193,11 @@ void k9MenuEditor::contentsMouseMoveEvent(QMouseEvent* e) { } } -void k9MenuEditor::resizeEvent ( QResizeEvent * e ) { - QWMatrix m; +void k9MenuEditor::resizeEvent ( TQResizeEvent * e ) { + TQWMatrix m; double scalex=(e->size().width()-4.0)/720.0; double scaley=(e->size().height()-4.0)/576.0; - m.scale(QMIN(scalex,scaley),QMIN(scalex,scaley)); + m.scale(TQMIN(scalex,scaley),TQMIN(scalex,scaley)); this->setWorldMatrix(m); } @@ -215,18 +215,18 @@ k9MenuButton * k9MenuEditor::getSelected() { return NULL; } -QCanvasItem* k9MenuEditor::getMoving() const { +TQCanvasItem* k9MenuEditor::getMoving() const { return moving; } -void k9MenuEditor::setMoving(QCanvasItem* _value) { +void k9MenuEditor::setMoving(TQCanvasItem* _value) { moving = _value; } -QPtrList< k9MenuButton > *k9MenuEditor::getSelection() { +TQPtrList< k9MenuButton > *k9MenuEditor::getSelection() { return &m_selection; } diff --git a/k9author/k9menueditor.h b/k9author/k9menueditor.h index 53c1921..d4332dd 100644 --- a/k9author/k9menueditor.h +++ b/k9author/k9menueditor.h @@ -12,7 +12,7 @@ #ifndef K9MENUEDITOR_H #define K9MENUEDITOR_H -#include +#include /** @author Jean-Michel PETIT @@ -21,11 +21,12 @@ class k9MenuButton; class k9MenuEdit; class k9CanvasSelection; -class k9MenuEditor : public QCanvasView { +class k9MenuEditor : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: - k9MenuEditor(QCanvas&, QWidget* parent=0, const char* name=0, WFlags f=0); + k9MenuEditor(TQCanvas&, TQWidget* tqparent=0, const char* name=0, WFlags f=0); void clear(); k9MenuButton* getSelected() ; @@ -33,31 +34,31 @@ public: m_menu=_menu; } - QCanvasItem* getMoving() const; + TQCanvasItem* getMoving() const; - void setMoving(QCanvasItem* _value); - QPtrList< k9MenuButton > *getSelection() ; + void setMoving(TQCanvasItem* _value); + TQPtrList< k9MenuButton > *getSelection() ; void clearSelection(); void hideSelection(); protected: - void contentsMousePressEvent(QMouseEvent*); - void contentsMouseMoveEvent(QMouseEvent*); - void contentsMouseReleaseEvent(QMouseEvent* e); - void updateCursor(QMouseEvent *e); - virtual void resizeEvent ( QResizeEvent * e ); - void addSelection(QCanvasItem *_item); - bool isSelected(QCanvasItem *_item); + void contentsMousePressEvent(TQMouseEvent*); + void contentsMouseMoveEvent(TQMouseEvent*); + void contentsMouseReleaseEvent(TQMouseEvent* e); + void updateCursor(TQMouseEvent *e); + virtual void resizeEvent ( TQResizeEvent * e ); + void addSelection(TQCanvasItem *_item); + bool isSelected(TQCanvasItem *_item); void drawSelection(); signals: - void status(const QString&); + void status(const TQString&); void itemSelected(); private: - QCanvasItem* moving; - QCanvasRectangle *m_rect; - QPoint moving_start; + TQCanvasItem* moving; + TQCanvasRectangle *m_rect; + TQPoint moving_start; k9MenuEdit *m_menu; - QPtrList m_selection; + TQPtrList m_selection; k9CanvasSelection *m_canvasSelection; }; diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp index 7cc73bd..3fa8c5b 100644 --- a/k9author/k9newdvd.cpp +++ b/k9author/k9newdvd.cpp @@ -12,24 +12,24 @@ #include "k9newdvd.h" #include "k9title.h" #include "k9tools.h" -#include +#include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include #include "k9menu.h" #include "k9menubutton.h" #include "k9processlist.h" -#include -#include +#include +#include -k9NewDVD::k9NewDVD(QObject *parent, const char *name) - : QObject(parent, name) { +k9NewDVD::k9NewDVD(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { m_workDir=locateLocal("tmp", "k9copy/" ) ; m_rootMenu=new k9Menu(this); m_format=PAL; @@ -38,7 +38,7 @@ k9NewDVD::k9NewDVD(QObject *parent, const char *name) k9NewDVD::~k9NewDVD() {} -int k9NewDVDItems::compareItems(QPtrCollection::Item item1,QPtrCollection::Item item2) { +int k9NewDVDItems::compareItems(TQPtrCollection::Item item1,TQPtrCollection::Item item2) { k9Title *_i1=(k9Title*) item1; k9Title *_i2=(k9Title*) item2; @@ -51,19 +51,19 @@ void k9NewDVD::execute() { m_cancel=false; m_error=""; m_config=new k9Config(); - // connect(m_process, SIGNAL(receivedStderr(KProcess *, char *, int)),this, SLOT(getStderr(KProcess *, char *, int) )); + // connect(m_process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(getStderr(KProcess *, char *, int) )); - connect(&m_aviDecode,SIGNAL(drawFrame(QImage*)),this,SLOT(drawImage(QImage*))); + connect(&m_aviDecode,TQT_SIGNAL(drawFrame(TQImage*)),this,TQT_SLOT(drawImage(TQImage*))); k9Tools::clearOutput(m_workDir+"dvd"); createXML(); - disconnect(&m_aviDecode,SIGNAL(drawFrame(QImage*)),this,SLOT(drawImage(QImage*))); + disconnect(&m_aviDecode,TQT_SIGNAL(drawFrame(TQImage*)),this,TQT_SLOT(drawImage(TQImage*))); delete m_config; } #include "k9newdvd.moc" -void k9NewDVD::drawImage(QImage * _image) { +void k9NewDVD::drawImage(TQImage * _image) { // m_progress->setImage(*_image); } @@ -80,16 +80,16 @@ void k9NewDVD::createXML() { m_rootMenu->setWorkDir(m_workDir); - QString menuFileName=m_workDir+KApplication::randomString(8)+".mpg"; + TQString menuFileName=m_workDir+KApplication::randomString(8)+".mpg"; m_rootMenu->setMenuFileName(menuFileName); - m_xml=new QDomDocument(); - QDomElement root = m_xml->createElement( "dvdauthor" ); + m_xml=new TQDomDocument(); + TQDomElement root = m_xml->createElement( "dvdauthor" ); root.setAttribute ("dest",m_workDir+"dvd"); m_xml->appendChild( root ); // Create vmgm menu - QDomElement vmgm = m_xml->createElement("vmgm"); + TQDomElement vmgm = m_xml->createElement("vmgm"); root.appendChild(vmgm); m_processList->addProgress(i18n("Creating root menu")); m_rootMenu->createMenus(&vmgm); @@ -99,10 +99,10 @@ void k9NewDVD::createXML() { m_totalEncodedSize=0; m_offset=0; m_lastvalue=0; - for ( QStringList::Iterator it = m_tmpFiles.begin(); it != m_tmpFiles.end(); ++it ) { - QString file= *it; + for ( TQStringList::Iterator it = m_tmpFiles.begin(); it != m_tmpFiles.end(); ++it ) { + TQString file= *it; if (file.endsWith(".mpeg")) { - QFileInfo f(file); + TQFileInfo f(file); m_totalEncodedSize+=f.size(); } } @@ -110,17 +110,17 @@ void k9NewDVD::createXML() { m_cancel=m_processList->getCancel(); bool error=false; if (!m_cancel) { - QString dvdAuthor(m_workDir+"/"+KApplication::randomString(8)+".xml"); - QFile file( dvdAuthor); + TQString dvdAuthor(m_workDir+"/"+KApplication::randomString(8)+".xml"); + TQFile file( dvdAuthor); file.open(IO_WriteOnly); - QTextStream stream( &file ); + TQTextStream stream( &file ); m_xml->save(stream,1); file.close(); m_processList->clear(); k9Process *process=m_processList->addProcess(i18n("authoring")); - connect(process, SIGNAL(receivedStderr(KProcess *, char *, int)),this, SLOT(getStderr(KProcess *, char *, int) )); + connect(process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),this, TQT_SLOT(getStderr(KProcess *, char *, int) )); *process << "dvdauthor" << "-x" << dvdAuthor; m_processList->execute(); m_cancel=m_processList->getCancel(); @@ -134,9 +134,9 @@ void k9NewDVD::createXML() { m_error=i18n("The dvd authoring was canceled"); else if (error) m_error=i18n("An error occured while running DVDAuthor:\n")+ m_stdout; - QFile::remove(menuFileName); - for ( QStringList::Iterator it = m_tmpFiles.begin(); it != m_tmpFiles.end(); ++it ) { - QFile::remove(*it); + TQFile::remove(menuFileName); + for ( TQStringList::Iterator it = m_tmpFiles.begin(); it != m_tmpFiles.end(); ++it ) { + TQFile::remove(*it); } m_tmpFiles.clear(); if (m_error !="") { @@ -146,23 +146,23 @@ void k9NewDVD::createXML() { } -void k9NewDVD::addTitles (QDomElement &_root) { +void k9NewDVD::addTitles (TQDomElement &_root) { calcVideoBitrate(); for (k9Title *title=m_titles.first();title && !m_cancel;title=m_titles.next()) { - QDomElement titleSet = m_xml->createElement("titleset"); + TQDomElement titleSet = m_xml->createElement("titleset"); _root.appendChild(titleSet); - QDomElement pgc; + TQDomElement pgc; k9Menu *menu=title->getMenu(); menu->setWorkDir(m_workDir); - QString menuFileName=m_workDir+KApplication::randomString(8)+".mpg"; + TQString menuFileName=m_workDir+KApplication::randomString(8)+".mpg"; m_tmpFiles << menuFileName, menu->setMenuFileName(menuFileName); - m_processList->addProgress(i18n("Creating menu for title %1").arg(title->getNum()+1)); + m_processList->addProgress(i18n("Creating menu for title %1").tqarg(title->getNum()+1)); menu->createMenus(&titleSet); - QDomElement eTitle=m_xml->createElement("titles"); + TQDomElement eTitle=m_xml->createElement("titles"); titleSet.appendChild(eTitle); - QDomElement e=m_xml->createElement("video"); + TQDomElement e=m_xml->createElement("video"); e.setAttribute("aspect","16:9"); e.setAttribute("format",m_format==PAL?"PAL":"NTSC"); // if (l_track->getaspectRatio()!="4:3") { @@ -177,15 +177,15 @@ void k9NewDVD::addTitles (QDomElement &_root) { pgc=m_xml->createElement("pgc"); eTitle.appendChild(pgc); - QDomElement post=m_xml->createElement("post"); + TQDomElement post=m_xml->createElement("post"); pgc.appendChild(post); - QDomText txt=m_xml->createTextNode(title->getMenu()->getEndScript()); + TQDomText txt=m_xml->createTextNode(title->getMenu()->getEndScript()); post.appendChild(txt); - QPtrList *l=title->getFiles(); + TQPtrList *l=title->getFiles(); for (k9AviFile *aviFile= l->first();aviFile && !m_cancel;aviFile=l->next()) { if ( aviFile->getPrevious()==NULL || aviFile->getBreakPrevious()) { - QString cmd="",chapters=""; + TQString cmd="",chapters=""; createMencoderCmd(cmd,chapters,aviFile); e=m_xml->createElement("vob"); e.setAttribute("file",cmd); @@ -198,18 +198,18 @@ void k9NewDVD::addTitles (QDomElement &_root) { } -void k9NewDVD::setWorkDir ( const QString& _value ) { +void k9NewDVD::setWorkDir ( const TQString& _value ) { m_workDir = _value; if (!m_workDir.endsWith("/")) m_workDir +="/"; } -void k9NewDVD::createMencoderCmd(QString &_cmd,QString &_chapters, k9AviFile *_aviFile) { +void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *_aviFile) { // m_aviDecode.open(_aviFile->getFileName()); m_timer.start(); m_timer2.start(); m_timer3.start(); - QTime end; + TQTime end; k9AviFile *file=_aviFile; bool bEnd; _chapters="0"; @@ -219,20 +219,20 @@ void k9NewDVD::createMencoderCmd(QString &_cmd,QString &_chapters, k9AviFile *_a file=file->getNext(); if (!bEnd) { int lt=_aviFile->getStart().msecsTo(end); - QTime t; + TQTime t; t=t.addMSecs(lt); _chapters +="," + t.toString("hh:mm:ss"); } } while (!bEnd); - QString fileName= m_workDir + KApplication::randomString(8)+".mpeg"; - QString t1=_aviFile->getStart().toString("hh:mm:ss.zzz"); + TQString fileName= m_workDir + KApplication::randomString(8)+".mpeg"; + TQString t1=_aviFile->getStart().toString("hh:mm:ss.zzz"); int length=_aviFile->getStart().msecsTo(end); - QTime l; + TQTime l; l=l.addMSecs(length); - QString t2=l.toString("hh:mm:ss.zzz"); - QString scale; - QString fps; + TQString t2=l.toString("hh:mm:ss.zzz"); + TQString scale; + TQString fps; switch (m_format) { case PAL: scale="720:576"; @@ -244,18 +244,18 @@ void k9NewDVD::createMencoderCmd(QString &_cmd,QString &_chapters, k9AviFile *_a break; } - k9Process *process=m_processList->addProcess(i18n("Encoding %1").arg(_aviFile->getFileName())); + k9Process *process=m_processList->addProcess(i18n("Encoding %1").tqarg(_aviFile->getFileName())); m_processList->setFileName(process,_aviFile->getFileName()); - QTime t(0,0); + TQTime t(0,0); t.start(); m_timers[process]=t; - connect(process, SIGNAL(receivedStdout(KProcess *, char *, int)),this, SLOT(getStdout(KProcess *, char *, int) )); + connect(process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),this, TQT_SLOT(getStdout(KProcess *, char *, int) )); //m_progress->setTitle(i18n("Encoding file")); //m_process->clearArguments(); *process << "mencoder" << "-oac" << "lavc" << "-ovc" << "lavc" << "-of" << "mpeg" <<"-afm" <<"libmad"; *process << "-mpegopts" << "format=dvd" << "-vf" << "scale="+scale+",harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000"; - *process << "-lavcopts" << QString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").arg(m_videoBitrate).arg(m_config->getPrefAudioBitrate()).arg(m_config->getPrefAudioFormat().lower()); + *process << "-lavcopts" << TQString("vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=%1:keyint=15:acodec=%3:abitrate=%2:aspect=16/9").tqarg(m_videoBitrate).tqarg(m_config->getPrefAudioBitrate()).tqarg(m_config->getPrefAudioFormat().lower()); *process << "-ofps" << fps << "-o" << fileName << "-ss" << t1 << "-endpos" << t2 << _aviFile->getFileName(); qDebug(process->debug()); /* @@ -273,16 +273,16 @@ void k9NewDVD::createMencoderCmd(QString &_cmd,QString &_chapters, k9AviFile *_a } void k9NewDVD::getStderr(KProcess *_process, char *_buffer, int _length) { - QCString tmp(_buffer,_length); + TQCString tmp(_buffer,_length); m_stdout=tmp; int pos; - if (tmp.contains("STAT:")) { - pos=tmp.find("fixing VOBU"); + if (tmp.tqcontains("STAT:")) { + pos=tmp.tqfind("fixing VOBU"); if (pos!=-1) { - QString tmp2=tmp; + TQString tmp2=tmp; // m_progress->setTitle(i18n("Authoring")); // m_progress->setLabelText(i18n("Fixing VOBUS")); - int end=tmp2.find("%"); + int end=tmp2.tqfind("%"); if (end!=-1) { pos =end -2; tmp2=tmp2.mid(pos,end-pos); @@ -290,9 +290,9 @@ void k9NewDVD::getStderr(KProcess *_process, char *_buffer, int _length) { // m_progress->setProgress(tmp2.toInt(),100); } } else { - pos=tmp.find("STAT: VOBU "); + pos=tmp.tqfind("STAT: VOBU "); if (pos !=-1) { - QCString tmp2(_buffer+pos,_length-pos); + TQCString tmp2(_buffer+pos,_length-pos); int vobu,mb; sscanf(tmp2.data(),"STAT: VOBU %d at %dMB",&vobu,&mb); if (mb 500) { - QCString tmp(_buffer,_length); - int pos=tmp.find("Pos:"); + TQCString tmp(_buffer,_length); + int pos=tmp.tqfind("Pos:"); if (pos!=-1) { - QString tmp2=tmp.mid(pos); - tmp2=tmp2.replace(":",": ").replace("(","").replace(")","").simplifyWhiteSpace(); - QStringList sl=QStringList::split(" ",tmp2); + TQString tmp2=tmp.mid(pos); + tmp2=tmp2.tqreplace(":",": ").tqreplace("(","").tqreplace(")","").simplifyWhiteSpace(); + TQStringList sl=TQStringList::split(" ",tmp2); float position; sscanf(sl[1].latin1(),"%fs",&position); int frame; @@ -331,17 +331,17 @@ void k9NewDVD::getStdout(KProcess *_process, char *_buffer, int _length) { // if (percent>0 &&m_timer3.elapsed() >1000 ) { if (percent>0 ) { int elapsed=process->getElapsed(); - QTime time2(0,0); + TQTime time2(0,0); time2=time2.addMSecs(elapsed); - QTime time3(0,0); + TQTime time3(0,0); float fprc=percent/100.0; time3=time3.addMSecs((uint32_t)(elapsed*(1.0/fprc))); m_processList->setText(process,time2.toString("hh:mm:ss") +" / " + time3.toString("hh:mm:ss"),1); m_timer3.restart(); } - QString text;//=i18n("filename") + " : " + m_aviDecode.getFileName(); - text=i18n("fps")+ " : "+QString::number(fps); + TQString text;//=i18n("filename") + " : " + m_aviDecode.getFileName(); + text=i18n("fps")+ " : "+TQString::number(fps); m_processList->setText(process,text,2); /* m_progress->setLabelText(text); @@ -365,9 +365,9 @@ void k9NewDVD::appendTitle(k9Title *_title) { k9MenuButton *btn=m_rootMenu->addButton(); _title->setButton(btn); btn->setNum(_title->getNum()+1); - QPixmap px(m_config->getPrefButtonWidth(),m_config->getPrefButtonHeight()); - px.fill(Qt::black); - QImage img=px.convertToImage(); + TQPixmap px(m_config->getPrefButtonWidth(),m_config->getPrefButtonHeight()); + px.fill(TQt::black); + TQImage img=px.convertToImage(); btn->setImage(img); int nbColumn=(720-50)/(m_config->getPrefButtonWidth()+50); int top=(int) _title->getNum()/nbColumn ; @@ -376,15 +376,15 @@ void k9NewDVD::appendTitle(k9Title *_title) { btn->setLeft(left*(m_config->getPrefButtonWidth()+50) +50); btn->setWidth(m_config->getPrefButtonWidth()); btn->setHeight(m_config->getPrefButtonHeight()); - btn->setScript(QString("g1=0;jump titleset %1 menu;").arg(_title->getNum()+1)); + btn->setScript(TQString("g1=0;jump titleset %1 menu;").tqarg(_title->getNum()+1)); btn->setTextPosition(k9MenuButton::RIGHT); - btn->setText(i18n("title %1").arg(_title->getNum()+1)); + btn->setText(i18n("title %1").tqarg(_title->getNum()+1)); btn->setColor(m_config->getPrefButtonTextColor()); btn->setFont(m_config->getPrefButtonFont()); - QString script="\n"; + TQString script="\n"; for (k9Title *t = m_titles.first();t;t=m_titles.next()) { - script +=QString("if (g6== %1) { g6=0; jump titleset %2 menu;}\n").arg(t->getNum()+1).arg(t->getNum()+1); + script +=TQString("if (g6== %1) { g6=0; jump titleset %2 menu;}\n").tqarg(t->getNum()+1).tqarg(t->getNum()+1); } m_rootMenu->setStartScript2(script); emit sigAddTitle(); @@ -420,7 +420,7 @@ void k9NewDVD::calcVideoBitrate() { double sec=(double)length/1000.0; // m_videoBitrate=(int)( (size * 8388.608)/sec - 192); m_videoBitrate=8*((size*1024 - (m_config->getPrefAudioBitrate() * sec/8))/sec); - m_videoBitrate=QMIN(m_videoBitrate,9800); + m_videoBitrate=TQMIN(m_videoBitrate,9800); } int k9NewDVD::getTotalTime() { @@ -434,6 +434,6 @@ int k9NewDVD::getTotalTime() { return total; } -QString k9NewDVD::getError() const { +TQString k9NewDVD::getError() const { return m_error; } diff --git a/k9author/k9newdvd.h b/k9author/k9newdvd.h index bc56b95..ce7e729 100644 --- a/k9author/k9newdvd.h +++ b/k9author/k9newdvd.h @@ -13,10 +13,10 @@ #define K9NEWDVD_H #include "k9common.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "k9process.h" #include "k9progress.h" #include "k9avidecode.h" @@ -30,16 +30,17 @@ class k9Title; class k9AviFile; class k9Menu; class k9ProcessList; -class k9NewDVDItems : public QPtrList { +class k9NewDVDItems : public TQPtrList { protected: - virtual int compareItems ( QPtrCollection::Item item1,QPtrCollection::Item item2 ); + virtual int compareItems ( TQPtrCollection::Item item1,TQPtrCollection::Item item2 ); }; -class k9NewDVD : public QObject { +class k9NewDVD : public TQObject { Q_OBJECT + TQ_OBJECT public: enum eFormat {NTSC=2,PAL=1}; - k9NewDVD ( QObject *parent = 0, const char *name = 0 ); + k9NewDVD ( TQObject *tqparent = 0, const char *name = 0 ); ~k9NewDVD(); k9NewDVDItems* getTitles() { return &m_titles; @@ -48,10 +49,10 @@ public: void execute(); void createXML(); - void addTitles ( QDomElement &_root ); + void addTitles ( TQDomElement &_root ); void setFormat ( const eFormat& _value ); - void setWorkDir ( const QString& _value ); + void setWorkDir ( const TQString& _value ); void appendTitle ( k9Title *_title ); void setProcessList(k9ProcessList *_value); @@ -60,34 +61,34 @@ public: int getTotalTime(); k9Menu* getRootMenu() const; - QString getError() const; + TQString getError() const; private: k9NewDVDItems m_titles; - QStringList m_tmpFiles; - QDomDocument *m_xml; - QString m_workDir; + TQStringList m_tmpFiles; + TQDomDocument *m_xml; + TQString m_workDir; k9ProcessList *m_processList; - QTime m_timer; - QTime m_timer2; - QTime m_timer3; + TQTime m_timer; + TQTime m_timer2; + TQTime m_timer3; k9Menu *m_rootMenu; bool m_cancel; - QString m_error; - QString m_stdout; + TQString m_error; + TQString m_stdout; int m_videoBitrate; k9AviDecode m_aviDecode; int m_totalEncodedSize; int m_offset; int m_lastvalue; - QMap m_timers; + TQMap m_timers; void calcVideoBitrate(); - void createMencoderCmd ( QString &_cmd,QString &_chapters, k9AviFile *_aviFile ); + void createMencoderCmd ( TQString &_cmd,TQString &_chapters, k9AviFile *_aviFile ); k9Config *m_config; protected slots: void getStdout ( KProcess *, char *, int ); void getStderr ( KProcess *, char *, int ); - void drawImage ( QImage * _image ); + void drawImage ( TQImage * _image ); signals: void sigAddTitle(); }; diff --git a/k9author/k9newtitle.cpp b/k9author/k9newtitle.cpp index a229812..81faf3a 100644 --- a/k9author/k9newtitle.cpp +++ b/k9author/k9newtitle.cpp @@ -13,7 +13,7 @@ #include "k9newtitle.h" #include "k9import.h" -#include +#include #include #include #include @@ -23,8 +23,8 @@ #include "kpushbutton.h" #include #include -k9NewTitle::k9NewTitle(QWidget* parent, const char* name, WFlags fl) - : newTitle(parent,name,fl) { +k9NewTitle::k9NewTitle(TQWidget* tqparent, const char* name, WFlags fl) + : newTitle(tqparent,name,fl) { m_fileName=""; } @@ -32,19 +32,19 @@ k9NewTitle::~k9NewTitle() {} /*$SPECIALIZATION$*/ -void k9NewTitle::fileSelected(const QString &_fileName) { +void k9NewTitle::fileSelected(const TQString &_fileName) { m_fileName=_fileName; k9AviDecode fileInfo(0,0); fileInfo.open(m_fileName); double duration=fileInfo.getDuration(); fileInfo.close(); - QTime t(0,0,0); + TQTime t(0,0,0); t=t.addSecs(duration); lTotalTime->setText(t.toString("hh:mm:ss")); bAdd->setEnabled(true); } -void k9NewTitle::drawImage (QImage *_image) { +void k9NewTitle::drawImage (TQImage *_image) { m_image=*_image; } @@ -60,24 +60,24 @@ void k9NewTitle::bAddClicked() { k9LvItemImport * item=new k9LvItemImport(m_k9Import->getRoot(),k9LvItemImport::TITLE); item->setOpen(true); k9Title *title=new k9Title( m_k9Import->getNewDVD()); - item->setText(0,i18n("title %1").arg(title->getNum() +1)); + item->setText(0,i18n("title %1").tqarg(title->getNum() +1)); - connect( title->getButton(),SIGNAL(sigsetImage(k9MenuButton*, const QImage&)),m_k9Import,SLOT(buttonUpdated(k9MenuButton*, const QImage&))); + connect( title->getButton(),TQT_SIGNAL(sigsetImage(k9MenuButton*, const TQImage&)),m_k9Import,TQT_SLOT(buttonUpdated(k9MenuButton*, const TQImage&))); item->setTitle(title); - connect(&fileInfo,SIGNAL(drawFrame(QImage*)),this,SLOT(drawImage(QImage*))); + connect(&fileInfo,TQT_SIGNAL(drawFrame(TQImage*)),this,TQT_SLOT(drawImage(TQImage*))); - QTime t; - m_k9Import->getRoot()->listView()->setColumnWidthMode(0,QListView::Maximum); + TQTime t; + m_k9Import->getRoot()->listView()->setColumnWidthMode(0,TQListView::Maximum); item->setText(1,t.addSecs(fileInfo.getDuration()).toString("hh:mm:ss")); double increment; int maxCh; if (rbLength->isOn()) { - QTime t; + TQTime t; increment=t.secsTo(twLength->time()); maxCh=999; } @@ -112,14 +112,14 @@ void k9NewTitle::bAddClicked() { file->setFileName(m_fileName); file->setStart(t.addMSecs(pos*1000)); pos+=increment; - file->setEnd(t.addMSecs(QMIN(pos,fileInfo.getDuration()) *1000)); + file->setEnd(t.addMSecs(TQMIN(pos,fileInfo.getDuration()) *1000)); k9LvItemImport * itemch=new k9LvItemImport(item,k9LvItemImport::CHAPTER); - itemch->setText(0,i18n("chapter %1").arg(i+1)); + itemch->setText(0,i18n("chapter %1").tqarg(i+1)); itemch->setText(1,file->getStart().toString("hh:mm:ss") +" - "+file->getEnd().toString("hh:mm:ss") ); itemch->setAviFile(file); itemch->setTitle(title); - itemch->setPixmap(0,QPixmap(m_image.smoothScale(50,40))); - connect(file,SIGNAL(aviFileUpdated(k9AviFile*)),m_k9Import,SLOT(aviFileUpdated(k9AviFile*))); + itemch->setPixmap(0,TQPixmap(m_image.smoothScale(50,40))); + connect(file,TQT_SIGNAL(aviFileUpdated(k9AviFile*)),m_k9Import,TQT_SLOT(aviFileUpdated(k9AviFile*))); k9MenuButton *btn=title->getMenu()->addButton(); btn->setNum(i+1); @@ -134,12 +134,12 @@ void k9NewTitle::bAddClicked() { btn->setLeft(left); btn->setWidth(width); btn->setHeight(height); - btn->setScript(QString("jump title 1 chapter %1 ;").arg(i+1)); + btn->setScript(TQString("jump title 1 chapter %1 ;").tqarg(i+1)); btn->setTextPosition(k9MenuButton::BOTTOM); - btn->setText(i18n("chapter %1").arg(i+1)); + btn->setText(i18n("chapter %1").tqarg(i+1)); btn->setColor(config.getPrefButtonTextColor()); btn->setFont(config.getPrefButtonFont()); - connect(file,SIGNAL(imageChanged(const QImage&)),btn,SLOT(setImage(const QImage&))); + connect(file,TQT_SIGNAL(imageChanged(const TQImage&)),btn,TQT_SLOT(setImage(const TQImage&))); } title->getMenu()->setEndScript("call vmgm menu;"); diff --git a/k9author/k9newtitle.h b/k9author/k9newtitle.h index 8df44f3..2b24d02 100644 --- a/k9author/k9newtitle.h +++ b/k9author/k9newtitle.h @@ -16,18 +16,19 @@ #include "k9common.h" #include "../k9author/newTitle.h" #include "k9lvitemimport.h" -#include +#include class k9Import; class k9NewTitle : public newTitle { Q_OBJECT + TQ_OBJECT private: k9Import *m_k9Import; - QString m_fileName; - QImage m_image; + TQString m_fileName; + TQImage m_image; public: - k9NewTitle(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9NewTitle(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9NewTitle(); void setK9Import ( k9Import* _value ); @@ -41,11 +42,11 @@ protected: protected slots: /*$PROTECTED_SLOTS$*/ - virtual void fileSelected(const QString &); + virtual void fileSelected(const TQString &); virtual void bAddClicked(); virtual void rbNumberClicked(); virtual void rbLengthClicked(); - virtual void drawImage (QImage *_image); + virtual void drawImage (TQImage *_image); }; #endif diff --git a/k9author/k9title.cpp b/k9author/k9title.cpp index d2603e5..47d4563 100644 --- a/k9author/k9title.cpp +++ b/k9author/k9title.cpp @@ -13,13 +13,13 @@ #include "k9newdvd.h" #include "k9menu.h" -k9Title::k9Title(k9NewDVD *parent, const char *name) - : QObject(parent, name) +k9Title::k9Title(k9NewDVD *tqparent, const char *name) + : TQObject(tqparent, name) { - m_num=parent->getTitles()->count(); - parent->appendTitle(this); + m_num=tqparent->getTitles()->count(); + tqparent->appendTitle(this); m_menu=new k9Menu(this,0); - m_menu->setFormat((k9Menu::eFormat)parent->getFormat()); + m_menu->setFormat((k9Menu::eFormat)tqparent->getFormat()); } @@ -27,7 +27,7 @@ k9Title::~k9Title() { } -int k9TitleItems::compareItems(QPtrCollection::Item item1,QPtrCollection::Item item2) { +int k9TitleItems::compareItems(TQPtrCollection::Item item1,TQPtrCollection::Item item2) { k9AviFile *i1,*i2; i1=(k9AviFile*) item1; i2=(k9AviFile*) item2; diff --git a/k9author/k9title.h b/k9author/k9title.h index 8828a7d..f28677f 100644 --- a/k9author/k9title.h +++ b/k9author/k9title.h @@ -13,8 +13,8 @@ #define K9TITLE_H #include "k9common.h" -#include -#include +#include +#include #include "k9avifile.h" #include "k9menubutton.h" /** @@ -23,15 +23,16 @@ class k9NewDVD; class k9Menu; -class k9TitleItems : public QPtrList { +class k9TitleItems : public TQPtrList { protected: - virtual int compareItems(QPtrCollection::Item item1,QPtrCollection::Item item2); + virtual int compareItems(TQPtrCollection::Item item1,TQPtrCollection::Item item2); }; -class k9Title : public QObject { +class k9Title : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9Title(k9NewDVD *parent = 0, const char *name = 0); + k9Title(k9NewDVD *tqparent = 0, const char *name = 0); ~k9Title(); k9TitleItems *getFiles(); diff --git a/k9author/menuEdit.cpp b/k9author/menuEdit.cpp index db313d2..d9a74c4 100644 --- a/k9author/menuEdit.cpp +++ b/k9author/menuEdit.cpp @@ -9,40 +9,40 @@ #include "menuEdit.h" -#include -#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "kurlrequester.h" #include "klineedit.h" #include "kpushbutton.h" #include "kcolorbutton.h" /* - * Constructs a menuEdit as a child of 'parent', with the + * Constructs a menuEdit as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -menuEdit::menuEdit( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +menuEdit::menuEdit( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "menuEdit" ); - menuEditLayout = new QGridLayout( this, 1, 1, 2, 6, "menuEditLayout"); + menuEditLayout = new TQGridLayout( this, 1, 1, 2, 6, "menuEditLayout"); - textLabel2 = new QLabel( this, "textLabel2" ); - textLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) ); + textLabel2 = new TQLabel( this, "textLabel2" ); + textLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) ); menuEditLayout->addMultiCellWidget( textLabel2, 5, 6, 0, 0 ); - textLabel1 = new QLabel( this, "textLabel1" ); - textLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + textLabel1 = new TQLabel( this, "textLabel1" ); + textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); menuEditLayout->addWidget( textLabel1, 4, 0 ); @@ -51,76 +51,76 @@ menuEdit::menuEdit( QWidget* parent, const char* name, WFlags fl ) menuEditLayout->addMultiCellWidget( urBackground, 4, 4, 1, 5 ); cbColor = new KColorButton( this, "cbColor" ); - cbColor->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, cbColor->sizePolicy().hasHeightForWidth() ) ); + cbColor->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbColor->sizePolicy().hasHeightForWidth() ) ); menuEditLayout->addWidget( cbColor, 6, 1 ); bFont = new KPushButton( this, "bFont" ); - bFont->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bFont->sizePolicy().hasHeightForWidth() ) ); + bFont->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bFont->sizePolicy().hasHeightForWidth() ) ); menuEditLayout->addWidget( bFont, 6, 2 ); - cbPosTitle = new QComboBox( FALSE, this, "cbPosTitle" ); - cbPosTitle->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, cbPosTitle->sizePolicy().hasHeightForWidth() ) ); + cbPosTitle = new TQComboBox( FALSE, this, "cbPosTitle" ); + cbPosTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbPosTitle->sizePolicy().hasHeightForWidth() ) ); menuEditLayout->addWidget( cbPosTitle, 6, 3 ); - spacer1 = new QSpacerItem( 51, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1 = new TQSpacerItem( 51, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); menuEditLayout->addMultiCell( spacer1, 6, 6, 4, 5 ); - leTitle = new QLineEdit( this, "leTitle" ); + leTitle = new TQLineEdit( this, "leTitle" ); menuEditLayout->addMultiCellWidget( leTitle, 5, 5, 1, 4 ); bAddText = new KPushButton( this, "bAddText" ); - bAddText->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)4, (QSizePolicy::SizeType)4, 0, 0, bAddText->sizePolicy().hasHeightForWidth() ) ); - bAddText->setMinimumSize( QSize( 24, 24 ) ); - bAddText->setMaximumSize( QSize( 24, 24 ) ); + bAddText->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)4, 0, 0, bAddText->sizePolicy().hasHeightForWidth() ) ); + bAddText->setMinimumSize( TQSize( 24, 24 ) ); + bAddText->setMaximumSize( TQSize( 24, 24 ) ); menuEditLayout->addWidget( bAddText, 5, 5 ); - lTitle = new QLabel( this, "lTitle" ); - lTitle->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, lTitle->sizePolicy().hasHeightForWidth() ) ); - QFont lTitle_font( lTitle->font() ); + lTitle = new TQLabel( this, "lTitle" ); + lTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, lTitle->sizePolicy().hasHeightForWidth() ) ); + TQFont lTitle_font( lTitle->font() ); lTitle_font.setBold( TRUE ); lTitle->setFont( lTitle_font ); menuEditLayout->addMultiCellWidget( lTitle, 0, 0, 0, 5 ); - textLabel1_2 = new QLabel( this, "textLabel1_2" ); + textLabel1_2 = new TQLabel( this, "textLabel1_2" ); menuEditLayout->addWidget( textLabel1_2, 2, 0 ); - cbStart = new QComboBox( FALSE, this, "cbStart" ); + cbStart = new TQComboBox( FALSE, this, "cbStart" ); menuEditLayout->addMultiCellWidget( cbStart, 2, 2, 1, 5 ); - textLabel1_2_2 = new QLabel( this, "textLabel1_2_2" ); + textLabel1_2_2 = new TQLabel( this, "textLabel1_2_2" ); menuEditLayout->addWidget( textLabel1_2_2, 3, 0 ); - cbEnd = new QComboBox( FALSE, this, "cbEnd" ); + cbEnd = new TQComboBox( FALSE, this, "cbEnd" ); menuEditLayout->addMultiCellWidget( cbEnd, 3, 3, 1, 5 ); - frame = new QFrame( this, "frame" ); - frame->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, frame->sizePolicy().hasHeightForWidth() ) ); - frame->setFrameShape( QFrame::StyledPanel ); - frame->setFrameShadow( QFrame::Raised ); + frame = new TQFrame( this, "frame" ); + frame->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, frame->sizePolicy().hasHeightForWidth() ) ); + frame->setFrameShape( TQFrame::StyledPanel ); + frame->setFrameShadow( TQFrame::Raised ); menuEditLayout->addMultiCellWidget( frame, 1, 1, 0, 5 ); languageChange(); - resize( QSize(576, 682).expandedTo(minimumSizeHint()) ); + resize( TQSize(576, 682).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bFont, SIGNAL( clicked() ), this, SLOT( bFontClick() ) ); - connect( urBackground, SIGNAL( urlSelected(const QString&) ), this, SLOT( urBackgroundSelected(const QString&) ) ); - connect( cbColor, SIGNAL( changed(const QColor&) ), this, SLOT( cbColorChanged(const QColor&) ) ); - connect( leTitle, SIGNAL( textChanged(const QString&) ), this, SLOT( leTitleChanged(const QString&) ) ); - connect( cbPosTitle, SIGNAL( activated(int) ), this, SLOT( cbPosTitleActivated(int) ) ); - connect( bAddText, SIGNAL( clicked() ), this, SLOT( bAddTextClick() ) ); - connect( cbStart, SIGNAL( activated(int) ), this, SLOT( cbStartActivated(int) ) ); - connect( cbEnd, SIGNAL( activated(int) ), this, SLOT( cbEndActivated(int) ) ); + connect( bFont, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bFontClick() ) ); + connect( urBackground, TQT_SIGNAL( urlSelected(const TQString&) ), this, TQT_SLOT( urBackgroundSelected(const TQString&) ) ); + connect( cbColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT( cbColorChanged(const TQColor&) ) ); + connect( leTitle, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( leTitleChanged(const TQString&) ) ); + connect( cbPosTitle, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbPosTitleActivated(int) ) ); + connect( bAddText, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bAddTextClick() ) ); + connect( cbStart, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbStartActivated(int) ) ); + connect( cbEnd, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbEndActivated(int) ) ); // tab order setTabOrder( cbStart, cbEnd ); @@ -137,7 +137,7 @@ menuEdit::menuEdit( QWidget* parent, const char* name, WFlags fl ) */ menuEdit::~menuEdit() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -149,13 +149,13 @@ void menuEdit::languageChange() setCaption( tr2i18n( "Edit Menu" ) ); textLabel2->setText( tr2i18n( "Text" ) ); textLabel1->setText( tr2i18n( "Background picture" ) ); - cbColor->setText( QString::null ); + cbColor->setText( TQString() ); bFont->setText( tr2i18n( "Font" ) ); cbPosTitle->clear(); cbPosTitle->insertItem( tr2i18n( "Bottom" ) ); cbPosTitle->insertItem( tr2i18n( "Right" ) ); - bAddText->setText( QString::null ); - bAddText->setAccel( QKeySequence( QString::null ) ); + bAddText->setText( TQString() ); + bAddText->setAccel( TQKeySequence( TQString() ) ); lTitle->setText( tr2i18n( "Root Menu" ) ); textLabel1_2->setText( tr2i18n( "At start" ) ); cbStart->clear(); @@ -173,19 +173,19 @@ void menuEdit::bFontClick() qWarning( "menuEdit::bFontClick(): Not implemented yet" ); } -void menuEdit::urBackgroundSelected(const QString&) +void menuEdit::urBackgroundSelected(const TQString&) { - qWarning( "menuEdit::urBackgroundSelected(const QString&): Not implemented yet" ); + qWarning( "menuEdit::urBackgroundSelected(const TQString&): Not implemented yet" ); } -void menuEdit::cbColorChanged(const QColor&) +void menuEdit::cbColorChanged(const TQColor&) { - qWarning( "menuEdit::cbColorChanged(const QColor&): Not implemented yet" ); + qWarning( "menuEdit::cbColorChanged(const TQColor&): Not implemented yet" ); } -void menuEdit::leTitleChanged(const QString&) +void menuEdit::leTitleChanged(const TQString&) { - qWarning( "menuEdit::leTitleChanged(const QString&): Not implemented yet" ); + qWarning( "menuEdit::leTitleChanged(const TQString&): Not implemented yet" ); } void menuEdit::cbPosTitleActivated(int) diff --git a/k9author/menuEdit.ui b/k9author/menuEdit.ui index 02c0776..f844871 100644 --- a/k9author/menuEdit.ui +++ b/k9author/menuEdit.ui @@ -1,10 +1,10 @@ menuEdit - + menuEdit - + 0 0 @@ -22,7 +22,7 @@ 2 - + textLabel2 @@ -38,7 +38,7 @@ Text - + textLabel1 @@ -91,7 +91,7 @@ Font - + Bottom @@ -124,14 +124,14 @@ Expanding - + 51 20 - + leTitle @@ -148,13 +148,13 @@ 0 - + 24 24 - + 24 24 @@ -167,7 +167,7 @@ - + lTitle @@ -188,7 +188,7 @@ Root Menu - + textLabel1_2 @@ -196,7 +196,7 @@ At start - + Play menu @@ -211,7 +211,7 @@ cbStart - + textLabel1_2_2 @@ -219,7 +219,7 @@ At End - + Play root menu @@ -239,7 +239,7 @@ cbEnd - + frame @@ -269,21 +269,21 @@ urBackground - urlSelected(const QString&) + urlSelected(const TQString&) menuEdit - urBackgroundSelected(const QString&) + urBackgroundSelected(const TQString&) cbColor - changed(const QColor&) + changed(const TQColor&) menuEdit - cbColorChanged(const QColor&) + cbColorChanged(const TQColor&) leTitle - textChanged(const QString&) + textChanged(const TQString&) menuEdit - leTitleChanged(const QString&) + leTitleChanged(const TQString&) cbPosTitle @@ -320,17 +320,17 @@ bFont cbPosTitle - + bFontClick() - urBackgroundSelected(const QString &) - cbColorChanged(const QColor&) - leTitleChanged(const QString &) + urBackgroundSelected(const TQString &) + cbColorChanged(const TQColor&) + leTitleChanged(const TQString &) cbPosTitleActivated(int) bAddTextClick() cbStartActivated(int) cbEndActivated(int) - - + + kurlrequester.h klineedit.h diff --git a/k9author/newTitle.cpp b/k9author/newTitle.cpp index 25786de..e838b01 100644 --- a/k9author/newTitle.cpp +++ b/k9author/newTitle.cpp @@ -9,18 +9,18 @@ #include "newTitle.h" -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include "knuminput.h" #include "ktimewidget.h" #include "kpushbutton.h" @@ -28,26 +28,26 @@ #include "klineedit.h" /* - * Constructs a newTitle as a child of 'parent', with the + * Constructs a newTitle as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -newTitle::newTitle( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +newTitle::newTitle( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "newTitle" ); - newTitleLayout = new QGridLayout( this, 1, 1, 11, 6, "newTitleLayout"); + newTitleLayout = new TQGridLayout( this, 1, 1, 11, 6, "newTitleLayout"); - buttonGroup1 = new QButtonGroup( this, "buttonGroup1" ); - buttonGroup1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) ); + buttonGroup1 = new TQButtonGroup( this, "buttonGroup1" ); + buttonGroup1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->layout()->setSpacing( 6 ); - buttonGroup1->layout()->setMargin( 11 ); - buttonGroup1Layout = new QGridLayout( buttonGroup1->layout() ); - buttonGroup1Layout->setAlignment( Qt::AlignTop ); + buttonGroup1->tqlayout()->setSpacing( 6 ); + buttonGroup1->tqlayout()->setMargin( 11 ); + buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() ); + buttonGroup1Layout->tqsetAlignment( TQt::AlignTop ); nbChapters = new KIntNumInput( buttonGroup1, "nbChapters" ); - nbChapters->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, nbChapters->sizePolicy().hasHeightForWidth() ) ); + nbChapters->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, nbChapters->sizePolicy().hasHeightForWidth() ) ); nbChapters->setMinValue( 1 ); nbChapters->setMaxValue( 99 ); @@ -55,60 +55,60 @@ newTitle::newTitle( QWidget* parent, const char* name, WFlags fl ) twLength = new KTimeWidget( buttonGroup1, "twLength" ); twLength->setEnabled( FALSE ); - twLength->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, twLength->sizePolicy().hasHeightForWidth() ) ); + twLength->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, twLength->sizePolicy().hasHeightForWidth() ) ); buttonGroup1Layout->addWidget( twLength, 1, 1 ); - rbNumber = new QRadioButton( buttonGroup1, "rbNumber" ); + rbNumber = new TQRadioButton( buttonGroup1, "rbNumber" ); rbNumber->setChecked( TRUE ); buttonGroup1Layout->addWidget( rbNumber, 0, 0 ); - rbLength = new QRadioButton( buttonGroup1, "rbLength" ); + rbLength = new TQRadioButton( buttonGroup1, "rbLength" ); buttonGroup1Layout->addWidget( rbLength, 1, 0 ); - spacer1 = new QSpacerItem( 131, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1 = new TQSpacerItem( 131, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); buttonGroup1Layout->addMultiCell( spacer1, 0, 1, 2, 2 ); newTitleLayout->addMultiCellWidget( buttonGroup1, 1, 1, 0, 1 ); - spacer3 = new QSpacerItem( 21, 16, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer3 = new TQSpacerItem( 21, 16, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); newTitleLayout->addItem( spacer3, 3, 0 ); - spacer4 = new QSpacerItem( 16, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer4 = new TQSpacerItem( 16, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); newTitleLayout->addItem( spacer4, 1, 2 ); bAdd = new KPushButton( this, "bAdd" ); bAdd->setEnabled( FALSE ); - bAdd->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) ); + bAdd->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) ); bAdd->setProperty( "stdItem", 27 ); newTitleLayout->addWidget( bAdd, 2, 1 ); - spacer2 = new QSpacerItem( 470, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer2 = new TQSpacerItem( 470, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); newTitleLayout->addItem( spacer2, 2, 0 ); - layout1 = new QHBoxLayout( 0, 0, 6, "layout1"); + tqlayout1 = new TQHBoxLayout( 0, 0, 6, "tqlayout1"); - textLabel1 = new QLabel( this, "textLabel1" ); - textLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); - layout1->addWidget( textLabel1 ); + textLabel1 = new TQLabel( this, "textLabel1" ); + textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + tqlayout1->addWidget( textLabel1 ); urFile = new KURLRequester( this, "urFile" ); urFile->setMode( 25 ); - layout1->addWidget( urFile ); + tqlayout1->addWidget( urFile ); - lTotalTime = new QLabel( this, "lTotalTime" ); - lTotalTime->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, lTotalTime->sizePolicy().hasHeightForWidth() ) ); - layout1->addWidget( lTotalTime ); + lTotalTime = new TQLabel( this, "lTotalTime" ); + lTotalTime->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, lTotalTime->sizePolicy().hasHeightForWidth() ) ); + tqlayout1->addWidget( lTotalTime ); - newTitleLayout->addMultiCellLayout( layout1, 0, 0, 0, 1 ); + newTitleLayout->addMultiCellLayout( tqlayout1, 0, 0, 0, 1 ); languageChange(); - resize( QSize(605, 171).expandedTo(minimumSizeHint()) ); + resize( TQSize(605, 171).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( urFile, SIGNAL( urlSelected(const QString&) ), this, SLOT( fileSelected(const QString&) ) ); - connect( rbNumber, SIGNAL( clicked() ), this, SLOT( rbNumberClicked() ) ); - connect( rbLength, SIGNAL( clicked() ), this, SLOT( rbLengthClicked() ) ); - connect( bAdd, SIGNAL( clicked() ), this, SLOT( bAddClicked() ) ); + connect( urFile, TQT_SIGNAL( urlSelected(const TQString&) ), this, TQT_SLOT( fileSelected(const TQString&) ) ); + connect( rbNumber, TQT_SIGNAL( clicked() ), this, TQT_SLOT( rbNumberClicked() ) ); + connect( rbLength, TQT_SIGNAL( clicked() ), this, TQT_SLOT( rbLengthClicked() ) ); + connect( bAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bAddClicked() ) ); } /* @@ -116,7 +116,7 @@ newTitle::newTitle( QWidget* parent, const char* name, WFlags fl ) */ newTitle::~newTitle() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -126,18 +126,18 @@ newTitle::~newTitle() void newTitle::languageChange() { setCaption( tr2i18n( "Add title" ) ); - buttonGroup1->setTitle( QString::null ); + buttonGroup1->setTitle( TQString() ); rbNumber->setText( tr2i18n( "number of chapters" ) ); rbLength->setText( tr2i18n( "chapter length" ) ); bAdd->setText( tr2i18n( "Add" ) ); - bAdd->setAccel( QKeySequence( QString::null ) ); + bAdd->setAccel( TQKeySequence( TQString() ) ); textLabel1->setText( tr2i18n( "Video file" ) ); lTotalTime->setText( tr2i18n( "--:--:--" ) ); } -void newTitle::fileSelected(const QString&) +void newTitle::fileSelected(const TQString&) { - qWarning( "newTitle::fileSelected(const QString&): Not implemented yet" ); + qWarning( "newTitle::fileSelected(const TQString&): Not implemented yet" ); } void newTitle::rbNumberClicked() diff --git a/k9author/newTitle.ui b/k9author/newTitle.ui index c68ab88..3787513 100644 --- a/k9author/newTitle.ui +++ b/k9author/newTitle.ui @@ -1,10 +1,10 @@ newTitle - + newTitle - + 0 0 @@ -19,7 +19,7 @@ unnamed - + buttonGroup1 @@ -73,7 +73,7 @@ - + rbNumber @@ -84,7 +84,7 @@ true - + rbLength @@ -102,7 +102,7 @@ Expanding - + 131 21 @@ -121,7 +121,7 @@ Expanding - + 21 16 @@ -138,7 +138,7 @@ Expanding - + 16 20 @@ -180,22 +180,22 @@ Expanding - + 470 20 - + - layout1 + tqlayout1 unnamed - + textLabel1 @@ -219,7 +219,7 @@ 25 - + lTotalTime @@ -242,9 +242,9 @@ urFile - urlSelected(const QString&) + urlSelected(const TQString&) newTitle - fileSelected(const QString&) + fileSelected(const TQString&) rbNumber @@ -265,13 +265,13 @@ bAddClicked() - - fileSelected(const QString&) + + fileSelected(const TQString&) rbNumberClicked() rbLengthClicked() bAddClicked() - - + + knuminput.h knuminput.h diff --git a/k9decmpeg/cpu_accel.cpp b/k9decmpeg/cpu_accel.cpp index 9589868..6af9558 100755 --- a/k9decmpeg/cpu_accel.cpp +++ b/k9decmpeg/cpu_accel.cpp @@ -197,7 +197,7 @@ static inline uint32_t arch_accel (void) { uint64_t no_mvi; - asm volatile ("amask %1, %0" + asm volatile ("atqmask %1, %0" : "=r" (no_mvi) : "rI" (256)); /* AMASK_MVI */ return no_mvi ? MPEG2_ACCEL_ALPHA : (MPEG2_ACCEL_ALPHA | diff --git a/k9decmpeg/header.cpp b/k9decmpeg/header.cpp index 21c347d..e3757c1 100755 --- a/k9decmpeg/header.cpp +++ b/k9decmpeg/header.cpp @@ -33,9 +33,9 @@ #include "attributes.h" #include "mpeg2_internal.h" -#define SEQ_EXT 2 -#define SEQ_DISPLAY_EXT 4 -#define QUANT_MATRIX_EXT 8 +#define SETQ_EXT 2 +#define SETQ_DISPLAY_EXT 4 +#define TQUANT_MATRIX_EXT 8 #define COPYRIGHT_EXT 0x10 #define PIC_DISPLAY_EXT 0x80 #define PIC_CODING_EXT 0x100 @@ -156,8 +156,8 @@ int mpeg2_header_sequence (mpeg2dec_t * mpeg2dec) sequence->chroma_width = sequence->width >> 1; sequence->chroma_height = sequence->height >> 1; - sequence->flags = (SEQ_FLAG_PROGRESSIVE_SEQUENCE | - SEQ_VIDEO_FORMAT_UNSPECIFIED); + sequence->flags = (SETQ_FLAG_PROGRESSIVE_SEQUENCE | + SETQ_VIDEO_FORMAT_UNSPECIFIED); sequence->pixel_width = buffer[3] >> 4; /* aspect ratio */ sequence->frame_period = frame_period[buffer[3] & 15]; @@ -167,7 +167,7 @@ int mpeg2_header_sequence (mpeg2dec_t * mpeg2dec) sequence->vbv_buffer_size = ((buffer[6]<<16)|(buffer[7]<<8))&0x1ff800; if (buffer[7] & 4) - sequence->flags |= SEQ_FLAG_CONSTRAINED_PARAMETERS; + sequence->flags |= SETQ_FLAG_CONSTRAINED_PARAMETERS; mpeg2dec->copy_matrix = 3; if (buffer[7] & 2) { @@ -192,7 +192,7 @@ int mpeg2_header_sequence (mpeg2dec_t * mpeg2dec) sequence->transfer_characteristics = 0; sequence->matrix_coefficients = 0; - mpeg2dec->ext_state = SEQ_EXT; + mpeg2dec->ext_state = SETQ_EXT; mpeg2dec->state = STATE_SEQUENCE; mpeg2dec->display_offset_x = mpeg2dec->display_offset_y = 0; @@ -216,13 +216,13 @@ static int sequence_ext (mpeg2dec_t * mpeg2dec) (buffer[2] << 7) & 0x3000; sequence->width = (sequence->picture_width + 15) & ~15; sequence->height = (sequence->picture_height + 15) & ~15; - flags = sequence->flags | SEQ_FLAG_MPEG2; + flags = sequence->flags | SETQ_FLAG_MPEG2; if (!(buffer[1] & 8)) { - flags &= ~SEQ_FLAG_PROGRESSIVE_SEQUENCE; + flags &= ~SETQ_FLAG_PROGRESSIVE_SEQUENCE; sequence->height = (sequence->height + 31) & ~31; } if (buffer[5] & 0x80) - flags |= SEQ_FLAG_LOW_DELAY; + flags |= SETQ_FLAG_LOW_DELAY; sequence->flags = flags; sequence->chroma_width = sequence->width; sequence->chroma_height = sequence->height; @@ -242,7 +242,7 @@ static int sequence_ext (mpeg2dec_t * mpeg2dec) sequence->frame_period = sequence->frame_period * ((buffer[5]&31)+1) / (((buffer[5]>>2)&3)+1); - mpeg2dec->ext_state = SEQ_DISPLAY_EXT; + mpeg2dec->ext_state = SETQ_DISPLAY_EXT; return 0; } @@ -253,10 +253,10 @@ static int sequence_display_ext (mpeg2dec_t * mpeg2dec) mpeg2_sequence_t * sequence = &(mpeg2dec->new_sequence); uint32_t flags; - flags = ((sequence->flags & ~SEQ_MASK_VIDEO_FORMAT) | - ((buffer[0]<<4) & SEQ_MASK_VIDEO_FORMAT)); + flags = ((sequence->flags & ~SETQ_MASK_VIDEO_FORMAT) | + ((buffer[0]<<4) & SETQ_MASK_VIDEO_FORMAT)); if (buffer[0] & 1) { - flags |= SEQ_FLAG_COLOUR_DESCRIPTION; + flags |= SETQ_FLAG_COLOUR_DESCRIPTION; sequence->colour_primaries = buffer[1]; sequence->transfer_characteristics = buffer[2]; sequence->matrix_coefficients = buffer[3]; @@ -280,7 +280,7 @@ static inline void finalize_sequence (mpeg2_sequence_t * sequence) sequence->byte_rate *= 50; - if (sequence->flags & SEQ_FLAG_MPEG2) { + if (sequence->flags & SETQ_FLAG_MPEG2) { switch (sequence->pixel_width) { case 1: /* square pixels */ sequence->pixel_width = sequence->pixel_height = 1; return; @@ -376,7 +376,7 @@ void mpeg2_header_sequence_finalize (mpeg2dec_t * mpeg2dec) finalize_sequence (sequence); finalize_matrix (mpeg2dec); - decoder->mpeg1 = !(sequence->flags & SEQ_FLAG_MPEG2); + decoder->mpeg1 = !(sequence->flags & SETQ_FLAG_MPEG2); decoder->width = sequence->width; decoder->height = sequence->height; decoder->vertical_position_extension = (sequence->picture_height > 2800); @@ -451,7 +451,7 @@ void mpeg2_set_fbuf (mpeg2dec_t * mpeg2dec, int b_type) mpeg2dec->fbuf[2] != &mpeg2dec->fbuf_alloc[i].fbuf) { mpeg2dec->fbuf[0] = &mpeg2dec->fbuf_alloc[i].fbuf; mpeg2dec->info.current_fbuf = mpeg2dec->fbuf[0]; - if (b_type || (mpeg2dec->sequence.flags & SEQ_FLAG_LOW_DELAY)) { + if (b_type || (mpeg2dec->sequence.flags & SETQ_FLAG_LOW_DELAY)) { if (b_type || mpeg2dec->convert) mpeg2dec->info.discard_fbuf = mpeg2dec->fbuf[0]; mpeg2dec->info.display_fbuf = mpeg2dec->fbuf[0]; @@ -549,7 +549,7 @@ static int picture_coding_ext (mpeg2dec_t * mpeg2dec) picture->nb_fields = 1; break; case FRAME_PICTURE: - if (!(mpeg2dec->sequence.flags & SEQ_FLAG_PROGRESSIVE_SEQUENCE)) { + if (!(mpeg2dec->sequence.flags & SETQ_FLAG_PROGRESSIVE_SEQUENCE)) { picture->nb_fields = (buffer[3] & 2) ? 3 : 2; flags |= (buffer[3] & 128) ? PIC_FLAG_TOP_FIELD_FIRST : 0; } else @@ -570,7 +570,7 @@ static int picture_coding_ext (mpeg2dec_t * mpeg2dec) PIC_MASK_COMPOSITE_DISPLAY) | PIC_FLAG_COMPOSITE_DISPLAY; picture->flags = flags; - mpeg2dec->ext_state = PIC_DISPLAY_EXT | COPYRIGHT_EXT | QUANT_MATRIX_EXT; + mpeg2dec->ext_state = PIC_DISPLAY_EXT | COPYRIGHT_EXT | TQUANT_MATRIX_EXT; return 0; } @@ -582,7 +582,7 @@ static int picture_display_ext (mpeg2dec_t * mpeg2dec) int i, nb_pos; nb_pos = picture->nb_fields; - if (mpeg2dec->sequence.flags & SEQ_FLAG_PROGRESSIVE_SEQUENCE) + if (mpeg2dec->sequence.flags & SETQ_FLAG_PROGRESSIVE_SEQUENCE) nb_pos >>= 1; for (i = 0; i < nb_pos; i++) { @@ -608,7 +608,7 @@ void mpeg2_header_picture_finalize (mpeg2dec_t * mpeg2dec, uint32_t accels) { mpeg2_decoder_t * decoder = &(mpeg2dec->decoder); int old_type_b = (decoder->coding_type == B_TYPE); - int low_delay = mpeg2dec->sequence.flags & SEQ_FLAG_LOW_DELAY; + int low_delay = mpeg2dec->sequence.flags & SETQ_FLAG_LOW_DELAY; finalize_matrix (mpeg2dec); decoder->coding_type = mpeg2dec->new_picture.flags & PIC_MASK_CODING_TYPE; @@ -878,7 +878,7 @@ mpeg2_state_t mpeg2_header_end (mpeg2dec_t * mpeg2dec) picture = mpeg2dec->pictures + 2; mpeg2_reset_info (&(mpeg2dec->info)); - if (!(mpeg2dec->sequence.flags & SEQ_FLAG_LOW_DELAY)) { + if (!(mpeg2dec->sequence.flags & SETQ_FLAG_LOW_DELAY)) { mpeg2dec->info.display_picture = picture; if (picture->nb_fields == 1) mpeg2dec->info.display_picture_2nd = picture + 1; diff --git a/k9decmpeg/idct_alpha.cpp b/k9decmpeg/idct_alpha.cpp index 4f1e88f..7105089 100755 --- a/k9decmpeg/idct_alpha.cpp +++ b/k9decmpeg/idct_alpha.cpp @@ -158,7 +158,7 @@ static void inline idct_col (int16_t * const block) void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride) { - uint64_t clampmask; + uint64_t clamptqmask; int i; for (i = 0; i < 8; i++) @@ -167,18 +167,18 @@ void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride) for (i = 0; i < 8; i++) idct_col (block + i); - clampmask = zap (-1, 0xaa); /* 0x00ff00ff00ff00ff */ + clamptqmask = zap (-1, 0xaa); /* 0x00ff00ff00ff00ff */ do { uint64_t shorts0, shorts1; shorts0 = ldq (block); shorts0 = maxsw4 (shorts0, 0); - shorts0 = minsw4 (shorts0, clampmask); + shorts0 = minsw4 (shorts0, clamptqmask); stl (pkwb (shorts0), dest); shorts1 = ldq (block + 4); shorts1 = maxsw4 (shorts1, 0); - shorts1 = minsw4 (shorts1, clampmask); + shorts1 = minsw4 (shorts1, clamptqmask); stl (pkwb (shorts1), dest + 4); stq (0, block); @@ -192,8 +192,8 @@ void mpeg2_idct_copy_mvi (int16_t * block, uint8_t * dest, const int stride) void mpeg2_idct_add_mvi (const int last, int16_t * block, uint8_t * dest, const int stride) { - uint64_t clampmask; - uint64_t signmask; + uint64_t clamptqmask; + uint64_t signtqmask; int i; if (last != 129 || (block[0] & (7 << 4)) == (4 << 4)) { @@ -201,9 +201,9 @@ void mpeg2_idct_add_mvi (const int last, int16_t * block, idct_row (block + 8 * i); for (i = 0; i < 8; i++) idct_col (block + i); - clampmask = zap (-1, 0xaa); /* 0x00ff00ff00ff00ff */ - signmask = zap (-1, 0x33); - signmask ^= signmask >> 1; /* 0x8000800080008000 */ + clamptqmask = zap (-1, 0xaa); /* 0x00ff00ff00ff00ff */ + signtqmask = zap (-1, 0x33); + signtqmask ^= signtqmask >> 1; /* 0x8000800080008000 */ do { uint64_t shorts0, pix0, signs0; @@ -214,22 +214,22 @@ void mpeg2_idct_add_mvi (const int last, int16_t * block, pix0 = unpkbw (ldl (dest)); /* signed subword add (MMX paddw). */ - signs0 = shorts0 & signmask; - shorts0 &= ~signmask; + signs0 = shorts0 & signtqmask; + shorts0 &= ~signtqmask; shorts0 += pix0; shorts0 ^= signs0; /* clamp. */ shorts0 = maxsw4 (shorts0, 0); - shorts0 = minsw4 (shorts0, clampmask); + shorts0 = minsw4 (shorts0, clamptqmask); /* next 4. */ pix1 = unpkbw (ldl (dest + 4)); - signs1 = shorts1 & signmask; - shorts1 &= ~signmask; + signs1 = shorts1 & signtqmask; + shorts1 &= ~signtqmask; shorts1 += pix1; shorts1 ^= signs1; shorts1 = maxsw4 (shorts1, 0); - shorts1 = minsw4 (shorts1, clampmask); + shorts1 = minsw4 (shorts1, clamptqmask); stl (pkwb (shorts0), dest); stl (pkwb (shorts1), dest + 4); diff --git a/k9decmpeg/k9decodethread.h b/k9decmpeg/k9decodethread.h index b98abb5..1ce1ceb 100644 --- a/k9decmpeg/k9decodethread.h +++ b/k9decmpeg/k9decodethread.h @@ -14,22 +14,22 @@ #include "k9common.h" #include "k9vamps.h" -#include -#include -#include +#include +#include +#include #include "kdecmpeg2.h" /** @author Jean-Michel PETIT */ -class k9DecodeThread : public QThread +class k9DecodeThread : public TQThread { private: kDecMPEG2 *m_decoder; k9fifo m_fifo; - QWaitCondition wDataRead; - QWaitCondition wDataReady; + TQWaitCondition wDataRead; + TQWaitCondition wDataReady; bool noData; public: diff --git a/k9decmpeg/k9plaympeg2.cpp b/k9decmpeg/k9plaympeg2.cpp index cc304a6..f5ff3d7 100644 --- a/k9decmpeg/k9plaympeg2.cpp +++ b/k9decmpeg/k9plaympeg2.cpp @@ -14,7 +14,7 @@ #include "dvdnav.h" #include -#include +#include k9PlayMPEG2::k9PlayMPEG2() { @@ -55,7 +55,7 @@ void k9PlayMPEG2::playTitle() { /* set read ahead cache usage */ if (dvdnav_set_readahead_flag(dvdnav, DVD_READ_CACHE) != DVDNAV_STATUS_OK) { - setError(QString("ERR:Error on dvdnav_set_readahead_flag: %1\n").arg(dvdnav_err_to_string(dvdnav))); + setError(TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); return; } @@ -63,14 +63,14 @@ void k9PlayMPEG2::playTitle() { if (dvdnav_menu_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK || dvdnav_audio_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK || dvdnav_spu_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK) { - setError(QString("ERR:Error on setting languages: %1\n").arg(dvdnav_err_to_string(dvdnav))); + setError(TQString("ERR:Error on setting languages: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); return ; } /* set the PGC positioning flag to have position information relatively to the * whole feature instead of just relatively to the current chapter */ if (dvdnav_set_PGC_positioning_flag(dvdnav, 1) != DVDNAV_STATUS_OK) { - setError(QString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").arg(dvdnav_err_to_string(dvdnav))); + setError(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); return ; } @@ -84,7 +84,7 @@ void k9PlayMPEG2::playTitle() { /* the read loop which regularly calls dvdnav_get_next_block * and handles the returned events */ - while (!finished && !m_stopped && qApp!=NULL) { + while (!finished && !m_stopped && tqApp!=NULL) { int result, event, len; uint8_t *buf = mem; @@ -105,7 +105,7 @@ void k9PlayMPEG2::playTitle() { if (result == DVDNAV_STATUS_ERR) { - setError(QString("ERR:Error getting next block: %1\n").arg(dvdnav_err_to_string(dvdnav))); + setError(TQString("ERR:Error getting next block: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); return; } @@ -121,9 +121,9 @@ void k9PlayMPEG2::playTitle() { if (finished==0 && buf[17]==0xE0) { m_decoder.addData( buf,len); } - if (qApp->tryLock()) { + if (tqApp->tryLock()) { emit setPosition( pos); - qApp->unlock(); + tqApp->unlock(); } @@ -237,12 +237,12 @@ kDecMPEG2 *k9PlayMPEG2::getDecoder() { return m_decoder.getDecoder() ; } -void k9PlayMPEG2::open (dvd_reader_t *dvd,const QString & device,k9DVDTitle * title,int chapter=0) { +void k9PlayMPEG2::open (dvd_reader_t *dvd,const TQString & device,k9DVDTitle * title,int chapter=0) { m_dvd=dvd; m_chapter=chapter; int ret = 0; struct stat dvd_stat; - QString c; + TQString c; m_idxLect=0xFFFFFFFF; stop(); @@ -254,7 +254,7 @@ void k9PlayMPEG2::open (dvd_reader_t *dvd,const QString & device,k9DVDTitle * ti m_lastSector=0; ret = stat(device.utf8(), &dvd_stat); /* if ( ret < 0 ) { - c=i18n("Can't find device %1\n").arg(device.latin1()); + c=i18n("Can't find device %1\n").tqarg(device.latin1()); setError(c); return; } @@ -268,7 +268,7 @@ void k9PlayMPEG2::open (dvd_reader_t *dvd,const QString & device,k9DVDTitle * ti emit setMax( m_lastSector); emit setMin( m_startSector); - m_decoder.start(QThread::LowPriority); + m_decoder.start(TQThread::LowPriority); start(); } diff --git a/k9decmpeg/k9plaympeg2.h b/k9decmpeg/k9plaympeg2.h index 2b431e8..28a2f19 100644 --- a/k9decmpeg/k9plaympeg2.h +++ b/k9decmpeg/k9plaympeg2.h @@ -16,32 +16,33 @@ #include "k9dvdtitle.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "k9decodethread.h" /** @author Jean-Michel PETIT */ -class k9PlayMPEG2 : public QObject,public QThread +class k9PlayMPEG2 : public TQObject,public TQThread { Q_OBJECT + TQ_OBJECT private: k9DVDTitle *m_title; - QString m_device; + TQString m_device; k9DecodeThread m_decoder; uint32_t m_idxLect; uint32_t m_startSector; uint32_t m_lastSector; bool m_stopped; dvd_file_t *dvdfile; - QMutex mutex; + TQMutex mutex; dvd_reader_t *m_dvd; int m_chapter; public: k9PlayMPEG2(); - void open (dvd_reader_t *dvd,const QString & device,k9DVDTitle * title,int chapter); + void open (dvd_reader_t *dvd,const TQString & device,k9DVDTitle * title,int chapter); kDecMPEG2 *getDecoder(); void setDvd(dvd_reader_t* _value) { m_dvd = _value;} dvd_reader_t* getDvd() const {return m_dvd;} @@ -59,7 +60,7 @@ signals: void setMin(uint32_t _sector); void setMax(uint32_t _sector); - void setError(const QString & err); + void setError(const TQString & err); }; diff --git a/k9decmpeg/kdecmpeg2.cpp b/k9decmpeg/kdecmpeg2.cpp index 80c1774..15b487e 100755 --- a/k9decmpeg/kdecmpeg2.cpp +++ b/k9decmpeg/kdecmpeg2.cpp @@ -21,14 +21,14 @@ #include "kdecmpeg2.h" #include "mpeg2.h" #include "mpeg2convert.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "k9decodethread.h" -void k9DisplayThread::setImage( QImage _image) { +void k9DisplayThread::setImage( TQImage _image) { if (m_mutex.tryLock()) { m_image=_image; m_raw=FALSE; @@ -50,7 +50,7 @@ void k9DisplayThread::setRawImage(uchar *_buffer,int _width,int _height,int size } void k9DisplayThread::run() { - if (qApp==NULL) + if (tqApp==NULL) return; if (m_raw) { m_dec->drawRaw( m_buffer,m_width,m_height,m_size); diff --git a/k9decmpeg/kdecmpeg2.h b/k9decmpeg/kdecmpeg2.h index 525aa27..4476231 100755 --- a/k9decmpeg/kdecmpeg2.h +++ b/k9decmpeg/kdecmpeg2.h @@ -24,31 +24,31 @@ #include "mpeg2.h" #include #include -#include +#include #include "ac.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /** *@author */ class kDecMPEG2; -class k9DisplayThread:public QThread { +class k9DisplayThread:public TQThread { public: k9DisplayThread(kDecMPEG2 *_dec) {m_dec=_dec;} - void setImage(QImage _image); + void setImage(TQImage _image); void setRawImage(uchar *_buffer,int _width,int _height,int size); protected: kDecMPEG2 *m_dec; uchar *m_buffer; int m_size,m_width,m_height; - QImage m_image; - QMutex m_mutex; + TQImage m_image; + TQMutex m_mutex; bool m_raw; void run(); @@ -57,8 +57,9 @@ protected: class k9DecodeThread; -class kDecMPEG2 : public QObject { +class kDecMPEG2 : public TQObject { Q_OBJECT + TQ_OBJECT public: kDecMPEG2(k9DecodeThread *_thread); kDecMPEG2(); @@ -68,7 +69,7 @@ public: void start(); void stop(); void pause(); - void draw(QImage *image) {emit pixmapReady(image);} + void draw(TQImage *image) {emit pixmapReady(image);} void drawRaw(uchar *_buffer,int width,int height,int size) {emit ppmReady (_buffer,width,height,size);} void setUseGL(bool _value) {m_useGL = _value;} @@ -77,12 +78,12 @@ private: bool m_useGL; bool m_pause; k9DecodeThread *m_thread; - QImage pix; - QTime m_timer; + TQImage pix; + TQTime m_timer; bool m_opened; int demux_pid; int demux_track; - QMutex mutex; + TQMutex mutex; mpeg2dec_t * decoder; k9DisplayThread *m_display; int demux (uint8_t * buf, uint8_t * end, int flags); @@ -92,7 +93,7 @@ private: void sync(); signals: // Signals /** No descriptions */ - void pixmapReady(QImage *image); + void pixmapReady(TQImage *image); void ppmReady(uchar *buffer,int width,int height,int size); }; diff --git a/k9decmpeg/mmx.h b/k9decmpeg/mmx.h index a410caa..bbbca78 100755 --- a/k9decmpeg/mmx.h +++ b/k9decmpeg/mmx.h @@ -218,7 +218,7 @@ typedef union { : "m" (mem)) -#define maskmovq(regs,maskreg) mmx_r2ri (maskmovq, regs, maskreg) +#define tqmaskmovq(regs,tqmaskreg) mmx_r2ri (tqmaskmovq, regs, tqmaskreg) #define movntq_r2m(mmreg,var) mmx_r2m (movntq, mmreg, var) diff --git a/k9decmpeg/motion_comp_mmx.cpp b/k9decmpeg/motion_comp_mmx.cpp index 97828c4..f3c30ef 100755 --- a/k9decmpeg/motion_comp_mmx.cpp +++ b/k9decmpeg/motion_comp_mmx.cpp @@ -52,7 +52,7 @@ */ /* some rounding constants */ -static mmx_t mask1 = {0xfefefefefefefefeLL}; +static mmx_t tqmask1 = {0xfefefefefefefefeLL}; static mmx_t round4 = {0x0002000200020002LL}; /* @@ -81,7 +81,7 @@ static inline void mmx_average_2_U8 (uint8_t * dest, const uint8_t * src1, movq_r2r (mm3, mm4); /* copy 8 src2 bytes */ pxor_r2r (mm1, mm3); /* xor src1 and src2 */ - pand_m2r (mask1, mm3); /* mask lower bits */ + pand_m2r (tqmask1, mm3); /* tqmask lower bits */ psrlq_i2r (1, mm3); /* /2 */ por_r2r (mm2, mm4); /* or src1 and src2 */ psubb_r2r (mm3, mm4); /* subtract subresults */ @@ -104,14 +104,14 @@ static inline void mmx_interp_average_2_U8 (uint8_t * dest, movq_r2r (mm5, mm6); /* copy 8 src2 bytes */ pxor_r2r (mm3, mm5); /* xor src1 and src2 */ - pand_m2r (mask1, mm5); /* mask lower bits */ + pand_m2r (tqmask1, mm5); /* tqmask lower bits */ psrlq_i2r (1, mm5); /* /2 */ por_r2r (mm4, mm6); /* or src1 and src2 */ psubb_r2r (mm5, mm6); /* subtract subresults */ movq_r2r (mm6, mm5); /* copy subresult */ pxor_r2r (mm1, mm5); /* xor srcavg and dest */ - pand_m2r (mask1, mm5); /* mask lower bits */ + pand_m2r (tqmask1, mm5); /* tqmask lower bits */ psrlq_i2r (1, mm5); /* /2 */ por_r2r (mm2, mm6); /* or srcavg and dest */ psubb_r2r (mm5, mm6); /* subtract subresults */ @@ -228,7 +228,7 @@ static inline void mmx_interp_average_4_U8 (uint8_t * dest, movq_r2r (mm1,mm2); /* copy subresult */ pxor_r2r (mm1, mm3); /* xor srcavg and dest */ - pand_m2r (mask1, mm3); /* mask lower bits */ + pand_m2r (tqmask1, mm3); /* tqmask lower bits */ psrlq_i2r (1, mm3); /* /2 */ por_r2r (mm2, mm4); /* or srcavg and dest */ psubb_r2r (mm3, mm4); /* subtract subresults */ @@ -636,7 +636,7 @@ static inline void MC_avg2_16 (int height, uint8_t * dest, const uint8_t * ref, } while (--height); } -static mmx_t mask_one = {0x0101010101010101LL}; +static mmx_t tqmask_one = {0x0101010101010101LL}; static inline void MC_put4_8 (int height, uint8_t * dest, const uint8_t * ref, const int stride, const int cpu) @@ -664,7 +664,7 @@ static inline void MC_put4_8 (int height, uint8_t * dest, const uint8_t * ref, pand_r2r (mm5, mm7); pavg_r2r (mm2, mm0); - pand_m2r (mask_one, mm7); + pand_m2r (tqmask_one, mm7); psubusb_r2r (mm7, mm0); @@ -695,7 +695,7 @@ static inline void MC_put4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (mask_one, mm7); + pand_m2r (tqmask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_r2m (mm0, *dest); @@ -714,7 +714,7 @@ static inline void MC_put4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (mask_one, mm7); + pand_m2r (tqmask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); ref += stride; @@ -741,7 +741,7 @@ static inline void MC_avg4_8 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (mask_one, mm7); + pand_m2r (tqmask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_m2r (*dest, mm1); @@ -770,7 +770,7 @@ static inline void MC_avg4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (mask_one, mm7); + pand_m2r (tqmask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_m2r (*dest, mm1); @@ -791,7 +791,7 @@ static inline void MC_avg4_16 (int height, uint8_t * dest, const uint8_t * ref, movq_r2r (mm0, mm6); pxor_r2r (mm2, mm6); pand_r2r (mm6, mm7); - pand_m2r (mask_one, mm7); + pand_m2r (tqmask_one, mm7); pavg_r2r (mm2, mm0); psubusb_r2r (mm7, mm0); movq_m2r (*(dest+8), mm1); diff --git a/k9decmpeg/motion_comp_vis.cpp b/k9decmpeg/motion_comp_vis.cpp index 218af8a..49e1b69 100755 --- a/k9decmpeg/motion_comp_vis.cpp +++ b/k9decmpeg/motion_comp_vis.cpp @@ -37,10 +37,10 @@ * (x+y+1)>>1 == (x|y)-((x^y)>>1) * * This allows us to average 8 bytes at a time in a 64-bit FPU reg. - * We avoid overflows by masking before we do the shift, and we + * We avoid overflows by tqmasking before we do the shift, and we * implement the shift by multiplying by 1/2 using mul8x16. So in - * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating mask - * of '0xfe' is in f4, a repeating mask of '0x7f' is in f6, and + * VIS this is (assume 'x' is in f0, 'y' is in f2, a repeating tqmask + * of '0xfe' is in f4, a repeating tqmask of '0x7f' is in f6, and * the value 0x80808080 is in f8): * * fxor f0, f2, f10 diff --git a/k9decmpeg/mpeg2.h b/k9decmpeg/mpeg2.h index e8c7d2d..83c9138 100755 --- a/k9decmpeg/mpeg2.h +++ b/k9decmpeg/mpeg2.h @@ -27,19 +27,19 @@ #define MPEG2_VERSION(a,b,c) (((a)<<16)|((b)<<8)|(c)) #define MPEG2_RELEASE MPEG2_VERSION (0, 4, 0) /* 0.4.0 */ -#define SEQ_FLAG_MPEG2 1 -#define SEQ_FLAG_CONSTRAINED_PARAMETERS 2 -#define SEQ_FLAG_PROGRESSIVE_SEQUENCE 4 -#define SEQ_FLAG_LOW_DELAY 8 -#define SEQ_FLAG_COLOUR_DESCRIPTION 16 - -#define SEQ_MASK_VIDEO_FORMAT 0xe0 -#define SEQ_VIDEO_FORMAT_COMPONENT 0 -#define SEQ_VIDEO_FORMAT_PAL 0x20 -#define SEQ_VIDEO_FORMAT_NTSC 0x40 -#define SEQ_VIDEO_FORMAT_SECAM 0x60 -#define SEQ_VIDEO_FORMAT_MAC 0x80 -#define SEQ_VIDEO_FORMAT_UNSPECIFIED 0xa0 +#define SETQ_FLAG_MPEG2 1 +#define SETQ_FLAG_CONSTRAINED_PARAMETERS 2 +#define SETQ_FLAG_PROGRESSIVE_SEQUENCE 4 +#define SETQ_FLAG_LOW_DELAY 8 +#define SETQ_FLAG_COLOUR_DESCRIPTION 16 + +#define SETQ_MASK_VIDEO_FORMAT 0xe0 +#define SETQ_VIDEO_FORMAT_COMPONENT 0 +#define SETQ_VIDEO_FORMAT_PAL 0x20 +#define SETQ_VIDEO_FORMAT_NTSC 0x40 +#define SETQ_VIDEO_FORMAT_SECAM 0x60 +#define SETQ_VIDEO_FORMAT_MAC 0x80 +#define SETQ_VIDEO_FORMAT_UNSPECIFIED 0xa0 typedef struct mpeg2_sequence_s { unsigned int width, height; diff --git a/k9decmpeg/mpeg2_internal.h b/k9decmpeg/mpeg2_internal.h index 7e6c1df..8eecf37 100755 --- a/k9decmpeg/mpeg2_internal.h +++ b/k9decmpeg/mpeg2_internal.h @@ -26,7 +26,7 @@ #define MACROBLOCK_PATTERN 2 #define MACROBLOCK_MOTION_BACKWARD 4 #define MACROBLOCK_MOTION_FORWARD 8 -#define MACROBLOCK_QUANT 16 +#define MACROBLOCK_TQUANT 16 #define DCT_TYPE_INTERLACED 32 /* motion_type */ #define MOTION_TYPE_SHIFT 6 diff --git a/k9decmpeg/rgb_mmx.cpp b/k9decmpeg/rgb_mmx.cpp index 957708c..59b7c6e 100755 --- a/k9decmpeg/rgb_mmx.cpp +++ b/k9decmpeg/rgb_mmx.cpp @@ -127,9 +127,9 @@ static inline void mmx_yuv2rgb (uint8_t * py, uint8_t * pu, uint8_t * pv) static inline void mmx_unpack_16rgb (uint8_t * image, const int cpu) { - static mmx_t mmx_bluemask = {0xf8f8f8f8f8f8f8f8LL}; - static mmx_t mmx_greenmask = {0xfcfcfcfcfcfcfcfcLL}; - static mmx_t mmx_redmask = {0xf8f8f8f8f8f8f8f8LL}; + static mmx_t mmx_bluetqmask = {0xf8f8f8f8f8f8f8f8LL}; + static mmx_t mmx_greentqmask = {0xfcfcfcfcfcfcfcfcLL}; + static mmx_t mmx_redtqmask = {0xf8f8f8f8f8f8f8f8LL}; /* * convert RGB plane to RGB 16 bits @@ -138,9 +138,9 @@ static inline void mmx_unpack_16rgb (uint8_t * image, const int cpu) * mm6 -> GB, mm7 -> AR pixel 0-3 */ - pand_m2r (mmx_bluemask, mm0); /* mm0 = b7b6b5b4b3______ */ - pand_m2r (mmx_greenmask, mm2); /* mm2 = g7g6g5g4g3g2____ */ - pand_m2r (mmx_redmask, mm1); /* mm1 = r7r6r5r4r3______ */ + pand_m2r (mmx_bluetqmask, mm0); /* mm0 = b7b6b5b4b3______ */ + pand_m2r (mmx_greentqmask, mm2); /* mm2 = g7g6g5g4g3g2____ */ + pand_m2r (mmx_redtqmask, mm1); /* mm1 = r7r6r5r4r3______ */ psrlq_i2r (3, mm0); /* mm0 = ______b7b6b5b4b3 */ pxor_r2r (mm4, mm4); /* mm4 = 0 */ movq_r2r (mm0, mm5); /* mm5 = ______b7b6b5b4b3 */ diff --git a/k9decmpeg/slice.cpp b/k9decmpeg/slice.cpp index 2c25bb1..55c3d03 100755 --- a/k9decmpeg/slice.cpp +++ b/k9decmpeg/slice.cpp @@ -1797,8 +1797,8 @@ void mpeg2_slice (mpeg2_decoder_t * const decoder, const int code, macroblock_modes = get_macroblock_modes (decoder); - /* maybe integrate MACROBLOCK_QUANT test into get_macroblock_modes ? */ - if (macroblock_modes & MACROBLOCK_QUANT) + /* maybe integrate MACROBLOCK_TQUANT test into get_macroblock_modes ? */ + if (macroblock_modes & MACROBLOCK_TQUANT) get_quantizer_scale (decoder); if (macroblock_modes & MACROBLOCK_INTRA) { diff --git a/k9decmpeg/vlc.h b/k9decmpeg/vlc.h index f82e595..61b2a50 100755 --- a/k9decmpeg/vlc.h +++ b/k9decmpeg/vlc.h @@ -96,17 +96,17 @@ typedef struct { #define INTRA MACROBLOCK_INTRA -#define QUANT MACROBLOCK_QUANT +#define TQUANT MACROBLOCK_TQUANT static const MBtab MB_I [] = { - {INTRA|QUANT, 2}, {INTRA, 1} + {INTRA|TQUANT, 2}, {INTRA, 1} }; #define MC MACROBLOCK_MOTION_FORWARD #define CODED MACROBLOCK_PATTERN static const MBtab MB_P [] = { - {INTRA|QUANT, 6}, {CODED|QUANT, 5}, {MC|CODED|QUANT, 5}, {INTRA, 5}, + {INTRA|TQUANT, 6}, {CODED|TQUANT, 5}, {MC|CODED|TQUANT, 5}, {INTRA, 5}, {MC, 3}, {MC, 3}, {MC, 3}, {MC, 3}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, @@ -121,9 +121,9 @@ static const MBtab MB_P [] = { #define INTER MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD static const MBtab MB_B [] = { - {0, 0}, {INTRA|QUANT, 6}, - {BWD|CODED|QUANT, 6}, {FWD|CODED|QUANT, 6}, - {INTER|CODED|QUANT, 5}, {INTER|CODED|QUANT, 5}, + {0, 0}, {INTRA|TQUANT, 6}, + {BWD|CODED|TQUANT, 6}, {FWD|CODED|TQUANT, 6}, + {INTER|CODED|TQUANT, 5}, {INTER|CODED|TQUANT, 5}, {INTRA, 5}, {INTRA, 5}, {FWD, 4}, {FWD, 4}, {FWD, 4}, {FWD, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, @@ -142,7 +142,7 @@ static const MBtab MB_B [] = { }; #undef INTRA -#undef QUANT +#undef TQUANT #undef MC #undef CODED #undef FWD diff --git a/k9devices/k9cddrive.cpp b/k9devices/k9cddrive.cpp index 0a47b70..5fdf0bf 100644 --- a/k9devices/k9cddrive.cpp +++ b/k9devices/k9cddrive.cpp @@ -35,12 +35,12 @@ k9CdDrive::k9CdDrive() { } k9CdDrive::~k9CdDrive() {} -k9CdDrives::k9CdDrives():QObject( 0,0) { +k9CdDrives::k9CdDrives():TQObject( 0,0) { drives.setAutoDelete(true); #ifdef HAVE_HAL m_connection=k9HalConnection::getInstance(); - connect(m_connection,SIGNAL(deviceAdded( k9HalDevice* )),this,SLOT(deviceAdded( k9HalDevice* ))); - connect(m_connection,SIGNAL(deviceRemoved( k9HalDevice* )),this,SLOT(deviceRemoved( k9HalDevice*))); + connect(m_connection,TQT_SIGNAL(deviceAdded( k9HalDevice* )),this,TQT_SLOT(deviceAdded( k9HalDevice* ))); + connect(m_connection,TQT_SIGNAL(deviceRemoved( k9HalDevice* )),this,TQT_SLOT(deviceRemoved( k9HalDevice*))); #else m_devMgr=new K3bDevice::DeviceManager(this); @@ -81,7 +81,7 @@ void k9CdDrives::addDrive(k9HalDevice *_device) { drive->canWriteCDR=_device->getCanBurnCd(); drive->device=_device->getDeviceName(); drive->name=_device->getModel(); - QValueList writeSpeeds; + TQValueList writeSpeeds; for (int i=2;i <=_device->getMaxWriteSpeed()/1385;i+=2) writeSpeeds.append( i); drive->setWriteSpeeds(writeSpeeds); @@ -96,7 +96,7 @@ void k9CdDrives::scanDrives() { drives.clear(); #ifdef HAVE_HAL - QPtrList list=m_connection->getDevices(); + TQPtrList list=m_connection->getDevices(); for (k9HalDevice *hdrive=list.first();hdrive;hdrive=list.next()) { addDrive(hdrive); @@ -104,7 +104,7 @@ void k9CdDrives::scanDrives() { #else m_devMgr->scanBus(); int row=0; - QPtrList lDev=m_devMgr->allDevices(); + TQPtrList lDev=m_devMgr->allDevices(); for (K3bDevice::Device *dev=lDev.first();dev;dev=lDev.next()) { k9CdDrive *drive=new k9CdDrive; drive->device=dev->blockDeviceName(); @@ -112,7 +112,7 @@ void k9CdDrives::scanDrives() { drive->canReadDVD=dev->readsDvd(); drive->canWriteCDR=dev->writesCd(); drive->canWriteDVD=dev->writesDvd(); - QValueList writeSpeeds; + TQValueList writeSpeeds; for (int i=2;i <=dev->determineMaximalWriteSpeed()/1385;i+=2) writeSpeeds.append( i); drive->setWriteSpeeds(writeSpeeds); @@ -127,7 +127,7 @@ void k9CdDrives::scanDrives() { readConfig(); } -void k9CdDrives::eject(const QString & device) { +void k9CdDrives::eject(const TQString & device) { KProcess *process =new KProcess(); if (k9Tools::checkProgram("kdeeject")) *process <<"kdeeject" << device; @@ -141,26 +141,26 @@ void k9CdDrives::eject(const QString & device) { /** reads devices that was entered manually **/ void k9CdDrives::readConfig() { - QStringList ldev; - QStringList llabels; - QStringList lIO; + TQStringList ldev; + TQStringList llabels; + TQStringList lIO; k9Config config; ldev=config.getDevices(); llabels=config.getDevicesLabels(); lIO=config.getDevicesIO(); int row=count(); int i=0; - for ( QStringList::Iterator it = ldev.begin(); it != ldev.end(); ++it ) { + for ( TQStringList::Iterator it = ldev.begin(); it != ldev.end(); ++it ) { k9CdDrive *drive=new k9CdDrive; drive->device=(*it); - QStringList::Iterator it2=llabels.at(i); - QStringList::Iterator it3=lIO.at(i); + TQStringList::Iterator it2=llabels.at(i); + TQStringList::Iterator it3=lIO.at(i); drive->name=(*it2); - QString c=(*it3); - if (c.contains("I")) { + TQString c=(*it3); + if (c.tqcontains("I")) { drive->canReadDVD=true; } - if (c.contains("O")) { + if (c.tqcontains("O")) { drive->canWriteCDR=true; drive->canWriteDVD=true; } @@ -185,12 +185,12 @@ k9CdDrive * k9CdDrives::getDrive(int num) { } -QValueList< int > k9CdDrive::getWriteSpeeds() const { +TQValueList< int > k9CdDrive::getWriteSpeeds() const { return writeSpeeds; } -void k9CdDrive::setWriteSpeeds(const QValueList< int >& _value) { +void k9CdDrive::setWriteSpeeds(const TQValueList< int >& _value) { writeSpeeds = _value; } diff --git a/k9devices/k9cddrive.h b/k9devices/k9cddrive.h index e64bc0f..9a4a374 100644 --- a/k9devices/k9cddrive.h +++ b/k9devices/k9cddrive.h @@ -13,11 +13,11 @@ #define K9CDDRIVE_H #include "k9common.h" -#include +#include -#include -#include -#include +#include +#include +#include #ifndef HAVE_HAL #include #include @@ -30,20 +30,21 @@ class k9HalDevice; class k9HalConnection; -class k9CdDrive : public QObject { +class k9CdDrive : public TQObject { Q_OBJECT + TQ_OBJECT public: k9CdDrive(); ~k9CdDrive(); int num; - QString name; - QString device; + TQString name; + TQString device; bool canWriteCDR; bool canReadDVD; bool canWriteDVD; - void setWriteSpeeds(const QValueList< int >& _value); - QValueList< int > getWriteSpeeds() const; + void setWriteSpeeds(const TQValueList< int >& _value); + TQValueList< int > getWriteSpeeds() const; #ifdef HAVE_HAL void setDevice(k9HalDevice* _value) { m_Device = _value;} @@ -51,14 +52,15 @@ public: k9HalDevice* getDevice() { return m_Device;} #endif private: - QValueList writeSpeeds; + TQValueList writeSpeeds; #ifdef HAVE_HAL k9HalDevice *m_Device; #endif }; -class k9CdDrives : public QObject { +class k9CdDrives : public TQObject { Q_OBJECT + TQ_OBJECT public: k9CdDrives(); ~k9CdDrives(); @@ -66,7 +68,7 @@ public: int count(); /** No descriptions */ k9CdDrive * getDrive(int num); - void eject(const QString & device); + void eject(const TQString & device); void scanDrives(); public slots: void deviceAdded(k9HalDevice *device); @@ -82,6 +84,6 @@ private: // Private methods K3bDevice::DeviceManager *m_devMgr; #endif void readConfig(); - QPtrList drives; + TQPtrList drives; }; #endif diff --git a/k9devices/k9dbusdispatch.cpp b/k9devices/k9dbusdispatch.cpp index 71d8a2f..c8c6a09 100644 --- a/k9devices/k9dbusdispatch.cpp +++ b/k9devices/k9dbusdispatch.cpp @@ -29,20 +29,20 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data) bool enabled = dbus_watch_get_enabled(watch); //qDebug("addReadWatch %d %s", fd, (enabled ? "enabled" : "disabled")); watcher.watch = watch; - watcher.read = new QSocketNotifier(fd, QSocketNotifier::Read, d); + watcher.read = new TQSocketNotifier(fd, TQSocketNotifier::Read, d); if (!enabled) watcher.read->setEnabled(false); - d->connect(watcher.read, SIGNAL(activated(int)), SLOT(socketRead(int))); + d->connect(watcher.read, TQT_SIGNAL(activated(int)), TQT_SLOT(socketRead(int))); } if (flags & DBUS_WATCH_WRITABLE) { bool enabled = dbus_watch_get_enabled(watch); //qDebug("addWriteWatch %d %s", fd, (enabled ? "enabled" : "disabled")); watcher.watch = watch; - watcher.write = new QSocketNotifier(fd, QSocketNotifier::Write, d); + watcher.write = new TQSocketNotifier(fd, TQSocketNotifier::Write, d); if (!enabled) watcher.write->setEnabled(false); - d->connect(watcher.write, SIGNAL(activated(int)), SLOT(socketWrite(int))); + d->connect(watcher.write, TQT_SIGNAL(activated(int)), TQT_SLOT(socketWrite(int))); } // FIXME-QT4 d->watchers.insertMulti(fd, watcher); - K9DBusDispatch::WatcherHash::iterator it = d->watchers.find(fd); + K9DBusDispatch::WatcherHash::iterator it = d->watchers.tqfind(fd); if (it == d->watchers.end()) { it = d->watchers.insert(fd, K9DBusDispatch::WatcherList()); @@ -58,7 +58,7 @@ static void qDBusRemoveWatch(DBusWatch *watch, void *data) int fd = dbus_watch_get_fd(watch); - K9DBusDispatch::WatcherHash::iterator it = d->watchers.find(fd); + K9DBusDispatch::WatcherHash::iterator it = d->watchers.tqfind(fd); if (it != d->watchers.end()) { K9DBusDispatch::WatcherList& list = *it; @@ -87,7 +87,7 @@ static void qDBusRemoveWatch(DBusWatch *watch, void *data) } if (d->removedWatches.count() > 0) - QTimer::singleShot(0, d, SLOT(purgeRemovedWatches())); + TQTimer::singleShot(0, d, TQT_SLOT(purgeRemovedWatches())); } @@ -96,7 +96,7 @@ static void qDBusToggleWatch(DBusWatch *watch, void *data) K9DBusDispatch *d=(K9DBusDispatch*)data; int fd = dbus_watch_get_fd(watch); - K9DBusDispatch::WatcherHash::iterator it = d->watchers.find(fd); + K9DBusDispatch::WatcherHash::iterator it = d->watchers.tqfind(fd); if (it != d->watchers.end()) { K9DBusDispatch::WatcherList& list = *it; for (K9DBusDispatch::WatcherList::iterator wit = list.begin(); wit != list.end(); @@ -162,8 +162,8 @@ void K9DBusDispatch::purgeRemovedWatches() void K9DBusDispatch::socketRead(int fd) { - // FIXME-QT4 QHashIterator it(watchers); - WatcherHash::const_iterator it = watchers.find(fd); + // FIXME-QT4 TQHashIterator it(watchers); + WatcherHash::const_iterator it = watchers.tqfind(fd); if (it != watchers.end()) { const WatcherList& list = *it; for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) { @@ -178,8 +178,8 @@ void K9DBusDispatch::socketRead(int fd) void K9DBusDispatch::socketWrite(int fd) { - // FIXME-QT4 QHashIterator it(watchers); - WatcherHash::const_iterator it = watchers.find(fd); + // FIXME-QT4 TQHashIterator it(watchers); + WatcherHash::const_iterator it = watchers.tqfind(fd); if (it != watchers.end()) { const WatcherList& list = *it; for (WatcherList::const_iterator wit = list.begin(); wit != list.end(); ++wit) { @@ -205,11 +205,11 @@ void K9DBusDispatch::dispatch() } } -K9DBusDispatch::K9DBusDispatch(QObject *parent, const char *name) - : QObject(parent, name) +K9DBusDispatch::K9DBusDispatch(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { - m_dispatcher = new QTimer(this); - QObject::connect(m_dispatcher, SIGNAL(timeout()), this, SLOT(dispatch())); + m_dispatcher = new TQTimer(this); + TQObject::connect(m_dispatcher, TQT_SIGNAL(timeout()), this, TQT_SLOT(dispatch())); } diff --git a/k9devices/k9dbusdispatch.h b/k9devices/k9dbusdispatch.h index a93c2b0..d9d210e 100644 --- a/k9devices/k9dbusdispatch.h +++ b/k9devices/k9dbusdispatch.h @@ -3,7 +3,7 @@ // // Description: the main goal of this class is to dispatch dbus messages so that libhal can // detect changes on devices. -// This code is based on QDBusConnectionPrivate from the new Qt DBus bindings +// This code is based on TQDBusConnectionPrivate from the new TQt DBus bindings // // // Author: Jean-Michel PETIT , (C) 2007 @@ -15,15 +15,19 @@ #define K9DBUSDISPATCH_H #include "k9common.h" +#ifdef Q_MOC_RUN +#define HAVE_HAL +#endif // Q_MOC_RUN + #ifdef HAVE_HAL -#include -#include +#include +#include #define DBUS_API_SUBJECT_TO_CHANGE #include -#include -#include -#include +#include +#include +#include /** @author Jean-Michel PETIT @@ -33,24 +37,25 @@ class k9Watcher { public: k9Watcher() { read=write=0; watch=0;}; DBusWatch *watch; - QSocketNotifier *read,*write; + TQSocketNotifier *read,*write; }; -class K9DBusDispatch : public QObject +class K9DBusDispatch : public TQObject { Q_OBJECT + TQ_OBJECT public: - K9DBusDispatch(QObject *parent = 0, const char *name = 0); + K9DBusDispatch(TQObject *tqparent = 0, const char *name = 0); ~K9DBusDispatch(); void setConnection(DBusConnection* _value); - typedef QValueList WatcherList; + typedef TQValueList WatcherList; WatcherList removedWatches; - typedef QMap WatcherHash; + typedef TQMap WatcherHash; WatcherHash watchers; private: - QTimer *m_dispatcher; + TQTimer *m_dispatcher; DBusConnection *m_connection; void purgeRemovedWatches(); diff --git a/k9devices/k9halconnection.cpp b/k9devices/k9halconnection.cpp index 4de67ac..12d23cb 100644 --- a/k9devices/k9halconnection.cpp +++ b/k9devices/k9halconnection.cpp @@ -31,8 +31,8 @@ void halDeviceRemoved (LibHalContext *ctx, const char *udi) { } -k9HalConnection::k9HalConnection(QObject *parent, const char *name) - : QObject(parent, name) +k9HalConnection::k9HalConnection(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { m_devices.setAutoDelete(true); m_context =(void*) libhal_ctx_new(); @@ -41,7 +41,7 @@ k9HalConnection::k9HalConnection(QObject *parent, const char *name) dbus_error_init( &error ); m_dbusConnect = dbus_bus_get( DBUS_BUS_SYSTEM, &error ); if( dbus_error_is_set(&error) ) { - qDebug(QString("Error connecting to DBUS : %1").arg(error.message)); + qDebug(TQString("Error connecting to DBUS : %1").tqarg(error.message)); return; } @@ -82,7 +82,7 @@ void k9HalConnection::addDevice( const char* udi ) if( libhal_device_query_capability( (LibHalContext*) m_context, udi, "storage.cdrom", 0 ) ) { char* dev = libhal_device_get_property_string( (LibHalContext*) m_context, udi, "block.device", 0 ); if( dev ) { - QString s( dev ); + TQString s( dev ); libhal_free_string( dev ); if( !s.isEmpty() ) { @@ -104,7 +104,7 @@ void k9HalConnection::testVolumeChanged( const char * udi) { } else if( libhal_device_query_capability( (LibHalContext*) m_context, udi, "volume", 0 ) ) { - char* udiParent = libhal_device_get_property_string( (LibHalContext*) m_context, udi, "info.parent", 0 ); + char* udiParent = libhal_device_get_property_string( (LibHalContext*) m_context, udi, "info.tqparent", 0 ); if( udiParent ) { k9HalDevice *device=findDevice( udiParent); libhal_free_string( udiParent ); @@ -120,9 +120,9 @@ k9HalConnection::~k9HalConnection() libhal_ctx_shutdown((LibHalContext*)m_context, 0 ); libhal_ctx_free ((LibHalContext*)m_context); #ifdef DBUS_QT3 - //QDBusConnection::closeConnection("sbus"); + //TQDBusConnection::closeConnection("sbus"); #else - //delete m_dBusQtConnect; + //delete m_dBusTQtConnect; #endif } @@ -135,7 +135,7 @@ k9HalConnection * k9HalConnection::getInstance() { k9HalDevice *k9HalConnection::findDevice( const char *udi) { for (k9HalDevice *dev= m_devices.first();dev;dev=m_devices.next()) { - if (dev->name()==QString(udi)) + if (dev->name()==TQString(udi)) return dev; } return NULL; @@ -143,7 +143,7 @@ k9HalDevice *k9HalConnection::findDevice( const char *udi) { k9HalDevice *k9HalConnection::findDeviceByVolume( const char *udi) { for (k9HalDevice *dev= m_devices.first();dev;dev=m_devices.next()) { - if (dev->getVolumeUdi()==QString(udi)) + if (dev->getVolumeUdi()==TQString(udi)) return dev; } return NULL; diff --git a/k9devices/k9halconnection.h b/k9devices/k9halconnection.h index 27119a5..ac44db4 100644 --- a/k9devices/k9halconnection.h +++ b/k9devices/k9halconnection.h @@ -10,12 +10,17 @@ // // #include "k9common.h" + +#ifdef Q_MOC_RUN +#define HAVE_HAL +#endif // Q_MOC_RUN + #ifdef HAVE_HAL #ifndef K9HALCONNECTION_H #define K9HALCONNECTION_H -#include -#include +#include +#include #include "k9dbusdispatch.h" /** @author Jean-Michel PETIT @@ -24,22 +29,23 @@ class k9HalDevice; class DBusConnection; #ifdef DBUS_QT3 -class QDBusConnection; +class TQDBusConnection; #else -namespace DBusQt { +namespace DBusTQt { class Connection; }; #endif -class k9HalConnection : public QObject +class k9HalConnection : public TQObject { Q_OBJECT + TQ_OBJECT friend class k9HalDevice; public: static k9HalConnection* getInstance(); static void end(); - QPtrList< k9HalDevice > getDevices() const { return m_devices;} + TQPtrList< k9HalDevice > getDevices() const { return m_devices;} void addDevice( const char* udi ); void removeDevice( const char* udi ); void testVolumeChanged( const char * udi); @@ -49,13 +55,13 @@ signals: void deviceAdded(k9HalDevice *); void deviceRemoved(k9HalDevice*); private: - QPtrList m_devices; + TQPtrList m_devices; void *m_context; DBusConnection * m_dbusConnect; K9DBusDispatch *m_dbusDispatch; private: - k9HalConnection(QObject *parent = 0, const char *name = 0); + k9HalConnection(TQObject *tqparent = 0, const char *name = 0); ~k9HalConnection(); diff --git a/k9devices/k9haldevice.cpp b/k9devices/k9haldevice.cpp index 0f70c42..f42ead8 100644 --- a/k9devices/k9haldevice.cpp +++ b/k9devices/k9haldevice.cpp @@ -17,17 +17,17 @@ #include #include -k9HalDevice::k9HalDevice(QObject *parent, const char *udi) - : QObject(parent, udi) { +k9HalDevice::k9HalDevice(TQObject *tqparent, const char *udi) + : TQObject(tqparent, udi) { - m_connection=(k9HalConnection*)parent; + m_connection=(k9HalConnection*)tqparent; getDriveProperties(); } k9HalDevice::~k9HalDevice() {} -QString k9HalDevice::volumeName() { - QString sVol(""); +TQString k9HalDevice::volumeName() { + TQString sVol(""); LibHalDrive *drive= libhal_drive_from_udi ((LibHalContext *)m_connection->m_context, name()); int num_volumes; if (drive !=NULL) { @@ -37,11 +37,11 @@ QString k9HalDevice::volumeName() { char *volume_udi; LibHalVolume *volume; volume_udi = volumes[i]; - QString s(volume_udi); + TQString s(volume_udi); m_volumeUdi=s; volume = libhal_volume_from_udi ((LibHalContext *)m_connection->m_context, volume_udi); if (volume != NULL) { - sVol=QString(libhal_volume_get_label (volume)); + sVol=TQString(libhal_volume_get_label (volume)); libhal_volume_free (volume); } } @@ -53,8 +53,8 @@ QString k9HalDevice::volumeName() { return sVol; } -QString k9HalDevice::mountPoint() { - QString sMountPoint(""); +TQString k9HalDevice::mountPoint() { + TQString sMountPoint(""); LibHalDrive *drive= libhal_drive_from_udi ((LibHalContext *)m_connection->m_context, name()); if (drive !=NULL) { int num_volumes; @@ -66,7 +66,7 @@ QString k9HalDevice::mountPoint() { volume_udi = volumes[i]; volume = libhal_volume_from_udi ((LibHalContext *)m_connection->m_context, volume_udi); if (volume != NULL) { - sMountPoint=QString(libhal_volume_get_mount_point (volume)); + sMountPoint=TQString(libhal_volume_get_mount_point (volume)); libhal_volume_free (volume); } } @@ -94,8 +94,8 @@ void k9HalDevice::getDriveProperties() { m_canBurnCd= (caps & LIBHAL_DRIVE_CDROM_CAPS_CDR)==LIBHAL_DRIVE_CDROM_CAPS_CDR; m_canReadDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDROM)==LIBHAL_DRIVE_CDROM_CAPS_DVDROM; m_canBurnDvd=(caps & LIBHAL_DRIVE_CDROM_CAPS_DVDR)==LIBHAL_DRIVE_CDROM_CAPS_DVDR; - m_model=QString(libhal_drive_get_model(drive)); - // qDebug(QString("canReadDvd:%1 canBurnDvd:%2 model:%3").arg(m_canReadDvd).arg(m_canBurnDvd).arg(m_model)); + m_model=TQString(libhal_drive_get_model(drive)); + // qDebug(TQString("canReadDvd:%1 canBurnDvd:%2 model:%3").tqarg(m_canReadDvd).tqarg(m_canBurnDvd).tqarg(m_model)); libhal_drive_free(drive); @@ -103,7 +103,7 @@ void k9HalDevice::getDriveProperties() { m_maxWriteSpeed= libhal_device_get_property_int( (LibHalContext*)m_connection->m_context, name(), "storage.cdrom.write_speed", 0 ); } char* dev = libhal_device_get_property_string( (LibHalContext*) m_connection->m_context, name(), "block.device", 0 ); - m_deviceName=QString ( dev ); + m_deviceName=TQString ( dev ); libhal_free_string( dev ); m_volumeName=volumeName(); diff --git a/k9devices/k9haldevice.h b/k9devices/k9haldevice.h index e7c25f1..c2c0e0c 100644 --- a/k9devices/k9haldevice.h +++ b/k9devices/k9haldevice.h @@ -13,19 +13,25 @@ #ifndef K9HALDEVICE_H #define K9HALDEVICE_H #include "k9common.h" + +#ifdef Q_MOC_RUN +#define HAVE_HAL +#endif // Q_MOC_RUN + #ifdef HAVE_HAL -#include +#include /** @author Jean-Michel PETIT */ class k9HalConnection; -class k9HalDevice : public QObject +class k9HalDevice : public TQObject { Q_OBJECT + TQ_OBJECT public: - k9HalDevice(QObject *parent = 0, const char *name = 0); + k9HalDevice(TQObject *tqparent = 0, const char *name = 0); ~k9HalDevice(); @@ -45,7 +51,7 @@ public: return m_canBurnDvd; } - QString getModel() const { + TQString getModel() const { return m_model; } @@ -53,33 +59,33 @@ public: return m_maxWriteSpeed; } - QString getDeviceName() const { + TQString getDeviceName() const { return m_deviceName; } void updateVolumeName(); - QString getVolumeUdi() const { + TQString getVolumeUdi() const { return m_volumeUdi; } - QString getVolumeName() const { + TQString getVolumeName() const { return m_volumeName; } - QString mountPoint(); + TQString mountPoint(); signals: - void volumeChanged(const QString &device,const QString &volumeName); + void volumeChanged(const TQString &device,const TQString &volumeName); private: - QString m_volumeName; - QString m_volumeUdi; + TQString m_volumeName; + TQString m_volumeUdi; k9HalConnection *m_connection; bool m_canReadCd,m_canReadDvd,m_canBurnCd,m_canBurnDvd; - QString m_model; - QString m_deviceName; + TQString m_model; + TQString m_deviceName; int m_maxWriteSpeed; void getDriveProperties(); - QString volumeName(); + TQString volumeName(); }; #endif diff --git a/k9vamps/getvlc.h b/k9vamps/getvlc.h index bcf82c0..b35a5a3 100644 --- a/k9vamps/getvlc.h +++ b/k9vamps/getvlc.h @@ -4,7 +4,7 @@ #define MACROBLOCK_PATTERN 2 #define MACROBLOCK_MOTION_BACKWARD 4 #define MACROBLOCK_MOTION_FORWARD 8 -#define MACROBLOCK_QUANT 16 +#define MACROBLOCK_TQUANT 16 #define DCT_TYPE_INTERLACED 32 /* motion_type */ @@ -68,17 +68,17 @@ typedef struct { #define INTRA MACROBLOCK_INTRA -#define QUANT MACROBLOCK_QUANT +#define TQUANT MACROBLOCK_TQUANT static const MBtab MB_I [] = { - {INTRA|QUANT, 2}, {INTRA, 1} + {INTRA|TQUANT, 2}, {INTRA, 1} }; #define MC MACROBLOCK_MOTION_FORWARD #define CODED MACROBLOCK_PATTERN static const MBtab MB_P [] = { - {INTRA|QUANT, 6}, {CODED|QUANT, 5}, {MC|CODED|QUANT, 5}, {INTRA, 5}, + {INTRA|TQUANT, 6}, {CODED|TQUANT, 5}, {MC|CODED|TQUANT, 5}, {INTRA, 5}, {MC, 3}, {MC, 3}, {MC, 3}, {MC, 3}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, @@ -93,9 +93,9 @@ static const MBtab MB_P [] = { #define INTER MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD static const MBtab MB_B [] = { - {0, 0}, {INTRA|QUANT, 6}, - {BWD|CODED|QUANT, 6}, {FWD|CODED|QUANT, 6}, - {INTER|CODED|QUANT, 5}, {INTER|CODED|QUANT, 5}, + {0, 0}, {INTRA|TQUANT, 6}, + {BWD|CODED|TQUANT, 6}, {FWD|CODED|TQUANT, 6}, + {INTER|CODED|TQUANT, 5}, {INTER|CODED|TQUANT, 5}, {INTRA, 5}, {INTRA, 5}, {FWD, 4}, {FWD, 4}, {FWD, 4}, {FWD, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, @@ -114,7 +114,7 @@ static const MBtab MB_B [] = { }; #undef INTRA -#undef QUANT +#undef TQUANT #undef MC #undef CODED #undef FWD diff --git a/k9vamps/k9fifo.h b/k9vamps/k9fifo.h index 42fbbef..efb2935 100644 --- a/k9vamps/k9fifo.h +++ b/k9vamps/k9fifo.h @@ -13,7 +13,7 @@ #define K9FIFO_H #include "k9common.h" -#include +#include /** @author Jean-Michel PETIT */ @@ -25,7 +25,7 @@ private: uint32_t head,queue; uchar *array; uint32_t m_count; - QMutex mutex; + TQMutex mutex; public: k9fifo () { head=queue=m_count=0;array= new uchar[INPUT_SIZE];}; uint32_t count(); // { return (queue-head)%INPUT_SIZE ;} diff --git a/k9vamps/k9requant.cpp b/k9vamps/k9requant.cpp index 009f76c..cf2f381 100644 --- a/k9vamps/k9requant.cpp +++ b/k9vamps/k9requant.cpp @@ -1709,7 +1709,7 @@ void k9requant::mpeg2_slice ( const int code ) const MBAtab * mba; macroblock_modes = get_macroblock_modes (); - if (macroblock_modes & MACROBLOCK_QUANT) quantizer_scale = get_quantizer_scale (); + if (macroblock_modes & MACROBLOCK_TQUANT) quantizer_scale = get_quantizer_scale (); if (macroblock_modes & MACROBLOCK_INTRA) { @@ -1719,12 +1719,12 @@ void k9requant::mpeg2_slice ( const int code ) #endif new_quantizer_scale = getNewQuant(quantizer_scale, 1); - if (last_coded_scale == new_quantizer_scale) macroblock_modes &= 0xFFFFFFEF; // remove MACROBLOCK_QUANT - else macroblock_modes |= MACROBLOCK_QUANT; //add MACROBLOCK_QUANT + if (last_coded_scale == new_quantizer_scale) macroblock_modes &= 0xFFFFFFEF; // remove MACROBLOCK_TQUANT + else macroblock_modes |= MACROBLOCK_TQUANT; //add MACROBLOCK_TQUANT putaddrinc(mb_add + mb_skip); mb_skip = 0; putmbdata(macroblock_modes); - if (macroblock_modes & MACROBLOCK_QUANT) put_quantiser(new_quantizer_scale); + if (macroblock_modes & MACROBLOCK_TQUANT) put_quantiser(new_quantizer_scale); if (concealment_motion_vectors) { @@ -1825,7 +1825,7 @@ void k9requant::mpeg2_slice ( const int code ) #endif if (!new_coded_block_pattern) { - macroblock_modes &= 0xFFFFFFED; // remove MACROBLOCK_PATTERN and MACROBLOCK_QUANT flag + macroblock_modes &= 0xFFFFFFED; // remove MACROBLOCK_PATTERN and MACROBLOCK_TQUANT flag if ( (picture_coding_type == P_TYPE) && !(macroblock_modes & MACROBLOCK_MOTION_FORWARD)) { @@ -1855,13 +1855,13 @@ void k9requant::mpeg2_slice ( const int code ) } } - if (last_coded_scale == new_quantizer_scale) macroblock_modes &= 0xFFFFFFEF; // remove MACROBLOCK_QUANT - else if (macroblock_modes & MACROBLOCK_PATTERN) macroblock_modes |= MACROBLOCK_QUANT; //add MACROBLOCK_QUANT - assert( (macroblock_modes & MACROBLOCK_PATTERN) || !(macroblock_modes & MACROBLOCK_QUANT) ); + if (last_coded_scale == new_quantizer_scale) macroblock_modes &= 0xFFFFFFEF; // remove MACROBLOCK_TQUANT + else if (macroblock_modes & MACROBLOCK_PATTERN) macroblock_modes |= MACROBLOCK_TQUANT; //add MACROBLOCK_TQUANT + assert( (macroblock_modes & MACROBLOCK_PATTERN) || !(macroblock_modes & MACROBLOCK_TQUANT) ); putaddrinc(mb_add + mb_skip); mb_skip = 0; putmbdata(macroblock_modes); - if (macroblock_modes & MACROBLOCK_QUANT) put_quantiser(new_quantizer_scale); + if (macroblock_modes & MACROBLOCK_TQUANT) put_quantiser(new_quantizer_scale); // put saved motion data... for (batb = 0; batb < (n_wbuf - n_owbuf); batb++) putbits(n_owbuf[batb], 8); @@ -2440,14 +2440,14 @@ bool k9requant::lock( int64 x) { { if (likely (wbuf)) { - QMutexLocker locker( &mutw ); + TQMutexLocker locker( &mutw ); //mutw.lock(); rqt_wcnt = wbuf - owbuf; condw.wakeAll(); //mutw.unlock(); } //mutr.lock(); - QMutexLocker locker( &mutr ); + TQMutexLocker locker( &mutr ); while (!rqt_rcnt) { condr.wait( &mutr); diff --git a/k9vamps/k9requant.h b/k9vamps/k9requant.h index 2832c06..7cdc711 100644 --- a/k9vamps/k9requant.h +++ b/k9vamps/k9requant.h @@ -9,14 +9,14 @@ // Copyright: See COPYING file that comes with this distribution // // -#ifndef K9REQUANT_H -#define K9REQUANT_H +#ifndef K9RETQUANT_H +#define K9RETQUANT_H #include "k9common.h" -#include -#include -#include +#include +#include +#include // user defined types @@ -86,7 +86,7 @@ RunLevel; /** @author Jean-Michel PETIT */ -class k9requant : public QThread { +class k9requant : public TQThread { private: int inbitcnt, outbitcnt; @@ -260,10 +260,10 @@ public: uint64_t rqt_visize; uchar *rqt_rptr; uchar *rqt_wptr; - QWaitCondition condr; - QWaitCondition condw; - QMutex mutr; - QMutex mutw; + TQWaitCondition condr; + TQWaitCondition condw; + TQMutex mutr; + TQMutex mutw; bool rqt_stop; bool rqt_run; diff --git a/k9vamps/k9requant2.h b/k9vamps/k9requant2.h index e28336f..f85c8bd 100755 --- a/k9vamps/k9requant2.h +++ b/k9vamps/k9requant2.h @@ -1,8 +1,8 @@ -#include +#include #include "k9fifo.h" -#ifndef K9REQUANT2_H -#define K9REQUANT2_H +#ifndef K9RETQUANT2_H +#define K9RETQUANT2_H class k9Requant2 @@ -16,8 +16,8 @@ public: k9Requant2(); ~k9Requant2(); private: - QBuffer m_buffIn,m_buffOut; - QByteArray m_baIn,m_baOut; + TQBuffer m_buffIn,m_buffOut; + TQByteArray m_baIn,m_baOut; char *m_dataIn,*m_dataOut; int m_sizeIn,m_sizeOut; diff --git a/k9vamps/k9vamps.cpp b/k9vamps/k9vamps.cpp index b077fb8..f5e537a 100755 --- a/k9vamps/k9vamps.cpp +++ b/k9vamps/k9vamps.cpp @@ -11,7 +11,7 @@ // #include "k9vamps.h" -#include +#include #include "ac.h" @@ -163,7 +163,7 @@ k9vamps::k9vamps(k9DVDBackup *dvdbackup) { void k9vamps::setPreserve(bool _value) { m_preserve = _value; } -void k9vamps::setOutput(QFile *_output) { +void k9vamps::setOutput(TQFile *_output) { m_output=_output; } @@ -185,7 +185,7 @@ void k9vamps::run () { vobuf = (uchar*) malloc (vbuf_size); if (vibuf == NULL || vobuf == NULL) - fatal (QString("Allocation of video buffers failed: %1").arg(strerror (errno))); + fatal (TQString("Allocation of video buffers failed: %1").tqarg(strerror (errno))); // actually do vaporization @@ -357,18 +357,18 @@ int k9vamps::check_video_packet (uchar *ptr) { vid_packet_start_code |= (uint32_t) (ptr [3]); if (vid_packet_start_code != 0x000001e0) - fatal(QString ("Bad video packet start code at %1: %2").arg(rtell(ptr)).arg(vid_packet_start_code,0,16)); + fatal(TQString ("Bad video packet start code at %1: %2").tqarg(rtell(ptr)).tqarg(vid_packet_start_code,0,16)); vid_packet_length = ptr [4] << 8; vid_packet_length |= ptr [5]; vid_packet_length += 6; if ((ptr [6] & 0xc0) != 0x80) - fatal (QString("Not an MPEG2 video packet at %1").arg(rtell (ptr))); + fatal (TQString("Not an MPEG2 video packet at %1").tqarg(rtell (ptr))); if (ptr [7]) { if ((ptr [7] & 0xc0) != 0xc0) - qDebug (QString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").arg(rtell (ptr)).arg(ptr [7])); + qDebug (TQString("First video packet in sequence starting at %1 misses PTS or DTS, flags=%2").tqarg(rtell (ptr)).tqarg(ptr [7])); else { sequence_header_code = (uint32_t) (ptr [6 + 3 + ptr [8] + 0]) << 24; sequence_header_code |= (uint32_t) (ptr [6 + 3 + ptr [8] + 1]) << 16; @@ -399,7 +399,7 @@ int k9vamps::check_video_packet (uchar *ptr) { pad_packet_start_code |= (uint32_t) (ptr [3]); if (pad_packet_start_code != 0x000001be) - qDebug (QString("Bad padding packet start code at %1: %2").arg(rtell (ptr + vid_packet_length)).arg(pad_packet_start_code)); + qDebug (TQString("Bad padding packet start code at %1: %2").tqarg(rtell (ptr + vid_packet_length)).tqarg(pad_packet_start_code)); else { pad_packet_length = ptr [4] << 8; pad_packet_length |= ptr [5]; @@ -409,7 +409,7 @@ int k9vamps::check_video_packet (uchar *ptr) { // length of video packet plus padding packet must always match sector size if (14 + vid_packet_length + pad_packet_length != SECT_SIZE) - qDebug (QString("Bad video packet length at %1: %2").arg(rtell (ptr)).arg(vid_packet_length)); + qDebug (TQString("Bad video packet length at %1: %2").tqarg(rtell (ptr)).tqarg(vid_packet_length)); return rc; } @@ -479,7 +479,7 @@ int k9vamps::requant (uchar *dst, uchar *src, int n, float fact) { double realrqtfact=(double)(vin_bytes) / (double)(vout_bytes+rv); avgdiff = ((m_avgfact) /realrqtfact); - //qDebug ("factor : " +QString::number(m_avgfact) +" --> " +QString::number((float)n/(float)rv) +" avgdiff : " + QString::number(avgdiff) +" rqt_visize :" +QString::number(m_requant->rqt_visize) +" ps_size :" +QString::number(ps_size) + " vin_bytes :" + QString::number(vin_bytes)) ; + //qDebug ("factor : " +TQString::number(m_avgfact) +" --> " +TQString::number((float)n/(float)rv) +" avgdiff : " + TQString::number(avgdiff) +" rqt_visize :" +TQString::number(m_requant->rqt_visize) +" ps_size :" +TQString::number(ps_size) + " vin_bytes :" + TQString::number(vin_bytes)) ; return rv; @@ -636,7 +636,7 @@ void k9vamps::vap_leader () { data_length |= ptr [5]; if (14 + data_length != SECT_SIZE - 6) - fatal (QString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length)); + fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length)); //JMP:à vérifier skip (SECT_SIZE); @@ -681,7 +681,7 @@ void k9vamps::vap_trailer (int length) { data_length |= ptr [5]; if (14 + data_length != SECT_SIZE - 6) - fatal (QString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length)); + fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length)); skip (SECT_SIZE); } else { copy (SECT_SIZE); @@ -802,7 +802,7 @@ int k9vamps::vap_phase1 (void) { data_length |= ptr [5]; if (14 + data_length != SECT_SIZE - 6) - fatal (QString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length)); + fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length)); break; @@ -938,7 +938,7 @@ void k9vamps::vap_phase2 (int seq_length) { data_length |= ptr [5]; if (14 + data_length != SECT_SIZE - 6) - fatal (QString("Bad padding packet length at %1: %2").arg(rtell (ptr)).arg(data_length)); + fatal (TQString("Bad padding packet length at %1: %2").tqarg(rtell (ptr)).tqarg(data_length)); //JMP: à vérifier skip (SECT_SIZE); break; @@ -955,7 +955,7 @@ void k9vamps::vap_phase2 (int seq_length) { } } -QString & k9vamps::geterrMsg() { +TQString & k9vamps::geterrMsg() { return m_errMsg; } @@ -1068,7 +1068,7 @@ void k9vamps::abort() { // this is a *very* sophisticated kind of error handling :-) void -k9vamps::fatal (QString msg) { +k9vamps::fatal (TQString msg) { m_errMsg=msg; m_error=true; if (m_requant !=NULL) diff --git a/k9vamps/k9vamps.h b/k9vamps/k9vamps.h index 8f0b945..b757db7 100755 --- a/k9vamps/k9vamps.h +++ b/k9vamps/k9vamps.h @@ -13,9 +13,9 @@ #define K9VAMPS_H #include "k9common.h" -#include -#include -#include +#include +#include +#include #include #include #include @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include "k9dvdbackup.h" #include "k9requant.h" #include "k9fifo.h" @@ -47,13 +47,13 @@ -class k9bgUpdate : public QThread +class k9bgUpdate : public TQThread { private: uchar * m_buffer; k9DVDBackup *m_backup; uint32_t m_size; - QMutex mutex; + TQMutex mutex; public: k9bgUpdate(k9DVDBackup * _backup); void update(uchar *_buffer, uint32_t size); @@ -65,7 +65,7 @@ protected: -class k9vamps:public QThread +class k9vamps:public TQThread { private: uchar *rbuf;// [RBUF_SIZE]; // the PS read buffer @@ -100,20 +100,20 @@ private: bool m_preserve; // preserve audio/spu track numbers float vap_fact; // vaporization factor from cmd line bool noData; - QMutex mutex; + TQMutex mutex; k9bgUpdate *m_bgUpdate; k9fifo m_fifo; - QString m_errMsg; + TQString m_errMsg; bool m_error; double avgdiff; double m_totfact,m_nbfact,m_avgfact; - QFile *m_output; + TQFile *m_output; private: // prototypes void vaporize (void); - void fatal (QString _msg); + void fatal (TQString _msg); int lock(int size); void copy(int size); void skip (int size); @@ -137,8 +137,8 @@ private: int readData(uchar *data,uint size); - QWaitCondition wDataRead; - QWaitCondition wDataReady; + TQWaitCondition wDataRead; + TQWaitCondition wDataReady; k9DVDBackup *m_dvdbackup; k9requant *m_requant; k9SaveImage *m_saveImage; @@ -155,9 +155,9 @@ public: void setInputSize(uint64_t size); void setVapFactor(float factor); void setSaveImage(k9SaveImage*); - void setOutput(QFile *_output); + void setOutput(TQFile *_output); uint64_t getOutputBytes(); - QString & geterrMsg(); + TQString & geterrMsg(); bool geterror(); void abort(); void setPreserve(bool _value); diff --git a/k9vamps/tcmemcpy.cpp b/k9vamps/tcmemcpy.cpp index ceb7c69..c72cd73 100644 --- a/k9vamps/tcmemcpy.cpp +++ b/k9vamps/tcmemcpy.cpp @@ -224,7 +224,7 @@ sse.memcpy_small: # Small block copy routine--no prefetch \n" jg 1b \n\ \n\ # Then copy--forward, which seems to be faster than reverse for \n\ - # certain alignments \n\ + # certain tqalignments \n\ xor %%eax, %%eax \n\ 2: movq (%%esi,%%eax,8), %%mm0 # Copy 8 bytes and loop \n\ movntq %%mm0, (%%edi,%%eax,8) \n\ @@ -320,7 +320,7 @@ sse.memcpy_end: \n\ jg 1b \n\ \n\ # Then copy--forward, which seems to be faster than reverse for \n\ - # certain alignments \n\ + # certain tqalignments \n\ xor %%eax, %%eax \n\ 2: " #movdq " (%%rsi,%%rax,8), %%xmm0 # Copy 16 bytes and loop \n\ movntdq %%xmm0, (%%rdi,%%rax,8) \n\ diff --git a/libdvdnav/decoder.c b/libdvdnav/decoder.c index 1c21f60..9586b30 100644 --- a/libdvdnav/decoder.c +++ b/libdvdnav/decoder.c @@ -35,7 +35,7 @@ uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) { uint64_t result = 0; - uint64_t bit_mask = 0; + uint64_t bit_tqmask = 0; uint64_t examining = 0; int32_t bits; @@ -50,12 +50,12 @@ uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) { abort(); } /* all ones, please */ - bit_mask = ~bit_mask; - bit_mask >>= 63 - start; + bit_tqmask = ~bit_tqmask; + bit_tqmask >>= 63 - start; bits = start + 1 - count; - examining = ((bit_mask >> bits) << bits ); + examining = ((bit_tqmask >> bits) << bits ); command->examined |= examining; - result = (command->instruction & bit_mask) >> bits; + result = (command->instruction & bit_tqmask) >> bits; return (uint32_t) result; } @@ -217,11 +217,11 @@ static int32_t eval_special_instruction(command_t* command, int32_t cond) { /* max number of rows < 256, so we will end this set */ line = 256; return cond ? 256 : 0; - case 3: /* Set temporary parental level and goto */ + case 3: /* Set temporary tqparental level and goto */ line = vm_getbits(command, 7, 8); level = vm_getbits(command, 11, 4); if(cond) { - /* This always succeeds now, if we want real parental protection */ + /* This always succeeds now, if we want real tqparental protection */ /* we need to ask the user and have passwords and stuff. */ command->registers->SPRM[13] = level; } diff --git a/libdvdnav/dvdnav.h b/libdvdnav/dvdnav.h index 1e39d0b..b8618d9 100644 --- a/libdvdnav/dvdnav.h +++ b/libdvdnav/dvdnav.h @@ -52,7 +52,7 @@ extern "C" { */ typedef struct dvdnav_s dvdnav_t; -/* Status as reported by most of libdvdnav's functions */ +/* tqStatus as reported by most of libdvdnav's functions */ typedef int32_t dvdnav_status_t; /* @@ -120,22 +120,22 @@ int64_t dvdnav_convert_time(dvd_time_t *time); */ /* - * Sets the region mask (bit 0 set implies region 1, bit 1 set implies + * Sets the region tqmask (bit 0 set implies region 1, bit 1 set implies * region 2, etc) of the virtual machine. Generally you will only need to set * this if you are playing RCE discs which query the virtual machine as to its * region setting. * * This has _nothing_ to do with the region setting of the DVD drive. */ -dvdnav_status_t dvdnav_set_region_mask(dvdnav_t *self, int32_t region_mask); +dvdnav_status_t dvdnav_set_region_tqmask(dvdnav_t *self, int32_t region_tqmask); /* - * Returns the region mask (bit 0 set implies region 1, bit 1 set implies + * Returns the region tqmask (bit 0 set implies region 1, bit 1 set implies * region 2, etc) of the virtual machine. * * This has _nothing_ to do with the region setting of the DVD drive. */ -dvdnav_status_t dvdnav_get_region_mask(dvdnav_t *self, int32_t *region_mask); +dvdnav_status_t dvdnav_get_region_tqmask(dvdnav_t *self, int32_t *region_tqmask); /* * Specify whether read-ahead caching should be used. You may not want this if your diff --git a/libdvdnav/read_cache.c b/libdvdnav/read_cache.c index 1941c3c..685a440 100644 --- a/libdvdnav/read_cache.c +++ b/libdvdnav/read_cache.c @@ -47,7 +47,7 @@ typedef struct read_cache_chunk_s { uint8_t *cache_buffer; - uint8_t *cache_buffer_base; /* used in malloc and free for alignment */ + uint8_t *cache_buffer_base; /* used in malloc and free for tqalignment */ int32_t cache_start_sector; /* -1 means cache invalid */ int32_t cache_read_count; /* this many sectors are already read */ size_t cache_block_count; /* this many sectors will go in this chunk */ diff --git a/libdvdnav/settings.c b/libdvdnav/settings.c index 4af8aea..a760b96 100644 --- a/libdvdnav/settings.c +++ b/libdvdnav/settings.c @@ -29,7 +29,7 @@ /* Characteristics/setting API calls */ -dvdnav_status_t dvdnav_get_region_mask(dvdnav_t *this, int32_t *region) { +dvdnav_status_t dvdnav_get_region_tqmask(dvdnav_t *this, int32_t *region) { if(!this || !region) { printerr("Passed a NULL this pointer."); return DVDNAV_STATUS_ERR; @@ -39,14 +39,14 @@ dvdnav_status_t dvdnav_get_region_mask(dvdnav_t *this, int32_t *region) { return DVDNAV_STATUS_OK; } -dvdnav_status_t dvdnav_set_region_mask(dvdnav_t *this, int32_t mask) { +dvdnav_status_t dvdnav_set_region_tqmask(dvdnav_t *this, int32_t tqmask) { if(!this) { printerr("Passed a NULL this pointer."); return DVDNAV_STATUS_ERR; } pthread_mutex_lock(&this->vm_lock); - this->vm->state.registers.SPRM[20] = (mask & 0xff); + this->vm->state.registers.SPRM[20] = (tqmask & 0xff); pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_OK; } diff --git a/libdvdnav/vm.c b/libdvdnav/vm.c index dbebafa..0df5f0b 100644 --- a/libdvdnav/vm.c +++ b/libdvdnav/vm.c @@ -359,11 +359,11 @@ int vm_reset(vm_t *vm, const char *dvdroot) { /* ifoRead_TXTDT_MGI(vmgi); Not implemented yet */ } if (vm->vmgi) { - int i, mask; - fprintf(MSG_OUT, "libdvdnav: DVD disk reports itself with Region mask 0x%08x. Regions:", + int i, tqmask; + fprintf(MSG_OUT, "libdvdnav: DVD disk reports itself with Region tqmask 0x%08x. Regions:", vm->vmgi->vmgi_mat->vmg_category); - for (i = 1, mask = 1; i <= 8; i++, mask <<= 1) - if (((vm->vmgi->vmgi_mat->vmg_category >> 16) & mask) == 0) + for (i = 1, tqmask = 1; i <= 8; i++, tqmask <<= 1) + if (((vm->vmgi->vmgi_mat->vmg_category >> 16) & tqmask) == 0) fprintf(MSG_OUT, " %d", i); fprintf(MSG_OUT, "\n"); } 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 -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #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 @@ backupDlg - + backupDlg - + 0 0 @@ -20,13 +20,13 @@ 0 - + 0 0 - + 9999 9999 @@ -57,7 +57,7 @@ 8 - + textLabel1 @@ -82,15 +82,15 @@ <p align="left"><b>DVD Backup</b></p> - + - layout3 + tqlayout3 unnamed - + lblStep @@ -114,7 +114,7 @@ Current step - + pbStep @@ -122,7 +122,7 @@ 3 - + pbTotal @@ -141,7 +141,7 @@ - + textLabel1_2 @@ -160,7 +160,7 @@ Elapsed Time - + lblTime @@ -179,9 +179,9 @@ --:--:-- - + - layout1 + tqlayout1 3 @@ -200,7 +200,7 @@ Expanding - + 131 20 @@ -228,7 +228,7 @@ - + lblFactor @@ -236,7 +236,7 @@ 3 - + frame3 @@ -271,13 +271,13 @@ 0 - + 25 25 - + 25 25 @@ -309,14 +309,14 @@ Expanding - + 476 20 - + image @@ -354,7 +354,7 @@ Expanding - + 380 20 @@ -371,11 +371,11 @@ bAbortClick() - + bAbortClick() bPlayToggled(bool state) - - + + kpushbutton.h kpushbutton.h 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 -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /* - * 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 @@ DVDProgress - + DVDProgress - + 0 0 @@ -20,13 +20,13 @@ 0 - + 0 150 - + 400 150 @@ -42,9 +42,9 @@ unnamed - + - layout2 + tqlayout2 3 @@ -53,7 +53,7 @@ unnamed - + lblTotal @@ -64,7 +64,7 @@ - + pbTotal @@ -80,9 +80,9 @@ - + - layout1 + tqlayout1 3 @@ -91,7 +91,7 @@ unnamed - + lblTitle @@ -102,7 +102,7 @@ - + pbTitle @@ -124,9 +124,9 @@ - + - lblStatus + lbltqStatus 3 @@ -137,5 +137,5 @@ - + 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 +#include 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::iterator i=m_codecs.begin();i!=m_codecs.end();++i) { + TQStringList labels; + TQStringList options; + for (TQMap::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 +#include /** @author Jean-Michel PETIT */ 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 m_codecs; + TQMap 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 -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #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 +#include #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 +#include #include #include #include #include -#include +#include #include 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 <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(factory->create(qApp->mainWidget(),"progress", "k9Progress")); +// progress=static_cast(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 <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 { +class k9VobuList : public TQPtrList { 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 audio; - QValueList subpicture; + TQValueList audio; + TQValueList subpicture; k9CellList *cellList; private: int numVobu; void addRefStream(k9Vobu *_vobu,uchar *_buffer,uint32_t _position); - QPtrList m_titles; + TQPtrList m_titles; }; -class k9CellList : public QPtrList { +class k9CellList : public TQPtrList { 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 -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::iterator it; + TQValueList::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::iterator it; + TQValueList::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 { +class k9CellVTSList : public TQPtrList { 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 VTSList; + //TQPtrList 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 -#include -#include +#include +#include +#include #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 +#include -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 -#include +#include +#include /** @author Jean-Michel PETIT */ -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 +#include #include #include #include +#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=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 -#include -#include +#include +#include +#include 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 m_titlesets; - QString m_title; + TQObjectList m_titles; + TQPtrList 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 #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #include -#include +#include 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 it (files); + TQPtrListIterator 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 +#include #include "k9process.h" -#include -#include +#include +#include #include #include /** *@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 files; + TQPtrList 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 #include -#include -#include +#include +#include #include #include @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #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::iterator it; + TQValueList::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;iCellcells.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; ivobuvobus.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::iterator it; + TQValueList::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::iterator it; + TQValueList::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 (factorsetFactor(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 -#include -#include +#include +#include +#include /** @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 { +class k9TitleSetList:public TQPtrList { protected: - int compareItems ( QPtrCollection::Item item1, QPtrCollection::Item item2 ); + int compareItems ( TQPtrCollection::Item item1, TQPtrCollection::Item item2 ); }; -class k9CadtList:public QPtrList { +class k9CadtList:public TQPtrList { 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 vobuQueue; - QMutex mutex; + TQPtrQueue 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 +#include 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 cells; - QValueList startSectors; - virtual const QTime & gettime(); + TQPtrList cells; + TQValueList 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 -#include +#include +#include -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 +#include /** @author Jean-Michel PETIT @@ -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 files; - QPtrList ifos; + TQPtrList files; + TQPtrList 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 -#include +#include +#include /** @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 +#include #include #include #include #include #include -#include +#include #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& k9DVDSubtitle::getID() { +TQValueList& 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;igetlength()); 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 tchapters=tmp->getChapters(); + TQPtrList 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 -#include -#include +#include +#include +#include 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 id; + TQValueList 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& getID(); + virtual TQValueList& 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 m_titles; + TQPtrList 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 chapters; + TQPtrList 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 #include #include -#include +#include 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 -#include -#include +#include +#include +#include #include "k9dvdtitle.h" -class k9DVDTitleset :public QObject +class k9DVDTitleset :public TQObject { Q_OBJECT + TQ_OBJECT private: int m_num; uint32_t m_size; - QPtrList titles; + TQPtrList 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;jhli.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 +#include #include /** @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 +#include #include -#include +#include #include -#include +#include #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 -#include +#include +#include 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 -#include +#include +#include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include "k9tools.h" #include "k9audiocodecs.h" #include "k9videocodecs.h" -#include +#include -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 chapters=_title->getChapters(); + TQString res=""; + TQPtrList 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 titles=_title->getTitles(); + TQPtrList 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 chapterCells; - QMap::iterator ichapterCells; - QStringList chapters; + TQMap chapterCells; + TQMap::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(),""+i18n ( "Error while running mencoder :" ) +"
"+m_stderr, i18n ( "Encoding error" ) ); + KMessageBox::error ( tqApp->mainWidget(),""+i18n ( "Error while running mencoder :" ) +"
"+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 +#include #include -#include -#include +#include +#include class k9MP4Dlg; /** @author Jean-Michel PETIT */ -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 -#include -#include +#include +#include +#include -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 -#include +#include /** @author Jean-Michel PETIT */ 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 -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -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 it=m_processes.begin() ;it!=m_processes.end() ;++it ) { + for (TQPtrListStdIterator 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 -#include +#include +#include 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 m_items; - QPtrList m_processes; - QTimer m_timer; + TQMap m_items; + TQPtrList 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 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include -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 -#include -#include +#include +#include #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 -#include +#include #include -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 -#include -#include +#include +#include +#include #include "k9fifo.h" #include -#include +#include /** @@ -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 +#include /** @@ -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 -#include +#include -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 +#include /** @author Jean-Michel PETIT @@ -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 +#include 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::iterator i=m_codecs.begin();i!=m_codecs.end();++i) { + TQStringList labels; + TQStringList options; + for (TQMap::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 -#include +#include +#include #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 m_codecs; + TQMap 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 -#include -#include +#include +#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #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 @@ MP4Dlg - + MP4Dlg - + 0 0 @@ -22,7 +22,7 @@ unnamed - + lblTitle @@ -54,7 +54,7 @@ 3 - + frame3 @@ -79,7 +79,7 @@ unnamed - + lblfps @@ -89,11 +89,11 @@ - + AlignVCenter - + lblRemain @@ -103,11 +103,11 @@ - + AlignVCenter - + lblsize @@ -118,7 +118,7 @@ - + lblbitrate @@ -129,7 +129,7 @@ - + textLabel2 @@ -140,7 +140,7 @@ fps - + textLabel2_2 @@ -151,7 +151,7 @@ Elapsed Time - + textLabel1 @@ -162,7 +162,7 @@ Bitrate - + textLabel3 @@ -204,7 +204,7 @@ Expanding - + 225 21 @@ -221,14 +221,14 @@ Fixed - + 20 16 - + image @@ -240,7 +240,7 @@ 0 - + 0 250 @@ -270,10 +270,10 @@ Cancel() - + Cancel() - - + + kprogress.h kpushbutton.h 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 -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #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 @@ processList - + processList - + 0 0 @@ -19,7 +19,7 @@ unnamed - + Processes @@ -89,7 +89,7 @@ Expanding - + 361 20 @@ -106,10 +106,10 @@ bCancelClick() - + bCancelClick() - - + + kpushbutton.h 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 -#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #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 @@ Progress - + Progress - + 0 0 @@ -20,7 +20,7 @@ 0 - + 0 0 @@ -39,7 +39,7 @@ unnamed - + lblTitle @@ -92,7 +92,7 @@ Expanding - + 161 21 @@ -117,14 +117,14 @@ Fixed - + 20 20 - + image @@ -136,7 +136,7 @@ 0 - + 0 250 @@ -155,11 +155,11 @@ Plain - + AlignCenter - + textLabel1 @@ -178,7 +178,7 @@ Elapsed Time - + lblElapsed @@ -197,7 +197,7 @@ - + LabelText @@ -220,7 +220,7 @@ - + AlignVCenter @@ -234,10 +234,10 @@ bCancelClick() - + bCancelClick() - - + + kpushbutton.h kprogress.h diff --git a/src/configDlg.cpp b/src/configDlg.cpp index b4a6fb7..0df4a87 100644 --- a/src/configDlg.cpp +++ b/src/configDlg.cpp @@ -9,33 +9,33 @@ #include "configDlg.h" -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include "kpushbutton.h" /* - * Constructs a configDlg as a child of 'parent', with the + * Constructs a configDlg as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -configDlg::configDlg( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +configDlg::configDlg( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "configDlg" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - configDlgLayout = new QGridLayout( this, 1, 1, 11, 6, "configDlgLayout"); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); + configDlgLayout = new TQGridLayout( this, 1, 1, 11, 6, "configDlgLayout"); - Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1"); + Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); configDlgLayout->addMultiCellLayout( Layout1, 3, 3, 0, 1 ); - spacer4 = new QSpacerItem( 20, 190, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer4 = new TQSpacerItem( 20, 190, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); configDlgLayout->addItem( spacer4, 2, 1 ); - tblDevices = new QTable( this, "tblDevices" ); + tblDevices = new TQTable( this, "tblDevices" ); tblDevices->setNumCols( tblDevices->numCols() + 1 ); tblDevices->horizontalHeader()->setLabel( tblDevices->numCols() - 1, tr2i18n( "device" ) ); tblDevices->setNumCols( tblDevices->numCols() + 1 ); @@ -44,36 +44,36 @@ configDlg::configDlg( QWidget* parent, const char* name, WFlags fl ) tblDevices->horizontalHeader()->setLabel( tblDevices->numCols() - 1, tr2i18n( "Input" ) ); tblDevices->setNumCols( tblDevices->numCols() + 1 ); tblDevices->horizontalHeader()->setLabel( tblDevices->numCols() - 1, tr2i18n( "Output" ) ); - tblDevices->setResizePolicy( QTable::Default ); - tblDevices->setVScrollBarMode( QTable::Auto ); + tblDevices->setResizePolicy( TQTable::Default ); + tblDevices->setVScrollBarMode( TQTable::Auto ); tblDevices->setNumRows( 0 ); tblDevices->setNumCols( 4 ); tblDevices->setShowGrid( TRUE ); - tblDevices->setSelectionMode( QTable::Single ); - tblDevices->setFocusStyle( QTable::SpreadSheet ); + tblDevices->setSelectionMode( TQTable::Single ); + tblDevices->setFocusStyle( TQTable::SpreadSheet ); configDlgLayout->addMultiCellWidget( tblDevices, 1, 2, 0, 0 ); - layout4 = new QVBoxLayout( 0, 0, 6, "layout4"); + tqlayout4 = new TQVBoxLayout( 0, 0, 6, "tqlayout4"); bAdd = new KPushButton( this, "bAdd" ); - bAdd->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) ); + bAdd->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bAdd->sizePolicy().hasHeightForWidth() ) ); bAdd->setProperty( "stdItem", 27 ); - layout4->addWidget( bAdd ); + tqlayout4->addWidget( bAdd ); bRemove = new KPushButton( this, "bRemove" ); - bRemove->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, bRemove->sizePolicy().hasHeightForWidth() ) ); + bRemove->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, bRemove->sizePolicy().hasHeightForWidth() ) ); bRemove->setProperty( "stdItem", 28 ); - layout4->addWidget( bRemove ); + tqlayout4->addWidget( bRemove ); - configDlgLayout->addLayout( layout4, 1, 1 ); + configDlgLayout->addLayout( tqlayout4, 1, 1 ); languageChange(); - resize( QSize(578, 342).expandedTo(minimumSizeHint()) ); + resize( TQSize(578, 342).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bRemove, SIGNAL( clicked() ), this, SLOT( bRemoveClick() ) ); - connect( bAdd, SIGNAL( clicked() ), this, SLOT( bAddClick() ) ); + connect( bRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bRemoveClick() ) ); + connect( bAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bAddClick() ) ); } /* @@ -81,7 +81,7 @@ configDlg::configDlg( QWidget* parent, const char* name, WFlags fl ) */ configDlg::~configDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -96,9 +96,9 @@ void configDlg::languageChange() tblDevices->horizontalHeader()->setLabel( 2, tr2i18n( "Input" ) ); tblDevices->horizontalHeader()->setLabel( 3, tr2i18n( "Output" ) ); bAdd->setText( tr2i18n( "Add" ) ); - bAdd->setAccel( QKeySequence( QString::null ) ); + bAdd->setAccel( TQKeySequence( TQString() ) ); bRemove->setText( tr2i18n( "Remove" ) ); - bRemove->setAccel( QKeySequence( QString::null ) ); + bRemove->setAccel( TQKeySequence( TQString() ) ); } void configDlg::bRemoveClick() diff --git a/src/configDlg.ui b/src/configDlg.ui index 2bc3c78..4000b6b 100644 --- a/src/configDlg.ui +++ b/src/configDlg.ui @@ -1,10 +1,10 @@ configDlg - + configDlg - + 0 0 @@ -33,7 +33,7 @@ 6 - + Layout1 @@ -59,14 +59,14 @@ Expanding - + 20 190 - + device @@ -112,9 +112,9 @@ SpreadSheet - + - layout4 + tqlayout4 @@ -183,12 +183,12 @@ - + bRemoveClick() bAddClick() bOkClick() - - + + kpushbutton.h kpushbutton.h diff --git a/src/images.h b/src/images.h index a3c9198..a4b5e1c 100755 --- a/src/images.h +++ b/src/images.h @@ -60,7 +60,7 @@ static const char* const img_sound[] = "30 29 230 2", ".a c None", ".# c None", - "Qt c None", + "TQt c None", "aA c #101820", "aM c #181820", "aL c #181829", @@ -288,35 +288,35 @@ static const char* const img_sound[] = "a0 c #e6dee6", "b. c #e6e2e6", "bJ c #eee2ee", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#.b.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.c.d.e.f.fQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.g.h.i.j.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.a.k.aQt.lQt.aQt.aQt.m.n.o.p.qQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#.r.sQt.#.t.#Qt.#Qt.u.v.w.x.y.z.AQt.#Qt.#Qt.#", - ".aQt.aQt.B.C.a.D.E.F.a.r.G.H.aQt.I.J.K.L.M.M.N.O.PQt.aQt.aQt", - "Qt.#Qt.#.s.Q.R.c.S.#Qt.k.F.#Qt.T.U.V.W.W.X.Y.Z.0.u.#Qt.#Qt.#", - ".aQt.aQt.1.2.3.f.aQt.aQt.aQt.4.5.V.W.6.W.7.Y.8.y.9Qt.aQt.aQt", - "Qt.#Qt.#Qt.t#.##Qt.#Qt.#Qt#a#b#c.W#d.W.W.M.Y#e.N#f.#Qt.#Qt.#", - ".aQt.aQt#g#h#iQt.aQt.aQt.a#j.V.K.V.W#d#k#l.Y#m#n#oQt.aQt.aQt", - "Qt.#Qt.#.c#pQt.#Qt.#Qt.#Qt.x#q.V.W#d#r#s#t#u#v#w#x.#Qt.#Qt.#", - ".aQt.a#y#z#A.aQt.aQt.aQt#B#C.V.W.6.U#D#E#F#G#u#H#IQt.aQt.aQt", - "Qt.#Qt.##J.#Qt.##K#LQt.##M#q.7#N#N#O#P#Q#R#S#T#U#V.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt#W#X.a#Y#Z#0#1#0#0#2#3#4#T#5#6#U#G#7.aQt.aQt", - "Qt.#Qt.#Qt.#Qt#8#9a.Qta##Saa#Saa#Gabac#Saaadae.Naf.vQt.#Qt.#", - ".aQt.aQtagagahai.aQt.aaj#S#w#wakal#5#l.w#Vaman#N#lao.aQt.aQt", - "Qt.#Qt.#.DapaqahQt.#Qtarak#Tasatauavaw.AaxayazaA.ZaBQt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aaCakaDaEaFaGaHaIaJaK#waLaMaNQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.uaOaDaPaQaRaSaTaU.5aVaWaXaYaZa0.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aa1aja2a3a4a4aJaj.Ua5a6a7a.a8a9#yb..aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qtb#.9babbbcbdbebfbgbh#AbibjbkblbmbnQt.#", - ".aQt.aQt.aQt.aQt.aQt.abnbobp.Ubfbqbrbsbsbt#Aa5bjbua8bmbv.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qtbvbw.Dbxa.bybza7a6a7bzbAbx.DbBbC.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aQtbvbD#ybEbmbBbF.bbGbmbHbIaZbv.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#bJ.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#" + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#.b.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.c.d.e.f.fTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.g.h.i.j.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.a.k.aTQt.lTQt.aTQt.aTQt.m.n.o.p.qTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#.r.sTQt.#.t.#TQt.#TQt.u.v.w.x.y.z.ATQt.#TQt.#TQt.#", + ".aTQt.aTQt.B.C.a.D.E.F.a.r.G.H.aTQt.I.J.K.L.M.M.N.O.PTQt.aTQt.aTQt", + "TQt.#TQt.#.s.Q.R.c.S.#TQt.k.F.#TQt.T.U.V.W.W.X.Y.Z.0.u.#TQt.#TQt.#", + ".aTQt.aTQt.1.2.3.f.aTQt.aTQt.aTQt.4.5.V.W.6.W.7.Y.8.y.9TQt.aTQt.aTQt", + "TQt.#TQt.#TQt.t#.##TQt.#TQt.#TQt#a#b#c.W#d.W.W.M.Y#e.N#f.#TQt.#TQt.#", + ".aTQt.aTQt#g#h#iTQt.aTQt.aTQt.a#j.V.K.V.W#d#k#l.Y#m#n#oTQt.aTQt.aTQt", + "TQt.#TQt.#.c#pTQt.#TQt.#TQt.#TQt.x#q.V.W#d#r#s#t#u#v#w#x.#TQt.#TQt.#", + ".aTQt.a#y#z#A.aTQt.aTQt.aTQt#B#C.V.W.6.U#D#E#F#G#u#H#ITQt.aTQt.aTQt", + "TQt.#TQt.##J.#TQt.##K#LTQt.##M#q.7#N#N#O#P#Q#R#S#T#U#V.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt#W#X.a#Y#Z#0#1#0#0#2#3#4#T#5#6#U#G#7.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt#8#9a.TQta##Saa#Saa#Gabac#Saaadae.Naf.vTQt.#TQt.#", + ".aTQt.aTQtagagahai.aTQt.aaj#S#w#wakal#5#l.w#Vaman#N#lao.aTQt.aTQt", + "TQt.#TQt.#.DapaqahTQt.#TQtarak#Tasatauavaw.AaxayazaA.ZaBTQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aaCakaDaEaFaGaHaIaJaK#waLaMaNTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.uaOaDaPaQaRaSaTaU.5aVaWaXaYaZa0.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aa1aja2a3a4a4aJaj.Ua5a6a7a.a8a9#yb..aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQtb#.9babbbcbdbebfbgbh#AbibjbkblbmbnTQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.abnbobp.Ubfbqbrbsbsbt#Aa5bjbua8bmbv.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQtbvbw.Dbxa.bybza7a6a7bzbAbx.DbBbC.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aTQtbvbD#ybEbmbBbF.bbGbmbHbIaZbv.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#bJ.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#" }; @@ -353,7 +353,7 @@ static const char* const img_video[] = "30 30 205 2", ".a c None", ".# c None", - "Qt c None", + "TQt c None", ".j c #292452", ".q c #292852", ".i c #39305a", @@ -556,36 +556,36 @@ static const char* const img_video[] = "ao c #fff6ff", "ac c #fffaff", "#F c #ffffff", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.bQt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.a.c.d.e.f.g.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#.h.i.j.k.l.mQt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aQt.aQt.nQt.a.o.p.q.r.s.t.u.vQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.w.x.y.z.A.B.C.D.E.F.t.G.H.A.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.a.I.J.K.L.M.A.N.O.D.P.Q.R.S.T.L.U.V.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#.W.y.X.Y.Z.0.1.2.3.4.5.6.7.8Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.9#..2##.D###a#b.z.z#c#d#e.h#fQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.##d#g#h#i#j#k#l.A.3#m#n.n.w.h.B#o#p.#Qt.#Qt.#Qt.#", - ".aQt.aQt.a.g#q#r#s#t#u#v.Q#w.4#x#y#z#A#B#C.V.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt#D#E#F#G#H#I#J#c#K#L.z.X#M#N#O#P.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.g#Q#R#S#S#T#U#V#W.A#X#Y#Z#0#1#2#h.B.aQt.aQt.aQt.aQt", - "Qt.#Qt.##3#4#5#6#7#8#9a..O.D###ka#aaabac#p.AQt.#Qt.#Qt.#Qt.#", - ".aQt.aad#waeafagahaiajakal##am#9anaoapapaq.o.aQt.aQt.aQt.aQt", - "Qt.#Qt.##warasatauavaw.Eax#eay#4abaqaqaz#J#CQt.#Qt.#Qt.#Qt.#", - ".aQt.aQt#taAaBaCawaDaE#zaF.zaGaHaIataJaJaKaL.aQt.aQt.aQt.aQt", - "Qt.#Qt.#aM.L.zaNaOaNaPaQ#e.6aNaJaRaSaTaUaVaWQt.#Qt.#Qt.#Qt.#", - ".aQt.aQtaXaYaZaZ#baZaVa0.AaZa1a2a3a4a5a6a7Qt.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.ha8a9.Xb.aM.o.o.7aOb#babbbc.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.abdaY#Cb.aNbebfbg#ebh#pabQt.aQt.aQt.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qtbi.LbjaF.L#tbkQt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.8Qt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt", - "Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#Qt.#", - ".aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt.aQt" + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.bTQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.a.c.d.e.f.g.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#.h.i.j.k.l.mTQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.nTQt.a.o.p.q.r.s.t.u.vTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.w.x.y.z.A.B.C.D.E.F.t.G.H.A.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.a.I.J.K.L.M.A.N.O.D.P.Q.R.S.T.L.U.V.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#.W.y.X.Y.Z.0.1.2.3.4.5.6.7.8TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.9#..2##.D###a#b.z.z#c#d#e.h#fTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.##d#g#h#i#j#k#l.A.3#m#n.n.w.h.B#o#p.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.a.g#q#r#s#t#u#v.Q#w.4#x#y#z#A#B#C.V.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt#D#E#F#G#H#I#J#c#K#L.z.X#M#N#O#P.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.g#Q#R#S#S#T#U#V#W.A#X#Y#Z#0#1#2#h.B.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.##3#4#5#6#7#8#9a..O.D###ka#aaabac#p.ATQt.#TQt.#TQt.#TQt.#", + ".aTQt.aad#waeafagahaiajakal##am#9anaoapapaq.o.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.##warasatauavaw.Eax#eay#4abaqaqaz#J#CTQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt#taAaBaCawaDaE#zaF.zaGaHaIataJaJaKaL.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#aM.L.zaNaOaNaPaQ#e.6aNaJaRaSaTaUaVaWTQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQtaXaYaZaZ#baZaVa0.AaZa1a2a3a4a5a6a7TQt.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.ha8a9.Xb.aM.o.o.7aOb#babbbc.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.abdaY#Cb.aNbebfbg#ebh#pabTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQtbi.LbjaF.L#tbkTQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.8TQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt", + "TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#TQt.#", + ".aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt.aTQt" }; static const unsigned char img_chapter[] = { diff --git a/src/k9copy.cpp b/src/k9copy.cpp index a65fdf5..ba0275e 100644 --- a/src/k9copy.cpp +++ b/src/k9copy.cpp @@ -23,13 +23,13 @@ #include #include #include -#include +#include #include #include #include #include "kviewmpeg2.h" #include "k9titlefactor.h" -#include +#include #include #include "k9mp4title.h" #include "k9tools.h" @@ -65,7 +65,7 @@ k9Copy::k9Copy() // automatically save settings if changed: window size, toolbar // position, icon size, etc. Also to add actions for the statusbar // toolbar, and keybindings if necessary. - resize(QSize(800,600)); + resize(TQSize(800,600)); setToolviewStyle(KMdi::TextAndIcon); createCopyWindows(); @@ -121,15 +121,15 @@ void k9Copy::createCopyWindows() { m_ToolViews.append(acc); if (m_useXine) { - m_mp2=new K9Mplayer(this); + m_mp2=new K9Mplayer(TQT_TQOBJECT(this)); } else m_mp2=new kViewMPEG2(); m_previewAcc=addToolWindow(m_mp2,KDockWidget::DockRight,getMainDockWidget(),0,i18n("Preview"),i18n("Preview")); m_ToolViews.append(m_previewAcc); - connect(m_k9Main,SIGNAL(showPreview( k9DVD*, k9DVDTitle*,int )),m_mp2,SLOT(open( k9DVD*, k9DVDTitle*,int ))); - connect(m_k9Main,SIGNAL(stopPreview()),m_mp2,SLOT(bStopClick())); + connect(m_k9Main,TQT_SIGNAL(showPreview( k9DVD*, k9DVDTitle*,int )),m_mp2,TQT_SLOT(open( k9DVD*, k9DVDTitle*,int ))); + connect(m_k9Main,TQT_SIGNAL(stopPreview()),m_mp2,TQT_SLOT(bStopClick())); m_factors =new k9TitleFactor( this); m_factors->setUseDvdAuthor(m_useDvdAuthor); @@ -137,8 +137,8 @@ void k9Copy::createCopyWindows() { acc=addToolWindow(m_factors,KDockWidget::DockBottom,getMainDockWidget(),10,i18n("Shrink Factor"),i18n("Shrink Factor")); m_ToolViews.append(acc); - connect(m_k9Main,SIGNAL(SelectionChanged( k9DVD*,bool )),m_factors,SLOT(SelectionChanged( k9DVD*,bool ))); - connect(m_k9Main,SIGNAL(changedTitle( k9DVDTitle* )),m_factors,SLOT(changedTitle( k9DVDTitle* ))); + connect(m_k9Main,TQT_SIGNAL(SelectionChanged( k9DVD*,bool )),m_factors,TQT_SLOT(SelectionChanged( k9DVD*,bool ))); + connect(m_k9Main,TQT_SIGNAL(changedTitle( k9DVDTitle* )),m_factors,TQT_SLOT(changedTitle( k9DVDTitle* ))); KDockWidget *dw=dockManager->findWidgetParentDock (m_factors); dw->setForcedFixedHeight(h); @@ -147,10 +147,10 @@ void k9Copy::createCopyWindows() { // allow the view to change the statusbar and caption - connect(m_k9Main, SIGNAL(changeStatusbar(const QString&,int )), - this, SLOT(changeStatusbar(const QString&,int))); - connect(m_k9Main, SIGNAL(changeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_k9Main, TQT_SIGNAL(changeStatusbar(const TQString&,int )), + this, TQT_SLOT(changeStatusbar(const TQString&,int))); + connect(m_k9Main, TQT_SIGNAL(changeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); setAutoSaveSettings(); KSimpleConfig settings("K9Copy"); @@ -194,8 +194,8 @@ void k9Copy::createImportWindows() { acc=addToolWindow(m_menuEdit, KDockWidget::DockRight, getMainDockWidget(),20,i18n("Edit menu"),i18n("Edit Menu")); m_ToolViews.append(acc); - connect (m_k9Import,SIGNAL(titleSelected(k9Title*)),m_menuEdit,SLOT(titleSelected(k9Title*))); - connect (m_k9Import,SIGNAL(rootSelected(k9NewDVD*)),m_menuEdit,SLOT(rootSelected(k9NewDVD*))); + connect (m_k9Import,TQT_SIGNAL(titleSelected(k9Title*)),m_menuEdit,TQT_SLOT(titleSelected(k9Title*))); + connect (m_k9Import,TQT_SIGNAL(rootSelected(k9NewDVD*)),m_menuEdit,TQT_SLOT(rootSelected(k9NewDVD*))); m_k9Import->setMenuEdit(m_menuEdit); m_newTitle=new k9NewTitle(this); @@ -210,16 +210,16 @@ void k9Copy::createImportWindows() { m_chapterEdit->setIcon(SmallIcon("title")); acc=addToolWindow(m_chapterEdit, KDockWidget::DockBottom, getMainDockWidget(),20,i18n("Chapter properties"),i18n("Chapter properties")); m_ToolViews.append(acc); - connect(m_k9Import,SIGNAL(aviFileSelected(k9AviFile*)),m_chapterEdit,SLOT(setAviFile(k9AviFile*))); + connect(m_k9Import,TQT_SIGNAL(aviFileSelected(k9AviFile*)),m_chapterEdit,TQT_SLOT(setAviFile(k9AviFile*))); // allow the view to change the statusbar and caption /* - connect(m_k9Main, SIGNAL(changeStatusbar(const QString&,int )), - this, SLOT(changeStatusbar(const QString&,int))); - connect(m_k9Main, SIGNAL(changeCaption(const QString&)), - this, SLOT(changeCaption(const QString&))); + connect(m_k9Main, TQT_SIGNAL(changeStatusbar(const TQString&,int )), + this, TQT_SLOT(changeStatusbar(const TQString&,int))); + connect(m_k9Main, TQT_SIGNAL(changeCaption(const TQString&)), + this, TQT_SLOT(changeCaption(const TQString&))); */ setAutoSaveSettings(); KSimpleConfig settings("K9Copy"); @@ -250,48 +250,48 @@ bool k9Copy::queryClose ( ) { void k9Copy::setupActions() { - m_actions["open"]=KStdAction::open(this, SLOT(fileOpen()), actionCollection()); - m_actions["quit"]=KStdAction::quit(this, SLOT(quit()), actionCollection()); - m_actions["preferences"]=KStdAction::preferences(this,SLOT(preferences()),actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); + m_actions["open"]=KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + m_actions["quit"]=KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); + m_actions["preferences"]=KStdAction::preferences(TQT_TQOBJECT(this),TQT_SLOT(preferences()),actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); setStandardToolBarMenuEnabled(TRUE); createStandardStatusBarAction(); PlayTitleAction = new KAction(i18n("Play title"), 0, - this, SLOT(ActionPlayTitle()), + TQT_TQOBJECT(this), TQT_SLOT(ActionPlayTitle()), actionCollection(), "PlayTitle"); m_actions["playtitle"]=PlayTitleAction; - QImage img; + TQImage img; img.loadFromData( img_preview, sizeof( img_preview ), "PNG" ); - PlayTitleAction->setIconSet(QIconSet(img)); + PlayTitleAction->setIconSet(TQIconSet(img)); CopyAction = new KAction(i18n("Copy"), 0, - this, SLOT(ActionCopy()), + TQT_TQOBJECT(this), TQT_SLOT(ActionCopy()), actionCollection(), "Copy"); m_actions["copy"]=CopyAction; CopyAction->setIcon("dvdcopy"); mkMpeg2Action = new KAction(i18n("Extract MPEG2"),0, - this, SLOT(ActionMpeg2()), + TQT_TQOBJECT(this), TQT_SLOT(ActionMpeg2()), actionCollection(),"MakeMPEG2"); m_actions["mp2"]=mkMpeg2Action; mkMpeg2Action->setIcon("mpeg"); mkMP4Action = new KAction(i18n("Create MPEG-4"),0, - this, SLOT(ActionMP4()), + TQT_TQOBJECT(this), TQT_SLOT(ActionMP4()), actionCollection(),"MakeMPEG4"); m_actions["mp4"]=mkMP4Action; mkMP4Action->setIcon("mp4"); ejectAction = new KAction(i18n("Eject"),0, - this, SLOT(ActionEject()), + TQT_TQOBJECT(this), TQT_SLOT(ActionEject()), actionCollection() , "Eject"); ejectAction->setIcon("player_eject"); @@ -299,19 +299,19 @@ void k9Copy::setupActions() { backupAction= new KRadioAction(i18n("DVD Backup"),0, - this, SLOT(ActionBackup()), + TQT_TQOBJECT(this), TQT_SLOT(ActionBackup()), actionCollection(), "backup"); backupAction->setExclusiveGroup("mode"); m_actions["backup"]=backupAction; authorAction= new KRadioAction(i18n("DVD Author"),0, - this, SLOT(ActionAuthor()), + TQT_TQOBJECT(this), TQT_SLOT(ActionAuthor()), actionCollection(), "author"); authorAction->setExclusiveGroup("mode"); m_actions["author"]=authorAction; m_actions["create"]= new KAction(i18n("Create DVD"),0, - this, SLOT(ActionCreate()), + TQT_TQOBJECT(this), TQT_SLOT(ActionCreate()), actionCollection(), "Create"); m_actions["create"]->setIcon("author"); @@ -353,7 +353,7 @@ void k9Copy::optionsConfigureToolbars() { // use the standard toolbar editor saveMainWindowSettings(KGlobal::config(), autoSaveGroup()); KEditToolbar dlg(factory()); - connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(newToolbarConfig())); + connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); dlg.exec(); } @@ -374,8 +374,8 @@ void k9Copy::fileOpen() { void k9Copy::addMp4TitleOptions() { m_mp4=new k9MP4Title(this); m_ToolViews.append(addToolWindow(m_mp4,KDockWidget::DockBottom,getMainDockWidget(),10,i18n("MPEG4 Encoding options"),i18n("MPEG4 Encoding Options"))); - connect(m_k9Main,SIGNAL(changedTitle( k9DVDTitle* )),m_mp4,SLOT(titleChanged( k9DVDTitle* ))); - connect(m_k9Main,SIGNAL(SelectionChanged( k9DVD*,bool )),m_mp4,SLOT(selectionChanged( k9DVD*,bool ))); + connect(m_k9Main,TQT_SIGNAL(changedTitle( k9DVDTitle* )),m_mp4,TQT_SLOT(titleChanged( k9DVDTitle* ))); + connect(m_k9Main,TQT_SIGNAL(SelectionChanged( k9DVD*,bool )),m_mp4,TQT_SLOT(selectionChanged( k9DVD*,bool ))); } @@ -392,14 +392,14 @@ void k9Copy::preferences() { m_ToolViews.removeRef(m_previewAcc); if (m_useXine) - m_mp2=new K9Mplayer(this); + m_mp2=new K9Mplayer(TQT_TQOBJECT(this)); else m_mp2=new kViewMPEG2(); m_previewAcc=addToolWindow(m_mp2,KDockWidget::DockRight,getMainDockWidget(),0,i18n("Preview"),i18n("Preview")); m_ToolViews.append(m_previewAcc); //kViewMPEG2 * v=(kViewMPEG2*) m_mp2; - connect(m_k9Main,SIGNAL(showPreview( k9DVD*, k9DVDTitle*,int )),m_mp2,SLOT(open( k9DVD*, k9DVDTitle*,int ))); - connect(m_k9Main,SIGNAL(stopPreview()),m_mp2,SLOT(bStopClick())); + connect(m_k9Main,TQT_SIGNAL(showPreview( k9DVD*, k9DVDTitle*,int )),m_mp2,TQT_SLOT(open( k9DVD*, k9DVDTitle*,int ))); + connect(m_k9Main,TQT_SIGNAL(stopPreview()),m_mp2,TQT_SLOT(bStopClick())); m_mp4->load(); } @@ -444,7 +444,7 @@ void k9Copy::ActionCreate() { m_k9Import->execute(); } -KMdiToolViewAccessor * k9Copy::setToolWindow(QWidget *_widget,KDockWidget::DockPosition _pos,const QString &tabToolTip,const QString &tabCaption) { +KMdiToolViewAccessor * k9Copy::setToolWindow(TQWidget *_widget,KDockWidget::DockPosition _pos,const TQString &tabToolTip,const TQString &tabCaption) { KMdiToolViewAccessor *acc=addToolWindow(_widget, _pos, getMainDockWidget(),0,tabToolTip,tabCaption); m_ToolViews.append(acc); return acc; @@ -456,26 +456,26 @@ void k9Copy::removeToolWindow(KMdiToolViewAccessor *toolWin) { } -void k9Copy::changeStatusbar(const QString& text,int id) { +void k9Copy::changeStatusbar(const TQString& text,int id) { // display the text on the statusbar statusBar()->changeItem(text,id); } -void k9Copy::changeCaption(const QString& text) { +void k9Copy::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); } -void k9Copy::clone( QString _input,QString _output) { +void k9Copy::clone( TQString _input,TQString _output) { show(); m_k9Main->Clone( _input,_output); } -void k9Copy::setInput(QString _input) { +void k9Copy::setInput(TQString _input) { m_k9Main->setInput(_input); } -void k9Copy::setOutput(QString _output) { +void k9Copy::setOutput(TQString _output) { m_k9Main->setOutput(_output); } @@ -494,7 +494,7 @@ void k9Copy::saveDock() { } } -void k9Copy::closeEvent( QCloseEvent* ce ) { +void k9Copy::closeEvent( TQCloseEvent* ce ) { saveDock(); ce->accept(); kapp->quit(); diff --git a/src/k9copy.h b/src/k9copy.h index 2fb43f4..6406a62 100644 --- a/src/k9copy.h +++ b/src/k9copy.h @@ -37,18 +37,19 @@ class k9NewTitle; class k9ChapterEdit; class k9Copy : public KMdiMainFrm { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor */ k9Copy(); - void clone(QString _input,QString _output); - void setInput(QString _input); - void setOutput(QString _output); + void clone(TQString _input,TQString _output); + void setInput(TQString _input); + void setOutput(TQString _output); KDockWidget* getVisibleDock(); - KMdiToolViewAccessor * setToolWindow(QWidget *_widget,KDockWidget::DockPosition _pos,const QString &tabToolTip,const QString &tabCaption) ; + KMdiToolViewAccessor * setToolWindow(TQWidget *_widget,KDockWidget::DockPosition _pos,const TQString &tabToolTip,const TQString &tabCaption) ; void removeToolWindow(KMdiToolViewAccessor *toolWin); /** @@ -58,7 +59,7 @@ public: protected: bool queryClose( ); - void closeEvent( QCloseEvent* ce ); + void closeEvent( TQCloseEvent* ce ); private slots: void ActionCopy(); @@ -69,8 +70,8 @@ private slots: void ActionAuthor(); void ActionPlayTitle(); void ActionCreate(); - void changeStatusbar(const QString& text,int id); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& text,int id); + void changeCaption(const TQString& text); void optionsConfigureKeys(); void optionsConfigureToolbars(); void newToolbarConfig(); @@ -104,15 +105,15 @@ private: k9TitleFactor *m_factors; k9LangSelect *m_lang; k9MP4Title *m_mp4; - QWidget *m_mp2; + TQWidget *m_mp2; k9MenuEdit *m_menuEdit; k9NewTitle *m_newTitle; k9ChapterEdit *m_chapterEdit; k9Import *m_k9Import; bool m_useXine; bool m_useDvdAuthor; - QMap m_actions; - QPtrList m_ToolViews; + TQMap m_actions; + TQPtrList m_ToolViews; k9CdDrives m_drives; }; diff --git a/src/k9glwidget.cpp b/src/k9glwidget.cpp index 444d823..9594e62 100644 --- a/src/k9glwidget.cpp +++ b/src/k9glwidget.cpp @@ -13,20 +13,20 @@ #include "k9glwidget.h" #ifdef HAVE_OPENGL -#include -#include -#include +#include +#include +#include #include #include "ac.h" #include -k9GLWidget::k9GLWidget(QWidget *parent, const char *name):QGLWidget(parent, name) { +k9GLWidget::k9GLWidget(TQWidget *tqparent, const char *name):TQGLWidget(tqparent, name) { XMapRaised(x11Display(),winId()); m_buffer=NULL; m_height=0; m_width=0; - library=new QLibrary("GL.so.1"); + library=new TQLibrary("GL.so.1"); glClear = (glClear_t) library->resolve( "glClear" ); glRasterPos2i= (glRasterPos2i_t)library->resolve("glRasterPos2i"); @@ -45,9 +45,9 @@ k9GLWidget::k9GLWidget(QWidget *parent, const char *name):QGLWidget(parent, name glGetString=(glGetString_t)library->resolve("glGetString"); } -k9GLWidget* k9GLWidget::createWidget(QWidget *parent , const char *name ) { +k9GLWidget* k9GLWidget::createWidget(TQWidget *tqparent , const char *name ) { //XInitThreads(); - return new k9GLWidget(parent,name); + return new k9GLWidget(tqparent,name); } k9GLWidget::~k9GLWidget() { @@ -61,9 +61,9 @@ void k9GLWidget::paintGL() { } void k9GLWidget::setImage(uchar *_buffer,int _width,int _height,int _len) { - if (qApp==NULL) + if (tqApp==NULL) return; - if (qApp->tryLock() ) { + if (tqApp->tryLock() ) { uchar *buffer=_buffer; m_width=_width; m_height=_height; @@ -74,8 +74,8 @@ void k9GLWidget::setImage(uchar *_buffer,int _width,int _height,int _len) { //m_stack.push(buffer); m_mutex.unlock(); update(); - if (qApp !=NULL) - qApp->unlock(); + if (tqApp !=NULL) + tqApp->unlock(); } else { free(_buffer); } diff --git a/src/k9glwidget.h b/src/k9glwidget.h index c26237c..e032ed8 100644 --- a/src/k9glwidget.h +++ b/src/k9glwidget.h @@ -14,12 +14,16 @@ #include "k9common.h" +#ifdef Q_MOC_RUN +#define HAVE_OPENGL +#endif // Q_MOC_RUN + #ifdef HAVE_OPENGL -#include -#include -#include -#include +#include +#include +#include +#include typedef void (*glClear_t) (GLbitfield); typedef void (*glRasterPos2i_t) ( GLint , GLint ); @@ -39,12 +43,13 @@ typedef const GLubyte * (*glGetString_t)( GLenum ); /** @author Jean-Michel PETIT */ -class k9GLWidget : public QGLWidget +class k9GLWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: void setImage(uchar *_buffer,int _width,int _height,int _len); - static k9GLWidget * createWidget(QWidget *parent = 0, const char *name = 0); + static k9GLWidget * createWidget(TQWidget *tqparent = 0, const char *name = 0); ~k9GLWidget(); protected: void draw(); @@ -52,12 +57,12 @@ protected: void initializeGL(); void paintGL(); private: - k9GLWidget(QWidget *parent = 0, const char *name = 0); - QImage m_image; - QMutex m_mutex; + k9GLWidget(TQWidget *tqparent = 0, const char *name = 0); + TQImage m_image; + TQMutex m_mutex; int m_width,m_height; uchar *m_buffer; - QLibrary * library; + TQLibrary * library; glClear_t glClear; glRasterPos2i_t glRasterPos2i; @@ -78,18 +83,18 @@ private: #else -#include -#include +#include +#include -class k9GLWidget:public QWidget +class k9GLWidget:public TQWidget { public: - static k9GLWidget * createWidget(QWidget *parent = 0, const char *name = 0) { - return new k9GLWidget(parent,name); + static k9GLWidget * createWidget(TQWidget *tqparent = 0, const char *name = 0) { + return new k9GLWidget(tqparent,name); } void setImage(uchar *_buffer,int _width,int _height,int _len){}; private: - k9GLWidget(QWidget *parent = 0, const char *name = 0){}; + k9GLWidget(TQWidget *tqparent = 0, const char *name = 0){}; }; diff --git a/src/k9langselect.cpp b/src/k9langselect.cpp index 997d514..2700e56 100644 --- a/src/k9langselect.cpp +++ b/src/k9langselect.cpp @@ -16,8 +16,8 @@ #include "k9dvdtitle.h" #include "k9main.h" #include -k9LangSelect::k9LangSelect(k9Main *mainWindow,QWidget* parent, const char* name, WFlags fl) -: langSelect(parent,name,fl) +k9LangSelect::k9LangSelect(k9Main *mainWindow,TQWidget* tqparent, const char* name, WFlags fl) +: langSelect(tqparent,name,fl) { setMain( mainWindow); m_main->setLangSelect( this); @@ -49,23 +49,23 @@ void k9LangSelect::fillLvLanguages() { lvLanguages->clear(); langAudItems.clear(); langSubItems.clear(); - QStringList slAudLang,slSubLang; + TQStringList slAudLang,slSubLang; if (m_dvd->getopened()) { k9DVDSubtitle *l_sub; k9DVDAudioStream *l_auds; - QObjectList *items=m_main->getItems(); + TQObjectList *items=m_main->getItems(); for (uint i=0;icount();i++) { k9DVDListItem *litem=(k9DVDListItem*)items->at(i); switch (litem->streamType) { case SUB: { l_sub=litem->subtitle; - if (slSubLang.contains(l_sub->getlanguage())==0) + if (slSubLang.tqcontains(l_sub->getlanguage())==0) slSubLang.append(l_sub->getlanguage()); break; } case AUD: { l_auds=litem->audioStream; - if (slAudLang.contains(l_auds->getlanguage())==0) + if (slAudLang.tqcontains(l_auds->getlanguage())==0) slAudLang.append(l_auds->getlanguage()); break; } @@ -74,10 +74,10 @@ void k9LangSelect::fillLvLanguages() { } } } - QListViewItem *audioRoot = new QListViewItem(lvLanguages); + TQListViewItem *audioRoot = new TQListViewItem(lvLanguages); audioRoot->setOpen( TRUE ); audioRoot->setText(0, i18n("Audio")); - for ( QStringList::Iterator it = slAudLang.begin(); it != slAudLang.end(); ++it ) { + for ( TQStringList::Iterator it = slAudLang.begin(); it != slAudLang.end(); ++it ) { ckLvLangItem *lvitem=new ckLvLangItem(audioRoot,m_main); lvitem->setText(0,*it); lvitem->streamType=AUD; @@ -85,10 +85,10 @@ void k9LangSelect::fillLvLanguages() { langAudItems.append(lvitem); } - QListViewItem *subRoot = new QListViewItem(lvLanguages); + TQListViewItem *subRoot = new TQListViewItem(lvLanguages); subRoot->setOpen( TRUE ); subRoot->setText(0, i18n("Subtitles")); - for ( QStringList::Iterator it = slSubLang.begin(); it != slSubLang.end(); ++it ) { + for ( TQStringList::Iterator it = slSubLang.begin(); it != slSubLang.end(); ++it ) { ckLvLangItem *lvitem=new ckLvLangItem(subRoot,m_main); lvitem->setText(0,*it); lvitem->streamType=SUB; @@ -108,10 +108,10 @@ void k9LangSelect::update() { } -void k9LangSelect::updateLvLang(const eStreamType streamType,const QString & lang ) { +void k9LangSelect::updateLvLang(const eStreamType streamType,const TQString & lang ) { uint Total=0,Selected=0; - QString lg; - QObjectList *items = m_main->getItems(); + TQString lg; + TQObjectList *items = m_main->getItems(); for (uint i=0;icount();i++) { k9DVDListItem *litem=(k9DVDListItem*)items->at(i); if (litem->streamType==streamType ) { diff --git a/src/k9langselect.h b/src/k9langselect.h index e54ea5c..71697bb 100644 --- a/src/k9langselect.h +++ b/src/k9langselect.h @@ -17,21 +17,21 @@ #include "langselectw.h" #include "k9main.h" -#include +#include class k9Main; class k9DVD; -class ckLvLangItem : public QCheckListItem { +class ckLvLangItem : public TQCheckListItem { public: - ckLvLangItem( QListViewItem *parent,k9Main *dlg) - : QCheckListItem( parent,"",QCheckListItem::CheckBox) { + ckLvLangItem( TQListViewItem *tqparent,k9Main *dlg) + : TQCheckListItem( tqparent,"",TQCheckListItem::CheckBox) { mainDlg=dlg; streamType=NONE; } eStreamType streamType; k9Main *mainDlg; - QString language; + TQString language; protected: void stateChange(bool state); }; @@ -41,9 +41,10 @@ protected: class k9LangSelect : public langSelect { Q_OBJECT + TQ_OBJECT public: - k9LangSelect(k9Main *mainWindow,QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9LangSelect(k9Main *mainWindow,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9LangSelect(); void setMain(k9Main* _value); @@ -60,9 +61,9 @@ protected: /*$PROTECTED_FUNCTIONS$*/ k9Main * m_main; k9DVD *m_dvd; - QPtrList langAudItems; - QPtrList langSubItems; - void updateLvLang(const eStreamType streamType,const QString & lang ); + TQPtrList langAudItems; + TQPtrList langSubItems; + void updateLvLang(const eStreamType streamType,const TQString & lang ); protected slots: /*$PROTECTED_SLOTS$*/ diff --git a/src/k9main.cpp b/src/k9main.cpp index 0daf516..055fe17 100644 --- a/src/k9main.cpp +++ b/src/k9main.cpp @@ -35,34 +35,34 @@ #include "k9titleencopt.h" #include #include -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include -#include -#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include +#include #include -#include +#include -k9DVDListItem::k9DVDListItem(QObject *DVD,ckLvItem *List,eStreamType type) +k9DVDListItem::k9DVDListItem(TQObject *DVD,ckLvItem *List,eStreamType type) { switch(type) { @@ -88,13 +88,13 @@ k9DVDListItem::k9DVDListItem(QObject *DVD,ckLvItem *List,eStreamType type) streamType=type; } -k9Main::k9Main(QWidget* parent, const char* name, k9CdDrives *_drives) - : MainDlg(parent,name),pxVideo((const char **) img_video), pxSound((const char **) img_sound), +k9Main::k9Main(TQWidget* tqparent, const char* name, k9CdDrives *_drives) + : MainDlg(tqparent,name),pxVideo((const char **) img_video), pxSound((const char **) img_sound), pxText((const char **) img_text) { drives=_drives; - m_parent=(k9Copy*)parent; - QImage img; + m_parent=(k9Copy*)tqparent; + TQImage img; img.loadFromData( img_chapter, sizeof( img_chapter ), "PNG" ); pxChapter.convertFromImage( img); /* m_factory = KLibLoader::self()->factory("libk9copy"); @@ -103,27 +103,27 @@ k9Main::k9Main(QWidget* parent, const char* name, k9CdDrives *_drives) } */ - dvd=new k9DVD(this); + dvd=new k9DVD(TQT_TQOBJECT(this)); updating=false; items.setAutoDelete(true); - listView1->setDefaultRenameAction(QListView::Accept); + listView1->setDefaultRenameAction(TQListView::Accept); // KStandardDirs kd; m_prefOutput=locateLocal("tmp","k9copy/",true); //kd.findResource("tmp",""); - connect(drives,SIGNAL(deviceAdded( k9CdDrive*)),this,SLOT(deviceAdded( k9CdDrive* ))); - connect(drives,SIGNAL(deviceRemoved( k9CdDrive*)),this,SLOT(deviceRemoved( k9CdDrive* ))); + connect(drives,TQT_SIGNAL(deviceAdded( k9CdDrive*)),this,TQT_SLOT(deviceAdded( k9CdDrive* ))); + connect(drives,TQT_SIGNAL(deviceRemoved( k9CdDrive*)),this,TQT_SLOT(deviceRemoved( k9CdDrive* ))); readSettings(); bInputOpen->setPixmap(SmallIcon("fileopen")); bInputOpenDir->setPixmap(SmallIcon("folder_open")); emit SelectionChanged(NULL,true); - m_update=new k9UpdateFactor(this,""); - connect(m_update,SIGNAL(updateFactor_internal()),this,SLOT(updateFactor_internal())); + m_update=new k9UpdateFactor(TQT_TQOBJECT(this),""); + connect(m_update,TQT_SIGNAL(updateFactor_internal()),this,TQT_SLOT(updateFactor_internal())); } -k9DVDListItem *k9Main::addListItem(QObject *DVD,ckLvItem *List,eStreamType type) +k9DVDListItem *k9Main::addListItem(TQObject *DVD,ckLvItem *List,eStreamType type) { k9DVDListItem *litem; litem=new k9DVDListItem(DVD,List,type); @@ -142,7 +142,7 @@ int ckLvItem::rtti() const return(1001); } -int ckLvItem::compare ( QListViewItem * i, int col, bool ascending ) const +int ckLvItem::compare ( TQListViewItem * i, int col, bool ascending ) const { if (i->rtti() !=1001) return 1; @@ -216,7 +216,7 @@ int ckLvItem::compare ( QListViewItem * i, int col, bool ascending ) const return k9Main::compare(ch1->getsectors(),ch2->getsectors()); } } - return QCheckListItem::compare(i,col,ascending); + return TQCheckListItem::compare(i,col,ascending); } double ckLvItem::getstreamSize() @@ -251,7 +251,7 @@ double ckLvItem::getstreamSize() } -int LvItem::compare ( QListViewItem * i, int col, bool ascending ) const +int LvItem::compare ( TQListViewItem * i, int col, bool ascending ) const { if(i->rtti()==1001) return -1; @@ -270,15 +270,15 @@ int LvItem::compare ( QListViewItem * i, int col, bool ascending ) const return k9Main::compare(title1->getpgc(),title2->getpgc()); } - return QListViewItem::compare(i,col,ascending); + return TQListViewItem::compare(i,col,ascending); } -void ckLvItem::paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align ) +void ckLvItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { if (column==1) { p->eraseRect(0,0,width,height()); - QFont f(p->font()); + TQFont f(p->font()); switch (objectType) { @@ -287,7 +287,7 @@ void ckLvItem::paintCell ( QPainter * p, const QColorGroup & cg, int column, int k9DVDTitleset *titleset=(k9DVDTitleset*)obj; f.setBold(true); p->setFont(f); - p->drawText(0,0,width,height(),Qt::AlignRight | Qt::AlignVCenter ,titleset->getsize_mb()+" " +i18n("MB")); + p->drawText(0,0,width,height(),TQt::AlignRight | TQt::AlignVCenter ,titleset->getsize_mb()+" " +i18n("MB")); break; } case STREAM: @@ -295,9 +295,9 @@ void ckLvItem::paintCell ( QPainter * p, const QColorGroup & cg, int column, int if ( ! mainDlg->getquickScan()) { double size=getstreamSize(); - QString c; + TQString c; c.sprintf("%.2f ",size); - p->drawText(0,0,width,height(),Qt::AlignRight | Qt::AlignVCenter ,c+i18n("MB")); + p->drawText(0,0,width,height(),TQt::AlignRight | TQt::AlignVCenter ,c+i18n("MB")); } break; } @@ -305,32 +305,32 @@ void ckLvItem::paintCell ( QPainter * p, const QColorGroup & cg, int column, int { k9DVDChapter *chapter=(k9DVDChapter*) obj; double size=(double)chapter->getsectors()/512; - QString c; + TQString c; c.sprintf("%.2f ",size); - p->drawText(0,0,width,height(),Qt::AlignRight | Qt::AlignVCenter ,c+i18n("MB")); + p->drawText(0,0,width,height(),TQt::AlignRight | TQt::AlignVCenter ,c+i18n("MB")); } break; default: - QCheckListItem::paintCell(p,cg,column,width,align); + TQCheckListItem::paintCell(p,cg,column,width,align); } } else - QCheckListItem::paintCell(p,cg,column,width,align); + TQCheckListItem::paintCell(p,cg,column,width,align); } -void LvItem::paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align ) +void LvItem::paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ) { if (column==1 && objectType==TITLE) { p->eraseRect(0,0,width,height()); k9DVDTitle * title=(k9DVDTitle*)obj; - QString c; + TQString c; c.sprintf("%.2f ",title->gettotalsize_mb()); - p->drawText(0,0,width,height(),Qt::AlignRight | Qt::AlignVCenter ,c+i18n("MB")); + p->drawText(0,0,width,height(),TQt::AlignRight | TQt::AlignVCenter ,c+i18n("MB")); } else - QListViewItem::paintCell(p,cg,column,width,align); + TQListViewItem::paintCell(p,cg,column,width,align); } void ckLvItem::stateChange(bool state) @@ -367,7 +367,7 @@ bool k9Main::getupdating() void k9Main::Copy() { - QString c,filename; + TQString c,filename; if (!dvd->getopened()) { KMessageBox::error( this, i18n("DVD is not opened"), i18n("DVD Copy")); @@ -376,23 +376,23 @@ void k9Main::Copy() setDVDSize(); updateSelection(); - QString outputDir=m_prefOutput; + TQString outputDir=m_prefOutput; bool burn=false; if (cbOutputDev->currentItem() ==0) { - 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 =="") return; } else if (cbOutputDev->currentItem()==1) { - outputDir= KFileDialog::getExistingDirectory(QDir::homeDirPath()); + outputDir= KFileDialog::getExistingDirectory(TQDir::homeDirPath()); if (outputDir=="") return; } if (getFreeSpace( m_prefOutput) < m_prefSize) { - if (KMessageBox::warningContinueCancel (this, i18n("Insufficient disk space on %1\n%2 mb expected.").arg(m_prefOutput).arg(m_prefSize),i18n("DVD Copy"))==KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel (this, i18n("Insufficient disk space on %1\n%2 mb expected.").tqarg(m_prefOutput).tqarg(m_prefSize),i18n("DVD Copy"))==KMessageBox::Cancel) return; } stopPreview(); @@ -460,7 +460,7 @@ void k9Main::Copy() } -void k9Main::setProgressWindow(QWidget *_widget) { +void k9Main::setProgressWindow(TQWidget *_widget) { m_toolView=m_parent->setToolWindow(_widget,KDockWidget::DockRight,i18n("processing"),i18n("processing")); m_dockWidget = m_parent->getVisibleDock(); m_parent->setActions( false); @@ -486,16 +486,16 @@ void k9Main::eject() -QString k9Main::getDevice(QComboBox *_combo) +TQString k9Main::getDevice(TQComboBox *_combo) { int index=-1; for (int i=0; i<_combo->count();i++) { - QString t =_combo->text(i); + TQString t =_combo->text(i); if (_combo->text(i) == _combo->currentText()) index=i; } - QString res=""; + TQString res=""; if ((index==-1) || (_combo->currentText() ==i18n("ISO Image"))) { res=_combo->currentText(); @@ -531,16 +531,16 @@ void k9Main::Open() { int i; k9DVDTitle * l_track; - QString t; - QTime h; - connect(listView1,SIGNAL(itemRenamed(QListViewItem*,int)),this,SLOT(itemRenamed(QListViewItem *,int))); - connect(listView1,SIGNAL(expanded( QListViewItem*)),this,SLOT(expanded( QListViewItem* ))); - connect(listView1,SIGNAL(collapsed( QListViewItem*)),this,SLOT(collapsed( QListViewItem* ))); + TQString t; + TQTime h; + connect(listView1,TQT_SIGNAL(itemRenamed(TQListViewItem*,int)),this,TQT_SLOT(itemRenamed(TQListViewItem *,int))); + connect(listView1,TQT_SIGNAL(expanded( TQListViewItem*)),this,TQT_SLOT(expanded( TQListViewItem* ))); + connect(listView1,TQT_SIGNAL(collapsed( TQListViewItem*)),this,TQT_SLOT(collapsed( TQListViewItem* ))); closeDVD(); - QString sDevice=getDevice(cbInputDev); + TQString sDevice=getDevice(cbInputDev); - QString sVolName=""; + TQString sVolName=""; //if no dvd label, try to get it from hal for (k9CdDrive *drive=driveList.first();drive;drive=driveList.next()) { #ifdef HAVE_HAL @@ -582,8 +582,8 @@ void k9Main::Open() { ckLvItem *tsItem = new ckLvItem(root,this,TITLESET); tsItem->setOpen(TRUE); - QString c; - c=i18n("Titleset %1").arg(i+1); + TQString c; + c=i18n("Titleset %1").tqarg(i+1); tsItem->setText(0,c); tsItem->setText(1," "+dvd->gettitleset(i)->getsize_mb() +" " +i18n("MB")); tsItem->obj=dvd->gettitleset(i) ; @@ -612,7 +612,7 @@ void k9Main::Open() void k9Main::setDVDSize() { //k9DVDSize *dvdsize=static_cast(m_factory->create(this,"dvd", "k9DVDSize")); - k9DVDSize *dvdsize=new k9DVDSize(this); + k9DVDSize *dvdsize=new k9DVDSize(TQT_TQOBJECT(this)); dvdsize->setMaxSizeDyn(m_prefSize); delete dvdsize; } @@ -623,14 +623,14 @@ k9Main::~k9Main() delete dvd; } -void k9Main::closeEvent( QCloseEvent* ce ) +void k9Main::closeEvent( TQCloseEvent* ce ) { saveSettings(); ce->accept(); } -void k9Main::addChapters(QListViewItem *_parent,k9DVDTitle *_title) +void k9Main::addChapters(TQListViewItem *_parent,k9DVDTitle *_title) { LvItem *chapter = new LvItem(_parent,CHAPTER); chapter->setText(0, i18n("chapters")); @@ -641,8 +641,8 @@ void k9Main::addChapters(QListViewItem *_parent,k9DVDTitle *_title) for (int i=0;i< _title->getchapterCount();i++) { ckLvItem *it =new ckLvItem(chapter,this,CHAPTER); - it->setText(0,i18n("chapter %1").arg(++ch)); - it->setText(1,i18n("%1 MB").arg((double)(_title->getChapter(i)->getsectors()) /512)); + it->setText(0,i18n("chapter %1").tqarg(++ch)); + it->setText(1,i18n("%1 MB").tqarg((double)(_title->getChapter(i)->getsectors()) /512)); it->streamType=CHAP; it->obj=_title->getChapter(i); chItems.append( it); @@ -654,10 +654,10 @@ void k9Main::addChapters(QListViewItem *_parent,k9DVDTitle *_title) for (int i=0;i< title2->getchapterCount();i++) { ckLvItem *it =new ckLvItem(chapter,this,CHAPTER); - it->setText(0,i18n("chapter %1").arg(++ch)); + it->setText(0,i18n("chapter %1").tqarg(++ch)); it->streamType=CHAP; it->obj=title2->getChapter(i); - it->setText(1,i18n("%1 MB").arg((double)(title2->getChapter(i)->getsectors()) /512)); + it->setText(1,i18n("%1 MB").tqarg((double)(title2->getChapter(i)->getsectors()) /512)); chItems.append( it); it->mainTitle=_title; } @@ -674,7 +674,7 @@ void k9Main::addTitle(k9DVDTitle *track) k9DVDAudioStream *l_auds; k9DVDSubtitle *l_sub; int i; - QString c,ch; + TQString c,ch; listView1->setRootIsDecorated(true); @@ -696,7 +696,7 @@ void k9Main::addTitle(k9DVDTitle *track) video->streamType=VID; addListItem(track,video,VID); video->setOpen( false ); - c=i18n("video %1 ").arg(track->getformat()); + c=i18n("video %1 ").tqarg(track->getformat()); c.append (" - " + track->gettotallength().toString("h:mm:ss")); video->setText(col1, c); c.sprintf("%.2f ", track->gettotalvideosize_mb()); @@ -707,7 +707,7 @@ void k9Main::addTitle(k9DVDTitle *track) for (i=0;i< track->getaudioStreamCount();i++) { l_auds=track->getaudioStream(i); - c=i18n("audio %1 ").arg(i+1); + c=i18n("audio %1 ").tqarg(i+1); c.append( l_auds->getlanguage() + " " +l_auds->getformat()+" " ); ch.sprintf("%dch ",l_auds->getchannels()); c.append(ch+l_auds->getfrequency()+" "+l_auds->getquantization()); @@ -716,7 +716,7 @@ void k9Main::addTitle(k9DVDTitle *track) item->language=l_auds->getlanguage(); addListItem(l_auds,item,AUD); item->setText( col1, c ); - c=i18n("%1 MB").arg(l_auds->getsize_mb()); + c=i18n("%1 MB").tqarg(l_auds->getsize_mb()); item->setText( col2,c); item->setText( col3,l_auds->getcontent()); item->setPixmap(col1,pxSound); @@ -727,14 +727,14 @@ void k9Main::addTitle(k9DVDTitle *track) for (i=0;i< track->getsubPictureCount();i++) { l_sub=track->getsubtitle(i); - c=i18n("subpicture %1 ").arg(i+1); + c=i18n("subpicture %1 ").tqarg(i+1); c.append( l_sub->getlanguage()); ckLvItem * item = new ckLvItem( itemTrack,this,STREAM); item->streamType=SUB; item->language=l_sub->getlanguage(); addListItem(l_sub,item,SUB); item->setText( col1, c ); - c=i18n("%1 MB").arg(l_sub->getsize_mb()); + c=i18n("%1 MB").tqarg(l_sub->getsize_mb()); item->setText( col2,c); item->setText( col3, l_sub->getcontent()); item->setPixmap(col1,pxText); @@ -791,7 +791,7 @@ void k9Main::updateSelection() updating=supdating; } -void k9Main::checkLang(QString lang,eStreamType streamType,bool state) +void k9Main::checkLang(TQString lang,eStreamType streamType,bool state) { updating =true; for (uint i=0;ilistItem->obj; - ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->parent()->parent(); + ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->tqparent()->tqparent(); itemtitleset->setOn(title->gettitleset()->getselected()); } break; @@ -826,7 +826,7 @@ void k9Main::checkLang(QString lang,eStreamType streamType,bool state) checked=state; k9DVDTitle *title=(k9DVDTitle*)litem->listItem->obj; - ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->parent()->parent(); + ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->tqparent()->tqparent(); itemtitleset->setOn(title->gettitleset()->getselected()); } break; @@ -839,7 +839,7 @@ void k9Main::checkLang(QString lang,eStreamType streamType,bool state) for (uint j=0; jlistItem->parent()==litem->listItem->parent() && litem2->streamType==VID ) + if (litem2->listItem->tqparent()==litem->listItem->tqparent() && litem2->streamType==VID ) { litem2->title->setforceSelection(state); litem2->listItem->setOn(state); @@ -883,7 +883,7 @@ void k9Main::checkTitle(bool state, ckLvItem *_item) for (uint i=0;ilistItem->parent() == _item->parent()) + if (litem->listItem->tqparent() == _item->tqparent()) { //if current item is video and is unchecked, uncheck audio and subtitles if (!state && _item->streamType==VID) @@ -928,9 +928,9 @@ void k9Main::checkTitle(bool state, ckLvItem *_item) { ckLvItem * itemtitleset; if (_item->streamType==CHAP) - itemtitleset=(ckLvItem*)_item->parent()->parent()->parent(); + itemtitleset=(ckLvItem*)_item->tqparent()->tqparent()->tqparent(); else - itemtitleset=(ckLvItem*)_item->parent()->parent(); + itemtitleset=(ckLvItem*)_item->tqparent()->tqparent(); itemtitleset->setOn(titleset->getselected()); } @@ -964,7 +964,7 @@ void k9Main::checkAll(bool state) litem->listItem->setOn(state); // k9DVDTitle *title=(k9DVDTitle*)litem->listItem->obj; - ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->parent()->parent(); + ckLvItem * itemtitleset=(ckLvItem*)litem -> listItem->tqparent()->tqparent(); l_title->gettitleset()->setselected(state); itemtitleset->setOn(l_title->gettitleset()->getselected()); } @@ -992,7 +992,7 @@ void k9Main::checkTS( bool _state,ckLvItem *_item ) for (uint i=0;ilistItem->parent ()->parent() == _item) + if (litem->listItem->tqparent ()->tqparent() == _item) { litem->listItem->setOn(_state); } @@ -1007,7 +1007,7 @@ void k9Main::checkTS( bool _state,ckLvItem *_item ) emit SelectionChanged(dvd,withMenus()); } -void k9Main::expanded( QListViewItem *item) { +void k9Main::expanded( TQListViewItem *item) { if (item->rtti()==1001) { ckLvItem *ckit = (ckLvItem*) item; @@ -1016,7 +1016,7 @@ if (item->rtti()==1001) } } -void k9Main::collapsed( QListViewItem *item) { +void k9Main::collapsed( TQListViewItem *item) { if (item->rtti()==1001) { ckLvItem *ckit = (ckLvItem*) item; @@ -1027,10 +1027,10 @@ if (item->rtti()==1001) /** No descriptions */ -void k9Main::itemRenamed(QListViewItem * item,int ) +void k9Main::itemRenamed(TQListViewItem * item,int ) { k9DVDTitle *t=NULL; - QString newText; + TQString newText; if (item->rtti()==1000) { LvItem *it = (LvItem*) item; @@ -1044,10 +1044,10 @@ void k9Main::itemRenamed(QListViewItem * item,int ) newText=ckit->text(0); } - QString c; + TQString c; if (t !=NULL) { - //QMessageBox::critical( this, "test", c.sprintf("%d",it->tag)); + //TQMessageBox::critical( this, "test", c.sprintf("%d",it->tag)); t->setname(newText); m_playbackOptions->titleRenamed( t,newText); } @@ -1103,7 +1103,7 @@ void k9Main::PreviewTitle() if (listView1->selectedItem()->depth() <2) return; int rtti=listView1->selectedItem()->rtti(); - QObject *obj; + TQObject *obj; if (rtti==1000) { LvItem *it=(LvItem*)listView1->selectedItem(); @@ -1141,29 +1141,29 @@ void k9Main::CreateMP4() KMessageBox::error( this, i18n("DVD is not opened"), i18n("MPEG-4 Encoding")); return; } - QString filename=""; + TQString filename=""; int cpt=0; for (int i=0; i < dvd->gettitleCount();i++) { k9DVDTitle *t=dvd->gettitle(i); - changeStatusbar( i18n("Transcoding title : %1").arg(t->getname()) ,sbMessage); + changeStatusbar( i18n("Transcoding title : %1").tqarg(t->getname()) ,sbMessage); if (t->isSelected() && t->getIndexed() ) { - QString name; + TQString name; if (filename=="") - filename=KFileDialog::getSaveFileName (QDir::homeDirPath(),"*.avi|Audio Video Interleave (*.avi)\n*.mpg|MPEG-1 and MPEG-2 systems (*.mpg)\n*.mp4|MPEG-4 format (*.mp4)\n*.asf|Advanced Streaming Format (*.asf)\n*.swf|Adobe Flash (*.swf)\n*.flv|Adobe Flash video files (*.flv)\n*.rm|RealVideo (*.rm)\n*.mov|QuickTime (*.mov)", 0,i18n("Save file to disk")); + filename=KFileDialog::getSaveFileName (TQDir::homeDirPath(),"*.avi|Audio Video Interleave (*.avi)\n*.mpg|MPEG-1 and MPEG-2 systems (*.mpg)\n*.mp4|MPEG-4 format (*.mp4)\n*.asf|Advanced Streaming Format (*.asf)\n*.swf|Adobe Flash (*.swf)\n*.flv|Adobe Flash video files (*.flv)\n*.rm|RealVideo (*.rm)\n*.mov|QuickTime (*.mov)", 0,i18n("Save file to disk")); if (filename=="") break; k9MP4Enc *mp4=new k9MP4Enc(); setProgressWindow( mp4->getDialog()); if (cpt >0) { - QString ext=filename.section(".",-1); + TQString ext=filename.section(".",-1); if (ext!="") ext="."+ext; - QString path=filename.left(filename.length()-ext.length()); - path=path+QString::number(cpt)+ext; + TQString path=filename.left(filename.length()-ext.length()); + path=path+TQString::number(cpt)+ext; mp4->setFilename(path); } else @@ -1176,9 +1176,9 @@ void k9Main::CreateMP4() mp4->setVideoBitrate(opt->getVideoBr()); mp4->setCodec( opt->getCodec()); mp4->setAudioCodec(opt->getAudioCodec()); - mp4->setSize(QString::number(opt->getMaxSize())); - mp4->setAudioGain(QString::number(opt->getAudioGain())); - mp4->setNumberCD(QString::number(opt->getNumParts())); + mp4->setSize(TQString::number(opt->getMaxSize())); + mp4->setAudioGain(TQString::number(opt->getAudioGain())); + mp4->setNumberCD(TQString::number(opt->getNumParts())); mp4->setWidth(opt->getWidth() ); mp4->setHeight(opt->getHeight()); mp4->set2Passes( opt->get2Passes()); @@ -1202,7 +1202,7 @@ void k9Main::extractMPEG2() { KMessageBox::error( this, i18n("DVD is not opened"), i18n("Extract Mpeg2")); return; } - QString filename=""; + TQString filename=""; int cpt=0; @@ -1211,9 +1211,9 @@ void k9Main::extractMPEG2() { changeStatusbar( i18n("Extracting title : %1",t->getname()) ,sbMessage); if (t->isSelected() && t->getIndexed() ) { - QString name; + TQString name; if (filename=="") - filename=KFileDialog::getSaveFileName (QDir::homeDirPath(),"*.mpg|MPEG-1 and MPEG-2 systems (*.mpg)", 0,i18n("Save file to disk")); + filename=KFileDialog::getSaveFileName (TQDir::homeDirPath(),"*.mpg|MPEG-1 and MPEG-2 systems (*.mpg)", 0,i18n("Save file to disk")); if (filename=="") { break; } @@ -1224,11 +1224,11 @@ void k9Main::extractMPEG2() { mp4->setUseCache(false); if (cpt >0) { - QString ext=filename.section(".",-1); + TQString ext=filename.section(".",-1); if (ext!="") ext="."+ext; - QString path=filename.left(filename.length()-ext.length()); - path=path+QString::number(cpt)+ext; + TQString path=filename.left(filename.length()-ext.length()); + path=path+TQString::number(cpt)+ext; mp4->setFilename(path); } else mp4->setFilename(filename); @@ -1254,11 +1254,11 @@ void k9Main::deviceRemoved(k9CdDrive *_drive) { if (_drive->device == dvd->getDevice()) closeDVD(); - int i=driveList.find(_drive); + int i=driveList.tqfind(_drive); driveList.remove(i); cbInputDev->removeItem(i); - i=recorderList.find(_drive); + i=recorderList.tqfind(_drive); recorderList.remove( i); cbOutputDev->removeItem(i+2); @@ -1268,12 +1268,12 @@ void k9Main::addDrive(k9CdDrive *drive) { #ifdef HAVE_HAL if (drive->getDevice()!=NULL) { k9HalDevice *dev=drive->getDevice(); - connect(dev,SIGNAL(volumeChanged( const QString &,const QString &)),this,SLOT(volumeChanged(const QString&,const QString&))); + connect(dev,TQT_SIGNAL(volumeChanged( const TQString &,const TQString &)),this,TQT_SLOT(volumeChanged(const TQString&,const TQString&))); } #endif if (drive->canReadDVD) { - QString c(drive->name + " ("+drive->device+")"); + TQString c(drive->name + " ("+drive->device+")"); cbInputDev->insertItem(c,-1); driveList.append(drive); } @@ -1302,7 +1302,7 @@ void k9Main::readDrives() } -void k9Main::volumeChanged(const QString &device,const QString &volumeName) { +void k9Main::volumeChanged(const TQString &device,const TQString &volumeName) { if (device==dvd->getDevice() && dvd->getopened() && volumeName=="") closeDVD(); else if (!dvd->getopened() && volumeName !="" && getDevice(cbInputDev)==device) { @@ -1311,9 +1311,9 @@ void k9Main::volumeChanged(const QString &device,const QString &volumeName) { } /*! - \fn k9Main::listView1CurrentChanged( QListViewItem *newItem ) + \fn k9Main::listView1CurrentChanged( TQListViewItem *newItem ) */ -void k9Main::listView1CurrentChanged( QListViewItem *newItem ) +void k9Main::listView1CurrentChanged( TQListViewItem *newItem ) { if (newItem == NULL) { @@ -1339,8 +1339,8 @@ void k9Main::listView1CurrentChanged( QListViewItem *newItem ) ckLvItem *ckit = (ckLvItem*) newItem; if (((ckLvItem*)newItem)->streamType==CHAP) { - LvItem *parent=(LvItem*)(ckit->parent()->parent()); - title=(k9DVDTitle*)parent->obj; + LvItem *tqparent=(LvItem*)(ckit->tqparent()->tqparent()); + title=(k9DVDTitle*)tqparent->obj; } else title=(k9DVDTitle*)ckit->obj; @@ -1387,14 +1387,14 @@ void k9Main::cbOutputDevActivated(int _index) k9CdDrive * drive=(k9CdDrive*)recorderList.at(_index-1); if (drive !=NULL) { - QValueList list=drive->getWriteSpeeds(); - QValueList::iterator it=list.begin(); + TQValueList list=drive->getWriteSpeeds(); + TQValueList::iterator it=list.begin(); cbBurnSpeed->clear(); cbBurnSpeed->insertItem(i18n("default")); while( it !=list.end()) { - cbBurnSpeed->insertItem(QString::number((double)(*it))); + cbBurnSpeed->insertItem(TQString::number((double)(*it))); it++; } } @@ -1402,7 +1402,7 @@ void k9Main::cbOutputDevActivated(int _index) void k9Main::bInputOpenClick() { - QString result=KFileDialog::getOpenFileName (QDir::homeDirPath(),"*.iso", 0,i18n("Open ISO Image")); + TQString result=KFileDialog::getOpenFileName (TQDir::homeDirPath(),"*.iso", 0,i18n("Open ISO Image")); if (result!="") { cbInputDev->setCurrentText(result); @@ -1413,7 +1413,7 @@ void k9Main::bInputOpenClick() void k9Main::bInputOpenDirClick() { - QString result= KDirSelectDialog::selectDirectory (QDir::homeDirPath(), false, this,i18n("Open DVD folder")).path(); + TQString result= KDirSelectDialog::selectDirectory (TQDir::homeDirPath(), false, this,i18n("Open DVD folder")).path(); if (result!="") { cbInputDev->setCurrentText(result); @@ -1426,25 +1426,25 @@ void k9Main::fspDone() fspFinish=true; } -void k9Main::foundMountPoint( const QString &, unsigned long , unsigned long , unsigned long kBAvail) +void k9Main::foundMountPoint( const TQString &, unsigned long , unsigned long , unsigned long kBAvail) { fspAvail=kBAvail; } -long k9Main::getFreeSpace(const QString & _path) +long k9Main::getFreeSpace(const TQString & _path) { fspFinish=false; fspAvail=0; KDiskFreeSp *FreeSp=new KDiskFreeSp(); ; - connect(FreeSp,SIGNAL(foundMountPoint (const QString &, unsigned long , unsigned long , unsigned long )),this,SLOT(foundMountPoint (const QString &, unsigned long , unsigned long , unsigned long ))); - connect(FreeSp,SIGNAL(done ( )),this,SLOT(fspDone ())); - QString mountPoint = KIO::findPathMountPoint( _path ); + connect(FreeSp,TQT_SIGNAL(foundMountPoint (const TQString &, unsigned long , unsigned long , unsigned long )),this,TQT_SLOT(foundMountPoint (const TQString &, unsigned long , unsigned long , unsigned long ))); + connect(FreeSp,TQT_SIGNAL(done ( )),this,TQT_SLOT(fspDone ())); + TQString mountPoint = KIO::findPathMountPoint( _path ); FreeSp->readDF(mountPoint); do { - qApp->processEvents(); + tqApp->processEvents(); } while (!fspFinish); fspAvail/=1024; @@ -1453,7 +1453,7 @@ long k9Main::getFreeSpace(const QString & _path) } -void k9Main::setInput(QString _input) +void k9Main::setInput(TQString _input) { bool found=false; for (uint i=0;i< driveList.count();i++) { @@ -1467,13 +1467,13 @@ void k9Main::setInput(QString _input) cbInputDev->setCurrentText(_input); } -void k9Main::setOutput(QString _output) +void k9Main::setOutput(TQString _output) { cbOutputDev->setCurrentItem(0); for (uint i=0 ;i device); + TQString c(drive->device); // qDebug ("output=" +c); if (c==_output) { @@ -1483,7 +1483,7 @@ void k9Main::setOutput(QString _output) } } -void k9Main::Clone(QString _input,QString _output) +void k9Main::Clone(TQString _input,TQString _output) { setInput(_input); setOutput(_output); @@ -1513,7 +1513,7 @@ void k9Main::updateFactor_internal() if (dvd->getsizeSelected(FALSE)==0) changeStatusbar("",sbFactor); else - changeStatusbar( QString::number(dbfactor,'f',2),sbFactor); + changeStatusbar( TQString::number(dbfactor,'f',2),sbFactor); emit SelectionChanged( dvd,withMenus()); m_mutex.unlock(); } diff --git a/src/k9main.h b/src/k9main.h index 6e9c348..547cbdf 100644 --- a/src/k9main.h +++ b/src/k9main.h @@ -18,35 +18,35 @@ #include "k9mainw.h" #include "kconfigdlg.h" #include "k9playbackoptions.h" -#include +#include #include -#include +#include #include #include -#include +#include #include -#include +#include #include "k9copy.h" -#include +#include enum eStreamType {SUB,AUD,VID,NONE,CHAP} ; enum eObjectType {TITLE,CHAPTER,TITLESET,STREAM,ROOT}; -class LvItem : public QListViewItem { +class LvItem : public TQListViewItem { public: - LvItem( QListViewItem *parent,eObjectType _objectType) - : QListViewItem( parent), obj( NULL ) { + LvItem( TQListViewItem *tqparent,eObjectType _objectType) + : TQListViewItem( tqparent), obj( NULL ) { objectType=_objectType; } - LvItem( QListView *parent,eObjectType _objectType) - : QListViewItem( parent), obj( NULL ) { + LvItem( TQListView *tqparent,eObjectType _objectType) + : TQListViewItem( tqparent), obj( NULL ) { objectType=_objectType; } eObjectType objectType; - QObject *obj; + TQObject *obj; virtual int rtti () const; - int compare ( QListViewItem * i, int col, bool ascending ) const; - void paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align ); + int compare ( TQListViewItem * i, int col, bool ascending ) const; + void paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); }; class k9Main; @@ -59,10 +59,10 @@ class k9PlaybackOptions; class k9LangSelect; class k9UpdateFactor; -class ckLvItem : public QCheckListItem { +class ckLvItem : public TQCheckListItem { public: - ckLvItem( QListViewItem *parent,k9Main *dlg,eObjectType _objectType) - : QCheckListItem( parent,"",QCheckListItem::CheckBox) { + ckLvItem( TQListViewItem *tqparent,k9Main *dlg,eObjectType _objectType) + : TQCheckListItem( tqparent,"",TQCheckListItem::CheckBox) { mainDlg=dlg; obj=NULL; stream=NULL; @@ -70,8 +70,8 @@ public: language=""; objectType=_objectType; } - ckLvItem( QListView *parent,k9Main *dlg,eObjectType _objectType) - : QCheckListItem( parent,"",QCheckListItem::CheckBox) { + ckLvItem( TQListView *tqparent,k9Main *dlg,eObjectType _objectType) + : TQCheckListItem( tqparent,"",TQCheckListItem::CheckBox) { mainDlg=dlg; obj=NULL; stream=NULL; @@ -84,12 +84,12 @@ public: k9Main *mainDlg; k9DVDTitle *mainTitle; - QObject *obj; - QObject *stream; - QString language; + TQObject *obj; + TQObject *stream; + TQString language; virtual int rtti () const; - void paintCell ( QPainter * p, const QColorGroup & cg, int column, int width, int align ); - int compare ( QListViewItem * i, int col, bool ascending ) const; + void paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align ); + int compare ( TQListViewItem * i, int col, bool ascending ) const; double getstreamSize(); protected: @@ -98,8 +98,9 @@ protected: }; -class k9DVDListItem : public QObject { +class k9DVDListItem : public TQObject { Q_OBJECT + TQ_OBJECT public: k9DVDAudioStream *audioStream; k9DVDSubtitle *subtitle; @@ -107,25 +108,26 @@ public: ckLvItem *listItem; eStreamType streamType; public: - k9DVDListItem(QObject *DVD,ckLvItem *List,eStreamType type); + k9DVDListItem(TQObject *DVD,ckLvItem *List,eStreamType type); }; class k9Main : public MainDlg { Q_OBJECT + TQ_OBJECT public: - k9Main(QWidget* parent = 0, const char* name = 0, k9CdDrives *_drives=0 ); + k9Main(TQWidget* tqparent = 0, const char* name = 0, k9CdDrives *_drives=0 ); ~k9Main(); /*$PUBLIC_FUNCTIONS$*/ void addTitle(k9DVDTitle *track); - void addChapters(QListViewItem *_parent,k9DVDTitle *_title); + void addChapters(TQListViewItem *_parent,k9DVDTitle *_title); void updateSelection(); void checkAll(bool state); void checkTS( bool _state,ckLvItem *_item ); void checkTitle(bool state, ckLvItem *_item); - void checkLang(QString lang, eStreamType streamType,bool state); + void checkLang(TQString lang, eStreamType streamType,bool state); bool getupdating(); void saveSettings(); void setDVDSize(); @@ -140,7 +142,7 @@ public: void setLangSelect(k9LangSelect *_value) { m_langSelect=_value; }; - QObjectList *getItems() { + TQObjectList *getItems() { return &items; }; void updateFactor(); @@ -148,18 +150,18 @@ public: k9DVD *dvd; void eject(); private slots: - virtual void listView1CurrentChanged( QListViewItem * ); + virtual void listView1CurrentChanged( TQListViewItem * ); virtual void bSaveClick(); virtual void cbOutputDevActivated(int); virtual void bInputOpenClick(); virtual void bInputOpenDirClick(); - virtual void foundMountPoint (const QString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); + virtual void foundMountPoint (const TQString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); virtual void fspDone(); virtual void updateFactor_internal(); virtual void deviceAdded(k9CdDrive *_drive); virtual void deviceRemoved(k9CdDrive *_drive); - virtual void expanded(QListViewItem*); - virtual void collapsed (QListViewItem*); + virtual void expanded(TQListViewItem*); + virtual void collapsed (TQListViewItem*); public slots: /*$PUBLIC_SLOTS$*/ virtual void PreviewTitle(); @@ -167,42 +169,42 @@ public slots: virtual void extractMPEG2(); virtual void Copy(); virtual void Open(); - virtual void Clone(QString _input,QString _output); - virtual void setInput(QString _input); - virtual void setOutput(QString _output); - virtual void volumeChanged(const QString &device,const QString &volumeName); + virtual void Clone(TQString _input,TQString _output); + virtual void setInput(TQString _input); + virtual void setOutput(TQString _output); + virtual void volumeChanged(const TQString &device,const TQString &volumeName); void setDrives(k9CdDrives* _value); protected: /*$PROTECTED_FUNCTIONS$*/ - QObjectList items; - k9DVDListItem *addListItem(QObject *DVD,ckLvItem *List,eStreamType type); + TQObjectList items; + k9DVDListItem *addListItem(TQObject *DVD,ckLvItem *List,eStreamType type); void readDrives(); void addDrive (k9CdDrive *_drive); k9Copy *m_parent; - QPtrList tsItems; - QPtrList chItems; + TQPtrList tsItems; + TQPtrList chItems; ckLvItem * root; - QPtrList driveList; - QPtrList recorderList; + TQPtrList driveList; + TQPtrList recorderList; k9CdDrives *drives; - QPixmap pxVideo; - QPixmap pxSound; - QPixmap pxText; - QPixmap pxChapter; - QMutex m_mutex; + TQPixmap pxVideo; + TQPixmap pxSound; + TQPixmap pxText; + TQPixmap pxChapter; + TQMutex m_mutex; bool updating; bool fspFinish; long fspAvail; - void closeEvent( QCloseEvent* ce ); + void closeEvent( TQCloseEvent* ce ); void closeDVD(); KLibFactory *m_factory; - QString getDevice(QComboBox *_combo); + TQString getDevice(TQComboBox *_combo); k9UpdateFactor *m_update; //PREFERENCES - QString m_prefOutput; + TQString m_prefOutput; bool m_useDvdAuthor; bool m_quickScan; int m_prefSize; @@ -216,21 +218,21 @@ protected: KDockWidget *m_dockWidget; protected slots: /*$PROTECTED_SLOTS$*/ - void itemRenamed ( QListViewItem *item, int col ); + void itemRenamed ( TQListViewItem *item, int col ); signals: // Signals /** No descriptions */ - void sig_progress(QString str); - void changeStatusbar(const QString& str,int id); - void changeCaption(const QString& str); + void sig_progress(TQString str); + void changeStatusbar(const TQString& str,int id); + void changeCaption(const TQString& str); void showPreview(k9DVD *_dvd,k9DVDTitle * title,int chapter); void stopPreview(); void SelectionChanged(k9DVD *_dvd,bool _withMenus); void changedTitle(k9DVDTitle *_title); private: void fillLvLanguages(); - void updateLvLang(const eStreamType streamType,const QString & lang) ; - long getFreeSpace(const QString & _path); - void setProgressWindow(QWidget *_widget); + void updateLvLang(const eStreamType streamType,const TQString & lang) ; + long getFreeSpace(const TQString & _path); + void setProgressWindow(TQWidget *_widget); void removeProgressWindow(); diff --git a/src/k9mainw.cpp b/src/k9mainw.cpp index 27eb9ac..f2e685c 100644 --- a/src/k9mainw.cpp +++ b/src/k9mainw.cpp @@ -9,131 +9,131 @@ #include "k9mainw.h" -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include "kselect.h" #include "kcombobox.h" #include "klineedit.h" #include "kpushbutton.h" /* - * Constructs a MainDlg as a child of 'parent', with the + * Constructs a MainDlg as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -MainDlg::MainDlg( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +MainDlg::MainDlg( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "MainDlg" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setMinimumSize( QSize( 0, 200 ) ); - MainDlgLayout = new QGridLayout( this, 1, 1, 2, 6, "MainDlgLayout"); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setMinimumSize( TQSize( 0, 200 ) ); + MainDlgLayout = new TQGridLayout( this, 1, 1, 2, 6, "MainDlgLayout"); - lblInput_2 = new QLabel( this, "lblInput_2" ); - lblInput_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, lblInput_2->sizePolicy().hasHeightForWidth() ) ); + lblInput_2 = new TQLabel( this, "lblInput_2" ); + lblInput_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblInput_2->sizePolicy().hasHeightForWidth() ) ); MainDlgLayout->addWidget( lblInput_2, 1, 0 ); - lblInput = new QLabel( this, "lblInput" ); - lblInput->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, lblInput->sizePolicy().hasHeightForWidth() ) ); + lblInput = new TQLabel( this, "lblInput" ); + lblInput->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblInput->sizePolicy().hasHeightForWidth() ) ); MainDlgLayout->addWidget( lblInput, 0, 0 ); - tab = new QWidget( this, "tab" ); - tabLayout = new QGridLayout( tab, 1, 1, 1, 0, "tabLayout"); + tab = new TQWidget( this, "tab" ); + tabLayout = new TQGridLayout( tab, 1, 1, 1, 0, "tabLayout"); factor = new KGradientSelector( tab, "factor" ); factor->setEnabled( FALSE ); - factor->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)4, 0, 0, factor->sizePolicy().hasHeightForWidth() ) ); - factor->setMinimumSize( QSize( 0, 15 ) ); + factor->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)4, 0, 0, factor->sizePolicy().hasHeightForWidth() ) ); + factor->setMinimumSize( TQSize( 0, 15 ) ); factor->setValue( 0 ); factor->setMinValue( 0 ); factor->setMaxValue( 100 ); - factor->setFirstColor( QColor( 170, 0, 0 ) ); - factor->setSecondColor( QColor( 0, 255, 0 ) ); + factor->setFirstColor( TQColor( 170, 0, 0 ) ); + factor->setSecondColor( TQColor( 0, 255, 0 ) ); tabLayout->addWidget( factor, 1, 0 ); - listView1 = new QListView( tab, "listView1" ); + listView1 = new TQListView( tab, "listView1" ); listView1->addColumn( tr2i18n( "Title" ) ); listView1->addColumn( tr2i18n( "Size" ) ); listView1->header()->setResizeEnabled( FALSE, listView1->header()->count() - 1 ); listView1->addColumn( tr2i18n( "Content" ) ); - listView1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, listView1->sizePolicy().hasHeightForWidth() ) ); - listView1->setMinimumSize( QSize( 0, 200 ) ); + listView1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, listView1->sizePolicy().hasHeightForWidth() ) ); + listView1->setMinimumSize( TQSize( 0, 200 ) ); listView1->setShowSortIndicator( TRUE ); tabLayout->addWidget( listView1, 0, 0 ); MainDlgLayout->addMultiCellWidget( tab, 2, 2, 0, 4 ); - textLabel2_2 = new QLabel( this, "textLabel2_2" ); - textLabel2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) ); + textLabel2_2 = new TQLabel( this, "textLabel2_2" ); + textLabel2_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) ); MainDlgLayout->addWidget( textLabel2_2, 1, 4 ); cbBurnSpeed = new KComboBox( FALSE, this, "cbBurnSpeed" ); - cbBurnSpeed->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, cbBurnSpeed->sizePolicy().hasHeightForWidth() ) ); + cbBurnSpeed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbBurnSpeed->sizePolicy().hasHeightForWidth() ) ); cbBurnSpeed->setEditable( TRUE ); MainDlgLayout->addWidget( cbBurnSpeed, 1, 3 ); - textLabel1_3 = new QLabel( this, "textLabel1_3" ); - textLabel1_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, textLabel1_3->sizePolicy().hasHeightForWidth() ) ); + textLabel1_3 = new TQLabel( this, "textLabel1_3" ); + textLabel1_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, textLabel1_3->sizePolicy().hasHeightForWidth() ) ); MainDlgLayout->addWidget( textLabel1_3, 1, 2 ); - cbInputDev = new QComboBox( FALSE, this, "cbInputDev" ); - cbInputDev->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, cbInputDev->sizePolicy().hasHeightForWidth() ) ); + cbInputDev = new TQComboBox( FALSE, this, "cbInputDev" ); + cbInputDev->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbInputDev->sizePolicy().hasHeightForWidth() ) ); cbInputDev->setEditable( TRUE ); cbInputDev->setAutoCompletion( TRUE ); MainDlgLayout->addWidget( cbInputDev, 0, 1 ); - layout2 = new QHBoxLayout( 0, 0, 6, "layout2"); + tqlayout2 = new TQHBoxLayout( 0, 0, 6, "tqlayout2"); bInputOpenDir = new KPushButton( this, "bInputOpenDir" ); - bInputOpenDir->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, bInputOpenDir->sizePolicy().hasHeightForWidth() ) ); - bInputOpenDir->setMinimumSize( QSize( 22, 22 ) ); - bInputOpenDir->setMaximumSize( QSize( 22, 22 ) ); - layout2->addWidget( bInputOpenDir ); + bInputOpenDir->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpenDir->sizePolicy().hasHeightForWidth() ) ); + bInputOpenDir->setMinimumSize( TQSize( 22, 22 ) ); + bInputOpenDir->setMaximumSize( TQSize( 22, 22 ) ); + tqlayout2->addWidget( bInputOpenDir ); bInputOpen = new KPushButton( this, "bInputOpen" ); - bInputOpen->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, bInputOpen->sizePolicy().hasHeightForWidth() ) ); - bInputOpen->setMinimumSize( QSize( 22, 22 ) ); - bInputOpen->setMaximumSize( QSize( 22, 22 ) ); - layout2->addWidget( bInputOpen ); - spacer5_2 = new QSpacerItem( 50, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); - layout2->addItem( spacer5_2 ); + bInputOpen->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, bInputOpen->sizePolicy().hasHeightForWidth() ) ); + bInputOpen->setMinimumSize( TQSize( 22, 22 ) ); + bInputOpen->setMaximumSize( TQSize( 22, 22 ) ); + tqlayout2->addWidget( bInputOpen ); + spacer5_2 = new TQSpacerItem( 50, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + tqlayout2->addItem( spacer5_2 ); - MainDlgLayout->addMultiCellLayout( layout2, 0, 0, 2, 4 ); + MainDlgLayout->addMultiCellLayout( tqlayout2, 0, 0, 2, 4 ); - cbOutputDev = new QComboBox( FALSE, this, "cbOutputDev" ); - cbOutputDev->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, cbOutputDev->sizePolicy().hasHeightForWidth() ) ); + cbOutputDev = new TQComboBox( FALSE, this, "cbOutputDev" ); + cbOutputDev->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbOutputDev->sizePolicy().hasHeightForWidth() ) ); cbOutputDev->setEditable( FALSE ); cbOutputDev->setAutoCompletion( TRUE ); MainDlgLayout->addWidget( cbOutputDev, 1, 1 ); languageChange(); - resize( QSize(743, 585).expandedTo(minimumSizeHint()) ); + resize( TQSize(743, 585).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( listView1, SIGNAL( currentChanged(QListViewItem*) ), this, SLOT( listView1CurrentChanged(QListViewItem*) ) ); - connect( cbOutputDev, SIGNAL( activated(int) ), this, SLOT( cbOutputDevActivated(int) ) ); - connect( bInputOpen, SIGNAL( clicked() ), this, SLOT( bInputOpenClick() ) ); - connect( bInputOpenDir, SIGNAL( clicked() ), this, SLOT( bInputOpenDirClick() ) ); - connect( listView1, SIGNAL( itemRenamed(QListViewItem*,int) ), this, SLOT( itemRenamed(QListViewItem*,int) ) ); + connect( listView1, TQT_SIGNAL( currentChanged(TQListViewItem*) ), this, TQT_SLOT( listView1CurrentChanged(TQListViewItem*) ) ); + connect( cbOutputDev, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbOutputDevActivated(int) ) ); + connect( bInputOpen, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bInputOpenClick() ) ); + connect( bInputOpenDir, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bInputOpenDirClick() ) ); + connect( listView1, TQT_SIGNAL( itemRenamed(TQListViewItem*,int) ), this, TQT_SLOT( itemRenamed(TQListViewItem*,int) ) ); // tab order setTabOrder( cbInputDev, cbOutputDev ); @@ -148,7 +148,7 @@ MainDlg::MainDlg( QWidget* parent, const char* name, WFlags fl ) */ MainDlg::~MainDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -167,10 +167,10 @@ void MainDlg::languageChange() cbBurnSpeed->clear(); cbBurnSpeed->insertItem( tr2i18n( "default" ) ); textLabel1_3->setText( tr2i18n( "@" ) ); - bInputOpenDir->setText( QString::null ); - QToolTip::add( bInputOpenDir, tr2i18n( "Open a folder" ) ); - bInputOpen->setText( QString::null ); - QToolTip::add( bInputOpen, tr2i18n( "Open an iso image" ) ); + bInputOpenDir->setText( TQString() ); + TQToolTip::add( bInputOpenDir, tr2i18n( "Open a folder" ) ); + bInputOpen->setText( TQString() ); + TQToolTip::add( bInputOpen, tr2i18n( "Open an iso image" ) ); } void MainDlg::bSaveClick() @@ -183,9 +183,9 @@ void MainDlg::bDevicesClick() qWarning( "MainDlg::bDevicesClick(): Not implemented yet" ); } -void MainDlg::listView1CurrentChanged(QListViewItem*) +void MainDlg::listView1CurrentChanged(TQListViewItem*) { - qWarning( "MainDlg::listView1CurrentChanged(QListViewItem*): Not implemented yet" ); + qWarning( "MainDlg::listView1CurrentChanged(TQListViewItem*): Not implemented yet" ); } void MainDlg::cbOutputDevActivated(int) @@ -208,9 +208,9 @@ void MainDlg::ckMp4AspectRatioClick() qWarning( "MainDlg::ckMp4AspectRatioClick(): Not implemented yet" ); } -void MainDlg::itemRenamed(QListViewItem*,int) +void MainDlg::itemRenamed(TQListViewItem*,int) { - qWarning( "MainDlg::itemRenamed(QListViewItem*,int): Not implemented yet" ); + qWarning( "MainDlg::itemRenamed(TQListViewItem*,int): Not implemented yet" ); } #include "k9mainw.moc" diff --git a/src/k9mainw.ui b/src/k9mainw.ui index 5598e0b..15a4648 100644 --- a/src/k9mainw.ui +++ b/src/k9mainw.ui @@ -1,10 +1,10 @@ MainDlg - + MainDlg - + 0 0 @@ -20,7 +20,7 @@ 0 - + 0 200 @@ -36,7 +36,7 @@ 2 - + lblInput_2 @@ -52,7 +52,7 @@ Output device - + lblInput @@ -68,7 +68,7 @@ input device - + tab @@ -97,7 +97,7 @@ 0 - + 0 15 @@ -127,7 +127,7 @@ - + Title @@ -172,7 +172,7 @@ 0 - + 0 200 @@ -184,7 +184,7 @@ - + textLabel2_2 @@ -221,7 +221,7 @@ true - + textLabel1_3 @@ -237,7 +237,7 @@ @ - + cbInputDev @@ -256,9 +256,9 @@ true - + - layout2 + tqlayout2 @@ -276,13 +276,13 @@ 0 - + 22 22 - + 22 22 @@ -307,13 +307,13 @@ 0 - + 22 22 - + 22 22 @@ -336,7 +336,7 @@ Expanding - + 50 21 @@ -345,7 +345,7 @@ - + cbOutputDev @@ -369,9 +369,9 @@ listView1 - currentChanged(QListViewItem*) + currentChanged(TQListViewItem*) MainDlg - listView1CurrentChanged(QListViewItem*) + listView1CurrentChanged(TQListViewItem*) cbOutputDev @@ -393,9 +393,9 @@ listView1 - itemRenamed(QListViewItem*,int) + itemRenamed(TQListViewItem*,int) MainDlg - itemRenamed(QListViewItem*,int) + itemRenamed(TQListViewItem*,int) @@ -406,17 +406,17 @@ cbBurnSpeed listView1 - + bSaveClick() bDevicesClick() - listView1CurrentChanged( QListViewItem * ) + listView1CurrentChanged( TQListViewItem * ) cbOutputDevActivated(int) bInputOpenClick() bInputOpenDirClick() ckMp4AspectRatioClick() - itemRenamed(QListViewItem*,int) - - + itemRenamed(TQListViewItem*,int) + + kselect.h kcombobox.h diff --git a/src/k9mainwsov.ui b/src/k9mainwsov.ui index e798ad8..9ba7d5e 100644 --- a/src/k9mainwsov.ui +++ b/src/k9mainwsov.ui @@ -1,10 +1,10 @@ MainDlg - + MainDlg - + 0 0 @@ -22,7 +22,7 @@ 2 - + lblInput_2 @@ -38,7 +38,7 @@ Output device - + textLabel1_3 @@ -54,7 +54,7 @@ @ - + lblInput @@ -91,7 +91,7 @@ true - + cbInputDev @@ -110,7 +110,7 @@ true - + cbOutputDev @@ -129,7 +129,7 @@ true - + textLabel2_2 @@ -145,7 +145,7 @@ X - + tabWidget2 @@ -157,7 +157,7 @@ 0 - + tab @@ -189,7 +189,7 @@ 0 - + 0 15 @@ -219,14 +219,14 @@ - + splitter1 Horizontal - + Title @@ -260,7 +260,7 @@ 0 - + 0 0 @@ -277,9 +277,9 @@ - + - layout2 + tqlayout2 @@ -297,13 +297,13 @@ 0 - + 22 22 - + 22 22 @@ -325,13 +325,13 @@ 0 - + 22 22 - + 22 22 @@ -351,7 +351,7 @@ Expanding - + 50 21 @@ -403,7 +403,7 @@ tabWidget2 listView1 - + bSaveClick() bDevicesClick() listView1CurrentChanged( QListViewItem * ) @@ -412,8 +412,8 @@ bInputOpenDirClick() ckMp4AspectRatioClick() itemRenamed(QListViewItem*,int) - - + + kcombobox.h klineedit.h diff --git a/src/k9mencodercmdgen.cpp b/src/k9mencodercmdgen.cpp index 2681b82..6af03af 100644 --- a/src/k9mencodercmdgen.cpp +++ b/src/k9mencodercmdgen.cpp @@ -12,45 +12,45 @@ #include "k9mencodercmdgen.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -class _k9CheckListItem: public QCheckListItem { +class _k9CheckListItem: public TQCheckListItem { public: - _k9CheckListItem(QListViewItem *_item):QCheckListItem(_item,"",QCheckListItem::CheckBox) {}; - QString root; - QDomDocument doc; + _k9CheckListItem(TQListViewItem *_item):TQCheckListItem(_item,"",TQCheckListItem::CheckBox) {}; + TQString root; + TQDomDocument doc; int page; - QFrame *frame; + TQFrame *frame; int rtti () const {return 1001;} protected: void stateChange(bool _state); }; void _k9CheckListItem::stateChange(bool _state) { - QDomElement eRoot=doc.documentElement().elementsByTagName(root).item(0).toElement(); - QDomElement eCodec=eRoot.elementsByTagName(text()).item(0).toElement(); + TQDomElement eRoot=doc.documentElement().elementsByTagName(root).item(0).toElement(); + TQDomElement eCodec=eRoot.elementsByTagName(text()).item(0).toElement(); eCodec.setAttribute("selected",_state?"true":"false"); } -k9MencoderCmdGen::k9MencoderCmdGen(QWidget* parent, const QString &_cmd, bool modal, WFlags fl) -: MyDialog1(parent,"", modal,fl) +k9MencoderCmdGen::k9MencoderCmdGen(TQWidget* tqparent, const TQString &_cmd, bool modal, WFlags fl) +: MyDialog1(tqparent,"", modal,fl) { setCaption(kapp->makeStdCaption(i18n("MEncoder options"))); m_row=0; m_page=1; @@ -63,34 +63,34 @@ k9MencoderCmdGen::k9MencoderCmdGen(QWidget* parent, const QString &_cmd, bool mo void k9MencoderCmdGen::fillListView() { listView->clear(); listView->header()->hide(); - QListViewItem *item=new QListViewItem(listView); + TQListViewItem *item=new TQListViewItem(listView); item->setOpen(true); item->setText(0,i18n("Audio Codec")); - QDomElement root=m_doc.documentElement().elementsByTagName("AUDIO").item(0).toElement(); + TQDomElement root=m_doc.documentElement().elementsByTagName("AUDIO").item(0).toElement(); for (int i=0; i< root.childNodes().count();i++) { - QDomElement eChild=root.childNodes().item(i).toElement(); + TQDomElement eChild=root.childNodes().item(i).toElement(); _k9CheckListItem *child=new _k9CheckListItem(item); child->setText(0,eChild.nodeName()); child->root="AUDIO"; child->doc=m_doc; - QDomAttr attr=eChild.attributeNode("selected"); + TQDomAttr attr=eChild.attributeNode("selected"); if (!attr.isNull()) child->setOn(attr.value()=="true"); addWidgets(child, "AUDIO",eChild.nodeName()); } - item=new QListViewItem(listView); + item=new TQListViewItem(listView); item->setText(0,i18n("Video Codec")); item->setOpen(true); root=m_doc.documentElement().elementsByTagName("VIDEO").item(0).toElement(); for (int i=0; i< root.childNodes().count();i++) { - QDomElement eChild=root.childNodes().item(i).toElement(); + TQDomElement eChild=root.childNodes().item(i).toElement(); _k9CheckListItem *child=new _k9CheckListItem(item); child->setText(0,eChild.nodeName()); child->root="VIDEO"; child->doc=m_doc; - QDomAttr attr=eChild.attributeNode("selected"); + TQDomAttr attr=eChild.attributeNode("selected"); if (!attr.isNull()) child->setOn(attr.value()=="true"); @@ -99,17 +99,17 @@ void k9MencoderCmdGen::fillListView() { } - item=new QListViewItem(listView); + item=new TQListViewItem(listView); item->setText(0,i18n("Filters")); item->setOpen(true); root=m_doc.documentElement().elementsByTagName("FILTERS").item(0).toElement(); for (int i=0; i< root.childNodes().count();i++) { - QDomElement eChild=root.childNodes().item(i).toElement(); + TQDomElement eChild=root.childNodes().item(i).toElement(); _k9CheckListItem *child=new _k9CheckListItem(item); child->setText(0,eChild.nodeName()); child->root="FILTERS"; child->doc=m_doc; - QDomAttr attr=eChild.attributeNode("selected"); + TQDomAttr attr=eChild.attributeNode("selected"); if (!attr.isNull()) child->setOn(attr.value()=="true"); @@ -124,8 +124,8 @@ k9MencoderCmdGen::~k9MencoderCmdGen() /*$SPECIALIZATION$*/ -void k9MencoderCmdGen::listViewCurrentChanged(QListViewItem *_item) { - if (_item->parent() == NULL) +void k9MencoderCmdGen::listViewCurrentChanged(TQListViewItem *_item) { + if (_item->tqparent() == NULL) wsOptions->raiseWidget(0); else if (_item->rtti()==1001) { _k9CheckListItem *item=(_k9CheckListItem*) _item; @@ -136,7 +136,7 @@ void k9MencoderCmdGen::listViewCurrentChanged(QListViewItem *_item) { } void k9MencoderCmdGen::loadXml() { - QFile file(KGlobal::dirs()->findResource( "data", "k9copy/mencoder.xml")); + TQFile file(KGlobal::dirs()->findResource( "data", "k9copy/mencoder.xml")); if ( !file.open( IO_ReadOnly ) ) return; if ( !m_doc.setContent( &file ) ) { @@ -148,39 +148,39 @@ void k9MencoderCmdGen::loadXml() { } -void k9MencoderCmdGen::addWidgets(_k9CheckListItem *_listItem,QString _root,QString _cat) { +void k9MencoderCmdGen::addWidgets(_k9CheckListItem *_listItem,TQString _root,TQString _cat) { m_cpt=0; - QVBox *vbox=new QVBox(wsOptions); + TQVBox *vbox=new TQVBox(wsOptions); wsOptions->addWidget(vbox,m_page); _listItem->page=m_page; m_page++; - QFrame *fr=new QFrame(vbox); + TQFrame *fr=new TQFrame(vbox); _listItem->frame=fr; - QGridLayout *m_grid1=new QGridLayout(fr,1,1,0,0); - m_scrollView=new QScrollView(fr,0); + TQGridLayout *m_grid1=new TQGridLayout(fr,1,1,0,0); + m_scrollView=new TQScrollView(fr,0); m_scrollView->viewport()->setPaletteBackgroundColor(this->paletteBackgroundColor()); - m_scrollView->setVScrollBarMode(QScrollView::AlwaysOn); + m_scrollView->setVScrollBarMode(TQScrollView::AlwaysOn); m_grid1->addWidget(m_scrollView,0,0); - m_grid=new QGrid(2,m_scrollView->viewport()); + m_grid=new TQGrid(2,m_scrollView->viewport()); m_grid->setSpacing(2); m_scrollView->addChild(m_grid); //finds the VIDEO node - QDomElement eVideo=m_doc.documentElement().elementsByTagName(_root).item(0).toElement(); + TQDomElement eVideo=m_doc.documentElement().elementsByTagName(_root).item(0).toElement(); //gets the codec list - QDomNodeList lCodecs=eVideo.elementsByTagName(_cat); + TQDomNodeList lCodecs=eVideo.elementsByTagName(_cat); for (int i=0; isetChecked(bSel); - m_hbox=new QGrid(2,m_grid); - m_hbox->setFrameShape(QFrame::StyledPanel); - m_hbox->setFrameShadow(QFrame::Raised); + m_hbox=new TQGrid(2,m_grid); + m_hbox->setFrameShape(TQFrame::StyledPanel); + m_hbox->setFrameShadow(TQFrame::Raised); if ( !_eOpt.attributeNode("description").isNull()) { - QToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); - QWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); + TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); + TQWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); } - QDomNodeList lOption=_eOpt.elementsByTagName("subopt"); + TQDomNodeList lOption=_eOpt.elementsByTagName("subopt"); for (int i=0; isetChecked(bSel); - ckLabel->setBackgroundColor(parent->backgroundColor()); + ckLabel->setBackgroundColor(tqparent->backgroundColor()); if ( !_eOpt.attributeNode("description").isNull()) { - QToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); - QWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); + TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); + TQWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); } _eOpt.setAttribute("checkbox",ckLabel->name()); - KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,parent,QString("int%1").arg(m_row++)); + KIntSpinBox *sb= new KIntSpinBox(iMin,iMax,1,iDefault,10,tqparent,TQString("int%1").tqarg(m_row++)); if (iMax <1000) sb->setFixedWidth(50); else @@ -282,8 +282,8 @@ void k9MencoderCmdGen::addInt(QDomElement _eOpt) { //m_grid->addWidget(label,m_row++,0); } -void k9MencoderCmdGen::addFloat(QDomElement _eOpt) { - QString sName=_eOpt.attributeNode("name").value(); +void k9MencoderCmdGen::addFloat(TQDomElement _eOpt) { + TQString sName=_eOpt.attributeNode("name").value(); double dMin=_eOpt.attributeNode("min").value().toDouble(); double dMax=_eOpt.attributeNode("max").value().toDouble(); double dDefault=_eOpt.attributeNode("default").value().toDouble(); @@ -292,20 +292,20 @@ void k9MencoderCmdGen::addFloat(QDomElement _eOpt) { if (_eOpt.nodeName()=="subopt") blist=true; - QWidget *parent; + TQWidget *tqparent; if (!blist) { - parent=m_grid; + tqparent=m_grid; } else - parent=m_hbox; - QDomAttr aSel=_eOpt.attributeNode("selected"); + tqparent=m_hbox; + TQDomAttr aSel=_eOpt.attributeNode("selected"); if (!aSel.isNull()) bSel=aSel.value()=="true"; - QCheckBox *ckLabel=new QCheckBox(sName,parent,QString("ck%1").arg(m_row++)); + TQCheckBox *ckLabel=new TQCheckBox(sName,tqparent,TQString("ck%1").tqarg(m_row++)); ckLabel->setChecked(bSel); if ( !_eOpt.attributeNode("description").isNull()) { - QToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); - QWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); + TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); + TQWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); } _eOpt.setAttribute("checkbox",ckLabel->name()); @@ -317,7 +317,7 @@ void k9MencoderCmdGen::addFloat(QDomElement _eOpt) { if (!_eOpt.attributeNode("precision").isNull()) { iPrecision=_eOpt.attributeNode("precision").value().toInt(); } - KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,parent,QString("float%1").arg(m_row++)); + KDoubleSpinBox *sb= new KDoubleSpinBox(dMin,dMax,dStep,dDefault,iPrecision,tqparent,TQString("float%1").tqarg(m_row++)); if (dMax <1000) sb->setFixedWidth(80); else @@ -329,30 +329,30 @@ void k9MencoderCmdGen::addFloat(QDomElement _eOpt) { _eOpt.setAttribute("widget",sb->name()); } -void k9MencoderCmdGen::addBool(QDomElement _eOpt) { - QString sName=_eOpt.attributeNode("name").value(); +void k9MencoderCmdGen::addBool(TQDomElement _eOpt) { + TQString sName=_eOpt.attributeNode("name").value(); bool blist=false; if (_eOpt.nodeName()=="subopt") blist=true; bool bSel=false; - QWidget *parent; + TQWidget *tqparent; if (!blist) { - parent = m_grid; + tqparent = m_grid; } else - parent = m_hbox; + tqparent = m_hbox; - QDomAttr aSel=_eOpt.attributeNode("selected"); + TQDomAttr aSel=_eOpt.attributeNode("selected"); if (!aSel.isNull()) bSel=aSel.value()=="true"; - QCheckBox *ckLabel=new QCheckBox(sName,parent,QString("ck%1").arg(m_row++)); + TQCheckBox *ckLabel=new TQCheckBox(sName,tqparent,TQString("ck%1").tqarg(m_row++)); if ( !_eOpt.attributeNode("description").isNull()) { - QToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); - QWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); + TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); + TQWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); } - QWidget *w=new QWidget(parent); + TQWidget *w=new TQWidget(tqparent); if ((_eOpt.attributeNode("default").value()=="true") && bSel) ckLabel->setChecked(true); @@ -361,42 +361,42 @@ void k9MencoderCmdGen::addBool(QDomElement _eOpt) { } -void k9MencoderCmdGen::addString(QDomElement _eOpt) { - QString sName=_eOpt.attributeNode("name").value(); +void k9MencoderCmdGen::addString(TQDomElement _eOpt) { + TQString sName=_eOpt.attributeNode("name").value(); bool blist=false; if (_eOpt.nodeName()=="subopt") blist=true; - QString sDefault=_eOpt.attributeNode("default").value(); - QWidget *parent; + TQString sDefault=_eOpt.attributeNode("default").value(); + TQWidget *tqparent; if( !blist) { - parent=m_grid; + tqparent=m_grid; } else - parent=m_hbox; + tqparent=m_hbox; bool bSel=false; - QDomAttr aSel=_eOpt.attributeNode("selected"); + TQDomAttr aSel=_eOpt.attributeNode("selected"); if (!aSel.isNull()) bSel=aSel.value()=="true"; - QCheckBox *ckLabel=new QCheckBox(sName,parent,QString("ck%1").arg(m_row++)); + TQCheckBox *ckLabel=new TQCheckBox(sName,tqparent,TQString("ck%1").tqarg(m_row++)); ckLabel->setChecked(bSel); if ( !_eOpt.attributeNode("description").isNull()) { - QToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); - QWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); + TQToolTip::add(ckLabel,_eOpt.attributeNode("description").value()); + TQWhatsThis::add(ckLabel,_eOpt.attributeNode("description").value()); } _eOpt.setAttribute("checkbox",ckLabel->name()); - QComboBox *cb=new QComboBox(parent,QString("string%1").arg(m_row++)); + TQComboBox *cb=new TQComboBox(tqparent,TQString("string%1").tqarg(m_row++)); - QDomNodeList values=_eOpt.elementsByTagName("value"); + TQDomNodeList values=_eOpt.elementsByTagName("value"); int def=0; if (values.count()==0) { cb->setEditable(true); cb->setCurrentText(sDefault); } else { for (int i=0;iinsertItem(e.attributeNode("name").value()); if (e.attributeNode("name").value() ==sDefault) def=cb->count()-1; @@ -407,44 +407,44 @@ void k9MencoderCmdGen::addString(QDomElement _eOpt) { } -const QString & k9MencoderCmdGen::getCmd(const QString &_root) { - /* QString str; - QTextStream ts(&str,IO_WriteOnly); +const TQString & k9MencoderCmdGen::getCmd(const TQString &_root) { + /* TQString str; + TQTextStream ts(&str,IO_WriteOnly); m_doc.save(ts,4); - QFile f ("/home/jmp/doc.xml"); + TQFile f ("/home/jmp/doc.xml"); f.open(IO_WriteOnly); f.writeBlock(str.latin1(),str.length()); f.close(); */ m_cmd=""; - QString m_sepOpt=":"; - QString m_sepValues=","; + TQString m_sepOpt=":"; + TQString m_sepValues=","; //finds the VIDEO node - QDomElement eRoot=m_doc.documentElement().elementsByTagName(_root).item(0).toElement(); + TQDomElement eRoot=m_doc.documentElement().elementsByTagName(_root).item(0).toElement(); //gets the codec list - QDomNodeList lCodecs=eRoot.childNodes(); + TQDomNodeList lCodecs=eRoot.childNodes(); for (int i=0; ichild(aCheckBox.value().latin1()); + TQDomElement eOpt=lOptions.item(j).toElement(); + TQDomAttr aType=eOpt.attributeNode("type"); + TQDomAttr aCheckBox=eOpt.attributeNode("checkbox"); + TQDomAttr aWidget=eOpt.attributeNode("widget"); + TQCheckBox *ck=(TQCheckBox*)this->child(aCheckBox.value().latin1()); if (ck->isChecked()) { if (sCmd1.isEmpty()){ if (eCodec.attributeNode("options").isNull()) @@ -458,17 +458,17 @@ const QString & k9MencoderCmdGen::getCmd(const QString &_root) { eSep=eOpt.attributeNode("separator"); if (!eSep.isNull()) m_sepValues=eSep.value(); - QDomNodeList lSubOpt=eOpt.elementsByTagName("subopt"); - QString sCmd2=""; - QString sTmp=""; + TQDomNodeList lSubOpt=eOpt.elementsByTagName("subopt"); + TQString sCmd2=""; + TQString sTmp=""; for (int k=0;kchild(eSOpt.attributeNode("checkbox").value().latin1()); + TQCheckBox *Sck=(TQCheckBox*)this->child(eSOpt.attributeNode("checkbox").value().latin1()); if(aSType.value()=="int" && Sck->isChecked()) { KIntSpinBox *isb=(KIntSpinBox*) this->child(aSWidget.value().latin1(),"KIntSpinBox"); if (!sCmd2.isEmpty()) @@ -479,10 +479,10 @@ const QString & k9MencoderCmdGen::getCmd(const QString &_root) { KDoubleSpinBox *isb=(KDoubleSpinBox*) this->child(aSWidget.value().latin1(),"KDoubleSpinBox"); if (!sCmd2.isEmpty()) sCmd2 +=m_sepValues; - sCmd2+=sTmp+sPrefix+isb->text().replace(",",".").stripWhiteSpace(); + sCmd2+=sTmp+sPrefix+isb->text().tqreplace(",",".").stripWhiteSpace(); sTmp=""; } else if(aSType.value()=="string" && Sck->isChecked()) { - QComboBox *cb=(QComboBox*) this->child(aSWidget.value().latin1(),"QComboBox"); + TQComboBox *cb=(TQComboBox*) this->child(aSWidget.value().latin1(),TQCOMBOBOX_OBJECT_NAME_STRING); if (!sCmd2.isEmpty() ) sCmd2 +=m_sepValues; // sCmd2+= cb->text(cb->currentItem()); @@ -509,9 +509,9 @@ const QString & k9MencoderCmdGen::getCmd(const QString &_root) { KDoubleSpinBox *isb=(KDoubleSpinBox*) this->child(aWidget.value().latin1(),"KDoubleSpinBox"); if (!sCmd.isEmpty()) sCmd +=m_sepOpt; - sCmd+= eOpt.attributeNode("name").value() + "=" + isb->text().replace(",","."); + sCmd+= eOpt.attributeNode("name").value() + "=" + isb->text().tqreplace(",","."); } else if(aType.value()=="string") { - QComboBox *cb=(QComboBox*) this->child(aWidget.value().latin1(),"QComboBox"); + TQComboBox *cb=(TQComboBox*) this->child(aWidget.value().latin1(),TQCOMBOBOX_OBJECT_NAME_STRING); if (!sCmd.isEmpty()) sCmd +=m_sepOpt; sCmd+= eOpt.attributeNode("name").value() + "=" + cb->currentText(); @@ -529,14 +529,14 @@ const QString & k9MencoderCmdGen::getCmd(const QString &_root) { return m_cmd; } -bool k9MencoderCmdGen::getMencoderOptions(QString &_cmd) { +bool k9MencoderCmdGen::getMencoderOptions(TQString &_cmd) { k9MencoderCmdGen * m_cmdGen=new k9MencoderCmdGen(NULL,_cmd); m_cmdGen->m_cmd=_cmd; bool res=m_cmdGen->exec(); if (res) { - QString m_video=m_cmdGen->getCmd("VIDEO").stripWhiteSpace(); - QString m_audio=m_cmdGen->getCmd("AUDIO").stripWhiteSpace(); - QString m_filters=m_cmdGen->getCmd("FILTERS").stripWhiteSpace(); + TQString m_video=m_cmdGen->getCmd("VIDEO").stripWhiteSpace(); + TQString m_audio=m_cmdGen->getCmd("AUDIO").stripWhiteSpace(); + TQString m_filters=m_cmdGen->getCmd("FILTERS").stripWhiteSpace(); if (!m_video.isEmpty()) m_video="-ovc "+m_video; if (!m_audio.isEmpty()) @@ -547,11 +547,11 @@ bool k9MencoderCmdGen::getMencoderOptions(QString &_cmd) { return res; } -void k9MencoderCmdGen::parseCmd(const QString &_cmd){ - QString cmd(_cmd); - cmd=cmd.replace("\n"," ").simplifyWhiteSpace(); - QStringList cmdList=QStringList::split(" ",cmd); - for (QStringList::iterator it=cmdList.begin();it!=cmdList.end();++it) { +void k9MencoderCmdGen::parseCmd(const TQString &_cmd){ + TQString cmd(_cmd); + cmd=cmd.tqreplace("\n"," ").simplifyWhiteSpace(); + TQStringList cmdList=TQStringList::split(" ",cmd); + for (TQStringList::iterator it=cmdList.begin();it!=cmdList.end();++it) { if (*it=="-ovc") { ++it; selectCodec("VIDEO",*it); @@ -563,15 +563,15 @@ void k9MencoderCmdGen::parseCmd(const QString &_cmd){ selectCodec("FILTERS","vf"); else if (*it=="-af") selectCodec("FILTERS","af"); - QDomNodeList lRoot=m_doc.documentElement().childNodes(); + TQDomNodeList lRoot=m_doc.documentElement().childNodes(); bool bFound=false; - QString sCodec=*it; + TQString sCodec=*it; for (int i=0;i -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include class _k9CheckListItem; class k9MencoderCmdGen : public MyDialog1 { Q_OBJECT + TQ_OBJECT public: - k9MencoderCmdGen(QWidget* parent, const QString &_cmd, bool modal = FALSE, WFlags fl = 0 ); + k9MencoderCmdGen(TQWidget* tqparent, const TQString &_cmd, bool modal = FALSE, WFlags fl = 0 ); ~k9MencoderCmdGen(); /*$PUBLIC_FUNCTIONS$*/ - static bool getMencoderOptions(QString &_cmd); + static bool getMencoderOptions(TQString &_cmd); public slots: /*$PUBLIC_SLOTS$*/ private: - QScrollView *m_scrollView; - QGrid *m_grid; - QGrid *m_hbox; + TQScrollView *m_scrollView; + TQGrid *m_grid; + TQGrid *m_hbox; int m_row,m_page,m_cpt; - QDomDocument m_doc; - QString m_cmd; + TQDomDocument m_doc; + TQString m_cmd; - void addWidgets(_k9CheckListItem *_item,QString _root,QString _cat); + void addWidgets(_k9CheckListItem *_item,TQString _root,TQString _cat); void loadXml(); void fillListView(); - void addInt(QDomElement _eOpt); - void addFloat(QDomElement _eOpt); - void addBool(QDomElement _eOpt); - void addString(QDomElement _eOpt); - void addList(QDomElement _eOpt); + void addInt(TQDomElement _eOpt); + void addFloat(TQDomElement _eOpt); + void addBool(TQDomElement _eOpt); + void addString(TQDomElement _eOpt); + void addList(TQDomElement _eOpt); - const QString & getCmd(const QString &_root); - void selectCodec(const QString &_root,const QString &_codec); - void parseCodecOptions(const QString &_root,const QString &_codec,const QString & _options); - void parseCmd(const QString &_cmd); + const TQString & getCmd(const TQString &_root); + void selectCodec(const TQString &_root,const TQString &_codec); + void parseCodecOptions(const TQString &_root,const TQString &_codec,const TQString & _options); + void parseCmd(const TQString &_cmd); protected: /*$PROTECTED_FUNCTIONS$*/ protected slots: /*$PROTECTED_SLOTS$*/ - void listViewCurrentChanged(QListViewItem*); + void listViewCurrentChanged(TQListViewItem*); }; #endif diff --git a/src/k9mp4title.cpp b/src/k9mp4title.cpp index 00bf426..e4cf7d6 100644 --- a/src/k9mp4title.cpp +++ b/src/k9mp4title.cpp @@ -15,19 +15,19 @@ #include "k9config.h" #include "k9titleencopt.h" #include "k9dvdtitle.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include -k9MP4Title::k9MP4Title(QWidget* parent, const char* name, WFlags fl) -: prefMPEG4(parent,name,fl) +k9MP4Title::k9MP4Title(TQWidget* tqparent, const char* name, WFlags fl) +: prefMPEG4(tqparent,name,fl) { m_titleEncOpt=NULL; load(); @@ -63,8 +63,8 @@ void k9MP4Title::load() { leMp4AudioBitrate->setText(config.getPrefMp4AudioBitrate()); leMp4VideoBitrate->setText(config.getPrefMp4VideoBitrate()); - QStringList m_codecLabels=config.getCodecLabels(); - QStringList m_codecLabelsAudio=config.getCodecLabelsAudio(); + TQStringList m_codecLabels=config.getCodecLabels(); + TQStringList m_codecLabelsAudio=config.getCodecLabelsAudio(); cbMp4Codec->clear(); @@ -177,23 +177,23 @@ void k9MP4Title::sbAudioGainValueChanged( int _value ) { m_titleEncOpt->setAudioGain(_value); } -void k9MP4Title::leMp4WidthTextChanged( const QString & _value) { +void k9MP4Title::leMp4WidthTextChanged( const TQString & _value) { if (m_titleEncOpt) m_titleEncOpt->setWidth(_value); } -void k9MP4Title::leMp4HeightTextChanged( const QString & _value) { +void k9MP4Title::leMp4HeightTextChanged( const TQString & _value) { if (m_titleEncOpt) m_titleEncOpt->setHeight(_value); } -void k9MP4Title::leMp4AudioBitrateTextChanged( const QString & _value) { +void k9MP4Title::leMp4AudioBitrateTextChanged( const TQString & _value) { if (m_titleEncOpt) m_titleEncOpt->setAudioBr(_value); } -void k9MP4Title::leMp4VideoBitrateTextChanged( const QString & _value) { +void k9MP4Title::leMp4VideoBitrateTextChanged( const TQString & _value) { if (m_titleEncOpt) m_titleEncOpt->setVideoBr(_value); } diff --git a/src/k9mp4title.h b/src/k9mp4title.h index da020f4..63bda0f 100644 --- a/src/k9mp4title.h +++ b/src/k9mp4title.h @@ -22,9 +22,10 @@ class k9DVD; class k9MP4Title : public prefMPEG4 { Q_OBJECT + TQ_OBJECT public: - k9MP4Title(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9MP4Title(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9MP4Title(); /*$PUBLIC_FUNCTIONS$*/ private: @@ -45,10 +46,10 @@ protected slots: virtual void sbAudioGainValueChanged( int ); virtual void sbMp4NumberCDValueChanged( int ); - virtual void leMp4WidthTextChanged( const QString & ); - virtual void leMp4HeightTextChanged( const QString & ); - virtual void leMp4AudioBitrateTextChanged( const QString & ); - virtual void leMp4VideoBitrateTextChanged( const QString & ); + virtual void leMp4WidthTextChanged( const TQString & ); + virtual void leMp4HeightTextChanged( const TQString & ); + virtual void leMp4AudioBitrateTextChanged( const TQString & ); + virtual void leMp4VideoBitrateTextChanged( const TQString & ); virtual void rgVideoSizeChanged(); diff --git a/src/k9play.cpp b/src/k9play.cpp index c772a1d..e2c3550 100644 --- a/src/k9play.cpp +++ b/src/k9play.cpp @@ -27,23 +27,23 @@ #include #include -void k9play::saveStatus(k9play_st _status) { - QFile fstatus(m_inject); +void k9play::savetqStatus(k9play_st _status) { + TQFile fstatus(m_inject); fstatus.open(IO_WriteOnly); fstatus.writeBlock((const char*)&_status,sizeof(k9play_st)); fstatus.close(); - kdebug (QString("saving status : %1 %2 %3 %4 %5 %6 %7\n").arg(_status.title).arg(_status.chapter).arg(_status.cell).arg(_status.sector).arg(_status.bytesWritten).arg(_status.bytesRead).arg(_status.bytesSkipped)); + kdebug (TQString("saving status : %1 %2 %3 %4 %5 %6 %7\n").tqarg(_status.title).tqarg(_status.chapter).tqarg(_status.cell).tqarg(_status.sector).tqarg(_status.bytesWritten).tqarg(_status.bytesRead).tqarg(_status.bytesSkipped)); } -void k9play::readStatus(k9play_st &_status) { - QFile fstatus(m_inject); +void k9play::readtqStatus(k9play_st &_status) { + TQFile fstatus(m_inject); if (fstatus.open(IO_ReadOnly)) { fstatus.readBlock((char*)&_status,sizeof(k9play_st)); fstatus.close(); } else memset(&_status,0,sizeof(k9play_st)); - kdebug (QString("reading status : title:%1 chapter:%2 cell:%3 sector:%4 written:%5 readen:%6 skipped:%7 chapters:%8 \n").arg(_status.title).arg(_status.chapter).arg(_status.cell).arg(_status.sector).arg(_status.bytesWritten).arg(_status.bytesRead).arg(_status.bytesSkipped).arg(_status.bytesChapters)); + kdebug (TQString("reading status : title:%1 chapter:%2 cell:%3 sector:%4 written:%5 readen:%6 skipped:%7 chapters:%8 \n").tqarg(_status.title).tqarg(_status.chapter).tqarg(_status.cell).tqarg(_status.sector).tqarg(_status.bytesWritten).tqarg(_status.bytesRead).tqarg(_status.bytesSkipped).tqarg(_status.bytesChapters)); } @@ -63,13 +63,13 @@ k9play::k9play() { m_useCache=false; } -void k9play::kdebug(QString const & _msg) { +void k9play::kdebug(TQString const & _msg) { #ifdef debug m_stderr.writeBlock(_msg.latin1(),_msg.length()); #endif } -void k9play::writeOutput(QString const & _msg) { +void k9play::writeOutput(TQString const & _msg) { m_stderr.writeBlock(_msg.latin1(),_msg.length()); } @@ -78,72 +78,72 @@ k9play::~k9play() { m_stderr.close(); } -void k9play::setstartSector(QString _value) { +void k9play::setstartSector(TQString _value) { if (_value !="") m_startSector=_value.toUInt(); } -void k9play::setinject(QString _value) { +void k9play::setinject(TQString _value) { m_inject=_value; } -void k9play::setendSector(QString _value) { +void k9play::setendSector(TQString _value) { if (_value!="") m_endSector=_value.toUInt(); } -void k9play::setaudioFilter( QString _value) { +void k9play::setaudioFilter( TQString _value) { if (_value!="") - m_audioFilter=QStringList::split(",",_value); + m_audioFilter=TQStringList::split(",",_value); } -void k9play::setsubpictureFilter( QString _value) { +void k9play::setsubpictureFilter( TQString _value) { if (_value!="") - m_subpictureFilter=QStringList::split(",",_value); + m_subpictureFilter=TQStringList::split(",",_value); } -void k9play::setchapterList( QString _value) { +void k9play::setchapterList( TQString _value) { if (_value!="") - m_chapterList=QStringList::split(",",_value); + m_chapterList=TQStringList::split(",",_value); } -void k9play::setvampsFactor(QString _value) { +void k9play::setvampsFactor(TQString _value) { if (_value!="") m_vampsFactor=_value.toDouble(); } -void k9play::setinputSize( QString _value) { +void k9play::setinputSize( TQString _value) { if (_value!="") m_inputSize=_value.toULongLong(); } -void k9play::settotalSize( QString _value) { +void k9play::settotalSize( TQString _value) { if (_value!="") m_totalSize=_value.toULongLong(); } -void k9play::setdvdSize( QString _value) { +void k9play::setdvdSize( TQString _value) { if (_value!="") m_dvdSize=_value.toULongLong(); } -void k9play::setchapterSize( QString _value) { +void k9play::setchapterSize( TQString _value) { if (_value!="") m_chapterSize=_value.toULongLong(); } -void k9play::setchapter( QString _value) { +void k9play::setchapter( TQString _value) { if (_value!="") m_chapter=_value.toUInt(); } -void k9play::setcell(QString _value) { +void k9play::setcell(TQString _value) { if (_value !="") m_cell=_value.toUInt(); } -void k9play::setinitStatus(bool _value) { +void k9play::setinittqStatus(bool _value) { m_initstatus=_value; } @@ -234,7 +234,7 @@ void k9play::play() { if (m_initstatus) memset(&status,0,sizeof(k9play_st)); else { - readStatus( status); + readtqStatus( status); if (m_continue) m_startSector=status.sector; } @@ -246,7 +246,7 @@ void k9play::play() { bufferFile=new KTempFile(locateLocal("tmp", "k9copy/k9p"), ""); m_output=bufferFile->file(); } else { - m_output=new QFile(); + m_output=new TQFile(); m_output->open(IO_WriteOnly,stdout); } k9vamps vamps(NULL); @@ -277,20 +277,20 @@ void k9play::play() { double factor; factor = (double) (m_totalSize - (status.bytesRead +status.bytesSkipped)) / (double) (m_dvdSize-status.bytesWritten) ; if (factor <1) factor =1; - kdebug(QString("shrink factor %1 totalSize:%2 (status.bytesRead +status.bytesSkipped):%3 m_dvdSize:%4 status.bytesWritten:%5").arg(factor).arg(m_totalSize).arg(status.bytesRead +status.bytesSkipped).arg(m_dvdSize).arg(status.bytesWritten) ); + kdebug(TQString("shrink factor %1 totalSize:%2 (status.bytesRead +status.bytesSkipped):%3 m_dvdSize:%4 status.bytesWritten:%5").tqarg(factor).tqarg(m_totalSize).tqarg(status.bytesRead +status.bytesSkipped).tqarg(m_dvdSize).tqarg(status.bytesWritten) ); vamps.setVapFactor(factor); } else { vamps.setVapFactor(m_vampsFactor); - kdebug(QString("vamps factor %1\n").arg(m_vampsFactor)); + kdebug(TQString("vamps factor %1\n").tqarg(m_vampsFactor)); } vamps.setInputSize(m_inputSize); - for ( QStringList::Iterator it = m_audioFilter.begin(); it != m_audioFilter.end(); ++it ) { + for ( TQStringList::Iterator it = m_audioFilter.begin(); it != m_audioFilter.end(); ++it ) { vamps.addAudio((*it).toInt()); } - for ( QStringList::Iterator it = m_subpictureFilter.begin(); it != m_subpictureFilter.end(); ++it ) { + for ( TQStringList::Iterator it = m_subpictureFilter.begin(); it != m_subpictureFilter.end(); ++it ) { vamps.addSubpicture((*it).toInt()); } @@ -302,7 +302,7 @@ void k9play::play() { /* set read ahead cache usage */ if (dvdnav_set_readahead_flag(dvdnav, DVD_READ_CACHE) != DVDNAV_STATUS_OK) { - writeOutput( QString("ERR:Error on dvdnav_set_readahead_flag: %1\n").arg(dvdnav_err_to_string(dvdnav))); + writeOutput( TQString("ERR:Error on dvdnav_set_readahead_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); return; } @@ -310,14 +310,14 @@ void k9play::play() { if (dvdnav_menu_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK || dvdnav_audio_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK || dvdnav_spu_language_select(dvdnav, DVD_LANGUAGE) != DVDNAV_STATUS_OK) { - writeOutput( QString("ERR:Error on setting languages: %1\n").arg(dvdnav_err_to_string(dvdnav))); + writeOutput( TQString("ERR:Error on setting languages: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); return ; } /* set the PGC positioning flag to have position information relatively to the * whole feature instead of just relatively to the current chapter */ if (dvdnav_set_PGC_positioning_flag(dvdnav, 1) != DVDNAV_STATUS_OK) { - writeOutput(QString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").arg(dvdnav_err_to_string(dvdnav))); + writeOutput(TQString("ERR:Error on dvdnav_set_PGC_positioning_flag: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); return ; } @@ -351,7 +351,7 @@ void k9play::play() { if (result == DVDNAV_STATUS_ERR) { - writeOutput(QString("ERR:Error getting next block: %1\n").arg(dvdnav_err_to_string(dvdnav))); + writeOutput(TQString("ERR:Error getting next block: %1\n").tqarg(dvdnav_err_to_string(dvdnav))); return; } switch (event) { @@ -367,7 +367,7 @@ void k9play::play() { if ((m_endSector !=0xFFFFFFFF) && (((status.bytesRead+status.bytesSkipped)/2048) >m_endSector)) { finished=1; - kdebug(QString("pos >m_endSector %1 %2").arg((status.bytesRead+status.bytesSkipped)/2048).arg(m_endSector)); + kdebug(TQString("pos >m_endSector %1 %2").tqarg((status.bytesRead+status.bytesSkipped)/2048).tqarg(m_endSector)); } if ((m_chapter !=0 && ptt !=m_chapter) || (tt != m_title)) finished=1; @@ -375,9 +375,9 @@ void k9play::play() { finished=1; if (!finished && m_chapterList.count() >0) { - if (m_chapterList.findIndex( QString::number(ptt)) == -1) { + if (m_chapterList.tqfindIndex( TQString::number(ptt)) == -1) { dvdnav_part_play(dvdnav,tt, ptt+1); - kdebug( QString("skipping chapter %1").arg(ptt)); + kdebug( TQString("skipping chapter %1").tqarg(ptt)); continue; //dvdnav_part_play(dvdnav_t *self, int32_t title, int32_t part); } @@ -386,19 +386,19 @@ void k9play::play() { if (m_continue) { dvdnav_sector_search(dvdnav,m_startSector , SEEK_SET); - kdebug (QString("repositionning on %1").arg(m_startSector)); + kdebug (TQString("repositionning on %1").tqarg(m_startSector)); m_continue=false; finished=0; bcell=true; } else { if ((m_cell==0 || (m_cell!=0 && currCell==m_cell)) && finished==0) { if (!vamps.running()) - vamps.start(QThread::NormalPriority); + vamps.start(TQThread::NormalPriority); bcopy=true; vamps.addData( buf,len); status.bytesRead +=len; if (!m_useCache) - writeOutput(QString("\rINFOPOS: %1 %2").arg((status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN).arg(lgr)); + writeOutput(TQString("\rINFOPOS: %1 %2").tqarg((status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN).tqarg(lgr)); if (m_pos==0xFFFFFFFF) m_pos=(status.bytesRead+status.bytesSkipped) / DVD_VIDEO_LB_LEN; } @@ -412,7 +412,7 @@ void k9play::play() { /* We have received a regular block of the currently playing MPEG stream.*/ if (m_cell==0 || (m_cell!=0 && currCell==m_cell)) { if (!vamps.running()) - vamps.start(QThread::NormalPriority); + vamps.start(TQThread::NormalPriority); vamps.addData( buf,len); status.bytesRead +=len; bcopy=true; @@ -521,17 +521,17 @@ void k9play::play() { status.bytesWritten +=vamps.getOutputBytes(); if (!m_firstPass) - saveStatus( status); + savetqStatus( status); delete bufferFile; } void k9play::flush(k9SaveImage &_saveImage ) { char buffer[20*DVD_VIDEO_LB_LEN]; m_output->reset(); - QFile out; + TQFile out; out.open(IO_WriteOnly,stdout); while(!m_output->atEnd()) { - writeOutput(QString("\rINFOPOS: %1 %2").arg(m_pos).arg(m_length)); + writeOutput(TQString("\rINFOPOS: %1 %2").tqarg(m_pos).tqarg(m_length)); m_pos+=20; int l=m_output->readBlock(buffer,20*DVD_VIDEO_LB_LEN); if (l>0) { diff --git a/src/k9play.h b/src/k9play.h index 8a9232a..c291151 100644 --- a/src/k9play.h +++ b/src/k9play.h @@ -14,7 +14,7 @@ #include "k9common.h" #include "k9dvdtitle.h" -#include +#include /** @author Jean-Michel PETIT */ @@ -37,9 +37,9 @@ private: int m_title; k9DVD *m_dvd; k9DVDTitle *m_dvdTitle; - QString m_device; - QFile *m_output; - QFile m_stderr; + TQString m_device; + TQFile *m_output; + TQFile m_stderr; uint32_t m_totalBytes; uint32_t m_startSector,m_endSector; uint32_t m_pos,m_length; @@ -55,16 +55,16 @@ private: bool m_firstPass; bool m_forcedFactor; bool m_useCache; - QString m_inject; - QStringList m_audioFilter; - QStringList m_subpictureFilter; - QStringList m_chapterList; - void kdebug(QString const & _msg); + TQString m_inject; + TQStringList m_audioFilter; + TQStringList m_subpictureFilter; + TQStringList m_chapterList; + void kdebug(TQString const & _msg); bool readNavPack (k9DVDFile *fh, dsi_t *dsi,int sector, uchar *_buffer); void insert_dummy_pack (int8_t *buf); void insert_nav_pack (int8_t *buf); - void saveStatus(k9play_st _status); - void readStatus(k9play_st &_status); + void savetqStatus(k9play_st _status); + void readtqStatus(k9play_st &_status); void flush(k9SaveImage &_saveImage); public: k9play(); @@ -72,26 +72,26 @@ public: ~k9play(); void execute(); void play(); - void writeOutput(QString const & _msg); + void writeOutput(TQString const & _msg); void setTitle(int _value) {m_title = _value;}; - void setDevice(const QString& _value) {m_device = _value;}; + void setDevice(const TQString& _value) {m_device = _value;}; - void setstartSector(QString _value); - void setendSector(QString _value); - void setaudioFilter(QString _value); - void setsubpictureFilter(QString _value); - void setchapterList(QString _value); - void setvampsFactor(QString _value); - void setinputSize(QString _value); - void settotalSize(QString _value); - void setchapter(QString _value); - void setcell(QString _value); - void setinject(QString _value); - void setdvdSize(QString _value); - void setchapterSize(QString _value); - void setinitStatus(bool _value); + void setstartSector(TQString _value); + void setendSector(TQString _value); + void setaudioFilter(TQString _value); + void setsubpictureFilter(TQString _value); + void setchapterList(TQString _value); + void setvampsFactor(TQString _value); + void setinputSize(TQString _value); + void settotalSize(TQString _value); + void setchapter(TQString _value); + void setcell(TQString _value); + void setinject(TQString _value); + void setdvdSize(TQString _value); + void setchapterSize(TQString _value); + void setinittqStatus(bool _value); void setcontinue (bool _value); void setfirstPass (bool _value); void setforcedFactor(bool _value); diff --git a/src/k9playbackoptions.cpp b/src/k9playbackoptions.cpp index 3bf9715..846daba 100644 --- a/src/k9playbackoptions.cpp +++ b/src/k9playbackoptions.cpp @@ -16,8 +16,8 @@ #include #include -k9PlaybackOptions::k9PlaybackOptions(k9Main *mainWindow, QWidget* parent, const char* name, WFlags fl) -: PlaybackOptionsw(parent,name,fl) +k9PlaybackOptions::k9PlaybackOptions(k9Main *mainWindow, TQWidget* tqparent, const char* name, WFlags fl) +: PlaybackOptionsw(tqparent,name,fl) { setMain( mainWindow); @@ -42,7 +42,7 @@ k9PlaybackOptions::~k9PlaybackOptions() void k9PlaybackOptions::fillTitleList() { - QString txt=lbSequence->currentText(); + TQString txt=lbSequence->currentText(); lbSequence->clear(); k9DVDTitle *title=m_dvd->getstart(); @@ -64,7 +64,7 @@ void k9PlaybackOptions::fillTitleList() { for (int i=0;igettitleCount();i++) { k9DVDTitle* l_track=m_dvd->gettitle(i); if (l_track->getIndexed()) { - QString sTitle=l_track->getname(); + TQString sTitle=l_track->getname(); if(l_track->isSelected()) { bool foundtitle=false; for (uint j=0; jcount();j++) { @@ -135,7 +135,7 @@ void k9PlaybackOptions::setSequence() { } } -void k9PlaybackOptions::lbSequenceChanged(QListBoxItem *_item) { +void k9PlaybackOptions::lbSequenceChanged(TQListBoxItem *_item) { if (_item == NULL) return; lbItem *lbi=(lbItem*) _item; @@ -153,7 +153,7 @@ void k9PlaybackOptions::lbSequenceChanged(QListBoxItem *_item) { if (title->getaudioStream(i)->getselected()) { // if ( !title->getDefAudioSet()) // title->setDefAudio(title->getaudioStream(i)); - cbDefAudio->insertItem( QString("%1 - %2").arg(title->getaudioStream(i)->getID()).arg(title->getaudioStream(i)->getlanguage())); + cbDefAudio->insertItem( TQString("%1 - %2").tqarg(title->getaudioStream(i)->getID()).tqarg(title->getaudioStream(i)->getlanguage())); if (title->getaudioStream(i)==title->getDefAudio()) { cbDefAudio->setCurrentItem(cbDefAudio->count()-1); } @@ -163,8 +163,8 @@ void k9PlaybackOptions::lbSequenceChanged(QListBoxItem *_item) { for (int i=0;i < title->getsubPictureCount();i++) { if (title->getsubtitle(i)->getselected()) { - QPixmap icon; - cbDefSub->insertItem(QString("%1 - %2").arg(title->getsubtitle(i)->getID().first()).arg(title->getsubtitle(i)->getlanguage())); + TQPixmap icon; + cbDefSub->insertItem(TQString("%1 - %2").tqarg(title->getsubtitle(i)->getID().first()).tqarg(title->getsubtitle(i)->getlanguage())); if (title->getsubtitle(i)==title->getDefSubtitle()) { cbDefSub->setCurrentItem(cbDefSub->count()-1); } @@ -186,7 +186,7 @@ void k9PlaybackOptions::cbDefSubActivated(int _index) { lbi->getTitle()->setDefSubtitle(lstSubDef.at(_index)); } -void k9PlaybackOptions::titleRenamed (k9DVDTitle *_title, QString _newName) { +void k9PlaybackOptions::titleRenamed (k9DVDTitle *_title, TQString _newName) { for (uint j=0; jcount();j++) { lbItem *tmp=(lbItem*)lbSequence->item(j); if (tmp->getTitle() == _title) { diff --git a/src/k9playbackoptions.h b/src/k9playbackoptions.h index 55ee39d..2d5dba5 100644 --- a/src/k9playbackoptions.h +++ b/src/k9playbackoptions.h @@ -17,16 +17,16 @@ #include "k9dvd.h" #include "k9main.h" #include "k9dvdtitle.h" -#include -#include +#include +#include -class lbItem : public QListBoxText { +class lbItem : public TQListBoxText { protected: k9DVDTitle *m_title; public: - lbItem(QListBox * listbox, const QString & text = QString::null ): - QListBoxText(listbox,text) {} + lbItem(TQListBox * listbox, const TQString & text = TQString() ): + TQListBoxText(listbox,text) {} ; void setTitle(k9DVDTitle *_value) { m_title = _value; @@ -41,9 +41,10 @@ class k9Main; class k9PlaybackOptions : public PlaybackOptionsw { Q_OBJECT + TQ_OBJECT public: - k9PlaybackOptions(k9Main *mainWindow,QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9PlaybackOptions(k9Main *mainWindow,TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9PlaybackOptions(); /*$PUBLIC_FUNCTIONS$*/ void fillTitleList(); @@ -52,7 +53,7 @@ public: void setDvd(k9DVD* _value) {m_dvd = _value;} void setMain(k9Main* _value); void setSequence(); - void titleRenamed (k9DVDTitle *_title, QString _newName); + void titleRenamed (k9DVDTitle *_title, TQString _newName); bool withMenus() ; void setwithMenus(bool _value); void enable(bool _value); @@ -63,8 +64,8 @@ public slots: protected: /*$PROTECTED_FUNCTIONS$*/ - QPtrList lstAudioDef; - QPtrList lstSubDef; + TQPtrList lstAudioDef; + TQPtrList lstSubDef; protected slots: /*$PROTECTED_SLOTS$*/ @@ -72,7 +73,7 @@ protected slots: virtual void bSeqDownClick(); virtual void cbDefAudioActivated(int _index); virtual void cbDefSubActivated(int _index); - virtual void lbSequenceChanged (QListBoxItem * _item); + virtual void lbSequenceChanged (TQListBoxItem * _item); }; #endif diff --git a/src/k9prefauthor.cpp b/src/k9prefauthor.cpp index 6717bce..9dd14ea 100644 --- a/src/k9prefauthor.cpp +++ b/src/k9prefauthor.cpp @@ -12,13 +12,13 @@ #include "k9prefauthor.h" #include "k9config.h" -#include +#include #include #include #include -k9prefAuthor::k9prefAuthor(QWidget* parent, const char* name, WFlags fl) -: prefAuthor(parent,name,fl) +k9prefAuthor::k9prefAuthor(TQWidget* tqparent, const char* name, WFlags fl) +: prefAuthor(tqparent,name,fl) { load(); } @@ -26,7 +26,7 @@ k9prefAuthor::k9prefAuthor(QWidget* parent, const char* name, WFlags fl) void k9prefAuthor::load() { k9Config config; cbAudioFormat->setCurrentText(config.getPrefAudioFormat()); - cbAudioBitrate->setCurrentText(QString::number(config.getPrefAudioBitrate())); + cbAudioBitrate->setCurrentText(TQString::number(config.getPrefAudioBitrate())); inButtonWidth->setValue(config.getPrefButtonWidth()); inButtonHeight->setValue(config.getPrefButtonHeight()); cbHiliteColor->setColor(config.getPrefButtonHiliteColor()); diff --git a/src/k9prefauthor.h b/src/k9prefauthor.h index be59c40..7581bf3 100644 --- a/src/k9prefauthor.h +++ b/src/k9prefauthor.h @@ -14,14 +14,15 @@ #define K9PREFAUTHOR_H #include "k9common.h" #include "prefAuthor.h" -#include +#include class k9prefAuthor : public prefAuthor { Q_OBJECT + TQ_OBJECT public: - k9prefAuthor(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9prefAuthor(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9prefAuthor(); /*$PUBLIC_FUNCTIONS$*/ void load(); @@ -31,7 +32,7 @@ public slots: virtual void save(); protected: /*$PROTECTED_FUNCTIONS$*/ - QFont m_font; + TQFont m_font; protected slots: /*$PROTECTED_SLOTS$*/ diff --git a/src/k9prefdvd.cpp b/src/k9prefdvd.cpp index 8238b1c..889a83f 100644 --- a/src/k9prefdvd.cpp +++ b/src/k9prefdvd.cpp @@ -15,12 +15,12 @@ #include "k9config.h" #include #include -#include -#include +#include +#include #include -k9prefDVD::k9prefDVD(QWidget* parent, const char* name, WFlags fl) -: prefDVD(parent,name,fl) +k9prefDVD::k9prefDVD(TQWidget* tqparent, const char* name, WFlags fl) +: prefDVD(tqparent,name,fl) { k9Config config; urOutput->setMode(2); diff --git a/src/k9prefdvd.h b/src/k9prefdvd.h index f0479c8..3668d79 100644 --- a/src/k9prefdvd.h +++ b/src/k9prefdvd.h @@ -18,9 +18,10 @@ class k9prefDVD : public prefDVD { Q_OBJECT + TQ_OBJECT public: - k9prefDVD(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9prefDVD(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9prefDVD(); /*$PUBLIC_FUNCTIONS$*/ void save(); diff --git a/src/k9prefmencoder.cpp b/src/k9prefmencoder.cpp index b8d92d8..d4594fe 100644 --- a/src/k9prefmencoder.cpp +++ b/src/k9prefmencoder.cpp @@ -12,15 +12,15 @@ #include "k9prefmencoder.h" -#include -#include +#include +#include #include "k9mencodercmdgen.h" #include #include #include -k9prefMencoder::k9prefMencoder(QWidget* parent, const char* name, WFlags fl) -: prefMencoder(parent,name,fl) +k9prefMencoder::k9prefMencoder(TQWidget* tqparent, const char* name, WFlags fl) +: prefMencoder(tqparent,name,fl) { m_update=false; load(); @@ -46,7 +46,7 @@ void k9prefMencoder::load() { } -void k9prefMencoder::lbvCodecsCurrentChanged(QListBoxItem *_item) { +void k9prefMencoder::lbvCodecsCurrentChanged(TQListBoxItem *_item) { if (_item) { int i=lbvCodecs->currentItem(); m_update=true; @@ -59,7 +59,7 @@ void k9prefMencoder::lbvCodecsCurrentChanged(QListBoxItem *_item) { } } -void k9prefMencoder::lbaCodecsCurrentChanged(QListBoxItem *_item) { +void k9prefMencoder::lbaCodecsCurrentChanged(TQListBoxItem *_item) { if (_item) { int i=lbaCodecs->currentItem(); m_update=true; @@ -77,25 +77,25 @@ void k9prefMencoder::save() } void k9prefMencoder::btnOpt1Clicked() { - QString s=teOpt1->text(); + TQString s=teOpt1->text(); if( k9MencoderCmdGen::getMencoderOptions(s)) teOpt1->setText(s); } void k9prefMencoder::btnOpt2Clicked() { - QString s=teOpt2->text(); + TQString s=teOpt2->text(); if( k9MencoderCmdGen::getMencoderOptions(s)) teOpt2->setText(s); } void k9prefMencoder::btnOpt3Clicked() { - QString s=teOpt3->text(); + TQString s=teOpt3->text(); if( k9MencoderCmdGen::getMencoderOptions(s)) teOpt3->setText(s); } void k9prefMencoder::btnOptAClicked() { - QString s=teOptA->text(); + TQString s=teOptA->text(); if( k9MencoderCmdGen::getMencoderOptions(s)) teOptA->setText(s); @@ -165,20 +165,20 @@ void k9prefMencoder::teOpt3TextChanged() { } -void k9prefMencoder::leVLabelTextChanged(const QString &_value) { +void k9prefMencoder::leVLabelTextChanged(const TQString &_value) { if (!m_update) { lbvCodecs->changeItem(_value,lbvCodecs->currentItem()); m_codecs.setCodecName(lbvCodecs->currentItem(),_value); } } -void k9prefMencoder::leALabelTextChanged(const QString &_value) { +void k9prefMencoder::leALabelTextChanged(const TQString &_value) { if (!m_update) { lbaCodecs->changeItem(_value,lbaCodecs->currentItem()); m_audioCodecs.setCodecName(lbaCodecs->currentItem(),_value); } } -void k9prefMencoder::leFourccTextChanged(const QString &_value) { +void k9prefMencoder::leFourccTextChanged(const TQString &_value) { if (!m_update) { m_codecs.setFourcc(lbvCodecs->currentItem(),_value); } diff --git a/src/k9prefmencoder.h b/src/k9prefmencoder.h index 54ab311..308ecf5 100644 --- a/src/k9prefmencoder.h +++ b/src/k9prefmencoder.h @@ -17,16 +17,17 @@ #include "prefMencoder.h" #include "k9videocodecs.h" #include "k9audiocodecs.h" -#include -#include -#include +#include +#include +#include class k9prefMencoder : public prefMencoder { Q_OBJECT + TQ_OBJECT public: - k9prefMencoder(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9prefMencoder(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9prefMencoder(); /*$PUBLIC_FUNCTIONS$*/ void save(void); @@ -38,17 +39,17 @@ public slots: void teOpt1TextChanged(); void teOpt3TextChanged(); void teOpt2TextChanged(); - void leVLabelTextChanged(const QString &); - void leALabelTextChanged(const QString &); - void leFourccTextChanged(const QString &); + void leVLabelTextChanged(const TQString &); + void leALabelTextChanged(const TQString &); + void leFourccTextChanged(const TQString &); private: k9VideoCodecs m_codecs; k9AudioCodecs m_audioCodecs; bool m_update; protected slots: /*$PROTECTED_SLOTS$*/ - void lbvCodecsCurrentChanged(QListBoxItem *_item); - void lbaCodecsCurrentChanged(QListBoxItem *_item); + void lbvCodecsCurrentChanged(TQListBoxItem *_item); + void lbaCodecsCurrentChanged(TQListBoxItem *_item); void btnOpt1Clicked(); void btnOpt2Clicked(); void btnOpt3Clicked(); diff --git a/src/k9prefmpeg4.cpp b/src/k9prefmpeg4.cpp index db752bb..b61d40d 100644 --- a/src/k9prefmpeg4.cpp +++ b/src/k9prefmpeg4.cpp @@ -13,16 +13,16 @@ #include "k9common.h" #include "k9prefmpeg4.h" #include "k9config.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include -k9prefMPEG4::k9prefMPEG4(QWidget* parent, const char* name, WFlags fl) -: prefMPEG4(parent,name,fl) +k9prefMPEG4::k9prefMPEG4(TQWidget* tqparent, const char* name, WFlags fl) +: prefMPEG4(tqparent,name,fl) { load(); } @@ -46,8 +46,8 @@ void k9prefMPEG4::load() { leMp4AudioBitrate->setText(config.getPrefMp4AudioBitrate()); leMp4VideoBitrate->setText(config.getPrefMp4VideoBitrate()); - QStringList m_codecLabels=config.getCodecLabels(); - QStringList m_codecLabelsAudio=config.getCodecLabelsAudio(); + TQStringList m_codecLabels=config.getCodecLabels(); + TQStringList m_codecLabelsAudio=config.getCodecLabelsAudio(); cbMp4Codec->clear(); cbMp4Codec->insertStringList(m_codecLabels); diff --git a/src/k9prefmpeg4.h b/src/k9prefmpeg4.h index b8f692d..5ac285f 100644 --- a/src/k9prefmpeg4.h +++ b/src/k9prefmpeg4.h @@ -18,9 +18,10 @@ class k9prefMPEG4 : public prefMPEG4 { Q_OBJECT + TQ_OBJECT public: - k9prefMPEG4(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9prefMPEG4(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9prefMPEG4(); /*$PUBLIC_FUNCTIONS$*/ void save(); @@ -44,10 +45,10 @@ protected slots: virtual void sbAudioGainValueChanged( int ){}; virtual void sbMp4NumberCDValueChanged( int ) {}; - virtual void leMp4WidthTextChanged( const QString & ) {}; - virtual void leMp4HeightTextChanged( const QString & ) {}; - virtual void leMp4AudioBitrateTextChanged( const QString & ) {}; - virtual void leMp4VideoBitrateTextChanged( const QString & ) {}; + virtual void leMp4WidthTextChanged( const TQString & ) {}; + virtual void leMp4HeightTextChanged( const TQString & ) {}; + virtual void leMp4AudioBitrateTextChanged( const TQString & ) {}; + virtual void leMp4VideoBitrateTextChanged( const TQString & ) {}; virtual void ckUseCacheClick() {}; diff --git a/src/k9prefpreview.cpp b/src/k9prefpreview.cpp index e1c4fbf..19bff88 100644 --- a/src/k9prefpreview.cpp +++ b/src/k9prefpreview.cpp @@ -13,14 +13,14 @@ #include "k9prefpreview.h" #include "k9config.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -k9prefPreview::k9prefPreview(QWidget* parent, const char* name, WFlags fl) -: prefPreview(parent,name,fl) +k9prefPreview::k9prefPreview(TQWidget* tqparent, const char* name, WFlags fl) +: prefPreview(tqparent,name,fl) { load(); } diff --git a/src/k9prefpreview.h b/src/k9prefpreview.h index b5e661f..264b5a6 100644 --- a/src/k9prefpreview.h +++ b/src/k9prefpreview.h @@ -19,9 +19,10 @@ class k9prefPreview : public prefPreview { Q_OBJECT + TQ_OBJECT public: - k9prefPreview(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9prefPreview(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9prefPreview(); /*$PUBLIC_FUNCTIONS$*/ void save(); diff --git a/src/k9redirect.cpp b/src/k9redirect.cpp index f5d2066..3076556 100644 --- a/src/k9redirect.cpp +++ b/src/k9redirect.cpp @@ -29,8 +29,8 @@ void k9Redirect::execute() { p->wait(); - QFile f("/tmp/kde-jmp/k9copy/tmp.mpeg"); - QFile fout; + TQFile f("/tmp/kde-jmp/k9copy/tmp.mpeg"); + TQFile fout; f.open(IO_ReadOnly ); fout.open(IO_WriteOnly,stdout); while ( ! f.atEnd()) { diff --git a/src/k9redirect.h b/src/k9redirect.h index 24b3cd5..6eaeb81 100644 --- a/src/k9redirect.h +++ b/src/k9redirect.h @@ -13,7 +13,7 @@ #define K9REDIRECT_H #include "k9common.h" -#include +#include /** @author Jean-Michel PETIT */ diff --git a/src/k9settings.cpp b/src/k9settings.cpp index 3bdad1e..bbbb7bc 100644 --- a/src/k9settings.cpp +++ b/src/k9settings.cpp @@ -12,62 +12,62 @@ #include "k9settings.h" -#include +#include #include #include #include -#include +#include -k9settings::k9settings(QWidget *parent,const QString &caption): KDialogBase (IconList,caption, +k9settings::k9settings(TQWidget *tqparent,const TQString &caption): KDialogBase (IconList,caption, Ok|Apply|Cancel, Ok) { - setInitialSize(QSize(750,350), false); + setInitialSize(TQSize(750,350), false); - QFrame *frDevices; + TQFrame *frDevices; frDevices=addPage (i18n("Devices"),i18n("Devices not detected by k9copy"),KGlobal::iconLoader()->loadIcon("blockdevice", KIcon::Panel, KIcon::SizeMedium)); - QGridLayout *grid = new QGridLayout(frDevices, 0, 0, 10 ); + TQGridLayout *grid = new TQGridLayout(frDevices, 0, 0, 10 ); m_configDlg=new kConfigDlg(frDevices); grid->addWidget(m_configDlg,0,0); - QFrame *frDVD; + TQFrame *frDVD; frDVD=addPage (i18n("DVD"),i18n("DVD Backup"),KGlobal::iconLoader()->loadIcon("dvdcopy", KIcon::Panel, KIcon::SizeMedium)); - grid = new QGridLayout(frDVD, 0, 0, 10 ); + grid = new TQGridLayout(frDVD, 0, 0, 10 ); m_prefDVD =new k9prefDVD(frDVD); grid->addWidget(m_prefDVD,0,0); //TODO afficher uniquement si mencoder et mplayer installés - QFrame *frMencoder; + TQFrame *frMencoder; frMencoder=addPage (i18n("MEncoder"),i18n("MPEG-4 Codecs"),KGlobal::iconLoader()->loadIcon("mencoder", KIcon::Panel, KIcon::SizeMedium)); m_prefMencoder =new k9prefMencoder(frMencoder); - QFrame *frMPEG4; + TQFrame *frMPEG4; frMPEG4=addPage (i18n("MPEG-4"),i18n("MPEG-4 Encoding"),KGlobal::iconLoader()->loadIcon("mp4", KIcon::Panel, KIcon::SizeMedium)); - grid = new QGridLayout(frMPEG4, 0, 0, 10 ); + grid = new TQGridLayout(frMPEG4, 0, 0, 10 ); m_prefMPEG4 =new k9prefMPEG4(frMPEG4); grid->addWidget(m_prefMPEG4,0,0); - grid = new QGridLayout(frMencoder, 0, 0, 10 ); + grid = new TQGridLayout(frMencoder, 0, 0, 10 ); grid->addWidget(m_prefMencoder,0,0); - QFrame *frPreview; + TQFrame *frPreview; frPreview=addPage (i18n("Preview"),i18n("Title preview"),KGlobal::iconLoader()->loadIcon("mplayer", KIcon::Panel, KIcon::SizeMedium)); - grid = new QGridLayout(frPreview, 0, 0, 10 ); + grid = new TQGridLayout(frPreview, 0, 0, 10 ); m_prefPreview =new k9prefPreview(frPreview); grid->addWidget(m_prefPreview,0,0); - QFrame *frAuthor; + TQFrame *frAuthor; frAuthor=addPage(i18n("Authoring"),i18n("Authoring"),KGlobal::iconLoader()->loadIcon("author",KIcon::Panel,KIcon::SizeMedium)); - grid = new QGridLayout(frAuthor, 0, 0, 10 ); + grid = new TQGridLayout(frAuthor, 0, 0, 10 ); m_prefAuthor =new k9prefAuthor(frAuthor); grid->addWidget(m_prefAuthor,0,0); - connect(this, SIGNAL(okClicked()), SLOT(slotOkClicked())); - connect(this, SIGNAL(applyClicked()), SLOT(slotApplyClicked())); + connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotOkClicked())); + connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotApplyClicked())); } void k9settings::slotOkClicked() { diff --git a/src/k9settings.h b/src/k9settings.h index d1cc237..e86ae3c 100644 --- a/src/k9settings.h +++ b/src/k9settings.h @@ -26,8 +26,9 @@ */ class k9settings:public KDialogBase{ Q_OBJECT + TQ_OBJECT public: - k9settings(QWidget *parent,const QString &caption); + k9settings(TQWidget *tqparent,const TQString &caption); virtual ~k9settings(); diff --git a/src/k9titlefactor.cpp b/src/k9titlefactor.cpp index d020e52..ffb4add 100644 --- a/src/k9titlefactor.cpp +++ b/src/k9titlefactor.cpp @@ -14,16 +14,16 @@ #include "k9titlefactor.h" #include "k9cellcopylist.h" #include "k9dvdsize.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -k9TitleFactor::k9TitleFactor(QWidget* parent, const char* name, WFlags fl) - : titleFactor(parent,name,fl) { +k9TitleFactor::k9TitleFactor(TQWidget* tqparent, const char* name, WFlags fl) + : titleFactor(tqparent,name,fl) { m_current=NULL; m_slFactorPressed=false; m_factor=-1; @@ -86,9 +86,9 @@ void k9TitleFactor::slFactor_valueChanged( int ) { m_factor=-1; } if (m_current->getforceFactor()) - tFactor->setText(QString("%1").arg(m_current->getfactor(),4,'f',2)); + tFactor->setText(TQString("%1").tqarg(m_current->getfactor(),4,'f',2)); else - tFactor->setText(QString("%1").arg(getFactor(),4,'f',2)); + tFactor->setText(TQString("%1").tqarg(getFactor(),4,'f',2)); } } @@ -107,14 +107,14 @@ void k9TitleFactor::changedTitle(k9DVDTitle *_title) { gbTitle->setChecked(m_current->getforceFactor()); m_updating=false; - lbTitle->setText(QString(i18n("Shrink Factor for %1")).arg(m_current->getname())); + lbTitle->setText(TQString(i18n("Shrink Factor for %1")).tqarg(m_current->getname())); if (m_current->getforceFactor()) { slFactor->setValue(m_current->getfactor()*100.0); - tFactor->setText(QString("%1").arg(m_current->getfactor(),4,'f',2)); + tFactor->setText(TQString("%1").tqarg(m_current->getfactor(),4,'f',2)); setMinFactor(); } else { slFactor->setValue(getFactor()*100.0); - tFactor->setText(QString("%1").arg(getFactor(),4,'f',2)); + tFactor->setText(TQString("%1").tqarg(getFactor(),4,'f',2)); slFactor->setMinValue(100); } diff --git a/src/k9titlefactor.h b/src/k9titlefactor.h index 65a02f9..2c2e961 100644 --- a/src/k9titlefactor.h +++ b/src/k9titlefactor.h @@ -22,9 +22,10 @@ class k9TitleFactor : public titleFactor { Q_OBJECT + TQ_OBJECT public: - k9TitleFactor(QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + k9TitleFactor(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~k9TitleFactor(); /*$PUBLIC_FUNCTIONS$*/ private : diff --git a/src/k9updatefactor.cpp b/src/k9updatefactor.cpp index 76a99c5..74dba8a 100644 --- a/src/k9updatefactor.cpp +++ b/src/k9updatefactor.cpp @@ -11,8 +11,8 @@ // #include "k9updatefactor.h" -k9UpdateFactor::k9UpdateFactor(QObject *parent, const char *name) - : QObject(parent, name), QThread() +k9UpdateFactor::k9UpdateFactor(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), TQThread() { } diff --git a/src/k9updatefactor.h b/src/k9updatefactor.h index 8ca98e2..6cec823 100644 --- a/src/k9updatefactor.h +++ b/src/k9updatefactor.h @@ -13,24 +13,25 @@ #define K9UPDATEFACTOR_H #include "k9common.h" -#include -#include -#include +#include +#include +#include /** @author Jean-Michel PETIT */ class k9Main; -class k9UpdateFactor : public QObject, public QThread +class k9UpdateFactor : public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT private: - QMutex m_mutex; + TQMutex m_mutex; bool m_restart; protected: void run(); public: - k9UpdateFactor(QObject *parent = 0, const char *name = 0); + k9UpdateFactor(TQObject *tqparent = 0, const char *name = 0); ~k9UpdateFactor(); void updateFactor(); diff --git a/src/kconfigdlg.cpp b/src/kconfigdlg.cpp index 1507939..c5527e5 100644 --- a/src/kconfigdlg.cpp +++ b/src/kconfigdlg.cpp @@ -28,12 +28,12 @@ #include #include "k9config.h" -kConfigDlg::kConfigDlg(QWidget *parent) - : configDlg(parent) +kConfigDlg::kConfigDlg(TQWidget *tqparent) + : configDlg(tqparent) { - QStringList ldev; - QStringList llabels; - QStringList lIO; + TQStringList ldev; + TQStringList llabels; + TQStringList lIO; tblDevices->setColumnWidth(0,150); tblDevices->setColumnWidth(1,210); tblDevices->setColumnWidth(2,40); @@ -45,11 +45,11 @@ kConfigDlg::kConfigDlg(QWidget *parent) llabels=config.getDevicesLabels(); lIO=config.getDevicesIO(); int row=0; - for ( QStringList::Iterator it = ldev.begin(); it != ldev.end(); ++it ) + for ( TQStringList::Iterator it = ldev.begin(); it != ldev.end(); ++it ) { tblDevices->setNumRows(row+1); tblDevices->setText(row,0,(*it)); - QStringList::Iterator it2=llabels.at(row); + TQStringList::Iterator it2=llabels.at(row); tblDevices->setText(row,1,(*it2)); row++; @@ -57,10 +57,10 @@ kConfigDlg::kConfigDlg(QWidget *parent) } for ( int j = 0; j < tblDevices->numRows(); ++j ) { - QCheckTableItem *I = new QCheckTableItem( tblDevices, "" ); - QCheckTableItem *O = new QCheckTableItem( tblDevices, "" ) ; - QStringList::Iterator it=lIO.at(j); - QString c=(*it); + TQCheckTableItem *I = new TQCheckTableItem( tblDevices, "" ); + TQCheckTableItem *O = new TQCheckTableItem( tblDevices, "" ) ; + TQStringList::Iterator it=lIO.at(j); + TQString c=(*it); if((c =="I") || (c =="IO")) I->setChecked(true); if((c =="O") || (c =="IO")) O->setChecked(true); tblDevices->setItem( j, 2, I ); @@ -85,8 +85,8 @@ kConfigDlg::~kConfigDlg() void kConfigDlg::bAddClick() { tblDevices->setNumRows(tblDevices->numRows()+1); - QCheckTableItem *I = new QCheckTableItem( tblDevices, "" ); - QCheckTableItem *O = new QCheckTableItem( tblDevices, "" ) ; + TQCheckTableItem *I = new TQCheckTableItem( tblDevices, "" ); + TQCheckTableItem *O = new TQCheckTableItem( tblDevices, "" ) ; tblDevices->setItem( tblDevices->numRows()-1, 2, I ); tblDevices->setItem( tblDevices->numRows()-1, 3, O); } @@ -103,26 +103,26 @@ void kConfigDlg::bRemoveClick() void kConfigDlg::save() { - QStringList ldev; - QStringList llabels; - QStringList lIO; + TQStringList ldev; + TQStringList llabels; + TQStringList lIO; //KSimpleConfig settings("K9Copy"); k9Config config; ldev.clear(); llabels.clear(); for (int i=0;inumRows();i++) { - QString c=tblDevices->text(i,0); + TQString c=tblDevices->text(i,0); if (!c.isEmpty()) { - if (QFile::exists(c)) + if (TQFile::exists(c)) { ldev.append(tblDevices->text(i,0)); c=tblDevices->text(i,1); if (c.isEmpty()) c=tblDevices->text(i,0); llabels.append(c); - QCheckTableItem *I = (QCheckTableItem*)tblDevices->item(i,2); - QCheckTableItem *O = (QCheckTableItem*)tblDevices->item(i,3); + TQCheckTableItem *I = (TQCheckTableItem*)tblDevices->item(i,2); + TQCheckTableItem *O = (TQCheckTableItem*)tblDevices->item(i,3); if (O->isChecked() && I->isChecked()) { lIO.append("IO"); diff --git a/src/kconfigdlg.h b/src/kconfigdlg.h index 7dbc016..ce58a0f 100644 --- a/src/kconfigdlg.h +++ b/src/kconfigdlg.h @@ -22,9 +22,9 @@ #include "k9common.h" #include -#include -#include -#include +#include +#include +#include /** @author Jean-Michel PETIT @@ -32,7 +32,7 @@ class kConfigDlg : public configDlg { public: - kConfigDlg(QWidget *parent); + kConfigDlg(TQWidget *tqparent); ~kConfigDlg(); void bAddClick(); diff --git a/src/kviewmpeg2.cpp b/src/kviewmpeg2.cpp index 899f31d..84008e4 100755 --- a/src/kviewmpeg2.cpp +++ b/src/kviewmpeg2.cpp @@ -18,15 +18,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "k9common.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -41,21 +41,21 @@ -k9Widget::k9Widget(QWidget *parent):QWidget(parent) { +k9Widget::k9Widget(TQWidget *tqparent):TQWidget(tqparent) { m_image=NULL; } -void k9Widget::setImage(QImage *_image) { +void k9Widget::setImage(TQImage *_image) { m_image=_image; //paintEvent( NULL); - repaint(FALSE); + tqrepaint(FALSE); } -void k9Widget::paintEvent( QPaintEvent *_event) { - setPaletteBackgroundColor(Qt::black); +void k9Widget::paintEvent( TQPaintEvent *_event) { + setPaletteBackgroundColor(TQt::black); int top,left; if (m_image !=NULL) { - QPainter p(this); + TQPainter p(this); double wratio=(double)width()/(double)m_image->width(); double hratio=(double)height()/(double)m_image->height(); double ratio= wratio < hratio ? wratio:hratio; @@ -77,13 +77,13 @@ kViewMPEG2::kViewMPEG2() { m_layout=NULL; bPlay->setPixmap(SmallIcon("player_play")); bStop->setPixmap(SmallIcon("player_stop")); - connect(&m_player , SIGNAL(setPosition(uint32_t)), this, SLOT(setPosition(uint32_t))); - connect(&m_player , SIGNAL(setMax(uint32_t)), this, SLOT(setMax(uint32_t))); - connect(&m_player , SIGNAL(setMin(uint32_t)), this, SLOT(setMin(uint32_t))); + connect(&m_player , TQT_SIGNAL(setPosition(uint32_t)), this, TQT_SLOT(setPosition(uint32_t))); + connect(&m_player , TQT_SIGNAL(setMax(uint32_t)), this, TQT_SLOT(setMax(uint32_t))); + connect(&m_player , TQT_SIGNAL(setMin(uint32_t)), this, TQT_SLOT(setMin(uint32_t))); lockSlider=false; stopped=true; - m_layout=new QGridLayout(label,1,1); + m_layout=new TQGridLayout(label,1,1); #ifdef HAVE_OPENGL @@ -100,7 +100,7 @@ kViewMPEG2::kViewMPEG2() { } m_player.getDecoder()->setUseGL(m_prefUseGL); if (m_prefUseGL) { - connect(m_player.getDecoder() , SIGNAL(ppmReady(uchar *,int,int,int)), this, SLOT(drawppm(uchar *,int,int,int))); + connect(m_player.getDecoder() , TQT_SIGNAL(ppmReady(uchar *,int,int,int)), this, TQT_SLOT(drawppm(uchar *,int,int,int))); m_GLwidget= k9GLWidget::createWidget(label); m_widget=NULL; @@ -112,7 +112,7 @@ kViewMPEG2::kViewMPEG2() { config.save(); } else { - connect(m_player.getDecoder() , SIGNAL(pixmapReady(QImage *)), this, SLOT(drawPixmap(QImage *))); + connect(m_player.getDecoder() , TQT_SIGNAL(pixmapReady(TQImage *)), this, TQT_SLOT(drawPixmap(TQImage *))); m_widget=new k9Widget(label); m_layout->addWidget(m_widget,0,0); @@ -162,24 +162,24 @@ void kViewMPEG2::setMin(uint32_t _position) { /** No descriptions */ -void kViewMPEG2::drawPixmap(QImage *image) { - if (qApp==NULL) +void kViewMPEG2::drawPixmap(TQImage *image) { + if (tqApp==NULL) return; - if (qApp->tryLock()) { + if (tqApp->tryLock()) { m_widget->setImage( image); - if (qApp!=NULL) - qApp->unlock(); + if (tqApp!=NULL) + tqApp->unlock(); } } /** No descriptions */ void kViewMPEG2::drawppm(uchar *_buf,int _width,int _height,int _len) { - if (qApp==NULL) + if (tqApp==NULL) return; -// if (qApp->tryLock()) { +// if (tqApp->tryLock()) { m_GLwidget->setImage(_buf,_width,_height,_len); - // if (qApp !=NULL) - // qApp->unlock(); + // if (tqApp !=NULL) + // tqApp->unlock(); // } else // free(_buf); } @@ -196,13 +196,13 @@ int kViewMPEG2::open (k9DVD *_dvd,k9DVDTitle * title,int chapter) { /** No descriptions */ -void kViewMPEG2::setError(const QString & err) { +void kViewMPEG2::setError(const TQString & err) { error=true; errMsg=err; } -void kViewMPEG2::resizeEvent(QResizeEvent *_event) {} +void kViewMPEG2::resizeEvent(TQResizeEvent *_event) {} void kViewMPEG2::bStopClick() { m_player.stop(); @@ -217,7 +217,7 @@ void kViewMPEG2::sliderReleased() { } -void kViewMPEG2::closeEvent( QCloseEvent* ce ) { +void kViewMPEG2::closeEvent( TQCloseEvent* ce ) { stopped=true; ce->accept(); return; diff --git a/src/kviewmpeg2.h b/src/kviewmpeg2.h index bd21253..1c0b58b 100755 --- a/src/kviewmpeg2.h +++ b/src/kviewmpeg2.h @@ -23,13 +23,13 @@ #include "k9dvdtitle.h" -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "k9plaympeg2.h" #include "k9glwidget.h" #include "k9mplayer.h" @@ -38,57 +38,59 @@ *@author */ -class k9Widget : public QWidget { +class k9Widget : public TQWidget { Q_OBJECT + TQ_OBJECT protected: - QImage *m_image; - void paintEvent ( QPaintEvent * _event); + TQImage *m_image; + void paintEvent ( TQPaintEvent * _event); public: - k9Widget (QWidget *_parent); - void setImage(QImage *_image); + k9Widget (TQWidget *_parent); + void setImage(TQImage *_image); }; class kViewMPEG2 : public ViewMPEG2 { Q_OBJECT + TQ_OBJECT public: kViewMPEG2(); ~kViewMPEG2(); private: - QMutex mutex; + TQMutex mutex; k9DVDTitle *m_title; - QString dev; + TQString dev; int selTitle; unsigned long idxLect; bool pause; bool lockSlider; - QImage img; + TQImage img; bool stopped; void sliderReleased(); /** No descriptions */ void sliderPressed(); void lock(); void unlock(); - QString file; - QString errMsg; + TQString file; + TQString errMsg; bool error; - QString length; + TQString length; uint startSector; uint lastSector; k9PlayMPEG2 m_player; - QGridLayout *m_layout; + TQGridLayout *m_layout; bool m_prefUseGL; k9GLWidget *m_GLwidget; k9Widget *m_widget; protected: - void closeEvent( QCloseEvent* ); - void resizeEvent ( QResizeEvent * ); + void closeEvent( TQCloseEvent* ); + void resizeEvent ( TQResizeEvent * ); public slots: // Public slots /** No descriptions */ int open (k9DVD *_dvd,k9DVDTitle * title,int chapter); - void drawPixmap( QImage *image); + void drawPixmap( TQImage *image); void drawppm(uchar *_buf,int _width,int _height,int _len); - void setError(const QString & err); + void setError(const TQString & err); void setPosition(uint32_t _position); void setMax(uint32_t _position); void setMin(uint32_t _position); diff --git a/src/langselectw.cpp b/src/langselectw.cpp index 357acfd..8faa67d 100644 --- a/src/langselectw.cpp +++ b/src/langselectw.cpp @@ -9,14 +9,14 @@ #include "langselectw.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include static const unsigned char img0_langselectw[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, @@ -74,31 +74,31 @@ static const unsigned char img0_langselectw[] = { /* - * Constructs a langSelect as a child of 'parent', with the + * Constructs a langSelect as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -langSelect::langSelect( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +langSelect::langSelect( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { - QImage img; + TQImage img; img.loadFromData( img0_langselectw, sizeof( img0_langselectw ), "PNG" ); image0 = img; if ( !name ) setName( "langSelect" ); setIcon( image0 ); - langSelectLayout = new QGridLayout( this, 1, 1, 2, 6, "langSelectLayout"); + langSelectLayout = new TQGridLayout( this, 1, 1, 2, 6, "langSelectLayout"); - lvLanguages = new QListView( this, "lvLanguages" ); + lvLanguages = new TQListView( this, "lvLanguages" ); lvLanguages->addColumn( tr2i18n( "Languages" ) ); lvLanguages->header()->setClickEnabled( FALSE, lvLanguages->header()->count() - 1 ); - lvLanguages->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)7, 0, 0, lvLanguages->sizePolicy().hasHeightForWidth() ) ); - lvLanguages->setMinimumSize( QSize( 208, 0 ) ); - lvLanguages->setHScrollBarMode( QListView::AlwaysOff ); - lvLanguages->setResizeMode( QListView::LastColumn ); + lvLanguages->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)7, 0, 0, lvLanguages->sizePolicy().hasHeightForWidth() ) ); + lvLanguages->setMinimumSize( TQSize( 208, 0 ) ); + lvLanguages->setHScrollBarMode( TQListView::AlwaysOff ); + lvLanguages->setResizeMode( TQListView::LastColumn ); langSelectLayout->addWidget( lvLanguages, 0, 0 ); languageChange(); - resize( QSize(600, 480).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } @@ -107,7 +107,7 @@ langSelect::langSelect( QWidget* parent, const char* name, WFlags fl ) */ langSelect::~langSelect() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/src/langselectw.ui b/src/langselectw.ui index 943d72a..fda7cb3 100644 --- a/src/langselectw.ui +++ b/src/langselectw.ui @@ -1,10 +1,10 @@ langSelect - + langSelect - + 0 0 @@ -25,7 +25,7 @@ 2 - + Languages @@ -48,7 +48,7 @@ 0 - + 208 0 @@ -68,5 +68,5 @@ 89504e470d0a1a0a0000000d4948445200000011000000120806000000bdf935540000022749444154388d9dd24f48d36118c0f1efef97ca0affe582220c9a825966ed20251d86512081c1829da2c33a64070fa5d0a50e5b5d0a42727508ba48073b49185114441b24b59ce5241029643041f1b77fbfaded37759b6f87e5dc3f5df4c203efe1793eefc3f33e9210024992283e1e30d7180cb63a93c928d7d7b301f8c6c65ce7c2e1b39b394288a24b21605c309984f07884989ecec5c2d09078093df9881002b94400d260ded7d707a15041b4f4f6a26b6e7e549cbf1de24ab9dd100c96c4718bc5f81cac159114340a4dcb16060205c8218381fdededb6a7d0b8995f05f075fc61a4e6db0b57fcfecc6c0a1aea743a6b536b6bb610a068f09d5d5d877fcdcfdf04ec39e460621cddc50be65d33c25cabd553d5d282944e67bbf80bacb8dd78bd5e35035ea1d723c18d02448b461d0d72d216e839c0dea93d108b6d3d2b4924fd7e3e78bd131a5ced079550088081fc99ac67e411e5c7a4babbfb24d1cc72b683bc58541412e0e807b5dc0c6580cec139351c4a3874f26fc2a7f4254854d3b80eae7240c1ef6c6418599efdacd69e3f4db83aba85280ac9d5d5edea0b91ee3b73aa12581f94630b2c5d3a0191084422c4e271e6d7d62676548ad7fefbf031dfd2a44dbc3136f9de82f3198c0ee7ed4471ad10a214797deba8d5ffeab2703eb6f8767c7d2704e0a3bdc3179e792046afb55bff0529bbf64a3033a8fefc42db1993ad523739addc797fbbcd1998ba279e5c3962ffaf4e001657e4bbee779f08567734546ae40f517b2c24c5d9542e0000000049454e44ae426082 - + diff --git a/src/main.cpp b/src/main.cpp index 2158608..ee375b4 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -84,28 +84,28 @@ int main(int argc, char **argv) { // no session.. just start up normally KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - QString TitleNumber(args->getOption("dvdtitle")); - QString InputOptionArg( args->getOption("input")); - QString OutputOptionArg( args->getOption("output")); - QString startSectorArg(args->getOption("startsector")); - QString endSectorArg(args->getOption("endsector")); - QString audioFilterArg(args->getOption("audiofilter")); - QString subpictureFilterArg(args->getOption("subpicturefilter")); - QString vampsFactorArg(args->getOption("vampsfactor")); - QString inputSizeArg(args->getOption("inputsize")); - QString chapterArg(args->getOption("chapter")); - QString cellArg(args->getOption("cell")); - QString injectArg(args->getOption("inject")); - QString totalSizeArg(args->getOption("totalsize")); - QString dvdSizeArg(args->getOption("dvdsize")); - QString chapterSizeArg(args->getOption("chaptersize")); - QString chapterListArg(args->getOption("chapterlist")); + TQString TitleNumber(args->getOption("dvdtitle")); + TQString InputOptionArg( args->getOption("input")); + TQString OutputOptionArg( args->getOption("output")); + TQString startSectorArg(args->getOption("startsector")); + TQString endSectorArg(args->getOption("endsector")); + TQString audioFilterArg(args->getOption("audiofilter")); + TQString subpictureFilterArg(args->getOption("subpicturefilter")); + TQString vampsFactorArg(args->getOption("vampsfactor")); + TQString inputSizeArg(args->getOption("inputsize")); + TQString chapterArg(args->getOption("chapter")); + TQString cellArg(args->getOption("cell")); + TQString injectArg(args->getOption("inject")); + TQString totalSizeArg(args->getOption("totalsize")); + TQString dvdSizeArg(args->getOption("dvdsize")); + TQString chapterSizeArg(args->getOption("chaptersize")); + TQString chapterListArg(args->getOption("chapterlist")); bool ffactor=args->isSet("ffactor"); bool play= args->isSet("play"); bool redirect = args->isSet("redirect"); if (play) { k9play player; - player.setinitStatus( args->isSet("initstatus")); + player.setinittqStatus( args->isSet("initstatus")); player.setcontinue( args->isSet("continue")); player.setfirstPass(args->isSet("firstpass")); player.setuseCache(args->isSet("usecache")); diff --git a/src/mencoderCmdGen.cpp b/src/mencoderCmdGen.cpp index 93701c5..744e527 100644 --- a/src/mencoderCmdGen.cpp +++ b/src/mencoderCmdGen.cpp @@ -9,38 +9,38 @@ #include "mencoderCmdGen.h" -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "kpushbutton.h" /* - * Constructs a MyDialog1 as a child of 'parent', with the + * Constructs a MyDialog1 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. */ -MyDialog1::MyDialog1( QWidget* parent, const char* name, bool modal, WFlags fl ) - : QDialog( parent, name, modal, fl ) +MyDialog1::MyDialog1( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) + : TQDialog( tqparent, name, modal, fl ) { if ( !name ) setName( "MyDialog1" ); setSizeGripEnabled( TRUE ); - MyDialog1Layout = new QGridLayout( this, 1, 1, 11, 6, "MyDialog1Layout"); + MyDialog1Layout = new TQGridLayout( this, 1, 1, 11, 6, "MyDialog1Layout"); - Layout1 = new QHBoxLayout( 0, 0, 6, "Layout1"); - Horizontal_Spacing2 = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); - Layout1->addItem( Horizontal_Spacing2 ); + Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1"); + Horizontal_Spacing2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + Layout1->addItem(Horizontal_Spacing2 ); buttonOk = new KPushButton( this, "buttonOk" ); buttonOk->setAutoDefault( TRUE ); @@ -55,30 +55,30 @@ MyDialog1::MyDialog1( QWidget* parent, const char* name, bool modal, WFlags fl ) MyDialog1Layout->addMultiCellLayout( Layout1, 1, 1, 0, 1 ); - listView = new QListView( this, "listView" ); - listView->addColumn( QString::null ); + listView = new TQListView( this, "listView" ); + listView->addColumn( TQString() ); listView->header()->setClickEnabled( FALSE, listView->header()->count() - 1 ); listView->header()->setResizeEnabled( FALSE, listView->header()->count() - 1 ); - listView->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)7, 0, 0, listView->sizePolicy().hasHeightForWidth() ) ); - listView->setMinimumSize( QSize( 200, 0 ) ); - listView->setResizeMode( QListView::LastColumn ); + listView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listView->sizePolicy().hasHeightForWidth() ) ); + listView->setMinimumSize( TQSize( 200, 0 ) ); + listView->setResizeMode( TQListView::LastColumn ); MyDialog1Layout->addWidget( listView, 0, 0 ); - wsOptions = new QWidgetStack( this, "wsOptions" ); + wsOptions = new TQWidgetStack( this, "wsOptions" ); - WStackPage = new QWidget( wsOptions, "WStackPage" ); + WStackPage = new TQWidget( wsOptions, "WStackPage" ); wsOptions->addWidget( WStackPage, 0 ); MyDialog1Layout->addWidget( wsOptions, 0, 1 ); languageChange(); - resize( QSize(655, 498).expandedTo(minimumSizeHint()) ); + resize( TQSize(655, 498).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); - connect( listView, SIGNAL( currentChanged(QListViewItem*) ), this, SLOT( listViewCurrentChanged(QListViewItem*) ) ); + connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( listView, TQT_SIGNAL( currentChanged(TQListViewItem*) ), this, TQT_SLOT( listViewCurrentChanged(TQListViewItem*) ) ); } /* @@ -86,7 +86,7 @@ MyDialog1::MyDialog1( QWidget* parent, const char* name, bool modal, WFlags fl ) */ MyDialog1::~MyDialog1() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -96,34 +96,34 @@ MyDialog1::~MyDialog1() void MyDialog1::languageChange() { setCaption( tr2i18n( "MEncoder options" ) ); - listView->header()->setLabel( 0, QString::null ); + listView->header()->setLabel( 0, TQString() ); listView->clear(); - QListViewItem * item_2 = new QListViewItem( listView, 0 ); + TQListViewItem * item_2 = new TQListViewItem( listView, 0 ); item_2->setOpen( TRUE ); - QListViewItem * item = new QListViewItem( item_2, 0 ); + TQListViewItem * item = new TQListViewItem( item_2, 0 ); item->setText( 0, tr2i18n( "faac" ) ); item_2->setOpen( TRUE ); - item = new QListViewItem( item_2, item ); + item = new TQListViewItem( item_2, item ); item->setText( 0, tr2i18n( "lavc" ) ); item_2->setText( 0, tr2i18n( "Audio Codec" ) ); - QListViewItem * item_3 = new QListViewItem( listView, item_2 ); + TQListViewItem * item_3 = new TQListViewItem( listView, item_2 ); item_3->setOpen( TRUE ); - item = new QListViewItem( item_3, item_2 ); + item = new TQListViewItem( item_3, item_2 ); item->setText( 0, tr2i18n( "x264" ) ); item_3->setOpen( TRUE ); - item = new QListViewItem( item_3, item ); + item = new TQListViewItem( item_3, item ); item->setText( 0, tr2i18n( "xvid" ) ); item_3->setOpen( TRUE ); - item = new QListViewItem( item_3, item ); + item = new TQListViewItem( item_3, item ); item->setText( 0, tr2i18n( "lavc" ) ); item_3->setText( 0, tr2i18n( "Video Codec" ) ); } -void MyDialog1::listViewCurrentChanged(QListViewItem*) +void MyDialog1::listViewCurrentChanged(TQListViewItem*) { - qWarning( "MyDialog1::listViewCurrentChanged(QListViewItem*): Not implemented yet" ); + qWarning( "MyDialog1::listViewCurrentChanged(TQListViewItem*): Not implemented yet" ); } #include "mencoderCmdGen.moc" diff --git a/src/mencoderCmdGen.ui b/src/mencoderCmdGen.ui index 219764e..bf1e6f8 100644 --- a/src/mencoderCmdGen.ui +++ b/src/mencoderCmdGen.ui @@ -1,10 +1,10 @@ MyDialog1 - + MyDialog1 - + 0 0 @@ -22,7 +22,7 @@ unnamed - + Layout1 @@ -46,7 +46,7 @@ Expanding - + 20 20 @@ -80,7 +80,7 @@ - + @@ -159,7 +159,7 @@ 0 - + 200 0 @@ -169,11 +169,11 @@ LastColumn - + wsOptions - + WStackPage @@ -199,15 +199,15 @@ listView - currentChanged(QListViewItem*) + currentChanged(TQListViewItem*) MyDialog1 - listViewCurrentChanged(QListViewItem*) + listViewCurrentChanged(TQListViewItem*) - - listViewCurrentChanged(QListViewItem*) - - + + listViewCurrentChanged(TQListViewItem*) + + kpushbutton.h kpushbutton.h diff --git a/src/playbackoptionsw.cpp b/src/playbackoptionsw.cpp index a6a4860..66de7d4 100644 --- a/src/playbackoptionsw.cpp +++ b/src/playbackoptionsw.cpp @@ -9,19 +9,19 @@ #include "playbackoptionsw.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "kpushbutton.h" static const unsigned char img0_playbackoptionsw[] = { @@ -100,115 +100,115 @@ static const unsigned char img0_playbackoptionsw[] = { /* - * Constructs a PlaybackOptionsw as a child of 'parent', with the + * Constructs a PlaybackOptionsw as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -PlaybackOptionsw::PlaybackOptionsw( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +PlaybackOptionsw::PlaybackOptionsw( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { - QImage img; + TQImage img; img.loadFromData( img0_playbackoptionsw, sizeof( img0_playbackoptionsw ), "PNG" ); image0 = img; if ( !name ) setName( "PlaybackOptionsw" ); setIcon( image0 ); - PlaybackOptionswLayout = new QGridLayout( this, 1, 1, 2, 6, "PlaybackOptionswLayout"); + PlaybackOptionswLayout = new TQGridLayout( this, 1, 1, 2, 6, "PlaybackOptionswLayout"); - ckMenu = new QCheckBox( this, "ckMenu" ); + ckMenu = new TQCheckBox( this, "ckMenu" ); PlaybackOptionswLayout->addWidget( ckMenu, 1, 0 ); - frPlayback = new QFrame( this, "frPlayback" ); + frPlayback = new TQFrame( this, "frPlayback" ); frPlayback->setEnabled( FALSE ); - frPlayback->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, frPlayback->sizePolicy().hasHeightForWidth() ) ); - frPlayback->setFrameShape( QFrame::NoFrame ); - frPlayback->setFrameShadow( QFrame::Sunken ); - frPlaybackLayout = new QGridLayout( frPlayback, 1, 1, 0, 2, "frPlaybackLayout"); + frPlayback->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, frPlayback->sizePolicy().hasHeightForWidth() ) ); + frPlayback->setFrameShape( TQFrame::NoFrame ); + frPlayback->setFrameShadow( TQFrame::Sunken ); + frPlaybackLayout = new TQGridLayout( frPlayback, 1, 1, 0, 2, "frPlaybackLayout"); - lbSequence = new QListBox( frPlayback, "lbSequence" ); - lbSequence->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, lbSequence->sizePolicy().hasHeightForWidth() ) ); + lbSequence = new TQListBox( frPlayback, "lbSequence" ); + lbSequence->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, lbSequence->sizePolicy().hasHeightForWidth() ) ); frPlaybackLayout->addMultiCellWidget( lbSequence, 1, 5, 0, 0 ); - spacer5 = new QSpacerItem( 20, 31, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer5 = new TQSpacerItem( 20, 31, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); frPlaybackLayout->addMultiCell( spacer5, 0, 1, 1, 1 ); bSeqUp = new KPushButton( frPlayback, "bSeqUp" ); - bSeqUp->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bSeqUp->sizePolicy().hasHeightForWidth() ) ); - bSeqUp->setMinimumSize( QSize( 21, 21 ) ); - bSeqUp->setMaximumSize( QSize( 21, 21 ) ); + bSeqUp->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bSeqUp->sizePolicy().hasHeightForWidth() ) ); + bSeqUp->setMinimumSize( TQSize( 21, 21 ) ); + bSeqUp->setMaximumSize( TQSize( 21, 21 ) ); frPlaybackLayout->addMultiCellWidget( bSeqUp, 2, 2, 1, 2 ); bSeqDown = new KPushButton( frPlayback, "bSeqDown" ); - bSeqDown->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bSeqDown->sizePolicy().hasHeightForWidth() ) ); - bSeqDown->setMinimumSize( QSize( 21, 21 ) ); - bSeqDown->setMaximumSize( QSize( 21, 21 ) ); + bSeqDown->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bSeqDown->sizePolicy().hasHeightForWidth() ) ); + bSeqDown->setMinimumSize( TQSize( 21, 21 ) ); + bSeqDown->setMaximumSize( TQSize( 21, 21 ) ); frPlaybackLayout->addMultiCellWidget( bSeqDown, 4, 4, 1, 2 ); - spacer7 = new QSpacerItem( 20, 16, QSizePolicy::Minimum, QSizePolicy::Fixed ); + spacer7 = new TQSpacerItem( 20, 16, TQSizePolicy::Minimum, TQSizePolicy::Fixed ); frPlaybackLayout->addItem( spacer7, 3, 1 ); - textLabel4 = new QLabel( frPlayback, "textLabel4" ); - textLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) ); - QFont textLabel4_font( textLabel4->font() ); + textLabel4 = new TQLabel( frPlayback, "textLabel4" ); + textLabel4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) ); + TQFont textLabel4_font( textLabel4->font() ); textLabel4_font.setBold( TRUE ); textLabel4->setFont( textLabel4_font ); frPlaybackLayout->addWidget( textLabel4, 0, 0 ); - frame4 = new QFrame( frPlayback, "frame4" ); - frame4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) ); - frame4->setMinimumSize( QSize( 211, 100 ) ); - frame4->setFrameShape( QFrame::NoFrame ); - frame4->setFrameShadow( QFrame::Raised ); - frame4Layout = new QGridLayout( frame4, 1, 1, 0, 0, "frame4Layout"); + frame4 = new TQFrame( frPlayback, "frame4" ); + frame4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame4->sizePolicy().hasHeightForWidth() ) ); + frame4->setMinimumSize( TQSize( 211, 100 ) ); + frame4->setFrameShape( TQFrame::NoFrame ); + frame4->setFrameShadow( TQFrame::Raised ); + frame4Layout = new TQGridLayout( frame4, 1, 1, 0, 0, "frame4Layout"); - textLabel1 = new QLabel( frame4, "textLabel1" ); - textLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); - QFont textLabel1_font( textLabel1->font() ); + textLabel1 = new TQLabel( frame4, "textLabel1" ); + textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + TQFont textLabel1_font( textLabel1->font() ); textLabel1_font.setBold( TRUE ); textLabel1->setFont( textLabel1_font ); frame4Layout->addMultiCellWidget( textLabel1, 0, 0, 0, 2 ); - cbDefSub = new QComboBox( FALSE, frame4, "cbDefSub" ); - cbDefSub->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)5, 0, 0, cbDefSub->sizePolicy().hasHeightForWidth() ) ); + cbDefSub = new TQComboBox( FALSE, frame4, "cbDefSub" ); + cbDefSub->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, cbDefSub->sizePolicy().hasHeightForWidth() ) ); frame4Layout->addWidget( cbDefSub, 2, 2 ); - textLabel3 = new QLabel( frame4, "textLabel3" ); - textLabel3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel3->sizePolicy().hasHeightForWidth() ) ); + textLabel3 = new TQLabel( frame4, "textLabel3" ); + textLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel3->sizePolicy().hasHeightForWidth() ) ); frame4Layout->addWidget( textLabel3, 2, 0 ); - cbDefAudio = new QComboBox( FALSE, frame4, "cbDefAudio" ); - cbDefAudio->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)5, 0, 0, cbDefAudio->sizePolicy().hasHeightForWidth() ) ); + cbDefAudio = new TQComboBox( FALSE, frame4, "cbDefAudio" ); + cbDefAudio->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, cbDefAudio->sizePolicy().hasHeightForWidth() ) ); frame4Layout->addWidget( cbDefAudio, 1, 2 ); - textLabel2_3 = new QLabel( frame4, "textLabel2_3" ); - textLabel2_3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel2_3->sizePolicy().hasHeightForWidth() ) ); + textLabel2_3 = new TQLabel( frame4, "textLabel2_3" ); + textLabel2_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel2_3->sizePolicy().hasHeightForWidth() ) ); frame4Layout->addWidget( textLabel2_3, 1, 0 ); - spacer4 = new QSpacerItem( 16, 21, QSizePolicy::Fixed, QSizePolicy::Minimum ); + spacer4 = new TQSpacerItem( 16, 21, TQSizePolicy::Fixed, TQSizePolicy::Minimum ); frame4Layout->addMultiCell( spacer4, 1, 2, 1, 1 ); frPlaybackLayout->addWidget( frame4, 6, 0 ); - spacer6 = new QSpacerItem( 20, 280, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer6 = new TQSpacerItem( 20, 280, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); frPlaybackLayout->addMultiCell( spacer6, 5, 6, 1, 1 ); PlaybackOptionswLayout->addWidget( frPlayback, 0, 0 ); languageChange(); - resize( QSize(328, 491).expandedTo(minimumSizeHint()) ); + resize( TQSize(328, 491).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bSeqDown, SIGNAL( clicked() ), this, SLOT( bSeqDownClick() ) ); - connect( bSeqUp, SIGNAL( clicked() ), this, SLOT( bSeqUpClick() ) ); - connect( ckMenu, SIGNAL( clicked() ), this, SLOT( ckMenuClick() ) ); - connect( cbDefAudio, SIGNAL( activated(int) ), this, SLOT( cbDefAudioActivated(int) ) ); - connect( cbDefSub, SIGNAL( activated(int) ), this, SLOT( cbDefSubActivated(int) ) ); - connect( lbSequence, SIGNAL( currentChanged(QListBoxItem*) ), this, SLOT( lbSequenceChanged(QListBoxItem*) ) ); + connect( bSeqDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bSeqDownClick() ) ); + connect( bSeqUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bSeqUpClick() ) ); + connect( ckMenu, TQT_SIGNAL( clicked() ), this, TQT_SLOT( ckMenuClick() ) ); + connect( cbDefAudio, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbDefAudioActivated(int) ) ); + connect( cbDefSub, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbDefSubActivated(int) ) ); + connect( lbSequence, TQT_SIGNAL( currentChanged(TQListBoxItem*) ), this, TQT_SLOT( lbSequenceChanged(TQListBoxItem*) ) ); } /* @@ -216,7 +216,7 @@ PlaybackOptionsw::PlaybackOptionsw( QWidget* parent, const char* name, WFlags fl */ PlaybackOptionsw::~PlaybackOptionsw() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -227,9 +227,9 @@ void PlaybackOptionsw::languageChange() { setCaption( tr2i18n( "DVD playback options" ) ); ckMenu->setText( tr2i18n( "&Keep original menus" ) ); - ckMenu->setAccel( QKeySequence( tr2i18n( "Alt+K" ) ) ); - bSeqUp->setText( QString::null ); - bSeqDown->setText( QString::null ); + ckMenu->setAccel( TQKeySequence( tr2i18n( "Alt+K" ) ) ); + bSeqUp->setText( TQString() ); + bSeqDown->setText( TQString() ); textLabel4->setText( tr2i18n( "Selected Titles" ) ); textLabel1->setText( tr2i18n( "Default language" ) ); textLabel3->setText( tr2i18n( "Subtitle" ) ); @@ -261,9 +261,9 @@ void PlaybackOptionsw::bSeqDownClick() qWarning( "PlaybackOptionsw::bSeqDownClick(): Not implemented yet" ); } -void PlaybackOptionsw::lbSequenceChanged(QListBoxItem*) +void PlaybackOptionsw::lbSequenceChanged(TQListBoxItem*) { - qWarning( "PlaybackOptionsw::lbSequenceChanged(QListBoxItem*): Not implemented yet" ); + qWarning( "PlaybackOptionsw::lbSequenceChanged(TQListBoxItem*): Not implemented yet" ); } void PlaybackOptionsw::cbDefAudioActivated(int) diff --git a/src/playbackoptionsw.ui b/src/playbackoptionsw.ui index 8f3105e..9d0864a 100644 --- a/src/playbackoptionsw.ui +++ b/src/playbackoptionsw.ui @@ -1,10 +1,10 @@ PlaybackOptionsw - + PlaybackOptionsw - + 0 0 @@ -25,7 +25,7 @@ 2 - + ckMenu @@ -36,7 +36,7 @@ Alt+K - + frPlayback @@ -67,7 +67,7 @@ 2 - + lbSequence @@ -90,7 +90,7 @@ Expanding - + 20 31 @@ -109,13 +109,13 @@ 0 - + 21 21 - + 21 21 @@ -137,13 +137,13 @@ 0 - + 21 21 - + 21 21 @@ -163,14 +163,14 @@ Fixed - + 20 16 - + textLabel4 @@ -191,7 +191,7 @@ Selected Titles - + frame4 @@ -203,7 +203,7 @@ 0 - + 211 100 @@ -225,7 +225,7 @@ 0 - + textLabel1 @@ -246,7 +246,7 @@ Default language - + cbDefSub @@ -259,7 +259,7 @@ - + textLabel3 @@ -275,7 +275,7 @@ Subtitle - + cbDefAudio @@ -288,7 +288,7 @@ - + textLabel2_3 @@ -314,7 +314,7 @@ Fixed - + 16 21 @@ -333,7 +333,7 @@ Expanding - + 20 280 @@ -382,22 +382,22 @@ lbSequence - currentChanged(QListBoxItem*) + currentChanged(TQListBoxItem*) PlaybackOptionsw - lbSequenceChanged(QListBoxItem*) + lbSequenceChanged(TQListBoxItem*) - + cbStartActivated( int ) cbTitleActivated( int ) ckMenuClick() bSeqUpClick() bSeqDownClick() - lbSequenceChanged(QListBoxItem*) + lbSequenceChanged(TQListBoxItem*) cbDefAudioActivated(int) cbDefSubActivated(int) - - + + kpushbutton.h kpushbutton.h diff --git a/src/prefAuthor.cpp b/src/prefAuthor.cpp index f43d619..98d3d36 100644 --- a/src/prefAuthor.cpp +++ b/src/prefAuthor.cpp @@ -9,75 +9,75 @@ #include "prefAuthor.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include "knuminput.h" #include "kpushbutton.h" #include "kcolorbutton.h" /* - * Constructs a prefAuthor as a child of 'parent', with the + * Constructs a prefAuthor as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -prefAuthor::prefAuthor( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +prefAuthor::prefAuthor( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "prefAuthor" ); - prefAuthorLayout = new QGridLayout( this, 1, 1, 11, 6, "prefAuthorLayout"); + prefAuthorLayout = new TQGridLayout( this, 1, 1, 11, 6, "prefAuthorLayout"); - groupBox1 = new QGroupBox( this, "groupBox1" ); + groupBox1 = new TQGroupBox( this, "groupBox1" ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->layout()->setSpacing( 6 ); - groupBox1->layout()->setMargin( 11 ); - groupBox1Layout = new QGridLayout( groupBox1->layout() ); - groupBox1Layout->setAlignment( Qt::AlignTop ); + groupBox1->tqlayout()->setSpacing( 6 ); + groupBox1->tqlayout()->setMargin( 11 ); + groupBox1Layout = new TQGridLayout( groupBox1->tqlayout() ); + groupBox1Layout->tqsetAlignment( TQt::AlignTop ); - cbAudioFormat = new QComboBox( FALSE, groupBox1, "cbAudioFormat" ); + cbAudioFormat = new TQComboBox( FALSE, groupBox1, "cbAudioFormat" ); groupBox1Layout->addWidget( cbAudioFormat, 0, 1 ); - cbAudioBitrate = new QComboBox( FALSE, groupBox1, "cbAudioBitrate" ); + cbAudioBitrate = new TQComboBox( FALSE, groupBox1, "cbAudioBitrate" ); groupBox1Layout->addWidget( cbAudioBitrate, 1, 1 ); - textLabel1 = new QLabel( groupBox1, "textLabel1" ); + textLabel1 = new TQLabel( groupBox1, "textLabel1" ); groupBox1Layout->addWidget( textLabel1, 0, 0 ); - textLabel2 = new QLabel( groupBox1, "textLabel2" ); + textLabel2 = new TQLabel( groupBox1, "textLabel2" ); groupBox1Layout->addWidget( textLabel2, 1, 0 ); - spacer1 = new QSpacerItem( 151, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer1 = new TQSpacerItem( 151, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); groupBox1Layout->addMultiCell( spacer1, 0, 1, 2, 2 ); prefAuthorLayout->addWidget( groupBox1, 0, 0 ); - spacer3 = new QSpacerItem( 20, 60, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer3 = new TQSpacerItem( 20, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); prefAuthorLayout->addItem( spacer3, 2, 0 ); - groupBox2 = new QGroupBox( this, "groupBox2" ); + groupBox2 = new TQGroupBox( this, "groupBox2" ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->layout()->setSpacing( 6 ); - groupBox2->layout()->setMargin( 11 ); - groupBox2Layout = new QGridLayout( groupBox2->layout() ); - groupBox2Layout->setAlignment( Qt::AlignTop ); + groupBox2->tqlayout()->setSpacing( 6 ); + groupBox2->tqlayout()->setMargin( 11 ); + groupBox2Layout = new TQGridLayout( groupBox2->tqlayout() ); + groupBox2Layout->tqsetAlignment( TQt::AlignTop ); - textLabel3 = new QLabel( groupBox2, "textLabel3" ); + textLabel3 = new TQLabel( groupBox2, "textLabel3" ); groupBox2Layout->addWidget( textLabel3, 0, 0 ); - spacer2 = new QSpacerItem( 121, 31, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer2 = new TQSpacerItem( 121, 31, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); groupBox2Layout->addItem( spacer2, 0, 2 ); - textLabel5 = new QLabel( groupBox2, "textLabel5" ); + textLabel5 = new TQLabel( groupBox2, "textLabel5" ); groupBox2Layout->addWidget( textLabel5, 1, 0 ); @@ -97,7 +97,7 @@ prefAuthor::prefAuthor( QWidget* parent, const char* name, WFlags fl ) groupBox2Layout->addWidget( bButtonFont, 4, 1 ); - textLabel6 = new QLabel( groupBox2, "textLabel6" ); + textLabel6 = new TQLabel( groupBox2, "textLabel6" ); groupBox2Layout->addWidget( textLabel6, 2, 0 ); @@ -105,7 +105,7 @@ prefAuthor::prefAuthor( QWidget* parent, const char* name, WFlags fl ) groupBox2Layout->addWidget( cbHiliteColor, 2, 1 ); - textLabel6_2 = new QLabel( groupBox2, "textLabel6_2" ); + textLabel6_2 = new TQLabel( groupBox2, "textLabel6_2" ); groupBox2Layout->addWidget( textLabel6_2, 3, 0 ); @@ -115,11 +115,11 @@ prefAuthor::prefAuthor( QWidget* parent, const char* name, WFlags fl ) prefAuthorLayout->addWidget( groupBox2, 1, 0 ); languageChange(); - resize( QSize(600, 480).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bButtonFont, SIGNAL( clicked() ), this, SLOT( bButtonFontClicked() ) ); + connect( bButtonFont, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bButtonFontClicked() ) ); } /* @@ -127,7 +127,7 @@ prefAuthor::prefAuthor( QWidget* parent, const char* name, WFlags fl ) */ prefAuthor::~prefAuthor() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -152,9 +152,9 @@ void prefAuthor::languageChange() textLabel5->setText( tr2i18n( "Height" ) ); bButtonFont->setText( tr2i18n( "Font" ) ); textLabel6->setText( tr2i18n( "Hilite color" ) ); - cbHiliteColor->setText( QString::null ); + cbHiliteColor->setText( TQString() ); textLabel6_2->setText( tr2i18n( "Text color" ) ); - cbTextColor->setText( QString::null ); + cbTextColor->setText( TQString() ); } void prefAuthor::bButtonFontClicked() diff --git a/src/prefAuthor.ui b/src/prefAuthor.ui index 0f3db9a..7b3ca9c 100644 --- a/src/prefAuthor.ui +++ b/src/prefAuthor.ui @@ -1,10 +1,10 @@ prefAuthor - + prefAuthor - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox1 @@ -30,7 +30,7 @@ unnamed - + AC3 @@ -45,7 +45,7 @@ cbAudioFormat - + 128 @@ -65,7 +65,7 @@ cbAudioBitrate - + textLabel1 @@ -73,7 +73,7 @@ Format - + textLabel2 @@ -91,7 +91,7 @@ Expanding - + 151 21 @@ -110,14 +110,14 @@ Expanding - + 20 60 - + groupBox2 @@ -128,7 +128,7 @@ unnamed - + textLabel3 @@ -146,14 +146,14 @@ Expanding - + 121 31 - + textLabel5 @@ -191,7 +191,7 @@ Font - + textLabel6 @@ -207,7 +207,7 @@ - + textLabel6_2 @@ -235,10 +235,10 @@ bButtonFontClicked() - + bButtonFontClicked() - - + + knuminput.h knuminput.h diff --git a/src/prefDVD.cpp b/src/prefDVD.cpp index d0aef30..03c81dd 100644 --- a/src/prefDVD.cpp +++ b/src/prefDVD.cpp @@ -9,76 +9,76 @@ #include "prefDVD.h" -#include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "kurlrequester.h" #include "klineedit.h" #include "kpushbutton.h" /* - * Constructs a prefDVD as a child of 'parent', with the + * Constructs a prefDVD as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -prefDVD::prefDVD( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +prefDVD::prefDVD( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "prefDVD" ); - prefDVDLayout = new QGridLayout( this, 1, 1, 11, 6, "prefDVDLayout"); + prefDVDLayout = new TQGridLayout( this, 1, 1, 11, 6, "prefDVDLayout"); - lblworkDir = new QLabel( this, "lblworkDir" ); - lblworkDir->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)5, 0, 0, lblworkDir->sizePolicy().hasHeightForWidth() ) ); + lblworkDir = new TQLabel( this, "lblworkDir" ); + lblworkDir->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, lblworkDir->sizePolicy().hasHeightForWidth() ) ); prefDVDLayout->addWidget( lblworkDir, 0, 0 ); urOutput = new KURLRequester( this, "urOutput" ); - urOutput->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, urOutput->sizePolicy().hasHeightForWidth() ) ); + urOutput->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, urOutput->sizePolicy().hasHeightForWidth() ) ); prefDVDLayout->addMultiCellWidget( urOutput, 0, 0, 1, 2 ); - ckK3b = new QCheckBox( this, "ckK3b" ); + ckK3b = new TQCheckBox( this, "ckK3b" ); prefDVDLayout->addMultiCellWidget( ckK3b, 2, 2, 0, 2 ); - ckAutoBurn = new QCheckBox( this, "ckAutoBurn" ); - ckAutoBurn->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, ckAutoBurn->sizePolicy().hasHeightForWidth() ) ); + ckAutoBurn = new TQCheckBox( this, "ckAutoBurn" ); + ckAutoBurn->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, ckAutoBurn->sizePolicy().hasHeightForWidth() ) ); prefDVDLayout->addMultiCellWidget( ckAutoBurn, 3, 3, 0, 2 ); - textLabel1_2 = new QLabel( this, "textLabel1_2" ); + textLabel1_2 = new TQLabel( this, "textLabel1_2" ); prefDVDLayout->addWidget( textLabel1_2, 1, 0 ); - sbSize = new QSpinBox( this, "sbSize" ); - sbSize->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, sbSize->sizePolicy().hasHeightForWidth() ) ); - sbSize->setMinimumSize( QSize( 80, 0 ) ); + sbSize = new TQSpinBox( this, "sbSize" ); + sbSize->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbSize->sizePolicy().hasHeightForWidth() ) ); + sbSize->setMinimumSize( TQSize( 80, 0 ) ); sbSize->setMaxValue( 9000 ); sbSize->setLineStep( 100 ); sbSize->setValue( 4400 ); prefDVDLayout->addWidget( sbSize, 1, 1 ); - ckQuickScan = new QCheckBox( this, "ckQuickScan" ); + ckQuickScan = new TQCheckBox( this, "ckQuickScan" ); prefDVDLayout->addMultiCellWidget( ckQuickScan, 4, 4, 0, 2 ); - spacer1 = new QSpacerItem( 21, 110, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer1 = new TQSpacerItem( 21, 110, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); prefDVDLayout->addItem( spacer1, 7, 2 ); - ckDvdAuthor = new QCheckBox( this, "ckDvdAuthor" ); + ckDvdAuthor = new TQCheckBox( this, "ckDvdAuthor" ); prefDVDLayout->addMultiCellWidget( ckDvdAuthor, 5, 5, 0, 2 ); - ckDelTmpFiles = new QCheckBox( this, "ckDelTmpFiles" ); + ckDelTmpFiles = new TQCheckBox( this, "ckDelTmpFiles" ); prefDVDLayout->addMultiCellWidget( ckDelTmpFiles, 6, 6, 0, 2 ); languageChange(); - resize( QSize(600, 347).expandedTo(minimumSizeHint()) ); + resize( TQSize(600, 347).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); } @@ -87,7 +87,7 @@ prefDVD::prefDVD( QWidget* parent, const char* name, WFlags fl ) */ prefDVD::~prefDVD() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -99,16 +99,16 @@ void prefDVD::languageChange() setCaption( tr2i18n( "prefDVD" ) ); lblworkDir->setText( tr2i18n( "Output directory" ) ); ckK3b->setText( tr2i18n( "Burn with k3b" ) ); - ckK3b->setAccel( QKeySequence( tr2i18n( "Alt+B" ) ) ); + ckK3b->setAccel( TQKeySequence( tr2i18n( "Alt+B" ) ) ); ckAutoBurn->setText( tr2i18n( "Auto burn" ) ); - ckAutoBurn->setAccel( QKeySequence( tr2i18n( "Alt+T" ) ) ); + ckAutoBurn->setAccel( TQKeySequence( tr2i18n( "Alt+T" ) ) ); textLabel1_2->setText( tr2i18n( "DVD size" ) ); ckQuickScan->setText( tr2i18n( "Quick scan" ) ); - ckQuickScan->setAccel( QKeySequence( tr2i18n( "Alt+Q" ) ) ); + ckQuickScan->setAccel( TQKeySequence( tr2i18n( "Alt+Q" ) ) ); ckDvdAuthor->setText( tr2i18n( "use dvdAuthor for copy without menus" ) ); - ckDvdAuthor->setAccel( QKeySequence( tr2i18n( "Alt+D" ) ) ); + ckDvdAuthor->setAccel( TQKeySequence( tr2i18n( "Alt+D" ) ) ); ckDelTmpFiles->setText( tr2i18n( "Clear output directory on exit" ) ); - ckDelTmpFiles->setAccel( QKeySequence( tr2i18n( "Alt+Y" ) ) ); + ckDelTmpFiles->setAccel( TQKeySequence( tr2i18n( "Alt+Y" ) ) ); } #include "prefDVD.moc" diff --git a/src/prefDVD.ui b/src/prefDVD.ui index d610ee8..e07b932 100644 --- a/src/prefDVD.ui +++ b/src/prefDVD.ui @@ -1,10 +1,10 @@ prefDVD - + prefDVD - + 0 0 @@ -19,7 +19,7 @@ unnamed - + lblworkDir @@ -48,7 +48,7 @@ - + ckK3b @@ -59,7 +59,7 @@ Alt+B - + ckAutoBurn @@ -78,7 +78,7 @@ Alt+T - + textLabel1_2 @@ -86,7 +86,7 @@ DVD size - + sbSize @@ -98,7 +98,7 @@ 0 - + 80 0 @@ -114,7 +114,7 @@ 4400 - + ckQuickScan @@ -135,14 +135,14 @@ Expanding - + 21 110 - + ckDvdAuthor @@ -153,7 +153,7 @@ Alt+D - + ckDelTmpFiles @@ -166,7 +166,7 @@ - + kurlrequester.h klineedit.h diff --git a/src/prefMPEG4.cpp b/src/prefMPEG4.cpp index 9787413..05540d3 100644 --- a/src/prefMPEG4.cpp +++ b/src/prefMPEG4.cpp @@ -9,21 +9,21 @@ #include "prefMPEG4.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const unsigned char img0_prefMPEG4[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, @@ -89,110 +89,110 @@ static const unsigned char img0_prefMPEG4[] = { /* - * Constructs a prefMPEG4 as a child of 'parent', with the + * Constructs a prefMPEG4 as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -prefMPEG4::prefMPEG4( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +prefMPEG4::prefMPEG4( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { - QImage img; + TQImage img; img.loadFromData( img0_prefMPEG4, sizeof( img0_prefMPEG4 ), "PNG" ); image0 = img; if ( !name ) setName( "prefMPEG4" ); setIcon( image0 ); - prefMPEG4Layout = new QGridLayout( this, 1, 1, 5, 2, "prefMPEG4Layout"); + prefMPEG4Layout = new TQGridLayout( this, 1, 1, 5, 2, "prefMPEG4Layout"); - lTitle = new QLabel( this, "lTitle" ); - QFont lTitle_font( lTitle->font() ); + lTitle = new TQLabel( this, "lTitle" ); + TQFont lTitle_font( lTitle->font() ); lTitle_font.setBold( TRUE ); lTitle->setFont( lTitle_font ); prefMPEG4Layout->addWidget( lTitle, 0, 0 ); - tabWidget = new QTabWidget( this, "tabWidget" ); + tabWidget = new TQTabWidget( this, "tabWidget" ); - tabVideo = new QWidget( tabWidget, "tabVideo" ); - tabVideoLayout = new QGridLayout( tabVideo, 1, 1, 11, 6, "tabVideoLayout"); + tabVideo = new TQWidget( tabWidget, "tabVideo" ); + tabVideoLayout = new TQGridLayout( tabVideo, 1, 1, 11, 6, "tabVideoLayout"); - ck2passes = new QCheckBox( tabVideo, "ck2passes" ); + ck2passes = new TQCheckBox( tabVideo, "ck2passes" ); tabVideoLayout->addMultiCellWidget( ck2passes, 0, 0, 3, 6 ); - textLabel1_4 = new QLabel( tabVideo, "textLabel1_4" ); + textLabel1_4 = new TQLabel( tabVideo, "textLabel1_4" ); tabVideoLayout->addWidget( textLabel1_4, 0, 0 ); - cbMp4Codec = new QComboBox( FALSE, tabVideo, "cbMp4Codec" ); - cbMp4Codec->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, cbMp4Codec->sizePolicy().hasHeightForWidth() ) ); + cbMp4Codec = new TQComboBox( FALSE, tabVideo, "cbMp4Codec" ); + cbMp4Codec->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4Codec->sizePolicy().hasHeightForWidth() ) ); tabVideoLayout->addMultiCellWidget( cbMp4Codec, 0, 0, 1, 2 ); - textLabel3_2 = new QLabel( tabVideo, "textLabel3_2" ); + textLabel3_2 = new TQLabel( tabVideo, "textLabel3_2" ); tabVideoLayout->addWidget( textLabel3_2, 1, 0 ); - textLabel3_2_2 = new QLabel( tabVideo, "textLabel3_2_2" ); + textLabel3_2_2 = new TQLabel( tabVideo, "textLabel3_2_2" ); tabVideoLayout->addWidget( textLabel3_2_2, 2, 0 ); - leMp4Width = new QLineEdit( tabVideo, "leMp4Width" ); - leMp4Width->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, leMp4Width->sizePolicy().hasHeightForWidth() ) ); - leMp4Width->setMinimumSize( QSize( 0, 0 ) ); - leMp4Width->setMaximumSize( QSize( 70, 32767 ) ); + leMp4Width = new TQLineEdit( tabVideo, "leMp4Width" ); + leMp4Width->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, leMp4Width->sizePolicy().hasHeightForWidth() ) ); + leMp4Width->setMinimumSize( TQSize( 0, 0 ) ); + leMp4Width->setMaximumSize( TQSize( 70, 32767 ) ); leMp4Width->setMaxLength( 4 ); - leMp4Width->setAlignment( int( QLineEdit::AlignAuto ) ); + leMp4Width->tqsetAlignment( int( TQLineEdit::AlignAuto ) ); tabVideoLayout->addWidget( leMp4Width, 1, 1 ); - ckMp4AspectRatio = new QCheckBox( tabVideo, "ckMp4AspectRatio" ); - ckMp4AspectRatio->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, ckMp4AspectRatio->sizePolicy().hasHeightForWidth() ) ); + ckMp4AspectRatio = new TQCheckBox( tabVideo, "ckMp4AspectRatio" ); + ckMp4AspectRatio->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, ckMp4AspectRatio->sizePolicy().hasHeightForWidth() ) ); ckMp4AspectRatio->setChecked( TRUE ); tabVideoLayout->addMultiCellWidget( ckMp4AspectRatio, 1, 1, 3, 6 ); - spacer9 = new QSpacerItem( 380, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer9 = new TQSpacerItem( 380, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tabVideoLayout->addMultiCell( spacer9, 2, 2, 2, 6 ); - leMp4Height = new QLineEdit( tabVideo, "leMp4Height" ); + leMp4Height = new TQLineEdit( tabVideo, "leMp4Height" ); leMp4Height->setEnabled( FALSE ); - leMp4Height->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, leMp4Height->sizePolicy().hasHeightForWidth() ) ); - leMp4Height->setMinimumSize( QSize( 0, 0 ) ); - leMp4Height->setMaximumSize( QSize( 70, 32767 ) ); + leMp4Height->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4Height->sizePolicy().hasHeightForWidth() ) ); + leMp4Height->setMinimumSize( TQSize( 0, 0 ) ); + leMp4Height->setMaximumSize( TQSize( 70, 32767 ) ); leMp4Height->setMaxLength( 4 ); - leMp4Height->setAlignment( int( QLineEdit::AlignAuto ) ); + leMp4Height->tqsetAlignment( int( TQLineEdit::AlignAuto ) ); tabVideoLayout->addWidget( leMp4Height, 2, 1 ); - spacer8 = new QSpacerItem( 21, 110, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer8 = new TQSpacerItem( 21, 110, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabVideoLayout->addItem( spacer8, 4, 5 ); - sbMp4NumberCD = new QSpinBox( tabVideo, "sbMp4NumberCD" ); - sbMp4NumberCD->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, sbMp4NumberCD->sizePolicy().hasHeightForWidth() ) ); + sbMp4NumberCD = new TQSpinBox( tabVideo, "sbMp4NumberCD" ); + sbMp4NumberCD->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4NumberCD->sizePolicy().hasHeightForWidth() ) ); sbMp4NumberCD->setMaxValue( 9 ); sbMp4NumberCD->setMinValue( 1 ); tabVideoLayout->addWidget( sbMp4NumberCD, 3, 5 ); - textLabel1 = new QLabel( tabVideo, "textLabel1" ); - textLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + textLabel1 = new TQLabel( tabVideo, "textLabel1" ); + textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); tabVideoLayout->addWidget( textLabel1, 3, 4 ); - buttonGroup1 = new QButtonGroup( tabVideo, "buttonGroup1" ); - buttonGroup1->setFrameShape( QButtonGroup::NoFrame ); + buttonGroup1 = new TQButtonGroup( tabVideo, "buttonGroup1" ); + buttonGroup1->setFrameShape( TQButtonGroup::NoFrame ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->layout()->setSpacing( 6 ); - buttonGroup1->layout()->setMargin( 2 ); - buttonGroup1Layout = new QGridLayout( buttonGroup1->layout() ); - buttonGroup1Layout->setAlignment( Qt::AlignTop ); + buttonGroup1->tqlayout()->setSpacing( 6 ); + buttonGroup1->tqlayout()->setMargin( 2 ); + buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() ); + buttonGroup1Layout->tqsetAlignment( TQt::AlignTop ); - rbSize = new QRadioButton( buttonGroup1, "rbSize" ); + rbSize = new TQRadioButton( buttonGroup1, "rbSize" ); buttonGroup1Layout->addWidget( rbSize, 0, 0 ); - sbMp4Size = new QSpinBox( buttonGroup1, "sbMp4Size" ); - sbMp4Size->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, sbMp4Size->sizePolicy().hasHeightForWidth() ) ); - sbMp4Size->setMinimumSize( QSize( 80, 0 ) ); - sbMp4Size->setButtonSymbols( QSpinBox::UpDownArrows ); + sbMp4Size = new TQSpinBox( buttonGroup1, "sbMp4Size" ); + sbMp4Size->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, sbMp4Size->sizePolicy().hasHeightForWidth() ) ); + sbMp4Size->setMinimumSize( TQSize( 80, 0 ) ); + sbMp4Size->setButtonSymbols( TQSpinBox::UpDownArrows ); sbMp4Size->setMaxValue( 9999 ); sbMp4Size->setMinValue( 1 ); sbMp4Size->setLineStep( 10 ); @@ -200,86 +200,86 @@ prefMPEG4::prefMPEG4( QWidget* parent, const char* name, WFlags fl ) buttonGroup1Layout->addWidget( sbMp4Size, 0, 1 ); - rbBitrate = new QRadioButton( buttonGroup1, "rbBitrate" ); + rbBitrate = new TQRadioButton( buttonGroup1, "rbBitrate" ); buttonGroup1Layout->addWidget( rbBitrate, 1, 0 ); - spacer6 = new QSpacerItem( 51, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer6 = new TQSpacerItem( 51, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); buttonGroup1Layout->addMultiCell( spacer6, 0, 1, 2, 2 ); - leMp4VideoBitrate = new QLineEdit( buttonGroup1, "leMp4VideoBitrate" ); - leMp4VideoBitrate->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, leMp4VideoBitrate->sizePolicy().hasHeightForWidth() ) ); + leMp4VideoBitrate = new TQLineEdit( buttonGroup1, "leMp4VideoBitrate" ); + leMp4VideoBitrate->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, leMp4VideoBitrate->sizePolicy().hasHeightForWidth() ) ); buttonGroup1Layout->addWidget( leMp4VideoBitrate, 1, 1 ); tabVideoLayout->addMultiCellWidget( buttonGroup1, 3, 3, 0, 3 ); - spacer3 = new QSpacerItem( 130, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer3 = new TQSpacerItem( 130, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tabVideoLayout->addItem( spacer3, 3, 6 ); - tabWidget->insertTab( tabVideo, QString::fromLatin1("") ); + tabWidget->insertTab( tabVideo, TQString::tqfromLatin1("") ); - tabAudio = new QWidget( tabWidget, "tabAudio" ); - tabAudioLayout = new QGridLayout( tabAudio, 1, 1, 11, 6, "tabAudioLayout"); + tabAudio = new TQWidget( tabWidget, "tabAudio" ); + tabAudioLayout = new TQGridLayout( tabAudio, 1, 1, 11, 6, "tabAudioLayout"); - textLabel1_4_2 = new QLabel( tabAudio, "textLabel1_4_2" ); + textLabel1_4_2 = new TQLabel( tabAudio, "textLabel1_4_2" ); tabAudioLayout->addWidget( textLabel1_4_2, 0, 0 ); - cbMp4AudioCodec = new QComboBox( FALSE, tabAudio, "cbMp4AudioCodec" ); - cbMp4AudioCodec->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, cbMp4AudioCodec->sizePolicy().hasHeightForWidth() ) ); + cbMp4AudioCodec = new TQComboBox( FALSE, tabAudio, "cbMp4AudioCodec" ); + cbMp4AudioCodec->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, cbMp4AudioCodec->sizePolicy().hasHeightForWidth() ) ); tabAudioLayout->addMultiCellWidget( cbMp4AudioCodec, 0, 0, 1, 2 ); - textLabel1_5 = new QLabel( tabAudio, "textLabel1_5" ); + textLabel1_5 = new TQLabel( tabAudio, "textLabel1_5" ); tabAudioLayout->addWidget( textLabel1_5, 1, 0 ); - leMp4AudioBitrate = new QLineEdit( tabAudio, "leMp4AudioBitrate" ); - leMp4AudioBitrate->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, leMp4AudioBitrate->sizePolicy().hasHeightForWidth() ) ); - leMp4AudioBitrate->setMinimumSize( QSize( 0, 0 ) ); - leMp4AudioBitrate->setMaximumSize( QSize( 70, 32767 ) ); + leMp4AudioBitrate = new TQLineEdit( tabAudio, "leMp4AudioBitrate" ); + leMp4AudioBitrate->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, leMp4AudioBitrate->sizePolicy().hasHeightForWidth() ) ); + leMp4AudioBitrate->setMinimumSize( TQSize( 0, 0 ) ); + leMp4AudioBitrate->setMaximumSize( TQSize( 70, 32767 ) ); leMp4AudioBitrate->setMaxLength( 3 ); - leMp4AudioBitrate->setAlignment( int( QLineEdit::AlignAuto ) ); + leMp4AudioBitrate->tqsetAlignment( int( TQLineEdit::AlignAuto ) ); tabAudioLayout->addWidget( leMp4AudioBitrate, 1, 1 ); - spacer4 = new QSpacerItem( 376, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer4 = new TQSpacerItem( 376, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); tabAudioLayout->addMultiCell( spacer4, 1, 1, 2, 3 ); - sbAudioGain = new QSpinBox( tabAudio, "sbAudioGain" ); + sbAudioGain = new TQSpinBox( tabAudio, "sbAudioGain" ); sbAudioGain->setMaxValue( 10 ); sbAudioGain->setMinValue( 1 ); tabAudioLayout->addWidget( sbAudioGain, 2, 1 ); - textLabel1_2 = new QLabel( tabAudio, "textLabel1_2" ); + textLabel1_2 = new TQLabel( tabAudio, "textLabel1_2" ); tabAudioLayout->addWidget( textLabel1_2, 2, 0 ); - spacer14 = new QSpacerItem( 20, 61, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer14 = new TQSpacerItem( 20, 61, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabAudioLayout->addItem( spacer14, 3, 3 ); - tabWidget->insertTab( tabAudio, QString::fromLatin1("") ); + tabWidget->insertTab( tabAudio, TQString::tqfromLatin1("") ); prefMPEG4Layout->addWidget( tabWidget, 1, 0 ); - ckUseCache = new QCheckBox( this, "ckUseCache" ); + ckUseCache = new TQCheckBox( this, "ckUseCache" ); prefMPEG4Layout->addWidget( ckUseCache, 2, 0 ); languageChange(); - resize( QSize(582, 460).expandedTo(minimumSizeHint()) ); + resize( TQSize(582, 460).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( cbMp4AudioCodec, SIGNAL( activated(int) ), this, SLOT( cbMp4AudioCodecActivated(int) ) ); - connect( cbMp4Codec, SIGNAL( activated(int) ), this, SLOT( cbMp4CodecActivated(int) ) ); - connect( ck2passes, SIGNAL( clicked() ), this, SLOT( ck2passesClicked() ) ); - connect( ckMp4AspectRatio, SIGNAL( clicked() ), this, SLOT( ckMp4AspectRatioClick() ) ); - connect( rbBitrate, SIGNAL( clicked() ), this, SLOT( rgVideoSizeChanged() ) ); - connect( rbSize, SIGNAL( clicked() ), this, SLOT( rgVideoSizeChanged() ) ); - connect( leMp4Width, SIGNAL( textChanged(const QString&) ), this, SLOT( leMp4WidthTextChanged(const QString&) ) ); - connect( leMp4Height, SIGNAL( textChanged(const QString&) ), this, SLOT( leMp4HeightTextChanged(const QString&) ) ); - connect( sbMp4Size, SIGNAL( valueChanged(int) ), this, SLOT( sbMp4SizeValueChanged(int) ) ); - connect( sbMp4NumberCD, SIGNAL( valueChanged(int) ), this, SLOT( sbMp4NumberCDValueChanged(int) ) ); - connect( leMp4VideoBitrate, SIGNAL( textChanged(const QString&) ), this, SLOT( leMp4VideoBitrateTextChanged(const QString&) ) ); - connect( sbAudioGain, SIGNAL( valueChanged(int) ), this, SLOT( sbAudioGainValueChanged(int) ) ); - connect( leMp4AudioBitrate, SIGNAL( textChanged(const QString&) ), this, SLOT( leMp4AudioBitrateTextChanged(const QString&) ) ); - connect( ckUseCache, SIGNAL( clicked() ), this, SLOT( ckUseCacheClick() ) ); + connect( cbMp4AudioCodec, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbMp4AudioCodecActivated(int) ) ); + connect( cbMp4Codec, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( cbMp4CodecActivated(int) ) ); + connect( ck2passes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( ck2passesClicked() ) ); + connect( ckMp4AspectRatio, TQT_SIGNAL( clicked() ), this, TQT_SLOT( ckMp4AspectRatioClick() ) ); + connect( rbBitrate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( rgVideoSizeChanged() ) ); + connect( rbSize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( rgVideoSizeChanged() ) ); + connect( leMp4Width, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( leMp4WidthTextChanged(const TQString&) ) ); + connect( leMp4Height, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( leMp4HeightTextChanged(const TQString&) ) ); + connect( sbMp4Size, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( sbMp4SizeValueChanged(int) ) ); + connect( sbMp4NumberCD, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( sbMp4NumberCDValueChanged(int) ) ); + connect( leMp4VideoBitrate, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( leMp4VideoBitrateTextChanged(const TQString&) ) ); + connect( sbAudioGain, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( sbAudioGainValueChanged(int) ) ); + connect( leMp4AudioBitrate, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( leMp4AudioBitrateTextChanged(const TQString&) ) ); + connect( ckUseCache, TQT_SIGNAL( clicked() ), this, TQT_SLOT( ckUseCacheClick() ) ); // tab order setTabOrder( tabWidget, cbMp4Codec ); @@ -302,7 +302,7 @@ prefMPEG4::prefMPEG4( QWidget* parent, const char* name, WFlags fl ) */ prefMPEG4::~prefMPEG4() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -312,9 +312,9 @@ prefMPEG4::~prefMPEG4() void prefMPEG4::languageChange() { setCaption( tr2i18n( "Form1" ) ); - lTitle->setText( QString::null ); + lTitle->setText( TQString() ); ck2passes->setText( tr2i18n( "2 pass" ) ); - ck2passes->setAccel( QKeySequence( tr2i18n( "Alt+2" ) ) ); + ck2passes->setAccel( TQKeySequence( tr2i18n( "Alt+2" ) ) ); textLabel1_4->setText( tr2i18n( "Codec" ) ); cbMp4Codec->clear(); cbMp4Codec->insertItem( tr2i18n( "XviD" ) ); @@ -324,17 +324,17 @@ void prefMPEG4::languageChange() textLabel3_2->setText( tr2i18n( "Width" ) ); textLabel3_2_2->setText( tr2i18n( "Height" ) ); leMp4Width->setText( tr2i18n( "640" ) ); - leMp4Width->setInputMask( QString::null ); + leMp4Width->setInputMask( TQString() ); ckMp4AspectRatio->setText( tr2i18n( "&keep aspect ratio" ) ); - ckMp4AspectRatio->setAccel( QKeySequence( tr2i18n( "Alt+K" ) ) ); - leMp4Height->setInputMask( QString::null ); + ckMp4AspectRatio->setAccel( TQKeySequence( tr2i18n( "Alt+K" ) ) ); + leMp4Height->setInputMask( TQString() ); textLabel1->setText( tr2i18n( "X" ) ); - buttonGroup1->setTitle( QString::null ); + buttonGroup1->setTitle( TQString() ); rbSize->setText( tr2i18n( "File size" ) ); - rbSize->setAccel( QKeySequence( tr2i18n( "Alt+S" ) ) ); + rbSize->setAccel( TQKeySequence( tr2i18n( "Alt+S" ) ) ); sbMp4Size->setSuffix( tr2i18n( " MB" ) ); rbBitrate->setText( tr2i18n( "Bitrate" ) ); - rbBitrate->setAccel( QKeySequence( tr2i18n( "Alt+B" ) ) ); + rbBitrate->setAccel( TQKeySequence( tr2i18n( "Alt+B" ) ) ); tabWidget->changeTab( tabVideo, tr2i18n( "Video" ) ); textLabel1_4_2->setText( tr2i18n( "Codec" ) ); cbMp4AudioCodec->clear(); @@ -344,7 +344,7 @@ void prefMPEG4::languageChange() cbMp4AudioCodec->insertItem( tr2i18n( "ac3" ) ); cbMp4AudioCodec->insertItem( tr2i18n( "adpcm ima" ) ); textLabel1_5->setText( tr2i18n( "Bitrate" ) ); - leMp4AudioBitrate->setText( QString::null ); + leMp4AudioBitrate->setText( TQString() ); textLabel1_2->setText( tr2i18n( "Gain" ) ); tabWidget->changeTab( tabAudio, tr2i18n( "Audio" ) ); ckUseCache->setText( tr2i18n( "use cell cache" ) ); @@ -380,19 +380,19 @@ void prefMPEG4::sbMp4NumberCDValueChanged(int) qWarning( "prefMPEG4::sbMp4NumberCDValueChanged(int): Not implemented yet" ); } -void prefMPEG4::leMp4WidthTextChanged(const QString&) +void prefMPEG4::leMp4WidthTextChanged(const TQString&) { - qWarning( "prefMPEG4::leMp4WidthTextChanged(const QString&): Not implemented yet" ); + qWarning( "prefMPEG4::leMp4WidthTextChanged(const TQString&): Not implemented yet" ); } -void prefMPEG4::leMp4HeightTextChanged(const QString&) +void prefMPEG4::leMp4HeightTextChanged(const TQString&) { - qWarning( "prefMPEG4::leMp4HeightTextChanged(const QString&): Not implemented yet" ); + qWarning( "prefMPEG4::leMp4HeightTextChanged(const TQString&): Not implemented yet" ); } -void prefMPEG4::leMp4AudioBitrateTextChanged(const QString&) +void prefMPEG4::leMp4AudioBitrateTextChanged(const TQString&) { - qWarning( "prefMPEG4::leMp4AudioBitrateTextChanged(const QString&): Not implemented yet" ); + qWarning( "prefMPEG4::leMp4AudioBitrateTextChanged(const TQString&): Not implemented yet" ); } void prefMPEG4::rgVideoSizeChanged() @@ -400,9 +400,9 @@ void prefMPEG4::rgVideoSizeChanged() qWarning( "prefMPEG4::rgVideoSizeChanged(): Not implemented yet" ); } -void prefMPEG4::leMp4VideoBitrateTextChanged(const QString&) +void prefMPEG4::leMp4VideoBitrateTextChanged(const TQString&) { - qWarning( "prefMPEG4::leMp4VideoBitrateTextChanged(const QString&): Not implemented yet" ); + qWarning( "prefMPEG4::leMp4VideoBitrateTextChanged(const TQString&): Not implemented yet" ); } void prefMPEG4::sbAudioGainValueChanged(int) diff --git a/src/prefMPEG4.ui b/src/prefMPEG4.ui index fc21017..0789409 100644 --- a/src/prefMPEG4.ui +++ b/src/prefMPEG4.ui @@ -1,10 +1,10 @@ prefMPEG4 - + prefMPEG4 - + 0 0 @@ -28,7 +28,7 @@ 2 - + lTitle @@ -41,11 +41,11 @@ - + tabWidget - + tabVideo @@ -56,7 +56,7 @@ unnamed - + ck2passes @@ -67,7 +67,7 @@ Alt+2 - + textLabel1_4 @@ -75,7 +75,7 @@ Codec - + XviD @@ -106,7 +106,7 @@ 1 - + textLabel3_2 @@ -114,7 +114,7 @@ Width - + textLabel3_2_2 @@ -122,7 +122,7 @@ Height - + leMp4Width @@ -134,13 +134,13 @@ 0 - + 0 0 - + 70 32767 @@ -152,14 +152,14 @@ 4 - + AlignAuto - + ckMp4AspectRatio @@ -191,14 +191,14 @@ Expanding - + 380 21 - + leMp4Height @@ -213,13 +213,13 @@ 0 - + 0 0 - + 70 32767 @@ -228,7 +228,7 @@ 4 - + AlignAuto @@ -245,14 +245,14 @@ Expanding - + 21 110 - + sbMp4NumberCD @@ -271,7 +271,7 @@ 1 - + textLabel1 @@ -287,7 +287,7 @@ X - + buttonGroup1 @@ -304,7 +304,7 @@ 2 - + rbSize @@ -315,7 +315,7 @@ Alt+S - + sbMp4Size @@ -327,7 +327,7 @@ 0 - + 80 0 @@ -352,7 +352,7 @@ 700 - + rbBitrate @@ -373,14 +373,14 @@ Expanding - + 51 20 - + leMp4VideoBitrate @@ -405,7 +405,7 @@ Expanding - + 130 21 @@ -414,7 +414,7 @@ - + tabAudio @@ -425,7 +425,7 @@ unnamed - + textLabel1_4_2 @@ -433,7 +433,7 @@ Codec - + mp3 @@ -471,7 +471,7 @@ - + textLabel1_5 @@ -479,7 +479,7 @@ Bitrate - + leMp4AudioBitrate @@ -491,13 +491,13 @@ 0 - + 0 0 - + 70 32767 @@ -509,7 +509,7 @@ 3 - + AlignAuto @@ -523,14 +523,14 @@ Expanding - + 376 20 - + sbAudioGain @@ -541,7 +541,7 @@ 1 - + textLabel1_2 @@ -559,7 +559,7 @@ Expanding - + 20 61 @@ -569,7 +569,7 @@ - + ckUseCache @@ -623,15 +623,15 @@ leMp4Width - textChanged(const QString&) + textChanged(const TQString&) prefMPEG4 - leMp4WidthTextChanged(const QString&) + leMp4WidthTextChanged(const TQString&) leMp4Height - textChanged(const QString&) + textChanged(const TQString&) prefMPEG4 - leMp4HeightTextChanged(const QString&) + leMp4HeightTextChanged(const TQString&) sbMp4Size @@ -647,9 +647,9 @@ leMp4VideoBitrate - textChanged(const QString&) + textChanged(const TQString&) prefMPEG4 - leMp4VideoBitrateTextChanged(const QString&) + leMp4VideoBitrateTextChanged(const TQString&) sbAudioGain @@ -659,9 +659,9 @@ leMp4AudioBitrate - textChanged(const QString&) + textChanged(const TQString&) prefMPEG4 - leMp4AudioBitrateTextChanged(const QString&) + leMp4AudioBitrateTextChanged(const TQString&) ckUseCache @@ -686,20 +686,20 @@ leMp4AudioBitrate sbAudioGain - + ckMp4AspectRatioClick() cbMp4CodecActivated( int ) cbMp4AudioCodecActivated( int ) ck2passesClicked() sbMp4SizeValueChanged( int ) sbMp4NumberCDValueChanged( int ) - leMp4WidthTextChanged( const QString & ) - leMp4HeightTextChanged( const QString & ) - leMp4AudioBitrateTextChanged( const QString & ) + leMp4WidthTextChanged( const TQString & ) + leMp4HeightTextChanged( const TQString & ) + leMp4AudioBitrateTextChanged( const TQString & ) rgVideoSizeChanged() - leMp4VideoBitrateTextChanged(const QString &) + leMp4VideoBitrateTextChanged(const TQString &) sbAudioGainValueChanged(int) ckUseCacheClick() - - + + diff --git a/src/prefMencoder.cpp b/src/prefMencoder.cpp index 98a56ca..63de9a1 100644 --- a/src/prefMencoder.cpp +++ b/src/prefMencoder.cpp @@ -9,241 +9,241 @@ #include "prefMencoder.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "kpushbutton.h" /* - * Constructs a prefMencoder as a child of 'parent', with the + * Constructs a prefMencoder as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -prefMencoder::prefMencoder( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +prefMencoder::prefMencoder( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "prefMencoder" ); - prefMencoderLayout = new QGridLayout( this, 1, 1, 11, 6, "prefMencoderLayout"); + prefMencoderLayout = new TQGridLayout( this, 1, 1, 11, 6, "prefMencoderLayout"); - layout2 = new QGridLayout( 0, 1, 1, 0, 6, "layout2"); + tqlayout2 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout2"); - textLabel2 = new QLabel( this, "textLabel2" ); - textLabel2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) ); - QFont textLabel2_font( textLabel2->font() ); + textLabel2 = new TQLabel( this, "textLabel2" ); + textLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, textLabel2->sizePolicy().hasHeightForWidth() ) ); + TQFont textLabel2_font( textLabel2->font() ); textLabel2_font.setBold( TRUE ); textLabel2->setFont( textLabel2_font ); - layout2->addWidget( textLabel2, 0, 0 ); + tqlayout2->addWidget( textLabel2, 0, 0 ); - textLabel2_2 = new QLabel( this, "textLabel2_2" ); - textLabel2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) ); + textLabel2_2 = new TQLabel( this, "textLabel2_2" ); + textLabel2_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel2_2->sizePolicy().hasHeightForWidth() ) ); - layout2->addWidget( textLabel2_2, 0, 1 ); + tqlayout2->addWidget( textLabel2_2, 0, 1 ); - prefMencoderLayout->addLayout( layout2, 2, 0 ); + prefMencoderLayout->addLayout( tqlayout2, 2, 0 ); - tabWidget2 = new QTabWidget( this, "tabWidget2" ); + tabWidget2 = new TQTabWidget( this, "tabWidget2" ); - tab = new QWidget( tabWidget2, "tab" ); - tabLayout = new QGridLayout( tab, 1, 1, 11, 6, "tabLayout"); + tab = new TQWidget( tabWidget2, "tab" ); + tabLayout = new TQGridLayout( tab, 1, 1, 11, 6, "tabLayout"); - lbvCodecs = new QListBox( tab, "lbvCodecs" ); + lbvCodecs = new TQListBox( tab, "lbvCodecs" ); tabLayout->addMultiCellWidget( lbvCodecs, 0, 4, 0, 1 ); btnDeleteV = new KPushButton( tab, "btnDeleteV" ); - btnDeleteV->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, btnDeleteV->sizePolicy().hasHeightForWidth() ) ); + btnDeleteV->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnDeleteV->sizePolicy().hasHeightForWidth() ) ); btnDeleteV->setProperty( "stdItem", 28 ); tabLayout->addWidget( btnDeleteV, 5, 1 ); btnAddV = new KPushButton( tab, "btnAddV" ); - btnAddV->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, btnAddV->sizePolicy().hasHeightForWidth() ) ); + btnAddV->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnAddV->sizePolicy().hasHeightForWidth() ) ); btnAddV->setProperty( "stdItem", 27 ); tabLayout->addWidget( btnAddV, 5, 0 ); - textLabel1_3 = new QLabel( tab, "textLabel1_3" ); + textLabel1_3 = new TQLabel( tab, "textLabel1_3" ); tabLayout->addWidget( textLabel1_3, 0, 2 ); - textLabel2_3 = new QLabel( tab, "textLabel2_3" ); + textLabel2_3 = new TQLabel( tab, "textLabel2_3" ); tabLayout->addWidget( textLabel2_3, 1, 2 ); - textLabel1_2_3 = new QLabel( tab, "textLabel1_2_3" ); + textLabel1_2_3 = new TQLabel( tab, "textLabel1_2_3" ); tabLayout->addWidget( textLabel1_2_3, 3, 2 ); - layout9 = new QGridLayout( 0, 1, 1, 0, 6, "layout9"); + tqlayout9 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout9"); - teOpt2 = new QTextEdit( tab, "teOpt2" ); + teOpt2 = new TQTextEdit( tab, "teOpt2" ); teOpt2->setEnabled( TRUE ); - layout9->addMultiCellWidget( teOpt2, 0, 1, 0, 0 ); - spacer5 = new QSpacerItem( 20, 81, QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout9->addItem( spacer5, 1, 1 ); + tqlayout9->addMultiCellWidget( teOpt2, 0, 1, 0, 0 ); + spacer5 = new TQSpacerItem( 20, 81, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout9->addItem( spacer5, 1, 1 ); btnOpt2 = new KPushButton( tab, "btnOpt2" ); - btnOpt2->setMinimumSize( QSize( 22, 22 ) ); - btnOpt2->setMaximumSize( QSize( 22, 22 ) ); + btnOpt2->setMinimumSize( TQSize( 22, 22 ) ); + btnOpt2->setMaximumSize( TQSize( 22, 22 ) ); - layout9->addWidget( btnOpt2, 0, 1 ); + tqlayout9->addWidget( btnOpt2, 0, 1 ); - tabLayout->addLayout( layout9, 3, 3 ); + tabLayout->addLayout( tqlayout9, 3, 3 ); - layout10 = new QGridLayout( 0, 1, 1, 0, 6, "layout10"); + tqlayout10 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout10"); - teOpt3 = new QTextEdit( tab, "teOpt3" ); + teOpt3 = new TQTextEdit( tab, "teOpt3" ); teOpt3->setEnabled( TRUE ); - layout10->addMultiCellWidget( teOpt3, 0, 1, 0, 0 ); + tqlayout10->addMultiCellWidget( teOpt3, 0, 1, 0, 0 ); btnOpt3 = new KPushButton( tab, "btnOpt3" ); - btnOpt3->setMinimumSize( QSize( 22, 22 ) ); - btnOpt3->setMaximumSize( QSize( 22, 22 ) ); + btnOpt3->setMinimumSize( TQSize( 22, 22 ) ); + btnOpt3->setMaximumSize( TQSize( 22, 22 ) ); - layout10->addWidget( btnOpt3, 0, 1 ); - spacer6 = new QSpacerItem( 20, 60, QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout10->addItem( spacer6, 1, 1 ); + tqlayout10->addWidget( btnOpt3, 0, 1 ); + spacer6 = new TQSpacerItem( 20, 60, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout10->addItem( spacer6, 1, 1 ); - tabLayout->addMultiCellLayout( layout10, 4, 5, 3, 3 ); + tabLayout->addMultiCellLayout( tqlayout10, 4, 5, 3, 3 ); - textLabel1_2 = new QLabel( tab, "textLabel1_2" ); + textLabel1_2 = new TQLabel( tab, "textLabel1_2" ); tabLayout->addWidget( textLabel1_2, 2, 2 ); - layout8 = new QGridLayout( 0, 1, 1, 0, 6, "layout8"); - spacer4 = new QSpacerItem( 20, 90, QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout8->addItem( spacer4, 1, 1 ); + tqlayout8 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout8"); + spacer4 = new TQSpacerItem( 20, 90, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout8->addItem( spacer4, 1, 1 ); - teOpt1 = new QTextEdit( tab, "teOpt1" ); + teOpt1 = new TQTextEdit( tab, "teOpt1" ); teOpt1->setEnabled( TRUE ); - teOpt1->setWordWrap( QTextEdit::WidgetWidth ); + teOpt1->setWordWrap( TQTextEdit::WidgetWidth ); - layout8->addMultiCellWidget( teOpt1, 0, 1, 0, 0 ); + tqlayout8->addMultiCellWidget( teOpt1, 0, 1, 0, 0 ); btnOpt1 = new KPushButton( tab, "btnOpt1" ); - btnOpt1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, btnOpt1->sizePolicy().hasHeightForWidth() ) ); - btnOpt1->setMinimumSize( QSize( 22, 22 ) ); - btnOpt1->setMaximumSize( QSize( 22, 22 ) ); + btnOpt1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnOpt1->sizePolicy().hasHeightForWidth() ) ); + btnOpt1->setMinimumSize( TQSize( 22, 22 ) ); + btnOpt1->setMaximumSize( TQSize( 22, 22 ) ); - layout8->addWidget( btnOpt1, 0, 1 ); + tqlayout8->addWidget( btnOpt1, 0, 1 ); - tabLayout->addLayout( layout8, 2, 3 ); + tabLayout->addLayout( tqlayout8, 2, 3 ); - textLabel1_2_3_2 = new QLabel( tab, "textLabel1_2_3_2" ); + textLabel1_2_3_2 = new TQLabel( tab, "textLabel1_2_3_2" ); tabLayout->addMultiCellWidget( textLabel1_2_3_2, 4, 5, 2, 2 ); - leFourcc = new QLineEdit( tab, "leFourcc" ); + leFourcc = new TQLineEdit( tab, "leFourcc" ); tabLayout->addWidget( leFourcc, 1, 3 ); - leVLabel = new QLineEdit( tab, "leVLabel" ); + leVLabel = new TQLineEdit( tab, "leVLabel" ); leVLabel->setEnabled( TRUE ); tabLayout->addWidget( leVLabel, 0, 3 ); - tabWidget2->insertTab( tab, QString::fromLatin1("") ); + tabWidget2->insertTab( tab, TQString::tqfromLatin1("") ); - tab_2 = new QWidget( tabWidget2, "tab_2" ); - tabLayout_2 = new QGridLayout( tab_2, 1, 1, 11, 6, "tabLayout_2"); + tab_2 = new TQWidget( tabWidget2, "tab_2" ); + tabLayout_2 = new TQGridLayout( tab_2, 1, 1, 11, 6, "tabLayout_2"); btnDeleteA = new KPushButton( tab_2, "btnDeleteA" ); - btnDeleteA->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, btnDeleteA->sizePolicy().hasHeightForWidth() ) ); + btnDeleteA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnDeleteA->sizePolicy().hasHeightForWidth() ) ); btnDeleteA->setProperty( "stdItem", 28 ); tabLayout_2->addWidget( btnDeleteA, 2, 1 ); btnAddA = new KPushButton( tab_2, "btnAddA" ); - btnAddA->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, btnAddA->sizePolicy().hasHeightForWidth() ) ); + btnAddA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnAddA->sizePolicy().hasHeightForWidth() ) ); btnAddA->setProperty( "stdItem", 27 ); tabLayout_2->addWidget( btnAddA, 2, 0 ); - lbaCodecs = new QListBox( tab_2, "lbaCodecs" ); + lbaCodecs = new TQListBox( tab_2, "lbaCodecs" ); tabLayout_2->addMultiCellWidget( lbaCodecs, 0, 1, 0, 1 ); - leALabel = new QLineEdit( tab_2, "leALabel" ); + leALabel = new TQLineEdit( tab_2, "leALabel" ); tabLayout_2->addWidget( leALabel, 0, 3 ); - textLabel3 = new QLabel( tab_2, "textLabel3" ); + textLabel3 = new TQLabel( tab_2, "textLabel3" ); tabLayout_2->addWidget( textLabel3, 0, 2 ); - layout11 = new QGridLayout( 0, 1, 1, 0, 6, "layout11"); + tqlayout11 = new TQGridLayout( 0, 1, 1, 0, 6, "tqlayout11"); - teOptA = new QTextEdit( tab_2, "teOptA" ); + teOptA = new TQTextEdit( tab_2, "teOptA" ); - layout11->addMultiCellWidget( teOptA, 0, 1, 0, 0 ); - spacer4_2 = new QSpacerItem( 20, 78, QSizePolicy::Minimum, QSizePolicy::Expanding ); - layout11->addItem( spacer4_2, 1, 1 ); + tqlayout11->addMultiCellWidget( teOptA, 0, 1, 0, 0 ); + spacer4_2 = new TQSpacerItem( 20, 78, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); + tqlayout11->addItem( spacer4_2, 1, 1 ); btnOptA = new KPushButton( tab_2, "btnOptA" ); - btnOptA->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)0, 0, 0, btnOptA->sizePolicy().hasHeightForWidth() ) ); - btnOptA->setMinimumSize( QSize( 22, 22 ) ); - btnOptA->setMaximumSize( QSize( 22, 22 ) ); + btnOptA->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, btnOptA->sizePolicy().hasHeightForWidth() ) ); + btnOptA->setMinimumSize( TQSize( 22, 22 ) ); + btnOptA->setMaximumSize( TQSize( 22, 22 ) ); - layout11->addWidget( btnOptA, 0, 1 ); + tqlayout11->addWidget( btnOptA, 0, 1 ); - tabLayout_2->addMultiCellLayout( layout11, 1, 2, 3, 3 ); + tabLayout_2->addMultiCellLayout( tqlayout11, 1, 2, 3, 3 ); - textLabel1_2_2_2 = new QLabel( tab_2, "textLabel1_2_2_2" ); - textLabel1_2_2_2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel1_2_2_2->sizePolicy().hasHeightForWidth() ) ); + textLabel1_2_2_2 = new TQLabel( tab_2, "textLabel1_2_2_2" ); + textLabel1_2_2_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1_2_2_2->sizePolicy().hasHeightForWidth() ) ); tabLayout_2->addMultiCellWidget( textLabel1_2_2_2, 1, 2, 2, 2 ); - tabWidget2->insertTab( tab_2, QString::fromLatin1("") ); + tabWidget2->insertTab( tab_2, TQString::tqfromLatin1("") ); prefMencoderLayout->addMultiCellWidget( tabWidget2, 0, 0, 0, 2 ); - textLabel1 = new QLabel( this, "textLabel1" ); - textLabel1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); - QFont textLabel1_font( textLabel1->font() ); + textLabel1 = new TQLabel( this, "textLabel1" ); + textLabel1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, textLabel1->sizePolicy().hasHeightForWidth() ) ); + TQFont textLabel1_font( textLabel1->font() ); textLabel1_font.setBold( TRUE ); textLabel1->setFont( textLabel1_font ); prefMencoderLayout->addWidget( textLabel1, 1, 0 ); bReset = new KPushButton( this, "bReset" ); - bReset->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, 0, 0, bReset->sizePolicy().hasHeightForWidth() ) ); + bReset->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, bReset->sizePolicy().hasHeightForWidth() ) ); bReset->setProperty( "stdItem", 21 ); prefMencoderLayout->addMultiCellWidget( bReset, 1, 2, 2, 2 ); - spacer5_2 = new QSpacerItem( 121, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer5_2 = new TQSpacerItem( 121, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); prefMencoderLayout->addItem( spacer5_2, 1, 1 ); languageChange(); - resize( QSize(672, 587).expandedTo(minimumSizeHint()) ); + resize( TQSize(672, 587).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( lbvCodecs, SIGNAL( currentChanged(QListBoxItem*) ), this, SLOT( lbvCodecsCurrentChanged(QListBoxItem*) ) ); - connect( teOpt1, SIGNAL( textChanged() ), this, SLOT( teOpt1TextChanged() ) ); - connect( teOpt2, SIGNAL( textChanged() ), this, SLOT( teOpt2TextChanged() ) ); - connect( leVLabel, SIGNAL( textChanged(const QString&) ), this, SLOT( leVLabelTextChanged(const QString&) ) ); - connect( teOpt3, SIGNAL( textChanged() ), this, SLOT( teOpt3TextChanged() ) ); - connect( lbaCodecs, SIGNAL( currentChanged(QListBoxItem*) ), this, SLOT( lbaCodecsCurrentChanged(QListBoxItem*) ) ); - connect( teOptA, SIGNAL( textChanged() ), this, SLOT( teOptATextChanged() ) ); - connect( leALabel, SIGNAL( textChanged(const QString&) ), this, SLOT( leALabelTextChanged(const QString&) ) ); - connect( btnOpt1, SIGNAL( clicked() ), this, SLOT( btnOpt1Clicked() ) ); - connect( btnOpt2, SIGNAL( clicked() ), this, SLOT( btnOpt2Clicked() ) ); - connect( btnOpt3, SIGNAL( clicked() ), this, SLOT( btnOpt3Clicked() ) ); - connect( btnOptA, SIGNAL( clicked() ), this, SLOT( btnOptAClicked() ) ); - connect( btnAddA, SIGNAL( clicked() ), this, SLOT( btnAddAClicked() ) ); - connect( btnAddV, SIGNAL( clicked() ), this, SLOT( btnAddVClicked() ) ); - connect( btnDeleteA, SIGNAL( clicked() ), this, SLOT( btnDeleteAClicked() ) ); - connect( btnDeleteV, SIGNAL( clicked() ), this, SLOT( btnDeleteVClicked() ) ); - connect( leFourcc, SIGNAL( textChanged(const QString&) ), this, SLOT( leFourccTextChanged(const QString&) ) ); - connect( bReset, SIGNAL( clicked() ), this, SLOT( bResetClicked() ) ); + connect( lbvCodecs, TQT_SIGNAL( currentChanged(TQListBoxItem*) ), this, TQT_SLOT( lbvCodecsCurrentChanged(TQListBoxItem*) ) ); + connect( teOpt1, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( teOpt1TextChanged() ) ); + connect( teOpt2, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( teOpt2TextChanged() ) ); + connect( leVLabel, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( leVLabelTextChanged(const TQString&) ) ); + connect( teOpt3, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( teOpt3TextChanged() ) ); + connect( lbaCodecs, TQT_SIGNAL( currentChanged(TQListBoxItem*) ), this, TQT_SLOT( lbaCodecsCurrentChanged(TQListBoxItem*) ) ); + connect( teOptA, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( teOptATextChanged() ) ); + connect( leALabel, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( leALabelTextChanged(const TQString&) ) ); + connect( btnOpt1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnOpt1Clicked() ) ); + connect( btnOpt2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnOpt2Clicked() ) ); + connect( btnOpt3, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnOpt3Clicked() ) ); + connect( btnOptA, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnOptAClicked() ) ); + connect( btnAddA, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnAddAClicked() ) ); + connect( btnAddV, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnAddVClicked() ) ); + connect( btnDeleteA, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnDeleteAClicked() ) ); + connect( btnDeleteV, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnDeleteVClicked() ) ); + connect( leFourcc, TQT_SIGNAL( textChanged(const TQString&) ), this, TQT_SLOT( leFourccTextChanged(const TQString&) ) ); + connect( bReset, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bResetClicked() ) ); // tab order setTabOrder( lbvCodecs, leVLabel ); @@ -274,7 +274,7 @@ prefMencoder::prefMencoder( QWidget* parent, const char* name, WFlags fl ) */ prefMencoder::~prefMencoder() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -313,29 +313,29 @@ void prefMencoder::languageChange() lbvCodecs->insertItem( tr2i18n( "ffvHuff" ) ); lbvCodecs->insertItem( tr2i18n( "ASUS v1" ) ); lbvCodecs->insertItem( tr2i18n( "ASUS v2" ) ); - btnDeleteV->setAccel( QKeySequence( QString::null ) ); + btnDeleteV->setAccel( TQKeySequence( TQString() ) ); textLabel1_3->setText( tr2i18n( "label" ) ); textLabel2_3->setText( tr2i18n( "fourcc" ) ); textLabel1_2_3->setText( tr2i18n( "first pass" ) ); - btnOpt2->setText( QString::null ); - btnOpt3->setText( QString::null ); + btnOpt2->setText( TQString() ); + btnOpt3->setText( TQString() ); textLabel1_2->setText( tr2i18n( "one pass" ) ); - teOpt1->setText( QString::null ); - btnOpt1->setText( QString::null ); + teOpt1->setText( TQString() ); + btnOpt1->setText( TQString() ); textLabel1_2_3_2->setText( tr2i18n( "second pass" ) ); tabWidget2->changeTab( tab, tr2i18n( "Video codecs" ) ); lbaCodecs->clear(); lbaCodecs->insertItem( tr2i18n( "New Item" ) ); textLabel3->setText( tr2i18n( "label" ) ); - btnOptA->setText( QString::null ); + btnOptA->setText( TQString() ); textLabel1_2_2_2->setText( tr2i18n( "options" ) ); tabWidget2->changeTab( tab_2, tr2i18n( "Audio codecs" ) ); textLabel1->setText( tr2i18n( "Available variables" ) ); } -void prefMencoder::lbvCodecsCurrentChanged(QListBoxItem*) +void prefMencoder::lbvCodecsCurrentChanged(TQListBoxItem*) { - qWarning( "prefMencoder::lbvCodecsCurrentChanged(QListBoxItem*): Not implemented yet" ); + qWarning( "prefMencoder::lbvCodecsCurrentChanged(TQListBoxItem*): Not implemented yet" ); } void prefMencoder::teOpt1TextChanged() @@ -348,9 +348,9 @@ void prefMencoder::teOpt2TextChanged() qWarning( "prefMencoder::teOpt2TextChanged(): Not implemented yet" ); } -void prefMencoder::leVLabelTextChanged(const QString&) +void prefMencoder::leVLabelTextChanged(const TQString&) { - qWarning( "prefMencoder::leVLabelTextChanged(const QString&): Not implemented yet" ); + qWarning( "prefMencoder::leVLabelTextChanged(const TQString&): Not implemented yet" ); } void prefMencoder::teOpt3TextChanged() @@ -358,9 +358,9 @@ void prefMencoder::teOpt3TextChanged() qWarning( "prefMencoder::teOpt3TextChanged(): Not implemented yet" ); } -void prefMencoder::lbaCodecsCurrentChanged(QListBoxItem*) +void prefMencoder::lbaCodecsCurrentChanged(TQListBoxItem*) { - qWarning( "prefMencoder::lbaCodecsCurrentChanged(QListBoxItem*): Not implemented yet" ); + qWarning( "prefMencoder::lbaCodecsCurrentChanged(TQListBoxItem*): Not implemented yet" ); } void prefMencoder::teOptATextChanged() @@ -368,9 +368,9 @@ void prefMencoder::teOptATextChanged() qWarning( "prefMencoder::teOptATextChanged(): Not implemented yet" ); } -void prefMencoder::leALabelTextChanged(const QString&) +void prefMencoder::leALabelTextChanged(const TQString&) { - qWarning( "prefMencoder::leALabelTextChanged(const QString&): Not implemented yet" ); + qWarning( "prefMencoder::leALabelTextChanged(const TQString&): Not implemented yet" ); } void prefMencoder::btnOpt1Clicked() @@ -413,9 +413,9 @@ void prefMencoder::btnDeleteAClicked() qWarning( "prefMencoder::btnDeleteAClicked(): Not implemented yet" ); } -void prefMencoder::leFourccTextChanged(const QString&) +void prefMencoder::leFourccTextChanged(const TQString&) { - qWarning( "prefMencoder::leFourccTextChanged(const QString&): Not implemented yet" ); + qWarning( "prefMencoder::leFourccTextChanged(const TQString&): Not implemented yet" ); } void prefMencoder::bResetClicked() diff --git a/src/prefMencoder.ui b/src/prefMencoder.ui index e12aec6..a22a519 100644 --- a/src/prefMencoder.ui +++ b/src/prefMencoder.ui @@ -1,10 +1,10 @@ prefMencoder - + prefMencoder - + 0 0 @@ -19,15 +19,15 @@ unnamed - + - layout2 + tqlayout2 unnamed - + textLabel2 @@ -52,7 +52,7 @@ $VIDBR $AUDBR - + textLabel2_2 @@ -74,11 +74,11 @@ audio bitrate - + tabWidget2 - + tab @@ -89,7 +89,7 @@ audio bitrate unnamed - + XviD @@ -219,7 +219,7 @@ audio bitrate 27 - + textLabel1_3 @@ -230,7 +230,7 @@ audio bitrate leVLabel - + textLabel2_3 @@ -238,7 +238,7 @@ audio bitrate fourcc - + textLabel1_2_3 @@ -246,15 +246,15 @@ audio bitrate first pass - + - layout9 + tqlayout9 unnamed - + teOpt2 @@ -272,7 +272,7 @@ audio bitrate Expanding - + 20 81 @@ -283,13 +283,13 @@ audio bitrate btnOpt2 - + 22 22 - + 22 22 @@ -301,15 +301,15 @@ audio bitrate - + - layout10 + tqlayout10 unnamed - + teOpt3 @@ -321,13 +321,13 @@ audio bitrate btnOpt3 - + 22 22 - + 22 22 @@ -347,7 +347,7 @@ audio bitrate Expanding - + 20 60 @@ -356,7 +356,7 @@ audio bitrate - + textLabel1_2 @@ -364,9 +364,9 @@ audio bitrate one pass - + - layout8 + tqlayout8 @@ -382,14 +382,14 @@ audio bitrate Expanding - + 20 90 - + teOpt1 @@ -415,13 +415,13 @@ audio bitrate 0 - + 22 22 - + 22 22 @@ -433,7 +433,7 @@ audio bitrate - + textLabel1_2_3_2 @@ -441,12 +441,12 @@ audio bitrate second pass - + leFourcc - + leVLabel @@ -456,7 +456,7 @@ audio bitrate - + tab @@ -499,7 +499,7 @@ audio bitrate 27 - + New Item @@ -509,12 +509,12 @@ audio bitrate lbaCodecs - + leALabel - + textLabel3 @@ -525,15 +525,15 @@ audio bitrate leALabel - + - layout11 + tqlayout11 unnamed - + teOptA @@ -548,7 +548,7 @@ audio bitrate Expanding - + 20 78 @@ -567,13 +567,13 @@ audio bitrate 0 - + 22 22 - + 22 22 @@ -585,7 +585,7 @@ audio bitrate - + textLabel1_2_2_2 @@ -604,7 +604,7 @@ audio bitrate - + textLabel1 @@ -651,7 +651,7 @@ audio bitrate Expanding - + 121 21 @@ -663,9 +663,9 @@ audio bitrate lbvCodecs - currentChanged(QListBoxItem*) + currentChanged(TQListBoxItem*) prefMencoder - lbvCodecsCurrentChanged(QListBoxItem*) + lbvCodecsCurrentChanged(TQListBoxItem*) teOpt1 @@ -681,9 +681,9 @@ audio bitrate leVLabel - textChanged(const QString&) + textChanged(const TQString&) prefMencoder - leVLabelTextChanged(const QString&) + leVLabelTextChanged(const TQString&) teOpt3 @@ -693,9 +693,9 @@ audio bitrate lbaCodecs - currentChanged(QListBoxItem*) + currentChanged(TQListBoxItem*) prefMencoder - lbaCodecsCurrentChanged(QListBoxItem*) + lbaCodecsCurrentChanged(TQListBoxItem*) teOptA @@ -705,9 +705,9 @@ audio bitrate leALabel - textChanged(const QString&) + textChanged(const TQString&) prefMencoder - leALabelTextChanged(const QString&) + leALabelTextChanged(const TQString&) btnOpt1 @@ -759,9 +759,9 @@ audio bitrate leFourcc - textChanged(const QString&) + textChanged(const TQString&) prefMencoder - leFourccTextChanged(const QString&) + leFourccTextChanged(const TQString&) bReset @@ -790,15 +790,15 @@ audio bitrate btnDeleteA tabWidget2 - - lbvCodecsCurrentChanged(QListBoxItem*) + + lbvCodecsCurrentChanged(TQListBoxItem*) teOpt1TextChanged() teOpt2TextChanged() - leVLabelTextChanged(const QString &) + leVLabelTextChanged(const TQString &) teOpt3TextChanged() - lbaCodecsCurrentChanged(QListBoxItem*) + lbaCodecsCurrentChanged(TQListBoxItem*) teOptATextChanged() - leALabelTextChanged(const QString&) + leALabelTextChanged(const TQString&) btnOpt1Clicked() btnOpt2Clicked() btnOpt3Clicked() @@ -807,10 +807,10 @@ audio bitrate btnDeleteVClicked() btnAddAClicked() btnDeleteAClicked() - leFourccTextChanged(const QString&) + leFourccTextChanged(const TQString&) bResetClicked() - - + + kpushbutton.h kpushbutton.h diff --git a/src/prefpreview.cpp b/src/prefpreview.cpp index 54a959e..cb2fad6 100644 --- a/src/prefpreview.cpp +++ b/src/prefpreview.cpp @@ -9,101 +9,101 @@ #include "prefpreview.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* - * Constructs a prefPreview as a child of 'parent', with the + * Constructs a prefPreview as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -prefPreview::prefPreview( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +prefPreview::prefPreview( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { if ( !name ) setName( "prefPreview" ); - prefPreviewLayout = new QGridLayout( this, 1, 1, 11, 6, "prefPreviewLayout"); + prefPreviewLayout = new TQGridLayout( this, 1, 1, 11, 6, "prefPreviewLayout"); - buttonGroup1 = new QButtonGroup( this, "buttonGroup1" ); - buttonGroup1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) ); - buttonGroup1->setFrameShape( QButtonGroup::NoFrame ); + buttonGroup1 = new TQButtonGroup( this, "buttonGroup1" ); + buttonGroup1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, buttonGroup1->sizePolicy().hasHeightForWidth() ) ); + buttonGroup1->setFrameShape( TQButtonGroup::NoFrame ); buttonGroup1->setColumnLayout(0, Qt::Vertical ); - buttonGroup1->layout()->setSpacing( 6 ); - buttonGroup1->layout()->setMargin( 11 ); - buttonGroup1Layout = new QGridLayout( buttonGroup1->layout() ); - buttonGroup1Layout->setAlignment( Qt::AlignTop ); + buttonGroup1->tqlayout()->setSpacing( 6 ); + buttonGroup1->tqlayout()->setMargin( 11 ); + buttonGroup1Layout = new TQGridLayout( buttonGroup1->tqlayout() ); + buttonGroup1Layout->tqsetAlignment( TQt::AlignTop ); - rbInternal = new QRadioButton( buttonGroup1, "rbInternal" ); + rbInternal = new TQRadioButton( buttonGroup1, "rbInternal" ); buttonGroup1Layout->addWidget( rbInternal, 0, 0 ); - rbMplayer = new QRadioButton( buttonGroup1, "rbMplayer" ); + rbMplayer = new TQRadioButton( buttonGroup1, "rbMplayer" ); buttonGroup1Layout->addWidget( rbMplayer, 1, 0 ); prefPreviewLayout->addWidget( buttonGroup1, 0, 0 ); - spacer5 = new QSpacerItem( 21, 210, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer5 = new TQSpacerItem( 21, 210, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); prefPreviewLayout->addItem( spacer5, 2, 0 ); - wsOptions = new QWidgetStack( this, "wsOptions" ); - wsOptions->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, wsOptions->sizePolicy().hasHeightForWidth() ) ); - wsOptions->setFrameShape( QWidgetStack::NoFrame ); - wsOptions->setFrameShadow( QWidgetStack::Sunken ); + wsOptions = new TQWidgetStack( this, "wsOptions" ); + wsOptions->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, wsOptions->sizePolicy().hasHeightForWidth() ) ); + wsOptions->setFrameShape( TQWidgetStack::NoFrame ); + wsOptions->setFrameShadow( TQWidgetStack::Sunken ); wsOptions->setLineWidth( 1 ); wsOptions->setMidLineWidth( 0 ); - wspInternal = new QWidget( wsOptions, "wspInternal" ); - wspInternalLayout = new QGridLayout( wspInternal, 1, 1, 11, 6, "wspInternalLayout"); + wspInternal = new TQWidget( wsOptions, "wspInternal" ); + wspInternalLayout = new TQGridLayout( wspInternal, 1, 1, 11, 6, "wspInternalLayout"); - textLabel1 = new QLabel( wspInternal, "textLabel1" ); - QFont textLabel1_font( textLabel1->font() ); + textLabel1 = new TQLabel( wspInternal, "textLabel1" ); + TQFont textLabel1_font( textLabel1->font() ); textLabel1_font.setBold( TRUE ); textLabel1->setFont( textLabel1_font ); wspInternalLayout->addWidget( textLabel1, 0, 0 ); - ckUseGL = new QCheckBox( wspInternal, "ckUseGL" ); + ckUseGL = new TQCheckBox( wspInternal, "ckUseGL" ); wspInternalLayout->addWidget( ckUseGL, 1, 0 ); - spacer1 = new QSpacerItem( 21, 30, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer1 = new TQSpacerItem( 21, 30, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); wspInternalLayout->addItem( spacer1, 2, 0 ); wsOptions->addWidget( wspInternal, 0 ); - wspMplayer = new QWidget( wsOptions, "wspMplayer" ); - wspMplayerLayout = new QGridLayout( wspMplayer, 1, 1, 11, 6, "wspMplayerLayout"); + wspMplayer = new TQWidget( wsOptions, "wspMplayer" ); + wspMplayerLayout = new TQGridLayout( wspMplayer, 1, 1, 11, 6, "wspMplayerLayout"); - textLabel3 = new QLabel( wspMplayer, "textLabel3" ); + textLabel3 = new TQLabel( wspMplayer, "textLabel3" ); wspMplayerLayout->addWidget( textLabel3, 1, 0 ); - textLabel4 = new QLabel( wspMplayer, "textLabel4" ); - textLabel4->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) ); + textLabel4 = new TQLabel( wspMplayer, "textLabel4" ); + textLabel4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, textLabel4->sizePolicy().hasHeightForWidth() ) ); wspMplayerLayout->addWidget( textLabel4, 2, 0 ); - cbVout = new QComboBox( FALSE, wspMplayer, "cbVout" ); + cbVout = new TQComboBox( FALSE, wspMplayer, "cbVout" ); wspMplayerLayout->addWidget( cbVout, 1, 1 ); - cbAout = new QComboBox( FALSE, wspMplayer, "cbAout" ); - cbAout->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, cbAout->sizePolicy().hasHeightForWidth() ) ); + cbAout = new TQComboBox( FALSE, wspMplayer, "cbAout" ); + cbAout->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, cbAout->sizePolicy().hasHeightForWidth() ) ); wspMplayerLayout->addWidget( cbAout, 2, 1 ); - spacer3 = new QSpacerItem( 81, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer3 = new TQSpacerItem( 81, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); wspMplayerLayout->addItem( spacer3, 1, 2 ); - spacer6 = new QSpacerItem( 20, 21, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer6 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); wspMplayerLayout->addItem( spacer6, 3, 1 ); - textLabel2 = new QLabel( wspMplayer, "textLabel2" ); - QFont textLabel2_font( textLabel2->font() ); + textLabel2 = new TQLabel( wspMplayer, "textLabel2" ); + TQFont textLabel2_font( textLabel2->font() ); textLabel2_font.setBold( TRUE ); textLabel2->setFont( textLabel2_font ); @@ -111,15 +111,15 @@ prefPreview::prefPreview( QWidget* parent, const char* name, WFlags fl ) wsOptions->addWidget( wspMplayer, 1 ); prefPreviewLayout->addWidget( wsOptions, 1, 0 ); - spacer4 = new QSpacerItem( 230, 21, QSizePolicy::Expanding, QSizePolicy::Minimum ); + spacer4 = new TQSpacerItem( 230, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); prefPreviewLayout->addItem( spacer4, 0, 1 ); languageChange(); - resize( QSize(536, 470).expandedTo(minimumSizeHint()) ); + resize( TQSize(536, 470).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( rbInternal, SIGNAL( clicked() ), this, SLOT( rbInternalClick() ) ); - connect( rbMplayer, SIGNAL( clicked() ), this, SLOT( rbMplayerClick() ) ); + connect( rbInternal, TQT_SIGNAL( clicked() ), this, TQT_SLOT( rbInternalClick() ) ); + connect( rbMplayer, TQT_SIGNAL( clicked() ), this, TQT_SLOT( rbMplayerClick() ) ); } /* @@ -127,7 +127,7 @@ prefPreview::prefPreview( QWidget* parent, const char* name, WFlags fl ) */ prefPreview::~prefPreview() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -137,11 +137,11 @@ prefPreview::~prefPreview() void prefPreview::languageChange() { setCaption( tr2i18n( "Form1" ) ); - buttonGroup1->setTitle( QString::null ); + buttonGroup1->setTitle( TQString() ); rbInternal->setText( tr2i18n( "&Internal Player" ) ); - rbInternal->setAccel( QKeySequence( tr2i18n( "Alt+I" ) ) ); + rbInternal->setAccel( TQKeySequence( tr2i18n( "Alt+I" ) ) ); rbMplayer->setText( tr2i18n( "MPlayer" ) ); - rbMplayer->setAccel( QKeySequence( tr2i18n( "Alt+M" ) ) ); + rbMplayer->setAccel( TQKeySequence( tr2i18n( "Alt+M" ) ) ); textLabel1->setText( tr2i18n( "Internal viewer options" ) ); ckUseGL->setText( tr2i18n( "use OpenGL" ) ); textLabel3->setText( tr2i18n( "Video output" ) ); diff --git a/src/prefpreview.ui b/src/prefpreview.ui index 901b1ce..97ea4df 100644 --- a/src/prefpreview.ui +++ b/src/prefpreview.ui @@ -1,10 +1,10 @@ prefPreview - + prefPreview - + 0 0 @@ -19,7 +19,7 @@ unnamed - + buttonGroup1 @@ -41,7 +41,7 @@ unnamed - + rbInternal @@ -52,7 +52,7 @@ Alt+I - + rbMplayer @@ -75,14 +75,14 @@ Expanding - + 21 210 - + wsOptions @@ -106,7 +106,7 @@ 0 - + wspInternal @@ -117,7 +117,7 @@ unnamed - + textLabel1 @@ -130,7 +130,7 @@ Internal viewer options - + ckUseGL @@ -148,7 +148,7 @@ Expanding - + 21 30 @@ -157,7 +157,7 @@ - + wspMplayer @@ -168,7 +168,7 @@ unnamed - + textLabel3 @@ -176,7 +176,7 @@ Video output - + textLabel4 @@ -192,7 +192,7 @@ Audio output - + X11 @@ -217,7 +217,7 @@ cbVout - + ALSA @@ -255,7 +255,7 @@ Expanding - + 81 21 @@ -272,14 +272,14 @@ Expanding - + 20 21 - + textLabel2 @@ -305,7 +305,7 @@ Expanding - + 230 21 @@ -328,9 +328,9 @@ rbMplayerClick() - + rbInternalClick() rbMplayerClick() - - + + diff --git a/src/titlefactor.cpp b/src/titlefactor.cpp index e09fe73..0d48c28 100644 --- a/src/titlefactor.cpp +++ b/src/titlefactor.cpp @@ -9,16 +9,16 @@ #include "titlefactor.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const unsigned char img0_titlefactor[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, @@ -243,64 +243,64 @@ static const unsigned char img0_titlefactor[] = { /* - * Constructs a titleFactor as a child of 'parent', with the + * Constructs a titleFactor as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -titleFactor::titleFactor( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +titleFactor::titleFactor( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { - QImage img; + TQImage img; img.loadFromData( img0_titlefactor, sizeof( img0_titlefactor ), "PNG" ); image0 = img; if ( !name ) setName( "titleFactor" ); setIcon( image0 ); - titleFactorLayout = new QGridLayout( this, 1, 1, 5, 6, "titleFactorLayout"); + titleFactorLayout = new TQGridLayout( this, 1, 1, 5, 6, "titleFactorLayout"); - lbTitle = new QLabel( this, "lbTitle" ); - QFont lbTitle_font( lbTitle->font() ); + lbTitle = new TQLabel( this, "lbTitle" ); + TQFont lbTitle_font( lbTitle->font() ); lbTitle_font.setBold( TRUE ); lbTitle->setFont( lbTitle_font ); titleFactorLayout->addWidget( lbTitle, 0, 0 ); - gbTitle = new QGroupBox( this, "gbTitle" ); - gbTitle->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, gbTitle->sizePolicy().hasHeightForWidth() ) ); - gbTitle->setAlignment( int( QGroupBox::AlignVCenter ) ); + gbTitle = new TQGroupBox( this, "gbTitle" ); + gbTitle->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, gbTitle->sizePolicy().hasHeightForWidth() ) ); + gbTitle->tqsetAlignment( int( TQGroupBox::AlignVCenter ) ); gbTitle->setFlat( FALSE ); gbTitle->setCheckable( TRUE ); gbTitle->setChecked( FALSE ); gbTitle->setColumnLayout(0, Qt::Vertical ); - gbTitle->layout()->setSpacing( 1 ); - gbTitle->layout()->setMargin( 6 ); - gbTitleLayout = new QGridLayout( gbTitle->layout() ); - gbTitleLayout->setAlignment( Qt::AlignTop ); + gbTitle->tqlayout()->setSpacing( 1 ); + gbTitle->tqlayout()->setMargin( 6 ); + gbTitleLayout = new TQGridLayout( gbTitle->tqlayout() ); + gbTitleLayout->tqsetAlignment( TQt::AlignTop ); - tFactor = new QLabel( gbTitle, "tFactor" ); + tFactor = new TQLabel( gbTitle, "tFactor" ); gbTitleLayout->addWidget( tFactor, 1, 1 ); - slFactor = new QSlider( gbTitle, "slFactor" ); + slFactor = new TQSlider( gbTitle, "slFactor" ); slFactor->setMinValue( 100 ); slFactor->setMaxValue( 250 ); - slFactor->setOrientation( QSlider::Horizontal ); - slFactor->setTickmarks( QSlider::Below ); + slFactor->setOrientation( Qt::Horizontal ); + slFactor->setTickmarks( TQSlider::Below ); slFactor->setTickInterval( 10 ); gbTitleLayout->addWidget( slFactor, 1, 0 ); titleFactorLayout->addWidget( gbTitle, 1, 0 ); - spacer1 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); + spacer1 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); titleFactorLayout->addItem( spacer1, 2, 0 ); languageChange(); - resize( QSize(551, 115).expandedTo(minimumSizeHint()) ); + resize( TQSize(551, 115).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( slFactor, SIGNAL( sliderPressed() ), this, SLOT( slFactorPressed() ) ); - connect( slFactor, SIGNAL( sliderReleased() ), this, SLOT( slFactorReleased() ) ); - connect( slFactor, SIGNAL( valueChanged(int) ), this, SLOT( slFactor_valueChanged(int) ) ); - connect( gbTitle, SIGNAL( toggled(bool) ), this, SLOT( ckAutoClicked(bool) ) ); + connect( slFactor, TQT_SIGNAL( sliderPressed() ), this, TQT_SLOT( slFactorPressed() ) ); + connect( slFactor, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( slFactorReleased() ) ); + connect( slFactor, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slFactor_valueChanged(int) ) ); + connect( gbTitle, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( ckAutoClicked(bool) ) ); } /* @@ -308,7 +308,7 @@ titleFactor::titleFactor( QWidget* parent, const char* name, WFlags fl ) */ titleFactor::~titleFactor() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* diff --git a/src/titlefactor.ui b/src/titlefactor.ui index 4c0f145..fdda003 100644 --- a/src/titlefactor.ui +++ b/src/titlefactor.ui @@ -1,10 +1,10 @@ titleFactor - + titleFactor - + 0 0 @@ -25,7 +25,7 @@ 5 - + lbTitle @@ -38,7 +38,7 @@ Shrink Factor for Title %1 - + gbTitle @@ -53,7 +53,7 @@ Change Factor - + AlignVCenter @@ -75,7 +75,7 @@ 1 - + tFactor @@ -83,7 +83,7 @@ 0.00 - + slFactor @@ -115,7 +115,7 @@ Expanding - + 20 20 @@ -155,11 +155,11 @@ ckAutoClicked(bool) - + slFactor_valueChanged( int ) slFactorPressed() slFactorReleased() ckAutoClicked(bool) - - + + diff --git a/src/viewmpeg2.cpp b/src/viewmpeg2.cpp index 66a966a..ae8c0f7 100644 --- a/src/viewmpeg2.cpp +++ b/src/viewmpeg2.cpp @@ -9,17 +9,17 @@ #include "viewmpeg2.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const unsigned char img0_viewmpeg2[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, @@ -125,13 +125,13 @@ static const unsigned char img2_viewmpeg2[] = { /* - * Constructs a ViewMPEG2 as a child of 'parent', with the + * Constructs a ViewMPEG2 as a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. */ -ViewMPEG2::ViewMPEG2( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +ViewMPEG2::ViewMPEG2( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { - QImage img; + TQImage img; img.loadFromData( img0_viewmpeg2, sizeof( img0_viewmpeg2 ), "PNG" ); image0 = img; img.loadFromData( img1_viewmpeg2, sizeof( img1_viewmpeg2 ), "PNG" ); @@ -140,51 +140,51 @@ ViewMPEG2::ViewMPEG2( QWidget* parent, const char* name, WFlags fl ) image2 = img; if ( !name ) setName( "ViewMPEG2" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setSizeIncrement( QSize( 0, 0 ) ); - setBaseSize( QSize( 0, 0 ) ); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setSizeIncrement( TQSize( 0, 0 ) ); + setBaseSize( TQSize( 0, 0 ) ); setIcon( image0 ); - ViewMPEG2Layout = new QGridLayout( this, 1, 1, 2, 6, "ViewMPEG2Layout"); + ViewMPEG2Layout = new TQGridLayout( this, 1, 1, 2, 6, "ViewMPEG2Layout"); - frame7 = new QFrame( this, "frame7" ); - frame7->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, frame7->sizePolicy().hasHeightForWidth() ) ); - frame7->setMaximumSize( QSize( 32767, 50 ) ); - frame7->setFrameShape( QFrame::StyledPanel ); - frame7->setFrameShadow( QFrame::Raised ); - frame7Layout = new QGridLayout( frame7, 1, 1, 11, 6, "frame7Layout"); + frame7 = new TQFrame( this, "frame7" ); + frame7->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, frame7->sizePolicy().hasHeightForWidth() ) ); + frame7->setMaximumSize( TQSize( 32767, 50 ) ); + frame7->setFrameShape( TQFrame::StyledPanel ); + frame7->setFrameShadow( TQFrame::Raised ); + frame7Layout = new TQGridLayout( frame7, 1, 1, 11, 6, "frame7Layout"); - bStop = new QToolButton( frame7, "bStop" ); - bStop->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)1, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) ); - bStop->setIconSet( QIconSet( image1 ) ); + bStop = new TQToolButton( frame7, "bStop" ); + bStop->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, 0, 0, bStop->sizePolicy().hasHeightForWidth() ) ); + bStop->setIconSet( TQIconSet( image1 ) ); frame7Layout->addWidget( bStop, 0, 0 ); - bPlay = new QToolButton( frame7, "bPlay" ); - bPlay->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)1, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) ); - bPlay->setIconSet( QIconSet( image2 ) ); + bPlay = new TQToolButton( frame7, "bPlay" ); + bPlay->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)1, 0, 0, bPlay->sizePolicy().hasHeightForWidth() ) ); + bPlay->setIconSet( TQIconSet( image2 ) ); frame7Layout->addWidget( bPlay, 0, 1 ); - slider = new QSlider( frame7, "slider" ); - slider->setOrientation( QSlider::Horizontal ); + slider = new TQSlider( frame7, "slider" ); + slider->setOrientation( Qt::Horizontal ); frame7Layout->addWidget( slider, 0, 2 ); ViewMPEG2Layout->addWidget( frame7, 1, 0 ); - label = new QLabel( this, "label" ); - label->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)2, (QSizePolicy::SizeType)2, 0, 0, label->sizePolicy().hasHeightForWidth() ) ); + label = new TQLabel( this, "label" ); + label->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)2, (TQSizePolicy::SizeType)2, 0, 0, label->sizePolicy().hasHeightForWidth() ) ); ViewMPEG2Layout->addWidget( label, 0, 0 ); languageChange(); - resize( QSize(320, 320).expandedTo(minimumSizeHint()) ); + resize( TQSize(320, 320).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections - connect( bStop, SIGNAL( clicked() ), this, SLOT( bStopClick() ) ); - connect( bPlay, SIGNAL( clicked() ), this, SLOT( bPlayClick() ) ); - connect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); - connect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); + connect( bStop, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bStopClick() ) ); + connect( bPlay, TQT_SIGNAL( clicked() ), this, TQT_SLOT( bPlayClick() ) ); + connect( slider, TQT_SIGNAL( sliderReleased() ), this, TQT_SLOT( sliderReleased() ) ); + connect( slider, TQT_SIGNAL( sliderPressed() ), this, TQT_SLOT( sliderPressed() ) ); } /* @@ -192,7 +192,7 @@ ViewMPEG2::ViewMPEG2( QWidget* parent, const char* name, WFlags fl ) */ ViewMPEG2::~ViewMPEG2() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* @@ -202,8 +202,8 @@ ViewMPEG2::~ViewMPEG2() void ViewMPEG2::languageChange() { setCaption( tr2i18n( "k9Copy - Title Preview" ) ); - bStop->setText( QString::null ); - bPlay->setText( QString::null ); + bStop->setText( TQString() ); + bPlay->setText( TQString() ); } void ViewMPEG2::sliderReleased() diff --git a/src/viewmpeg2.ui b/src/viewmpeg2.ui index e327884..1ec06b9 100755 --- a/src/viewmpeg2.ui +++ b/src/viewmpeg2.ui @@ -1,10 +1,10 @@ ViewMPEG2 - + ViewMPEG2 - + 0 0 @@ -45,7 +45,7 @@ 2 - + frame7 @@ -57,7 +57,7 @@ 0 - + 32767 50 @@ -73,7 +73,7 @@ unnamed - + bStop @@ -92,7 +92,7 @@ image1 - + bPlay @@ -111,7 +111,7 @@ image2 - + slider @@ -121,7 +121,7 @@ - + label @@ -173,11 +173,11 @@ sliderPressed() - + sliderReleased() bStopClick() bPlayClick() sliderPressed() - - + +