summaryrefslogtreecommitdiffstats
path: root/kworldwatch
diff options
context:
space:
mode:
Diffstat (limited to 'kworldwatch')
-rw-r--r--kworldwatch/main.cpp4
-rw-r--r--kworldwatch/mapwidget.cpp30
-rw-r--r--kworldwatch/zoneclock.cpp16
3 files changed, 25 insertions, 25 deletions
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index e113d3a..5f8df3b 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -66,8 +66,8 @@ WorldWideWatch::WorldWideWatch(bool restore, TQWidget *parent, const char *name)
_clocks = new ZoneClockPanel(w);
vbox->addWidget(_clocks);
- connect(_map, TQT_SIGNAL(addClockClicked(const TQString &)), _clocks, TQT_SLOT(addClock(const TQString &)));
- connect(_map, TQT_SIGNAL(saveSettings()), this, TQT_SLOT(doSave()));
+ connect(_map, TQ_SIGNAL(addClockClicked(const TQString &)), _clocks, TQ_SLOT(addClock(const TQString &)));
+ connect(_map, TQ_SIGNAL(saveSettings()), this, TQ_SLOT(doSave()));
if (restore)
load(kapp->config());
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index ba1bba5..452a0ba 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -88,19 +88,19 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
int id;
_flagPopup = new TQPopupMenu(this);
TQPixmap flag = TQPixmap(locate("data", "kworldclock/pics/flag-red.png"));
- id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Red"), this, TQT_SLOT(addFlag(int)));
+ id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Red"), this, TQ_SLOT(addFlag(int)));
_flagPopup->setItemParameter(id, 0);
flag = TQPixmap(locate("data", "kworldclock/pics/flag-green.png"));
- id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Green"), this, TQT_SLOT(addFlag(int)));
+ id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Green"), this, TQ_SLOT(addFlag(int)));
_flagPopup->setItemParameter(id, 1);
flag = TQPixmap(locate("data", "kworldclock/pics/flag-blue.png"));
- id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Blue"), this, TQT_SLOT(addFlag(int)));
+ id = _flagPopup->insertItem(TQIconSet(flag), i18n("Add &Blue"), this, TQ_SLOT(addFlag(int)));
_flagPopup->setItemParameter(id, 2);
- id = _flagPopup->insertItem(i18n("Add &Custom..."), this, TQT_SLOT(addFlag(int)));
+ id = _flagPopup->insertItem(i18n("Add &Custom..."), this, TQ_SLOT(addFlag(int)));
_flagPopup->setItemParameter(id, 3);
_flagPopup->insertSeparator();
- _flagPopup->insertItem(i18n("&Remove Flag"), this, TQT_SLOT(removeFlag()));
- _flagPopup->insertItem(i18n("&Remove All Flags"), this, TQT_SLOT(removeAllFlags()));
+ _flagPopup->insertItem(i18n("&Remove Flag"), this, TQ_SLOT(removeFlag()));
+ _flagPopup->insertItem(i18n("&Remove All Flags"), this, TQ_SLOT(removeAllFlags()));
_themePopup = new TQPopupMenu(this);
_themes = MapLoader::themes();
@@ -108,13 +108,13 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
TQPtrListIterator<MapTheme> it(_themes);
for ( ; it.current(); ++it)
{
- int id = _themePopup->insertItem(it.current()->name(), this, TQT_SLOT(themeSelected(int)));
+ int id = _themePopup->insertItem(it.current()->name(), this, TQ_SLOT(themeSelected(int)));
_themePopup->setItemParameter(id, cnt++);
it.current()->setID(id);
}
TQPopupMenu *_clocksPopup = new TQPopupMenu(this);
- _clocksPopup->insertItem(i18n("&Add..."), this, TQT_SLOT(addClock()));
+ _clocksPopup->insertItem(i18n("&Add..."), this, TQ_SLOT(addClock()));
_popup = new TQPopupMenu(this);
_popup->insertItem(i18n("&Flags"), _flagPopup);
@@ -124,21 +124,21 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
_popup->insertSeparator();
_popup->insertItem(i18n("&Map Theme"), _themePopup);
- _illuminationID = _popup->insertItem(i18n("Show &Daylight"), this, TQT_SLOT(toggleIllumination()));
- _citiesID = _popup->insertItem(i18n("Show &Cities"), this, TQT_SLOT(toggleCities()));
- _flagsID = _popup->insertItem(i18n("Show F&lags"), this, TQT_SLOT(toggleFlags()));
+ _illuminationID = _popup->insertItem(i18n("Show &Daylight"), this, TQ_SLOT(toggleIllumination()));
+ _citiesID = _popup->insertItem(i18n("Show &Cities"), this, TQ_SLOT(toggleCities()));
+ _flagsID = _popup->insertItem(i18n("Show F&lags"), this, TQ_SLOT(toggleFlags()));
if (!applet)
{
_popup->insertSeparator();
- _popup->insertItem(i18n("&Save Settings"), this, TQT_SLOT(slotSaveSettings()));
+ _popup->insertItem(i18n("&Save Settings"), this, TQ_SLOT(slotSaveSettings()));
}
_popup->insertSeparator();
- _popup->insertItem(i18n("&About"), this, TQT_SLOT(about()));
+ _popup->insertItem(i18n("&About"), this, TQ_SLOT(about()));
TQTimer *timer = new TQTimer(this);
- connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+ connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
timer->start(1000);
_cityIndicator = new TQLabel(0,0, WStyle_StaysOnTop | WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WX11BypassWM );
@@ -154,7 +154,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
if (restore && !applet)
load(kapp->config());
- connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateCityIndicator()));
+ connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCityIndicator()));
}
diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp
index 7d0ad6b..e791b98 100644
--- a/kworldwatch/zoneclock.cpp
+++ b/kworldwatch/zoneclock.cpp
@@ -69,9 +69,9 @@ ZoneClock::ZoneClock(const TQString &zone, const TQString &name, TQWidget *paren
hbox->addWidget(_timeLabel, 0, TQt::AlignRight);
_popup = new TQPopupMenu(this);
- _popup->insertItem(i18n("&Edit..."), this, TQT_SLOT(editClock()));
- _popup->insertItem(i18n("&Add..."), this, TQT_SLOT(slotAddClock()));
- _popup->insertItem(i18n("&Remove"), this, TQT_SLOT(slotRemoveClock()));
+ _popup->insertItem(i18n("&Edit..."), this, TQ_SLOT(editClock()));
+ _popup->insertItem(i18n("&Add..."), this, TQ_SLOT(slotAddClock()));
+ _popup->insertItem(i18n("&Remove"), this, TQ_SLOT(slotRemoveClock()));
_nameLabel->installEventFilter(this);
_timeLabel->installEventFilter(this);
@@ -87,7 +87,7 @@ void ZoneClock::slotRemoveClock()
// So instead we fire up an idle event triggering the delete
// after the return.
- TQTimer::singleShot(0, this, TQT_SLOT(removeTimeout()));
+ TQTimer::singleShot(0, this, TQ_SLOT(removeTimeout()));
}
@@ -172,7 +172,7 @@ ZoneClockPanel::ZoneClockPanel(TQWidget *parent, const char *name)
TQTimer *t = new TQTimer(this);
- connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateTimer()));
+ connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateTimer()));
t->start(500);
_clocks.setAutoDelete(true);
@@ -202,9 +202,9 @@ void ZoneClockPanel::addClock(const TQString &zone, const TQString &name)
realign();
- connect(zc, TQT_SIGNAL(addClock(const TQString &)), this, TQT_SLOT(addClock(const TQString &)));
- connect(zc, TQT_SIGNAL(changed()), this, TQT_SLOT(realign()));
- connect(zc, TQT_SIGNAL(removeMe(ZoneClock *)), this, TQT_SLOT(removeClock(ZoneClock *)));
+ connect(zc, TQ_SIGNAL(addClock(const TQString &)), this, TQ_SLOT(addClock(const TQString &)));
+ connect(zc, TQ_SIGNAL(changed()), this, TQ_SLOT(realign()));
+ connect(zc, TQ_SIGNAL(removeMe(ZoneClock *)), this, TQ_SLOT(removeClock(ZoneClock *)));
}