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

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:50:42 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2011-12-15 15:50:42 -0600
commit: 6cdf35ab11c322f33feca5baf090ef56068b6049 (patch)
tree: ca493b21887096329578b1c02530fd4ca9388cfc
parent: 44b2e94b380d4e5ec1539874823ffc06f05515cb (diff)
download: tdetoys-6cdf35ab.tar.gz
tdetoys-6cdf35ab.zip
49 files changed, 281 insertions, 281 deletions
diff --git a/amor/amor.cpp b/amor/amor.cpp
index 0a9b436..7e8202b 100644
--- a/amor/amor.cpp
+++ b/amor/amor.cpp
@@ -152,7 +152,7 @@ Amor::Amor() : DCOPObject( "AmorIface" ), TQObject()
                         TQT_SLOT(slotMouseClicked(const TQPoint &)));
         connect(mAmor, TQT_SIGNAL(dragged(const TQPoint &, bool)),
                         TQT_SLOT(slotWidgetDragged(const TQPoint &, bool)));
-        mAmor->resize(mTheme.tqmaximumSize());
+        mAmor->resize(mTheme.maximumSize());
 
         mTimer = new TQTimer(this);
         connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
@@ -288,7 +288,7 @@ void Amor::reset()
     mPosition   = mCurrAnim->hotspot().x();
     mState      = Normal;
 
-    mAmor->resize(mTheme.tqmaximumSize()); 
+    mAmor->resize(mTheme.maximumSize()); 
     mCurrAnim->reset();
 
     mTimer->start(0, true);
@@ -748,7 +748,7 @@ void Amor::slotOffsetChanged(int off)
 //
 void Amor::slotAbout()
 {
-    TQString about = i18n("Amor Version %1\n\n").tqarg(AMOR_VERSION) +
+    TQString about = i18n("Amor Version %1\n\n").arg(AMOR_VERSION) +
                 i18n("Amusing Misuse Of Resources\n\n") +
                 i18n("Copyright (c) 1999 Martin R. Jones <mjones@kde.org>\n\n") +
 		i18n("Original Author: Martin R. Jones <mjones@kde.org>\n") +
diff --git a/amor/amoranim.cpp b/amor/amoranim.cpp
index 31b4f6f..b4e595b 100644
--- a/amor/amoranim.cpp
+++ b/amor/amoranim.cpp
@@ -227,7 +227,7 @@ bool AmorThemeManager::readGroup(const TQString & seq)
         mConfig->setGroup(list.at(i));
         AmorAnim *anim = new AmorAnim(*mConfig);
         animList->append(anim);
-        mMaximumSize = mMaximumSize.expandedTo(anim->tqmaximumSize());
+        mMaximumSize = mMaximumSize.expandedTo(anim->maximumSize());
     }
 
     // If no animations were available for this group, just add the base anim
@@ -238,7 +238,7 @@ bool AmorThemeManager::readGroup(const TQString & seq)
         if (anim)
         {
             animList->append(anim);
-            mMaximumSize = mMaximumSize.expandedTo(anim->tqmaximumSize());
+            mMaximumSize = mMaximumSize.expandedTo(anim->maximumSize());
             entries++;
         }
     }
diff --git a/amor/amoranim.h b/amor/amoranim.h
index d315840..acc4fba 100644
--- a/amor/amoranim.h
+++ b/amor/amoranim.h
@@ -59,7 +59,7 @@ public:
         { return (mCurrent < mSequence.count()); }
     int totalMovement() const
         { return mTotalMovement; }
-    TQSize tqmaximumSize() const
+    TQSize maximumSize() const
         { return mMaximumSize; }
 
     int delay() const
@@ -103,7 +103,7 @@ public:
 
     AmorAnim *random(const TQString & group);
 
-    TQSize tqmaximumSize() const { return mMaximumSize; }
+    TQSize maximumSize() const { return mMaximumSize; }
 
 protected:
     TQString           mPath;
diff --git a/amor/amorbubble.cpp b/amor/amorbubble.cpp
index 49e65b7..0af3c90 100644
--- a/amor/amorbubble.cpp
+++ b/amor/amorbubble.cpp
@@ -55,7 +55,7 @@ AmorBubble::AmorBubble()
 
     mBrowser->setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary); // too long to fit in one line?
 
-    TQColorGroup clgrp = mBrowser->tqcolorGroup();
+    TQColorGroup clgrp = mBrowser->colorGroup();
     clgrp.setColor(TQColorGroup::Text, TQt::black);
     //Laurent TQTextBrowser didn't have this function FIX me
     //mBrowser->setPaperColorGroup( clgrp );
@@ -83,12 +83,12 @@ AmorBubble::~AmorBubble()
 
 //---------------------------------------------------------------------------
 //
-// Set the message to display in the bubble.  Causes the tqgeometry of the
+// Set the message to display in the bubble.  Causes the geometry of the
 // widget to be recalculated.
 //
 void AmorBubble::setMessage(const TQString& message)
 {
-    mMessage = TQString( "<html>%1</html>" ).tqarg( message );
+    mMessage = TQString( "<html>%1</html>" ).arg( message );
     // hacks because heightForWidth() doesn't work.
     setGeometry( -1000, 0, 300, 1000 );
     show();
@@ -108,7 +108,7 @@ void AmorBubble::calcGeometry()
     mBound.setHeight( mBrowser->contentsHeight() );
     mBound.moveBy(ARROW_WIDTH+BORDER_SIZE, BORDER_SIZE);
 
-    // initialise the default tqgeometry of the bubble
+    // initialise the default geometry of the bubble
     int w = mBound.width() + BORDER_SIZE * 2 + ARROW_WIDTH;
     int h = mBound.height() + BORDER_SIZE * 2;
     int xpos = mOriginX + BUBBLE_OFFSET;
@@ -141,7 +141,7 @@ void AmorBubble::calcGeometry()
     setGeometry(xpos, ypos, w, h);
     mBrowser->setGeometry( mBound );
 
-    // create and apply the tqshape mask
+    // create and apply the shape mask
     mMask.resize(w, h);
     mMask.fill(color0);
     TQPainter maskPainter(&mMask);
@@ -195,7 +195,7 @@ void AmorBubble::drawBubble(TQPainter &p)
     p.drawPolygon(pointArray);
 
     p.setPen(pen);
-    p.tqdrawPolyline(pointArray, 0, 3);
+    p.drawPolyline(pointArray, 0, 3);
 }
 
 //---------------------------------------------------------------------------
diff --git a/amor/amorbubble.h b/amor/amorbubble.h
index 54e8912..f55cbd2 100644
--- a/amor/amorbubble.h
+++ b/amor/amorbubble.h
@@ -40,7 +40,7 @@ class TQTimer;
 
 //---------------------------------------------------------------------------
 //
-// AmorBubble displays a message in a tqshaped window
+// AmorBubble displays a message in a shaped window
 //
 class AmorBubble : public TQWidget
 {
@@ -70,7 +70,7 @@ protected:
     int   mOriginX;             // X origin of bubble arrow
     int   mOriginY;             // Y origin of bubble arrow
     TQRect mBound;               // bounds of the text
-    TQBitmap mMask;              // tqshape mask
+    TQBitmap mMask;              // shape mask
     VertPos mArrowVert;         // vertical position of the arrow
     HorzPos mArrowHorz;         // horizontal position of the arrow
     TQTextBrowser *mBrowser;	// displays the message
diff --git a/amor/amorwidget.cpp b/amor/amorwidget.cpp
index e5cc7b0..38dd0d3 100644
--- a/amor/amorwidget.cpp
+++ b/amor/amorwidget.cpp
@@ -64,7 +64,7 @@ void AmorWidget::setPixmap(const TQPixmap *pixmap)
         {
             XShapeCombineMask( x11Display(), winId(), ShapeBounding, 0, 0,
                                 mPixmap->mask()->handle(), ShapeSet );
-            tqrepaint(false);
+            repaint(false);
         }
     
 	update();
diff --git a/amor/amorwidget.h b/amor/amorwidget.h
index 15f9126..3b46d4b 100644
--- a/amor/amorwidget.h
+++ b/amor/amorwidget.h
@@ -36,7 +36,7 @@
 
 //---------------------------------------------------------------------------
 //
-// AmorWidget displays a tqshaped pixmap
+// AmorWidget displays a shaped pixmap
 //
 class AmorWidget : public TQWidget
 {
diff --git a/eyesapplet/eyes.cpp b/eyesapplet/eyes.cpp
index 84bdfbe..37dd37b 100644
--- a/eyesapplet/eyes.cpp
+++ b/eyesapplet/eyes.cpp
@@ -55,11 +55,11 @@ EyesApplet::EyesApplet(const TQString& configFile, Type t, int actions,
 
 int EyesApplet::widthForHeight(int h) const
 {
-    return static_cast<int>(1.4 * h); // rectangular tqshape.
+    return static_cast<int>(1.4 * h); // rectangular shape.
 }
 int EyesApplet::heightForWidth(int w) const
 {
-    return static_cast<int>(w / 1.4); // rectangular tqshape.
+    return static_cast<int>(w / 1.4); // rectangular shape.
 }
 
 void EyesApplet::resizeEvent( TQResizeEvent*e )
diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp
index 498f93d..1409c4f 100644
--- a/fifteenapplet/fifteenapplet.cpp
+++ b/fifteenapplet/fifteenapplet.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdlib.h>
 #include <time.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
 
@@ -54,7 +54,7 @@ FifteenApplet::FifteenApplet(const TQString& configFile, Type type, int actions,
     _table = new PiecesTable(this);
     setCustomMenu(_table->popup());
 
-    // setup tqlayout
+    // setup layout
     TQHBoxLayout *_layout = new TQHBoxLayout(this);
     _layout->add(_table);
 
@@ -120,7 +120,7 @@ void PiecesTable::paintCell(TQPainter *p, int row, int col)
 
     // draw cell background
     if(number == 16)
-        p->setBrush(tqcolorGroup().background());
+        p->setBrush(colorGroup().background());
     else
         p->setBrush(_colors[number-1]);
     p->setPen(NoPen);
@@ -128,7 +128,7 @@ void PiecesTable::paintCell(TQPainter *p, int row, int col)
 
     // draw borders
     if (height() > 40) {
-        p->setPen(tqcolorGroup().text());
+        p->setPen(colorGroup().text());
         if(col < numCols()-1)
             p->drawLine(x2, 0, x2, y2); // right border line
 
@@ -198,14 +198,14 @@ void PiecesTable::randomizeMap()
             }
         }
     }
-    tqrepaint();
+    repaint();
     _randomized = true;
 }
 
 void PiecesTable::resetMap()
 {
     initMap();
-    tqrepaint();
+    repaint();
 }
 
 void PiecesTable::chectwin()
diff --git a/fifteenapplet/qttableview.cpp b/fifteenapplet/qttableview.cpp
index 4aded39..1c9656b 100644
--- a/fifteenapplet/qttableview.cpp
+++ b/fifteenapplet/qttableview.cpp
@@ -34,8 +34,8 @@ enum ScrollBarDirtyFlags {
 };
 
 
-#define HSBEXT horizontalScrollBar()->tqsizeHint().height()
-#define VSBEXT verticalScrollBar()->tqsizeHint().width()
+#define HSBEXT horizontalScrollBar()->sizeHint().height()
+#define VSBEXT verticalScrollBar()->sizeHint().width()
 
 
 class QCornerSquare : public TQWidget		// internal class
@@ -88,7 +88,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
   used by functions such as setXOffset() or maxYOffset().
 
   \i The \e widget coordinates. (0,0) is the top-left corner of the widget,
-  \e including the frame.  They are used by functions such as tqrepaint().
+  \e including the frame.  They are used by functions such as repaint().
 
   \i The \e view coordinates.  (0,0) is the top-left corner of the view, \e
   excluding the frame.  This is the least-used coordinate system; it is used by
@@ -135,7 +135,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * )
   The \link setCellHeight() cell height\endlink and \link setCellWidth()
   cell width\endlink are set to 0.
 
-  Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
+  Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed;
   see TQFrame::setFrameStyle().
 
   Note that the \a f argument is \e not \link setTableFlags() table
@@ -207,7 +207,7 @@ void QtTableView::show()
 
 
 /*!
-  \overload void QtTableView::tqrepaint( bool erase )
+  \overload void QtTableView::repaint( bool erase )
   Repaints the entire view.
 */
 
@@ -221,16 +221,16 @@ void QtTableView::show()
   If \a w is negative, it is replaced with <code>width() - x</code>.
   If \a h is negative, it is replaced with <code>height() - y</code>.
 
-  Doing a tqrepaint() usually is faster than doing an update(), but
+  Doing a repaint() usually is faster than doing an update(), but
   calling update() many times in a row will generate a single paint
   event.
 
   At present, QtTableView is the only widget that reimplements \link
-  TQWidget::tqrepaint() tqrepaint()\endlink.	 It does this because by
+  TQWidget::repaint() repaint()\endlink.	 It does this because by
   clearing and then repainting one cell at at time, it can make the
   screen flicker less than it would otherwise.  */
 
-void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
+void QtTableView::repaint( int x, int y, int w, int h, bool erase )
 {
     if ( !isVisible() || testWState(WState_BlockUpdates) )
 	return;
@@ -249,7 +249,7 @@ void QtTableView::tqrepaint( int x, int y, int w, int h, bool erase )
 }
 
 /*!
-  \overload void QtTableView::tqrepaint( const TQRect &r, bool erase )
+  \overload void QtTableView::repaint( const TQRect &r, bool erase )
   Replaints rectangle \a r. If \a erase is TRUE draws the background
   using the palette's background.
 */
@@ -288,7 +288,7 @@ void QtTableView::setNumRows( int rows )
 	nRows = rows;
 	if ( autoUpdate() && isVisible() &&
 	     ( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) )
-		tqrepaint( oldTopCell != topCell() );
+		repaint( oldTopCell != topCell() );
     } else {
 	// Be more careful - if destructing, bad things might happen.
 	nRows = rows;
@@ -328,7 +328,7 @@ void QtTableView::setNumCols( int cols )
     if ( autoUpdate() && isVisible() ) {
 	int maxCol = lastColVisible();
 	if ( maxCol >= oldCols || maxCol >= nCols )
-	    tqrepaint();
+	    repaint();
     }
     updateScrollBars( horRange );
     updateFrameSize();
@@ -591,7 +591,7 @@ void QtTableView::setCellWidth( int cellWidth )
 
     updateScrollBars( horSteps | horRange );
     if ( autoUpdate() && isVisible() )
-	tqrepaint();
+	repaint();
 
 }
 
@@ -643,7 +643,7 @@ void QtTableView::setCellHeight( int cellHeight )
 #endif
     cellH = (short)cellHeight;
     if ( autoUpdate() && isVisible() )
-	tqrepaint();
+	repaint();
     updateScrollBars( verSteps | verRange );
 }
 
@@ -817,7 +817,7 @@ void QtTableView::setTableFlags( uint f )
 	     (f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) {
 	    snapToGrid( (f & Tbl_snapToHGrid) != 0,	// do snapping
 			(f & Tbl_snapToVGrid) != 0 );
-	    repaintMask |= Tbl_snapToGrid;	// tqrepaint table
+	    repaintMask |= Tbl_snapToGrid;	// repaint table
 	}
     }
 
@@ -825,7 +825,7 @@ void QtTableView::setTableFlags( uint f )
 	setAutoUpdate( TRUE );
 	updateScrollBars();
 	if ( isVisible() && (f & repaintMask) )
-	    tqrepaint();
+	    repaint();
     }
 
 }
@@ -881,7 +881,7 @@ void QtTableView::clearTableFlags( uint f )
 	    (f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) {
 	    snapToGrid( (f & Tbl_smoothHScrolling) != 0,      // do snapping
 			(f & Tbl_smoothVScrolling) != 0 );
-	    repaintMask |= Tbl_smoothScrolling;		     // tqrepaint table
+	    repaintMask |= Tbl_smoothScrolling;		     // repaint table
 	}
     }
     if ( f & Tbl_snapToHGrid ) {
@@ -894,7 +894,7 @@ void QtTableView::clearTableFlags( uint f )
 	setAutoUpdate( TRUE );
 	updateScrollBars();	     // returns immediately if nothing to do
 	if ( isVisible() && (f & repaintMask) )
-	    tqrepaint();
+	    repaint();
     }
 
 }
@@ -916,20 +916,20 @@ void QtTableView::clearTableFlags( uint f )
   automatically whenever it has changed in some way (for example, when a
   \link setTableFlags() flag\endlink is changed).
 
-  If \a enable is FALSE, the view does NOT tqrepaint itself or update
+  If \a enable is FALSE, the view does NOT repaint itself or update
   its internal state variables when it is changed.  This can be
   useful to avoid flicker during large changes and is singularly
   useless otherwise. Disable auto-update, do the changes, re-enable
-  auto-update and call tqrepaint().
+  auto-update and call repaint().
 
   \warning Do not leave the view in this state for a long time
   (i.e., between events). If, for example, the user interacts with the
   view when auto-update is off, strange things can happen.
 
-  Setting auto-update to TRUE does not tqrepaint the view; you must call
-  tqrepaint() to do this.
+  Setting auto-update to TRUE does not repaint the view; you must call
+  repaint() to do this.
 
-  \sa autoUpdate(), tqrepaint()
+  \sa autoUpdate(), repaint()
 */
 
 void QtTableView::setAutoUpdate( bool enable )
@@ -963,7 +963,7 @@ void QtTableView::updateCell( int row, int col, bool erase )
     TQRect uR = TQRect( xPos, yPos,
 		      cellW ? cellW : cellWidth(col),
 		      cellH ? cellH : cellHeight(row) );
-    tqrepaint( uR.intersect(viewRect()), erase );
+    repaint( uR.intersect(viewRect()), erase );
 }
 
 
@@ -1379,13 +1379,13 @@ void QtTableView::paintEvent( TQPaintEvent *e )
 
     // Note that this needs to be done regardless whether we do
     // eraseInPaint or not. Reason: a subclass may implement
-    // flicker-freeness and encourage the use of tqrepaint(FALSE).
+    // flicker-freeness and encourage the use of repaint(FALSE).
     // The subclass, however, cannot draw all pixels, just those
     // inside the cells. So QtTableView is reponsible for all pixels
     // outside the cells.
 
     TQRect viewR = viewRect();
-    const TQColorGroup g = tqcolorGroup();
+    const TQColorGroup g = colorGroup();
 
     if ( xPos <= maxX ) {
 	TQRect r = viewR;
@@ -1426,7 +1426,7 @@ void QtTableView::resizeEvent( TQResizeEvent * )
 
 void QtTableView::updateView()
 {
-    tqrepaint( viewRect() );
+    repaint( viewRect() );
 }
 
 /*!
@@ -1443,7 +1443,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
-        sb->resize( sb->tqsizeHint() ); // height is irrelevant
+        sb->resize( sb->sizeHint() ); // height is irrelevant
 	Q_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
 	sb->setFocusPolicy( TQ_NoFocus );
@@ -1474,7 +1474,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const
 #ifndef TQT_NO_CURSOR
 	sb->setCursor( arrowCursor );
 #endif
-	sb->resize( sb->tqsizeHint() ); // width is irrelevant
+	sb->resize( sb->sizeHint() ); // width is irrelevant
 	sb->setFocusPolicy( TQ_NoFocus );
 	Q_CHECK_PTR(sb);
 	sb->setTracking( FALSE );
@@ -1522,7 +1522,7 @@ void QtTableView::setHorScrollBar( bool on, bool update )
 	else
 	    sbDirty = sbDirty | verMask;
 	if ( hideScrollBar && isVisible() )
-	    tqrepaint( hScrollBar->x(), hScrollBar->y(),
+	    repaint( hScrollBar->x(), hScrollBar->y(),
 		     width() - hScrollBar->x(), hScrollBar->height() );
     }
     if ( update )
@@ -1561,7 +1561,7 @@ void QtTableView::setVerScrollBar( bool on, bool update )
 	else
 	    sbDirty = sbDirty | horMask;
 	if ( hideScrollBar && isVisible() )
-	    tqrepaint( vScrollBar->x(), vScrollBar->y(),
+	    repaint( vScrollBar->x(), vScrollBar->y(),
 		     vScrollBar->width(), height() - vScrollBar->y() );
     }
     if ( update )
@@ -2006,7 +2006,7 @@ void QtTableView::updateScrollBars( uint f )
 	if ( sbDirty & horValue )
 	    hScrollBar->setValue( xOffs );
 
-			// show scrollbar only when it has a sane tqgeometry
+			// show scrollbar only when it has a sane geometry
 	if ( !hScrollBar->isVisible() )
 	    hScrollBar->show();
     }
@@ -2030,7 +2030,7 @@ void QtTableView::updateScrollBars( uint f )
 	if ( sbDirty & verValue )
 	    vScrollBar->setValue( yOffs );
 
-			// show scrollbar only when it has a sane tqgeometry
+			// show scrollbar only when it has a sane geometry
 	if ( !vScrollBar->isVisible() )
 	    vScrollBar->show();
     }
@@ -2253,7 +2253,7 @@ void QtTableView::showOrHideScrollBars()
   Call this function when the table view's total size is changed;
   typically because the result of cellHeight() or cellWidth() have changed.
 
-  This function does not tqrepaint the widget.
+  This function does not repaint the widget.
 */
 
 void QtTableView::updateTableSize()
diff --git a/fifteenapplet/qttableview.h b/fifteenapplet/qttableview.h
index 081ed64..5333376 100644
--- a/fifteenapplet/qttableview.h
+++ b/fifteenapplet/qttableview.h
@@ -32,9 +32,9 @@ public:
     virtual void setPalette( const TQPalette & );
     void	show();
 
-    void	tqrepaint( bool erase=TRUE );
-    void	tqrepaint( int x, int y, int w, int h, bool erase=TRUE );
-    void	tqrepaint( const TQRect &, bool erase=TRUE );
+    void	repaint( bool erase=TRUE );
+    void	repaint( int x, int y, int w, int h, bool erase=TRUE );
+    void	repaint( const TQRect &, bool erase=TRUE );
 
 protected:
     QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 );
@@ -235,11 +235,11 @@ inline TQRect QtTableView::cellUpdateRect() const
 inline bool QtTableView::autoUpdate() const
 { return isUpdatesEnabled(); }
 
-inline void QtTableView::tqrepaint( bool erase )
-{ tqrepaint( 0, 0, width(), height(), erase ); }
+inline void QtTableView::repaint( bool erase )
+{ repaint( 0, 0, width(), height(), erase ); }
 
-inline void QtTableView::tqrepaint( const TQRect &r, bool erase )
-{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); }
+inline void QtTableView::repaint( const TQRect &r, bool erase )
+{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
 
 inline void QtTableView::updateScrollBars()
 { updateScrollBars( 0 ); }
diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp
index c7051a7..e469b68 100644
--- a/kmoon/kmoonapplet.cpp
+++ b/kmoon/kmoonapplet.cpp
@@ -27,7 +27,7 @@
 #include <tqtooltip.h>
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <dcopclient.h>
 #include <kdebug.h>
@@ -104,7 +104,7 @@ void MoonPAWidget::showAbout()
                                 KStdGuiItem::ok() );
 
     TQPixmap ret = DesktopIcon("kmoon");
-    TQString text = i18n(description) + TQString::tqfromLatin1("\n\n") +
+    TQString text = i18n(description) + TQString::fromLatin1("\n\n") +
 		   i18n("Written by Stephan Kulow <coolo@kde.org>\n"
                             "\n"
                             "Made an applet by M G Berberich "
@@ -136,7 +136,7 @@ void MoonPAWidget::settings()
                 config->writeEntry("Mask", moon->mask());
                 config->sync();
 	}
-	tqrepaint();
+	repaint();
 }
 
 void MoonPAWidget::timerEvent( TQTimerEvent * )
@@ -144,8 +144,8 @@ void MoonPAWidget::timerEvent( TQTimerEvent * )
     time_t clock;
     time(&clock);
     struct tm *t = localtime(&clock);
-    moon->calctqStatus(mktime(t));
-    moon->tqrepaint();
+    moon->calcStatus(mktime(t));
+    moon->repaint();
 }
 
 void MoonPAWidget::mousePressEvent( TQMouseEvent *e)
diff --git a/kmoon/kmoondlg.cpp b/kmoon/kmoondlg.cpp
index d4d750f..7c79a6f 100644
--- a/kmoon/kmoondlg.cpp
+++ b/kmoon/kmoondlg.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <klocale.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
@@ -94,7 +94,7 @@ void KMoonDlg::angleChanged(int value) {
 }
 
 void KMoonDlg::help() {
-    kapp->invokeHelp(TQString::tqfromLatin1("config"));
+    kapp->invokeHelp(TQString::fromLatin1("config"));
 }
 
 void KMoonDlg::toggleHemi() {
diff --git a/kmoon/kmoonwidget.cpp b/kmoon/kmoonwidget.cpp
index 89858c8..fd4dcf1 100644
--- a/kmoon/kmoonwidget.cpp
+++ b/kmoon/kmoonwidget.cpp
@@ -70,14 +70,14 @@ MoonWidget::MoonWidget(TQWidget *parent, const char *name)
     time(&clock);
     t = gmtime(&clock);
     // kdDebug() << "time " << t->tm_isdst << " " << timezone << " " << daylight << endl ;
-    calctqStatus(mktime(t));
+    calcStatus(mktime(t));
 }
 
 MoonWidget::~MoonWidget()
 {
 }
 
-void MoonWidget::calctqStatus( time_t time )
+void MoonWidget::calcStatus( time_t time )
 {
     uint lun = 0;
     time_t last_new = 0;
@@ -217,14 +217,14 @@ void MoonWidget::calctqStatus( time_t time )
     }
     
     renderGraphic();
-    tqrepaint();
+    repaint();
 }
 
 TQImage MoonWidget::loadMoon(int index)
 {
     if (index == 0) // the new moon has the wrong filename
         index = 29;
-    TQString filename = TQString("kmoon/pics/moon%1.png").tqarg(index);
+    TQString filename = TQString("kmoon/pics/moon%1.png").arg(index);
     TQString path = locate("data", filename);
     if (path.isNull())
         kdFatal() << "cound't find " << filename << ". Exiting.\n";
@@ -238,21 +238,21 @@ void MoonWidget::setAngle(int value)
 {
     _angle = value;
     renderGraphic();
-    tqrepaint();
+    repaint();
 }
 
 void MoonWidget::setNorthHemi(bool n)
 {
     _north = n;
     renderGraphic();
-    tqrepaint();
+    repaint();
 }
 
 void MoonWidget::setMask(bool value)
 {
     _mask = value;
     renderGraphic();
-    tqrepaint();
+    repaint();
 }
 
 void MoonWidget::paintEvent(TQPaintEvent *)
@@ -263,7 +263,7 @@ void MoonWidget::paintEvent(TQPaintEvent *)
 void MoonWidget::resizeEvent(TQResizeEvent *)
 {
     renderGraphic();
-    tqrepaint();
+    repaint();
 }
 
 void MoonWidget::renderGraphic()
diff --git a/kmoon/kmoonwidget.h b/kmoon/kmoonwidget.h
index 3b2415f..f636b60 100644
--- a/kmoon/kmoonwidget.h
+++ b/kmoon/kmoonwidget.h
@@ -37,7 +37,7 @@ public:
     MoonWidget(TQWidget *parent = 0, const char *name = 0);
     ~MoonWidget();
 
-    void calctqStatus( time_t time );
+    void calcStatus( time_t time );
 
     int angle() const { return _angle; }
     void setAngle(int angle);
diff --git a/kodo/kimagenumber.cpp b/kodo/kimagenumber.cpp
index 911f718..b01c4b6 100644
--- a/kodo/kimagenumber.cpp
+++ b/kodo/kimagenumber.cpp
@@ -30,7 +30,7 @@ KImageNumber::KImageNumber(const TQString& font, TQWidget* parent,const char* na
 	m_value(0)
 {
 	fontPix = new TQPixmap(font);
-	resize(tqsizeHint());
+	resize(sizeHint());
 }
 
 KImageNumber::~KImageNumber()
@@ -47,7 +47,7 @@ void KImageNumber::paintEvent(TQPaintEvent*)
 	data.sprintf("%06.1f", m_value);
 
 	for(unsigned int i=0; i < data.length(); i++) {
-		int wl = data.tqat(i).latin1() - '0';
+		int wl = data.at(i).latin1() - '0';
 		if(data.at(i) == '.')
 			wl = 10;
 		bitBlt(this, i*each, 0, fontPix, wl*each, 0, each, fontPix->height());
@@ -57,7 +57,7 @@ void KImageNumber::paintEvent(TQPaintEvent*)
 void KImageNumber::setValue(double v)
 {
 	m_value = v;
-	tqrepaint(false);
+	repaint(false);
 }
 
 double KImageNumber::value() const
@@ -65,7 +65,7 @@ double KImageNumber::value() const
 	return m_value;
 }
 
-TQSize KImageNumber::tqsizeHint() const
+TQSize KImageNumber::sizeHint() const
 {
 	int w = fontPix->width();
 	int each = w/11;
diff --git a/kodo/kimagenumber.h b/kodo/kimagenumber.h
index 0500d76..5719e1b 100644
--- a/kodo/kimagenumber.h
+++ b/kodo/kimagenumber.h
@@ -40,7 +40,7 @@ public:
 	virtual ~KImageNumber();
 
 	void paintEvent(TQPaintEvent*);
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	double value() const;
 
 public slots:
diff --git a/kteatime/tealist.cpp b/kteatime/tealist.cpp
index dcc4209..ae32339 100644
--- a/kteatime/tealist.cpp
+++ b/kteatime/tealist.cpp
@@ -15,12 +15,12 @@ TQString int2time(int time)
 {
 	TQString str;
 	if (time / 60)
-		str.append(i18n("%1 min").tqarg(time / 60));
+		str.append(i18n("%1 min").arg(time / 60));
 	if (time % 60)
           if (str.isEmpty())
-            str.append(i18n("%1 s").tqarg(time % 60));
+            str.append(i18n("%1 s").arg(time % 60));
           else
-            str.append(i18n(" %1 s").tqarg(time % 60));
+            str.append(i18n(" %1 s").arg(time % 60));
 	return str;
 }
 
diff --git a/kteatime/timeedit.cpp b/kteatime/timeedit.cpp
index 473a11b..ae4a93f 100644
--- a/kteatime/timeedit.cpp
+++ b/kteatime/timeedit.cpp
@@ -8,7 +8,7 @@
 
 #include <klocale.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include "timeedit.h"
 #include "timeedit.moc"
@@ -52,24 +52,24 @@ void WrappingSpinBox::stepDown()
 TimeEdit::TimeEdit(TQWidget* parent, const char* name)
     : TQWidget(parent, name)
 {
-	tqlayout = new TQHBoxLayout(this);
+	layout = new TQHBoxLayout(this);
 	minuteBox = new TQSpinBox(0, 300, 1, this);
-//	minuteBox->setFixedSize(minuteBox->tqsizeHint());
+//	minuteBox->setFixedSize(minuteBox->sizeHint());
 
 	TQLabel* min = new TQLabel(i18n(" min"), this);
-	min->setFixedSize(min->tqsizeHint());
+	min->setFixedSize(min->sizeHint());
 	secondBox = new WrappingSpinBox(0, 59, 1, this);
 	secondBox->setWrapping(true);
-//	secondBox->setFixedSize(secondBox->tqsizeHint());
+//	secondBox->setFixedSize(secondBox->sizeHint());
 
 	TQLabel* sec = new TQLabel(i18n(" sec"),this);
-	sec->setFixedSize(sec->tqsizeHint());
+	sec->setFixedSize(sec->sizeHint());
 
-	tqlayout->addWidget(minuteBox);
-	tqlayout->addWidget(min);
+	layout->addWidget(minuteBox);
+	layout->addWidget(min);
 
-	tqlayout->addWidget(secondBox);
-	tqlayout->addWidget(sec);
+	layout->addWidget(secondBox);
+	layout->addWidget(sec);
 
 	connect(minuteBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) );
 	connect(secondBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)) );
diff --git a/kteatime/timeedit.h b/kteatime/timeedit.h
index c614f57..7ff162f 100644
--- a/kteatime/timeedit.h
+++ b/kteatime/timeedit.h
@@ -67,7 +67,7 @@ signals:
 protected:
 	TQSpinBox *minuteBox;
 	WrappingSpinBox *secondBox;
-	TQBoxLayout* tqlayout;
+	TQBoxLayout* layout;
 };
 
 #endif
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index 82539ce..1760f86 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -24,7 +24,7 @@
 #include <assert.h>
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqlineedit.h>
@@ -207,7 +207,7 @@ void TopLevel::resizeEvent ( TQResizeEvent * )
 	teaNotReadyPixmap = loadSizedIcon("tea_not_ready", width());
 	teaAnim1Pixmap = loadSizedIcon("tea_anim1", width());
 	teaAnim2Pixmap = loadSizedIcon("tea_anim2", width());
-	tqrepaint();
+	repaint();
 }
 
 /** Handle mousePressEvent */
@@ -302,7 +302,7 @@ void TopLevel::timerEvent(TQTimerEvent *)
 					menu->setItemChecked(current_selected, true);
 			}
 
-			TQString teaMessage = i18n("The %1 is now ready!").tqarg(current_name);
+			TQString teaMessage = i18n("The %1 is now ready!").arg(current_name);
 			// invoke action
 			if (useNotify) {
 				KNotifyClient::event(winId(), "tea", teaMessage);
@@ -317,7 +317,7 @@ void TopLevel::timerEvent(TQTimerEvent *)
 				                       teaMessage, teaAnim1Pixmap, this, "popup", 0);
 				// FIXME: does auto-deletion work without timeout?
 			setToolTip(teaMessage);
-			tqrepaint();
+			repaint();
 		} else {
 			// timer not yet run out; just update tray-icon (if configured)...
 			if (useTrayVis) {
@@ -325,18 +325,18 @@ void TopLevel::timerEvent(TQTimerEvent *)
 				if (pDone - percentDone > 8) {
 					// update icon not every second, but only if somewhat noticable
 					percentDone = pDone;
-					tqrepaint();
+					repaint();
 				}
 			}
 			// ...and Tooltip
 			TQString min = int2time(seconds);
-			setToolTip(i18n("%1 left for %2").tqarg(min).tqarg(current_name));
+			setToolTip(i18n("%1 left for %2").arg(min).arg(current_name));
 		}
 	} else {
 		// no tea is steeping; just animate icon
 		if (ready) {
 			firstFrame = !firstFrame;
-			tqrepaint();
+			repaint();
 		}
 	}
 }
@@ -447,7 +447,7 @@ void TopLevel::start()
 		ready = false;
 		enable_menuEntries();                           // disable "start", enable "stop"
 
-		tqrepaint();
+		repaint();
 	}
 }
 
@@ -467,7 +467,7 @@ void TopLevel::stop()
 	}
 
 	setToolTip(i18n("The Tea Cooker"), true);
-	tqrepaint();
+	repaint();
 }
 
 /* open dialog to start an 'anonymous' tea */
@@ -487,10 +487,10 @@ void TopLevel::anonymous()
 		prop_box->addWidget(propright);
 
 		anon_time = new TimeEdit(propright);
-		anon_time->setFixedHeight(anon_time->tqsizeHint().height());
+		anon_time->setFixedHeight(anon_time->sizeHint().height());
 		anon_time->setValue(DEFAULT_TEA_TIME);
 		TQLabel *l = new TQLabel(anon_time, i18n("Tea time:"), propleft);
-		l->setFixedSize(l->tqsizeHint());
+		l->setFixedSize(l->sizeHint());
 
 		top_box->addStretch();
 
@@ -688,28 +688,28 @@ void TopLevel::config()
     btn_new = new TQPushButton(TQString(), listgroup_widget);
     TQToolTip::add(btn_new, i18n("New"));
     btn_new->setPixmap(SmallIcon("filenew"));
-    btn_new->setMinimumSize(btn_new->tqsizeHint() * 1.2);
+    btn_new->setMinimumSize(btn_new->sizeHint() * 1.2);
     connect(btn_new, TQT_SIGNAL(clicked()), TQT_SLOT(newButtonClicked()));
     hbox->addWidget(btn_new);
 
     btn_del = new TQPushButton(TQString(), listgroup_widget);
     TQToolTip::add(btn_del, i18n("Delete"));
     btn_del->setIconSet(SmallIconSet("editdelete"));
-    btn_del->setMinimumSize(btn_new->tqsizeHint() * 1.2);
+    btn_del->setMinimumSize(btn_new->sizeHint() * 1.2);
     connect(btn_del, TQT_SIGNAL(clicked()), TQT_SLOT(delButtonClicked()));
     hbox->addWidget(btn_del);
 
     btn_up = new TQPushButton(TQString(), listgroup_widget);
     TQToolTip::add(btn_up, i18n("Up"));
     btn_up->setIconSet(SmallIconSet("up"));
-    btn_up->setMinimumSize(btn_up->tqsizeHint() * 1.2);
+    btn_up->setMinimumSize(btn_up->sizeHint() * 1.2);
     connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(upButtonClicked()));
     hbox->addWidget(btn_up);
 
     btn_down = new TQPushButton(TQString(), listgroup_widget);
     TQToolTip::add(btn_down, i18n("Down"));
     btn_down->setIconSet(SmallIconSet("down"));
-    btn_down->setMinimumSize(btn_down->tqsizeHint() * 1.2);
+    btn_down->setMinimumSize(btn_down->sizeHint() * 1.2);
     connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(downButtonClicked()));
     hbox->addWidget(btn_down);
 
@@ -721,21 +721,21 @@ void TopLevel::config()
     rightside->addWidget(editgroup, 0, 0);
     TQHBox *propbox = new TQHBox(editgroup);
 
-    // FIXME: - must enforce correct vertical tqalignment of each label-editor pair
+    // FIXME: - must enforce correct vertical alignment of each label-editor pair
     //          (better use one HBox for each label-editor pair?)
     TQVBox *propleft = new TQVBox(propbox);
     TQVBox *propright = new TQVBox(propbox);
     nameEdit = new TQLineEdit(propright);
-    nameEdit->setFixedHeight(nameEdit->tqsizeHint().height());
-    nameEdit->tqsetAlignment(TQLineEdit::AlignLeft);
+    nameEdit->setFixedHeight(nameEdit->sizeHint().height());
+    nameEdit->setAlignment(TQLineEdit::AlignLeft);
     TQLabel *l = new TQLabel(nameEdit, i18n("Name:"), propleft);
-    l->setFixedSize(l->tqsizeHint());
+    l->setFixedSize(l->sizeHint());
     connect(nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(nameEditTextChanged(const TQString&)) );
 
     timeEdit = new TimeEdit(propright);
-    timeEdit->setFixedHeight(timeEdit->tqsizeHint().height());
+    timeEdit->setFixedHeight(timeEdit->sizeHint().height());
     l = new TQLabel(timeEdit, i18n("Tea time:"), propleft);
-    l->setFixedSize(l->tqsizeHint());
+    l->setFixedSize(l->sizeHint());
     connect(timeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinBoxValueChanged(int)));
 
     /* bottom - timeout actions */
@@ -751,15 +751,15 @@ void TopLevel::config()
 
     eventEnable = new TQCheckBox(i18n("Event"), actiongroup);
     popupEnable = new TQCheckBox(i18n("Popup"), actiongroup);
-    eventEnable->setFixedHeight(eventEnable->tqsizeHint().height());
-    popupEnable->setFixedHeight(popupEnable->tqsizeHint().height());
+    eventEnable->setFixedHeight(eventEnable->sizeHint().height());
+    popupEnable->setFixedHeight(popupEnable->sizeHint().height());
 
     TQHBox *actionbox = new TQHBox(actiongroup);
     actionEnable = new TQCheckBox(actionbox);
 //    FIXME: add text to this line:
 //    TQLabel *actionLabel = new TQLabel(i18n("Execute: "), actiongroup);
     actionEdit = new TQLineEdit(actionbox);
-    actionEdit->setFixedHeight(actionEdit->tqsizeHint().height());
+    actionEdit->setFixedHeight(actionEdit->sizeHint().height());
     TQToolTip::add(actionEdit, i18n("Enter command here; '%t' will be replaced with name of steeping tea"));
     connect(actionEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(actionEnableToggled(bool)));
     rightside->addStretch();
diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp
index 5138159..de9be14 100644
--- a/ktux/sprite.cpp
+++ b/ktux/sprite.cpp
@@ -9,7 +9,7 @@
 #include <time.h>
 #include <tqlabel.h>
 #include <tqmessagebox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqslider.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
@@ -60,7 +60,7 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name )
     tl1->addLayout(tl11);
 
     TQLabel *label = new TQLabel( i18n("Speed:"), this );
-    label->setMinimumSize(label->tqsizeHint());
+    label->setMinimumSize(label->sizeHint());
     tl11->addStretch(1);
     tl11->addWidget(label);
 
@@ -85,7 +85,7 @@ KSpriteSetup::KSpriteSetup( TQWidget *parent, const char *name )
 
     button = bbox->addButton(KStdGuiItem::cancel());
     connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
-    bbox->tqlayout();
+    bbox->layout();
     tl->addWidget(bbox);
 
     tl->freeze();
@@ -203,7 +203,7 @@ void KSpriteSaver::initialise()
 {
     mCanvas = new TQCanvas();
     TQPixmap pm( locate("sprite", "bg.png") );
-    mCanvas->tqsetBackgroundPixmap( pm );
+    mCanvas->setBackgroundPixmap( pm );
     mCanvas->resize( width(), height() );
     mView = new TQCanvasView(mCanvas);
     mView->viewport()->setBackgroundColor( black );
diff --git a/kweather/dockwidget.cpp b/kweather/dockwidget.cpp
index 04576b1..390d455 100644
--- a/kweather/dockwidget.cpp
+++ b/kweather/dockwidget.cpp
@@ -21,7 +21,7 @@
 #include "weatherservice_stub.h"
 
 #include <tqtooltip.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqtimer.h>
 #include <tqobjectlist.h>
@@ -112,19 +112,19 @@ void dockwidget::showWeather()
                     "<th><nobr>" + i18n( "Rel. Humidity:" ) + "</nobr></th><td><nobr>%4</nobr></td></nobr></tr>"
 
                 "<tr><th><nobr>" + i18n( "Wind Speed:"    ) + "</nobr></th><td><nobr>%5</nobr></td>")
-                .tqarg(temp).tqarg(dewPoint).tqarg(pressure).tqarg(relHumidity).tqarg(wind);
+                .arg(temp).arg(dewPoint).arg(pressure).arg(relHumidity).arg(wind);
 
         if ( !heatIndex.isEmpty() )
-            tip += TQString("<th><nobr>" + i18n( "Heat Index:" ) + "</nobr></th><td><nobr>%1</nobr></td>").tqarg(heatIndex);
+            tip += TQString("<th><nobr>" + i18n( "Heat Index:" ) + "</nobr></th><td><nobr>%1</nobr></td>").arg(heatIndex);
         else if ( !windChill.isEmpty() )
-            tip += TQString("<th><nobr>" + i18n( "Wind Chill:" ) + "</nobr></th><td><nobr>%1</nobr></td>").tqarg(windChill);
+            tip += TQString("<th><nobr>" + i18n( "Wind Chill:" ) + "</nobr></th><td><nobr>%1</nobr></td>").arg(windChill);
         else
             tip += "<td>&nbsp;</td><td>&nbsp;</td>";
         tip += "</tr>";
 
         tip += TQString("<tr><th><nobr>" + i18n( "Sunrise:" ) + "</nobr></th><td><nobr>%1</nobr></td>" +
                            "<th><nobr>" + i18n( "Sunset:"  ) + "</nobr></th><td><nobr>%2</nobr></td>")
-                 .tqarg(sunRiseTime).tqarg(sunSetTime);
+                 .arg(sunRiseTime).arg(sunSetTime);
 
         tip += "</tr></table>";
 
@@ -184,12 +184,12 @@ void dockwidget::initDock()
     mainLayout->setMargin(0);
     mainLayout->addWidget(m_button, 0, TQt::AlignCenter);
 
-    TQBoxLayout *tqlayout = new TQBoxLayout(mainLayout, TQBoxLayout::TopToBottom);
-    tqlayout->setSpacing(0);
-    tqlayout->setMargin(0);
-    tqlayout->addWidget(m_lblTemp);
-    tqlayout->addWidget(m_lblWind);
-    tqlayout->addWidget(m_lblPres);
+    TQBoxLayout *layout = new TQBoxLayout(mainLayout, TQBoxLayout::TopToBottom);
+    layout->setSpacing(0);
+    layout->setMargin(0);
+    layout->addWidget(m_lblTemp);
+    layout->addWidget(m_lblWind);
+    layout->addWidget(m_lblPres);
 
     mainLayout->addSpacing(8);
 
@@ -210,21 +210,21 @@ void dockwidget::resizeView( const TQSize &size )
 
         if ( m_mode == ShowAll )
         {
-            if ( h <= 128 )  // left to right tqlayout
+            if ( h <= 128 )  // left to right layout
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
-                m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
-                m_lblWind->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
-                m_lblPres->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
+                m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
             }
             else  // top to bottom
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
                 TQFontMetrics fm(m_font);
                 h = 128 - (3 * fm.height());  // 3 lines of text below the button
-                m_lblTemp->tqsetAlignment(TQt::AlignCenter);
-                m_lblWind->tqsetAlignment(TQt::AlignCenter);
-                m_lblPres->tqsetAlignment(TQt::AlignCenter);
+                m_lblTemp->setAlignment(TQt::AlignCenter);
+                m_lblWind->setAlignment(TQt::AlignCenter);
+                m_lblPres->setAlignment(TQt::AlignCenter);
             }
             m_button->setFixedSize(h, h);
         }
@@ -232,15 +232,15 @@ void dockwidget::resizeView( const TQSize &size )
         {
             if ( h <= 32 )  // left to right
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
-                m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
+                m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
             }
             else  // top to bottom
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
                 TQFontMetrics fm(m_font);
                 h = TQMIN(128, h) - fm.height();
-                m_lblTemp->tqsetAlignment(TQt::AlignCenter);
+                m_lblTemp->setAlignment(TQt::AlignCenter);
             }
             m_button->setFixedSize(h, h);
         }
@@ -259,21 +259,21 @@ void dockwidget::resizeView( const TQSize &size )
         {
             if ( w <= 128 )  // top to bottom
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
-                m_lblTemp->tqsetAlignment(TQt::AlignCenter);
-                m_lblWind->tqsetAlignment(TQt::AlignCenter);
-                m_lblPres->tqsetAlignment(TQt::AlignCenter);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
+                m_lblTemp->setAlignment(TQt::AlignCenter);
+                m_lblWind->setAlignment(TQt::AlignCenter);
+                m_lblPres->setAlignment(TQt::AlignCenter);
 
                 TQFontMetrics fm(m_font);
                 h = h - (3 * fm.height());  // 3 lines of text below the button
                 h = TQMIN(w, h);
             }
-            else  // left to right tqlayout
+            else  // left to right layout
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
-                m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
-                m_lblWind->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
-                m_lblPres->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
+                m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblWind->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                m_lblPres->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
             }
             m_button->setFixedSize(h, h);
         }
@@ -281,15 +281,15 @@ void dockwidget::resizeView( const TQSize &size )
         {
             if ( w <= 128 )  // top to bottom
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::TopToBottom);
-                m_lblTemp->tqsetAlignment(TQt::AlignCenter);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::TopToBottom);
+                m_lblTemp->setAlignment(TQt::AlignCenter);
 
                 h = w;
             }
-            else  // left to right tqlayout
+            else  // left to right layout
             {
-                static_cast<TQBoxLayout*>(tqlayout())->setDirection(TQBoxLayout::LeftToRight);
-                m_lblTemp->tqsetAlignment(TQt::AlignAuto | TQt::AlignVCenter);
+                static_cast<TQBoxLayout*>(layout())->setDirection(TQBoxLayout::LeftToRight);
+                m_lblTemp->setAlignment(TQt::AlignAuto | TQt::AlignVCenter);
 
                 h = static_cast<int>(w * 0.33);
             }
@@ -310,7 +310,7 @@ int dockwidget::widthForHeight(int h)
 
     if ( m_mode == ShowAll )
     {
-        if ( h <= 128 )  // left to right tqlayout
+        if ( h <= 128 )  // left to right layout
         {
             int pixelSize = h/3 - 3;
             pixelSize = TQMIN(pixelSize, fi.pixelSize());  // don't make it too large
@@ -337,7 +337,7 @@ int dockwidget::widthForHeight(int h)
     }
     else if ( m_mode == ShowTempOnly )
     {
-        if ( h <= 32 )  // left to right tqlayout
+        if ( h <= 32 )  // left to right layout
         {
             int pixelSize = h - 3;
             pixelSize = TQMIN(pixelSize, fi.pixelSize());  // don't make it too large
diff --git a/kweather/kcmweather.cpp b/kweather/kcmweather.cpp
index d49d3a0..1037fa1 100644
--- a/kweather/kcmweather.cpp
+++ b/kweather/kcmweather.cpp
@@ -24,7 +24,7 @@
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kaboutdata.h>
 #include <kapplication.h>
@@ -54,12 +54,12 @@ KCMWeather::KCMWeather( TQWidget *parent, const char *name )
 {
   mWeatherService = new WeatherService_stub( "KWeatherService",
       "WeatherService" );
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
   mWidget = new prefsDialogData( this );
 
   mWidget->m_reportLocation->setFocus();
-  tqlayout->addWidget( mWidget );
-  tqlayout->addStretch();
+  layout->addWidget( mWidget );
+  layout->addStretch();
 
   fillStationList();
   load();
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index db8325d..203bddf 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */                                                                      
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kaboutdata.h>
 #include <kdebug.h>
@@ -41,13 +41,13 @@ extern "C"
 KCMWeatherService::KCMWeatherService( TQWidget *parent, const char *name )
   : KCModule( parent, name )
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+  TQVBoxLayout *layout = new TQVBoxLayout( this );
   mWidget = new ServiceConfigWidget( this );
 
   // not needed, as a change immediately changes the service
   //connect(mWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
 
-  tqlayout->addWidget( mWidget );
+  layout->addWidget( mWidget );
   KAboutData *about = new KAboutData( "kcmweatherservice",
                                       I18N_NOOP( "KWeather Configure Dialog" ),
                                       0, 0, KAboutData::License_GPL,
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 9b8c481..9685543 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -31,7 +31,7 @@
 
 #include <tqfile.h>
 #include <tqtimer.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include "kweather.h"
 #include "reportview.h"
@@ -86,7 +86,7 @@ kweather::~kweather()
 void kweather::initContextMenu()
 {
     mContextMenu = new KPopupMenu(this);
-    mContextMenu->insertTitle(i18n("KWeather - %1").tqarg( reportLocation ), -1, 0);
+    mContextMenu->insertTitle(i18n("KWeather - %1").arg( reportLocation ), -1, 0);
     mContextMenu->insertItem(SmallIcon("viewmag"), i18n("Show &Report"),
         this, TQT_SLOT(doReport()), 0, -1, 1);
     mContextMenu->insertItem(SmallIcon("reload"), i18n("&Update Now"),
@@ -171,7 +171,7 @@ void kweather::preferences()
 /** The help handler */
 void kweather::help()
 {
-    kapp->invokeHelp(TQString(), TQString::tqfromLatin1("kweather"));
+    kapp->invokeHelp(TQString(), TQString::fromLatin1("kweather"));
 }
 
 /** Display the current weather report. */
diff --git a/kweather/metar_parser.cpp b/kweather/metar_parser.cpp
index 2d3eab9..b6715f0 100644
--- a/kweather/metar_parser.cpp
+++ b/kweather/metar_parser.cpp
@@ -147,7 +147,7 @@ bool MetarParser::parseCover(const TQString &s)
 {
 	if (CoverRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Cover: " << TQString(CoverRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Cover: " << TQString(CoverRegExp.capturedTexts().join("-"))
 				<< endl;
 
 		TQString sCode = CoverRegExp.cap(1);
@@ -170,22 +170,22 @@ bool MetarParser::parseCover(const TQString &s)
 
 		if (sCode == "FEW")
 		{
-			skycondition = i18n( "Few clouds at %1" ).tqarg(sClouds);
+			skycondition = i18n( "Few clouds at %1" ).arg(sClouds);
 			weatherInfo.clouds += 2;
 		}
 		else if (sCode == "SCT")
 		{
-			skycondition = i18n( "Scattered clouds at %1" ).tqarg(sClouds);
+			skycondition = i18n( "Scattered clouds at %1" ).arg(sClouds);
 			weatherInfo.clouds += 4;
 		}
 		else if (sCode == "BKN")
 		{
-			skycondition = i18n( "Broken clouds at %1" ).tqarg(sClouds);
+			skycondition = i18n( "Broken clouds at %1" ).arg(sClouds);
 			weatherInfo.clouds += 8;
 		}
 		else if (sCode == "OVC")
 		{
-			skycondition = i18n( "Overcast clouds at %1" ).tqarg(sClouds);
+			skycondition = i18n( "Overcast clouds at %1" ).arg(sClouds);
 			weatherInfo.clouds += 64;
 		}
 		else if ((sCode == "CLR") || (sCode == "SKC") || (sCode == "CAVOK"))
@@ -211,7 +211,7 @@ bool MetarParser::parseCurrent(const TQString &s)
 		TQString sCode = CurrentRegExp.cap(2);
 		TQString intensity, descriptor, phenomena, currentWeather;
 
-		kdDebug(12006) << "Current: " << TQString(CurrentRegExp.tqcapturedTexts().join("-")) << endl;
+		kdDebug(12006) << "Current: " << TQString(CurrentRegExp.capturedTexts().join("-")) << endl;
 
 		// Decode the intensity
 		if (sIntensity == "+")
@@ -343,7 +343,7 @@ bool MetarParser::parseCurrent(const TQString &s)
 		else if (sCode.contains("DS"))
 			phenomena = i18n("Dust Storm");
 		
-		if (currentWeather.isEmpty()) currentWeather = i18n("%1 is the intensity, %2 is the descriptor and %3 is the phenomena", "%1 %2 %3").tqarg(intensity).tqarg(descriptor).tqarg(phenomena);
+		if (currentWeather.isEmpty()) currentWeather = i18n("%1 is the intensity, %2 is the descriptor and %3 is the phenomena", "%1 %2 %3").arg(intensity).arg(descriptor).arg(phenomena);
 
 		if (!currentWeather.isEmpty())
 			weatherInfo.qsCurrentList << currentWeather;
@@ -358,7 +358,7 @@ bool MetarParser::parseTemperature(const TQString &s)
 {
 	if (TempRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Temp: " << TQString(TempRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Temp: " << TQString(TempRegExp.capturedTexts().join("-"))
 				<< endl;
 
 		float fTemp = TempRegExp.cap(2).toFloat();
@@ -379,7 +379,7 @@ bool MetarParser::parseTemperatureTenths(const TQString &s)
 {
 	if (TempTenRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Temp Tenths: " << TQString(TempTenRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Temp Tenths: " << TQString(TempTenRegExp.capturedTexts().join("-"))
 				<< endl;
 		
 		float temperature = TempTenRegExp.cap( 1 ).toFloat() / 10;
@@ -473,7 +473,7 @@ bool MetarParser::parseDate(const TQString &s)
 {
 	if (DateRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Date: " << TQString(DateRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Date: " << TQString(DateRegExp.capturedTexts().join("-"))
 				<< endl;
 		TQString dateString = DateRegExp.cap(1);
 		TQString day, month, year;
@@ -496,7 +496,7 @@ bool MetarParser::parseTime(const TQString &s)
 {
 	if (TimeRegExp.search(s) > -1)
 	{
-		kdDebug(12006) << "Time: " << TQString(TimeRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Time: " << TQString(TimeRegExp.capturedTexts().join("-"))
 				<< endl;
 
 		TQString hour, minute, dateString;
@@ -521,7 +521,7 @@ bool MetarParser::parseVisibility(TQStringList::ConstIterator it)
 	{
 		fVisibility = VisRegExp.cap(1).toFloat();
 
-		kdDebug(12006) << "Visibility: " << TQString(VisRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Visibility: " << TQString(VisRegExp.capturedTexts().join("-"))
 				<< endl;
 
 	}
@@ -564,7 +564,7 @@ bool MetarParser::parsePressure( const TQString &s)
 		TQString type = PressRegExp.cap(1);
 		float fPressure = PressRegExp.cap(2).toFloat();
 
-		kdDebug(12006) << "Pressure: " << TQString(PressRegExp.tqcapturedTexts().join("-"))
+		kdDebug(12006) << "Pressure: " << TQString(PressRegExp.capturedTexts().join("-"))
 				<< endl;
 
 		if (m_units == KLocale::Metric)
@@ -643,7 +643,7 @@ bool MetarParser::parseWindSpeed(const TQString &s)
 		float gustSpeed = WindRegExp.cap(3).toFloat();
 		TQString sWindUnit = WindRegExp.cap(4);
 
-		kdDebug(12006) << "Wind: " << WindRegExp.tqcapturedTexts().join("-")
+		kdDebug(12006) << "Wind: " << WindRegExp.capturedTexts().join("-")
 				<< endl;
 
 		if (m_units == KLocale::Metric)
diff --git a/kweather/metar_parser.h b/kweather/metar_parser.h
index 7d94149..daeddad 100644
--- a/kweather/metar_parser.h
+++ b/kweather/metar_parser.h
@@ -60,7 +60,7 @@ class MetarParser
 	public:
 		MetarParser(StationDatabase *stationDB,
 			    KLocale::MeasureSystem units = KLocale::Imperial,
-			    TQDate date = TQDate::tqcurrentDate(),
+			    TQDate date = TQDate::currentDate(),
 			    TQTime time = TQTime::currentTime(), 
 			    unsigned int localUTCOffset = KRFCDate::localUTCOffset());
 
diff --git a/kweather/prefdialogdata.ui b/kweather/prefdialogdata.ui
index 590a2c2..c0878ce 100644
--- a/kweather/prefdialogdata.ui
+++ b/kweather/prefdialogdata.ui
@@ -21,7 +21,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -85,7 +85,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -129,7 +129,7 @@
             <property name="title">
                 <string>Panel Display Options</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
             <property name="exclusive">
@@ -228,7 +228,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>294</width>
                             <height>16</height>
@@ -256,7 +256,7 @@
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>252</width>
                             <height>0</height>
@@ -284,7 +284,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -318,7 +318,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>170</width>
                             <height>20</height>
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index f25df19..39b5536 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -72,7 +72,7 @@ void reportView::render(){
 
     TQString textColor = KGlobalSettings::textColor().name();
     TQString baseColor = KGlobalSettings::baseColor().name();
-    TQColorGroup cg = tqpalette().active();
+    TQColorGroup cg = palette().active();
     TQString bgColor = cg.background().name();
     TQString hlColor = cg.highlight().name();
     TQString hlTextColor = cg.highlightedText().name();
@@ -93,7 +93,7 @@ void reportView::render(){
     TQStringList cover = m_weatherService->cover(m_locationCode );
     TQStringList weather = m_weatherService->weather(m_locationCode );
 
-    setCaption(i18n("Weather Report - %1").tqarg( locationName ) );
+    setCaption(i18n("Weather Report - %1").arg( locationName ) );
 
     TQString weatherText = "<ul>\n";
 
@@ -114,24 +114,24 @@ void reportView::render(){
     TQString contents =
     "<html><head><style type=\"text/css\">" +
     TQString("body { font-family: \"%1\"; font-size: %2pt; color: %3; background-color: %4; }\n")
-    .tqarg(fntFamily).tqarg(fntSize).tqarg(textColor).tqarg(baseColor) +
+    .arg(fntFamily).arg(fntSize).arg(textColor).arg(baseColor) +
     TQString("div.headerTitle { background-color: %1; color: %2; padding: 4px; font-size: 120%; border: solid %3 1px; }\n")
-    .tqarg(hlColor).tqarg(hlTextColor).tqarg(textColor) +
+    .arg(hlColor).arg(hlTextColor).arg(textColor) +
     TQString("div.headerMsg { background-color: %1; color: %2; border-bottom: solid %3 1px; "
     "border-left: solid %4 1px; border-right: solid %5 1px; margin-bottom: 1em; padding: 2px; }\n")
-    .tqarg(bgColor).tqarg(textColor).tqarg(textColor).tqarg(textColor).tqarg(textColor) +    
-    TQString("</style><title></title></head><body dir=\"%1\">").tqarg( TQApplication::reverseLayout()?"rtl":"ltr") + 
-    "<div class=\"headerTitle\"><b>" + i18n( "Weather Report - %1 - %2" ).tqarg( locationName ).tqarg( countryName ) +        
+    .arg(bgColor).arg(textColor).arg(textColor).arg(textColor).arg(textColor) +    
+    TQString("</style><title></title></head><body dir=\"%1\">").arg( TQApplication::reverseLayout()?"rtl":"ltr") + 
+    "<div class=\"headerTitle\"><b>" + i18n( "Weather Report - %1 - %2" ).arg( locationName ).arg( countryName ) +        
     "</b></div>\n";
 
     if ( ! date.isEmpty() )
-      contents += "<div class=\"headerMsg\"><b>" + i18n( "Latest data from %1" ).tqarg(date) + "</b></div>\n";
+      contents += "<div class=\"headerMsg\"><b>" + i18n( "Latest data from %1" ).arg(date) + "</b></div>\n";
 
     contents += TQString(
     "<table><tr><td width=\"60\" style=\"text-align: center; border: dotted %1 1px;\">"
     "<img width=\"64\" height=\"64\" src=\"%2\" /></td>"
     "<td style=\"vertical-align: top\">%3</td></tr>")
-    .tqarg(bgColor).tqarg(KURL(icon).url()).tqarg(weatherText) +
+    .arg(bgColor).arg(KURL(icon).url()).arg(weatherText) +
     "</table><table>" +
     TQString("<tr><th style=\"text-align: right\">" + i18n( "Temperature:" )
     + "</th><td>%1</td>"
@@ -145,15 +145,15 @@ void reportView::render(){
     + "</th><td>%4</td></tr>"
     "<tr><th style=\"text-align: right\">" + i18n( "Wind Speed:" )
     + "</th><td>%5</td>")
-    .tqarg(temp).tqarg(dewPoint).tqarg(pressure).tqarg(relHumidity)
-    .tqarg(wind) + "<td width=\"50\">&nbsp;</td>";
+    .arg(temp).arg(dewPoint).arg(pressure).arg(relHumidity)
+    .arg(wind) + "<td width=\"50\">&nbsp;</td>";
 
     if (!heatIndex.isEmpty())
         contents += TQString("<th style=\"text-align: right\">"
-        + i18n( "Heat Index:" ) + "</th><td>%1</td>").tqarg(heatIndex);
+        + i18n( "Heat Index:" ) + "</th><td>%1</td>").arg(heatIndex);
     else if (!windChill.isEmpty())
         contents += TQString("<th style=\"text-align: right\">"
-        + i18n( "Wind Chill:" ) + "</th><td>%1</td>").tqarg(windChill);
+        + i18n( "Wind Chill:" ) + "</th><td>%1</td>").arg(windChill);
     else
         contents += "<td>&nbsp;</td><td>&nbsp;</td>";
     contents += "</tr>";
@@ -162,7 +162,7 @@ void reportView::render(){
     + i18n( "Sunrise:" ) + "</th><td>%1</td>" +
     "<td width=\"50\">&nbsp;</td><th style=\"text-align: right\">"
     + i18n( "Sunset:" ) + "</th><td>%2</td>")
-    .tqarg(sunRiseTime).tqarg(sunSetTime);
+    .arg(sunRiseTime).arg(sunSetTime);
 
     contents += "</tr></table></body></html>";
 
diff --git a/kweather/serviceconfigdata.ui b/kweather/serviceconfigdata.ui
index befdca2..71f6099 100644
--- a/kweather/serviceconfigdata.ui
+++ b/kweather/serviceconfigdata.ui
@@ -60,7 +60,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>86</height>
@@ -121,7 +121,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>85</height>
@@ -169,7 +169,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kweather/serviceconfigwidget.cpp b/kweather/serviceconfigwidget.cpp
index 08a3b51..a71d4b6 100644
--- a/kweather/serviceconfigwidget.cpp
+++ b/kweather/serviceconfigwidget.cpp
@@ -194,7 +194,7 @@ void ServiceConfigWidget::loadLocations()
           parseStationEntry( entryIt.data(), station, uid );
           new StationItem( stateItem, station, uid );
           mStationMap.insert( uid, TQString( "%1, %2" )
-              .tqarg( station ).tqarg( *stateIt ) );
+              .arg( station ).arg( *stateIt ) );
         }
       }
     }
diff --git a/kweather/sidebarwidgetbase.ui b/kweather/sidebarwidgetbase.ui
index 46eb042..6f1f50c 100644
--- a/kweather/sidebarwidgetbase.ui
+++ b/kweather/sidebarwidgetbase.ui
@@ -61,7 +61,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kweather/sun.h b/kweather/sun.h
index f56b513..fd407d7 100644
--- a/kweather/sun.h
+++ b/kweather/sun.h
@@ -37,7 +37,7 @@ class Sun
 		 */
 		Sun( const TQString &latitude, 
 		     const TQString &longitude,
-		     TQDate date = TQDate::tqcurrentDate(),
+		     TQDate date = TQDate::currentDate(),
 		     const int localUTCOffset = KRFCDate::localUTCOffset() );
 		
 		TQTime computeRiseTime();
diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index c77333d..a3c5b05 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlabel.h>
 #include <tqfont.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqscrollview.h>
 #include <tqgroupbox.h>
 #include <klocale.h>
diff --git a/kweather/weatherbar.h b/kweather/weatherbar.h
index 0d00c13..d132d04 100644
--- a/kweather/weatherbar.h
+++ b/kweather/weatherbar.h
@@ -28,7 +28,7 @@
 #include <kparts/browserextension.h>
 #include <tqdict.h>
 #include <dcopobject.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtimer.h>
 
 class dockwidget;
diff --git a/kweather/weatherbutton.cpp b/kweather/weatherbutton.cpp
index ceb4360..ee88962 100644
--- a/kweather/weatherbutton.cpp
+++ b/kweather/weatherbutton.cpp
@@ -124,14 +124,14 @@ void WeatherButton::slotIconChanged( int group )
         return;
 
     generateIcons();
-    tqrepaint( false );
+    repaint( false );
 }
 
 void WeatherButton::enterEvent( TQEvent *e )
 {
     m_highlight = true;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -139,7 +139,7 @@ void WeatherButton::leaveEvent( TQEvent *e )
 {
     m_highlight = false;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
diff --git a/kweather/weatherlib.cpp b/kweather/weatherlib.cpp
index 40eab31..7daf2d7 100644
--- a/kweather/weatherlib.cpp
+++ b/kweather/weatherlib.cpp
@@ -18,7 +18,7 @@ email                : geiseri@msoe.edu
 #include "config.h"
 #include <tqfile.h>
 #include <tqdatetime.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -65,7 +65,7 @@ WeatherLib::Data::Data()
 
 void WeatherLib::Data::clear()
 {
-	age = TQDateTime::tqcurrentDateTime();
+	age = TQDateTime::currentDateTime();
 	downloading = false;
 	updated = false;
 	job = 0;
@@ -135,7 +135,7 @@ void WeatherLib::slotCopyDone(KIO::Job* job)
 						kdDebug( 12006 ) << "Parse: " << s << endl;
 						MetarParser parser(m_StationDb, KGlobal::locale()->measureSystem());
 						d->wi = parser.processData(d->wi.reportLocation, s);
-						d->age = TQDateTime::tqcurrentDateTime().addSecs(1800);
+						d->age = TQDateTime::currentDateTime().addSecs(1800);
 						emit fileUpdate(d->wi.reportLocation);
 						d->updated = true;
 					}
@@ -144,7 +144,7 @@ void WeatherLib::slotCopyDone(KIO::Job* job)
 						// File error
 						kdDebug( 12006 ) << "File empty error..." << endl;
 						KPassivePopup::message( i18n("KWeather Error!"),
-						i18n("The temp file %1 was empty.").tqarg(d->target->name()),  0L,"error" );
+						i18n("The temp file %1 was empty.").arg(d->target->name()),  0L,"error" );
 						d->updated = false;
 					}
 				}
@@ -153,7 +153,7 @@ void WeatherLib::slotCopyDone(KIO::Job* job)
 					// File error
 					kdDebug( 12006 ) << "File read error..." << endl;
 					KPassivePopup::message( i18n("KWeather Error!"),
-				i18n("Could not read the temp file %1.").tqarg(d->target->name()),  0L,"error" );
+				i18n("Could not read the temp file %1.").arg(d->target->name()),  0L,"error" );
 					d->updated = false;
 				}
 				delete d->target;
@@ -322,7 +322,7 @@ void WeatherLib::update(const TQString &stationID)
 	// Only grab new data if its more than 50 minutes old
 	Data *d = findData(stationID);
 
-	TQDateTime timeout = TQDateTime::tqcurrentDateTime();
+	TQDateTime timeout = TQDateTime::currentDateTime();
 
 	kdDebug (12006) << "Current Time: " << KGlobal::locale()->formatDateTime(timeout, false, false) <<
 			" Update at: " << KGlobal::locale()->formatDateTime(d->age, false, false) << endl;
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)));
     }
 }
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:50:42 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2011-12-15 15:50:42 -0600
commit	6cdf35ab11c322f33feca5baf090ef56068b6049 (patch)
tree	ca493b21887096329578b1c02530fd4ca9388cfc
parent	44b2e94b380d4e5ec1539874823ffc06f05515cb (diff)
download	tdetoys-6cdf35ab.tar.gz tdetoys-6cdf35ab.zip