summaryrefslogtreecommitdiffstats
path: root/kicker/applets/clock
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/applets/clock')
-rw-r--r--kicker/applets/clock/clock.cpp112
-rw-r--r--kicker/applets/clock/clock.h14
-rw-r--r--kicker/applets/clock/datepicker.cpp2
-rw-r--r--kicker/applets/clock/digital.ui4
-rw-r--r--kicker/applets/clock/settings.ui4
-rw-r--r--kicker/applets/clock/zone.cpp2
6 files changed, 69 insertions, 69 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 86ee8b059..7cbb5a6c8 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -84,7 +84,7 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
setIcon(SmallIcon("date"));
settings = new SettingsWidgetImp(prefs, zone, 0, "General");
- connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
+ connect(settings->kcfg_Type, TQ_SIGNAL(activated(int)), TQ_SLOT(selectPage(int)));
settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
@@ -104,24 +104,24 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent,
settings->widgetStack->addWidget(fuzzyPage, 3);
fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background());
- connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(dateToggled()));
- connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
- TQT_SLOT(dateToggled()));
+ connect(settings->kcfg_PlainShowDate, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(dateToggled()));
+ connect(settings->kcfg_PlainShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(dateToggled()));
+ connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(dateToggled()));
+ connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(dateToggled()));
+ connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(dateToggled()));
+ connect(analogPage->kcfg_AnalogShowDate, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(dateToggled()));
+ connect(analogPage->kcfg_AnalogShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(dateToggled()));
+ connect(fuzzyPage->kcfg_FuzzyShowDate, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(dateToggled()));
+ connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQ_SIGNAL(toggled(bool)),
+ TQ_SLOT(dateToggled()));
addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
}
@@ -144,7 +144,7 @@ void TDEConfigDialogSingle::updateWidgetsDefault()
item->swapDefault();
// This is ugly, but kcfg_Type does not have its correct setting
// at this point in time.
- TQTimer::singleShot(0, this, TQT_SLOT(dateToggled()));
+ TQTimer::singleShot(0, this, TQ_SLOT(dateToggled()));
}
void TDEConfigDialogSingle::selectPage(int p)
@@ -425,7 +425,7 @@ void DigitalClock::drawContents( TQPainter * p)
p->translate( +1, +1 );
TQLCDNumber::drawContents( p );
if (_prefs->digitalLCDStyle())
- pal.setColor( TQColorGroup::Foreground, Qt::black);
+ pal.setColor( TQColorGroup::Foreground, TQt::black);
else
pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
setPalette( pal );
@@ -633,8 +633,8 @@ void AnalogClock::paintEvent( TQPaintEvent * )
}
if (_prefs->analogLCDStyle()) {
- paint.setPen( TQPen(Qt::black, aaFactor) );
- paint.setBrush( Qt::black );
+ paint.setPen( TQPen(TQt::black, aaFactor) );
+ paint.setBrush( TQt::black );
} else {
paint.setPen( TQPen(_prefs->analogForegroundColor(), aaFactor) );
paint.setBrush( _prefs->analogForegroundColor() );
@@ -743,7 +743,7 @@ FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, cons
void FuzzyClock::deleteMyself()
{
if(alreadyDrawing) // try again later
- TQTimer::singleShot(1000, this, TQT_SLOT(deleteMyself()));
+ TQTimer::singleShot(1000, this, TQ_SLOT(deleteMyself()));
else
delete this;
}
@@ -854,7 +854,7 @@ void FuzzyClock::drawContents(TQPainter *p)
TQRect tr;
- if (_applet->getOrientation() == Qt::Vertical)
+ if (_applet->getOrientation() == TQt::Vertical)
{
p->rotate(90);
tr = TQRect(4, -2, height() - 8, -(width()) + 2);
@@ -917,9 +917,9 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
_date->setBackgroundOrigin(AncestorOrigin);
_date->installEventFilter(this); // catch mouse clicks
- connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout()));
- connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate()));
- connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(globalPaletteChange()));
+ connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout()));
+ connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate()));
+ connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange()));
reconfigure(); // initialize clock widget
slotUpdate();
@@ -927,8 +927,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
if (kapp->authorizeTDEAction("kicker_rmb"))
{
menu = new TDEPopupMenu();
- connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
- connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+ connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
+ connect(menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
setCustomMenu(menu);
}
@@ -970,7 +970,7 @@ KTextShadowEngine *ClockApplet::shadowEngine()
int ClockApplet::widthForHeight(int h) const
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
return width();
}
@@ -1081,7 +1081,7 @@ int ClockApplet::widthForHeight(int h) const
int ClockApplet::heightForWidth(int w) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return height();
}
@@ -1156,7 +1156,7 @@ void ClockApplet::preferences(bool timezone)
if (!dialog)
{
dialog = new TDEConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow);
- connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure()));
+ connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotReconfigure()));
}
if (timezone)
@@ -1242,7 +1242,7 @@ void ClockApplet::reconfigure()
m_updateOnTheMinute = updateInterval != shortInterval;
if (m_updateOnTheMinute)
{
- connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+ connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
updateInterval = ((60 - clockGetTime().second()) * 1000) + 500;
}
else
@@ -1250,7 +1250,7 @@ void ClockApplet::reconfigure()
// in case we reconfigure to show seconds but setTimerTo60 is going to be called
// we need to make sure to disconnect this so we don't end up updating only once
// a minute ;)
- disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+ disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
}
_timer->start(updateInterval);
@@ -1300,7 +1300,7 @@ void ClockApplet::reconfigure()
void ClockApplet::setTimerTo60()
{
// kdDebug() << "setTimerTo60" << endl;
- disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+ disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
_timer->changeInterval(60000);
}
@@ -1417,7 +1417,7 @@ void ClockApplet::slotUpdate()
if (seconds > 2)
{
- connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60()));
+ connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60()));
_timer->changeInterval(((60 - seconds) * 1000) + 500);
}
}
@@ -1430,7 +1430,7 @@ void ClockApplet::slotCalendarDeleted()
_calendar = 0L;
// don't reopen the calendar immediately ...
_disableCalendar = true;
- TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar()));
+ TQTimer::singleShot(100, this, TQ_SLOT(slotEnableCalendar()));
// we are free to show a tip know :)
installEventFilter(KickerTip::the());
@@ -1460,7 +1460,7 @@ void ClockApplet::toggleCalendar()
removeEventFilter(KickerTip::the());
_calendar = new DatePicker(this, _lastDate, _prefs);
- connect(_calendar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted()));
+ connect(_calendar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted()));
TQSize size = _prefs->calendarSize();
@@ -1542,24 +1542,24 @@ void ClockApplet::aboutToShowContextMenu()
TDELocale *loc = TDEGlobal::locale();
TQDateTime dt = TQDateTime::currentDateTime();
- dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
+ dt = dt.addSecs(TZoffset);
TDEPopupMenu *copyMenu = new TDEPopupMenu( menu );
copyMenu->insertItem(loc->formatDateTime(dt), 201);
- copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date())), 202);
- copyMenu->insertItem(loc->formatDate(TQT_TQDATE_OBJECT(dt.date()), true), 203);
- copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time())), 204);
- copyMenu->insertItem(loc->formatTime(TQT_TQTIME_OBJECT(dt.time()), true), 205);
+ copyMenu->insertItem(loc->formatDate(dt.date()), 202);
+ copyMenu->insertItem(loc->formatDate(dt.date(), true), 203);
+ copyMenu->insertItem(loc->formatTime(dt.time()), 204);
+ copyMenu->insertItem(loc->formatTime(dt.time(), true), 205);
copyMenu->insertItem(dt.date().toString(), 206);
copyMenu->insertItem(dt.time().toString(), 207);
copyMenu->insertItem(dt.toString(), 208);
copyMenu->insertItem(dt.toString("yyyy-MM-dd hh:mm:ss"), 209);
- connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) );
+ connect( copyMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotCopyMenuActivated(int) ) );
if (!bImmutable)
{
TDEPopupMenu *zoneMenu = new TDEPopupMenu( menu );
- connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+ connect(zoneMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
for (int i = 0; i <= zone->remoteZoneCount(); i++)
{
if (i == 0)
@@ -1576,7 +1576,7 @@ void ClockApplet::aboutToShowContextMenu()
zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110);
TDEPopupMenu *type_menu = new TDEPopupMenu(menu);
- connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+ connect(type_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1);
type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2);
type_menu->insertItem(i18n("&Analog"), Prefs::EnumType::Analog, 3);
@@ -1610,12 +1610,12 @@ void ClockApplet::slotCopyMenuActivated( int id )
TQTime ClockApplet::clockGetTime()
{
- return TQT_TQTIME_OBJECT(TQTime::currentTime().addSecs(TZoffset));
+ return TQTime::currentTime().addSecs(TZoffset);
}
TQDate ClockApplet::clockGetDate()
{
- return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date());
+ return TQDateTime::currentDateTime().addSecs(TZoffset).date();
}
void ClockApplet::showZone(int z)
@@ -1642,13 +1642,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev)
{
switch (ev->button())
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
toggleCalendar();
break;
- case Qt::RightButton:
+ case TQt::RightButton:
openContextMenu();
break;
- case Qt::MidButton:
+ case TQt::MidButton:
nextZone();
TQToolTip::remove(_clock->widget());
break;
@@ -1675,10 +1675,10 @@ void ClockApplet::wheelEvent(TQWheelEvent* e)
// catch the mouse clicks of our child widgets
bool ClockApplet::eventFilter( TQObject *o, TQEvent *e )
{
- if (( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_clock->widget()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_date) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(_dayOfWeek)) &&
+ if (( o == _clock->widget() || o == _date || o == _dayOfWeek) &&
e->type() == TQEvent::MouseButtonPress )
{
- mousePressEvent(TQT_TQMOUSEEVENT(e) );
+ mousePressEvent(static_cast<TQMouseEvent*>(e) );
return true;
}
@@ -1794,7 +1794,7 @@ void ClockApplet::fixupLayout()
// this fixes problems triggered by having the date first
// because of the date format (e.g. YY/MM/DD) and then hiding
// the date
- if (orientation() == Qt::Horizontal && height() < 32)
+ if (orientation() == TQt::Horizontal && height() < 32)
{
bool mustShowDate = showDate || (zone->zoneIndex() != 0);
@@ -1840,7 +1840,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
(m_clock->type() == Prefs::EnumType::Analog) )
{
// show full time (incl. hour) as tooltip for Fuzzy clock
- tipText = TDEGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)));
+ tipText = TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset));
}
else
{
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 36e5f00bf..9f4031539 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -66,7 +66,7 @@ class SettingsWidgetImp;
class SettingsWidgetImp : public SettingsWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
SettingsWidgetImp(Prefs *p=0,
@@ -84,7 +84,7 @@ class SettingsWidgetImp : public SettingsWidget
class TDEConfigDialogSingle : public TDEConfigDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEConfigDialogSingle(Zone *zone,
@@ -139,7 +139,7 @@ class ClockWidget
class PlainClock : public TQLabel, public ClockWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
PlainClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
@@ -162,7 +162,7 @@ class PlainClock : public TQLabel, public ClockWidget
class DigitalClock : public TQLCDNumber, public ClockWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
DigitalClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
@@ -189,7 +189,7 @@ class DigitalClock : public TQLCDNumber, public ClockWidget
class AnalogClock : public TQFrame, public ClockWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
AnalogClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent=0, const char *name=0);
@@ -216,7 +216,7 @@ class AnalogClock : public TQFrame, public ClockWidget
class FuzzyClock : public TQFrame, public ClockWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
FuzzyClock(ClockApplet *applet, Prefs* prefs, TQWidget *parent=0, const char *name=0);
@@ -260,7 +260,7 @@ class ClockAppletToolTip : public TQToolTip
class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
friend class ClockAppletToolTip;
diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp
index d6165306e..99b9fe33e 100644
--- a/kicker/applets/clock/datepicker.cpp
+++ b/kicker/applets/clock/datepicker.cpp
@@ -69,7 +69,7 @@ void DatePicker::keyPressEvent(TQKeyEvent *e)
{
TQVBox::keyPressEvent(e);
- if (e->key() == Qt::Key_Escape)
+ if (e->key() == TQt::Key_Escape)
{
close();
}
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index e8ced7f2d..c63eb7d32 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -293,9 +293,9 @@
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">tdefontrequester.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 81e126560..bd33473cd 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -509,9 +509,9 @@
<include location="global" impldecl="in implementation">tdefontrequester.h</include>
<include location="global" impldecl="in implementation">tdelistview.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>configureType()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index aa9126b8c..85a4f3f19 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -85,7 +85,7 @@ int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */)
if (z)
{
- return -z->offset(Qt::LocalTime);
+ return -z->offset(TQt::LocalTime);
}
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 05:17:29 +0000