diff --git a/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui b/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
index ebdd9a1..6d15369 100644
--- a/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
+++ b/kradio3/plugins/alsa-sound/alsa-mixer-element-ui.ui
@@ -37,7 +37,7 @@
Expanding
-
+
16
20
@@ -54,7 +54,7 @@
Expanding
-
+
1
40
@@ -85,7 +85,7 @@
Expanding
-
+
1
40
@@ -102,7 +102,7 @@
Expanding
-
+
20
20
@@ -129,7 +129,7 @@
Expanding
-
+
11
20
@@ -157,7 +157,7 @@
Expanding
-
+
11
20
@@ -184,7 +184,7 @@
Expanding
-
+
16
20
@@ -236,7 +236,7 @@
Expanding
-
+
16
20
diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui b/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
index c15e91d..e487fb1 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
+++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration-ui.ui
@@ -50,7 +50,7 @@
Expanding
-
+
20
5
@@ -259,7 +259,7 @@
Expanding
-
+
20
40
diff --git a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
index 88c4d57..e1905ec 100644
--- a/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
+++ b/kradio3/plugins/alsa-sound/alsa-sound-configuration.cpp
@@ -135,13 +135,13 @@ void AlsaSoundConfiguration::slotCaptureCardSelected(const TQString &cardname)
delete m_groupMixerSubFrame;
m_groupMixerSubFrame = new TQFrame(m_groupMixerScrollView->viewport());
- m_groupMixerSubFrame->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
+ m_groupMixerSubFrame->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Maximum);
m_groupMixerScrollView->addChild(m_groupMixerSubFrame);
int rows = 1;
int cols = (all_list.count()+rows-1)/rows;
m_groupMixerLayout = new TQGridLayout( m_groupMixerSubFrame, rows, cols, 0, 0 );
- m_groupMixerLayout->tqsetAlignment( TQt::AlignBottom );
+ m_groupMixerLayout->setAlignment( TQt::AlignBottom );
int idx = 0;
for (TQValueListConstIterator it = all_list.begin(); it != all_list.end(); ++it, ++idx) {
diff --git a/kradio3/plugins/gui-error-log/errorlog.cpp b/kradio3/plugins/gui-error-log/errorlog.cpp
index b675d14..e593192 100644
--- a/kradio3/plugins/gui-error-log/errorlog.cpp
+++ b/kradio3/plugins/gui-error-log/errorlog.cpp
@@ -183,7 +183,7 @@ void ErrorLog::hideEvent(TQHideEvent *e)
bool ErrorLog::logError (const TQString &s)
{
- m_teErrors->append("" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + " " + s + "\n");
+ m_teErrors->append("" + TQDateTime::currentDateTime().toString(Qt::ISODate) + " " + s + "\n");
if (init_done) {
showPage(PAGE_ID_ERROR);
show();
@@ -193,19 +193,19 @@ bool ErrorLog::logError (const TQString &s)
bool ErrorLog::logWarning(const TQString &s)
{
- m_teWarnings->append("" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + " " + s + "\n");
+ m_teWarnings->append("" + TQDateTime::currentDateTime().toString(Qt::ISODate) + " " + s + "\n");
return true;
}
bool ErrorLog::logInfo (const TQString &s)
{
- m_teInfos->append("" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + " " + s + "\n");
+ m_teInfos->append("" + TQDateTime::currentDateTime().toString(Qt::ISODate) + " " + s + "\n");
return true;
}
bool ErrorLog::logDebug (const TQString &s)
{
- m_teDebug->append("" + TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + " " + s + "\n");
+ m_teDebug->append("" + TQDateTime::currentDateTime().toString(Qt::ISODate) + " " + s + "\n");
return true;
}
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
index 4cd8dd0..528f9c5 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.cpp
@@ -104,9 +104,9 @@ bool ButtonFlowLayout::hasHeightForWidth() const
return TRUE;
}
-TQSize ButtonFlowLayout::tqsizeHint() const
+TQSize ButtonFlowLayout::sizeHint() const
{
- return tqminimumSize();
+ return minimumSize();
}
TQSizePolicy::ExpandData ButtonFlowLayout::expanding() const
@@ -154,8 +154,8 @@ int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
it.toFirst();
while ( (o=it.current()) != 0 ) {
++it;
- buttonWidth = TQMAX( buttonWidth, o->tqsizeHint().width() );
- buttonHeight = TQMAX( buttonHeight, o->tqsizeHint().height() );
+ buttonWidth = TQMAX( buttonWidth, o->sizeHint().width() );
+ buttonHeight = TQMAX( buttonHeight, o->sizeHint().height() );
}
// calculate the optimal width
@@ -217,19 +217,19 @@ int ButtonFlowLayout::doLayout( const TQRect &r, bool testonly )
}
-TQSize ButtonFlowLayout::tqminimumSize() const
+TQSize ButtonFlowLayout::minimumSize() const
{
- return tqminimumSize(tqgeometry().size());
+ return minimumSize(tqgeometry().size());
}
-TQSize ButtonFlowLayout::tqminimumSize(const TQSize &r) const
+TQSize ButtonFlowLayout::minimumSize(const TQSize &r) const
{
TQSize s(0, 0);
for (TQPtrListIterator it(list); it.current(); ++it) {
TQLayoutItem *o = it.current();
- s = s.expandedTo( o->tqsizeHint()); //tqminimumSize() );
+ s = s.expandedTo( o->sizeHint()); //minimumSize() );
}
s.setHeight(heightForWidth(r.width()));
diff --git a/kradio3/plugins/gui-quickbar/buttonflowlayout.h b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
index fe33efc..bca27f0 100644
--- a/kradio3/plugins/gui-quickbar/buttonflowlayout.h
+++ b/kradio3/plugins/gui-quickbar/buttonflowlayout.h
@@ -41,9 +41,9 @@ public:
void addItem( TQLayoutItem *item);
bool hasHeightForWidth() const;
int heightForWidth( int ) const;
- TQSize tqsizeHint() const;
- TQSize tqminimumSize() const;
- TQSize tqminimumSize(const TQSize &r) const; // tqminimumSize is dependent from width
+ TQSize sizeHint() const;
+ TQSize minimumSize() const;
+ TQSize minimumSize(const TQSize &r) const; // minimumSize is dependent from width
TQLayoutIterator iterator();
TQSizePolicy::ExpandData expanding() const;
diff --git a/kradio3/plugins/gui-quickbar/quickbar.cpp b/kradio3/plugins/gui-quickbar/quickbar.cpp
index ca1d4d8..a5b0340 100644
--- a/kradio3/plugins/gui-quickbar/quickbar.cpp
+++ b/kradio3/plugins/gui-quickbar/quickbar.cpp
@@ -303,7 +303,7 @@ void QuickBar::rebuildGUI()
else
b->setText(m_showShortName ? rs.shortName() : rs.name());
- b->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
+ b->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred));
TQToolTip::add(b, rs.longName());
if (isVisible()) b->show();
@@ -367,7 +367,7 @@ void QuickBar::setGeometry (int x, int y, int w, int h)
{
if (m_layout) {
TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2);
- setMinimumSize(m_layout->tqminimumSize(TQSize(w, h) - marginSize) + marginSize);
+ setMinimumSize(m_layout->minimumSize(TQSize(w, h) - marginSize) + marginSize);
}
TQWidget::setGeometry (x, y, w, h);
}
@@ -381,10 +381,10 @@ void QuickBar::setGeometry (const TQRect &r)
void QuickBar::resizeEvent (TQResizeEvent *e)
{
- // tqminimumSize might change because of the flow tqlayout
+ // minimumSize might change because of the flow tqlayout
if (m_layout) {
TQSize marginSize(m_layout->margin()*2, m_layout->margin()*2);
- setMinimumSize(m_layout->tqminimumSize(e->size() - marginSize) + marginSize);
+ setMinimumSize(m_layout->minimumSize(e->size() - marginSize) + marginSize);
}
TQWidget::resizeEvent (e);
diff --git a/kradio3/plugins/gui-standard-display/displaycfg.cpp b/kradio3/plugins/gui-standard-display/displaycfg.cpp
index 0e92da7..16ebad2 100644
--- a/kradio3/plugins/gui-standard-display/displaycfg.cpp
+++ b/kradio3/plugins/gui-standard-display/displaycfg.cpp
@@ -48,16 +48,16 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
TQLabel *l2 = new TQLabel(i18n("Inactive Text"), bg);
TQLabel *l3 = new TQLabel(i18n("Background Color"), bg);
- l1->tqsetAlignment(TQLabel::AlignCenter);
- l2->tqsetAlignment(TQLabel::AlignCenter);
- l3->tqsetAlignment(TQLabel::AlignCenter);
+ l1->setAlignment(TQLabel::AlignCenter);
+ l2->setAlignment(TQLabel::AlignCenter);
+ l3->setAlignment(TQLabel::AlignCenter);
- l1->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
- l2->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
- l3->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
- m_btnActive ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
- m_btnInactive->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
- m_btnBkgnd ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ l1->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ l2->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ l3->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ m_btnActive ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_btnInactive->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_btnBkgnd ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
m_btnActive ->setMinimumSize(TQSize(40, 40));
m_btnInactive->setMinimumSize(TQSize(40, 40));
@@ -72,7 +72,7 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
m_fontChooser = new KFontChooser(this, NULL, false, TQStringList(), true, 4);
m_fontChooser->setFont(queryDisplayFont());
- m_fontChooser->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ m_fontChooser->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
TQVBoxLayout *l = new TQVBoxLayout(this, 10);
l->addWidget(bg);
diff --git a/kradio3/plugins/gui-standard-display/radioview.cpp b/kradio3/plugins/gui-standard-display/radioview.cpp
index c5f12f2..65430b2 100644
--- a/kradio3/plugins/gui-standard-display/radioview.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview.cpp
@@ -162,10 +162,10 @@ RadioView::RadioView(const TQString &name)
btnSnooze->setIconSet(SmallIconSet("kradio_zzz"));
btnPlugins->setIconSet(SmallIconSet("kradio_plugins"));
- widgetStacks[clsRadioSound] ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
- widgetStacks[clsRadioDisplay]->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred));
- widgetStacks[clsRadioSeek] ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
- comboStations ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+ widgetStacks[clsRadioSound] ->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Preferred));
+ widgetStacks[clsRadioDisplay]->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred));
+ widgetStacks[clsRadioSeek] ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+ comboStations ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
comboStations->setMinimumHeight(28);
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
index 17afde3..5afaf09 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
@@ -185,11 +185,11 @@ bool RadioViewFrequencyRadio::setDisplayColors(const TQColor &activeText,
if (parentWidget() && parentWidget()->backgroundPixmap() ){
KPixmapIO io;
TQImage i = io.convertToImage(*parentWidget()->backgroundPixmap());
- KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark));
+ KImageEffect::fade(i, 0.5, colorGroup().color(TQColorGroup::Dark));
setPaletteBackgroundPixmap(io.convertToPixmap(i));
setBackgroundOrigin(WindowOrigin);
} else {
- setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button));
+ setBackgroundColor(colorGroup().color(TQColorGroup::Button));
}
if (change)
@@ -320,10 +320,10 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint)
xx_sg = r.x() + margin,
xy_sg = r.y() + margin;
- TQPen activePen (tqcolorGroup().color(TQColorGroup::Text), penw);
- TQPen inactivePen (tqcolorGroup().color(TQColorGroup::Mid), penw);
- TQBrush activeBrush = tqcolorGroup().brush(TQColorGroup::Text);
- TQBrush inactiveBrush = tqcolorGroup().brush(TQColorGroup::Mid);
+ TQPen activePen (colorGroup().color(TQColorGroup::Text), penw);
+ TQPen inactivePen (colorGroup().color(TQColorGroup::Mid), penw);
+ TQBrush activeBrush = colorGroup().brush(TQColorGroup::Text);
+ TQBrush inactiveBrush = colorGroup().brush(TQColorGroup::Mid);
// draw stereo symbol
paint->setPen( (m_stereo && m_power) ? activePen : inactivePen);
diff --git a/kradio3/plugins/radio/radio-configuration-ui.ui b/kradio3/plugins/radio/radio-configuration-ui.ui
index 28e936e..5e8ed61 100644
--- a/kradio3/plugins/radio/radio-configuration-ui.ui
+++ b/kradio3/plugins/radio/radio-configuration-ui.ui
@@ -122,7 +122,7 @@
Expanding
-
+
20
10
@@ -358,7 +358,7 @@
0
-
+
0
0
@@ -395,7 +395,7 @@
0
-
+
20
20
@@ -415,7 +415,7 @@
Expanding
-
+
10
5
@@ -434,7 +434,7 @@
Expanding
-
+
20
10
@@ -481,7 +481,7 @@
Expanding
-
+
21
20
@@ -541,7 +541,7 @@
Expanding
-
+
21
20
@@ -683,7 +683,7 @@
Expanding
-
+
20
20
diff --git a/kradio3/plugins/radio/radio-configuration.cpp b/kradio3/plugins/radio/radio-configuration.cpp
index 4cbf764..b4136b6 100644
--- a/kradio3/plugins/radio/radio-configuration.cpp
+++ b/kradio3/plugins/radio/radio-configuration.cpp
@@ -484,7 +484,7 @@ void RadioConfiguration::slotStorePresets()
void RadioConfiguration::slotLastChangeNow()
{
slotSetDirty();
- editLastChange->setDateTime(TQDateTime::tqcurrentDateTime());
+ editLastChange->setDateTime(TQDateTime::currentDateTime());
}
diff --git a/kradio3/plugins/recording/encoder_mp3.cpp b/kradio3/plugins/recording/encoder_mp3.cpp
index 8d76fe2..15bc06c 100644
--- a/kradio3/plugins/recording/encoder_mp3.cpp
+++ b/kradio3/plugins/recording/encoder_mp3.cpp
@@ -126,7 +126,7 @@ bool RecordingEncodingMP3::openOutput(const TQString &output)
if (!m_error) {
id3tag_init(m_LAMEFlags);
id3tag_add_v2(m_LAMEFlags);
- TQString title = m_RadioStation->name() + TQString().sprintf(" - %s", (TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)).ascii());
+ TQString title = m_RadioStation->name() + TQString().sprintf(" - %s", (TQDateTime::currentDateTime().toString(Qt::ISODate)).ascii());
TQString comment = i18n("Recorded by KRadio");
size_t l = title.length() + comment.length() + 10;
m_ID3Tags = new char[l];
diff --git a/kradio3/plugins/recording/encoder_ogg.cpp b/kradio3/plugins/recording/encoder_ogg.cpp
index b51eedd..110238a 100644
--- a/kradio3/plugins/recording/encoder_ogg.cpp
+++ b/kradio3/plugins/recording/encoder_ogg.cpp
@@ -176,7 +176,7 @@ bool RecordingEncodingOgg::openOutput(const TQString &output)
vorbis_comment_init (&vc);
vorbis_comment_add_tag_new(&vc, "creator", "KRadio" VERSION);
vorbis_comment_add_tag_new(&vc, "title", m_RadioStation->longName().utf8());
- vorbis_comment_add_tag_new(&vc, "date", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate));
+ vorbis_comment_add_tag_new(&vc, "date", TQDateTime::currentDateTime().toString(Qt::ISODate));
vorbis_analysis_headerout(&m_VorbisDSP, &vc,
&header_main, &header_comments, &header_codebooks);
diff --git a/kradio3/plugins/recording/recording-configuration-ui.ui b/kradio3/plugins/recording/recording-configuration-ui.ui
index e5ba41c..1c6ece2 100644
--- a/kradio3/plugins/recording/recording-configuration-ui.ui
+++ b/kradio3/plugins/recording/recording-configuration-ui.ui
@@ -66,7 +66,7 @@
Expanding
-
+
141
20
@@ -107,7 +107,7 @@
Expanding
-
+
141
20
@@ -222,7 +222,7 @@
Expanding
-
+
20
5
@@ -263,7 +263,7 @@
Minimum
-
+
225
20
@@ -321,7 +321,7 @@
Minimum
-
+
225
20
@@ -454,7 +454,7 @@
Minimum
-
+
225
20
@@ -473,7 +473,7 @@
Expanding
-
+
20
5
@@ -563,7 +563,7 @@
Expanding
-
+
20
16
@@ -623,7 +623,7 @@
Expanding
-
+
380
20
@@ -688,7 +688,7 @@
Expanding
-
+
20
16
diff --git a/kradio3/plugins/recording/recording-datamonitor.cpp b/kradio3/plugins/recording/recording-datamonitor.cpp
index 8f22b1a..00b4755 100644
--- a/kradio3/plugins/recording/recording-datamonitor.cpp
+++ b/kradio3/plugins/recording/recording-datamonitor.cpp
@@ -50,7 +50,7 @@ RecordingDataMonitor::RecordingDataMonitor(TQWidget *parent, const char *name)
setColors(TQColor(20, 244, 20),
TQColor(10, 117, 10));
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+ setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
}
@@ -107,10 +107,10 @@ void RecordingDataMonitor::internalDrawContents(TQPainter &painter, bool repaint
if (m_channels <= 0) return;
TQRect r = contentsRect();
- TQPen activePen (tqcolorGroup().color(TQColorGroup::Text), 1);
- TQPen inactivePen (tqcolorGroup().color(TQColorGroup::Mid), 1);
- TQBrush activeBrush = tqcolorGroup().brush(TQColorGroup::Text);
- TQBrush inactiveBrush = tqcolorGroup().brush(TQColorGroup::Mid);
+ TQPen activePen (colorGroup().color(TQColorGroup::Text), 1);
+ TQPen inactivePen (colorGroup().color(TQColorGroup::Mid), 1);
+ TQBrush activeBrush = colorGroup().brush(TQColorGroup::Text);
+ TQBrush inactiveBrush = colorGroup().brush(TQColorGroup::Mid);
TQBrush yellowBrush(TQColor(255,255,0));
TQBrush orangeBrush(TQColor(255,192,0));
TQBrush redBrush (TQColor(255,0, 0));
@@ -223,11 +223,11 @@ bool RecordingDataMonitor::setColors(const TQColor &activeText,
if (parentWidget() && parentWidget()->backgroundPixmap() ){
KPixmapIO io;
TQImage i = io.convertToImage(*parentWidget()->backgroundPixmap());
- KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark));
+ KImageEffect::fade(i, 0.5, colorGroup().color(TQColorGroup::Dark));
setPaletteBackgroundPixmap(io.convertToPixmap(i));
setBackgroundOrigin(WindowOrigin);
} else {
- setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button));
+ setBackgroundColor(colorGroup().color(TQColorGroup::Button));
}
return true;
diff --git a/kradio3/plugins/recording/recording-monitor.cpp b/kradio3/plugins/recording/recording-monitor.cpp
index 063a095..24c2e05 100644
--- a/kradio3/plugins/recording/recording-monitor.cpp
+++ b/kradio3/plugins/recording/recording-monitor.cpp
@@ -43,7 +43,7 @@ RecordingMonitor::RecordingMonitor(const TQString &name)
l0->addWidget( new TQLabel(i18n("SoundStream"), this), 0, 0);
l0->addWidget(m_comboSoundStreamSelector = new KComboBox( this), 0, 1);
l0->addWidget( new TQLabel(i18n("Status"), this), 1, 0);
- l0->addWidget(m_labeltqStatus = new TQLabel(i18n(""), this), 1, 1);
+ l0->addWidget(m_labelStatus = new TQLabel(i18n(""), this), 1, 1);
l0->addWidget( new TQLabel(i18n("Recording File"), this), 2, 0);
l0->addWidget(m_labelFileName = new TQLabel(i18n(""), this), 2, 1);
l0->addWidget( new TQLabel(i18n("File Size"), this), 3, 0);
@@ -369,7 +369,7 @@ void RecordingMonitor::slotStreamSelected(int idx)
m_labelTime ->setEnabled(true);
m_labelRate ->setEnabled(true);
m_labelFileName ->setEnabled(true);
- m_labeltqStatus ->setEnabled(true);
+ m_labelStatus ->setEnabled(true);
} else {
m_dataMonitor ->setEnabled(false);
m_labelSize ->setEnabled(false);
@@ -377,7 +377,7 @@ void RecordingMonitor::slotStreamSelected(int idx)
m_labelTime ->setEnabled(false);
m_labelRate ->setEnabled(false);
m_labelFileName ->setEnabled(false);
- m_labeltqStatus ->setEnabled(false);
+ m_labelStatus ->setEnabled(false);
}
m_currentStream = id;
m_recording = false;
diff --git a/kradio3/plugins/recording/recording-monitor.h b/kradio3/plugins/recording/recording-monitor.h
index a979c02..5f9247a 100644
--- a/kradio3/plugins/recording/recording-monitor.h
+++ b/kradio3/plugins/recording/recording-monitor.h
@@ -105,7 +105,7 @@ protected:
TQLabel *m_labelTime;
TQLabel *m_labelRate;
TQLabel *m_labelFileName;
- TQLabel *m_labeltqStatus;
+ TQLabel *m_labelStatus;
TQPushButton *m_btnStartStop;
KComboBox *m_comboSoundStreamSelector;
diff --git a/kradio3/plugins/recording/recording.cpp b/kradio3/plugins/recording/recording.cpp
index ca11bfe..9707de9 100644
--- a/kradio3/plugins/recording/recording.cpp
+++ b/kradio3/plugins/recording/recording.cpp
@@ -529,7 +529,7 @@ bool Recording::startEncoder(SoundStreamID ssid, const RecordingConfig &cfg)
TQString station = rs ? rs->name() + "-" : "";
station.replace(TQRegExp("[/*?]"), "_");
- TQDate date = TQDate::tqcurrentDate();
+ TQDate date = TQDate::currentDate();
TQTime time = TQTime::currentTime();
TQString sdate;
diff --git a/kradio3/plugins/streaming/streaming-configuration-ui.ui b/kradio3/plugins/streaming/streaming-configuration-ui.ui
index 884e03c..591bc87 100644
--- a/kradio3/plugins/streaming/streaming-configuration-ui.ui
+++ b/kradio3/plugins/streaming/streaming-configuration-ui.ui
@@ -142,13 +142,13 @@
0
-
+
30
30
-
+
30
30
@@ -173,13 +173,13 @@
0
-
+
30
30
-
+
30
30
@@ -202,7 +202,7 @@
Expanding
-
+
10
10
@@ -221,13 +221,13 @@
0
-
+
30
30
-
+
30
30
@@ -252,13 +252,13 @@
0
-
+
30
30
-
+
30
30
@@ -293,13 +293,13 @@
0
-
+
30
30
-
+
30
30
@@ -324,13 +324,13 @@
0
-
+
30
30
-
+
30
30
@@ -353,7 +353,7 @@
Expanding
-
+
10
10
@@ -372,13 +372,13 @@
0
-
+
30
30
-
+
30
30
@@ -403,13 +403,13 @@
0
-
+
30
30
-
+
30
30
@@ -658,7 +658,7 @@
Minimum
-
+
140
20
@@ -675,7 +675,7 @@
Minimum
-
+
140
20
@@ -692,7 +692,7 @@
Minimum
-
+
140
20
@@ -709,7 +709,7 @@
Minimum
-
+
140
20
@@ -726,7 +726,7 @@
Minimum
-
+
140
20
diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
index 15ecc20..c5b92b8 100644
--- a/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
+++ b/kradio3/plugins/timecontrol/timecontrol-configuration-ui.ui
@@ -62,7 +62,7 @@
Expanding
-
+
40
20
@@ -273,7 +273,7 @@
Expanding
-
+
20
100
@@ -358,7 +358,7 @@
pixmapAlarmStation
-
+
20
20
@@ -378,7 +378,7 @@
Expanding
-
+
150
20
diff --git a/kradio3/plugins/timecontrol/timecontrol-configuration.cpp b/kradio3/plugins/timecontrol/timecontrol-configuration.cpp
index 31ec3db..c72aa5e 100644
--- a/kradio3/plugins/timecontrol/timecontrol-configuration.cpp
+++ b/kradio3/plugins/timecontrol/timecontrol-configuration.cpp
@@ -371,7 +371,7 @@ void TimeControlConfiguration::slotAlarmSelectChanged(int idx)
void TimeControlConfiguration::slotNewAlarm()
{
- TQDateTime dt(TQDateTime::tqcurrentDateTime());
+ TQDateTime dt(TQDateTime::currentDateTime());
Alarm a(dt, false, false);
alarms.push_back(a);
listAlarms->insertItem(a.alarmTime().toString());
diff --git a/kradio3/plugins/timecontrol/timecontrol.cpp b/kradio3/plugins/timecontrol/timecontrol.cpp
index 276e602..e5f99cf 100644
--- a/kradio3/plugins/timecontrol/timecontrol.cpp
+++ b/kradio3/plugins/timecontrol/timecontrol.cpp
@@ -102,7 +102,7 @@ bool TimeControl::setCountdownSeconds(int n)
bool TimeControl::startCountdown()
{
- m_countdownEnd = TQDateTime::tqcurrentDateTime().addSecs(m_countdownSeconds);
+ m_countdownEnd = TQDateTime::currentDateTime().addSecs(m_countdownSeconds);
m_countdownTimer.start(m_countdownSeconds * 1000, true);
notifyCountdownStarted(getCountdownEnd());
@@ -134,7 +134,7 @@ TQDateTime TimeControl::getNextAlarmTime() const
const Alarm *TimeControl::getNextAlarm () const
{
- TQDateTime now = TQDateTime::tqcurrentDateTime(),
+ TQDateTime now = TQDateTime::currentDateTime(),
next;
const Alarm *retval = NULL;
@@ -180,7 +180,7 @@ void TimeControl::slotQTimerAlarmTimeout()
notifyAlarm(*m_waitingFor);
}
- TQDateTime now = TQDateTime::tqcurrentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
Alarm const *n = getNextAlarm();
TQDateTime na = getNextAlarmTime();
diff --git a/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui b/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
index 2020bbc..c6b6109 100644
--- a/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
+++ b/kradio3/plugins/timeshifter/timeshifter-configuration-ui.ui
@@ -40,7 +40,7 @@
Preferred
-
+
30
21
@@ -57,7 +57,7 @@
Preferred
-
+
104
21
@@ -133,7 +133,7 @@
0
-
+
26
26
@@ -166,7 +166,7 @@
Preferred
-
+
30
21
@@ -183,7 +183,7 @@
Preferred
-
+
30
21
@@ -202,7 +202,7 @@
Expanding
-
+
20
61
diff --git a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
index 06550c7..9baedf3 100644
--- a/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
+++ b/kradio3/plugins/v4lradio/v4lradio-configuration-ui.ui
@@ -53,7 +53,7 @@
Preferred
-
+
40
21
@@ -86,7 +86,7 @@
Preferred
-
+
40
21
@@ -103,7 +103,7 @@
Preferred
-
+
40
21
@@ -120,7 +120,7 @@
Preferred
-
+
40
21
@@ -137,7 +137,7 @@
Preferred
-
+
40
21
@@ -154,7 +154,7 @@
Preferred
-
+
152
21
@@ -292,7 +292,7 @@
Expanding
-
+
5
5
@@ -549,7 +549,7 @@
Expanding
-
+
20
5
@@ -615,7 +615,7 @@
Expanding
-
+
20
20
@@ -643,7 +643,7 @@
Expanding
-
+
16
20
@@ -705,7 +705,7 @@
Expanding
-
+
20
20
@@ -733,7 +733,7 @@
Expanding
-
+
16
20
@@ -795,7 +795,7 @@
Expanding
-
+
20
20
@@ -823,7 +823,7 @@
Expanding
-
+
16
20
@@ -874,7 +874,7 @@
Expanding
-
+
20
33
@@ -911,7 +911,7 @@
Expanding
-
+
20
33
diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp
index 8d81179..fed81f5 100644
--- a/kradio3/src/aboutwidget.cpp
+++ b/kradio3/src/aboutwidget.cpp
@@ -45,8 +45,8 @@ class KRadioAboutTabWidget : public TQTabWidget
{
public:
KRadioAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
- TQSize tqsizeHint() const {
- return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) );
+ TQSize sizeHint() const {
+ return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) );
}
};
@@ -75,7 +75,7 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int layoutType
if( layoutType & AbtTitle )
{
mTitleLabel = new TQLabel( this, "title" );
- mTitleLabel->tqsetAlignment(AlignCenter);
+ mTitleLabel->setAlignment(AlignCenter);
mTopLayout->addWidget( mTitleLabel );
mTopLayout->addSpacing( KDialog::spacingHint() );
}
@@ -190,9 +190,9 @@ void KRadioAboutWidget::show( void )
TQWidget::show();
}
-TQSize KRadioAboutWidget::tqsizeHint( void ) const
+TQSize KRadioAboutWidget::sizeHint( void ) const
{
- return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) );
+ return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
}
void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ )
@@ -449,10 +449,10 @@ void KRadioAboutWidget::setProduct( const TQString &appName,
mIconLabel->setPixmap( kapp->icon() );
TQString msg1 = i18n("%1 %2 (Using KDE %3)").tqarg(appName).
- arg(TQString::tqfromLatin1(KRADIO_VERSION)).
- arg(TQString::tqfromLatin1(TDE_VERSION_STRING));
+ arg(TQString::fromLatin1(KRADIO_VERSION)).
+ arg(TQString::fromLatin1(TDE_VERSION_STRING));
TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").tqarg('©').tqarg(year).
- arg(author) : TQString::tqfromLatin1("");
+ arg(author) : TQString::fromLatin1("");
mVersionLabel->setText( msg1 );
mAuthorLabel->setText( msg2 );
@@ -563,7 +563,7 @@ void KRadioAboutWidget::setAboutData(const KAboutData &_aboutData)
TQLabel *label = new TQLabel(KAboutData::aboutTranslationTeam(),
translatorPage);
label->adjustSize();
- label->setMinimumSize(label->tqsizeHint());
+ label->setMinimumSize(label->sizeHint());
translatorPage->addWidget(label);
}
diff --git a/kradio3/src/alarm.cpp b/kradio3/src/alarm.cpp
index a7335d7..475d48b 100644
--- a/kradio3/src/alarm.cpp
+++ b/kradio3/src/alarm.cpp
@@ -64,7 +64,7 @@ Alarm::~Alarm()
TQDateTime Alarm::nextAlarm(bool ignoreEnable) const
{
- TQDateTime now = TQDateTime::tqcurrentDateTime(),
+ TQDateTime now = TQDateTime::currentDateTime(),
alarm = m_time;
if (m_daily) {
alarm.setDate (now.date());
diff --git a/kradio3/src/errorlog-interfaces.cpp b/kradio3/src/errorlog-interfaces.cpp
index 65e2e43..5b55fdb 100644
--- a/kradio3/src/errorlog-interfaces.cpp
+++ b/kradio3/src/errorlog-interfaces.cpp
@@ -41,7 +41,7 @@ IErrorLog::~IErrorLog()
int IErrorLogClient::sendLogError(const TQString &s) const
{
kdDebug() << TQString(i18n("%1 Error: %2\n"))
- .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+ .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s);
IF_SEND_MESSAGE(logError(s));
}
@@ -50,7 +50,7 @@ int IErrorLogClient::sendLogError(const TQString &s) const
int IErrorLogClient::sendLogWarning(const TQString &s) const
{
kdDebug() << TQString(i18n("%1 Warning: %2\n"))
- .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+ .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s);
IF_SEND_MESSAGE(logWarning(s));
}
@@ -59,7 +59,7 @@ int IErrorLogClient::sendLogWarning(const TQString &s) const
int IErrorLogClient::sendLogInfo(const TQString &s) const
{
kdDebug() << TQString(i18n("%1 Information: %2\n"))
- .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+ .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s);
IF_SEND_MESSAGE(logInfo(s));
}
@@ -68,7 +68,7 @@ int IErrorLogClient::sendLogInfo(const TQString &s) const
int IErrorLogClient::sendLogDebug(const TQString &s) const
{
kdDebug() << TQString(i18n("%1 Debug: %2\n"))
- .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+ .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s);
IF_SEND_MESSAGE(logDebug(s));
}
@@ -76,7 +76,7 @@ int IErrorLogClient::sendLogDebug(const TQString &s) const
void IErrorLogClient::staticLogError (const TQString &s)
{
kdDebug() << TQString(i18n("%1 Error: %2\n"))
- .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+ .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s);
if (staticLogger)
staticLogger->logError(s);
@@ -85,7 +85,7 @@ void IErrorLogClient::staticLogError (const TQString &s)
void IErrorLogClient::staticLogWarning(const TQString &s)
{
kdDebug() << TQString(i18n("%1 Warning: %2\n"))
- .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+ .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s);
if (staticLogger)
staticLogger->logWarning(s);
@@ -94,7 +94,7 @@ void IErrorLogClient::staticLogWarning(const TQString &s)
void IErrorLogClient::staticLogInfo (const TQString &s)
{
kdDebug() << TQString(i18n("%1 Information: %2\n"))
- .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+ .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s);
if (staticLogger)
staticLogger->logInfo(s);
@@ -103,7 +103,7 @@ void IErrorLogClient::staticLogInfo (const TQString &s)
void IErrorLogClient::staticLogDebug (const TQString &s)
{
kdDebug() << TQString(i18n("%1 Debug: %2\n"))
- .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+ .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
.tqarg(s);
if (staticLogger)
staticLogger->logDebug(s);
diff --git a/kradio3/src/include/aboutwidget.h b/kradio3/src/include/aboutwidget.h
index 58d9389..6d0639a 100644
--- a/kradio3/src/include/aboutwidget.h
+++ b/kradio3/src/include/aboutwidget.h
@@ -94,7 +94,7 @@ class KRadioAboutWidget : public TQWidget
public:
KRadioAboutWidget(const KAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0);
virtual void show( void );
- virtual TQSize tqsizeHint( void ) const;
+ virtual TQSize sizeHint( void ) const;
void setAboutData(const KAboutData &abtData);
diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp
index 36be553..2842522 100644
--- a/kradio3/src/kradioapp.cpp
+++ b/kradio3/src/kradioapp.cpp
@@ -266,7 +266,7 @@ KLibrary *KRadioApp::LoadLibrary (const TQString &library)
m_PluginInfos.insert(it.key(), PluginClassInfo (it.key(), *it, libinfo.init_func));
}
} else {
- kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)
+ kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " "
<< i18n("Error: Loading Library %1 failed: %2")
.tqarg(library).tqarg(KLibLoader::self()->lastErrorMessage())
@@ -317,13 +317,13 @@ PluginBase *KRadioApp::CreatePlugin (PluginManager *manager, const TQString &cla
if (m_PluginInfos.contains(class_name)) {
retval = m_PluginInfos[class_name].CreateInstance(object_name);
if (!retval) {
- kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)
+ kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " "
<< i18n("Error: Creation of instance \"%1\" of class %2 falied.").tqarg(object_name).tqarg(class_name)
<< endl;
}
} else {
- kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)
+ kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " "
<< i18n("Error: Cannot create instance \"%1\" of unknown class %2.").tqarg(object_name).tqarg(class_name)
<< endl;
diff --git a/kradio3/src/pluginmanager-configuration-ui.ui b/kradio3/src/pluginmanager-configuration-ui.ui
index abaa991..13adb7f 100644
--- a/kradio3/src/pluginmanager-configuration-ui.ui
+++ b/kradio3/src/pluginmanager-configuration-ui.ui
@@ -126,7 +126,7 @@
Expanding
-
+
20
87
@@ -137,7 +137,7 @@
btnRemovePluginInstance
-
+
24
24
@@ -196,7 +196,7 @@
Expanding
-
+
20
55
@@ -207,7 +207,7 @@
btnNewPluginInstance
-
+
24
24
@@ -301,7 +301,7 @@
btnRemoveLibrary
-
+
24
24
@@ -321,7 +321,7 @@
btnAddLibrary
-
+
24
24
@@ -363,7 +363,7 @@
Expanding
-
+
20
61
diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp
index 6164f20..892df34 100644
--- a/kradio3/src/pluginmanager.cpp
+++ b/kradio3/src/pluginmanager.cpp
@@ -153,7 +153,7 @@ void PluginManager::insertPlugin(PluginBase *p)
if (p) {
BlockProfiler profiler_cfg("PluginManager::insertPlugin - about/config");
- /*kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)
+ /*kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " Debug: Adding Plugin: " << p->name() << "\n";*/
if (!m_configDialog)
@@ -173,7 +173,7 @@ void PluginManager::insertPlugin(PluginBase *p)
// connect plugins with each other
for (PluginIterator it(m_plugins); it.current(); ++it) {
if (it.current() != p) {
- /*kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)
+ /*kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
<< " Debug: connecting with " << it.current()->name() << "\n";*/
p->connectI(it.current());
}
diff --git a/kradio3/src/standardscandialog-ui.ui b/kradio3/src/standardscandialog-ui.ui
index 8d0e8d5..60d48e2 100644
--- a/kradio3/src/standardscandialog-ui.ui
+++ b/kradio3/src/standardscandialog-ui.ui
@@ -54,7 +54,7 @@
Expanding
-
+
100
20
@@ -79,7 +79,7 @@
Expanding
-
+
70
20
diff --git a/kradio3/src/standardscandialog.cpp b/kradio3/src/standardscandialog.cpp
index b96f794..52e29ba 100644
--- a/kradio3/src/standardscandialog.cpp
+++ b/kradio3/src/standardscandialog.cpp
@@ -67,7 +67,7 @@ void StandardScanDialog::start()
if (!m_running) {
m_running = true;
m_stations.all().clear();
- m_startTime = TQDateTime::tqcurrentDateTime();
+ m_startTime = TQDateTime::currentDateTime();
m_oldPowerOn = queryIsPowerOn();
m_oldStation = queryCurrentStation().copy();
sendToBeginning();
@@ -153,7 +153,7 @@ bool StandardScanDialog::noticeProgress (float f)
progressBar->setProgress((int)rint(f * 100));
if (m_running) {
- int secs = m_startTime.secsTo(TQDateTime::tqcurrentDateTime());
+ int secs = m_startTime.secsTo(TQDateTime::currentDateTime());
int ms = (int)rint((1 - f) * (float) secs / f * 1000.0);
if (ms > 0 && ms < 86400000) // max one day
diff --git a/kradio3/src/station-drag-object.cpp b/kradio3/src/station-drag-object.cpp
index b3fecb7..f8cc2c7 100644
--- a/kradio3/src/station-drag-object.cpp
+++ b/kradio3/src/station-drag-object.cpp
@@ -76,7 +76,7 @@ bool StationDragObject::decode (const TQMimeSource *e, TQStringList &stationIDs)
{
stationIDs.clear();
if (canDecode(e)) {
- const TQByteArray &tmp = e->tqencodedData(e->format(0));
+ const TQByteArray &tmp = e->encodedData(e->format(0));
TQString str = "";
for (unsigned int pos = 0; pos < tmp.size(); ++pos) {
if (tmp[pos]) {
diff --git a/kradio3/src/stationlist.cpp b/kradio3/src/stationlist.cpp
index e7e7d64..b5965f7 100644
--- a/kradio3/src/stationlist.cpp
+++ b/kradio3/src/stationlist.cpp
@@ -235,7 +235,7 @@ void StationList::merge(const StationList & other)
if (! m_metaData.comment.isEmpty())
m_metaData.comment += "\n";
- m_metaData.lastChange = TQDateTime::tqcurrentDateTime();
+ m_metaData.lastChange = TQDateTime::currentDateTime();
if (!metaData.maintainer.isEmpty())
m_metaData.maintainer += (count() ? TQString(" / ") : TQString()) + metaData.maintainer;
diff --git a/kradio3/src/stationselector-ui.ui b/kradio3/src/stationselector-ui.ui
index bc3f3dd..586f970 100644
--- a/kradio3/src/stationselector-ui.ui
+++ b/kradio3/src/stationselector-ui.ui
@@ -102,7 +102,7 @@
Expanding
-
+
20
40
@@ -129,7 +129,7 @@
Minimum
-
+
10
20
diff --git a/kradio3/src/timecontrol_interfaces.cpp b/kradio3/src/timecontrol_interfaces.cpp
index 248fa47..c4f42b5 100644
--- a/kradio3/src/timecontrol_interfaces.cpp
+++ b/kradio3/src/timecontrol_interfaces.cpp
@@ -83,7 +83,7 @@ void ITimeControlClient::noticeConnectedI(cmplInterface *, bool /*pointer_valid*
noticeAlarmsChanged(queryAlarms());
noticeNextAlarmChanged(queryNextAlarm());
TQDateTime end = queryCountdownEnd();
- if (end > TQDateTime::tqcurrentDateTime())
+ if (end > TQDateTime::currentDateTime())
noticeCountdownStarted(end);
else
noticeCountdownStopped();
@@ -95,7 +95,7 @@ void ITimeControlClient::noticeDisconnectedI(cmplInterface *, bool /*pointer_val
noticeAlarmsChanged(queryAlarms());
noticeNextAlarmChanged(queryNextAlarm());
TQDateTime end = queryCountdownEnd();
- if (end > TQDateTime::tqcurrentDateTime())
+ if (end > TQDateTime::currentDateTime())
noticeCountdownStarted(end);
else
noticeCountdownStopped();