Rename a number of old tq methods that are no longer tq specific

11 files changed, 49 insertions, 49 deletions

diff --git a/kworldwatch/about.ui b/kworldwatch/about.ui
index 18ff889..334ea07 100644
--- a/kworldwatch/about.ui
+++ b/kworldwatch/about.ui
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>41</width>
                             <height>31</height>
@@ -119,7 +119,7 @@
 
 Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="wordwrap" stdset="0">
@@ -151,7 +151,7 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -179,7 +179,7 @@ Copyright: (c) 2000 Matthias Hoelzer-Kluepfel</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp
index 5accd63..9b97134 100644
--- a/kworldwatch/applet.cpp
+++ b/kworldwatch/applet.cpp
@@ -25,7 +25,7 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-#include <tqlayout.h>
+#include <layout.h>
 
 
 #include <kapplication.h>
diff --git a/kworldwatch/cities.cpp b/kworldwatch/cities.cpp
index 6626beb..2c2a9f3 100644
--- a/kworldwatch/cities.cpp
+++ b/kworldwatch/cities.cpp
@@ -26,7 +26,7 @@
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqpainter.h>
 
diff --git a/kworldwatch/clock.ui b/kworldwatch/clock.ui
index 26fed16..3a31234 100644
--- a/kworldwatch/clock.ui
+++ b/kworldwatch/clock.ui
@@ -71,7 +71,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -88,7 +88,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -177,7 +177,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -213,7 +213,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kworldwatch/flags.cpp b/kworldwatch/flags.cpp
index 6f9837f..0b726a8 100644
--- a/kworldwatch/flags.cpp
+++ b/kworldwatch/flags.cpp
@@ -121,9 +121,9 @@ void FlagList::save(KConfig *config)
   int cnt=0;
   for ( ; it.current(); ++it)
     {
-      config->writeEntry(TQString("Flag_%1_Color").tqarg(cnt), it.current()->color());
-      config->writeEntry(TQString("Flag_%1_Latitude").tqarg(cnt), it.current()->latitude());
-      config->writeEntry(TQString("Flag_%1_Longitude").tqarg(cnt), it.current()->longitude());
+      config->writeEntry(TQString("Flag_%1_Color").arg(cnt), it.current()->color());
+      config->writeEntry(TQString("Flag_%1_Latitude").arg(cnt), it.current()->latitude());
+      config->writeEntry(TQString("Flag_%1_Longitude").arg(cnt), it.current()->longitude());
       cnt++;
     }
 }
@@ -136,9 +136,9 @@ void FlagList::load(KConfig *config)
 
   for (int i=0; i<num; ++i)
     {
-      addFlag(new Flag(config->readDoubleNumEntry(TQString("Flag_%1_Longitude").tqarg(i)),
-		       config->readDoubleNumEntry(TQString("Flag_%1_Latitude").tqarg(i)),
-		       config->readColorEntry(TQString("Flag_%1_Color").tqarg(i))));
+      addFlag(new Flag(config->readDoubleNumEntry(TQString("Flag_%1_Longitude").arg(i)),
+		       config->readDoubleNumEntry(TQString("Flag_%1_Latitude").arg(i)),
+		       config->readColorEntry(TQString("Flag_%1_Color").arg(i))));
     }
 }
 
diff --git a/kworldwatch/flow.cpp b/kworldwatch/flow.cpp
index 056f5aa..519ed85 100644
--- a/kworldwatch/flow.cpp
+++ b/kworldwatch/flow.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** $Id$
 **
-** Implementing your own tqlayout: flow example
+** Implementing your own layout: flow example
 **
 ** Copyright (C) 1996 by Trolltech AS.  All rights reserved.
 **
@@ -76,9 +76,9 @@ bool SimpleFlow::hasHeightForWidth() const
     return TRUE;
 }
 
-TQSize SimpleFlow::tqsizeHint() const
+TQSize SimpleFlow::sizeHint() const
 {
-    return tqminimumSize();
+    return minimumSize();
 }
 
 TQSizePolicy::ExpandData SimpleFlow::expanding() const
@@ -116,29 +116,29 @@ int SimpleFlow::doLayout( const TQRect &r, bool testonly )
     TQLayoutItem *o;
     while ( (o=it.current()) != 0 ) {
 	++it;
-	int nextX = x + o->tqsizeHint().width() + spacing();
+	int nextX = x + o->sizeHint().width() + spacing();
 	if ( nextX - spacing() > r.right() && h > 0 ) {
 	    x = r.x();
 	    y = y + h + spacing();
-	    nextX = x + o->tqsizeHint().width() + spacing();
+	    nextX = x + o->sizeHint().width() + spacing();
 	    h = 0;
 	}
 	if ( !testonly )
-	    o->setGeometry( TQRect( TQPoint( x, y ), o->tqsizeHint() ) );
+	    o->setGeometry( TQRect( TQPoint( x, y ), o->sizeHint() ) );
 	x = nextX;
-	h = TQMAX( h,  o->tqsizeHint().height() );
+	h = TQMAX( h,  o->sizeHint().height() );
     }
     return y + h - r.y();
 }
 
-TQSize SimpleFlow::tqminimumSize() const
+TQSize SimpleFlow::minimumSize() const
 {
     TQSize s(0,0);
     TQPtrListIterator<TQLayoutItem> it(list);
     TQLayoutItem *o;
     while ( (o=it.current()) != 0 ) {
 	++it;
-	s = s.expandedTo( o->tqminimumSize() );
+	s = s.expandedTo( o->minimumSize() );
     }
     return s;
 }
@@ -155,7 +155,7 @@ int SimpleFlow::count() const {
     \reimp
 */
 TQLayoutItem* SimpleFlow::itemAt(int index) const {
-	return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).tqat(index)) : 0;
+	return index >= 0 && index < list.count() ? (const_cast<TQPtrList<TQLayoutItem>&>(list).at(index)) : 0;
 }
 
 /*!
@@ -164,8 +164,8 @@ TQLayoutItem* SimpleFlow::itemAt(int index) const {
 TQLayoutItem* SimpleFlow::takeAt(int index) {
 	if (index < 0 || index >= list.count())
 		return 0;
-	TQLayoutItem *item = list.tqat(index);
-	list.remove(list.tqat(index));
+	TQLayoutItem *item = list.at(index);
+	list.remove(list.at(index));
 	delete item;
 
 	invalidate();
diff --git a/kworldwatch/flow.h b/kworldwatch/flow.h
index e09a9a5..d8a9e63 100644
--- a/kworldwatch/flow.h
+++ b/kworldwatch/flow.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** $Id$
 **
-** Definition of simple flow tqlayout for custom tqlayout example
+** Definition of simple flow layout for custom layout example
 **
 ** Created : 979899
 **
@@ -15,7 +15,7 @@
 #ifndef FLOW_H
 #define FLOW_H
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 
 class SimpleFlow : public TQLayout
@@ -37,8 +37,8 @@ public:
     void addItem( TQLayoutItem *item);
     bool hasHeightForWidth() const;
     int heightForWidth( int ) const;
-    TQSize tqsizeHint() const;
-    TQSize tqminimumSize() const;
+    TQSize sizeHint() const;
+    TQSize minimumSize() const;
     TQLayoutIterator iterator();
     TQSizePolicy::ExpandData expanding() const;
 
diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index 346a97b..58ab232 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -29,7 +29,7 @@
 
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqwidget.h>
diff --git a/kworldwatch/maploader.cpp b/kworldwatch/maploader.cpp
index 62fc49a..bb62e4f 100644
--- a/kworldwatch/maploader.cpp
+++ b/kworldwatch/maploader.cpp
@@ -63,7 +63,7 @@ TQPtrList<MapTheme> MapLoader::themes()
 
 TQStringList MapLoader::maps(const TQString &theme)
 {
-  return KGlobal::dirs()->findAllResources("data", TQString("kworldclock/maps/%1/*.jpg").tqarg(theme));
+  return KGlobal::dirs()->findAllResources("data", TQString("kworldclock/maps/%1/*.jpg").arg(theme));
 }
 
 
@@ -101,7 +101,7 @@ void MapLoader::load(unsigned int width, const TQString &theme, unsigned int hei
       size = 800;
     }
   else  
-    image = TQImage(locate("data", TQString("kworldclock/maps/%1/%2.jpg").tqarg(theme).tqarg(size)));
+    image = TQImage(locate("data", TQString("kworldclock/maps/%1/%2.jpg").arg(theme).arg(size)));
 
   if (height == 0)
     height = width/2;
diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp
index 680d8ef..93bca75 100644
--- a/kworldwatch/mapwidget.cpp
+++ b/kworldwatch/mapwidget.cpp
@@ -143,7 +143,7 @@ MapWidget::MapWidget(bool applet, bool restore, TQWidget *parent, const char *na
   _cityIndicator->setIndent(0);
   _cityIndicator->setAutoMask(false);
   _cityIndicator->setLineWidth(1);
-  _cityIndicator->tqsetAlignment(TQLabel::AlignAuto | TQLabel::AlignTop);
+  _cityIndicator->setAlignment(TQLabel::AlignAuto | TQLabel::AlignTop);
   _cityIndicator->setAutoResize(true);
   _cityIndicator->setFrameStyle(TQFrame::Box | TQFrame::Plain);
   _cityIndicator->setPalette(TQToolTip::palette());
@@ -366,7 +366,7 @@ TQString MapWidget::cityTime(const TQString &city)
   time_t t = time(NULL);
   TQDateTime dt;
   dt.setTime_t(t);
-  result.append(TQString("%1, %2").tqarg(KGlobal::locale()->formatTime(dt.time(), true)).tqarg(KGlobal::locale()->formatDate(dt.date(), true)));
+  result.append(TQString("%1, %2").arg(KGlobal::locale()->formatTime(dt.time(), true)).arg(KGlobal::locale()->formatDate(dt.date(), true)));
 
   if (initial_TZ != 0)
     setenv("TZ", initial_TZ, 1);
@@ -563,13 +563,13 @@ TQPixmap MapWidget::calculatePixmap()
 
   if (gmt_position >= greenwich)
     {
-      p.tqdrawPixmap(gmt_position-greenwich, 0, map, 0, 0, map.width()-gmt_position+greenwich);
-      p.tqdrawPixmap(0,0, map, map.width()-gmt_position+greenwich, 0, gmt_position-greenwich);
+      p.drawPixmap(gmt_position-greenwich, 0, map, 0, 0, map.width()-gmt_position+greenwich);
+      p.drawPixmap(0,0, map, map.width()-gmt_position+greenwich, 0, gmt_position-greenwich);
     }
   else
     {
-      p.tqdrawPixmap(0,0, map, greenwich-gmt_position, 0, map.width()+gmt_position-greenwich);
-      p.tqdrawPixmap(map.width()+gmt_position-greenwich, 0, map, 0, 0, greenwich-gmt_position);
+      p.drawPixmap(0,0, map, greenwich-gmt_position, 0, map.width()+gmt_position-greenwich);
+      p.drawPixmap(map.width()+gmt_position-greenwich, 0, map, 0, 0, greenwich-gmt_position);
     }
 
   return pm;
diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp
index 1c81814..7325597 100644
--- a/kworldwatch/zoneclock.cpp
+++ b/kworldwatch/zoneclock.cpp
@@ -32,7 +32,7 @@
 
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqdatetime.h>
 #include <tqtimer.h>
 #include <tqcombobox.h>
@@ -122,7 +122,7 @@ void ZoneClock::editClock()
       _name = _dlg->ClockCaption->text().append(":");
       _nameLabel->setText(_dlg->ClockCaption->text().append(":"));
       updateTime();
-      tqlayout()->tqinvalidate();
+      layout()->invalidate();
       emit changed();
     }
 
@@ -152,7 +152,7 @@ void ZoneClock::updateTime()
   time_t t = time(NULL);
   TQDateTime dt;
   dt.setTime_t(t);
-  _timeLabel->setText(TQString("%1, %2").tqarg(KGlobal::locale()->formatTime(dt.time(), true)).tqarg(KGlobal::locale()->formatDate(dt.date(), true)));
+  _timeLabel->setText(TQString("%1, %2").arg(KGlobal::locale()->formatTime(dt.time(), true)).arg(KGlobal::locale()->formatDate(dt.date(), true)));
 
   if (initial_TZ != 0)
     setenv("TZ", initial_TZ, 1);
@@ -218,8 +218,8 @@ void ZoneClockPanel::realign()
   int w = 0;
   TQPtrListIterator<ZoneClock> it(_clocks);
   for ( ; it.current(); ++it)
-    if (it.current()->tqsizeHint().width() > w)
-      w = it.current()->tqsizeHint().width();
+    if (it.current()->sizeHint().width() > w)
+      w = it.current()->sizeHint().width();
   it.toFirst();
   for ( ; it.current(); ++it)
     it.current()->setFixedWidth(w);
@@ -266,8 +266,8 @@ void ZoneClockPanel::save(KConfig *config)
     {
       TQString n = it.current()->name();
       n = n.left(n.length()-1);
-      config->writeEntry(TQString("Clock_%1_Name").tqarg(cnt), n);
-      config->writeEntry(TQString("Clock_%1_Zone").tqarg(cnt), it.current()->zone());
+      config->writeEntry(TQString("Clock_%1_Name").arg(cnt), n);
+      config->writeEntry(TQString("Clock_%1_Zone").arg(cnt), it.current()->zone());
       cnt++;
     }
 }
@@ -281,7 +281,7 @@ void ZoneClockPanel::load(KConfig *config)
 
   for (int i=0; i<num; ++i)
     {
-      addClock(config->readEntry(TQString("Clock_%1_Zone").tqarg(i)), config->readEntry(TQString("Clock_%1_Name").tqarg(i)));
+      addClock(config->readEntry(TQString("Clock_%1_Zone").arg(i)), config->readEntry(TQString("Clock_%1_Name").arg(i)));
     }
 }