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 --- kscd/ChangeLog | 4 +- kscd/TODO | 2 +- kscd/bwlednum.cpp | 68 ++++++++++----------- kscd/bwlednum.h | 7 ++- kscd/cddbdlg.cpp | 6 +- kscd/cddbdlg.h | 3 +- kscd/configWidget.cpp | 10 ++-- kscd/configWidget.h | 3 +- kscd/configWidgetUI.ui | 54 ++++++++--------- kscd/docking.cpp | 20 +++---- kscd/docking.h | 3 +- kscd/kcompactdisc.cpp | 44 +++++++------- kscd/kcompactdisc.h | 21 +++---- kscd/kscd.cpp | 132 ++++++++++++++++++++--------------------- kscd/kscd.h | 9 +-- kscd/kscdmagic/README | 6 +- kscd/kscdmagic/syna.h | 2 +- kscd/kscdmagic/xlib.c | 10 ++-- kscd/kscdmagic/xlib.h | 6 +- kscd/ledlamp.cpp | 2 +- kscd/ledlamp.h | 9 +-- kscd/libwm/audio/audio_sun.c | 14 ++--- kscd/libwm/cddaslave.c | 2 +- kscd/libwm/cdtext.c | 18 +++--- kscd/libwm/database.c | 2 +- kscd/libwm/include/wm_cdtext.h | 2 +- kscd/libwm/include/wm_scsi.h | 2 +- kscd/libwm/plat_hpux.c | 2 +- kscd/libwm/plat_linux.c | 2 +- kscd/libwm/plat_linux_audio.c | 14 ++--- kscd/libwm/plat_news.c | 4 +- kscd/libwm/plat_sun.c | 4 +- kscd/libwm/plat_sun_audio.c | 14 ++--- kscd/libwm/plat_svr4.c | 2 +- kscd/libwm/scsi.c | 44 +++++++------- kscd/panel.ui | 82 ++++++++++++------------- 36 files changed, 318 insertions(+), 311 deletions(-) (limited to 'kscd') diff --git a/kscd/ChangeLog b/kscd/ChangeLog index 24eeb3ee..ab561f86 100644 --- a/kscd/ChangeLog +++ b/kscd/ChangeLog @@ -148,7 +148,7 @@ Tue Jan 18 17:27:26 2000 Dirk F * Added automatic storing of CDDB records downloaded from CDDB server to local harddrive. - * Fixed bug with routine connecting signals, over and over again, + * Fixed bug with routine connecting Q_SIGNALS, over and over again, causing routines to be called too many time, annoying CDDB server admins. Happens when a new CDDB (remote) request was issued. @@ -225,7 +225,7 @@ Fri May 15 18:28:40 1998 Bernd Johannes Wuebben Tue Apr 14 05:17:36 1998 Bernd Johannes Wuebben - * layout corrections for kscd magic dialog + * tqlayout corrections for kscd magic dialog Sat Jan 17 21:36:27 1998 Bernd Johannes Wuebben diff --git a/kscd/TODO b/kscd/TODO index e10c01c8..2851ae13 100644 --- a/kscd/TODO +++ b/kscd/TODO @@ -6,4 +6,4 @@ AJS: o fix eject button o don't show "no disc" error on startup o direct digital playback -o better GUI layout for LCD panel +o better GUI tqlayout for LCD panel diff --git a/kscd/bwlednum.cpp b/kscd/bwlednum.cpp index 4bfb16b6..fdc2beba 100644 --- a/kscd/bwlednum.cpp +++ b/kscd/bwlednum.cpp @@ -36,8 +36,8 @@ static char segs[14][8] = {25, 0, 0, 0, 0, 0, 0, 0} }; // blank -BW_LED_Number::BW_LED_Number( TQWidget *parent, const char *name ) - : TQFrame( parent, name ){ +BW_LED_Number::BW_LED_Number( TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name ){ offcolor = TQColor(100,0,0); @@ -84,7 +84,7 @@ void BW_LED_Number::setLEDColor( const TQColor& fgColor, const TQColor& bgColor fgcolor = fgColor; bgcolor = bgColor; - TQColorGroup old_cg = this->colorGroup(); + TQColorGroup old_cg = this->tqcolorGroup(); TQColorGroup new_cg( fgColor, bgColor, @@ -168,9 +168,9 @@ void BW_LED_Number::setSmallLED(bool a_boolean){ } -void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ +void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool tqrepaint ){ - // printf("drawSymbol repaint = %d\n",repaint); + // printf("drawSymbol tqrepaint = %d\n",tqrepaint); TQPoint pos; @@ -194,7 +194,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ pos = TQPoint( Xoffset , Yoffset ); - if(repaint){ + if(tqrepaint){ // this draw the non-illumintated segments @@ -222,7 +222,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ } } } - else{ // we are not repainting ourselves due to a repaint event but rather + else{ // we are not tqrepainting ourselves due to a tqrepaint event but rather // genuinely changing the symbol that is to be displayed for(int l = 0; l <= NUM_OF_SEGMENTS -1; l++){ @@ -277,7 +277,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter TQPoint pt = pos; - TQColorGroup g = colorGroup(); + TQColorGroup g = tqcolorGroup(); TQColor lightColor,darkColor; if ( erase ){ @@ -297,7 +297,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter TQPointArray pts; - pt.ry() += (QCOORD)Width/2; + pt.ry() += (TQCOORD)Width/2; if (erase){ @@ -355,7 +355,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter p.setPen(g.light()); break; case 2 : - pt.rx() += (QCOORD)(Segment_Length); + pt.rx() += (TQCOORD)(Segment_Length); if (erase) @@ -382,7 +382,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 3 : - pt.ry() += (QCOORD)Segment_Length; + pt.ry() += (TQCOORD)Segment_Length; p.setPen(g.background()); @@ -402,7 +402,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 4 : - pt.ry() += (QCOORD)(Segment_Length +1); + pt.ry() += (TQCOORD)(Segment_Length +1); p.fillRect(pt.x(), pt.y(), Width , Segment_Length - Width - Width/2 ,brush); if (erase) p.setPen(offcolor); @@ -421,8 +421,8 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 5 : - pt.rx() += (QCOORD)(Segment_Length ); - pt.ry() += (QCOORD)(Segment_Length +1); + pt.rx() += (TQCOORD)(Segment_Length ); + pt.ry() += (TQCOORD)(Segment_Length +1); p.fillRect(pt.x() - Width +1 ,pt.y(), Width , Segment_Length - Width - Width/2 ,brush); @@ -446,7 +446,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 6 : - pt.ry() += (QCOORD)(Segment_Length*2 ); + pt.ry() += (TQCOORD)(Segment_Length*2 ); p.fillRect(pt.x() + Width ,pt.y() -Width , Segment_Length -2* Width , Width ,brush); @@ -471,13 +471,13 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 7 : - pt.rx() += (QCOORD)(Segment_Length/2); - pt.ry() += (QCOORD)(Segment_Length*2); + pt.rx() += (TQCOORD)(Segment_Length/2); + pt.ry() += (TQCOORD)(Segment_Length*2); p.fillRect(pt.x() ,pt.y() - Width , Width , Width ,brush); break; case 8 : - pt.ry() += (QCOORD)(Segment_Length/2 + Width/2); - pt.rx() += (QCOORD)(Segment_Length/2 - Width/2 + 1); + pt.ry() += (TQCOORD)(Segment_Length/2 + Width/2); + pt.rx() += (TQCOORD)(Segment_Length/2 - Width/2 + 1); if (!show_off_colon && erase) { p.setBrush(bgcolor); @@ -494,8 +494,8 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 9 : - pt.ry() += (QCOORD)(3*Segment_Length/2 + Width/2); - pt.rx() += (QCOORD)(Segment_Length/2 - Width/2 + 1); + pt.ry() += (TQCOORD)(3*Segment_Length/2 + Width/2); + pt.rx() += (TQCOORD)(Segment_Length/2 - Width/2 + 1); if (!show_off_colon && erase) { p.setBrush(bgcolor); @@ -514,7 +514,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter else{ - pt.ry() += (QCOORD)Width/2; + pt.ry() += (TQCOORD)Width/2; switch ( seg_number ) { case 0 : @@ -524,37 +524,37 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter p.fillRect(pt.x()+Width,pt.y()- Width , Segment_Length -2* Width, Width ,brush); break; case 2 : - pt.rx() += (QCOORD)(Segment_Length); + pt.rx() += (TQCOORD)(Segment_Length); p.fillRect(pt.x()-Width,pt.y()+ Width/2, Width , Segment_Length - Width -Width/2 ,brush); break; case 3 : - pt.ry() += (QCOORD)Segment_Length; + pt.ry() += (TQCOORD)Segment_Length; p.fillRect(pt.x() + Width ,pt.y() - Width, Segment_Length- 2* Width, Width ,brush); break; case 4 : - pt.ry() += (QCOORD)(Segment_Length ); + pt.ry() += (TQCOORD)(Segment_Length ); p.fillRect(pt.x(), pt.y(), Width , Segment_Length - Width - Width/2 ,brush); break; case 5 : - pt.rx() += (QCOORD)(Segment_Length ); - pt.ry() += (QCOORD)(Segment_Length ); + pt.rx() += (TQCOORD)(Segment_Length ); + pt.ry() += (TQCOORD)(Segment_Length ); p.fillRect(pt.x() - Width ,pt.y(), Width , Segment_Length - Width - Width/2 ,brush); break; case 6 : - pt.ry() += (QCOORD)(Segment_Length*2); + pt.ry() += (TQCOORD)(Segment_Length*2); p.fillRect(pt.x() + Width ,pt.y() -Width , Segment_Length -2* Width , Width ,brush); break; case 7 : - pt.rx() += (QCOORD)(Segment_Length/2); - pt.ry() += (QCOORD)(Segment_Length*2); + pt.rx() += (TQCOORD)(Segment_Length/2); + pt.ry() += (TQCOORD)(Segment_Length*2); p.fillRect(pt.x() ,pt.y() - Width , Width , Width ,brush); break; case 8 : - pt.ry() += (QCOORD)(Segment_Length/2 + Width/2); - pt.rx() += (QCOORD)(Segment_Length/2 - Width/2 + 1); + pt.ry() += (TQCOORD)(Segment_Length/2 + Width/2); + pt.rx() += (TQCOORD)(Segment_Length/2 - Width/2 + 1); if (!show_off_colon && erase) { p.setBrush(bgcolor); brush.setColor(bgcolor); @@ -569,8 +569,8 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter break; case 9 : - pt.ry() += (QCOORD)(3*Segment_Length/2 + Width/2); - pt.rx() += (QCOORD)(Segment_Length/2 - Width/2 + 1); + pt.ry() += (TQCOORD)(3*Segment_Length/2 + Width/2); + pt.rx() += (TQCOORD)(Segment_Length/2 - Width/2 + 1); if (!show_off_colon && erase) { p.setBrush(bgcolor); diff --git a/kscd/bwlednum.h b/kscd/bwlednum.h index 5652832f..76bc10a8 100644 --- a/kscd/bwlednum.h +++ b/kscd/bwlednum.h @@ -17,13 +17,14 @@ #include "tqbitarray.h" -class BW_LED_Number : public QFrame +class BW_LED_Number : public TQFrame { Q_OBJECT + TQ_OBJECT public: - BW_LED_Number( TQWidget *parent=0, const char *name=0 ); + BW_LED_Number( TQWidget *tqparent=0, const char *name=0 ); ~BW_LED_Number(); void setSmallLED(bool ); // if you LED is small it might look better @@ -67,7 +68,7 @@ private: bool seg_contained_in( char c, char* seg); void drawSegment( const TQPoint &, char, TQPainter &, int, bool = FALSE ); - void drawSymbol( TQPainter *p,char s ,bool repaint); + void drawSymbol( TQPainter *p,char s ,bool tqrepaint); char* old_segments; char* current_segments; diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp index e574ba92..13efb8b7 100644 --- a/kscd/cddbdlg.cpp +++ b/kscd/cddbdlg.cpp @@ -33,8 +33,8 @@ struct mytoc unsigned absframe; }; -CDDBDlg::CDDBDlg( TQWidget* parent, const char* name ) - : KDialogBase( parent, name, false, i18n( "CD Editor" ), +CDDBDlg::CDDBDlg( TQWidget* tqparent, const char* name ) + : KDialogBase( tqparent, name, false, i18n( "CD Editor" ), Ok|Cancel|User1|User2, Ok, true ) { KGlobal::locale()->insertCatalogue("libkcddb"); @@ -90,7 +90,7 @@ void CDDBDlg::submitFinished(KCDDB::CDDB::Result r) else { TQString str = i18n("Error sending record.\n\n%1") - .arg(KCDDB::CDDB::resultToString(r)); + .tqarg(KCDDB::CDDB::resultToString(r)); KMessageBox::error(this, str, i18n("Record Submission")); } } // submitFinished() diff --git a/kscd/cddbdlg.h b/kscd/cddbdlg.h index b8f3c90a..cee86052 100644 --- a/kscd/cddbdlg.h +++ b/kscd/cddbdlg.h @@ -12,9 +12,10 @@ class CDInfoDialogBase; class CDDBDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CDDBDlg(TQWidget* parent, const char* name = 0); + CDDBDlg(TQWidget* tqparent, const char* name = 0); ~CDDBDlg(); void setData( diff --git a/kscd/configWidget.cpp b/kscd/configWidget.cpp index bae787e9..4d8e03fb 100644 --- a/kscd/configWidget.cpp +++ b/kscd/configWidget.cpp @@ -45,8 +45,8 @@ extern "C" { class SpecialComboBox : public KComboBox { public: - SpecialComboBox(TQWidget* parent, const char* name) - : KComboBox(parent, name) + SpecialComboBox(TQWidget* tqparent, const char* name) + : KComboBox(tqparent, name) {} // TQComboBox::setCurrentText replaces the current text if @@ -59,14 +59,14 @@ public: } ; /* - * Constructs a configWidget which is a child of 'parent', with the + * Constructs a configWidget which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -configWidget::configWidget(KSCD* player, TQWidget* parent, const char* name) - : configWidgetUI(parent, name), +configWidget::configWidget(KSCD* player, TQWidget* tqparent, const char* name) + : configWidgetUI(tqparent, name), mPlayer(player) { if (!name) diff --git a/kscd/configWidget.h b/kscd/configWidget.h index 7269ca42..5072d930 100644 --- a/kscd/configWidget.h +++ b/kscd/configWidget.h @@ -31,9 +31,10 @@ class SpecialComboBox; class configWidget : public configWidgetUI { Q_OBJECT + TQ_OBJECT public: - configWidget(KSCD* player, TQWidget* parent = 0, const char* name = 0); + configWidget(KSCD* player, TQWidget* tqparent = 0, const char* name = 0); ~configWidget(); protected: diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui index 83f9aca0..6cf302cc 100644 --- a/kscd/configWidgetUI.ui +++ b/kscd/configWidgetUI.ui @@ -1,13 +1,13 @@ configWidgetUI - + configWidgetUI true - + 0 0 @@ -19,7 +19,7 @@ unnamed - + groupBox1 @@ -30,7 +30,7 @@ unnamed - + textLabel2 @@ -52,7 +52,7 @@ The background color that will be used for the LCD display. - + kcfg_Docking @@ -63,7 +63,7 @@ When this option is selected an icon will appear in the system tray. Note that KsCD will <i>not</i> quit when the window is closed if a system tray icon is displayed. You may quit KsCD by clicking the Quit button or right-clicking on the system tray icon and selecting the appropriate entry. - + kcfg_TrackAnnouncement @@ -84,14 +84,14 @@ Expanding - + 292 20 - + textLabel1 @@ -123,7 +123,7 @@ - + textLabel1_2 @@ -136,7 +136,7 @@ - + buttonGroup1 @@ -167,7 +167,7 @@ This option controls the number of seconds KsCD will skip when the skip forwards or backwards buttons are pressed. - + textLabel3 @@ -178,7 +178,7 @@ kcfg_SkipDelta - + kcfg_Autoplay @@ -189,7 +189,7 @@ When this option is selected the CD will start playing automatically upon being inserted into the CD-ROM. - + kcfg_EjectOnFinish @@ -200,7 +200,7 @@ When this option is selected the CD will automatically eject when it is finished. - + kcfg_StopExit @@ -221,7 +221,7 @@ Expanding - + 171 81 @@ -230,7 +230,7 @@ - + groupBox3 @@ -249,7 +249,7 @@ The CD-ROM device to use when playing CDs. This will typically look something like "/dev/cdrom". To have KsCD autodetect your CD-ROM, leave this field empty. - + textLabel5 @@ -260,7 +260,7 @@ kcfg_AudioDevice - + kcfg_DigitalPlayback @@ -277,7 +277,7 @@ When this option is selected KsCD will attempt to play the CD using direct digital playback. This option is useful if the CD-ROM is not connected directly to the sound output on the computer. Note that digital playback consumes more system resources than the normal method of playback. - + textLabel4 @@ -293,7 +293,7 @@ kcfg_AudioDevice - + audioSystemFrame @@ -306,7 +306,7 @@ - + groupBox9 @@ -317,7 +317,7 @@ unnamed - + kcfg_SelectEncoding @@ -328,7 +328,7 @@ When this option is selected, you have the ability to select encoding for the results of a CDDB request. The standard describes CDDB results as being strictly Latin1. This is not true, as non-English speaking users often use other 8-bit encodings. - + AUTO @@ -401,7 +401,7 @@ Expanding - + 20 45 @@ -445,11 +445,11 @@ kcfg_DigitalPlayback kcfg_AudioDevice - + kcfg_DigitalPlayback_toggled( bool ) kcfg_SelectEncoding_toggled(bool) - - + + kcolorbutton.h kfontrequester.h diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 705c2ca8..ca85b914 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -38,13 +38,13 @@ #include -DockWidget::DockWidget( KSCD* parent, const char *name) - : KSystemTray( parent, name ) +DockWidget::DockWidget( KSCD* tqparent, const char *name) + : KSystemTray( tqparent, name ) { m_popup = 0; setPixmap( loadIcon("cdsmall") ); - KActionCollection* actionCollection = parent->actionCollection(); + KActionCollection* actionCollection = tqparent->actionCollection(); m_backAction = actionCollection->action("Previous"); m_forwardAction = actionCollection->action("Next"); m_backPix = loadIcon("player_start"); @@ -53,11 +53,11 @@ DockWidget::DockWidget( KSCD* parent, const char *name) // popup menu for right mouse button TQPopupMenu* popup = contextMenu(); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, TQT_SLOT(playClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, TQT_SLOT(stopClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, TQT_SLOT(nextClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, TQT_SLOT(prevClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, TQT_SLOT(ejectClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), tqparent, TQT_SLOT(playClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), tqparent, TQT_SLOT(stopClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), tqparent, TQT_SLOT(nextClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), tqparent, TQT_SLOT(prevClicked())); + popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), tqparent, TQT_SLOT(ejectClicked())); TQToolTip::add(this, kapp->aboutData()->programName()); } @@ -120,10 +120,10 @@ void DockWidget::setToolTip(const TQString& text) void DockWidget::wheelEvent(TQWheelEvent *e) { - if (e->orientation() == Horizontal) + if (e->orientation() ==Qt::Horizontal) return; - KSCD* kscd = dynamic_cast(parent()); + KSCD* kscd = dynamic_cast(tqparent()); if (kscd == 0) return; diff --git a/kscd/docking.h b/kscd/docking.h index 52fceebd..2ffc431a 100644 --- a/kscd/docking.h +++ b/kscd/docking.h @@ -46,9 +46,10 @@ class KPassivePopup; class DockWidget : public KSystemTray { Q_OBJECT + TQ_OBJECT public: - DockWidget( KSCD* parent, const char *name=0); + DockWidget( KSCD* tqparent, const char *name=0); ~DockWidget(); public slots: diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp index c412a932..83a9c532 100644 --- a/kscd/kcompactdisc.cpp +++ b/kscd/kcompactdisc.cpp @@ -98,13 +98,13 @@ const TQString KCompactDisc::defaultDevice = DEFAULT_CD_DEVICE; const unsigned KCompactDisc::missingDisc = (unsigned)-1; KCompactDisc::KCompactDisc(InformationMode infoMode) : - m_device(TQString::null), + m_device(TQString()), m_status(0), - m_previousStatus(123456), + m_previoustqStatus(123456), m_discId(missingDisc), m_previousDiscId(0), - m_artist(TQString::null), - m_title(TQString::null), + m_artist(TQString()), + m_title(TQString()), m_track(0), m_previousTrack(99999999), m_infoMode(infoMode) @@ -143,7 +143,7 @@ unsigned KCompactDisc::discPosition() const return cur_pos_abs * 1000 - FRAMES_TO_MS(m_trackStartFrames[0]); } -TQString KCompactDisc::discStatus(int status) +TQString KCompactDisc::disctqStatus(int status) { TQString message; @@ -280,14 +280,14 @@ bool KCompactDisc::setDevice( kdDebug() << "Device change: " << (digitalPlayback ? "WM_CDDA, " : "WM_CDIN, ") << m_device << ", " - << (digitalPlayback ? audioSystem : TQString::null) << ", " - << (digitalPlayback ? audioDevice : TQString::null) << ", status: " - << discStatus(status) << endl; + << (digitalPlayback ? audioSystem : TQString()) << ", " + << (digitalPlayback ? audioDevice : TQString()) << ", status: " + << disctqStatus(status) << endl; if (status < 0) { // Severe (OS-level) error. - m_device = TQString::null; + m_device = TQString(); } else { @@ -295,19 +295,19 @@ bool KCompactDisc::setDevice( setVolume(volume); } - m_previousStatus = m_status = wm_cd_status(); + m_previoustqStatus = m_status = wm_cd_status(); if (m_infoMode == Asynchronous) timerExpired(); else timer.start(1000, true); - return m_device != TQString::null; + return m_device != TQString(); } void KCompactDisc::setVolume(unsigned volume) { int status = wm_cd_volume(volume, WM_BALANCE_SYMMETRED); - kdDebug() << "Volume change: " << volume << ", status: " << discStatus(status) << endl; + kdDebug() << "Volume change: " << volume << ", status: " << disctqStatus(status) << endl; } void KCompactDisc::stop() @@ -323,7 +323,7 @@ const TQString &KCompactDisc::trackArtist() const const TQString &KCompactDisc::trackArtist(unsigned track) const { if (NO_DISC || !TRACK_VALID(track)) - return TQString::null; + return TQString(); return m_trackArtists[track - 1]; } @@ -357,7 +357,7 @@ const TQString &KCompactDisc::trackTitle() const const TQString &KCompactDisc::trackTitle(unsigned track) const { if (NO_DISC || !TRACK_VALID(track)) - return TQString::null; + return TQString(); return m_trackTitles[track - 1]; } @@ -378,11 +378,11 @@ void KCompactDisc::timerExpired() { m_status = wm_cd_status(); - if (WM_CDS_NO_DISC(m_status) || (m_device == TQString::null)) + if (WM_CDS_NO_DISC(m_status) || (m_device == TQString())) { - if (m_previousStatus != m_status) + if (m_previoustqStatus != m_status) { - m_previousStatus = m_status; + m_previoustqStatus = m_status; m_discId = missingDisc; m_previousDiscId = 0; m_trackArtists.clear(); @@ -428,7 +428,7 @@ void KCompactDisc::timerExpired() else { m_trackArtists.append(i18n("Unknown Artist")); - m_trackTitles.append(i18n("Track %1").arg(TQString::number(i).rightJustify(2, '0'))); + m_trackTitles.append(i18n("Track %1").tqarg(TQString::number(i).rightJustify(2, '0'))); } // FIXME: KDE4 // track.length = cd->trk[i - 1].length; @@ -450,12 +450,12 @@ void KCompactDisc::timerExpired() } if (isPlaying()) { - m_previousStatus = m_status; + m_previoustqStatus = m_status; // Update the current playing position. emit trackPlaying(m_track, trackPosition()); } else - if (m_previousStatus != m_status) + if (m_previoustqStatus != m_status) { // If we are not playing, then we are either paused, or stopped. switch (m_status) @@ -467,7 +467,7 @@ void KCompactDisc::timerExpired() emit trayOpening(); break; default: - if (m_previousStatus == WM_CDM_PLAYING || m_previousStatus == WM_CDM_PAUSED + if (m_previoustqStatus == WM_CDM_PLAYING || m_previoustqStatus == WM_CDM_PAUSED && m_status == WM_CDM_STOPPED) { emit discStopped(); @@ -475,7 +475,7 @@ void KCompactDisc::timerExpired() break; } - m_previousStatus = m_status; + m_previoustqStatus = m_status; } } diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h index f71189a8..10d5eabb 100644 --- a/kscd/kcompactdisc.h +++ b/kscd/kcompactdisc.h @@ -34,7 +34,7 @@ * @see #discChanged(): A disc was inserted or removed. * @see #trayOpening(): A disc is being removed. * - * The progress of playout is modelled by these signals: + * The progress of ptqlayout is modelled by these signals: * * @see #trackPlaying(): A track started playing, or is still playing. * @see #trackPaused(): A track was paused. @@ -44,9 +44,10 @@ * positive numbers; zero is not a valid track number. */ class KCompactDisc : - public QObject + public TQObject { Q_OBJECT + TQ_OBJECT public: enum InformationMode { @@ -63,12 +64,12 @@ public: void eject(); /** - * Start playout at given position of track. + * Start ptqlayout at given position of track. */ void play(unsigned startTrack = 0, unsigned startTrackPosition = 0, unsigned endTrack = 0); /** - * Pause/resume playout. + * Pause/resume ptqlayout. */ void pause(); @@ -89,13 +90,13 @@ public: const TQString &device = defaultDevice, unsigned volume = 50, bool digitalPlayback = true, - const TQString &audioSystem = TQString::null, - const TQString &audioDevice = TQString::null); + const TQString &audioSystem = TQString(), + const TQString &audioDevice = TQString()); void setVolume(unsigned volume); /** - * Stop playout. + * Stop ptqlayout. */ void stop(); @@ -280,7 +281,7 @@ private: TQTimer timer; TQString m_device; int m_status; - int m_previousStatus; + int m_previoustqStatus; unsigned m_discId; unsigned m_previousDiscId; TQString m_artist; @@ -291,8 +292,8 @@ private: TQStringList m_trackTitles; unsigned m_track; unsigned m_previousTrack; - void checkDeviceStatus(); - TQString discStatus(int status); + void checkDevicetqStatus(); + TQString disctqStatus(int status); class KCompactDiscPrivate *d; InformationMode m_infoMode; diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index bb2b0ae5..ef944999 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -89,9 +89,9 @@ bool stoppedByUser = false; The GUI part *****************************************************************************/ -KSCD::KSCD( TQWidget *parent, const char *name ) +KSCD::KSCD( TQWidget *tqparent, const char *name ) : DCOPObject("CDPlayer"), - kscdPanelDlg( parent, name, Qt::WDestructiveClose ), + kscdPanelDlg( tqparent, name, TQt::WDestructiveClose ), configDialog(0L), cddialog(0L), //!!!! jumpToTrack(0L), @@ -103,7 +103,7 @@ KSCD::KSCD( TQWidget *parent, const char *name ) random_current = random_list.begin(); cddb = new KCDDB::Client(); - connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result))); + connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), TQT_TQOBJECT(this), TQT_SLOT(lookupCDDBDone(CDDB::Result))); #if defined(BUILD_CDDA) audio_systems_list @@ -139,11 +139,11 @@ KSCD::KSCD( TQWidget *parent, const char *name ) /* FIXME check for return value */ setDevicePaths(/*Prefs::cdDevice(), Prefs::audioSystem(), Prefs::audioDevice()*/); - connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned))); - connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), this, TQT_SLOT(trackUpdate(unsigned, unsigned))); - connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), this, TQT_SLOT(trackChanged(unsigned, unsigned))); - connect(m_cd, TQT_SIGNAL(discStopped()), this, TQT_SLOT(discStopped())); - connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), this, TQT_SLOT(discChanged(unsigned))); + connect(m_cd, TQT_SIGNAL(trackPlaying(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned))); + connect(m_cd, TQT_SIGNAL(trackPaused(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackUpdate(unsigned, unsigned))); + connect(m_cd, TQT_SIGNAL(trackChanged(unsigned, unsigned)), TQT_TQOBJECT(this), TQT_SLOT(trackChanged(unsigned, unsigned))); + connect(m_cd, TQT_SIGNAL(discStopped()), TQT_TQOBJECT(this), TQT_SLOT(discStopped())); + connect(m_cd, TQT_SIGNAL(discChanged(unsigned)), TQT_TQOBJECT(this), TQT_SLOT(discChanged(unsigned))); connect( &queryledtimer, TQT_SIGNAL(timeout()), TQT_SLOT(togglequeryled()) ); connect( &titlelabeltimer, TQT_SIGNAL(timeout()), TQT_SLOT(titlelabeltimeout()) ); connect( &cycletimer, TQT_SIGNAL(timeout()), TQT_SLOT(cycletimeout()) ); @@ -160,8 +160,8 @@ KSCD::KSCD( TQWidget *parent, const char *name ) connect( songListCB, TQT_SIGNAL(activated(int)), TQT_SLOT(trackSelected(int))); connect( shufflePB, TQT_SIGNAL(clicked()), TQT_SLOT(randomSelected())); connect( cddbPB, TQT_SIGNAL(clicked()), TQT_SLOT(CDDialogSelected())); - connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), this, TQT_SLOT(setColors())); - connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(setIcons())); + connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_TQOBJECT(this), TQT_SLOT(setColors())); + connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(setIcons())); TQToolTip::remove(songListCB); TQToolTip::add(songListCB, i18n("Track list")); @@ -170,24 +170,24 @@ KSCD::KSCD( TQWidget *parent, const char *name ) m_actions = new KActionCollection(this); KAction* action; - action = new KAction(i18n("Play/Pause"), Key_P, this, TQT_SLOT(playClicked()), m_actions, "Play/Pause"); - action = new KAction(i18n("Stop"), Key_S, this, TQT_SLOT(stopClicked()), m_actions, "Stop"); - action = new KAction(i18n("Previous"), Key_B, this, TQT_SLOT(prevClicked()), m_actions, "Previous"); - action = new KAction(i18n("Next"), Key_N, this, TQT_SLOT(nextClicked()), m_actions, "Next"); - action = KStdAction::quit(this, TQT_SLOT(quitClicked()), m_actions); - action = KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts"); - action = KStdAction::keyBindings(this, TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals"); - action = KStdAction::preferences(this, TQT_SLOT(showConfig()), m_actions); - action = new KAction(i18n("Loop"), Key_L, this, TQT_SLOT(loopClicked()), m_actions, "Loop"); - action = new KAction(i18n("Eject"), CTRL + Key_E, this, TQT_SLOT(ejectClicked()), m_actions, "Eject"); - action = new KAction(i18n("Increase Volume"), Key_Plus, this, TQT_SLOT(incVolume()), m_actions, "IncVolume"); + action = new KAction(i18n("Play/Pause"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause"); + action = new KAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop"); + action = new KAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous"); + action = new KAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next"); + action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitClicked()), m_actions); + action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts"); + action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals"); + action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions); + action = new KAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop"); + action = new KAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject"); + action = new KAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume"); KShortcut increaseVolume = action->shortcut(); increaseVolume.append( KKey( Key_Equal ) ); action->setShortcut( increaseVolume ); - action = new KAction(i18n("Decrease Volume"), Key_Minus, this, TQT_SLOT(decVolume()), m_actions, "DecVolume"); - action = new KAction(i18n("Options"), CTRL + Key_T, this, TQT_SLOT(showConfig()), m_actions, "Options"); - action = new KAction(i18n("Shuffle"), Key_R, this, TQT_SLOT(randomSelected()), m_actions, "Shuffle"); - action = new KAction(i18n("CDDB"), CTRL + Key_D, this, TQT_SLOT(CDDialogSelected()), m_actions, "CDDB"); + action = new KAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume"); + action = new KAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options"); + action = new KAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle"); + action = new KAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB"); m_actions->readShortcutSettings("Shortcuts"); @@ -210,9 +210,9 @@ KSCD::KSCD( TQWidget *parent, const char *name ) setDocking(Prefs::docking()); - setFocusPolicy(TQWidget::NoFocus); + setFocusPolicy(TQ_NoFocus); - songListCB->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); + songListCB->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); adjustSize(); setFixedHeight(this->height()); } // KSCD @@ -227,25 +227,25 @@ KSCD::~KSCD() void KSCD::initGlobalShortcuts() { - m_globalAccel = new KGlobalAccel( this ); + m_globalAccel = new KGlobalAccel( TQT_TQOBJECT(this) ); //Definition of global shortcuts is based on 'local' shortcuts which follow //the WIN key. m_globalAccel->insert("Next", i18n("Next"), 0, KKey("WIN+N"), KKey("WIN+Right"), - this, TQT_SLOT(nextClicked())); + TQT_TQOBJECT(this), TQT_SLOT(nextClicked())); //NOTE: WIN+B collidates with amarok's default global shortcut. m_globalAccel->insert("Previous", i18n("Previous"), 0, KKey("WIN+B"), KKey("WIN+Left"), - this, TQT_SLOT(prevClicked())); + TQT_TQOBJECT(this), TQT_SLOT(prevClicked())); m_globalAccel->insert("Play/Pause", i18n("Play/Pause"), 0, KKey("WIN+P"), 0, - this, TQT_SLOT(playClicked())); + TQT_TQOBJECT(this), TQT_SLOT(playClicked())); m_globalAccel->insert("Stop", i18n("Stop"), 0, KKey("WIN+S"), 0, - this, TQT_SLOT(stopClicked())); + TQT_TQOBJECT(this), TQT_SLOT(stopClicked())); m_globalAccel->insert("IncVolume", i18n("Increase Volume"), 0, KKey("WIN+Plus"), KKey("WIN+Up"), - this, TQT_SLOT(incVolume())); + TQT_TQOBJECT(this), TQT_SLOT(incVolume())); m_globalAccel->insert("DecVolume", i18n("Decrease Volume"), 0, KKey("WIN+Minus"), KKey("WIN+Down"), - this, TQT_SLOT(decVolume())); + TQT_TQOBJECT(this), TQT_SLOT(decVolume())); m_globalAccel->insert("Shuffle", i18n("Shuffle"), 0, KKey("WIN+R"), 0, - this, TQT_SLOT(incVolume())); + TQT_TQOBJECT(this), TQT_SLOT(incVolume())); m_globalAccel->setConfigGroup( "GlobalShortcuts" ); m_globalAccel->readSettings( kapp->config() ); @@ -312,7 +312,7 @@ void KSCD::drawPanel() trackTimeLED[u]->setLEDoffColor(Prefs::backColor()); trackTimeLED[u]->setLEDColor(Prefs::ledColor(), Prefs::backColor()); trackTimeLED[u]->setGeometry(2 + u * 18, D, 23, 30); - connect(trackTimeLED[u], TQT_SIGNAL(clicked()), this, TQT_SLOT(cycleplaytimemode())); + connect(trackTimeLED[u], TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(cycleplaytimemode())); } setLEDs(-1); @@ -550,7 +550,7 @@ void KSCD::trackChanged(unsigned track, unsigned trackLength) justTheName = justTheName.right(justTheName.length() - 4); TQToolTip::remove(songListCB); - TQToolTip::add(songListCB, i18n("Current track: %1").arg(justTheName)); + TQToolTip::add(songListCB, i18n("Current track: %1").tqarg(justTheName)); } timeSlider->blockSignals(true); timeSlider->setRange(0, trackLength ? trackLength - 1 : 0); @@ -688,7 +688,7 @@ void KSCD::randomSelected() { setShuffle(Prefs::randomPlay()?0:1); - /* FIXME this helps us to display "Random" in Status line + /* FIXME this helps us to display "Random" in tqStatus line should it maybe to be replaced with symbol "RAND" or something others */ statuslabel->setText(Prefs::randomPlay()?i18n("Random"):i18n("Play")); } // randomSelected @@ -734,7 +734,7 @@ void KSCD::showConfig() configDialog = new KConfigDialog(this, "settings", Prefs::self()); - configDialog->setHelp(TQString::null); + configDialog->setHelp(TQString()); confWidget = new configWidget(this, 0, "Kscd"); @@ -765,7 +765,7 @@ void KSCD::showConfig() updateConfigDialog(confWidget); - connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(configDone())); + connect(configDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(configDone())); configDialog -> show(); } // showConfig() @@ -800,7 +800,7 @@ void KSCD::setDevicePaths() { // This device did not seem usable. TQString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\ - "Please make sure you have access permissions to:\n%1").arg( + "Please make sure you have access permissions to:\n%1").tqarg( KCompactDisc::urlToDevice(Prefs::cdDevice())); KMessageBox::error(this, str, i18n("Error")); } @@ -814,7 +814,7 @@ void KSCD::setDocking(bool dock) if (!m_dockWidget) { m_dockWidget = new DockWidget(this, "dockw"); - connect(m_dockWidget, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitClicked())); + connect(m_dockWidget, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(quitClicked())); } m_dockWidget->show(); @@ -881,7 +881,7 @@ void KSCD::make_random_list() { do { selected = 1 + (int) randSequence.getLong(m_cd->tracks()); - rejected = (random_list.find(selected) != random_list.end()); + rejected = (random_list.tqfind(selected) != random_list.end()); } while(rejected == true); random_list.append(selected); } @@ -1211,8 +1211,8 @@ void KSCD::lookupCDDBDone(CDDB::Result result) CDInfoList::iterator it; TQStringList list; for ( it = cddb_info.begin(); it != cddb_info.end(); ++it ) { - list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title) - .arg((*it).genre)); + list.append( TQString("%1, %2, %3").tqarg((*it).artist).tqarg((*it).title) + .tqarg((*it).genre)); } bool ok(false); @@ -1245,7 +1245,7 @@ void KSCD::lookupCDDBDone(CDDB::Result result) void KSCD::setCDInfo(KCDDB::CDInfo info) { // Some sanity provisions to ensure that the number of records matches what - // the CD actually contains. + // the CD actually tqcontains. while (info.trackInfoList.count() < cddbInfo.trackInfoList.count()) { info.trackInfoList.append(KCDDB::TrackInfo()); @@ -1313,7 +1313,7 @@ int KSCD::currentPosition() return m_cd->trackPosition(); } -int KSCD::getStatus() +int KSCD::gettqStatus() { if (m_cd->isPlaying()) return 2; @@ -1419,62 +1419,62 @@ void KSCD::information(int i) { case 0: str = TQString("http://musicmoz.org/cgi-bin/ext.cgi?artist=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 1: str = TQString("http://ubl.artistdirect.com/cgi-bin/gx.cgi/AppLogic+Search?select=MusicArtist&searchstr=%1&searchtype=NormalSearch") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 2: str = TQString("http://www.cduniverse.com/cgi-bin/cdubin.exe/rlinka/ean=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 3: str = TQString("http://www.alltheweb.com/search?cat=web&q=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 4: str = TQString("http://altavista.com/web/results?q=%1&kgs=0&kls=1&avkw=xytx") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 5: str = TQString("http://msxml.excite.com/_1_2UDOUB70SVHVHR__info.xcite/dog/results?otmpl=dog/webresults.htm&qkw=%1&qcat=web&qk=20&top=1&start=&ver=14060") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 6: str = TQString("http://www.google.com/search?q=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 7: str = TQString("http://groups.google.com/groups?oi=djq&as_q=%1&num=20") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 8: str = TQString("http://www.hotbot.com/default.asp?prov=Inktomi&query=%1&ps=&loc=searchbox&tab=web") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 9: str = TQString("http://search.lycos.com/default.asp?lpv=1&loc=searchhp&tab=web&query=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 10: str = TQString("http://search.dmoz.org/cgi-bin/search?search=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; case 11: str = TQString("http://search.yahoo.com/bin/search?p=%1") - .arg(encodedArtist); + .tqarg(encodedArtist); break; default: @@ -1488,7 +1488,7 @@ void KSCD::information(int i) /** * Save state on session termination */ -bool KSCD::saveState(QSessionManager& /*sm*/) +bool KSCD::saveState(TQSessionManager& /*sm*/) { writeSettings(); KConfig* config = KApplication::kApplication()->sessionConfig(); @@ -1506,7 +1506,7 @@ void KSCD::keyPressEvent(TQKeyEvent* e) bool isNum; int value = e->text().toInt(&isNum); - if (e->key() == Qt::Key_F1) + if (e->key() == TQt::Key_F1) { kapp->invokeHelp(); } @@ -1540,7 +1540,7 @@ void KSCD::jumpTracks() TQString KSCD::currentTrackTitle() { int track = m_cd->track(); - return (track > -1) ? cddbInfo.trackInfoList[track-1].title : TQString::null; + return (track > -1) ? cddbInfo.trackInfoList[track-1].title : TQString(); } TQString KSCD::currentAlbum() @@ -1563,13 +1563,13 @@ TQStringList KSCD::trackList() return tracks; } -void KSCD::populateSongList(TQString infoStatus) +void KSCD::populateSongList(TQString infotqStatus) { // set the artist and title labels as well as the dock tooltip. - if (!infoStatus.isEmpty()) - artistlabel->setText(infoStatus); + if (!infotqStatus.isEmpty()) + artistlabel->setText(infotqStatus); else - artistlabel->setText(TQString("%1 - %2").arg(cddbInfo.artist, cddbInfo.title)); + artistlabel->setText(TQString("%1 - %2").tqarg(cddbInfo.artist, cddbInfo.title)); songListCB->clear(); for (unsigned i = 0; i < cddbInfo.trackInfoList.count(); i++) diff --git a/kscd/kscd.h b/kscd/kscd.h index f4903590..c6f2a8c1 100644 --- a/kscd/kscd.h +++ b/kscd/kscd.h @@ -72,6 +72,7 @@ typedef TQValueList RandomList; class KSCD : public kscdPanelDlg, public KSessionManaged, virtual public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP // time display modes @@ -101,16 +102,16 @@ k_dcop: int currentTrack(); int currentTrackLength(); int currentPosition(); - int getStatus(); + int gettqStatus(); TQString currentTrackTitle(); TQString currentAlbum(); TQString currentArtist(); TQStringList trackList(); public: - KSCD( TQWidget *parent = 0, const char *name = 0 ); + KSCD( TQWidget *tqparent = 0, const char *name = 0 ); ~KSCD(); - virtual bool saveState(QSessionManager& sm); + virtual bool saveState(TQSessionManager& sm); void setDocking(bool dock); bool digitalPlayback(); @@ -174,7 +175,7 @@ protected: void calculateDisplayedTime(); void calculateDisplayedTime(int sec); void setSongListTo(int whichTrack); - void populateSongList(TQString infoStatus); + void populateSongList(TQString infotqStatus); void updatePlayPB(bool playing); void updateConfigDialog(configWidget* widget); diff --git a/kscd/kscdmagic/README b/kscd/kscdmagic/README index 64af4f6f..b2366190 100644 --- a/kscd/kscdmagic/README +++ b/kscd/kscdmagic/README @@ -15,14 +15,14 @@ Introduction This is a program for representing sounds visually from a CD or line input or piped from another program. It goes beyond the usual oscilliscope style program by combining an FFT and stereo positioning information to -give a two dimensional display. Some of the shapes I have observed are: +give a two dimensional display. Some of the tqshapes I have observed are: * Drums: clouds of color, fairly high * Clean guitar: several horizontal lines, low down * Rough guitar: a cloud, low down * Trumpet: Lots of horizontal lines everywhere * Flute: A single horizontal line, low down * Voice: A vertical line with some internal structure - * Synthesizer: All kinds of weird shapes! + * Synthesizer: All kinds of weird tqshapes! Synaesthesia can run in a window in X or full screen using SVGAlib. @@ -139,7 +139,7 @@ Changes Support for SDL. 2.0 - Bug fixes: Fixed problem in xlib.c that caused occasional segfaults, several endianness problems fixed. - New effects: Wave, heat, diamond shaped points. + New effects: Wave, heat, diamond tqshaped points. Piping sound now longer requires the twiddle factor. Yet another interface redesign. Partial support for LinuxPPC (pipe mode only) diff --git a/kscd/kscdmagic/syna.h b/kscd/kscdmagic/syna.h index d359a8c2..4d35e3e0 100644 --- a/kscd/kscdmagic/syna.h +++ b/kscd/kscdmagic/syna.h @@ -160,7 +160,7 @@ enum SoundSource { SourceLine, SourceCD, SourcePipe }; void cdOpen(char *cdromName); void cdClose(void); -void cdGetStatus(int &track, int &frames, SymbolID &state); +void cdGettqStatus(int &track, int &frames, SymbolID &state); void cdPlay(int trackFrame, int endFrame=-1); void cdStop(void); void cdPause(void); diff --git a/kscd/kscdmagic/xlib.c b/kscd/kscdmagic/xlib.c index b28a0650..6e1c1ed2 100644 --- a/kscd/kscdmagic/xlib.c +++ b/kscd/kscdmagic/xlib.c @@ -320,12 +320,12 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib xd->attributes->background_pixel = BlackPixel(xd->display, xd->screen); xd->attributes->border_pixel = BlackPixel(xd->display, xd->screen); - xd->attributes->event_mask = ButtonPressMask | StructureNotifyMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask | KeyReleaseMask; + xd->attributes->event_tqmask = ButtonPressMask | StructureNotifyMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask | KeyReleaseMask; xd->attributes->override_redirect = False; - xd->attr_mask = CWBackPixel | CWBorderPixel | CWEventMask; + xd->attr_tqmask = CWBackPixel | CWBorderPixel | CWEventMask; xd->classX = InputOutput; xd->xcolor.n = 0; - xd->parent_window = RootWindow(xd->display, xd->screen); + xd->tqparent_window = RootWindow(xd->display, xd->screen); defaultvisual = DefaultVisual(xd->display, xd->screen); xd->params = params; if (!params->usedefault) { @@ -403,10 +403,10 @@ xdisplay *xalloc_display(const char *s, int xHint, int yHint, int x, int y, xlib xd->lasty = 0; xd->font_struct = (XFontStruct *) NULL; - xd->window = XCreateWindow(xd->display, xd->parent_window, xHint, yHint, + xd->window = XCreateWindow(xd->display, xd->tqparent_window, xHint, yHint, xd->width, xd->height, xd->border_width, vis.depth, xd->classX, xd->visual, - xd->attr_mask, xd->attributes); + xd->attr_tqmask, xd->attributes); if (!xd->fixedcolormap && params->privatecolormap) { unsigned long pixels[256]; int i; diff --git a/kscd/kscdmagic/xlib.h b/kscd/kscdmagic/xlib.h index 73113292..fa079775 100644 --- a/kscd/kscdmagic/xlib.h +++ b/kscd/kscdmagic/xlib.h @@ -58,7 +58,7 @@ typedef struct { int privatecolormap; xlibparam *params; Display *display; - Window parent_window; + Window tqparent_window; Window window; unsigned int width, height; unsigned int border_width; @@ -66,9 +66,9 @@ typedef struct { int depth; unsigned int classX; Visual *visual; - unsigned long valuemask; + unsigned long valuetqmask; XSetWindowAttributes *attributes; - unsigned long attr_mask; + unsigned long attr_tqmask; XSizeHints sizehints; int screen; const char *window_name; diff --git a/kscd/ledlamp.cpp b/kscd/ledlamp.cpp index 96675921..93aa8000 100644 --- a/kscd/ledlamp.cpp +++ b/kscd/ledlamp.cpp @@ -26,7 +26,7 @@ #include "ledlamp.h" #include "ledlamp.moc" -LedLamp::LedLamp(TQWidget *parent, Type t) : TQFrame(parent), +LedLamp::LedLamp(TQWidget *tqparent, Type t) : TQFrame(tqparent), w( 10 ), h( 7 ), dx( 4 ) { // Make sure we're in a sane state diff --git a/kscd/ledlamp.h b/kscd/ledlamp.h index af37edc7..d7673998 100644 --- a/kscd/ledlamp.h +++ b/kscd/ledlamp.h @@ -26,14 +26,15 @@ #include -class LedLamp : public QFrame +class LedLamp : public TQFrame { Q_OBJECT + TQ_OBJECT public: enum Type { Rect, Loop }; - LedLamp(TQWidget *parent=0, Type t=Rect); + LedLamp(TQWidget *tqparent=0, Type t=Rect); enum State { On, Off }; @@ -41,10 +42,10 @@ public: State state() const { return s; } - void setState(State state) { s= state; repaint(false); } + void setState(State state) { s= state; tqrepaint(false); } - void toggleState() { if (s == On) s= Off; else if (s == Off) s= On; repaint(false); } + void toggleState() { if (s == On) s= Off; else if (s == Off) s= On; tqrepaint(false); } public slots: void toggle() { toggleState(); }; void on() { setState(On); }; diff --git a/kscd/libwm/audio/audio_sun.c b/kscd/libwm/audio/audio_sun.c index bee50905..93ce78d2 100644 --- a/kscd/libwm/audio/audio_sun.c +++ b/kscd/libwm/audio/audio_sun.c @@ -54,13 +54,13 @@ * a marker into the audio stream; when the audio device driver encounters the * marker, it increments a field in a status structure. When we see that * field go up, we grab the next status structure from the queue and send it - * to the parent process. + * to the tqparent process. * * The minimum size of the queue depends on the latency of the audio stream. */ -#define QSIZE 500 +#define TQSIZE 500 -struct cdda_block queue[QSIZE]; +struct cdda_block queue[TQSIZE]; int qtail; int qstart; @@ -199,7 +199,7 @@ sun_audio_ready( void ) * Start at the correct queue position. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qtail = info.play.eof % QSIZE; + qtail = info.play.eof % TQSIZE; qstart = qtail; queue[qtail].status = WM_CDM_PLAYING; @@ -284,11 +284,11 @@ sun_audio_send_status( void ) int qhead; /* - * Now send the most current status information to our parent. + * Now send the most current status information to our tqparent. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qhead = info.play.eof % QSIZE; + qhead = info.play.eof % TQSIZE; if (qhead != qstart && playing) { @@ -367,7 +367,7 @@ sun_audio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk) perror("audio mark"); } else - qtail = (qtail + 1) % QSIZE; + qtail = (qtail + 1) % TQSIZE; fcntl(aufd, F_SETFL, 0); diff --git a/kscd/libwm/cddaslave.c b/kscd/libwm/cddaslave.c index b378f95d..dac475e8 100644 --- a/kscd/libwm/cddaslave.c +++ b/kscd/libwm/cddaslave.c @@ -169,7 +169,7 @@ receive_command(struct cdda_device *dev, struct cdda_block* blk) if (read(0, inbuf, 1) <= 0) { wmcdda_close(dev); oops->wmaudio_close(); -/* ERRORLOG("cddaslave: parent died, exit\n");*/ +/* ERRORLOG("cddaslave: tqparent died, exit\n");*/ exit(0); } diff --git a/kscd/libwm/cdtext.c b/kscd/libwm/cdtext.c index bb4e19b8..fafd039f 100644 --- a/kscd/libwm/cdtext.c +++ b/kscd/libwm/cdtext.c @@ -21,8 +21,8 @@ #include #include #include -#ifdef libunicode - #include +#ifdef libtqunicode + #include #endif #include "include/wm_config.h" @@ -155,12 +155,12 @@ void get_data_from_cdtext_pack( int arr = pack->header_field_id2_tracknumber; int i; int language_block; - int unicode; + int tqunicode; language_block = (pack->header_field_id4_block_no >> 4) & 0x07; - unicode = pack->header_field_id4_block_no & 0x80; + tqunicode = pack->header_field_id4_block_no & 0x80; - if(!unicode) + if(!tqunicode) { for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i++) { @@ -180,7 +180,7 @@ void get_data_from_cdtext_pack( } } } -#ifdef libunicode +#ifdef libtqunicode else /* doublebytes ;-) */ { for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i += 2) @@ -203,7 +203,7 @@ void get_data_from_cdtext_pack( } #else else { - wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle unicode"); + wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle tqunicode"); } #endif } @@ -315,9 +315,9 @@ get_glob_cdtext(struct wm_drive *d, int redo) { wm_cdtext_info.blocks[j] = lp_block; wm_cdtext_info.blocks[j]->block_code = code; - wm_cdtext_info.blocks[j]->block_unicode = pack->header_field_id4_block_no & 0x80; + wm_cdtext_info.blocks[j]->block_tqunicode = pack->header_field_id4_block_no & 0x80; wm_lib_message(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS, - "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_unicode?"doublebyte":"singlebyte"); + "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_tqunicode?"doublebyte":"singlebyte"); /* unsigned char block_encoding; not jet! cdtext_string* block_encoding_text; diff --git a/kscd/libwm/database.c b/kscd/libwm/database.c index 62d66a32..617905eb 100644 --- a/kscd/libwm/database.c +++ b/kscd/libwm/database.c @@ -192,7 +192,7 @@ nomem: #ifndef NDEBUG fprintf(stderr, "WorkMan was run without a home directory, probably by a system daemon.\n"); - fprintf(stderr, "It doesn't know where to find "); + fprintf(stderr, "It doesn't know where to tqfind "); if (no_rc) { fprintf(stderr, "your personal preferences file "); diff --git a/kscd/libwm/include/wm_cdtext.h b/kscd/libwm/include/wm_cdtext.h index e843ee95..ba481be0 100644 --- a/kscd/libwm/include/wm_cdtext.h +++ b/kscd/libwm/include/wm_cdtext.h @@ -44,7 +44,7 @@ typedef unsigned char cdtext_string[MAX_LENGHT_OF_CDTEXT_STRING]; struct cdtext_info_block { /* management */ unsigned char block_code; - unsigned char block_unicode; /* 0 - single chars, 1 - doublebytes */ + unsigned char block_tqunicode; /* 0 - single chars, 1 - doublebytes */ unsigned char block_encoding; /* orange book -? */ cdtext_string* block_encoding_text; diff --git a/kscd/libwm/include/wm_scsi.h b/kscd/libwm/include/wm_scsi.h index f67e8035..5f11ea7e 100644 --- a/kscd/libwm/include/wm_scsi.h +++ b/kscd/libwm/include/wm_scsi.h @@ -30,7 +30,7 @@ #include "wm_struct.h" -#define WM_ERR_SCSI_INQUIRY_FAILED -1 +#define WM_ERR_SCSI_INTQUIRY_FAILED -1 int wm_scsi_mode_sense( struct wm_drive *d, unsigned char page, unsigned char *buf ); diff --git a/kscd/libwm/plat_hpux.c b/kscd/libwm/plat_hpux.c index c5a6991f..a52d341f 100644 --- a/kscd/libwm/plat_hpux.c +++ b/kscd/libwm/plat_hpux.c @@ -118,7 +118,7 @@ wmcd_open( struct wm_drive *d ) /* Now fill in the relevant parts of the wm_drive structure. */ fd = d->fd; - /* Default drive is the HP one, which might not respond to INQUIRY */ + /* Default drive is the HP one, which might not respond to INTQUIRY */ strcpy(&vendor, "TOSHIBA"); strcpy(&model, "XM-3301"); rev[0] = '\0'; diff --git a/kscd/libwm/plat_linux.c b/kscd/libwm/plat_linux.c index 8852ba16..1d473ce2 100644 --- a/kscd/libwm/plat_linux.c +++ b/kscd/libwm/plat_linux.c @@ -43,7 +43,7 @@ #if 0 /* this breaks the build on ia64 and s390 for example. sys/types.h is already included and should provide __u64. - please tell where we really need this and let's try to find + please tell where we really need this and let's try to tqfind a working #if case for everyone ... adrian@suse.de */ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) && LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) #undef __GNUC__ diff --git a/kscd/libwm/plat_linux_audio.c b/kscd/libwm/plat_linux_audio.c index e5608adf..690a36e5 100644 --- a/kscd/libwm/plat_linux_audio.c +++ b/kscd/libwm/plat_linux_audio.c @@ -57,13 +57,13 @@ static char plat_linux_audio_id[] = "$Id$"; * a marker into the audio stream; when the audio device driver encounters the * marker, it increments a field in a status structure. When we see that * field go up, we grab the next status structure from the queue and send it - * to the parent process. + * to the tqparent process. * * The minimum size of the queue depends on the latency of the audio stream. */ -#define QSIZE 500 +#define TQSIZE 500 -struct cdda_block queue[QSIZE]; +struct cdda_block queue[TQSIZE]; int qtail; int qstart; @@ -200,7 +200,7 @@ wmaudio_ready( void ) * Start at the correct queue position. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qtail = info.play.eof % QSIZE; + qtail = info.play.eof % TQSIZE; qstart = qtail; queue[qtail].status = WMCDDA_OK; @@ -275,11 +275,11 @@ wmaudio_send_status( void ) int qhead; /* - * Now send the most current status information to our parent. + * Now send the most current status information to our tqparent. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qhead = info.play.eof % QSIZE; + qhead = info.play.eof % TQSIZE; if (qhead != qstart && playing) { @@ -357,7 +357,7 @@ wmaudio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk) perror("audio mark"); } else - qtail = (qtail + 1) % QSIZE; + qtail = (qtail + 1) % TQSIZE; fcntl(aufd, F_SETFL, 0); diff --git a/kscd/libwm/plat_news.c b/kscd/libwm/plat_news.c index 4b9f2ef7..304ebfda 100644 --- a/kscd/libwm/plat_news.c +++ b/kscd/libwm/plat_news.c @@ -181,7 +181,7 @@ int gen_get_drive_status( struct wm_drive *d, int oldmode, int *mode, int *pos, int *track, int *index) { - struct CD_Status sc; + struct CD_tqStatus sc; /* If we can't get status, the CD is ejected, so default to that. */ *mode = WM_CDM_EJECTED; @@ -199,7 +199,7 @@ gen_get_drive_status( struct wm_drive *d, int oldmode, } /* Disc is ejected. Close the device. */ - if (CD_GetStatus(d->fd, &sc)) + if (CD_GettqStatus(d->fd, &sc)) { gen_close(d); return (0); diff --git a/kscd/libwm/plat_sun.c b/kscd/libwm/plat_sun.c index 4e61d68f..8d09efee 100644 --- a/kscd/libwm/plat_sun.c +++ b/kscd/libwm/plat_sun.c @@ -111,7 +111,7 @@ sigthawinit( void ) struct sigaction sa; sa.sa_handler = thawme; - sigemptyset(&sa.sa_mask); + sigemptyset(&sa.sa_tqmask); sa.sa_flags = 0; sigaction(SIGTHAW, &sa, NULL); @@ -400,7 +400,7 @@ gen_get_drive_status( struct wm_drive *d, * Now install the no-op signal handler. */ new_sig.sa_handler = do_nothing; - memset(&new_sig.sa_mask, 0, sizeof(new_sig.sa_mask)); + memset(&new_sig.sa_tqmask, 0, sizeof(new_sig.sa_tqmask)); new_sig.sa_flags = 0; if (sigaction(SIGALRM, &new_sig, &old_sig)) perror("sigaction"); diff --git a/kscd/libwm/plat_sun_audio.c b/kscd/libwm/plat_sun_audio.c index 6ef62d7b..3c9dfdc1 100644 --- a/kscd/libwm/plat_sun_audio.c +++ b/kscd/libwm/plat_sun_audio.c @@ -59,13 +59,13 @@ static char plat_sun_audio_id[] = "$Id$"; * a marker into the audio stream; when the audio device driver encounters the * marker, it increments a field in a status structure. When we see that * field go up, we grab the next status structure from the queue and send it - * to the parent process. + * to the tqparent process. * * The minimum size of the queue depends on the latency of the audio stream. */ -#define QSIZE 500 +#define TQSIZE 500 -struct cdda_block queue[QSIZE]; +struct cdda_block queue[TQSIZE]; int qtail; int qstart; @@ -204,7 +204,7 @@ wmaudio_ready( void ) * Start at the correct queue position. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qtail = info.play.eof % QSIZE; + qtail = info.play.eof % TQSIZE; qstart = qtail; queue[qtail].status = WMCDDA_OK; @@ -279,11 +279,11 @@ wmaudio_send_status( void ) int qhead; /* - * Now send the most current status information to our parent. + * Now send the most current status information to our tqparent. */ if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO"); - qhead = info.play.eof % QSIZE; + qhead = info.play.eof % TQSIZE; if (qhead != qstart && playing) { @@ -361,7 +361,7 @@ wmaudio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk) perror("audio mark"); } else - qtail = (qtail + 1) % QSIZE; + qtail = (qtail + 1) % TQSIZE; fcntl(aufd, F_SETFL, 0); diff --git a/kscd/libwm/plat_svr4.c b/kscd/libwm/plat_svr4.c index 3ccaf4c4..dad4e8af 100644 --- a/kscd/libwm/plat_svr4.c +++ b/kscd/libwm/plat_svr4.c @@ -314,7 +314,7 @@ wm_scsi( struct wm_drive *d, unsigned char *xcdb, int cdblen, sb.SCB.sc_link = (struct sb *) NULL; sb.SCB.sc_resid = 0; - scs.ss_op = SS_REQSEN; + scs.ss_op = SS_RETQSEN; scs.ss_lun = 0; scs.ss_addr1 = 0; scs.ss_addr = 0; diff --git a/kscd/libwm/scsi.c b/kscd/libwm/scsi.c index 11570146..c3c1d342 100644 --- a/kscd/libwm/scsi.c +++ b/kscd/libwm/scsi.c @@ -38,7 +38,7 @@ #include "include/wm_cdrom.h" #include "include/wm_cdtext.h" -#define SCMD_INQUIRY 0x12 +#define SCMD_INTQUIRY 0x12 #define SCMD_MODE_SELECT 0x15 #define SCMD_MODE_SENSE 0x1a #define SCMD_START_STOP 0x1b @@ -48,14 +48,14 @@ #define SCMD_PLAY_AUDIO_MSF 0x47 #define SCMD_PAUSE_RESUME 0x4b -#define SUBQ_STATUS_INVALID 0x00 -#define SUBQ_STATUS_PLAY 0x11 -#define SUBQ_STATUS_PAUSE 0x12 -#define SUBQ_STATUS_DONE 0x13 -#define SUBQ_STATUS_ERROR 0x14 -#define SUBQ_STATUS_NONE 0x15 -#define SUBQ_STATUS_NO_DISC 0x17 /* Illegal, but Toshiba returns it. */ -#define SUBQ_ILLEGAL 0xff +#define SUBTQ_STATUS_INVALID 0x00 +#define SUBTQ_STATUS_PLAY 0x11 +#define SUBTQ_STATUS_PAUSE 0x12 +#define SUBTQ_STATUS_DONE 0x13 +#define SUBTQ_STATUS_ERROR 0x14 +#define SUBTQ_STATUS_NONE 0x15 +#define SUBTQ_STATUS_NO_DISC 0x17 /* Illegal, but Toshiba returns it. */ +#define SUBTQ_ILLEGAL 0xff #define PAGE_AUDIO 0x0e #define LEADOUT 0xaa @@ -194,14 +194,14 @@ wm_scsi_mode_select( struct wm_drive *d, unsigned char *buf, unsigned char len ) } /* - * Send an INQUIRY command to get the drive type. + * Send an INTQUIRY command to get the drive type. * * d Drive structure * vendor Buffer for vendor name (8 bytes + null) * model Buffer for model name (16 bytes + null) * rev Buffer for revision level (4 bytes + null) * - * The above string lengths apply to the SCSI INQUIRY command. The + * The above string lengths apply to the SCSI INTQUIRY command. The * actual WorkMan drive structure reserves 31 bytes + NULL per entry. * * If the model name begins with "CD-ROM" and zero or more spaces, that will @@ -216,7 +216,7 @@ wm_scsi_get_drive_type( struct wm_drive *d, char *vendor, memset(buf, 0, 36); wm_lib_message(WM_MSG_CLASS_SCSI | WM_MSG_LEVEL_INFO, "Sending SCSI inquiry command...\n"); - if (sendscsi(d, buf, 36, 1, SCMD_INQUIRY, 0, 0, 0, 36, 0,0,0,0,0,0,0)) + if (sendscsi(d, buf, 36, 1, SCMD_INTQUIRY, 0, 0, 0, 36, 0,0,0,0,0,0,0)) { sprintf( vendor, WM_STR_GENVENDOR); sprintf( model, WM_STR_GENMODEL); @@ -346,20 +346,20 @@ wm_scsi2_get_drive_status(struct wm_drive *d, int oldmode, } /* If we can't read status, the CD has been ejected. */ - buf[1] = SUBQ_ILLEGAL; + buf[1] = SUBTQ_ILLEGAL; if (sendscsi(d, buf, sizeof(buf), 1, SCMD_READ_SUBCHANNEL, 2, 64, 1, 0, 0, 0, sizeof(buf) / 256, sizeof(buf) % 256, 0,0,0)) return (0); switch (buf[1]) { - case SUBQ_STATUS_PLAY: + case SUBTQ_STATUS_PLAY: *mode = WM_CDM_PLAYING; *track = buf[6]; *ind = buf[7]; *pos = buf[9] * 60 * 75 + buf[10] * 75 + buf[11]; break; - case SUBQ_STATUS_PAUSE: + case SUBTQ_STATUS_PAUSE: if (oldmode == WM_CDM_PLAYING || oldmode == WM_CDM_PAUSED) { *mode = WM_CDM_PAUSED; @@ -374,13 +374,13 @@ wm_scsi2_get_drive_status(struct wm_drive *d, int oldmode, break; /* - * SUBQ_STATUS_DONE is sometimes returned when the CD is idle, + * SUBTQ_STATUS_DONE is sometimes returned when the CD is idle, * even though the spec says it should only be returned when an * audio play operation finishes. */ - case SUBQ_STATUS_DONE: - case SUBQ_STATUS_NONE: - case SUBQ_STATUS_INVALID: + case SUBTQ_STATUS_DONE: + case SUBTQ_STATUS_NONE: + case SUBTQ_STATUS_INVALID: if (oldmode == WM_CDM_PLAYING) *mode = WM_CDM_TRACK_DONE; else @@ -390,16 +390,16 @@ wm_scsi2_get_drive_status(struct wm_drive *d, int oldmode, /* * This usually means there's no disc in the drive. */ - case SUBQ_STATUS_NO_DISC: + case SUBTQ_STATUS_NO_DISC: break; /* * This usually means the user ejected the CD manually. */ - case SUBQ_STATUS_ERROR: + case SUBTQ_STATUS_ERROR: break; - case SUBQ_ILLEGAL: /* call didn't really succeed */ + case SUBTQ_ILLEGAL: /* call didn't really succeed */ break; default: diff --git a/kscd/panel.ui b/kscd/panel.ui index 3b6b218a..6f8cec6a 100644 --- a/kscd/panel.ui +++ b/kscd/panel.ui @@ -1,10 +1,10 @@ kscdPanelDlg - + kscdPanelDlg - + 0 0 @@ -25,28 +25,28 @@ 0 - + - layout8 + tqlayout8 unnamed - + songListCB - + - layout6 + tqlayout6 unnamed - + timeIcon @@ -57,7 +57,7 @@ Track progress - + timeSlider @@ -92,14 +92,14 @@ Fixed - + 16 20 - + volumeIcon @@ -110,7 +110,7 @@ Volume control - + volumeSlider @@ -126,9 +126,9 @@ - + - layout7 + tqlayout7 @@ -137,7 +137,7 @@ 1 - + ejectPB @@ -148,7 +148,7 @@ true - + backdrop @@ -160,7 +160,7 @@ 0 - + 270 80 @@ -201,15 +201,15 @@ 2 - + - layout5 + tqlayout5 unnamed - + frameleds @@ -221,7 +221,7 @@ 0 - + 100 35 @@ -234,15 +234,15 @@ Raised - + statuslabel - Status + tqStatus - + volumelabel @@ -250,12 +250,12 @@ Vol: -- - + totaltimelabel - + tracklabel @@ -263,7 +263,7 @@ --/-- - + symbols @@ -275,7 +275,7 @@ 0 - + 30 0 @@ -285,7 +285,7 @@ Vol: -- - + artistlabel @@ -293,7 +293,7 @@ Artist - + titlelabel @@ -305,7 +305,7 @@ - + shufflePB @@ -319,7 +319,7 @@ true - + infoPB @@ -330,7 +330,7 @@ true - + playPB @@ -341,7 +341,7 @@ true - + stopPB @@ -355,7 +355,7 @@ true - + cddbPB @@ -366,7 +366,7 @@ true - + repeatPB @@ -383,7 +383,7 @@ true - + nextPB @@ -394,7 +394,7 @@ true - + prevPB @@ -457,12 +457,12 @@ cddbPB infoPB - + playClicked() stopClicked() prevClicked() ejectClicked() nextClicked() - - + + -- cgit v1.2.1