1 files changed, 19 insertions, 19 deletions

diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 5acc5ce..24e69f7 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -43,7 +43,7 @@
 #include <tdeglobalsettings.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include <tqcursor.h>
 #include <tqpainter.h>
@@ -69,7 +69,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
 
   if (restore)
     {
-      TDEConfig *config = kapp->config();
+      TDEConfig *config = tdeApp->config();
       if (applet)
 	config = new TDEConfig("kwwwappletrc");
       _theme = config->readEntry("Theme", "depths");
@@ -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 );
@@ -152,9 +152,9 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
   _cityIndicator->setPalette(TQToolTip::palette());
 
   if (restore && !applet)
-    load(kapp->config());
+    load(tdeApp->config());
     
-  connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateCityIndicator()));
+  connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCityIndicator()));
 }
 
 
@@ -410,7 +410,7 @@ void MapWidget::themeSelected(int index)
 
 void MapWidget::mousePressEvent(TQMouseEvent *ev)
 {
-  if (ev->button() == Qt::RightButton)
+  if (ev->button() == TQt::RightButton)
     {
       _flagPos = ev->pos();
       _popup->exec(ev->globalPos());