summaryrefslogtreecommitdiffstats
path: root/src/rip/videodvd
diff options
context:
space:
mode:
Diffstat (limited to 'src/rip/videodvd')
-rw-r--r--src/rip/videodvd/Makefile.am16
-rw-r--r--src/rip/videodvd/base_k3bvideodvdrippingwidget.ui6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.cpp14
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.h2
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingjob.cpp20
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingjob.h2
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingpreview.cpp6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingpreview.h2
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp8
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingtitlelistview.h2
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingview.cpp24
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingview.h2
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.cpp46
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.h2
14 files changed, 65 insertions, 87 deletions
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>&amp;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 &amp;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: