summaryrefslogtreecommitdiffstats
path: root/kscd
diff options
context:
space:
mode:
Diffstat (limited to 'kscd')
-rw-r--r--kscd/bwlednum.cpp4
-rw-r--r--kscd/configWidgetUI.ui6
-rw-r--r--kscd/kcompactdisc.cpp22
-rw-r--r--kscd/kcompactdisc.h6
-rw-r--r--kscd/kscd.cpp12
-rw-r--r--kscd/kscd.h4
-rw-r--r--kscd/kscdmagic/syna.h2
-rw-r--r--kscd/libwm/plat_news.c4
-rw-r--r--kscd/panel.ui10
9 files changed, 35 insertions, 35 deletions
diff --git a/kscd/bwlednum.cpp b/kscd/bwlednum.cpp
index 385c0c74..bb9ca8c1 100644
--- a/kscd/bwlednum.cpp
+++ b/kscd/bwlednum.cpp
@@ -84,7 +84,7 @@ void BW_LED_Number::setLEDColor( const TQColor& fgColor, const TQColor& bgColor
fgcolor = fgColor;
bgcolor = bgColor;
- TQColorGroup old_cg = this->tqcolorGroup();
+ TQColorGroup old_cg = this->colorGroup();
TQColorGroup new_cg( fgColor, bgColor,
@@ -277,7 +277,7 @@ void BW_LED_Number::drawSegment( const TQPoint &pos, char seg_number, TQPainter
TQPoint pt = pos;
- TQColorGroup g = tqcolorGroup();
+ TQColorGroup g = colorGroup();
TQColor lightColor,darkColor;
if ( erase ){
diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui
index 1477a193..de755edf 100644
--- a/kscd/configWidgetUI.ui
+++ b/kscd/configWidgetUI.ui
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>292</width>
<height>20</height>
@@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>171</width>
<height>81</height>
@@ -401,7 +401,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>45</height>
diff --git a/kscd/kcompactdisc.cpp b/kscd/kcompactdisc.cpp
index 83a9c532..ce2559ac 100644
--- a/kscd/kcompactdisc.cpp
+++ b/kscd/kcompactdisc.cpp
@@ -100,7 +100,7 @@ const unsigned KCompactDisc::missingDisc = (unsigned)-1;
KCompactDisc::KCompactDisc(InformationMode infoMode) :
m_device(TQString()),
m_status(0),
- m_previoustqStatus(123456),
+ m_previousStatus(123456),
m_discId(missingDisc),
m_previousDiscId(0),
m_artist(TQString()),
@@ -143,7 +143,7 @@ unsigned KCompactDisc::discPosition() const
return cur_pos_abs * 1000 - FRAMES_TO_MS(m_trackStartFrames[0]);
}
-TQString KCompactDisc::disctqStatus(int status)
+TQString KCompactDisc::discStatus(int status)
{
TQString message;
@@ -282,7 +282,7 @@ bool KCompactDisc::setDevice(
<< m_device << ", "
<< (digitalPlayback ? audioSystem : TQString()) << ", "
<< (digitalPlayback ? audioDevice : TQString()) << ", status: "
- << disctqStatus(status) << endl;
+ << discStatus(status) << endl;
if (status < 0)
{
@@ -295,7 +295,7 @@ bool KCompactDisc::setDevice(
setVolume(volume);
}
- m_previoustqStatus = m_status = wm_cd_status();
+ m_previousStatus = m_status = wm_cd_status();
if (m_infoMode == Asynchronous)
timerExpired();
@@ -307,7 +307,7 @@ bool KCompactDisc::setDevice(
void KCompactDisc::setVolume(unsigned volume)
{
int status = wm_cd_volume(volume, WM_BALANCE_SYMMETRED);
- kdDebug() << "Volume change: " << volume << ", status: " << disctqStatus(status) << endl;
+ kdDebug() << "Volume change: " << volume << ", status: " << discStatus(status) << endl;
}
void KCompactDisc::stop()
@@ -380,9 +380,9 @@ void KCompactDisc::timerExpired()
if (WM_CDS_NO_DISC(m_status) || (m_device == TQString()))
{
- if (m_previoustqStatus != m_status)
+ if (m_previousStatus != m_status)
{
- m_previoustqStatus = m_status;
+ m_previousStatus = m_status;
m_discId = missingDisc;
m_previousDiscId = 0;
m_trackArtists.clear();
@@ -450,12 +450,12 @@ void KCompactDisc::timerExpired()
}
if (isPlaying())
{
- m_previoustqStatus = m_status;
+ m_previousStatus = m_status;
// Update the current playing position.
emit trackPlaying(m_track, trackPosition());
}
else
- if (m_previoustqStatus != m_status)
+ if (m_previousStatus != 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_previoustqStatus == WM_CDM_PLAYING || m_previoustqStatus == WM_CDM_PAUSED
+ if (m_previousStatus == WM_CDM_PLAYING || m_previousStatus == WM_CDM_PAUSED
&& m_status == WM_CDM_STOPPED)
{
emit discStopped();
@@ -475,7 +475,7 @@ void KCompactDisc::timerExpired()
break;
}
- m_previoustqStatus = m_status;
+ m_previousStatus = m_status;
}
}
diff --git a/kscd/kcompactdisc.h b/kscd/kcompactdisc.h
index 10d5eabb..eeb17989 100644
--- a/kscd/kcompactdisc.h
+++ b/kscd/kcompactdisc.h
@@ -281,7 +281,7 @@ private:
TQTimer timer;
TQString m_device;
int m_status;
- int m_previoustqStatus;
+ int m_previousStatus;
unsigned m_discId;
unsigned m_previousDiscId;
TQString m_artist;
@@ -292,8 +292,8 @@ private:
TQStringList m_trackTitles;
unsigned m_track;
unsigned m_previousTrack;
- void checkDevicetqStatus();
- TQString disctqStatus(int status);
+ void checkDeviceStatus();
+ TQString discStatus(int status);
class KCompactDiscPrivate *d;
InformationMode m_infoMode;
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 74842d50..8c025ab2 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -212,7 +212,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
setFocusPolicy(TQ_NoFocus);
- songListCB->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed);
+ songListCB->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed);
adjustSize();
setFixedHeight(this->height());
} // KSCD
@@ -688,7 +688,7 @@ void KSCD::randomSelected()
{
setShuffle(Prefs::randomPlay()?0:1);
- /* FIXME this helps us to display "Random" in tqStatus line
+ /* FIXME this helps us to display "Random" in Status line
should it maybe to be replaced with symbol "RAND" or something others */
statuslabel->setText(Prefs::randomPlay()?i18n("Random"):i18n("Play"));
} // randomSelected
@@ -1313,7 +1313,7 @@ int KSCD::currentPosition()
return m_cd->trackPosition();
}
-int KSCD::gettqStatus()
+int KSCD::getStatus()
{
if (m_cd->isPlaying())
return 2;
@@ -1563,11 +1563,11 @@ TQStringList KSCD::trackList()
return tracks;
}
-void KSCD::populateSongList(TQString infotqStatus)
+void KSCD::populateSongList(TQString infoStatus)
{
// set the artist and title labels as well as the dock tooltip.
- if (!infotqStatus.isEmpty())
- artistlabel->setText(infotqStatus);
+ if (!infoStatus.isEmpty())
+ artistlabel->setText(infoStatus);
else
artistlabel->setText(TQString("%1 - %2").tqarg(cddbInfo.artist, cddbInfo.title));
diff --git a/kscd/kscd.h b/kscd/kscd.h
index a6c192bd..9a4e1044 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -102,7 +102,7 @@ k_dcop:
int currentTrack();
int currentTrackLength();
int currentPosition();
- int gettqStatus();
+ int getStatus();
TQString currentTrackTitle();
TQString currentAlbum();
TQString currentArtist();
@@ -175,7 +175,7 @@ protected:
void calculateDisplayedTime();
void calculateDisplayedTime(int sec);
void setSongListTo(int whichTrack);
- void populateSongList(TQString infotqStatus);
+ void populateSongList(TQString infoStatus);
void updatePlayPB(bool playing);
void updateConfigDialog(configWidget* widget);
diff --git a/kscd/kscdmagic/syna.h b/kscd/kscdmagic/syna.h
index 4d35e3e0..d359a8c2 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 cdGettqStatus(int &track, int &frames, SymbolID &state);
+void cdGetStatus(int &track, int &frames, SymbolID &state);
void cdPlay(int trackFrame, int endFrame=-1);
void cdStop(void);
void cdPause(void);
diff --git a/kscd/libwm/plat_news.c b/kscd/libwm/plat_news.c
index 304ebfda..4b9f2ef7 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_tqStatus sc;
+ struct CD_Status 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_GettqStatus(d->fd, &sc))
+ if (CD_GetStatus(d->fd, &sc))
{
gen_close(d);
return (0);
diff --git a/kscd/panel.ui b/kscd/panel.ui
index 43fd739a..ab9203ec 100644
--- a/kscd/panel.ui
+++ b/kscd/panel.ui
@@ -92,7 +92,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -160,7 +160,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>270</width>
<height>80</height>
@@ -221,7 +221,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>100</width>
<height>35</height>
@@ -239,7 +239,7 @@
<cstring>statuslabel</cstring>
</property>
<property name="text">
- <string>tqStatus</string>
+ <string>Status</string>
</property>
</widget>
<widget class="TQLabel" row="1" column="2">
@@ -275,7 +275,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 08:18:46 +0000