diff options
Diffstat (limited to 'src/rip')
40 files changed, 190 insertions, 252 deletions
diff --git a/src/rip/Makefile.am b/src/rip/Makefile.am deleted file mode 100644 index da023c7..0000000 --- a/src/rip/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -if include_videodvdrip -VIDEODVDRIPDIR = videodvd -VIDEODVDRIPLIB = videodvd/libvideodvdrip.la -endif - -AM_CPPFLAGS = -I$(srcdir)/../../libk3b/core \ - -I$(srcdir)/../../libk3b/cddb \ - -I$(srcdir)/../../libk3bdevice \ - -I$(srcdir)/../../libk3b/plugin \ - -I$(srcdir)/../../libk3b/tools \ - -I$(srcdir)/../../libk3b/projects \ - -I$(srcdir)/../../libk3b/projects/audiocd \ - -I$(srcdir)/../../libk3b/cddb \ - -I$(srcdir)/../../libk3b/jobs/ \ - -I$(srcdir)/.. \ - -I$(srcdir)/../projects \ - $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = librip.la -librip_la_LIBADD = $(VIDEODVDRIPLIB) - -librip_la_SOURCES = base_k3baudiorippingoptionwidget.ui \ - base_k3bcddbpatternwidget.ui k3bpatternparser.cpp k3baudiorippingdialog.cpp \ - k3baudioripthread.cpp k3baudiocdview.cpp k3bcddbpatternwidget.cpp \ - k3bvideocdinfo.cpp k3bvideocdview.cpp k3bvideocdrip.cpp \ - k3bvideocdrippingdialog.cpp k3bcuefilewriter.cpp k3baudioconvertingoptionwidget.cpp \ - k3baudiocdlistview.cpp k3baudioprojectconvertingdialog.cpp \ - k3baudioprojectconvertingthread.cpp k3baudioripjob.cpp - -SUBDIRS = $(VIDEODVDRIPDIR)
\ No newline at end of file diff --git a/src/rip/k3baudiocdlistview.h b/src/rip/k3baudiocdlistview.h index bb7c7ea..7a546e1 100644 --- a/src/rip/k3baudiocdlistview.h +++ b/src/rip/k3baudiocdlistview.h @@ -26,7 +26,7 @@ class K3bAudioCdView; */ class K3bAudioCdListView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp index abe5224..de4c7a3 100644 --- a/src/rip/k3baudiocdview.cpp +++ b/src/rip/k3baudiocdview.cpp @@ -43,7 +43,7 @@ #include <tdeconfig.h> #include <klineedit.h> #include <kcombobox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdialogbase.h> #include <tqlayout.h> @@ -119,21 +119,21 @@ K3bAudioCdView::K3bAudioCdView( TQWidget* parent, const char *name ) // ---------------------------------------------------------------------------------- m_trackView = new K3bAudioCdListView( this, mainWidget() ); - connect( m_trackView, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int)) ); - connect( m_trackView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); -// connect( m_trackView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), -// this, TQT_SLOT(slotTrackSelectionChanged(TQListViewItem*)) ); + connect( m_trackView, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString&, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString&, int)) ); + connect( m_trackView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); +// connect( m_trackView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), +// this, TQ_SLOT(slotTrackSelectionChanged(TQListViewItem*)) ); mainGrid->addLayout( toolBoxLayout, 0, 0 ); mainGrid->addWidget( m_trackView, 1, 0 ); - m_cddb = new K3bCddb( TQT_TQOBJECT(this) ); + m_cddb = new K3bCddb( this ); - connect( m_cddb, TQT_SIGNAL(queryFinished(int)), - this, TQT_SLOT(slotCddbQueryFinished(int)) ); + connect( m_cddb, TQ_SIGNAL(queryFinished(int)), + this, TQ_SLOT(slotCddbQueryFinished(int)) ); initActions(); // slotTrackSelectionChanged(0); @@ -226,33 +226,33 @@ void K3bAudioCdView::initActions() { m_actionCollection = new TDEActionCollection( this ); - TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCheckAll()), actionCollection(), + TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, this, + TQ_SLOT(slotCheckAll()), actionCollection(), "check_all" ); - TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUncheckAll()), actionCollection(), + TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, this, + TQ_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); - TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSelect()), actionCollection(), + TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, this, + TQ_SLOT(slotSelect()), actionCollection(), "select_track" ); - TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotDeselect()), actionCollection(), + TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, this, + TQ_SLOT(slotDeselect()), actionCollection(), "deselect_track" ); - TDEAction* actionEditTrackCddbInfo = new TDEAction( i18n("Edit Track cddb Info"), "edit", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditTrackCddb()), actionCollection(), + TDEAction* actionEditTrackCddbInfo = new TDEAction( i18n("Edit Track cddb Info"), "edit", 0, this, + TQ_SLOT(slotEditTrackCddb()), actionCollection(), "edit_track_cddb" ); - TDEAction* actionEditAlbumCddbInfo = new TDEAction( i18n("Edit Album cddb Info"), "edit", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditAlbumCddb()), actionCollection(), + TDEAction* actionEditAlbumCddbInfo = new TDEAction( i18n("Edit Album cddb Info"), "edit", 0, this, + TQ_SLOT(slotEditAlbumCddb()), actionCollection(), "edit_album_cddb" ); - TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "cddarip", 0, TQT_TQOBJECT(this), - TQT_SLOT(startRip()), actionCollection(), "start_rip" ); + TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "cddarip", 0, this, + TQ_SLOT(startRip()), actionCollection(), "start_rip" ); - TDEAction* actionQueryCddb = new TDEAction( i18n("Query cddb"), "reload", 0, TQT_TQOBJECT(this), - TQT_SLOT(queryCddb()), actionCollection(), "query_cddb" ); + TDEAction* actionQueryCddb = new TDEAction( i18n("Query cddb"), "reload", 0, this, + TQ_SLOT(queryCddb()), actionCollection(), "query_cddb" ); - TDEAction* actionSaveCddbLocally = new TDEAction( i18n("Save Cddb Entry Locally"), "document-save", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" ); + TDEAction* actionSaveCddbLocally = new TDEAction( i18n("Save Cddb Entry Locally"), "document-save", 0, this, + TQ_SLOT(slotSaveCddbLocally()), actionCollection(), "save_cddb_local" ); // TODO: set the actions tooltips and whatsthis infos diff --git a/src/rip/k3baudiocdview.h b/src/rip/k3baudiocdview.h index b86135a..bdc45cf 100644 --- a/src/rip/k3baudiocdview.h +++ b/src/rip/k3baudiocdview.h @@ -43,7 +43,7 @@ namespace K3bDevice { class K3bAudioCdView : public K3bMediaContentsView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp index 11f5146..1fa892b 100644 --- a/src/rip/k3baudioconvertingoptionwidget.cpp +++ b/src/rip/k3baudioconvertingoptionwidget.cpp @@ -82,18 +82,18 @@ K3bAudioConvertingOptionWidget::K3bAudioConvertingOptionWidget( TQWidget* parent { d = new Private(); - connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotUpdateFreeTempSpace()) ); - connect( m_comboFileType, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotEncoderChanged()) ); - connect( &d->freeSpaceUpdateTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateFreeTempSpace()) ); - connect( m_checkCreatePlaylist, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()) ); - connect( m_checkSingleFile, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()) ); - connect( m_checkWriteCueFile, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed()) ); - connect( m_comboFileType, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed()) ); - connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(changed()) ); - connect( m_buttonConfigurePlugin, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigurePlugin()) ); + connect( m_editBaseDir, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_comboFileType, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotEncoderChanged()) ); + connect( &d->freeSpaceUpdateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_checkCreatePlaylist, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()) ); + connect( m_checkSingleFile, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()) ); + connect( m_checkWriteCueFile, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed()) ); + connect( m_comboFileType, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed()) ); + connect( m_editBaseDir, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(changed()) ); + connect( m_buttonConfigurePlugin, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigurePlugin()) ); m_editBaseDir->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); m_buttonConfigurePlugin->setIconSet( SmallIconSet( "gear" ) ); diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h index 4c702aa..8a6e886 100644 --- a/src/rip/k3baudioconvertingoptionwidget.h +++ b/src/rip/k3baudioconvertingoptionwidget.h @@ -30,7 +30,7 @@ class TDEConfigBase; */ class K3bAudioConvertingOptionWidget : public base_K3bAudioRippingOptionWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp index 748f6fc..24a6325 100644 --- a/src/rip/k3baudioprojectconvertingdialog.cpp +++ b/src/rip/k3baudioprojectconvertingdialog.cpp @@ -116,13 +116,13 @@ void K3bAudioProjectConvertingDialog::setupGui() // ------------------------------------------------------------------------------------------- m_patternWidget = new K3bCddbPatternWidget( mainTab ); mainTab->addTab( m_patternWidget, i18n("File Naming") ); - connect( m_patternWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); + connect( m_patternWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(refresh()) ); Form1Layout->addWidget( m_viewTracks, 0, 0 ); Form1Layout->addWidget( mainTab, 1, 0 ); Form1Layout->setRowStretch( 0, 1 ); - connect( m_optionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); + connect( m_optionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(refresh()) ); } @@ -175,7 +175,7 @@ void K3bAudioProjectConvertingDialog::slotStartClicked() int i = 0; K3bAudioTrack* track = m_doc->firstTrack(); while( track ) { - tracksToRip.append( tqMakePair( i+1, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); + tracksToRip.append( qMakePair( i+1, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); ++i; track = track->next(); } @@ -196,7 +196,7 @@ void K3bAudioProjectConvertingDialog::slotStartClicked() K3bJobProgressDialog progressDialog( parentWidget() ); - K3bThreadJob job( thread, &progressDialog, TQT_TQOBJECT(this) ); + K3bThreadJob job( thread, &progressDialog, this ); hide(); progressDialog.startJob(&job); diff --git a/src/rip/k3baudioprojectconvertingdialog.h b/src/rip/k3baudioprojectconvertingdialog.h index e04e5ca..fd37ae0 100644 --- a/src/rip/k3baudioprojectconvertingdialog.h +++ b/src/rip/k3baudioprojectconvertingdialog.h @@ -41,7 +41,7 @@ class K3bAudioDoc; */ class K3bAudioProjectConvertingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudioprojectconvertingthread.cpp b/src/rip/k3baudioprojectconvertingthread.cpp index a94ced4..c085d0c 100644 --- a/src/rip/k3baudioprojectconvertingthread.cpp +++ b/src/rip/k3baudioprojectconvertingthread.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> diff --git a/src/rip/k3baudioripjob.cpp b/src/rip/k3baudioripjob.cpp index eded9aa..81f4742 100644 --- a/src/rip/k3baudioripjob.cpp +++ b/src/rip/k3baudioripjob.cpp @@ -29,11 +29,11 @@ K3bAudioRipJob::K3bAudioRipJob( K3bJobHandler* hdl, TQObject* parent ) m_thread = new K3bAudioRipThread(); m_threadJob = new K3bThreadJob( m_thread, this, this ); connectSubJob( m_threadJob, - TQT_SLOT(slotRippingFinished(bool)), - TQT_SIGNAL(newTask(const TQString&)), - TQT_SIGNAL(newSubTask(const TQString&)), - TQT_SIGNAL(percent(int)), - TQT_SIGNAL(subPercent(int)) ); + TQ_SLOT(slotRippingFinished(bool)), + TQ_SIGNAL(newTask(const TQString&)), + TQ_SIGNAL(newSubTask(const TQString&)), + TQ_SIGNAL(percent(int)), + TQ_SIGNAL(subPercent(int)) ); } diff --git a/src/rip/k3baudioripjob.h b/src/rip/k3baudioripjob.h index df0182a..65d9d16 100644 --- a/src/rip/k3baudioripjob.h +++ b/src/rip/k3baudioripjob.h @@ -31,7 +31,7 @@ class K3bThreadJob; class K3bAudioRipJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index e3116ab..2826441 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -142,7 +142,7 @@ void K3bAudioRippingDialog::setupGui() // ------------------------------------------------------------------------------------------- m_patternWidget = new K3bCddbPatternWidget( mainTab ); mainTab->addTab( m_patternWidget, i18n("File Naming") ); - connect( m_patternWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); + connect( m_patternWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(refresh()) ); // setup advanced page @@ -176,8 +176,8 @@ void K3bAudioRippingDialog::setupGui() setStartButtonText( i18n( "Start Ripping" ), i18n( "Starts copying the selected tracks") ); - connect( m_checkUseIndex0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(refresh()) ); - connect( m_optionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(refresh()) ); + connect( m_checkUseIndex0, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(refresh()) ); + connect( m_optionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(refresh()) ); } @@ -250,14 +250,14 @@ void K3bAudioRippingDialog::slotStartClicked() unsigned int i = 0; for( TQValueList<int>::const_iterator trackIt = m_trackNumbers.begin(); trackIt != m_trackNumbers.end(); ++trackIt ) { - tracksToRip.append( tqMakePair( *trackIt, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); + tracksToRip.append( qMakePair( *trackIt, d->filenames[(m_optionWidget->createSingleFile() ? 0 : i)] ) ); ++i; } K3bJobProgressDialog ripDialog( parentWidget(), "Ripping" ); K3bAudioEncoder* encoder = m_optionWidget->encoder(); - K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, TQT_TQOBJECT(this) ); + K3bAudioRipJob* job = new K3bAudioRipJob( &ripDialog, this ); job->setDevice( m_device ); job->setCddbEntry( m_cddbEntry ); job->setTracksToRip( tracksToRip ); diff --git a/src/rip/k3baudiorippingdialog.h b/src/rip/k3baudiorippingdialog.h index 2a77d3f..c04e315 100644 --- a/src/rip/k3baudiorippingdialog.h +++ b/src/rip/k3baudiorippingdialog.h @@ -43,7 +43,7 @@ class K3bAudioConvertingOptionWidget; */ class K3bAudioRippingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3baudioripthread.cpp b/src/rip/k3baudioripthread.cpp index cd04976..7f3e715 100644 --- a/src/rip/k3baudioripthread.cpp +++ b/src/rip/k3baudioripthread.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> @@ -409,7 +409,7 @@ void K3bAudioRipThread::cancel() // wait for 1 second. I the thread still is working terminate it // and trigger the finished slot manually emitInfoMessage( i18n("Cancellation could take a while..."), K3bJob::INFO ); - TQTimer::singleShot( 1000, this, TQT_SLOT(slotCheckIfThreadStillRunning()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(slotCheckIfThreadStillRunning()) ); } diff --git a/src/rip/k3baudioripthread.h b/src/rip/k3baudioripthread.h index d9b0b1b..9b49fc3 100644 --- a/src/rip/k3baudioripthread.h +++ b/src/rip/k3baudioripthread.h @@ -34,7 +34,7 @@ namespace K3bDevice { class K3bAudioRipThread : public TQObject, public K3bThread { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp index 2c8e533..04dfa0d 100644 --- a/src/rip/k3bcddbpatternwidget.cpp +++ b/src/rip/k3bcddbpatternwidget.cpp @@ -41,7 +41,7 @@ K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name ) // additional the filename can never contain a slash / // and the dir should never start with a slash since it should always be a relative path - TQRegExpValidator* dirValidator = new TQRegExpValidator( TQRegExp( "[^/][^?\\*\\\"]*" ), TQT_TQOBJECT(this) ); + TQRegExpValidator* dirValidator = new TQRegExpValidator( TQRegExp( "[^/][^?\\*\\\"]*" ), this ); m_comboFilenamePattern->setValidator( dirValidator ); m_comboPlaylistPattern->setValidator( dirValidator ); m_editBlankReplace->setValidator( dirValidator ); @@ -56,18 +56,18 @@ K3bCddbPatternWidget::K3bCddbPatternWidget( TQWidget* parent, const char* name ) m_comboPlaylistPattern->insertItem( i18n( "Playlist" ) ); m_comboPlaylistPattern->insertItem( i18n( "playlists/%{albumartist}/%{albumtitle }" ) ); - connect( m_comboFilenamePattern, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_comboPlaylistPattern, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_editBlankReplace, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_checkBlankReplace, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed()) ); - connect( m_specialStringsLabel, TQT_SIGNAL(leftClickedURL()), - this, TQT_SLOT(slotSeeSpecialStrings()) ); - connect( m_conditionalInclusionLabel, TQT_SIGNAL(leftClickedURL()), - this, TQT_SLOT(slotSeeConditionalInclusion()) ); + connect( m_comboFilenamePattern, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_comboPlaylistPattern, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_editBlankReplace, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_checkBlankReplace, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed()) ); + connect( m_specialStringsLabel, TQ_SIGNAL(leftClickedURL()), + this, TQ_SLOT(slotSeeSpecialStrings()) ); + connect( m_conditionalInclusionLabel, TQ_SIGNAL(leftClickedURL()), + this, TQ_SLOT(slotSeeConditionalInclusion()) ); } diff --git a/src/rip/k3bcddbpatternwidget.h b/src/rip/k3bcddbpatternwidget.h index 5c8dca5..956bfe7 100644 --- a/src/rip/k3bcddbpatternwidget.h +++ b/src/rip/k3bcddbpatternwidget.h @@ -24,7 +24,7 @@ class TDEConfigBase; class K3bCddbPatternWidget : public base_K3bCddbPatternWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp index fd256a4..286e80b 100644 --- a/src/rip/k3bpatternparser.cpp +++ b/src/rip/k3bpatternparser.cpp @@ -198,7 +198,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, bool isIncluded; static TQRegExp conditionrx( "^[@|!][atyegrmx](?:='.*')?\\{" ); - conditionrx.setMinimal( TRUE ); + conditionrx.setMinimal( true ); for( unsigned int i = 0; i < dir.length(); ++i ) { @@ -282,7 +282,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry, dir.replace( offset, length, ( isIncluded ? inclusion : TQString("") ) ); - if( isIncluded == TRUE ) + if( isIncluded == true ) i -= length - inclusion.length(); else i = offset - 1; // start next loop at offset diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index b996d1b..d37db1d 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -67,12 +67,12 @@ void K3bVideoCdInfo::info( const TQString& device ) *m_process << "-q" << "--norip" << "-i" << device << "-o" << "-"; - connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotInfoFinished() ) ); + connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotInfoFinished() ) ); if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { kdDebug() << "(K3bVideoCdInfo::info) could not start vcdxrip" << endl; diff --git a/src/rip/k3bvideocdinfo.h b/src/rip/k3bvideocdinfo.h index d6efd0a..70675e2 100644 --- a/src/rip/k3bvideocdinfo.h +++ b/src/rip/k3bvideocdinfo.h @@ -70,7 +70,7 @@ class K3bVideoCdInfoResult class K3bVideoCdInfo : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index 8a09301..343ed9e 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <tdeio/global.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetempfile.h> #include <kurl.h> @@ -150,12 +150,12 @@ void K3bVideoCdRip::vcdxRip() *m_process << "-o" << "/dev/null"; - connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotVcdXRipFinished() ) ); + connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQ_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotVcdXRipFinished() ) ); m_process->setWorkingDirectory( TQUrl( m_videooptions ->getVideoCdDestination() ).dirPath() ); diff --git a/src/rip/k3bvideocdrip.h b/src/rip/k3bvideocdrip.h index a6d4582..5c4b08d 100644 --- a/src/rip/k3bvideocdrip.h +++ b/src/rip/k3bvideocdrip.h @@ -26,7 +26,7 @@ class TQDataStream; class K3bVideoCdRip : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index 9eafedb..6f9ac23 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -21,9 +21,9 @@ #include <kurlrequester.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> -// qt includes +// TQt includes #include <tqgroupbox.h> #include <tqcheckbox.h> #include <tqlabel.h> @@ -72,7 +72,7 @@ void K3bVideoCdRippingDialog::setupGui() MainLayout->setMargin( 0 ); // ---------------------------------------------------- Directory group --- - TQGroupBox* groupDirectory = new TQGroupBox( 0, Qt::Vertical, i18n( "Destination Directory" ), frame ); + TQGroupBox* groupDirectory = new TQGroupBox( 0, TQt::Vertical, i18n( "Destination Directory" ), frame ); groupDirectory->layout() ->setSpacing( KDialog::spacingHint() ); groupDirectory->layout() ->setMargin( KDialog::marginHint() ); @@ -105,7 +105,7 @@ void K3bVideoCdRippingDialog::setupGui() groupDirectoryLayout->addWidget( necessarySizeBox, 2, 1 ); // ---------------------------------------------------- Options group --- - TQGroupBox* groupOptions = new TQGroupBox( 4, Qt::Vertical, i18n( "Settings" ), frame ); + TQGroupBox* groupOptions = new TQGroupBox( 4, TQt::Vertical, i18n( "Settings" ), frame ); m_ignoreExt = new TQCheckBox( i18n( "Ignore /EXT/PSD_X.VCD" ), groupOptions ); @@ -124,7 +124,7 @@ void K3bVideoCdRippingDialog::setupGui() setStartButtonText( i18n( "Start Ripping" ), i18n( "Starts extracting the selected VideoCd tracks" ) ); // ---------------------------------------------------------------------------------- - connect( m_editDirectory, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateFreeSpace()) ); + connect( m_editDirectory, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotUpdateFreeSpace()) ); m_labelNecessarySize ->setText( TDEIO::convertSize( m_videooptions ->getVideoCdSize() ) ); } @@ -186,7 +186,7 @@ void K3bVideoCdRippingDialog::slotStartClicked() m_videooptions ->setVideoCdExtractXml( m_extractXML ->isChecked() ); m_videooptions ->setVideoCdDestination( m_editDirectory ->url() ); - K3bJobProgressDialog ripDialog( kapp->mainWidget(), "Ripping" ); + K3bJobProgressDialog ripDialog( tdeApp->mainWidget(), "Ripping" ); K3bVideoCdRip * rip = new K3bVideoCdRip( &ripDialog, m_videooptions ); hide(); @@ -211,7 +211,7 @@ void K3bVideoCdRippingDialog::slotFreeSpace(const TQString&, else m_labelNecessarySize->setPaletteForegroundColor( m_labelFreeSpace->paletteForegroundColor() ); - TQTimer::singleShot( 1000, this, TQT_SLOT(slotUpdateFreeSpace()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(slotUpdateFreeSpace()) ); } diff --git a/src/rip/k3bvideocdrippingdialog.h b/src/rip/k3bvideocdrippingdialog.h index 454f4c3..a51682a 100644 --- a/src/rip/k3bvideocdrippingdialog.h +++ b/src/rip/k3bvideocdrippingdialog.h @@ -34,7 +34,7 @@ class K3bTempDirSelectionWidget; class K3bVideoCdRippingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp index 52549e6..bb0c5f9 100644 --- a/src/rip/k3bvideocdview.cpp +++ b/src/rip/k3bvideocdview.cpp @@ -21,10 +21,10 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> -// qt includes +// TQt includes #include <tqfont.h> #include <tqframe.h> #include <tqheader.h> @@ -173,14 +173,14 @@ K3bVideoCdView::K3bVideoCdView( TQWidget* parent, const char *name ) m_trackView->setItemsRenameable( false ); m_trackView->setRootIsDecorated( true ); - connect( m_trackView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); - connect( m_trackView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - this, TQT_SLOT( slotTrackSelectionChanged( TQListViewItem* ) ) ); - connect( m_trackView, TQT_SIGNAL( clicked( TQListViewItem* ) ), - this, TQT_SLOT( slotStateChanged( TQListViewItem* ) ) ); - connect( m_trackView, TQT_SIGNAL( spacePressed( TQListViewItem* ) ), - this, TQT_SLOT( slotStateChanged( TQListViewItem* ) ) ); + connect( m_trackView, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQ_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_trackView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + this, TQ_SLOT( slotTrackSelectionChanged( TQListViewItem* ) ) ); + connect( m_trackView, TQ_SIGNAL( clicked( TQListViewItem* ) ), + this, TQ_SLOT( slotStateChanged( TQListViewItem* ) ) ); + connect( m_trackView, TQ_SIGNAL( spacePressed( TQListViewItem* ) ), + this, TQ_SLOT( slotStateChanged( TQListViewItem* ) ) ); mainGrid->addLayout( toolBoxLayout, 0, 0 ); @@ -248,11 +248,11 @@ void K3bVideoCdView::reloadMedium() m_videooptions ->setVideoCdSource( device()->devicename() ); - m_videocdinfo = new K3bVideoCdInfo( TQT_TQOBJECT(this) ); + m_videocdinfo = new K3bVideoCdInfo( this ); m_videocdinfo->info( device()->devicename() ); - connect( m_videocdinfo, TQT_SIGNAL( infoFinished( bool ) ), - this, TQT_SLOT( slotVideoCdInfoFinished( bool ) ) ); + connect( m_videocdinfo, TQ_SIGNAL( infoFinished( bool ) ), + this, TQ_SLOT( slotVideoCdInfoFinished( bool ) ) ); } @@ -322,20 +322,20 @@ void K3bVideoCdView::initActions() { m_actionCollection = new TDEActionCollection( this ); - TDEAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), + TDEAction* actionSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), m_actionCollection, "select_all" ); - TDEAction* actionDeselectAll = KStdAction::deselect( TQT_TQOBJECT(this), TQT_SLOT( slotDeselectAll() ), + TDEAction* actionDeselectAll = KStdAction::deselect( this, TQ_SLOT( slotDeselectAll() ), m_actionCollection, "deselect_all" ); actionDeselectAll->setText( i18n( "Dese&lect All" ) ); - TDEAction* actionSelect = new TDEAction( i18n( "Select Track" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotSelect() ), actionCollection(), + TDEAction* actionSelect = new TDEAction( i18n( "Select Track" ), 0, 0, this, + TQ_SLOT( slotSelect() ), actionCollection(), "select_track" ); - TDEAction* actionDeselect = new TDEAction( i18n( "Deselect Track" ), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT( slotDeselect() ), actionCollection(), + TDEAction* actionDeselect = new TDEAction( i18n( "Deselect Track" ), 0, 0, this, + TQ_SLOT( slotDeselect() ), actionCollection(), "deselect_track" ); - TDEAction* actionStartRip = new TDEAction( i18n( "Start Ripping" ), "system-run", 0, TQT_TQOBJECT(this), - TQT_SLOT( startRip() ), actionCollection(), "start_rip" ); + TDEAction* actionStartRip = new TDEAction( i18n( "Start Ripping" ), "system-run", 0, this, + TQ_SLOT( startRip() ), actionCollection(), "start_rip" ); // TODO: set the actions tooltips and whatsthis infos @@ -368,14 +368,6 @@ void K3bVideoCdView::slotTrackSelectionChanged( TQListViewItem* item ) void K3bVideoCdView::slotStateChanged( TQListViewItem* item ) { - /* > QT 3.1 - if ( !item == 0 && item ->isSelectable() ) { - if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == TQCheckListItem::On) - slotSelect(); - else if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == TQCheckListItem::Off) - slotDeselect(); - } - */ if ( !item == 0 && item ->isSelectable() ) { if ( ( ( VideoTrackViewCheckItem* ) item) ->isOn() ) slotSelect(); diff --git a/src/rip/k3bvideocdview.h b/src/rip/k3bvideocdview.h index 7e8a992..20e887f 100644 --- a/src/rip/k3bvideocdview.h +++ b/src/rip/k3bvideocdview.h @@ -45,7 +45,7 @@ namespace K3bDevice class K3bVideoCdView : public K3bMediaContentsView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/Makefile.am b/src/rip/videodvd/Makefile.am deleted file mode 100644 index bac9b0a..0000000 --- a/src/rip/videodvd/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core \ - -I$(srcdir)/../../../libk3bdevice \ - -I$(srcdir)/../../../libk3b/tools \ - -I$(srcdir)/../../../libk3b/videodvd/ \ - -I$(srcdir)/../../../libk3b/jobs/ \ - -I$(srcdir)/../.. \ - $(all_includes) - -METASOURCES = AUTO - -noinst_LTLIBRARIES = libvideodvdrip.la - -libvideodvdrip_la_SOURCES = base_k3bvideodvdrippingwidget.ui k3bvideodvdrippingview.cpp \ - k3bvideodvdrippingtitlelistview.cpp \ - k3bvideodvdrippingjob.cpp k3bvideodvdrippingwidget.cpp \ - k3bvideodvdrippingdialog.cpp k3bvideodvdrippingpreview.cpp diff --git a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui index e6c35c0..88389a7 100644 --- a/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui +++ b/src/rip/videodvd/base_k3bvideodvdrippingwidget.ui @@ -587,9 +587,6 @@ <property name="text"> <string>&2-pass encoding</string> </property> - <property name="accel"> - <string>Alt+2</string> - </property> <property name="checked"> <bool>true</bool> </property> @@ -628,9 +625,6 @@ <property name="text"> <string>Resample Audio to &44.1 KHz</string> </property> - <property name="accel"> - <string>Alt+4</string> - </property> <property name="checked"> <bool>true</bool> </property> diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 1025f30..778b1af 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -163,12 +163,12 @@ K3bVideoDVDRippingDialog::K3bVideoDVDRippingDialog( const K3bVideoDVD::VideoDVD& frameLayout->setAutoAdd( true ); m_w = new K3bVideoDVDRippingWidget( frame ); - connect( m_w, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotUpdateFilesizes()) ); - connect( m_w, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotUpdateFilenames()) ); - connect( m_w, TQT_SIGNAL(changed()), - this, TQT_SLOT(slotUpdateVideoSizes()) ); + connect( m_w, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotUpdateFilesizes()) ); + connect( m_w, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotUpdateFilenames()) ); + connect( m_w, TQ_SIGNAL(changed()), + this, TQ_SLOT(slotUpdateVideoSizes()) ); setTitle( i18n("Video DVD Ripping"), i18n("1 title from %1", "%n titles from %1", titles.count()) @@ -612,7 +612,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked() // start the job K3bJobProgressDialog dlg( parentWidget() ); - K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, TQT_TQOBJECT(&dlg) ); + K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, &dlg ); job->setVideoDVD( m_dvd ); job->setTitles( titles ); diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.h b/src/rip/videodvd/k3bvideodvdrippingdialog.h index 7180a2b..4606384 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.h +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.h @@ -29,7 +29,7 @@ class TQCheckListItem; class K3bVideoDVDRippingDialog : public K3bInteractionDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp index b448fa0..cc0ee1c 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp @@ -89,11 +89,11 @@ K3bVideoDVDRippingJob::K3bVideoDVDRippingJob( K3bJobHandler* hdl, TQObject* pare m_transcodingJob = new K3bVideoDVDTitleTranscodingJob( this, this ); connectSubJob( m_transcodingJob, - TQT_SLOT(slotTranscodingJobFinished(bool)), - TQT_SIGNAL(newTask(const TQString&)), - TQT_SIGNAL(newSubTask(const TQString&)), - TQT_SLOT(slotTranscodingProgress(int)), - TQT_SIGNAL(subPercent(int)), + TQ_SLOT(slotTranscodingJobFinished(bool)), + TQ_SIGNAL(newTask(const TQString&)), + TQ_SIGNAL(newSubTask(const TQString&)), + TQ_SLOT(slotTranscodingProgress(int)), + TQ_SIGNAL(subPercent(int)), 0, 0 ); m_detectClippingJob = 0; @@ -234,11 +234,11 @@ void K3bVideoDVDRippingJob::startDetectClipping( int ripInfoIndex ) if( !m_detectClippingJob ) { m_detectClippingJob = new K3bVideoDVDTitleDetectClippingJob( this, this ); connectSubJob( m_detectClippingJob, - TQT_SLOT(slotDetectClippingJobFinished(bool)), - TQT_SIGNAL(newTask(const TQString&)), - TQT_SIGNAL(newSubTask(const TQString&)), - TQT_SLOT(slotDetectClippingProgress(int)), - TQT_SIGNAL(subPercent(int)), + TQ_SLOT(slotDetectClippingJobFinished(bool)), + TQ_SIGNAL(newTask(const TQString&)), + TQ_SIGNAL(newSubTask(const TQString&)), + TQ_SLOT(slotDetectClippingProgress(int)), + TQ_SIGNAL(subPercent(int)), 0, 0 ); } diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.h b/src/rip/videodvd/k3bvideodvdrippingjob.h index 171ae35..750b5e3 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.h +++ b/src/rip/videodvd/k3bvideodvdrippingjob.h @@ -31,7 +31,7 @@ class K3bVideoDVDTitleDetectClippingJob; */ class K3bVideoDVDRippingJob : public K3bJob { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp index 2f2b38e..3ee9e63 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp @@ -19,7 +19,7 @@ #include <k3bexternalbinmanager.h> #include <k3bdevice.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <ktempdir.h> #include <kdebug.h> @@ -85,8 +85,8 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv *m_process << "-Z" << "x200"; *m_process << "-o" << m_tempDir->name(); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotTranscodeFinished(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotTranscodeFinished(TDEProcess*)) ); if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout // something went wrong when starting the program // it "should" be the executable diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h index 92706dc..31ab15d 100644 --- a/src/rip/videodvd/k3bvideodvdrippingpreview.h +++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h @@ -27,7 +27,7 @@ class TDEProcess; class K3bVideoDVDRippingPreview : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index b0106a3..3a26899 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -193,7 +193,7 @@ protected: preW = h*16/9; p->drawRect( ( w - preW ) / 2, ( height() - h ) / 2, preW, h ); - TQPixmap noIcon = TDEApplication::kApplication()->iconLoader()->loadIcon( "no", TDEIcon::NoGroup, TDEIcon::SizeSmall, TDEIcon::DefaultState, 0, true ); + TQPixmap noIcon = tdeApp->iconLoader()->loadIcon( "no", TDEIcon::NoGroup, TDEIcon::SizeSmall, TDEIcon::DefaultState, 0, true ); p->drawPixmap( ( w - noIcon.width() ) / 2, ( height() - noIcon.height() ) / 2, noIcon ); } else { @@ -352,9 +352,9 @@ K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( TQWidget* pare m_toolTip = new TitleToolTip( this ); - m_previewGen = new K3bVideoDVDRippingPreview( TQT_TQOBJECT(this) ); - connect( m_previewGen, TQT_SIGNAL(previewDone(bool)), - this, TQT_SLOT(slotPreviewDone(bool)) ); + m_previewGen = new K3bVideoDVDRippingPreview( this ); + connect( m_previewGen, TQ_SIGNAL(previewDone(bool)), + this, TQ_SLOT(slotPreviewDone(bool)) ); } diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h index e144120..1d75f95 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.h @@ -28,7 +28,7 @@ class TQHideEvent; class K3bVideoDVDRippingTitleListView : public K3bListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index c524fa6..83736d3 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -62,8 +62,8 @@ K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * n // ---------------------------------------------------------------------------------- m_titleView = new K3bVideoDVDRippingTitleListView( mainWidget() ); - connect( m_titleView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( m_titleView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); // general layout // ---------------------------------------------------------------------------------- @@ -218,20 +218,20 @@ void K3bVideoDVDRippingView::initActions() { m_actionCollection = new TDEActionCollection( this ); - TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCheckAll()), actionCollection(), + TDEAction* actionSelectAll = new TDEAction( i18n("Check All"), 0, 0, this, + TQ_SLOT(slotCheckAll()), actionCollection(), "check_all" ); - TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUncheckAll()), actionCollection(), + TDEAction* actionDeselectAll = new TDEAction( i18n("Uncheck All"), 0, 0, this, + TQ_SLOT(slotUncheckAll()), actionCollection(), "uncheck_all" ); - TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCheck()), actionCollection(), + TDEAction* actionSelect = new TDEAction( i18n("Check Track"), 0, 0, this, + TQ_SLOT(slotCheck()), actionCollection(), "select_track" ); - TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUncheck()), actionCollection(), + TDEAction* actionDeselect = new TDEAction( i18n("Uncheck Track"), 0, 0, this, + TQ_SLOT(slotUncheck()), actionCollection(), "deselect_track" ); - TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "gear", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); + TDEAction* actionStartRip = new TDEAction( i18n("Start Ripping"), "gear", 0, this, + TQ_SLOT(slotStartRipping()), m_actionCollection, "start_rip" ); actionStartRip->setToolTip( i18n("Open the Video DVD ripping dialog") ); diff --git a/src/rip/videodvd/k3bvideodvdrippingview.h b/src/rip/videodvd/k3bvideodvdrippingview.h index a7820ca..7b5fe25 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.h +++ b/src/rip/videodvd/k3bvideodvdrippingview.h @@ -30,7 +30,7 @@ class TQListViewItem; class K3bVideoDVDRippingView : public K3bMediaContentsView { - Q_OBJECT + TQ_OBJECT public: diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index 649ac7b..82e6c3a 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -118,32 +118,32 @@ K3bVideoDVDRippingWidget::K3bVideoDVDRippingWidget( TQWidget* parent ) slotAudioCodecChanged( m_comboAudioCodec->selectedValue() ); - connect( m_comboAudioBitrate, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_spinVideoBitrate, TQT_SIGNAL(valueChanged(int)), - this, TQT_SIGNAL(changed()) ); - connect( m_checkBlankReplace, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed()) ); - connect( m_editBlankReplace, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_comboFilenamePattern, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - connect( m_editBaseDir, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SIGNAL(changed()) ); - - connect( m_comboAudioCodec, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotAudioCodecChanged(int)) ); - connect( m_specialStringsLabel, TQT_SIGNAL(leftClickedURL()), - this, TQT_SLOT(slotSeeSpecialStrings()) ); - connect( m_buttonCustomPictureSize, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCustomPictureSize()) ); - connect( m_comboVideoSize, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotVideoSizeChanged(int)) ); + connect( m_comboAudioBitrate, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_spinVideoBitrate, TQ_SIGNAL(valueChanged(int)), + this, TQ_SIGNAL(changed()) ); + connect( m_checkBlankReplace, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed()) ); + connect( m_editBlankReplace, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_comboFilenamePattern, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + connect( m_editBaseDir, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SIGNAL(changed()) ); + + connect( m_comboAudioCodec, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotAudioCodecChanged(int)) ); + connect( m_specialStringsLabel, TQ_SIGNAL(leftClickedURL()), + this, TQ_SLOT(slotSeeSpecialStrings()) ); + connect( m_buttonCustomPictureSize, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCustomPictureSize()) ); + connect( m_comboVideoSize, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotVideoSizeChanged(int)) ); // refresh every 2 seconds m_freeSpaceUpdateTimer = new TQTimer( this ); - connect( m_freeSpaceUpdateTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotUpdateFreeTempSpace()) ); + connect( m_freeSpaceUpdateTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotUpdateFreeTempSpace()) ); m_freeSpaceUpdateTimer->start(2000); slotUpdateFreeTempSpace(); } diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h index 812a5d8..101db33 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.h +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h @@ -29,7 +29,7 @@ class TQTimer; class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget { - Q_OBJECT + TQ_OBJECT public: |