summaryrefslogtreecommitdiffstats
path: root/noatun/modules/simple/userinterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/modules/simple/userinterface.cpp')
-rw-r--r--noatun/modules/simple/userinterface.cpp60
1 files changed, 30 insertions, 30 deletions
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index c600338d..72edda51 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -63,14 +63,14 @@ SimpleUI::SimpleUI()
setupGUI( StatusBar|Create, "simpleui.rc" );
- connect( napp->player(), TQT_SIGNAL(playing()), TQT_SLOT(slotPlaying()) );
- connect( napp->player(), TQT_SIGNAL(stopped()), TQT_SLOT(slotStopped()) );
- connect( napp->player(), TQT_SIGNAL(paused()), TQT_SLOT(slotPaused()) );
- connect( napp->player(), TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) );
- connect( napp->player(), TQT_SIGNAL(newSong()), TQT_SLOT(slotChanged()) );
- connect( napp->player(), TQT_SIGNAL(volumeChanged(int)), TQT_SLOT(slotVolumeChanged(int)) );
- connect( napp, TQT_SIGNAL(hideYourself()), TQT_SLOT(hide()) );
- connect( napp, TQT_SIGNAL(showYourself()), TQT_SLOT(show()) );
+ connect( napp->player(), TQ_SIGNAL(playing()), TQ_SLOT(slotPlaying()) );
+ connect( napp->player(), TQ_SIGNAL(stopped()), TQ_SLOT(slotStopped()) );
+ connect( napp->player(), TQ_SIGNAL(paused()), TQ_SLOT(slotPaused()) );
+ connect( napp->player(), TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) );
+ connect( napp->player(), TQ_SIGNAL(newSong()), TQ_SLOT(slotChanged()) );
+ connect( napp->player(), TQ_SIGNAL(volumeChanged(int)), TQ_SLOT(slotVolumeChanged(int)) );
+ connect( napp, TQ_SIGNAL(hideYourself()), TQ_SLOT(hide()) );
+ connect( napp, TQ_SIGNAL(showYourself()), TQ_SLOT(show()) );
napp->player()->handleButtons();
@@ -126,10 +126,10 @@ SimpleUI::~SimpleUI()
void SimpleUI::setupActions()
{
- KStdAction::open( TQT_TQOBJECT(napp), TQT_SLOT(fileOpen()), actionCollection(), "_file_open" );
- new TDEAction( i18n("&Properties"), 0, TQT_TQOBJECT(propertiesDialog), TQT_SLOT(show()),
+ KStdAction::open( napp, TQ_SLOT(fileOpen()), actionCollection(), "_file_open" );
+ new TDEAction( i18n("&Properties"), 0, propertiesDialog, TQ_SLOT(show()),
actionCollection(), "_file_properties" );
- KStdAction::quit( TQT_TQOBJECT(napp), TQT_SLOT(quit()), actionCollection(), "_file_quit");
+ KStdAction::quit( napp, TQ_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(TQT_TQOBJECT(this), TQT_SLOT(showMenubar()),
+ menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()),
actionCollection());
- statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()),
+ statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(showStatusbar()),
actionCollection());
NoatunStdAction::effects( actionCollection(), "effects" );
NoatunStdAction::equalizer( actionCollection(), "equalizer" );
NoatunStdAction::loop( actionCollection(), "loop_style" );
- KStdAction::preferences( TQT_TQOBJECT(napp), TQT_SLOT(preferences()), actionCollection() );
+ KStdAction::preferences( napp, TQ_SLOT(preferences()), actionCollection() );
}
void SimpleUI::showMenubar()
@@ -178,10 +178,10 @@ void SimpleUI::setupCentralWidget()
statusBar()->addWidget( positionLabel, 0, true );
video = new VideoFrame( npWidget );
- connect( video, TQT_SIGNAL(adaptSize(int,int)),
- TQT_SLOT(slotAdaptSize(int,int)) );
- connect( video, TQT_SIGNAL(rightButtonPressed(const TQPoint &)),
- TQT_SLOT(slotContextMenu(const TQPoint &)) );
+ connect( video, TQ_SIGNAL(adaptSize(int,int)),
+ TQ_SLOT(slotAdaptSize(int,int)) );
+ connect( video, TQ_SIGNAL(rightButtonPressed(const TQPoint &)),
+ TQ_SLOT(slotContextMenu(const TQPoint &)) );
TQHBox *ctlFrame = new TQHBox( npWidget );
ctlFrame->setFixedHeight( 38 );
@@ -194,38 +194,38 @@ void SimpleUI::setupCentralWidget()
backButton->setFixedSize( 24, 24 );
backButton->setPixmap( TQPixmap( back_xpm ) );
TQToolTip::add( backButton, i18n("Back") );
- connect( backButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(back()) );
+ connect( backButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(back()) );
stopButton = new TQPushButton( ctlFrame );
stopButton->setFixedSize( 24, 24 );
stopButton->setPixmap( TQPixmap( stop_xpm ) );
TQToolTip::add( stopButton, i18n("Stop") );
- connect( stopButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(stop()) );
+ connect( stopButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(stop()) );
playButton = new TQPushButton( ctlFrame );
playButton->setFixedSize( 24, 24 );
playButton->setPixmap( TQPixmap( play_xpm ) );
TQToolTip::add( playButton, i18n("Play / Pause") );
- connect( playButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(playpause()) );
+ connect( playButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(playpause()) );
TQPushButton *forwButton = new TQPushButton( ctlFrame );
forwButton->setFixedSize( 24, 24 );
forwButton->setPixmap( TQPixmap( forward_xpm ) );
TQToolTip::add( forwButton, i18n("Forward") );
- connect( forwButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(forward()) );
+ connect( forwButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(forward()) );
- slider = new L33tSlider( 0, 1000, 10, 0, Qt::Horizontal, ctlFrame );
+ slider = new L33tSlider( 0, 1000, 10, 0, TQt::Horizontal, ctlFrame );
slider->setFixedHeight( 24 );
slider->setMinimumWidth( 100 );
slider->setTickmarks( TQSlider::NoMarks );
- connect( slider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotSkipTo(int)) );
- connect( slider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotSliderMoved(int)) );
+ connect( slider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotSkipTo(int)) );
+ connect( slider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(slotSliderMoved(int)) );
TQPushButton *playlistButton = new TQPushButton( ctlFrame );
playlistButton->setFixedSize( 24, 24 );
playlistButton->setPixmap( TQPixmap( playlist_xpm ) );
TQToolTip::add( playlistButton, i18n("Playlist") );
- connect( playlistButton, TQT_SIGNAL(clicked()), napp->player(), TQT_SLOT(toggleListView()) );
+ connect( playlistButton, TQ_SIGNAL(clicked()), napp->player(), TQ_SLOT(toggleListView()) );
volumeButton = new TQPushButton( ctlFrame );
volumeButton->setFixedSize( 24, 24 );
@@ -242,15 +242,15 @@ void SimpleUI::setupCentralWidget()
volumeLabel->setFixedSize( volumeLabel->sizeHint() );
TQHBox *volumeSubFrame = new TQHBox( volumeFrame );
- volumeSlider = new L33tSlider( 0, 100, 10, 0,Qt::Vertical, volumeSubFrame );
+ volumeSlider = new L33tSlider( 0, 100, 10, 0,TQt::Vertical, volumeSubFrame );
volumeSlider->setValue( 100 - napp->player()->volume() );
volumeSlider->setFixedSize( volumeSlider->sizeHint() );
volumeFrame->resize( volumeFrame->sizeHint() );
- connect( volumeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
- connect( volumeSlider, TQT_SIGNAL(userChanged(int)), TQT_SLOT(slotVolumeSliderMoved(int)) );
- connect( volumeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotVolumeFrame()) );
+ connect( volumeSlider, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(slotVolumeSliderMoved(int)) );
+ connect( volumeSlider, TQ_SIGNAL(userChanged(int)), TQ_SLOT(slotVolumeSliderMoved(int)) );
+ connect( volumeButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotVolumeFrame()) );
setCentralWidget( npWidget );