summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-22 08:44:43 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-22 08:44:43 +0000
commit90bccb754fa2e4f0585c31e823534276700d2605 (patch)
tree1e59c90a1c6491427b0cc12a5df22513b390f2aa
parentabc21952ac547e45f72d35c35bc7d746648947cc (diff)
downloadk3b-90bccb754fa2e4f0585c31e823534276700d2605.tar.gz
k3b-90bccb754fa2e4f0585c31e823534276700d2605.zip
Fix k3b FTBFS under Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1242629 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.cpp4
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp2
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingview.cpp10
3 files changed, 8 insertions, 8 deletions
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index c54bb61..bb7bbcf 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -233,7 +233,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
if( m_dvd[*it-1].audioStream(i).format() == K3bVideoDVD::AUDIO_FORMAT_DTS ) {
// width of the radio button from TQCheckListItem::paintCell
- int buttonSize = style().tqpixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4;
+ int buttonSize = tqstyle().tqpixelMetric( TQStyle::PM_CheckListButtonSize, m_w->m_titleView ) + 4;
int spaceWidth = fontMetrics().width( ' ' );
int numSpaces = buttonSize/spaceWidth;
asI = new TQListViewItem( titleItem, asI, TQString().fill( ' ', numSpaces ) + text + " (" + i18n("not supported") + ")" );
@@ -612,7 +612,7 @@ void K3bVideoDVDRippingDialog::slotStartClicked()
// start the job
K3bJobProgressDialog dlg( parentWidget() );
- K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, &dlg );
+ K3bVideoDVDRippingJob* job = new K3bVideoDVDRippingJob( &dlg, TQT_TQOBJECT(&dlg) );
job->setVideoDVD( m_dvd );
job->setTitles( titles );
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index 244de2c..10b5831 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -352,7 +352,7 @@ K3bVideoDVDRippingTitleListView::K3bVideoDVDRippingTitleListView( TQWidget* tqpa
m_toolTip = new TitleToolTip( this );
- m_previewGen = new K3bVideoDVDRippingPreview( this );
+ m_previewGen = new K3bVideoDVDRippingPreview( TQT_TQOBJECT(this) );
connect( m_previewGen, TQT_SIGNAL(previewDone(bool)),
this, TQT_SLOT(slotPreviewDone(bool)) );
}
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp
index 6753305..4f3113d 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp
@@ -218,19 +218,19 @@ void K3bVideoDVDRippingView::initActions()
{
m_actionCollection = new KActionCollection( this );
- KAction* actionSelectAll = new KAction( i18n("Check All"), 0, 0, this,
+ KAction* actionSelectAll = new KAction( i18n("Check All"), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotCheckAll()), actionCollection(),
"check_all" );
- KAction* actionDeselectAll = new KAction( i18n("Uncheck All"), 0, 0, this,
+ KAction* actionDeselectAll = new KAction( i18n("Uncheck All"), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotUncheckAll()), actionCollection(),
"uncheck_all" );
- KAction* actionSelect = new KAction( i18n("Check Track"), 0, 0, this,
+ KAction* actionSelect = new KAction( i18n("Check Track"), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotCheck()), actionCollection(),
"select_track" );
- KAction* actionDeselect = new KAction( i18n("Uncheck Track"), 0, 0, this,
+ KAction* actionDeselect = new KAction( i18n("Uncheck Track"), 0, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotUncheck()), actionCollection(),
"deselect_track" );
- KAction* actionStartRip = new KAction( i18n("Start Ripping"), "gear", 0, this,
+ KAction* actionStartRip = new KAction( i18n("Start Ripping"), "gear", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotStartRipping()), m_actionCollection, "start_rip" );
actionStartRip->setToolTip( i18n("Open the Video DVD ripping dialog") );