From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun/modules/simple/propertiesdialog.ui | 64 ++++++++++++++--------------- noatun/modules/simple/propertiesdialog.ui.h | 6 +-- noatun/modules/simple/userinterface.cpp | 30 +++++++------- noatun/modules/simple/userinterface.h | 1 + 4 files changed, 51 insertions(+), 50 deletions(-) (limited to 'noatun/modules/simple') diff --git a/noatun/modules/simple/propertiesdialog.ui b/noatun/modules/simple/propertiesdialog.ui index 08f4f71c..875baa10 100644 --- a/noatun/modules/simple/propertiesdialog.ui +++ b/noatun/modules/simple/propertiesdialog.ui @@ -1,11 +1,11 @@ PropertiesDialog Ewald Snel - + PropertiesDialog - + 0 0 @@ -26,11 +26,11 @@ 6 - + TabWidget2 - + details @@ -47,11 +47,11 @@ 6 - + nameField - + 180 0 @@ -78,15 +78,15 @@ Horizontal - + iconLabel - + AlignVCenter|AlignLeft - + typeLabel @@ -109,7 +109,7 @@ Expanding - + 20 20 @@ -130,7 +130,7 @@ Horizontal - + TextLabel7_2 @@ -138,24 +138,24 @@ Type: - + TextLabel2_2 - + 25 0 - + 25 32767 - + TextLabel5 @@ -163,7 +163,7 @@ Length: - + lengthLabel @@ -176,7 +176,7 @@ - + TextLabel6 @@ -184,7 +184,7 @@ Audio: - + audioLabel @@ -197,7 +197,7 @@ - + TextLabel7 @@ -205,7 +205,7 @@ Video: - + videoLabel @@ -220,7 +220,7 @@ - + playobject @@ -237,17 +237,17 @@ 6 - + TextLabel2 - + 80 0 - + 80 32767 @@ -257,12 +257,12 @@ Description: - + descriptionLabel - + Capabilities @@ -281,7 +281,7 @@ - + buttonLayout @@ -305,14 +305,14 @@ Expanding - + 20 20 - + okButton @@ -341,8 +341,8 @@ kmimetype.h propertiesdialog.ui.h - + setPlayObject( PlaylistItem pi, Arts::PlayObject po ) - - + + diff --git a/noatun/modules/simple/propertiesdialog.ui.h b/noatun/modules/simple/propertiesdialog.ui.h index ef6f14f9..bf106f24 100644 --- a/noatun/modules/simple/propertiesdialog.ui.h +++ b/noatun/modules/simple/propertiesdialog.ui.h @@ -21,14 +21,14 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) descriptionLabel->setText( po.description().c_str() ); // Determine capabilities - if (!(item = (TQCheckListItem *)capsList->findItem( "capSeek", 0 ))) + if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capSeek", 0 ))) { item = new TQCheckListItem( capsList, "capSeek", TQCheckListItem::CheckBox ); } item->setOn( (ncaps & Arts::capSeek) ); - if (!(item = (TQCheckListItem *)capsList->findItem( "capPause", 0 ))) + if (!(item = (TQCheckListItem *)capsList->tqfindItem( "capPause", 0 ))) { item = new TQCheckListItem( capsList, "capPause", TQCheckListItem::CheckBox ); @@ -46,7 +46,7 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po ) // PlaylistItem properties (name and mimetype) if (!pi.isNull()) { - setCaption( i18n("Properties for %1").arg(pi.url().fileName()) ); + setCaption( i18n("Properties for %1").tqarg(pi.url().fileName()) ); KSharedPtr mime = KMimeType::mimeType( pi.mimetype() ); iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) ); diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 685b2467..591335f9 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -74,7 +74,7 @@ SimpleUI::SimpleUI() napp->player()->handleButtons(); - resize( minimumSize() ); + resize( tqminimumSize() ); // Show UI and calculate video widget frame show(); @@ -126,10 +126,10 @@ SimpleUI::~SimpleUI() void SimpleUI::setupActions() { - KStdAction::open( napp, TQT_SLOT(fileOpen()), actionCollection(), "_file_open" ); - new KAction( i18n("&Properties"), 0, propertiesDialog, TQT_SLOT(show()), + KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" ); + new KAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()), actionCollection(), "_file_properties" ); - KStdAction::quit( napp, TQT_SLOT(quit()), actionCollection(), "_file_quit"); + KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit"); NoatunStdAction::playlist( actionCollection(), "view_playlist" ); actionCollection()->insert(video->action( "half_size" )); @@ -139,14 +139,14 @@ void SimpleUI::setupActions() actionCollection()->insert(napp->pluginActionMenu()); - menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), + menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()), actionCollection()); - statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()), + statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection()); NoatunStdAction::effects( actionCollection(), "effects" ); NoatunStdAction::equalizer( actionCollection(), "equalizer" ); NoatunStdAction::loop( actionCollection(), "loop_style" ); - KStdAction::preferences( napp, TQT_SLOT(preferences()), actionCollection() ); + KStdAction::preferences( TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection() ); } void SimpleUI::showMenubar() @@ -173,7 +173,7 @@ void SimpleUI::setupCentralWidget() npWidget->setSpacing( 0 ); positionLabel = new TQLabel( statusBar() ); - positionLabel->setAlignment( AlignVCenter | AlignCenter ); + positionLabel->tqsetAlignment( AlignVCenter | AlignCenter ); positionLabel->setFixedSize( fontMetrics().size( 0, " 00:00/00:00 " ) ); statusBar()->addWidget( positionLabel, 0, true ); @@ -214,7 +214,7 @@ void SimpleUI::setupCentralWidget() TQToolTip::add( forwButton, i18n("Forward") ); connect( forwButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) ); - slider = new L33tSlider( 0, 1000, 10, 0, L33tSlider::Horizontal, ctlFrame ); + slider = new L33tSlider( 0, 1000, 10, 0, Qt::Horizontal, ctlFrame ); slider->setFixedHeight( 24 ); slider->setMinimumWidth( 100 ); slider->setTickmarks( TQSlider::NoMarks ); @@ -238,15 +238,15 @@ void SimpleUI::setupCentralWidget() volumeLabel = new TQLabel( volumeFrame ); volumeLabel->setText( "100%" ); - volumeLabel->setAlignment( AlignCenter ); - volumeLabel->setFixedSize( volumeLabel->sizeHint() ); + volumeLabel->tqsetAlignment( AlignCenter ); + volumeLabel->setFixedSize( volumeLabel->tqsizeHint() ); TQHBox *volumeSubFrame = new TQHBox( volumeFrame ); - volumeSlider = new L33tSlider( 0, 100, 10, 0, Vertical, volumeSubFrame ); + volumeSlider = new L33tSlider( 0, 100, 10, 0,Qt::Vertical, volumeSubFrame ); volumeSlider->setValue( 100 - napp->player()->volume() ); - volumeSlider->setFixedSize( volumeSlider->sizeHint() ); + volumeSlider->setFixedSize( volumeSlider->tqsizeHint() ); - volumeFrame->resize( volumeFrame->sizeHint() ); + volumeFrame->resize( volumeFrame->tqsizeHint() ); connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) ); @@ -254,7 +254,7 @@ void SimpleUI::setupCentralWidget() setCentralWidget( npWidget ); - video->setMinimumSize( minimumSizeHint().width(), 1 ); + video->setMinimumSize( tqminimumSizeHint().width(), 1 ); // Create properties dialog propertiesDialog = new PropertiesDialog( this ); diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h index e3a84f84..251471ee 100644 --- a/noatun/modules/simple/userinterface.h +++ b/noatun/modules/simple/userinterface.h @@ -28,6 +28,7 @@ class SimpleUI : public KMainWindow, public UserInterface { Q_OBJECT + TQ_OBJECT public: SimpleUI(); -- cgit v1.2.1