From e654398e46e37abf457b2b1122ab898d2c51c49f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:43:15 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kscd/bwlednum.cpp | 46 ++++---- kscd/bwlednum.h | 26 ++--- kscd/cddbdlg.cpp | 36 +++--- kscd/cddbdlg.h | 8 +- kscd/configWidget.cpp | 22 ++-- kscd/configWidget.h | 2 +- kscd/docking.cpp | 42 +++---- kscd/docking.h | 22 ++-- kscd/kcompactdisc.cpp | 62 +++++----- kscd/kcompactdisc.h | 48 ++++---- kscd/kscd.cpp | 304 +++++++++++++++++++++++++------------------------- kscd/kscd.h | 68 +++++------ kscd/ledlamp.cpp | 20 ++-- kscd/ledlamp.h | 6 +- 14 files changed, 356 insertions(+), 356 deletions(-) (limited to 'kscd') diff --git a/kscd/bwlednum.cpp b/kscd/bwlednum.cpp index a8f828cc..4bfb16b6 100644 --- a/kscd/bwlednum.cpp +++ b/kscd/bwlednum.cpp @@ -9,8 +9,8 @@ #include "bwlednum.h" -#include "qbitarray.h" -#include "qpainter.h" +#include "tqbitarray.h" +#include "tqpainter.h" #include #include "bwlednum.moc" @@ -36,11 +36,11 @@ static char segs[14][8] = {25, 0, 0, 0, 0, 0, 0, 0} }; // blank -BW_LED_Number::BW_LED_Number( QWidget *parent, const char *name ) - : QFrame( parent, name ){ +BW_LED_Number::BW_LED_Number( TQWidget *parent, const char *name ) + : TQFrame( parent, name ){ - offcolor = QColor(100,0,0); + offcolor = TQColor(100,0,0); showOffColon(FALSE); smallLED = false; current_symbol = ' '; @@ -64,11 +64,11 @@ BW_LED_Number::~BW_LED_Number(){ } -void BW_LED_Number::resizeEvent( QResizeEvent * ){ +void BW_LED_Number::resizeEvent( TQResizeEvent * ){ } -void BW_LED_Number::mouseReleaseEvent( QMouseEvent * /* e */ ) +void BW_LED_Number::mouseReleaseEvent( TQMouseEvent * /* e */ ) { emit(clicked()); } @@ -79,20 +79,20 @@ void BW_LED_Number::showOffColon(bool off){ } -void BW_LED_Number::setLEDColor( const QColor& fgColor, const QColor& bgColor ){ +void BW_LED_Number::setLEDColor( const TQColor& fgColor, const TQColor& bgColor ){ fgcolor = fgColor; bgcolor = bgColor; - QColorGroup old_cg = this->colorGroup(); + TQColorGroup old_cg = this->colorGroup(); - QColorGroup new_cg( fgColor, bgColor, + TQColorGroup new_cg( fgColor, bgColor, fgColor, fgColor, fgColor, fgColor, fgColor ); - this->setPalette(QPalette(new_cg, new_cg, new_cg)); + this->setPalette(TQPalette(new_cg, new_cg, new_cg)); } @@ -129,7 +129,7 @@ static char *getSegments( char s) return segs[j]; } -void BW_LED_Number::drawContents( QPainter *p ){ +void BW_LED_Number::drawContents( TQPainter *p ){ drawSymbol( p, current_symbol,TRUE ); @@ -147,7 +147,7 @@ void BW_LED_Number::display(int i ){ void BW_LED_Number::display(char s){ - QPainter p; + TQPainter p; p.begin( this ); @@ -168,11 +168,11 @@ void BW_LED_Number::setSmallLED(bool a_boolean){ } -void BW_LED_Number::drawSymbol( QPainter *p,char ,bool repaint ){ +void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){ // printf("drawSymbol repaint = %d\n",repaint); - QPoint pos; + TQPoint pos; int xSegment_Length, ySegment_Length, Segment_Length, xAdvance; int Xoffset, Yoffset, space; @@ -191,7 +191,7 @@ void BW_LED_Number::drawSymbol( QPainter *p,char ,bool repaint ){ Xoffset = ( width() - xAdvance + Segment_Length/4 )/2; Yoffset = ( height() - Segment_Length*2 )/2; - pos = QPoint( Xoffset , Yoffset ); + pos = TQPoint( Xoffset , Yoffset ); if(repaint){ @@ -266,19 +266,19 @@ bool BW_LED_Number::seg_contained_in( char c, char* seg){ return result; } -void BW_LED_Number::setLEDoffColor(QColor color){ +void BW_LED_Number::setLEDoffColor(TQColor color){ offcolor = color; } -void BW_LED_Number::drawSegment( const QPoint &pos, char seg_number, QPainter &p, +void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter &p, int Segment_Length, bool erase){ - QPoint pt = pos; - QColorGroup g = colorGroup(); - QColor lightColor,darkColor; + TQPoint pt = pos; + TQColorGroup g = colorGroup(); + TQColor lightColor,darkColor; if ( erase ){ lightColor = offcolor; @@ -293,8 +293,8 @@ void BW_LED_Number::drawSegment( const QPoint &pos, char seg_number, QPainter &p int Width = (int) Segment_Length/4; - QBrush brush(g.light()); - QPointArray pts; + TQBrush brush(g.light()); + TQPointArray pts; pt.ry() += (QCOORD)Width/2; diff --git a/kscd/bwlednum.h b/kscd/bwlednum.h index f3d66f8e..5652832f 100644 --- a/kscd/bwlednum.h +++ b/kscd/bwlednum.h @@ -13,8 +13,8 @@ #ifndef BW_LED_NUM_H #define BW_LED_NUM_H -#include "qframe.h" -#include "qbitarray.h" +#include "tqframe.h" +#include "tqbitarray.h" class BW_LED_Number : public QFrame @@ -23,7 +23,7 @@ class BW_LED_Number : public QFrame public: - BW_LED_Number( QWidget *parent=0, const char *name=0 ); + BW_LED_Number( TQWidget *parent=0, const char *name=0 ); ~BW_LED_Number(); void setSmallLED(bool ); // if you LED is small it might look better @@ -33,13 +33,13 @@ public: // the forground defaults to yellow, the background defaults // to black - void setLEDColor( const QColor& foregroundColor, const QColor& backgroundColor ); + void setLEDColor( const TQColor& foregroundColor, const TQColor& backgroundColor ); // this sets the color of the segments that are not iluminated // the default is a rather dark red. - void setLEDoffColor(QColor color); + void setLEDoffColor(TQColor color); // calling showOffColon(TRUE) will show the colon if not illuminated // this is rather ugly -- the default is that they are not shown. @@ -59,24 +59,24 @@ public slots: protected: - void resizeEvent( QResizeEvent * ); - void mouseReleaseEvent ( QMouseEvent * e ); - void drawContents( QPainter * ); + void resizeEvent( TQResizeEvent * ); + void mouseReleaseEvent ( TQMouseEvent * e ); + void drawContents( TQPainter * ); private: bool seg_contained_in( char c, char* seg); - void drawSegment( const QPoint &, char, QPainter &, int, bool = FALSE ); - void drawSymbol( QPainter *p,char s ,bool repaint); + void drawSegment( const TQPoint &, char, TQPainter &, int, bool = FALSE ); + void drawSymbol( TQPainter *p,char s ,bool repaint); char* old_segments; char* current_segments; char current_symbol; char old_symbol; - QColor offcolor; - QColor fgcolor; - QColor bgcolor; + TQColor offcolor; + TQColor fgcolor; + TQColor bgcolor; bool smallLED; diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp index cc0e9669..e574ba92 100644 --- a/kscd/cddbdlg.cpp +++ b/kscd/cddbdlg.cpp @@ -2,12 +2,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -33,7 +33,7 @@ struct mytoc unsigned absframe; }; -CDDBDlg::CDDBDlg( QWidget* parent, const char* name ) +CDDBDlg::CDDBDlg( TQWidget* parent, const char* name ) : KDialogBase( parent, name, false, i18n( "CD Editor" ), Ok|Cancel|User1|User2, Ok, true ) { @@ -46,15 +46,15 @@ CDDBDlg::CDDBDlg( QWidget* parent, const char* name ) setButtonText( User1, i18n( "Upload" ) ); setButtonText( User2, i18n( "Fetch Info" ) ); - connect( this, SIGNAL( okClicked() ), SLOT( save() ) ); - connect( this, SIGNAL( user1Clicked() ), SLOT( upload() ) ); - connect( this, SIGNAL( user2Clicked() ), SIGNAL( cddbQuery() ) ); - connect( m_dlgBase, SIGNAL( play( int ) ), SIGNAL( play( int ) ) ); + connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( save() ) ); + connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( upload() ) ); + connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SIGNAL( cddbQuery() ) ); + connect( m_dlgBase, TQT_SIGNAL( play( int ) ), TQT_SIGNAL( play( int ) ) ); cddbClient = new KCDDB::Client(); cddbClient->setBlockingMode(false); - connect (cddbClient, SIGNAL(finished(CDDB::Result)), - SLOT(submitFinished(CDDB::Result))); + connect (cddbClient, TQT_SIGNAL(finished(CDDB::Result)), + TQT_SLOT(submitFinished(CDDB::Result))); } @@ -66,7 +66,7 @@ CDDBDlg::~CDDBDlg() void CDDBDlg::setData( const KCDDB::CDInfo &_cddbInfo, const KCDDB::TrackOffsetList &_trackStartFrames, - const QStringList &_playlist) + const TQStringList &_playlist) { // Let's make a deep copy of the cd struct info so that the data won't // change the cd changes while we are playing with the dialog. @@ -89,7 +89,7 @@ void CDDBDlg::submitFinished(KCDDB::CDDB::Result r) } else { - QString str = i18n("Error sending record.\n\n%1") + TQString str = i18n("Error sending record.\n\n%1") .arg(KCDDB::CDDB::resultToString(r)); KMessageBox::error(this, str, i18n("Record Submission")); } @@ -166,15 +166,15 @@ void CDDBDlg::updateFromDialog() KCDDB::CDInfo copy = m_dlgBase->info(); // Playorder... - QStringList strlist = QStringList::split( ',', m_dlgBase->m_playOrder->text() ); + TQStringList strlist = TQStringList::split( ',', m_dlgBase->m_playOrder->text() ); bool ret = true; - QString teststr; + TQString teststr; bool ok; unsigned num; - for ( QStringList::Iterator it = strlist.begin(); + for ( TQStringList::Iterator it = strlist.begin(); it != strlist.end(); ++it ) { diff --git a/kscd/cddbdlg.h b/kscd/cddbdlg.h index bbef6e4e..b8f3c90a 100644 --- a/kscd/cddbdlg.h +++ b/kscd/cddbdlg.h @@ -14,13 +14,13 @@ class CDDBDlg : public KDialogBase Q_OBJECT public: - CDDBDlg(QWidget* parent, const char* name = 0); + CDDBDlg(TQWidget* parent, const char* name = 0); ~CDDBDlg(); void setData( const KCDDB::CDInfo &_cddbInfo, const KCDDB::TrackOffsetList &_trackStartFrames, - const QStringList &_playlist); + const TQStringList &_playlist); private slots: void save(); @@ -35,12 +35,12 @@ class CDDBDlg : public KDialogBase private: bool validInfo(); void updateFromDialog(); - QString framesTime(unsigned frames); + TQString framesTime(unsigned frames); CDInfoDialogBase *m_dlgBase; KCDDB::CDInfo cddbInfo; KCDDB::TrackOffsetList trackStartFrames; - QStringList playlist; + TQStringList playlist; KCDDB::Client *cddbClient; }; #endif // CDDBDLG_H diff --git a/kscd/configWidget.cpp b/kscd/configWidget.cpp index 0865c5ad..bae787e9 100644 --- a/kscd/configWidget.cpp +++ b/kscd/configWidget.cpp @@ -26,9 +26,9 @@ #include #include #include -#include +#include #include -#include +#include #include extern "C" { @@ -45,14 +45,14 @@ extern "C" { class SpecialComboBox : public KComboBox { public: - SpecialComboBox(QWidget* parent, const char* name) + SpecialComboBox(TQWidget* parent, const char* name) : KComboBox(parent, name) {} - // QComboBox::setCurrentText replaces the current text if + // TQComboBox::setCurrentText replaces the current text if // the list doesn't contain text, while // KComboBox::setCurrentItem doesn't - void setCurrentText(const QString& text) + void setCurrentText(const TQString& text) { setCurrentItem(text); } @@ -65,7 +65,7 @@ public: * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -configWidget::configWidget(KSCD* player, QWidget* parent, const char* name) +configWidget::configWidget(KSCD* player, TQWidget* parent, const char* name) : configWidgetUI(parent, name), mPlayer(player) { @@ -78,7 +78,7 @@ configWidget::configWidget(KSCD* player, QWidget* parent, const char* name) kcfg_cdDevice->comboBox()->insertItem(DEFAULT_CD_DEVICE); getMediaDevices(); - (new QVBoxLayout(audioSystemFrame))->setAutoAdd(true); + (new TQVBoxLayout(audioSystemFrame))->setAutoAdd(true); kcfg_AudioSystem = new SpecialComboBox(audioSystemFrame, "kcfg_AudioSystem"); textLabel4->setBuddy(kcfg_AudioSystem); @@ -115,14 +115,14 @@ void configWidget::getMediaDevices() if (!rep.isValid()) { return; } - QStringList list = rep; - QStringList::const_iterator it = list.begin(); - QStringList::const_iterator itEnd = list.end(); + TQStringList list = rep; + TQStringList::const_iterator it = list.begin(); + TQStringList::const_iterator itEnd = list.end(); // it would be much better if libmediacommon was in kdelibs while (it != itEnd) { it++; if (it == itEnd) break; - QString url="media:/"+(*it); // is it always right? ervin? + TQString url="media:/"+(*it); // is it always right? ervin? kdDebug() << "checking " << url << endl; for (int i=0;i<9;i++) ++it; // go to mimetype (MIME_TYPE-NAME from medium.h) kdDebug() << "Mime: " << *it << endl; diff --git a/kscd/configWidget.h b/kscd/configWidget.h index 897f02c4..7269ca42 100644 --- a/kscd/configWidget.h +++ b/kscd/configWidget.h @@ -33,7 +33,7 @@ class configWidget : public configWidgetUI Q_OBJECT public: - configWidget(KSCD* player, QWidget* parent = 0, const char* name = 0); + configWidget(KSCD* player, TQWidget* parent = 0, const char* name = 0); ~configWidget(); protected: diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 821e626d..705c2ca8 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -24,8 +24,8 @@ #include "docking.h" #include "kscd.h" -#include -#include +#include +#include #include #include @@ -51,22 +51,22 @@ DockWidget::DockWidget( KSCD* parent, const char *name) m_forwardPix = loadIcon("player_end"); // popup menu for right mouse button - QPopupMenu* popup = contextMenu(); + TQPopupMenu* popup = contextMenu(); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_play", KIcon::Small), i18n("Play/Pause"), parent, SLOT(playClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_stop", KIcon::Small), i18n("Stop"), parent, SLOT(stopClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_end", KIcon::Small), i18n("Next"), parent, SLOT(nextClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_start", KIcon::Small), i18n("Previous"), parent, SLOT(prevClicked())); - popup->insertItem(KGlobal::iconLoader()->loadIconSet("player_eject", KIcon::Small), i18n("Eject"), parent, SLOT(ejectClicked())); + 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())); - QToolTip::add(this, kapp->aboutData()->programName()); + TQToolTip::add(this, kapp->aboutData()->programName()); } DockWidget::~DockWidget() { } -void DockWidget::createPopup(const QString &songName, bool addButtons) +void DockWidget::createPopup(const TQString &songName, bool addButtons) { if (!Prefs::trackAnnouncement()) return; @@ -74,23 +74,23 @@ void DockWidget::createPopup(const QString &songName, bool addButtons) delete m_popup; m_popup = new KPassivePopup(this); - QHBox* box = new QHBox(m_popup); + TQHBox* box = new TQHBox(m_popup); if (addButtons) { - QPushButton* backButton = new QPushButton(m_backPix, 0, box, "popup_back"); + TQPushButton* backButton = new TQPushButton(m_backPix, 0, box, "popup_back"); backButton->setFlat(true); - connect(backButton, SIGNAL(clicked()), m_backAction, SLOT(activate())); + connect(backButton, TQT_SIGNAL(clicked()), m_backAction, TQT_SLOT(activate())); } - QLabel* l = new QLabel(songName, box); + TQLabel* l = new TQLabel(songName, box); l->setMargin(3); if (addButtons) { - QPushButton* forwardButton = new QPushButton(m_forwardPix, 0, box, "popup_forward"); + TQPushButton* forwardButton = new TQPushButton(m_forwardPix, 0, box, "popup_forward"); forwardButton->setFlat(true); - connect(forwardButton, SIGNAL(clicked()), m_forwardAction, SLOT(activate())); + connect(forwardButton, TQT_SIGNAL(clicked()), m_forwardAction, TQT_SLOT(activate())); } m_popup->setView(box); @@ -98,7 +98,7 @@ void DockWidget::createPopup(const QString &songName, bool addButtons) m_popup->show(); } -void DockWidget::setToolTip(const QString& text) +void DockWidget::setToolTip(const TQString& text) { if (tip == text) { @@ -106,19 +106,19 @@ void DockWidget::setToolTip(const QString& text) } tip = text; - QToolTip::remove(this); + TQToolTip::remove(this); if (text.isEmpty()) { - QToolTip::add(this, kapp->aboutData()->programName()); + TQToolTip::add(this, kapp->aboutData()->programName()); } else { - QToolTip::add(this, text); + TQToolTip::add(this, text); } } -void DockWidget::wheelEvent(QWheelEvent *e) +void DockWidget::wheelEvent(TQWheelEvent *e) { if (e->orientation() == Horizontal) return; diff --git a/kscd/docking.h b/kscd/docking.h index bb6434d0..52fceebd 100644 --- a/kscd/docking.h +++ b/kscd/docking.h @@ -30,11 +30,11 @@ #define _DOCKING_H_ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include class KSCD; @@ -52,21 +52,21 @@ public: ~DockWidget(); public slots: - void setToolTip(const QString& text); - void createPopup(const QString& songName, bool addButtons = true); + void setToolTip(const TQString& text); + void createPopup(const TQString& songName, bool addButtons = true); private: - virtual void wheelEvent( QWheelEvent *e); + virtual void wheelEvent( TQWheelEvent *e); KPassivePopup* m_popup; KAction* m_forwardAction; KAction* m_backAction; - QPixmap m_backPix; - QPixmap m_forwardPix; + TQPixmap m_backPix; + TQPixmap m_forwardPix; - QString tip; + TQString tip; }; #endif diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp index e1d0b9db..c412a932 100644 --- a/kscd/kcompactdisc.cpp +++ b/kscd/kcompactdisc.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -81,7 +81,7 @@ extern "C" #endif } -#include +#include #include // Our internal definition of when we have no disc. Used to guard some @@ -94,17 +94,17 @@ extern "C" #define TRACK_VALID(track) \ ((track) && (track <= m_tracks)) -const QString KCompactDisc::defaultDevice = DEFAULT_CD_DEVICE; +const TQString KCompactDisc::defaultDevice = DEFAULT_CD_DEVICE; const unsigned KCompactDisc::missingDisc = (unsigned)-1; KCompactDisc::KCompactDisc(InformationMode infoMode) : - m_device(QString::null), + m_device(TQString::null), m_status(0), m_previousStatus(123456), m_discId(missingDisc), m_previousDiscId(0), - m_artist(QString::null), - m_title(QString::null), + m_artist(TQString::null), + m_title(TQString::null), m_track(0), m_previousTrack(99999999), m_infoMode(infoMode) @@ -114,7 +114,7 @@ KCompactDisc::KCompactDisc(InformationMode infoMode) : m_trackArtists.clear(); m_trackTitles.clear(); m_trackStartFrames.clear(); - connect(&timer, SIGNAL(timeout()), SLOT(timerExpired())); + connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerExpired())); } KCompactDisc::~KCompactDisc() @@ -126,7 +126,7 @@ KCompactDisc::~KCompactDisc() wm_cd_destroy(); } -const QString &KCompactDisc::device() const +const TQString &KCompactDisc::device() const { return m_device; } @@ -143,9 +143,9 @@ unsigned KCompactDisc::discPosition() const return cur_pos_abs * 1000 - FRAMES_TO_MS(m_trackStartFrames[0]); } -QString KCompactDisc::discStatus(int status) +TQString KCompactDisc::discStatus(int status) { - QString message; + TQString message; switch (status) { @@ -183,7 +183,7 @@ QString KCompactDisc::discStatus(int status) if (status <= 0) message = strerror(-status); else - message = QString::number(status); + message = TQString::number(status); break; } return message; @@ -232,15 +232,15 @@ void KCompactDisc::play(unsigned startTrack, unsigned startTrackPosition, unsign wm_cd_play(TRACK_VALID(startTrack) ? startTrack : 1, startTrackPosition / 1000, TRACK_VALID(endTrack) ? endTrack : WM_ENDTRACK ); } -QString KCompactDisc::urlToDevice(const QString& device) +TQString KCompactDisc::urlToDevice(const TQString& device) { KURL deviceUrl(device); if (deviceUrl.protocol() == "media" || deviceUrl.protocol() == "system") { kdDebug() << "Asking mediamanager for " << deviceUrl.fileName() << endl; DCOPRef mediamanager("kded", "mediamanager"); - DCOPReply reply = mediamanager.call("properties(QString)", deviceUrl.fileName()); - QStringList properties = reply; + DCOPReply reply = mediamanager.call("properties(TQString)", deviceUrl.fileName()); + TQStringList properties = reply; if (!reply.isValid() || properties.count() < 6) { kdError() << "Invalid reply from mediamanager" << endl; @@ -257,22 +257,22 @@ QString KCompactDisc::urlToDevice(const QString& device) } bool KCompactDisc::setDevice( - const QString &device_, + const TQString &device_, unsigned volume, bool digitalPlayback, - const QString &audioSystem, - const QString &audioDevice) + const TQString &audioSystem, + const TQString &audioDevice) { timer.stop(); - QString device = urlToDevice(device_); + TQString device = urlToDevice(device_); #if !defined(BUILD_CDDA) digitalPlayback = false; #endif int status = wm_cd_init( digitalPlayback ? WM_CDDA : WM_CDIN, - QFile::encodeName(device), + TQFile::encodeName(device), digitalPlayback ? audioSystem.ascii() : 0, digitalPlayback ? audioDevice.ascii() : 0, 0); @@ -280,14 +280,14 @@ bool KCompactDisc::setDevice( kdDebug() << "Device change: " << (digitalPlayback ? "WM_CDDA, " : "WM_CDIN, ") << m_device << ", " - << (digitalPlayback ? audioSystem : QString::null) << ", " - << (digitalPlayback ? audioDevice : QString::null) << ", status: " + << (digitalPlayback ? audioSystem : TQString::null) << ", " + << (digitalPlayback ? audioDevice : TQString::null) << ", status: " << discStatus(status) << endl; if (status < 0) { // Severe (OS-level) error. - m_device = QString::null; + m_device = TQString::null; } else { @@ -301,7 +301,7 @@ bool KCompactDisc::setDevice( timerExpired(); else timer.start(1000, true); - return m_device != QString::null; + return m_device != TQString::null; } void KCompactDisc::setVolume(unsigned volume) @@ -315,15 +315,15 @@ void KCompactDisc::stop() wm_cd_stop(); } -const QString &KCompactDisc::trackArtist() const +const TQString &KCompactDisc::trackArtist() const { return trackArtist(m_track); } -const QString &KCompactDisc::trackArtist(unsigned track) const +const TQString &KCompactDisc::trackArtist(unsigned track) const { if (NO_DISC || !TRACK_VALID(track)) - return QString::null; + return TQString::null; return m_trackArtists[track - 1]; } @@ -349,15 +349,15 @@ unsigned KCompactDisc::tracks() const return m_tracks; } -const QString &KCompactDisc::trackTitle() const +const TQString &KCompactDisc::trackTitle() const { return trackTitle(m_track); } -const QString &KCompactDisc::trackTitle(unsigned track) const +const TQString &KCompactDisc::trackTitle(unsigned track) const { if (NO_DISC || !TRACK_VALID(track)) - return QString::null; + return TQString::null; return m_trackTitles[track - 1]; } @@ -378,7 +378,7 @@ void KCompactDisc::timerExpired() { m_status = wm_cd_status(); - if (WM_CDS_NO_DISC(m_status) || (m_device == QString::null)) + if (WM_CDS_NO_DISC(m_status) || (m_device == TQString::null)) { if (m_previousStatus != m_status) { @@ -428,7 +428,7 @@ void KCompactDisc::timerExpired() else { m_trackArtists.append(i18n("Unknown Artist")); - m_trackTitles.append(i18n("Track %1").arg(QString::number(i).rightJustify(2, '0'))); + m_trackTitles.append(i18n("Track %1").arg(TQString::number(i).rightJustify(2, '0'))); } // FIXME: KDE4 // track.length = cd->trk[i - 1].length; diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h index 4d1f1543..f71189a8 100644 --- a/kscd/kcompactdisc.h +++ b/kscd/kcompactdisc.h @@ -21,9 +21,9 @@ #ifndef KCOMPACTDISC_H #define KCOMPACTDISC_H -#include -#include -#include +#include +#include +#include /** * KCompactDisc - A CD drive interface for the KDE Project. @@ -76,7 +76,7 @@ public: * If the url is a media:/ or system:/ URL returns * the device it represents, otherwise returns device */ - static QString urlToDevice(const QString& device); + static TQString urlToDevice(const TQString& device); /** * @param device Name of CD device, e.g. /dev/cdrom. @@ -86,11 +86,11 @@ public: * @return true if the device seemed usable. */ bool setDevice( - const QString &device = defaultDevice, + const TQString &device = defaultDevice, unsigned volume = 50, bool digitalPlayback = true, - const QString &audioSystem = QString::null, - const QString &audioDevice = QString::null); + const TQString &audioSystem = TQString::null, + const TQString &audioDevice = TQString::null); void setVolume(unsigned volume); @@ -102,14 +102,14 @@ public: /** * The default CD for this system. */ - static const QString defaultDevice; + static const TQString defaultDevice; /** * Current device. * * @return Null string if no usable device set. */ - const QString &device() const; + const TQString &device() const; /** * The discId for a missing disc. @@ -124,21 +124,21 @@ public: /** * CDDB signature of disc. */ - const QValueList &discSignature() const { return m_trackStartFrames; } + const TQValueList &discSignature() const { return m_trackStartFrames; } /** * Artist for whole disc. * * @return Disc artist or null string. */ - const QString &discArtist() const { return m_artist; } + const TQString &discArtist() const { return m_artist; } /** * Title of disc. * * @return Disc title or null string. */ - const QString &discTitle() const { return m_title; } + const TQString &discTitle() const { return m_title; } /** * Length of disc. @@ -158,28 +158,28 @@ public: * * @return Track artist or null string. */ - const QString &trackArtist() const; + const TQString &trackArtist() const; /** * Artist of given track. * * @return Track artist or null string. */ - const QString &trackArtist(unsigned track) const; + const TQString &trackArtist(unsigned track) const; /** * Title of current track. * * @return Track title or null string. */ - const QString &trackTitle() const; + const TQString &trackTitle() const; /** * Title of given track. * * @return Track title or null string. */ - const QString &trackTitle(unsigned track) const; + const TQString &trackTitle(unsigned track) const; /** * Current track. @@ -277,22 +277,22 @@ signals: void trackPaused(unsigned track, unsigned trackPosition); private: - QTimer timer; - QString m_device; + TQTimer timer; + TQString m_device; int m_status; int m_previousStatus; unsigned m_discId; unsigned m_previousDiscId; - QString m_artist; - QString m_title; + TQString m_artist; + TQString m_title; unsigned m_tracks; - QValueList m_trackStartFrames; - QStringList m_trackArtists; - QStringList m_trackTitles; + TQValueList m_trackStartFrames; + TQStringList m_trackArtists; + TQStringList m_trackTitles; unsigned m_track; unsigned m_previousTrack; void checkDeviceStatus(); - QString discStatus(int status); + TQString discStatus(int status); class KCompactDiscPrivate *d; InformationMode m_infoMode; diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index 426df542..bb2b0ae5 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -22,15 +22,15 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -76,7 +76,7 @@ #include "cddbdlg.h" #include "configWidget.h" -#include +#include #include #include @@ -89,7 +89,7 @@ bool stoppedByUser = false; The GUI part *****************************************************************************/ -KSCD::KSCD( QWidget *parent, const char *name ) +KSCD::KSCD( TQWidget *parent, const char *name ) : DCOPObject("CDPlayer"), kscdPanelDlg( parent, name, Qt::WDestructiveClose ), configDialog(0L), @@ -103,7 +103,7 @@ KSCD::KSCD( QWidget *parent, const char *name ) random_current = random_list.begin(); cddb = new KCDDB::Client(); - connect(cddb, SIGNAL(finished(CDDB::Result)), this, SLOT(lookupCDDBDone(CDDB::Result))); + connect(cddb, TQT_SIGNAL(finished(CDDB::Result)), this, TQT_SLOT(lookupCDDBDone(CDDB::Result))); #if defined(BUILD_CDDA) audio_systems_list @@ -124,77 +124,77 @@ KSCD::KSCD( QWidget *parent, const char *name ) // the time slider timeIcon->setPixmap(SmallIcon("player_time")); - connect(timeSlider, SIGNAL(sliderPressed()), SLOT(timeSliderPressed())); - connect(timeSlider, SIGNAL(sliderReleased()), SLOT(timeSliderReleased())); - connect(timeSlider, SIGNAL(sliderMoved(int)), SLOT(timeSliderMoved(int))); - connect(timeSlider, SIGNAL(valueChanged(int)), SLOT(jumpToTime(int))); + connect(timeSlider, TQT_SIGNAL(sliderPressed()), TQT_SLOT(timeSliderPressed())); + connect(timeSlider, TQT_SIGNAL(sliderReleased()), TQT_SLOT(timeSliderReleased())); + connect(timeSlider, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(timeSliderMoved(int))); + connect(timeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(jumpToTime(int))); // the volume slider volumeIcon->setPixmap(SmallIcon("player_volume")); volumeSlider->setValue(Prefs::volume()); - QString str; - str = QString::fromUtf8( QCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) ); + TQString str; + str = TQString::fromUtf8( TQCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) ); volumelabel->setText(str); - connect(volumeSlider, SIGNAL(valueChanged(int)), SLOT(volChanged(int))); + connect(volumeSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(volChanged(int))); /* FIXME check for return value */ setDevicePaths(/*Prefs::cdDevice(), Prefs::audioSystem(), Prefs::audioDevice()*/); - connect(m_cd, SIGNAL(trackPlaying(unsigned, unsigned)), this, SLOT(trackUpdate(unsigned, unsigned))); - connect(m_cd, SIGNAL(trackPaused(unsigned, unsigned)), this, SLOT(trackUpdate(unsigned, unsigned))); - connect(m_cd, SIGNAL(trackChanged(unsigned, unsigned)), this, SLOT(trackChanged(unsigned, unsigned))); - connect(m_cd, SIGNAL(discStopped()), this, SLOT(discStopped())); - connect(m_cd, SIGNAL(discChanged(unsigned)), this, SLOT(discChanged(unsigned))); - connect( &queryledtimer, SIGNAL(timeout()), SLOT(togglequeryled()) ); - connect( &titlelabeltimer, SIGNAL(timeout()), SLOT(titlelabeltimeout()) ); - connect( &cycletimer, SIGNAL(timeout()), SLOT(cycletimeout()) ); - connect( &jumpTrackTimer, SIGNAL(timeout()), SLOT(jumpTracks()) ); + 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( &queryledtimer, TQT_SIGNAL(timeout()), TQT_SLOT(togglequeryled()) ); + connect( &titlelabeltimer, TQT_SIGNAL(timeout()), TQT_SLOT(titlelabeltimeout()) ); + connect( &cycletimer, TQT_SIGNAL(timeout()), TQT_SLOT(cycletimeout()) ); + connect( &jumpTrackTimer, TQT_SIGNAL(timeout()), TQT_SLOT(jumpTracks()) ); /* these are always connected in base class - connect( playPB, SIGNAL(clicked()), SLOT(playClicked()) ); - connect( nextPB, SIGNAL(clicked()), SLOT(nextClicked()) ); - connect( prevPB, SIGNAL(clicked()), SLOT(prevClicked()) ); - connect( stopPB, SIGNAL(clicked()), SLOT(stopClicked()) ); - connect( ejectPB, SIGNAL(clicked()), SLOT(ejectClicked()) ); + connect( playPB, TQT_SIGNAL(clicked()), TQT_SLOT(playClicked()) ); + connect( nextPB, TQT_SIGNAL(clicked()), TQT_SLOT(nextClicked()) ); + connect( prevPB, TQT_SIGNAL(clicked()), TQT_SLOT(prevClicked()) ); + connect( stopPB, TQT_SIGNAL(clicked()), TQT_SLOT(stopClicked()) ); + connect( ejectPB, TQT_SIGNAL(clicked()), TQT_SLOT(ejectClicked()) ); */ - connect( repeatPB, SIGNAL(clicked()), SLOT(loopClicked()) ); - connect( songListCB, SIGNAL(activated(int)), SLOT(trackSelected(int))); - connect( shufflePB, SIGNAL(clicked()), SLOT(randomSelected())); - connect( cddbPB, SIGNAL(clicked()), SLOT(CDDialogSelected())); - connect(kapp, SIGNAL(kdisplayPaletteChanged()), this, SLOT(setColors())); - connect(kapp, SIGNAL(iconChanged(int)), this, SLOT(setIcons())); - QToolTip::remove(songListCB); - QToolTip::add(songListCB, i18n("Track list")); + connect( repeatPB, TQT_SIGNAL(clicked()), TQT_SLOT(loopClicked()) ); + 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())); + TQToolTip::remove(songListCB); + TQToolTip::add(songListCB, i18n("Track list")); // set up the actions and keyboard accels m_actions = new KActionCollection(this); KAction* action; - action = new KAction(i18n("Play/Pause"), Key_P, this, SLOT(playClicked()), m_actions, "Play/Pause"); - action = new KAction(i18n("Stop"), Key_S, this, SLOT(stopClicked()), m_actions, "Stop"); - action = new KAction(i18n("Previous"), Key_B, this, SLOT(prevClicked()), m_actions, "Previous"); - action = new KAction(i18n("Next"), Key_N, this, SLOT(nextClicked()), m_actions, "Next"); - action = KStdAction::quit(this, SLOT(quitClicked()), m_actions); - action = KStdAction::keyBindings(this, SLOT(configureKeys()), m_actions, "options_configure_shortcuts"); - action = KStdAction::keyBindings(this, SLOT(configureGlobalKeys()), m_actions, "options_configure_globals"); - action = KStdAction::preferences(this, SLOT(showConfig()), m_actions); - action = new KAction(i18n("Loop"), Key_L, this, SLOT(loopClicked()), m_actions, "Loop"); - action = new KAction(i18n("Eject"), CTRL + Key_E, this, SLOT(ejectClicked()), m_actions, "Eject"); - action = new KAction(i18n("Increase Volume"), Key_Plus, this, SLOT(incVolume()), m_actions, "IncVolume"); + 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"); KShortcut increaseVolume = action->shortcut(); increaseVolume.append( KKey( Key_Equal ) ); action->setShortcut( increaseVolume ); - action = new KAction(i18n("Decrease Volume"), Key_Minus, this, SLOT(decVolume()), m_actions, "DecVolume"); - action = new KAction(i18n("Options"), CTRL + Key_T, this, SLOT(showConfig()), m_actions, "Options"); - action = new KAction(i18n("Shuffle"), Key_R, this, SLOT(randomSelected()), m_actions, "Shuffle"); - action = new KAction(i18n("CDDB"), CTRL + Key_D, this, SLOT(CDDialogSelected()), m_actions, "CDDB"); + 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"); m_actions->readShortcutSettings("Shortcuts"); m_actions->action( "options_configure_globals" )->setText( i18n( "Configure &Global Shortcuts..." ) ); kapp->installKDEPropertyMap(); - QSqlPropertyMap *map = QSqlPropertyMap::defaultMap(); + TQSqlPropertyMap *map = TQSqlPropertyMap::defaultMap(); map->insert("KComboBox", "currentText"); initGlobalShortcuts(); @@ -210,9 +210,9 @@ KSCD::KSCD( QWidget *parent, const char *name ) setDocking(Prefs::docking()); - setFocusPolicy(QWidget::NoFocus); + setFocusPolicy(TQWidget::NoFocus); - songListCB->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed); + songListCB->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed); adjustSize(); setFixedHeight(this->height()); } // KSCD @@ -232,20 +232,20 @@ void KSCD::initGlobalShortcuts() { //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, SLOT(nextClicked())); + 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, SLOT(prevClicked())); + this, TQT_SLOT(prevClicked())); m_globalAccel->insert("Play/Pause", i18n("Play/Pause"), 0, KKey("WIN+P"), 0, - this, SLOT(playClicked())); + this, TQT_SLOT(playClicked())); m_globalAccel->insert("Stop", i18n("Stop"), 0, KKey("WIN+S"), 0, - this, SLOT(stopClicked())); + this, TQT_SLOT(stopClicked())); m_globalAccel->insert("IncVolume", i18n("Increase Volume"), 0, KKey("WIN+Plus"), KKey("WIN+Up"), - this, SLOT(incVolume())); + this, TQT_SLOT(incVolume())); m_globalAccel->insert("DecVolume", i18n("Decrease Volume"), 0, KKey("WIN+Minus"), KKey("WIN+Down"), - this, SLOT(decVolume())); + this, TQT_SLOT(decVolume())); m_globalAccel->insert("Shuffle", i18n("Shuffle"), 0, KKey("WIN+R"), 0, - this, SLOT(incVolume())); + this, TQT_SLOT(incVolume())); m_globalAccel->setConfigGroup( "GlobalShortcuts" ); m_globalAccel->readSettings( kapp->config() ); @@ -266,7 +266,7 @@ void KSCD::setVolume(int v) volumeSlider->setValue(v); } -void KSCD::setDevice(const QString& dev) +void KSCD::setDevice(const TQString& dev) { Prefs::self()->setCdDevice(dev); setDevicePaths(); @@ -280,11 +280,11 @@ void KSCD::initFont() /* int theSmallPtSize = 10; // Find a font that fits the 13 and 14 pixel widgets - QFont fn( KGlobalSettings::generalFont().family(), theSmallPtSize, QFont::Bold ); + TQFont fn( KGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold ); bool fits = false; while (!fits && theSmallPtSize > 1) { - QFontMetrics metrics(fn); + TQFontMetrics metrics(fn); if(metrics.height() > 13) { --theSmallPtSize; @@ -293,7 +293,7 @@ void KSCD::initFont() fits = true; } } - smallfont = QFont(KGlobalSettings::generalFont().family(), theSmallPtSize, QFont::Bold); + smallfont = TQFont(KGlobalSettings::generalFont().family(), theSmallPtSize, TQFont::Bold); */ } // initFont() @@ -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], SIGNAL(clicked()), this, SLOT(cycleplaytimemode())); + connect(trackTimeLED[u], TQT_SIGNAL(clicked()), this, TQT_SLOT(cycleplaytimemode())); } setLEDs(-1); @@ -342,9 +342,9 @@ void KSCD::setIcons() void KSCD::setupPopups() { - QPopupMenu* mainPopup = new QPopupMenu(this); + TQPopupMenu* mainPopup = new TQPopupMenu(this); infoPB->setPopup(mainPopup); - infoPopup = new QPopupMenu (this); + infoPopup = new TQPopupMenu (this); infoPopup->insertItem("MusicMoz", 0); @@ -369,7 +369,7 @@ void KSCD::setupPopups() mainPopup->insertItem(i18n("Artist Information"), infoPopup); - connect( infoPopup, SIGNAL(activated(int)), SLOT(information(int)) ); + connect( infoPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(information(int)) ); KHelpMenu* helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), false); mainPopup->insertItem(SmallIcon("help"),i18n("&Help"), helpMenu->menu()); @@ -524,7 +524,7 @@ bool KSCD::nextClicked() void KSCD::trackChanged(unsigned track, unsigned trackLength) { - QString tooltip = artistlabel->text(); + TQString tooltip = artistlabel->text(); if (track < 1) { setLEDs(-1); @@ -546,20 +546,20 @@ void KSCD::trackChanged(unsigned track, unsigned trackLength) songListCB->setCurrentItem(track - 1); // drop the number. // for Mahlah, a picky though otherwise wonderful person - AJS - QString justTheName = songListCB->currentText(); + TQString justTheName = songListCB->currentText(); justTheName = justTheName.right(justTheName.length() - 4); - QToolTip::remove(songListCB); - QToolTip::add(songListCB, i18n("Current track: %1").arg(justTheName)); + TQToolTip::remove(songListCB); + TQToolTip::add(songListCB, i18n("Current track: %1").arg(justTheName)); } timeSlider->blockSignals(true); timeSlider->setRange(0, trackLength ? trackLength - 1 : 0); timeSlider->blockSignals(false); - QString str; + TQString str; str.sprintf("%02d/%02d", track, m_cd->tracks()); tracklabel->setText(str); - QString title = cddbInfo.trackInfoList[track-1].title; + TQString title = cddbInfo.trackInfoList[track-1].title; titlelabel->setText(title); tooltip += "/"; tooltip += KStringHandler::rsqueeze(title, 30); @@ -628,9 +628,9 @@ void KSCD::quitClicked() kapp->quit(); } // quitClicked() -bool KSCD::event( QEvent *e ) +bool KSCD::event( TQEvent *e ) { - return QWidget::event(e); + return TQWidget::event(e); } // event @@ -673,7 +673,7 @@ void KSCD::ejectClicked() m_cd->eject(); } // ejectClicked -void KSCD::closeEvent(QCloseEvent *e) +void KSCD::closeEvent(TQCloseEvent *e) { if (Prefs::docking() && !kapp->sessionSaving()) { @@ -713,7 +713,7 @@ void KSCD::updateConfigDialog(configWidget* widget) if(!widget) return; - static QString originalTitleOfGroupBox = widget->groupBox3->title(); + static TQString originalTitleOfGroupBox = widget->groupBox3->title(); if(m_cd->isPlaying()) { widget->groupBox3->setEnabled(false); widget->groupBox3->setTitle( i18n( "CD Drive (you must stop playing to change this)" ) ); @@ -734,7 +734,7 @@ void KSCD::showConfig() configDialog = new KConfigDialog(this, "settings", Prefs::self()); - configDialog->setHelp(QString::null); + configDialog->setHelp(TQString::null); confWidget = new configWidget(this, 0, "Kscd"); @@ -754,18 +754,18 @@ void KSCD::showConfig() m->load(); KCDDB::Config* cfg = new KCDDB::Config(); cfg->readConfig(); - configDialog -> addPage(m, cfg, QString("CDDB"), "cdtrack", i18n("Configure Fetching Items")); + configDialog -> addPage(m, cfg, TQString("CDDB"), "cdtrack", i18n("Configure Fetching Items")); - connect(configDialog, SIGNAL(okClicked()), m, SLOT(save())); - connect(configDialog, SIGNAL(applyClicked()), m, SLOT(save())); - connect(configDialog, SIGNAL(defaultClicked()), m, SLOT(defaults())); + connect(configDialog, TQT_SIGNAL(okClicked()), m, TQT_SLOT(save())); + connect(configDialog, TQT_SIGNAL(applyClicked()), m, TQT_SLOT(save())); + connect(configDialog, TQT_SIGNAL(defaultClicked()), m, TQT_SLOT(defaults())); } } } updateConfigDialog(confWidget); - connect(configDialog, SIGNAL(settingsChanged()), this, SLOT(configDone())); + connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(configDone())); configDialog -> show(); } // showConfig() @@ -799,7 +799,7 @@ void KSCD::setDevicePaths() Prefs::audioSystem(), Prefs::audioDevice())) { // This device did not seem usable. - QString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\ + 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( KCompactDisc::urlToDevice(Prefs::cdDevice())); KMessageBox::error(this, str, i18n("Error")); @@ -814,14 +814,14 @@ void KSCD::setDocking(bool dock) if (!m_dockWidget) { m_dockWidget = new DockWidget(this, "dockw"); - connect(m_dockWidget, SIGNAL(quitSelected()), this, SLOT(quitClicked())); + connect(m_dockWidget, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitClicked())); } m_dockWidget->show(); - connect(this, SIGNAL(trackChanged(const QString&)), - m_dockWidget, SLOT(setToolTip(const QString&))); - connect(this, SIGNAL(trackChanged(const QString&)), - m_dockWidget, SLOT(createPopup(const QString&))); + connect(this, TQT_SIGNAL(trackChanged(const TQString&)), + m_dockWidget, TQT_SLOT(setToolTip(const TQString&))); + connect(this, TQT_SIGNAL(trackChanged(const TQString&)), + m_dockWidget, TQT_SLOT(createPopup(const TQString&))); } else { @@ -859,8 +859,8 @@ void KSCD::decVolume() void KSCD::volChanged( int vol ) { - QString str; - str = QString::fromUtf8( QCString().sprintf(i18n("Vol: %02d%%").utf8(), vol) ); + TQString str; + str = TQString::fromUtf8( TQCString().sprintf(i18n("Vol: %02d%%").utf8(), vol) ); volumelabel->setText(str); m_cd->setVolume(vol); Prefs::setVolume(vol); @@ -962,7 +962,7 @@ void KSCD::discChanged(unsigned discId) } else { - cddbInfo.id = QString::number(discId, 16).rightJustify(8,'0'); + cddbInfo.id = TQString::number(discId, 16).rightJustify(8,'0'); cddbInfo.length = m_cd->discLength() / 1000; cddbInfo.artist = m_cd->discArtist(); cddbInfo.title = m_cd->discTitle(); @@ -990,10 +990,10 @@ void KSCD::discChanged(unsigned discId) } // Set the total time. - QTime dml; + TQTime dml; dml = dml.addSecs(m_cd->discLength() / 1000); - QString fmt; + TQString fmt; if(dml.hour() > 0) fmt.sprintf("%02d:%02d:%02d",dml.hour(),dml.minute(),dml.second()); else @@ -1054,7 +1054,7 @@ void KSCD::discStopped() void KSCD::setLEDs(int milliseconds) { - QString symbols; + TQString symbols; if (milliseconds < 0) { @@ -1085,23 +1085,23 @@ void KSCD::resetTimeSlider(bool enabled) void KSCD::setColors() { - QColor led_color = Prefs::ledColor(); - QColor background_color = Prefs::backColor(); + TQColor led_color = Prefs::ledColor(); + TQColor background_color = Prefs::backColor(); backdrop->setBackgroundColor(background_color); - QColorGroup colgrp( led_color, background_color, led_color,led_color , led_color, + TQColorGroup colgrp( led_color, background_color, led_color,led_color , led_color, led_color, white ); - titlelabel ->setPalette( QPalette(colgrp,colgrp,colgrp) ); - artistlabel->setPalette( QPalette(colgrp,colgrp,colgrp) ); - volumelabel->setPalette( QPalette(colgrp,colgrp,colgrp) ); - statuslabel->setPalette( QPalette(colgrp,colgrp,colgrp) ); - tracklabel ->setPalette( QPalette(colgrp,colgrp,colgrp) ); - totaltimelabel->setPalette( QPalette(colgrp,colgrp,colgrp) ); + titlelabel ->setPalette( TQPalette(colgrp,colgrp,colgrp) ); + artistlabel->setPalette( TQPalette(colgrp,colgrp,colgrp) ); + volumelabel->setPalette( TQPalette(colgrp,colgrp,colgrp) ); + statuslabel->setPalette( TQPalette(colgrp,colgrp,colgrp) ); + tracklabel ->setPalette( TQPalette(colgrp,colgrp,colgrp) ); + totaltimelabel->setPalette( TQPalette(colgrp,colgrp,colgrp) ); - queryled->setPalette( QPalette(colgrp,colgrp,colgrp) ); - loopled->setPalette( QPalette(colgrp,colgrp,colgrp) ); + queryled->setPalette( TQPalette(colgrp,colgrp,colgrp) ); + loopled->setPalette( TQPalette(colgrp,colgrp,colgrp) ); for (int u = 0; u< 5;u++){ trackTimeLED[u]->setLEDoffColor(background_color); @@ -1155,11 +1155,11 @@ void KSCD::CDDialogSelected() cddialog = new CDDBDlg(this); cddialog->setData(cddbInfo, m_cd->discSignature(), playlist); - connect(cddialog,SIGNAL(cddbQuery()),SLOT(lookupCDDB())); - connect(cddialog,SIGNAL(newCDInfoStored(KCDDB::CDInfo)), - SLOT(setCDInfo(KCDDB::CDInfo))); - connect(cddialog,SIGNAL(finished()),SLOT(CDDialogDone())); - connect(cddialog,SIGNAL(play(int)),SLOT(trackSelected(int))); + connect(cddialog,TQT_SIGNAL(cddbQuery()),TQT_SLOT(lookupCDDB())); + connect(cddialog,TQT_SIGNAL(newCDInfoStored(KCDDB::CDInfo)), + TQT_SLOT(setCDInfo(KCDDB::CDInfo))); + connect(cddialog,TQT_SIGNAL(finished()),TQT_SLOT(CDDialogDone())); + connect(cddialog,TQT_SIGNAL(play(int)),TQT_SLOT(trackSelected(int))); } cddialog->show(); @@ -1201,7 +1201,7 @@ void KSCD::lookupCDDBDone(CDDB::Result result) // The intent of the original code here seems to have been to perform the // lookup, and then to convert all the string data within the CDDB response - // using the use Prefs::selectedEncoding() and a QTextCodec. However, that + // using the use Prefs::selectedEncoding() and a TQTextCodec. However, that // seems to be irrelevant these days. KCDDB::CDInfo info = cddb->bestLookupResponse(); // TODO Why doesn't libcddb not return MultipleRecordFound? @@ -1209,21 +1209,21 @@ void KSCD::lookupCDDBDone(CDDB::Result result) if( cddb->lookupResponse().count() > 1 ) { CDInfoList cddb_info = cddb->lookupResponse(); CDInfoList::iterator it; - QStringList list; + TQStringList list; for ( it = cddb_info.begin(); it != cddb_info.end(); ++it ) { - list.append( QString("%1, %2, %3").arg((*it).artist).arg((*it).title) + list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title) .arg((*it).genre)); } bool ok(false); - QString res = KInputDialog::getItem( + TQString res = KInputDialog::getItem( i18n("Select CDDB Entry"), i18n("Select a CDDB entry:"), list, 0, false, &ok, this ); if ( ok ) { // The user selected and item and pressed OK uint c = 0; - for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { + for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { if( *it == res) break; c++; } @@ -1398,8 +1398,8 @@ void KSCD::cycleplaytimemode() void KSCD::cycletimeout() { cycletimer.stop(); - QString str; - str = QString::fromUtf8( QCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) ); + TQString str; + str = TQString::fromUtf8( TQCString().sprintf(i18n("Vol: %02d%%").utf8(), Prefs::volume()) ); volumelabel->setText(str); } // cycletimeout @@ -1411,69 +1411,69 @@ void KSCD::information(int i) if(cddbInfo.artist.isEmpty()) return; - QString encodedArtist = KURL::encode_string_no_slash(cddbInfo.artist); + TQString encodedArtist = KURL::encode_string_no_slash(cddbInfo.artist); - QString str; + TQString str; switch(i) { case 0: - str = QString("http://musicmoz.org/cgi-bin/ext.cgi?artist=%1") + str = TQString("http://musicmoz.org/cgi-bin/ext.cgi?artist=%1") .arg(encodedArtist); break; case 1: - str = QString("http://ubl.artistdirect.com/cgi-bin/gx.cgi/AppLogic+Search?select=MusicArtist&searchstr=%1&searchtype=NormalSearch") + str = TQString("http://ubl.artistdirect.com/cgi-bin/gx.cgi/AppLogic+Search?select=MusicArtist&searchstr=%1&searchtype=NormalSearch") .arg(encodedArtist); break; case 2: - str = QString("http://www.cduniverse.com/cgi-bin/cdubin.exe/rlinka/ean=%1") + str = TQString("http://www.cduniverse.com/cgi-bin/cdubin.exe/rlinka/ean=%1") .arg(encodedArtist); break; case 3: - str = QString("http://www.alltheweb.com/search?cat=web&q=%1") + str = TQString("http://www.alltheweb.com/search?cat=web&q=%1") .arg(encodedArtist); break; case 4: - str = QString("http://altavista.com/web/results?q=%1&kgs=0&kls=1&avkw=xytx") + str = TQString("http://altavista.com/web/results?q=%1&kgs=0&kls=1&avkw=xytx") .arg(encodedArtist); break; case 5: - str = QString("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") + 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); break; case 6: - str = QString("http://www.google.com/search?q=%1") + str = TQString("http://www.google.com/search?q=%1") .arg(encodedArtist); break; case 7: - str = QString("http://groups.google.com/groups?oi=djq&as_q=%1&num=20") + str = TQString("http://groups.google.com/groups?oi=djq&as_q=%1&num=20") .arg(encodedArtist); break; case 8: - str = QString("http://www.hotbot.com/default.asp?prov=Inktomi&query=%1&ps=&loc=searchbox&tab=web") + str = TQString("http://www.hotbot.com/default.asp?prov=Inktomi&query=%1&ps=&loc=searchbox&tab=web") .arg(encodedArtist); break; case 9: - str = QString("http://search.lycos.com/default.asp?lpv=1&loc=searchhp&tab=web&query=%1") + str = TQString("http://search.lycos.com/default.asp?lpv=1&loc=searchhp&tab=web&query=%1") .arg(encodedArtist); break; case 10: - str = QString("http://search.dmoz.org/cgi-bin/search?search=%1") + str = TQString("http://search.dmoz.org/cgi-bin/search?search=%1") .arg(encodedArtist); break; case 11: - str = QString("http://search.yahoo.com/bin/search?p=%1") + str = TQString("http://search.yahoo.com/bin/search?p=%1") .arg(encodedArtist); break; @@ -1501,7 +1501,7 @@ bool KSCD::saveState(QSessionManager& /*sm*/) /** * Allow the user to type in the number of the track */ -void KSCD::keyPressEvent(QKeyEvent* e) +void KSCD::keyPressEvent(TQKeyEvent* e) { bool isNum; int value = e->text().toInt(&isNum); @@ -1523,7 +1523,7 @@ void KSCD::keyPressEvent(QKeyEvent* e) } else { - QWidget::keyPressEvent(e); + TQWidget::keyPressEvent(e); } } //keyPressEvent @@ -1537,25 +1537,25 @@ void KSCD::jumpTracks() jumpToTrack = 0; } // jumpTracks -QString KSCD::currentTrackTitle() +TQString KSCD::currentTrackTitle() { int track = m_cd->track(); - return (track > -1) ? cddbInfo.trackInfoList[track-1].title : QString::null; + return (track > -1) ? cddbInfo.trackInfoList[track-1].title : TQString::null; } -QString KSCD::currentAlbum() +TQString KSCD::currentAlbum() { return cddbInfo.title; } -QString KSCD::currentArtist() +TQString KSCD::currentArtist() { return cddbInfo.artist; } -QStringList KSCD::trackList() +TQStringList KSCD::trackList() { - QStringList tracks; + TQStringList tracks; for (TrackInfoList::const_iterator it = cddbInfo.trackInfoList.begin(); it != cddbInfo.trackInfoList.end(); ++it) tracks << (*it).title; @@ -1563,13 +1563,13 @@ QStringList KSCD::trackList() return tracks; } -void KSCD::populateSongList(QString infoStatus) +void KSCD::populateSongList(TQString infoStatus) { // set the artist and title labels as well as the dock tooltip. if (!infoStatus.isEmpty()) artistlabel->setText(infoStatus); else - artistlabel->setText(QString("%1 - %2").arg(cddbInfo.artist, cddbInfo.title)); + artistlabel->setText(TQString("%1 - %2").arg(cddbInfo.artist, cddbInfo.title)); songListCB->clear(); for (unsigned i = 0; i < cddbInfo.trackInfoList.count(); i++) @@ -1579,9 +1579,9 @@ void KSCD::populateSongList(QString infoStatus) unsigned mysec; mymin = tmp / 60000; mysec = (tmp % 60000) / 1000; - QString str1; + TQString str1; str1.sprintf("%02d: ", i + 1); - QString str2; + TQString str2; str2.sprintf(" (%02d:%02d) ", mymin, mysec); str1.append(cddbInfo.trackInfoList[i].title); str1.append(str2); @@ -1635,7 +1635,7 @@ int main( int argc, char *argv[] ) DCOPRef ref("kscd", "CDPlayer"); if (args->count() > 0) { - ref.send("setDevice(QString)", QString(args->arg(0))); + ref.send("setDevice(TQString)", TQString(args->arg(0))); } if (args->isSet("start")) { diff --git a/kscd/kscd.h b/kscd/kscd.h index d5735e20..0a6bca7d 100644 --- a/kscd/kscd.h +++ b/kscd/kscd.h @@ -35,18 +35,18 @@ class KCompactDisc; #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "ledlamp.h" #include "panel.h" @@ -67,7 +67,7 @@ class KToggleAction; using namespace KCDDB; -typedef QValueList RandomList; +typedef TQValueList RandomList; class KSCD : public kscdPanelDlg, public KSessionManaged, virtual public DCOPObject { @@ -96,31 +96,31 @@ k_dcop: void volumeDown() { decVolume(); } void volumeUp() { incVolume(); } void setVolume(int v); - void setDevice(const QString& dev); + void setDevice(const TQString& dev); int getVolume() { return Prefs::volume(); } int currentTrack(); int currentTrackLength(); int currentPosition(); int getStatus(); - QString currentTrackTitle(); - QString currentAlbum(); - QString currentArtist(); - QStringList trackList(); + TQString currentTrackTitle(); + TQString currentAlbum(); + TQString currentArtist(); + TQStringList trackList(); public: - KSCD( QWidget *parent = 0, const char *name = 0 ); + KSCD( TQWidget *parent = 0, const char *name = 0 ); ~KSCD(); virtual bool saveState(QSessionManager& sm); void setDocking(bool dock); bool digitalPlayback(); void setDevicePaths(); - QStringList audioSystems() { return audio_systems_list; } + TQStringList audioSystems() { return audio_systems_list; } KActionCollection* actionCollection() { return m_actions; } signals: - void trackChanged(const QString&); + void trackChanged(const TQString&); public slots: void setColors(); @@ -165,16 +165,16 @@ protected: void dragTime(int sec); - void closeEvent(QCloseEvent *e); - void keyPressEvent( QKeyEvent* e ); - bool event( QEvent *e ); - // void focusOutEvent(QFocusEvent *e); + void closeEvent(TQCloseEvent *e); + void keyPressEvent( TQKeyEvent* e ); + bool event( TQEvent *e ); + // void focusOutEvent(TQFocusEvent *e); void playtime(); void playtime(int seconds); void calculateDisplayedTime(); void calculateDisplayedTime(int sec); void setSongListTo(int whichTrack); - void populateSongList(QString infoStatus); + void populateSongList(TQString infoStatus); void updatePlayPB(bool playing); void updateConfigDialog(configWidget* widget); @@ -182,16 +182,16 @@ protected: private: KConfigDialog *configDialog; CDDBDlg *cddialog; - QPopupMenu *mainPopup; - QPopupMenu *infoPopup; + TQPopupMenu *mainPopup; + TQPopupMenu *infoPopup; BW_LED_Number *trackTimeLED[6]; KCompactDisc *m_cd; - QTimer titlelabeltimer; - QTimer queryledtimer; - QTimer cycletimer; - QTimer jumpTrackTimer; + TQTimer titlelabeltimer; + TQTimer queryledtimer; + TQTimer cycletimer; + TQTimer jumpTrackTimer; // random playlists KRandomSequence randSequence; @@ -204,7 +204,7 @@ private: LedLamp *loopled; bool randomplay_pending; bool updateTime; - QStringList audio_systems_list; + TQStringList audio_systems_list; /** * select a random track from the current disc. @@ -220,7 +220,7 @@ private: * Info from CDDB, and exploded versions thereof. */ KCDDB::CDInfo cddbInfo; - QStringList playlist; + TQStringList playlist; KCDDB::Client* cddb; KActionCollection* m_actions; KGlobalAccel* m_globalAccel; diff --git a/kscd/ledlamp.cpp b/kscd/ledlamp.cpp index bfaa5c4e..96675921 100644 --- a/kscd/ledlamp.cpp +++ b/kscd/ledlamp.cpp @@ -19,14 +19,14 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include "ledlamp.h" #include "ledlamp.moc" -LedLamp::LedLamp(QWidget *parent, Type t) : QFrame(parent), +LedLamp::LedLamp(TQWidget *parent, Type t) : TQFrame(parent), w( 10 ), h( 7 ), dx( 4 ) { // Make sure we're in a sane state @@ -39,15 +39,15 @@ LedLamp::LedLamp(QWidget *parent, Type t) : QFrame(parent), } // LedLamp void -LedLamp::drawContents(QPainter *painter) +LedLamp::drawContents(TQPainter *painter) { - QBrush lightBrush(this->foregroundColor()); - QBrush darkBrush(this->backgroundColor()); + TQBrush lightBrush(this->foregroundColor()); + TQBrush darkBrush(this->backgroundColor()); - QPen darkPen(this->backgroundColor(),1); - QPen lightPen(this->foregroundColor(), 1); + TQPen darkPen(this->backgroundColor(),1); + TQPen lightPen(this->foregroundColor(), 1); switch(s) { diff --git a/kscd/ledlamp.h b/kscd/ledlamp.h index ccabee32..af37edc7 100644 --- a/kscd/ledlamp.h +++ b/kscd/ledlamp.h @@ -23,7 +23,7 @@ #ifndef LED_LAMP_H #define LED_LAMP_H -#include +#include class LedLamp : public QFrame @@ -33,7 +33,7 @@ public: enum Type { Rect, Loop }; - LedLamp(QWidget *parent=0, Type t=Rect); + LedLamp(TQWidget *parent=0, Type t=Rect); enum State { On, Off }; @@ -50,7 +50,7 @@ public slots: void on() { setState(On); }; void off() { setState(Off); }; protected: - void drawContents(QPainter *); + void drawContents(TQPainter *); private: const int w; const int h; -- cgit v1.2.3