Remove additional unneeded tq method conversions

arts/builder/createtool.cpp

@@ -55,7 +55,7 @@ CreateTool::CreateTool(ModuleWidget *mwidget)
 
 CreateTool::~CreateTool()
 {
-	mwidget->tqrepaint(componentRect);
+	mwidget->repaint(componentRect);
 	mwidget->setCursor(oldCursor);
 	mwidget->setMouseTracking(oldMouseTracking);
 }
@@ -89,7 +89,7 @@ void CreateTool::mouseMoveEvent(TQMouseEvent *e)
      && mwidget->colXPos(x + width, &cellx2) && mwidget->rowYPos(y + height, &celly2);
 	if(!posok) return;
 
-	mwidget->tqrepaint(componentRect);
+	mwidget->repaint(componentRect);
 	componentRect = TQRect(cellx, celly, cellx2 - cellx, celly2 - celly);
 
 	TQPainter *p = new TQPainter;
@@ -303,7 +303,7 @@ void ConnectPortsTool::mouseMoveEvent(TQMouseEvent *e)
 {
 	TQPainter painter(mwidget);
 	painter.setPen(TQt::white);
-	mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize());
+	mwidget->repaint(TQRect(firstPos, lastPos).normalize());
 	painter.drawLine(firstPos, e->pos());
 	lastPos = e->pos();
 }
@@ -334,6 +334,6 @@ void ConnectPortsTool::mouseReleaseEvent(TQMouseEvent *e)
 			}
 		}
 	}
-	mwidget->tqrepaint(TQRect(firstPos, lastPos).normalize());
+	mwidget->repaint(TQRect(firstPos, lastPos).normalize());
 	mwidget->leaveTool(this);
 }

arts/builder/dirmanager.cpp

@@ -83,7 +83,7 @@ char *DirManager::directory(const char *subdir, const TQString &desc)
 		TQString dir = TQFile::decodeName(dirname);
 		message = i18n("You need the folder %1.\n"
 			"It will be used to store %2.\nShould I create it now?")
-			.tqarg(dir).tqarg(desc);
+			.arg(dir).arg(desc);
 
 		if(KMessageBox::questionYesNo(0,message,i18n("aRts Folder Missing"),i18n("Create Folder"),i18n("Do Not Create"))
 			== KMessageBox::Yes)

arts/builder/interfacedlg.cpp

@@ -159,10 +159,10 @@ void InterfaceDlg::update(const string& interface, const string& indent)
 {
 	listbox->insertItem((indent + interface).c_str());
 
-	vector<string> *tqchildren = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface);
+	vector<string> *children = Arts::Dispatcher::the()->interfaceRepo().queryChildren(interface);
-	for (vector<string>::iterator ci = tqchildren->begin(); ci != tqchildren->end(); ++ci)
+	for (vector<string>::iterator ci = children->begin(); ci != children->end(); ++ci)
 		update(ci->c_str(), indent+"  ");
-	delete tqchildren;
+	delete children;
 }
 
 void InterfaceDlg::update()

arts/builder/main.cpp

@@ -441,7 +441,7 @@ void ArtsBuilderWindow::publish()
 	checkName();
 	structure->publish();
 	KMessageBox::information(this,
-		i18n("The structure has been published as: '%1' on the server.").tqarg( structure->name().c_str() ));
+		i18n("The structure has been published as: '%1' on the server.").arg( structure->name().c_str() ));
 }
 
 TQString ArtsBuilderWindow::getOpenFilename(const char *pattern, const char *initialDir)
@@ -587,7 +587,7 @@ bool ArtsBuilderWindow::save(TQString filename)
 	if(file.status()) {
 		KMessageBox::sorry(this,
 			i18n("The file '%1' could not be opened for writing: %2")
-			.tqarg(filename).tqarg(strerror(file.status())),
+			.arg(filename).arg(strerror(file.status())),
 			i18n("aRts Warning"));
 		return false;
 	}
@@ -597,7 +597,7 @@ bool ArtsBuilderWindow::save(TQString filename)
 	if(!file.close()) {
 		KMessageBox::sorry(this,
 			i18n("Saving to file '%1' could not be finished correctly: %2")
-			.tqarg(filename).tqarg(strerror(file.status())),
+			.arg(filename).arg(strerror(file.status())),
 			i18n("aRts Warning"));
 		return false;
 	}
@@ -872,7 +872,7 @@ ArtsBuilderApp::ArtsBuilderApp(TQString filename)
 		mainWindow->open(filename);
 	} else {
 		KMessageBox::sorry(0,
-		   i18n("The specified file '%1' does not exist.").tqarg(filename),
+		   i18n("The specified file '%1' does not exist.").arg(filename),
 		   i18n("aRts Warning"));
 	}
 }

arts/builder/portposdlg.cpp

@@ -247,7 +247,7 @@ void PortPosDlg::update()
 			}
 		}
 	}
-	listbox->tqrepaint();
+	listbox->repaint();
 }
 
 void PortPosDlg::help()

arts/builder/propertypanel.cpp

@@ -128,7 +128,7 @@ void PropertyPanel::setSelectedComponent( StructureComponent *component )
 			 it != modulePorts.end(); it++)
 		{
 			TQString portTitle = (*it)->description
-				+ TQString(" (%1)").tqarg( (*it)->PortDesc.type().direction == Arts::output ?
+				+ TQString(" (%1)").arg( (*it)->PortDesc.type().direction == Arts::output ?
 										i18n("OUTPUT") : i18n("INPUT") );
 			portCombo->insertItem( portTitle );
 		}
@@ -344,7 +344,7 @@ bool PropertyPanel::eventFilter( TQObject *o, TQEvent *e )
 		TQString entered = TQT_TQKEYEVENT(e)->text();
 		bool goodString = entered.length() > 0;
 
-//		kdDebug() << TQString("pressed '%1'").tqarg(entered) << endl;
+//		kdDebug() << TQString("pressed '%1'").arg(entered) << endl;
 
 		for( unsigned int i = 0; i < entered.length(); i++)
 			goodString = goodString && entered[i].isLetterOrNumber();

arts/builder/propertypanelbase.ui

@@ -314,7 +314,7 @@
                     <property name="name">
                         <cstring>tipLabel</cstring>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="wordwrap" stdset="0">

arts/builder/qttableview.cpp

@@ -88,7 +88,7 @@ void TQCornerSquare::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 TQCornerSquare::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
+  Setting auto-update to TRUE does not repaint the view; you must call
-  tqrepaint() to do this.
+  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,7 +1379,7 @@ 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.
@@ -1426,7 +1426,7 @@ void QtTableView::resizeEvent( TQResizeEvent * )
 
 void QtTableView::updateView()
 {
-    tqrepaint( viewRect() );
+    repaint( viewRect() );
 }
 
 /*!
@@ -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()

arts/builder/qttableview.h

@@ -32,9 +32,9 @@ public:
     virtual void setPalette( const TQPalette & );
     void	show();
 
-    void	tqrepaint( bool erase=TRUE );
+    void	repaint( bool erase=TRUE );
-    void	tqrepaint( int x, int y, int w, int h, bool erase=TRUE );
+    void	repaint( int x, int y, int w, int h, bool erase=TRUE );
-    void	tqrepaint( const TQRect &, 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 )
+inline void QtTableView::repaint( bool erase )
-{ tqrepaint( 0, 0, width(), height(), erase ); }
+{ repaint( 0, 0, width(), height(), erase ); }
 
-inline void QtTableView::tqrepaint( const TQRect &r, bool erase )
+inline void QtTableView::repaint( const TQRect &r, bool erase )
-{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); }
+{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
 
 inline void QtTableView::updateScrollBars()
 { updateScrollBars( 0 ); }

arts/gui/common/artsgui.idl

@@ -89,7 +89,7 @@ module Arts {
 		attribute long midlinewidth;
 
 		attribute long framestyle;
-		attribute Shape frametqshape;
+		attribute Shape frameshape;
 		attribute Shadow frameshadow;
 	};
 
@@ -126,7 +126,7 @@ module Arts {
 	interface LayoutBox : Frame {
 		/// Sets the direction of the widgets. Can be changed on-the-fly.
 		attribute Direction direction;
-		/// Adds a widget with the stretch-factor and the tqalignment.
+		/// Adds a widget with the stretch-factor and the alignment.
 		void addWidget( Widget widget, long stretch, long align );
 		void addWidget( Widget widget, long stretch );
 		void addWidget( Widget widget );
@@ -256,7 +256,7 @@ module Arts {
 	interface Label : Frame {
 		/// The text to show.
 		attribute string text;
-		/// The tqalignment of the text. See enum Align
+		/// The alignment of the text. See enum Align
 		attribute long align;
 		/// Fontsize [pixel]
 		/*writeonly*/ attribute long fontsize;

arts/gui/kde/kframe_impl.cpp

@@ -73,12 +73,12 @@ void KFrame_impl::framestyle( long fs )
 	_qframe->setFrameStyle( fs );
 }
 
-Shape KFrame_impl::frametqshape()
+Shape KFrame_impl::frameshape()
 {
 	return ( Shape )_qframe->frameShape();
 }
 
-void KFrame_impl::frametqshape( Shape fs )
+void KFrame_impl::frameshape( Shape fs )
 {
 	_qframe->setFrameShape( ( TQFrame::Shape )fs );
 }

arts/gui/kde/kframe_impl.h

@@ -44,8 +44,8 @@ class KDE_EXPORT KFrame_impl : virtual public Arts::Frame_skel,
 		void midlinewidth( long mlw );
 		long framestyle();
 		void framestyle( long fs );
-		Shape frametqshape();
+		Shape frameshape();
-		void frametqshape( Shape fs );
+		void frameshape( Shape fs );
 		Shadow frameshadow();
 		void frameshadow( Shadow fs );
 }; //class

arts/gui/kde/kgraph.cpp

@@ -52,7 +52,7 @@ void KGraph::addLine(Arts::KGraphLine_impl *line)
 
 void KGraph::redrawLine(Arts::KGraphLine_impl * /*line*/)
 {
-	tqrepaint();
+	repaint();
 }
 
 void KGraph::removeLine(Arts::KGraphLine_impl *line)

arts/gui/kde/klabel_impl.cpp

@@ -92,13 +92,13 @@ void RotateLabel::title( TQString n ) {
 
 void RotateLabel::align( long n ) {
 	_align=n;
-	tqrepaint();
+	repaint();
 }
 
 void RotateLabel::bottom( Arts::TextBottom bottom ) {
 	_bottom = bottom;
 	title( _title );
-	tqrepaint();
+	repaint();
 }
 
 // vim: sw=4 ts=4

arts/gui/kde/klevelmeter_firebars.cpp

@@ -91,7 +91,7 @@ void KLevelMeter_FireBars::invalue( float n, float p ) {
 			_bar->setGeometry( int( this->width()-_value*this->width() ), 0, this->width(), this->height() );
 			break;
 	}
-	tqrepaint();
+	repaint();
 }
 
 void KLevelMeter_FireBars::paintEvent( TQPaintEvent* ) {

arts/gui/kde/klevelmeter_linebars.cpp

@@ -38,7 +38,7 @@ KLevelMeter_LineBars::KLevelMeter_LineBars( Arts::KLevelMeter_impl* impl, TQWidg
 void KLevelMeter_LineBars::invalue( float n, float p ) {
 	_value = amptondb( n );
 	_peak  = amptondb( p );
-	tqrepaint();
+	repaint();
 }
 
 void KLevelMeter_LineBars::substyle( long n ) {

arts/gui/kde/kpoti.cpp

@@ -392,7 +392,7 @@ void KPoti::setColor( const TQColor &c )
 {
 	d->potiColor = c;
 	d->potiDirty = true;
-	tqrepaint();
+	repaint();
 }
 
 

arts/modules/common/env_mixeritem_impl.cc

@@ -49,7 +49,7 @@ public:
 		if(newName != _name)
 		{
 			_name = newName;
-		  	amClient.title(i18n("Mixer (\"%1\")").tqarg(TQString::fromUtf8(_name.c_str())).utf8().data());
+		  	amClient.title(i18n("Mixer (\"%1\")").arg(TQString::fromUtf8(_name.c_str())).utf8().data());
 		  	amClient.autoRestoreID("mixer_"+_name);
 			for(unsigned int i = 0; i < _inputs.size(); i++)
 				_inputs[i].busname(channelName(i));

arts/runtime/artsbuilder.idl

@@ -42,7 +42,7 @@ module Arts {
 	 * isMultiPort specifies if the port can take multiple incoming
 	 * connections or not. This is only relevant/allowed for input ports,
 	 * the output of all output ports may be connected to any amount of
-	 * tqreceivers.
+	 * receivers.
 	 *
 	 * Ports which can take multiple connections are handled differently
 	 * internally. (Also, artsbuilder needs to know whether to allow multi-

arts/tools/environmentview.cpp

@@ -84,11 +84,11 @@ EnvironmentView::EnvironmentView( Container container, TQWidget* parent, const c
 	connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delItem()));
 
 	TQPushButton *loadButton = new
-		TQPushButton(i18n("Load %1").tqarg(DEFAULT_ENV_FILENAME), this);
+		TQPushButton(i18n("Load %1").arg(DEFAULT_ENV_FILENAME), this);
 	connect(loadButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(load()));
 
 	TQPushButton *saveButton = new
-		TQPushButton(i18n("Save %1").tqarg(DEFAULT_ENV_FILENAME), this);
+		TQPushButton(i18n("Save %1").arg(DEFAULT_ENV_FILENAME), this);
 	connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save()));
 	show();
 }

arts/tools/levelmeters.cpp

@@ -104,7 +104,7 @@ void PeakBar::setValue(float f) {
 		
 	lastValues.append(new Observation(f));
 	
-	tqrepaint();
+	repaint();
 }
 
 // -------------------------------------------------------------
@@ -149,7 +149,7 @@ ScaleView::ScaleView(TQWidget *parent): TQFrame(parent) {
 
 void ScaleView::setDbRange(int db) {
 	dbRange= db;
-	tqrepaint();
+	repaint();
 }
 
 TQSize ScaleView::sizeHint() const {

arts/tools/midimanagerview.cpp

@@ -185,7 +185,7 @@ void MidiManagerView::updateLists()
 		widget->inputsListBox->setSelected(itemMap[srcID],true);
 	if(destID && itemMap[destID])
 		widget->outputsListBox->setSelected(itemMap[destID],true);
-	connectionWidget->tqrepaint();
+	connectionWidget->repaint();
 }
 
 void MidiManagerView::slotConnect()

juk/collectionlist.cpp

@@ -162,7 +162,7 @@ void CollectionList::slotRefreshItems(const KFileItemList &items)
 	    // If the item is no longer on disk, remove it from the collection.
 
 	    if(item->file().fileInfo().exists())
-		item->tqrepaint();
+		item->repaint();
 	    else
 		clearItem(item);
 	}
@@ -392,13 +392,13 @@ void CollectionListItem::refresh()
     file().coverInfo()->setCover();
 
     if(listView()->isVisible())
-	tqrepaint();
+	repaint();
 
-    for(PlaylistItemList::Iterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it) {
+    for(PlaylistItemList::Iterator it = m_children.begin(); it != m_children.end(); ++it) {
 	(*it)->playlist()->update();
 	(*it)->playlist()->dataChanged();
 	if((*it)->listView()->isVisible())
-	    (*it)->tqrepaint();
+	    (*it)->repaint();
     }
 
     CollectionList::instance()->dataChanged();
@@ -411,7 +411,7 @@ PlaylistItem *CollectionListItem::itemForPlaylist(const Playlist *playlist)
 	return this;
 
     PlaylistItemList::ConstIterator it;
-    for(it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+    for(it = m_children.begin(); it != m_children.end(); ++it)
 	if((*it)->playlist() == playlist)
 	    return *it;
     return 0;
@@ -428,11 +428,11 @@ void CollectionListItem::updateCollectionDict(const TQString &oldPath, const TQS
     collection->addToDict(newPath, this);
 }
 
-void CollectionListItem::tqrepaint() const
+void CollectionListItem::repaint() const
 {
-    TQListViewItem::tqrepaint();
+    TQListViewItem::repaint();
-    for(PlaylistItemList::ConstIterator it = m_tqchildren.begin(); it != m_tqchildren.end(); ++it)
+    for(PlaylistItemList::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
-	(*it)->tqrepaint();
+	(*it)->repaint();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -468,8 +468,8 @@ CollectionListItem::~CollectionListItem()
 {
     m_shuttingDown = true;
 
-    for(PlaylistItemList::ConstIterator it = m_tqchildren.begin();
+    for(PlaylistItemList::ConstIterator it = m_children.begin();
-	it != m_tqchildren.end();
+	it != m_children.end();
 	++it)
     {
         (*it)->playlist()->clearItem(*it);
@@ -486,13 +486,13 @@ CollectionListItem::~CollectionListItem()
 
 void CollectionListItem::addChildItem(PlaylistItem *child)
 {
-    m_tqchildren.append(child);
+    m_children.append(child);
 }
 
 void CollectionListItem::removeChildItem(PlaylistItem *child)
 {
     if(!m_shuttingDown)
-	m_tqchildren.remove(child);
+	m_children.remove(child);
 }
 
 bool CollectionListItem::checkCurrent()

juk/collectionlist.h

@@ -172,8 +172,8 @@ public:
     virtual void refresh();
     PlaylistItem *itemForPlaylist(const Playlist *playlist);
     void updateCollectionDict(const TQString &oldPath, const TQString &newPath);
-    void tqrepaint() const;
+    void repaint() const;
-    PlaylistItemList tqchildren() const { return m_tqchildren; }
+    PlaylistItemList children() const { return m_children; }
 
 protected:
     CollectionListItem(const FileHandle &file);
@@ -192,7 +192,7 @@ protected:
 
 private:
     bool m_shuttingDown;
-    PlaylistItemList m_tqchildren;
+    PlaylistItemList m_children;
 };
 
 #endif

juk/covericonview.cpp

@@ -22,7 +22,7 @@ CoverIconViewItem::CoverIconViewItem(coverKey id, TQIconView *parent) :
     KIconViewItem(parent), m_id(id)
 {
     CoverDataPtr data = CoverManager::coverInfo(id);
-    setText(TQString("%1 - %2").tqarg(data->artist, data->album));
+    setText(TQString("%1 - %2").arg(data->artist, data->album));
     setPixmap(data->thumbnail());
 }
 

juk/covermanager.cpp

@@ -395,7 +395,7 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c
 
     // Save it to file first!
 
-    TQString ext = TQString("/coverdb/coverID-%1.png").tqarg(id);
+    TQString ext = TQString("/coverdb/coverID-%1.png").arg(id);
     coverData->path = KGlobal::dirs()->saveLocation("appdata") + ext;
 
     kdDebug() << "Saving pixmap to " << coverData->path << endl;
@@ -413,8 +413,8 @@ coverKey CoverManager::addCover(const TQPixmap &large, const TQString &artist, c
     data()->covers[id] = coverData;
 
     // Make sure the new cover isn't inadvertently cached.
-    data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path));
+    data()->pixmapCache.remove(TQString("f%1").arg(coverData->path));
-    data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path));
+    data()->pixmapCache.remove(TQString("t%1").arg(coverData->path));
 
     return id;
 }
@@ -436,8 +436,8 @@ bool CoverManager::removeCover(coverKey id)
 
     // Remove cover from cache.
     CoverDataPtr coverData = coverInfo(id);
-    data()->pixmapCache.remove(TQString("f%1").tqarg(coverData->path));
+    data()->pixmapCache.remove(TQString("f%1").arg(coverData->path));
-    data()->pixmapCache.remove(TQString("t%1").tqarg(coverData->path));
+    data()->pixmapCache.remove(TQString("t%1").arg(coverData->path));
 
     // Remove references to files that had that track ID.
     TQDictIterator<coverKey> it(data()->tracks);
@@ -462,8 +462,8 @@ bool CoverManager::replaceCover(coverKey id, const TQPixmap &large)
     CoverDataPtr coverData = coverInfo(id);
 
     // Empty old pixmaps from cache.
-    data()->pixmapCache.remove(TQString("%1%2").tqarg("t", coverData->path));
+    data()->pixmapCache.remove(TQString("%1%2").arg("t", coverData->path));
-    data()->pixmapCache.remove(TQString("%1%2").tqarg("f", coverData->path));
+    data()->pixmapCache.remove(TQString("%1%2").arg("f", coverData->path));
 
     large.save(coverData->path, "PNG");
     return true;

juk/deletedialogbase.ui

@@ -61,7 +61,7 @@
                             <property name="text">
                                 <string>Are you sure that you want to remove these items?</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -72,7 +72,7 @@
                             <property name="text">
                                 <string>Deletion method placeholder, never shown to user.</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>WordBreak|AlignCenter</set>
                             </property>
                         </widget>
@@ -101,7 +101,7 @@
             <property name="text">
                 <string>Placeholder for number of files, not in GUI</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>

juk/directorylistbase.ui

@@ -63,7 +63,7 @@
                     <property name="text">
                         <string>These folders will be scanned on startup for new files.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>

juk/filerenamer.cpp

@@ -352,7 +352,7 @@ unsigned FileRenamerWidget::addRowCategory(TagType category)
     downMapper->connect(row.downButton, TQT_SIGNAL(clicked()), TQT_SLOT(map()));
     downMapper->setMapping(TQT_TQOBJECT(row.downButton), id);
 
-    TQString labelText = TQString("<b>%1</b>").tqarg(TagRenamerOptions::tagTypeText(category));
+    TQString labelText = TQString("<b>%1</b>").arg(TagRenamerOptions::tagTypeText(category));
     TQLabel *label = new TQLabel(labelText, frame);
     frame->setStretchFactor(label, 1);
     label->setAlignment(AlignCenter);
@@ -685,7 +685,7 @@ void FileRenamerWidget::moveItem(unsigned id, MovementDirection direction)
 
     tqlayout->remove(w);
     tqlayout->insertWidget(2 * pos, w);
-    tqlayout->tqinvalidate();
+    tqlayout->invalidate();
 
     TQTimer::singleShot(0, this, TQT_SLOT(exampleTextChanged()));
 }
@@ -778,7 +778,7 @@ void FileRenamerWidget::insertCategory()
     // Set its down button to be disabled.
     m_rows[id].downButton->setEnabled(false);
 
-    m_mainFrame->tqlayout()->tqinvalidate();
+    m_mainFrame->tqlayout()->invalidate();
     m_mainView->update();
 
     // Now update according to the code in loadConfig().
@@ -875,7 +875,7 @@ void FileRenamer::rename(const PlaylistItemList &items)
             setFolderIcon(it.data(), itemMap[it.key()]);
         }
         else
-            errorFiles << i18n("%1 to %2").tqarg(it.key()).tqarg(it.data());
+            errorFiles << i18n("%1 to %2").arg(it.key()).arg(it.data());
 
         processEvents();
     }
@@ -952,7 +952,7 @@ void FileRenamer::setFolderIcon(const KURL &dst, const PlaylistItem *item)
             config.setGroup("Desktop Entry");
 
             if(!config.hasKey("Icon")) {
-                config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").tqarg(path));
+                config.writeEntry("Icon", TQString("%1/.juk-thumbnail.png").arg(path));
                 config.sync();
             }
 

juk/filerenameroptions.cpp

@@ -46,11 +46,11 @@ FileRenamerTagOptions::FileRenamerTagOptions(TQWidget *parent,
 
     TQString tagText = m_options.tagTypeText();
 
-    setCaption(caption().tqarg(tagText));
+    setCaption(caption().arg(tagText));
-    m_tagFormatGroup->setTitle(m_tagFormatGroup->title().tqarg(tagText));
+    m_tagFormatGroup->setTitle(m_tagFormatGroup->title().arg(tagText));
-    m_emptyTagGroup->setTitle(m_emptyTagGroup->title().tqarg(tagText));
+    m_emptyTagGroup->setTitle(m_emptyTagGroup->title().arg(tagText));
-    m_description->setText(m_description->text().tqarg(tagText));
+    m_description->setText(m_description->text().arg(tagText));
-    m_tagLabel->setText(m_tagLabel->text().tqarg(tagText));
+    m_tagLabel->setText(m_tagLabel->text().arg(tagText));
 
     m_prefixText->setText(options.prefix());
     m_suffixText->setText(options.suffix());

juk/filerenameroptionsbase.ui

@@ -40,7 +40,7 @@
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignCenter</set>
                     </property>
                 </widget>
@@ -76,7 +76,7 @@
                             <property name="name">
                                 <cstring>m_prefixText</cstring>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignRight</set>
                             </property>
                         </widget>
@@ -92,7 +92,7 @@
                             <property name="name">
                                 <cstring>m_suffixText</cstring>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignLeft</set>
                             </property>
                         </widget>
@@ -127,7 +127,7 @@
                     <property name="text">
                         <string>Substitution Example</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -218,7 +218,7 @@
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignCenter</set>
                     </property>
                 </widget>
@@ -315,7 +315,7 @@
                                     <property name="text">
                                         <string>3 -&gt;</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>
@@ -326,7 +326,7 @@
                                     <property name="text">
                                         <string>14 -&gt;</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>

juk/musicbrainzquery.cpp

@@ -68,7 +68,7 @@ void MusicBrainzLookup::error()
 void MusicBrainzLookup::message(const TQString &s) const
 {
     KMainWindow *w = static_cast<KMainWindow *>(kapp->mainWidget());
-    w->statusBar()->message(TQString("%1 (%2)").tqarg(s).tqarg(m_file.fileInfo().fileName()), 3000);
+    w->statusBar()->message(TQString("%1 (%2)").arg(s).arg(m_file.fileInfo().fileName()), 3000);
 }
 
 void MusicBrainzLookup::confirmation()

juk/nowplaying.cpp

@@ -270,13 +270,13 @@ void TrackItem::slotUpdate()
         "<font size=\"+%3\"><b><a href=\"artist\">%4</a>%5<a href=\"album\">%6</a></b>";
 
     if(NowPlayingItem::parent()->collection()->showMoreActive())
-        format.append(TQString(" (<a href=\"clear\">%1</a>)").tqarg(i18n("back to playlist")));
+        format.append(TQString(" (<a href=\"clear\">%1</a>)").arg(i18n("back to playlist")));
 
     format.append("</font>");
 
     do {
-        m_label->setText(format.tqarg(size).tqarg(title).tqarg(size - 2)
+        m_label->setText(format.arg(size).arg(title).arg(size - 2)
-                         .tqarg(artist).tqarg(separator).tqarg(album));
+                         .arg(artist).arg(separator).arg(album));
         --size;
     } while(m_label->heightForWidth(m_label->width()) > imageSize && size >= 0);
 
@@ -294,7 +294,7 @@ HistoryItem::HistoryItem(NowPlaying *parent) :
     setFixedHeight(parent->height() - parent->tqlayout()->margin() * 2);
     setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
     setLinkUnderline(false);
-    setText(TQString("<b>%1</b>").tqarg(i18n("History")));
+    setText(TQString("<b>%1</b>").arg(i18n("History")));
 
     m_timer = new TQTimer(this);
     connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAddPlaying()));
@@ -309,14 +309,14 @@ void HistoryItem::update(const FileHandle &file)
         m_history.remove(m_history.fromLast());
 
     TQString format = "<br /><a href=\"%1\"><font size=\"-1\">%2</font></a>";
-    TQString current = TQString("<b>%1</b>").tqarg(i18n("History"));
+    TQString current = TQString("<b>%1</b>").arg(i18n("History"));
     TQString previous;
 
     for(TQValueList<Item>::ConstIterator it = m_history.begin();
         it != m_history.end(); ++it)
     {
         previous = current;
-        current.append(format.tqarg((*it).anchor).tqarg(TQStyleSheet::escape((*it).file.tag()->title())));
+        current.append(format.arg((*it).anchor).arg(TQStyleSheet::escape((*it).file.tag()->title())));
         setText(current);
         if(heightForWidth(width()) > imageSize) {
             setText(previous);

juk/playlist.cpp

@@ -543,7 +543,7 @@ void Playlist::save()
     TQFile file(m_fileName);
 
     if(!file.open(IO_WriteOnly))
-	return KMessageBox::error(this, i18n("Could not save to file %1.").tqarg(m_fileName));
+	return KMessageBox::error(this, i18n("Could not save to file %1.").arg(m_fileName));
 
     TQTextStream stream(&file);
 
@@ -2127,7 +2127,7 @@ void Playlist::slotShowRMBMenu(TQListViewItem *item, const TQPoint &point, int c
 
     if(showEdit)
 	m_rmbMenu->changeItem(m_rmbEditID,
-		i18n("Edit '%1'").tqarg(columnText(column + columnOffset())));
+		i18n("Edit '%1'").arg(columnText(column + columnOffset())));
 
     m_rmbMenu->setItemVisible(m_rmbEditID, showEdit);
 

juk/playlistbox.cpp

@@ -445,7 +445,7 @@ void PlaylistBox::contentsDropEvent(TQDropEvent *e)
     if(m_dropItem) {
 	Item *old = m_dropItem;
 	m_dropItem = 0;
-	old->tqrepaint();
+	old->repaint();
     }
 }
 
@@ -493,14 +493,14 @@ void PlaylistBox::contentsDragMoveEvent(TQDragMoveEvent *e)
 
 	    if(e->isAccepted()) {
 		m_dropItem = target;
-		target->tqrepaint();
+		target->repaint();
 		m_showTimer->start(1500, true);
 	    }
 	    else
 		m_dropItem = 0;
 
 	    if(old)
-		old->tqrepaint();
+		old->repaint();
 	}
     }
     else {
@@ -517,7 +517,7 @@ void PlaylistBox::contentsDragLeaveEvent(TQDragLeaveEvent *e)
     if(m_dropItem) {
 	Item *old = m_dropItem;
 	m_dropItem = 0;
-	old->tqrepaint();
+	old->repaint();
     }
     KListView::contentsDragLeaveEvent(e);
 }

juk/playlistcollection.cpp

@@ -747,11 +747,11 @@ TQString PlaylistCollection::uniquePlaylistName(const TQString &suggest) const
     base.remove(TQRegExp("\\s\\([0-9]+\\)$"));
 
     int count = 1;
-    TQString s = TQString("%1 (%2)").tqarg(base).tqarg(count);
+    TQString s = TQString("%1 (%2)").arg(base).arg(count);
 
     while(m_playlistNames.contains(s)) {
         count++;
-        s = TQString("%1 (%2)").tqarg(base).tqarg(count);
+        s = TQString("%1 (%2)").arg(base).arg(count);
     }
 
     return s;

juk/playlistsplitter.cpp

@@ -94,7 +94,7 @@ void PlaylistSplitter::slotFocusCurrentPlaylist()
         if(!item)
             return;
 
-        // A little bit of a hack to make TQListView tqrepaint things properly.  Switch
+        // A little bit of a hack to make TQListView repaint things properly.  Switch
         // to single selection mode, set the selection and then switch back.
 
         playlist->setSelectionMode(TQListView::Single);

juk/searchwidget.cpp

@@ -163,7 +163,7 @@ void SearchLine::updateColumns()
 
     TQStringList columnHeaders;
 
-    columnHeaders.append(TQString("<%1>").tqarg(i18n("All Visible")));
+    columnHeaders.append(TQString("<%1>").arg(i18n("All Visible")));
 
     Playlist *playlist = CollectionList::instance();
 

juk/systemtray.cpp

@@ -385,7 +385,7 @@ void SystemTray::createPopup()
     int labelCount = 0;
 
     TQString title = TQStyleSheet::escape(playingInfo->title());
-    m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").tqarg(title));
+    m_labels[labelCount++]->setText(TQString("<qt><nobr><h2>%1</h2></nobr><qt>").arg(title));
 
     if(!playingInfo->artist().isEmpty())
         m_labels[labelCount++]->setText(playingInfo->artist());
@@ -393,8 +393,8 @@ void SystemTray::createPopup()
     if(!playingInfo->album().isEmpty()) {
         TQString album = TQStyleSheet::escape(playingInfo->album());
         TQString s = playingInfo->year() > 0
-            ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").tqarg(album).tqarg(playingInfo->year())
+            ? TQString("<qt><nobr>%1 (%2)</nobr></qt>").arg(album).arg(playingInfo->year())
-            : TQString("<qt><nobr>%1</nobr></qt>").tqarg(album);
+            : TQString("<qt><nobr>%1</nobr></qt>").arg(album);
         m_labels[labelCount++]->setText(s);
     }
 
@@ -531,8 +531,8 @@ void SystemTray::setToolTip(const TQString &tip, const TQPixmap &cover)
         TQString html = i18n("%1 is Cover Art, %2 is the playing track, %3 is the appname",
                             "<center><table cellspacing=\"2\"><tr><td valign=\"middle\">%1</td>"
                             "<td valign=\"middle\">%2</td></tr></table><em>%3</em></center>");
-        html = html.tqarg("<img valign=\"middle\" src=\"tipCover\"");
+        html = html.arg("<img valign=\"middle\" src=\"tipCover\"");
-        html = html.tqarg(TQString("<nobr>%1</nobr>").tqarg(tip), i18n("JuK"));
+        html = html.arg(TQString("<nobr>%1</nobr>").arg(tip), i18n("JuK"));
 
         TQToolTip::add(this, html);
     }

juk/tagrenameroptions.cpp

@@ -69,12 +69,12 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category)
     if(categoryNum > 0)
         typeKey.append(TQString::number(categoryNum));
 
-    setSuffix(config.readEntry(TQString("%1Suffix").tqarg(typeKey)));
+    setSuffix(config.readEntry(TQString("%1Suffix").arg(typeKey)));
-    setPrefix(config.readEntry(TQString("%1Prefix").tqarg(typeKey)));
+    setPrefix(config.readEntry(TQString("%1Prefix").arg(typeKey)));
 
     // Default the emptyAction to ignoring the empty tag.
 
-    const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").tqarg(typeKey)).lower();
+    const TQString emptyAction = config.readEntry(TQString("%1EmptyAction").arg(typeKey)).lower();
     setEmptyAction(IgnoreEmptyTag);
 
     if(emptyAction == "forceemptyinclude")
@@ -82,9 +82,9 @@ TagRenamerOptions::TagRenamerOptions(const CategoryID &category)
     else if(emptyAction == "usereplacementvalue")
         setEmptyAction(UseReplacementValue);
 
-    setEmptyText(config.readEntry(TQString("%1EmptyText").tqarg(typeKey)));
+    setEmptyText(config.readEntry(TQString("%1EmptyText").arg(typeKey)));
-    setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").tqarg(typeKey)));
+    setTrackWidth(config.readUnsignedNumEntry(TQString("%1TrackWidth").arg(typeKey)));
-    setDisabled(config.readBoolEntry(TQString("%1Disabled").tqarg(typeKey), disabled));
+    setDisabled(config.readBoolEntry(TQString("%1Disabled").arg(typeKey), disabled));
 }
 
 TQString TagRenamerOptions::tagTypeText(TagType type, bool translate)
@@ -117,8 +117,8 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const
 
     KConfigGroup config(KGlobal::config(), "FileRenamer");
 
-    config.writeEntry(TQString("%1Suffix").tqarg(typeKey), suffix());
+    config.writeEntry(TQString("%1Suffix").arg(typeKey), suffix());
-    config.writeEntry(TQString("%1Prefix").tqarg(typeKey), prefix());
+    config.writeEntry(TQString("%1Prefix").arg(typeKey), prefix());
 
     TQString emptyStr;
 
@@ -136,12 +136,12 @@ void TagRenamerOptions::saveConfig(unsigned categoryNum) const
     break;
     }
 
-    config.writeEntry(TQString("%1EmptyAction").tqarg(typeKey), emptyStr);
+    config.writeEntry(TQString("%1EmptyAction").arg(typeKey), emptyStr);
-    config.writeEntry(TQString("%1EmptyText").tqarg(typeKey), emptyText());
+    config.writeEntry(TQString("%1EmptyText").arg(typeKey), emptyText());
-    config.writeEntry(TQString("%1Disabled").tqarg(typeKey), disabled());
+    config.writeEntry(TQString("%1Disabled").arg(typeKey), disabled());
 
     if(category() == Track)
-        config.writeEntry(TQString("%1TrackWidth").tqarg(typeKey), trackWidth());
+        config.writeEntry(TQString("%1TrackWidth").arg(typeKey), trackWidth());
 
     config.sync();
 }

juk/tagtransactionmanager.cpp

@@ -176,7 +176,7 @@ bool TagTransactionManager::processChangeList(bool undo)
 
             item->file().setFile(tag->fileName());
             item->refreshFromDisk();
-            item->tqrepaint();
+            item->repaint();
             item->playlist()->dataChanged();
             item->playlist()->update();
         }

juk/trackpickerdialogbase.ui

@@ -31,7 +31,7 @@
                     <property name="title">
                         <string>File Name</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <hbox>
@@ -50,7 +50,7 @@
                             <property name="text">
                                 <string></string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                             <property name="indent">
@@ -76,7 +76,7 @@
                     <property name="title">
                         <string>Select Best Possible Match</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignTop</set>
                     </property>
                     <vbox>

juk/treeviewitemplaylist.cpp

@@ -52,7 +52,7 @@ void TreeViewItemPlaylist::retag(const TQStringList &files, Playlist *)
 
     if(KMessageBox::warningContinueCancelList(
            this,
-           i18n("You are about to change the %1 on these files.").tqarg(changedTag),
+           i18n("You are about to change the %1 on these files.").arg(changedTag),
            files,
            i18n("Changing Track Tags"),
            KStdGuiItem::cont(),

juk/webimagefetcher.cpp

@@ -37,7 +37,7 @@ WebImage::WebImage(const TQString &imageURL, const TQString &thumbURL,
                          int width, int height) :
     m_imageURL(imageURL),
     m_thumbURL(thumbURL),
-    m_size(TQString("\n%1 x %2").tqarg(width).tqarg(height))
+    m_size(TQString("\n%1 x %2").arg(width).arg(height))
 {
 }
 

juk/webimagefetcherdialog.cpp

@@ -92,9 +92,9 @@ void WebImageFetcherDialog::showCreditURL(const TQString &url)
 void WebImageFetcherDialog::setLayout()
 {
     setCaption(TQString("%1 - %2 (%3)")
-              .tqarg(m_file.tag()->artist())
+              .arg(m_file.tag()->artist())
-              .tqarg(m_file.tag()->album())
+              .arg(m_file.tag()->album())
-              .tqarg(m_imageList.size()));
+              .arg(m_imageList.size()));
 
     m_iconWidget->clear();
     for(uint i = 0; i < m_imageList.size(); i++)
@@ -218,7 +218,7 @@ CoverIconViewItem::~CoverIconViewItem()
 void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data)
 {
     int currentSize = m_buffer.size();
-    m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim);
+    m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
     memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
 }
 

kaboodle/player.cpp

@@ -244,8 +244,8 @@ void Kaboodle::Player::tickerTimeout(void)
 
 		if(extension)
 			emit setStatusBarText(i18n("Playing %1 - %2")
-			                      .tqarg(current.prettyURL())
+			                      .arg(current.prettyURL())
-			                      .tqarg(positionString() + "/" + lengthString()));
+			                      .arg(positionString() + "/" + lengthString()));
 
 	}
 	updateTitle();

kaudiocreator/encodefile.ui

@@ -74,7 +74,7 @@
                     <property name="text">
                         <string>Track:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -85,7 +85,7 @@
                     <property name="text">
                         <string>Comment:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -101,7 +101,7 @@
                     <property name="text">
                         <string>Title:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -114,7 +114,7 @@
                     <property name="text">
                         <string>Artist:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -153,7 +153,7 @@
                     <property name="text">
                         <string>Artist:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -166,7 +166,7 @@
                     <property name="text">
                         <string>Album:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -192,7 +192,7 @@
                     <property name="text">
                         <string>Year:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -205,7 +205,7 @@
                     <property name="text">
                         <string>Genre:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -223,7 +223,7 @@
                     <property name="text">
                         <string>Comment:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>

kaudiocreator/encodefileimp.cpp

@@ -70,7 +70,7 @@ void EncodeFileImp::encode(){
   int counter(1);
   KMessageBox::information(this,
   i18n("%1 Job(s) have been started.  You can watch their progress in the " \
-	  "jobs section.").tqarg(counter),
+	  "jobs section.").arg(counter),
  i18n("Jobs have started"), i18n("Jobs have started"));
 }
 

kaudiocreator/encoder.cpp

@@ -53,7 +53,7 @@ void Encoder::loadSettings() {
 
 EncoderPrefs* Encoder::loadEncoder( int encoder ){
 	EncoderPrefs* prefs;
-	TQString currentEncoderGroup = TQString("Encoder_%1").tqarg(encoder);
+	TQString currentEncoderGroup = TQString("Encoder_%1").arg(encoder);
 	prefs = EncoderPrefs::prefs(currentEncoderGroup);
 	if ( !EncoderPrefs::hasPrefs(currentEncoderGroup) ) {
 		KMessageBox::sorry(0, i18n("No encoder has been selected.\nPlease select an encoder in the configuration."), i18n("No Encoder Selected"));
@@ -132,8 +132,8 @@ void Encoder::removeJob(int id ) {
  * @param job the job to encode.
  */
 void Encoder::encodeWav(Job *job ) {
-	emit(addJob(job, i18n("Encoding (%1): %2 - %3").tqarg(loadEncoder(job->encoder)->extension())
+	emit(addJob(job, i18n("Encoding (%1): %2 - %3").arg(loadEncoder(job->encoder)->extension())
-		                                             .tqarg(job->track_artist).tqarg(job->track_title)));
+		                                             .arg(job->track_artist).arg(job->track_title)));
 	pendingJobs.append(job);
 	tendToNewJobs();
 }
@@ -252,12 +252,12 @@ void Encoder::receivedThreadOutput(KProcess *process, char *buffer, int length )
 		reportCount++;
 		return;
 	}
-	//qDebug(TQString("Pre cropped: %1").tqarg(output).latin1());
+	//qDebug(TQString("Pre cropped: %1").arg(output).latin1());
 	output = output.mid(output.find('%')-loadEncoder(job->encoder)->percentLength(),2);
-	//qDebug(TQString("Post cropped: %1").tqarg(output).latin1());
+	//qDebug(TQString("Post cropped: %1").arg(output).latin1());
 	bool conversionSuccessfull = false;
 	int percent = output.toInt(&conversionSuccessfull);
-	//qDebug(TQString("number: %1").tqarg(percent).latin1());
+	//qDebug(TQString("number: %1").arg(percent).latin1());
 	if ( percent >= 0 && percent < 100 && conversionSuccessfull ) {
 		emit(updateProgress(job->id, percent));
 	}
@@ -284,7 +284,7 @@ void Encoder::jobDone(KProcess *process ) {
 
 	bool showDebugBox = false;
 	if ( process->exitStatus() == 127 ) {
-		KMessageBox::sorry(0, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").tqarg(job->errorString), i18n("Encoding Failed"));
+		KMessageBox::sorry(0, i18n("The selected encoder was not found.\nThe wav file has been removed. Command was: %1").arg(job->errorString), i18n("Encoding Failed"));
 		emit(updateProgress(job->id, -1));
 	}
 	else if ( TQFile::exists(job->newLocation) ) {

kaudiocreator/encoderconfig.ui

@@ -241,7 +241,7 @@
                     <property name="text">
                         <string>Lowest</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -252,7 +252,7 @@
                     <property name="text">
                         <string>Normal</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>

kaudiocreator/encoderconfigimp.cpp

@@ -93,7 +93,7 @@ void EncoderConfigImp::loadEncoderList(){
   int lastKnownEncoder = Prefs::lastKnownEncoder();
   lastKnownEncoder++;
   for( int i=0; i<=lastKnownEncoder; i++ ){
-    TQString currentGroup = TQString("Encoder_%1").tqarg(i);
+    TQString currentGroup = TQString("Encoder_%1").arg(i);
     if(EncoderPrefs::hasPrefs(currentGroup)){
       lastEncoder = i;
       EncoderPrefs *encPrefs = EncoderPrefs::prefs(currentGroup);
@@ -123,7 +123,7 @@ void EncoderConfigImp::addEncoderSlot(){
   uint number = 0;
   TQString groupName;
   while(!foundEmptyGroup){
-    groupName = TQString("Encoder_%1").tqarg(number);
+    groupName = TQString("Encoder_%1").arg(number);
     if(!EncoderPrefs::hasPrefs(groupName))
       foundEmptyGroup = true;
     else

kaudiocreator/general.ui

@@ -65,7 +65,7 @@
                         <string>Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines.
 </string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>

kaudiocreator/infodialog.ui

@@ -46,7 +46,7 @@
                     <property name="text">
                         <string>Comment:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -62,7 +62,7 @@
                     <property name="text">
                         <string>Title:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -80,7 +80,7 @@
                     <property name="text">
                         <string>Artist:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -114,7 +114,7 @@
                     <property name="text">
                         <string>Artist:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -127,7 +127,7 @@
                     <property name="text">
                         <string>Album:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -153,7 +153,7 @@
                     <property name="text">
                         <string>Year:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -166,7 +166,7 @@
                     <property name="text">
                         <string>Genre:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -184,7 +184,7 @@
                     <property name="text">
                         <string>Comment:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>

kaudiocreator/jobque.ui

@@ -106,7 +106,7 @@
             <property name="text">
                 <string>No jobs are in the queue</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">

kaudiocreator/jobqueimp.cpp

@@ -64,7 +64,7 @@ JobQueImp::JobQueImp( TQWidget* parent, const char* name) :
  */
 TQString JobQueImp::getStringFromNumber(int number){
 	if(number > highestNumber){
-		int diff = TQString("%1").tqarg(number).length() - TQString("%1").tqarg(highestNumber).length();
+		int diff = TQString("%1").arg(number).length() - TQString("%1").arg(highestNumber).length();
 		highestNumber = number;
 		if(diff > 0){
 			// We have to update all of the cells.
@@ -77,7 +77,7 @@ TQString JobQueImp::getStringFromNumber(int number){
 	}
 
 	TQString buffer = "";
-	uint newLength = TQString("%1").tqarg(highestNumber).length() - TQString("%1").tqarg(number).length();
+	uint newLength = TQString("%1").arg(highestNumber).length() - TQString("%1").arg(number).length();
 	for(uint i=0; i < newLength; i++)
 		buffer += "0";
 	return buffer;
@@ -92,9 +92,9 @@ void JobQueImp::addJob(Job*job, const TQString &name ){
 	if(!job)
 		return;
 	job->id = ++currentId;
-	QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").tqarg(getStringFromNumber(currentId)).tqarg(currentId), "0", name);
+	QueListViewItem *currentItem = new QueListViewItem(todoQue, TQString("%1%2").arg(getStringFromNumber(currentId)).arg(currentId), "0", name);
 	currentItem->setPixmap(ICON_LOC, SmallIcon("player_pause", currentItem->height()-2));
-	queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount()));
+	queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount()));
 }
 
 /**
@@ -106,7 +106,7 @@ void JobQueImp::updateProgress(int id, int progress){
 	int currentJobCount = numberOfJobsNotFinished();
 	QueListViewItem * currentItem = (QueListViewItem*)todoQue->firstChild();
 	TQString buffer = getStringFromNumber(id);
-	buffer += TQString("%1").tqarg(id);
+	buffer += TQString("%1").arg(id);
 
 	// Find the current item
 	while( currentItem != NULL ){
@@ -124,7 +124,7 @@ void JobQueImp::updateProgress(int id, int progress){
 		return;
 
 	currentItem->percentDone = progress;
-	currentItem->tqrepaint();
+	currentItem->repaint();
 
 	// Update the icon if needed
 	if(progress > 0 && progress < 100 && !currentItem->progressing ){
@@ -158,7 +158,7 @@ bool JobQueImp::removeJob(QueListViewItem *item, bool kill, bool prompt){
 	if(!item)
 		return false;
 
-	if(item->percentDone < 100 && item->percentDone > -1 && (prompt && KMessageBox::questionYesNo(this, i18n("KAudioCreator has not finished %1. Remove anyway?").tqarg(item->text(HEADER_DESCRIPTION)), i18n("Unfinished Job in Queue"), KStdGuiItem::del(), i18n("Keep"))
+	if(item->percentDone < 100 && item->percentDone > -1 && (prompt && KMessageBox::questionYesNo(this, i18n("KAudioCreator has not finished %1. Remove anyway?").arg(item->text(HEADER_DESCRIPTION)), i18n("Unfinished Job in Queue"), KStdGuiItem::del(), i18n("Keep"))
 		  == KMessageBox::No ))
 		return false;
 
@@ -180,7 +180,7 @@ bool JobQueImp::removeJob(QueListViewItem *item, bool kill, bool prompt){
 		currentId = 0;
 	}
 	else
-		queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount()));
+		queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount()));
 	return true;
 }
 
@@ -248,7 +248,7 @@ void JobQueImp::clearDoneJobs(){
 		currentId = 0;
 	}
 	else
-		queLabel->setText(i18n("Number of jobs in the queue: %1").tqarg(todoQue->childCount()));
+		queLabel->setText(i18n("Number of jobs in the queue: %1").arg(todoQue->childCount()));
 }
 
 /**
@@ -270,7 +270,7 @@ int JobQueImp::numberOfJobsNotFinished(){
 }
 
 /**
- * The tqrepaint function overloaded so that we can have a built in progressbar.
+ * The repaint function overloaded so that we can have a built in progressbar.
  */
 void QueListViewItem::paintCell (TQPainter * p,const TQColorGroup &cg,int column,
 			int width,int align){

kaudiocreator/kaudiocreator.cpp

@@ -153,10 +153,10 @@ void KAudioCreator::getRipMenu(){
     ripMenu->clear();
 
     int i=0;
-    TQString currentGroup = TQString("Encoder_%1").tqarg(i);
+    TQString currentGroup = TQString("Encoder_%1").arg(i);
     while(EncoderPrefs::hasPrefs(currentGroup)){
         ripMenu->insertItem(EncoderPrefs::prefs(currentGroup)->encoderName(), i);
-        currentGroup = TQString("Encoder_%1").tqarg(++i);
+        currentGroup = TQString("Encoder_%1").arg(++i);
     }
 }
 
@@ -180,11 +180,11 @@ void KAudioCreator::updateStatus() {
     int pendingEncodingJobs = encoder->pendingJobCount();
 
     if ( activeRippingJobs ) {
-        rippingStatus = i18n("Ripping (%1 active, %2 queued)").tqarg( activeRippingJobs ).tqarg( pendingRippingJobs );
+        rippingStatus = i18n("Ripping (%1 active, %2 queued)").arg( activeRippingJobs ).arg( pendingRippingJobs );
         status = rippingStatus;
     }
     if ( activeEncodingJobs ) {
-        encodingStatus = i18n("Encoding (%1 active, %2 queued)").tqarg( activeEncodingJobs ).tqarg( pendingEncodingJobs );
+        encodingStatus = i18n("Encoding (%1 active, %2 queued)").arg( activeEncodingJobs ).arg( pendingEncodingJobs );
 
         if ( activeRippingJobs ) {
             status.append(" : ");

kaudiocreator/ripper.cpp

@@ -120,7 +120,7 @@ void Ripper::removeJob(int id){
 		pendingJobs.remove(job);
 		delete job;
 	}
-	//qDebug(TQString("Done removing Job:%1").tqarg(id).latin1());
+	//qDebug(TQString("Done removing Job:%1").arg(id).latin1());
 	tendToNewJobs();
 }
 
@@ -132,7 +132,7 @@ void Ripper::removeJob(int id){
 void Ripper::ripTrack(Job *job){
 	if(!job)
 		return;
-	emit(addJob(job, i18n("Ripping: %1 - %2").tqarg(job->track_artist).tqarg(job->track_title)));
+	emit(addJob(job, i18n("Ripping: %1 - %2").arg(job->track_artist).arg(job->track_title)));
 	pendingJobs.append(job);
 	tendToNewJobs();
 }
@@ -172,12 +172,12 @@ void Ripper::tendToNewJobs(){
 	TQString wavFile;
 	TQString args = job->device;
 	if(!args.isEmpty())
-		args = TQString("?device=%1").tqarg(args);
+		args = TQString("?device=%1").arg(args);
 	args = args+"&fileNameTemplate=Track %{number}";
 	if(job->track < 10)
-		wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").tqarg(job->track).tqarg(args);
+		wavFile = TQString("audiocd:/Wav/Track 0%1.wav%2").arg(job->track).arg(args);
 	else
-		wavFile = TQString("audiocd:/Wav/Track %1.wav%2").tqarg(job->track).tqarg(args);
+		wavFile = TQString("audiocd:/Wav/Track %1.wav%2").arg(job->track).arg(args);
 
 	KURL source(wavFile);
 	KURL dest(tmp.name());

kaudiocreator/tracks.ui

@@ -35,7 +35,7 @@
             <property name="text">
                 <string>Unknown Artist - Unknown Album</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">

kaudiocreator/tracksimp.cpp

@@ -198,7 +198,7 @@ void TracksImp::changeDevice(const TQString &file ) {
         TQString errstring =
           i18n("CDROM read or access error (or no audio disk in drive).\n"\
             "Please make sure you have access permissions to:\n%1")
-            .tqarg(file);
+            .arg(file);
         KMessageBox::error(this, errstring, i18n("Error"));
     }
 }
@@ -247,8 +247,8 @@ void TracksImp::lookupCDDBDone(CDDB::Result result ) {
         CDInfoList::iterator it;
         TQStringList list;
         for ( it = cddb_info.begin(); it != cddb_info.end(); ++it  ) {
-            list.append( TQString("%1, %2, %3").tqarg((*it).artist).tqarg((*it).title)
+            list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title)
-              .tqarg((*it).genre));
+              .arg((*it).genre));
         }
 
         bool ok(false);
@@ -378,7 +378,7 @@ void TracksImp::startSession( int encoder )
     if( Prefs::promptIfIncompleteInfo() && list.count() > 0 )
     {
         int r = KMessageBox::questionYesNo( this, 
-                 i18n( "Part of the album is not set: %1.\n (To change album information click the \"Edit Information\" button.)\n Would you like to rip the selected tracks anyway?").tqarg(list.join(", ")), i18n("Album Information Incomplete"), i18n("Rip"), KStdGuiItem::cancel() );
+                 i18n( "Part of the album is not set: %1.\n (To change album information click the \"Edit Information\" button.)\n Would you like to rip the selected tracks anyway?").arg(list.join(", ")), i18n("Album Information Incomplete"), i18n("Rip"), KStdGuiItem::cancel() );
 
         if( r == KMessageBox::No )
             return;
@@ -417,7 +417,7 @@ void TracksImp::startSession( int encoder )
 
     KMessageBox::information(this,
     i18n("%1 Job(s) have been started.  You can watch their progress in the "
-         "jobs section.").tqarg( selected.count() ),
+         "jobs section.").arg( selected.count() ),
     i18n("Jobs have started"), i18n("Jobs have started"));
 }
 

kaudiocreator/wizard.ui

@@ -51,7 +51,7 @@
             <property name="textFormat">
                 <enum>RichText</enum>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignTop|AlignLeft</set>
             </property>
         </widget>

kaudiocreator/wizard.ui.h

@@ -105,6 +105,6 @@ void fileWizard::fileFormatTextChanged(const TQString& text)
 	TQMap<TQString,TQString> map;
 	map.insert("extension", "mp3");
 	string = job.replaceSpecialChars(string, false, map);
-	exampleLabel->setText(i18n("Example: %1").tqarg(string));
+	exampleLabel->setText(i18n("Example: %1").arg(string));
 }
 

kfile-plugins/m3u/kfile_m3u.cpp

@@ -75,7 +75,7 @@ bool KM3uPlugin::readInfo( KFileMetaInfo& info, uint )
             if (s.endsWith("\n")) s.truncate(s.length()-1);
 
             if (!s.stripWhiteSpace().isEmpty()) {
-                appendItem(group, i18n("Track %1").tqarg(num, 3), s);
+                appendItem(group, i18n("Track %1").arg(num, 3), s);
                 num++;
             }
         }

kioslave/audiocd/audiocd.cpp

@@ -252,8 +252,8 @@ struct cdrom_drive * AudioCDProtocol::initRequest(const KURL & url)
 			// the unit number and SCSI device name.
 			//
 			TQString devname = TQString::fromLatin1( "/dev/%1%2" )
-				.tqarg( drive->dev->given_dev_name )
+				.arg( drive->dev->given_dev_name )
-				.tqarg( drive->dev->given_unit_number ) ;
+				.arg( drive->dev->given_unit_number ) ;
 			kdDebug(7117) << "  Using derived name " << devname << endl;
 			d->cd.setDevice( devname );
 		}
@@ -399,7 +399,7 @@ void AudioCDProtocol::get(const KURL & url)
 
 	if( d->fname.contains(i18n(CDDB_INFORMATION))){
 		uint choice = 1;
-		if(d->fname != TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION))){
+		if(d->fname != TQString("%1.txt").arg(i18n(CDDB_INFORMATION))){
 			choice= d->fname.section('_',1,1).section('.',0,0).toInt();
 		}
 		uint count = 1;
@@ -610,15 +610,15 @@ void AudioCDProtocol::listDir(const KURL & url)
 		for ( it = d->cddbList.begin(); it != d->cddbList.end(); ++it ){
 			(*it).toString();
 			if(count == 1)
-				app_file(entry, TQString("%1.txt").tqarg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1);
+				app_file(entry, TQString("%1.txt").arg(i18n(CDDB_INFORMATION)), ((*it).toString().length())+1);
 			else
-				app_file(entry, TQString("%1_%2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(count), ((*it).toString().length())+1);
+				app_file(entry, TQString("%1_%2.txt").arg(i18n(CDDB_INFORMATION)).arg(count), ((*it).toString().length())+1);
 			count++;
 			listEntry(entry, false);
 		}
 		// Error
 		if( count == 1 ) {
-			app_file(entry, TQString("%1: %2.txt").tqarg(i18n(CDDB_INFORMATION)).tqarg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1);
+			app_file(entry, TQString("%1: %2.txt").arg(i18n(CDDB_INFORMATION)).arg(CDDB::resultToString(d->cddbResult)), ((*it).toString().length())+1);
 			count++;
 			listEntry(entry, false);
 		}
@@ -838,7 +838,7 @@ void AudioCDProtocol::paranoiaRead(
 		if (0 == buf) {
 			kdDebug(7117) << "Unrecoverable error in paranoia_read" << endl;
 			ok = false;
-			error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).tqarg( fileName ) );
+			error( ERR_SLAVE_DEFINED, i18n( "Error reading audio data for %1 from the CD" ).arg( fileName ) );
 			break;
 		}
 
@@ -848,7 +848,7 @@ void AudioCDProtocol::paranoiaRead(
 		if(encoderProcessed == -1){
 			kdDebug(7117) << "Encoder processing error, stopping." << endl;
 			ok = false;
-			TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName );
+			TQString errMsg = i18n( "Couldn't read %1: encoding failed" ).arg( fileName );
 			TQString details = encoder->lastErrorMessage();
 			if ( !details.isEmpty() )
 			    errMsg += "\n" + details;
@@ -926,7 +926,7 @@ void AudioCDProtocol::paranoiaRead(
 		processedSize(processed);
 	}
 	else if ( ok ) // i.e. no error message already emitted
-		error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).tqarg( fileName ) );
+		error( ERR_SLAVE_DEFINED, i18n( "Couldn't read %1: encoding failed" ).arg( fileName ) );
 
 	paranoia_free(paranoia);
 	paranoia = 0;
@@ -1058,7 +1058,7 @@ void AudioCDProtocol::generateTemplateTitles()
 	{
 		for (unsigned int i = 0; i < d->tracks; i++){
 			TQString n;
-			d->templateTitles.append( i18n("Track %1").tqarg(n.sprintf("%02d", i + 1)));
+			d->templateTitles.append( i18n("Track %1").arg(n.sprintf("%02d", i + 1)));
 		}
 		return;
 	}
@@ -1076,7 +1076,7 @@ void AudioCDProtocol::generateTemplateTitles()
 		macros["title"] = (info.trackInfoList[i].title);
 		TQString n;
 		macros["number"] = n.sprintf("%02d", i + 1);
-		//macros["number"] = TQString("%1").tqarg(i+1, 2, 10);
+		//macros["number"] = TQString("%1").arg(i+1, 2, 10);
 		macros["genre"] = info.genre;
 		macros["year"] = TQString::number(info.year);
 

kioslave/audiocd/kcmaudiocd/audiocdconfig.ui

@@ -116,7 +116,7 @@
                                 <property name="text">
                                     <string>Lowest</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>
@@ -127,7 +127,7 @@
                                 <property name="text">
                                     <string>Normal</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignCenter</set>
                                 </property>
                             </widget>
@@ -372,7 +372,7 @@
                                     <string>Regular expression used on all file names. For example using selection " " and replace with "_" would replace all the spaces with underlines.
 </string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>

kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp

@@ -51,7 +51,7 @@ KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name)
         KConfigSkeleton *config = NULL;
         TQWidget *widget = encoder->getConfigureWidget(&config);
         if(widget && config){
-	   tabWidget->addTab(widget, i18n("%1 Encoder").tqarg(encoder->type()));
+	   tabWidget->addTab(widget, i18n("%1 Encoder").arg(encoder->type()));
              KConfigDialogManager *configManager = new KConfigDialogManager(widget, config, TQString(encoder->type()+" EncoderConfigManager").latin1());
            encoderSettings.append(configManager);
         }

kioslave/audiocd/plugins/lame/encoderlame.cpp

@@ -126,31 +126,31 @@ void EncoderLame::loadSettings(){
 	if (method == 0) {
 		// Constant Bitrate Encoding
 		args.append("-b");
-		args.append(TQString("%1").tqarg(bitrates[settings->cbr_bitrate()]));
+		args.append(TQString("%1").arg(bitrates[settings->cbr_bitrate()]));
 		d->bitrate = bitrates[settings->cbr_bitrate()];
 		args.append("-q");
-		args.append(TQString("%1").tqarg(quality));
+		args.append(TQString("%1").arg(quality));
 	}
 	else {
 		// Variable Bitrate Encoding
 		if (settings->vbr_average_br()) {
 			args.append("--abr");
-			args.append(TQString("%1").tqarg(bitrates[settings->vbr_mean_brate()]));
+			args.append(TQString("%1").arg(bitrates[settings->vbr_mean_brate()]));
 			d->bitrate = bitrates[settings->vbr_mean_brate()];
 			if (settings->vbr_min_br()){
 				args.append("-b");
-				args.append(TQString("%1").tqarg(bitrates[settings->vbr_min_brate()]));
+				args.append(TQString("%1").arg(bitrates[settings->vbr_min_brate()]));
 			}
 			if (settings->vbr_min_hard())
 				args.append("-F");
 			if (settings->vbr_max_br()){
 				args.append("-B");
-				args.append(TQString("%1").tqarg(bitrates[settings->vbr_max_brate()]));
+				args.append(TQString("%1").arg(bitrates[settings->vbr_max_brate()]));
 			}
 		} else {
 			d->bitrate = 128;
 			args.append("-V");
-			args.append(TQString("%1").tqarg(quality));
+			args.append(TQString("%1").arg(quality));
 		}
 		if ( !settings->vbr_xing_tag() )
 			args.append("-t");
@@ -186,21 +186,21 @@ void EncoderLame::loadSettings(){
 
 	if ( settings->enable_lowpass() ) {
 		args.append("--lowpass");
-		args.append(TQString("%1").tqarg(settings->lowfilterfreq()));
+		args.append(TQString("%1").arg(settings->lowfilterfreq()));
 
 		if (settings->set_lpf_width()){
 			args.append("--lowpass-width");
-			args.append(TQString("%1").tqarg(settings->lowfilterwidth()));
+			args.append(TQString("%1").arg(settings->lowfilterwidth()));
 		}
 	}
 
 	if ( settings->enable_highpass()) {
 		args.append("--hipass");
-		args.append(TQString("%1").tqarg(settings->highfilterfreq()));
+		args.append(TQString("%1").arg(settings->highfilterfreq()));
 
 		if (settings->set_hpf_width()){
 			args.append("--hipass-width");
-			args.append(TQString("%1").tqarg(settings->highfilterwidth()));
+			args.append(TQString("%1").arg(settings->highfilterwidth()));
 		}
 	}
 }
@@ -341,13 +341,13 @@ void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c
 	trackInfo.append(info.get("title").toString());
 
 	trackInfo.append("--ty");
-	trackInfo.append(TQString("%1").tqarg(info.get("year").toString()));
+	trackInfo.append(TQString("%1").arg(info.get("year").toString()));
 
 	trackInfo.append("--tc");
 	trackInfo.append(comment);
 
 	trackInfo.append("--tn");
-	trackInfo.append(TQString("%1").tqarg(track+1));
+	trackInfo.append(TQString("%1").arg(track+1));
 
 	const TQString genre = info.get( "genre" ).toString();
 	if ( d->genreList.find( genre ) != d->genreList.end() )

kioslave/audiocd/plugins/lame/encoderlameconfig.ui

@@ -178,7 +178,7 @@
                     <property name="text">
                         <string>&amp;Quality:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignLeft</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -698,7 +698,7 @@
             <property name="title">
                 <string>Filter Settings</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignVCenter|AlignLeft</set>
             </property>
             <property name="hAlign" stdset="0">

kmid/channel.cpp

@@ -87,7 +87,7 @@ void KMidChannel::paintEvent( TQPaintEvent * )
 
     TQPainter *qpaint=new TQPainter(this);
 
-    TQString tmp = i18n("Channel %1").tqarg(channel);
+    TQString tmp = i18n("Channel %1").arg(channel);
     qpaint->setFont(*qcvfont);
     qpaint->setPen(*penB);
     qpaint->drawText(2,20,tmp);
@@ -185,7 +185,7 @@ void KMidChannel::reset(int level)
         replay=TRUE;
     };
 
-    tqrepaint(FALSE);
+    repaint(FALSE);
 }
 
 void KMidChannel::saveState(bool *p,int *pgm)
@@ -198,7 +198,7 @@ void KMidChannel::loadState(bool *p,int *pgm)
 {
     for (int i=0;i<128;i++) pressed[i]=p[i];
     instrumentCombo->setCurrentItem(*pgm);
-    tqrepaint(FALSE);
+    repaint(FALSE);
 }
 
 void KMidChannel::pgmChanged(int i)

kmid/collectdlg.cpp

@@ -164,7 +164,7 @@ void CollectionDialog::newCollection()
    int i=slman->createCollection(name.ascii());
    if (i==-1)
 	{
-	TQString s = i18n("The name '%1' is already used").tqarg(name);
+	TQString s = i18n("The name '%1' is already used").arg(name);
 	KMessageBox::sorry(this, s);
 	}
 	else
@@ -190,7 +190,7 @@ int i;
    i=slman->createCollection(name.ascii());
    if (i==-1)
 	{
-	TQString s = i18n("The name '%1' is already used").tqarg(name);
+	TQString s = i18n("The name '%1' is already used").arg(name);
 	KMessageBox::sorry(this, s);
 	}
 	else
@@ -232,7 +232,7 @@ if (idx==0) return;
   {
    if (slman->getCollection(name.ascii())!=NULL)
 	{
-	TQString s = i18n("The name '%1' is already used").tqarg(name);
+	TQString s = i18n("The name '%1' is already used").arg(name);
 	KMessageBox::sorry(this, s);
 	}
 	else

kmid/kdisptext.cpp

@@ -125,7 +125,7 @@ void KDisplayText::ClearEv(bool totally)
     TQT_TQOBJECT(this)->killTimers();
     autoscrollv=0;
     resizeContents(0,0);
-    viewport()->tqrepaint(TRUE);
+    viewport()->repaint(TRUE);
   }
 }
 
@@ -367,7 +367,7 @@ void KDisplayText::CursorToHome(void)
 
 
     setContentsPos(0,0);
-    viewport()->tqrepaint(true);
+    viewport()->repaint(true);
 } 
 
 void KDisplayText::PaintIn(int type)
@@ -487,7 +487,7 @@ void KDisplayText::gotomsec(ulong i)
 	TQT_TQOBJECT(this)->killTimers();
 	autoscrollv=0;
         setContentsPos(0,first_line->ypos);
-        viewport()->tqrepaint();
+        viewport()->repaint();
         
     }
 }
@@ -508,7 +508,7 @@ void KDisplayText::fontChanged(void)
     qfmetr=new TQFontMetrics(*qtextfont);
     calculatePositions();
     nvisiblelines=height()/qfmetr->lineSpacing();
-    viewport()->tqrepaint(TRUE);
+    viewport()->repaint(TRUE);
 }
 
 void KDisplayText::ChangeTypeOfTextEvents(int type)
@@ -534,7 +534,7 @@ void KDisplayText::ChangeTypeOfTextEvents(int type)
 
         setContentsPos(0,first_line->ypos);
     }
-    viewport()->tqrepaint(TRUE);
+    viewport()->repaint(TRUE);
 }
 
 int KDisplayText::ChooseTypeOfTextEvents(void)

kmid/klcdnumber.cpp

@@ -197,7 +197,7 @@ void KLCDNumber::setValue(double v)
 void KLCDNumber::display (double v)
 {
     setValue(v);
-    tqrepaint(FALSE);
+    repaint(FALSE);
 }
 
 void KLCDNumber::display (int v)
@@ -317,13 +317,13 @@ void KLCDNumber::defaultValueClicked()
 void KLCDNumber::setLCDBackgroundColor(int r,int g,int b)
 {
     backgcolor=TQColor(r,g,b);
-    tqrepaint(FALSE);
+    repaint(FALSE);
 }
 
 void KLCDNumber::setLCDColor(int r,int g,int b)
 {
     LCDcolor=TQColor(r,g,b);
-    tqrepaint(FALSE);
+    repaint(FALSE);
 }
 
 void KLCDNumber::setRange(double min, double max)

kmid/kmidclient.cpp

@@ -290,10 +290,10 @@ int kmidClient::openFile(const char *filename)
         switch (r)
         {
         case (-1) : errormsg =
-                            i18n("The file %1 does not exist or cannot be opened.").tqarg(filename);
+                            i18n("The file %1 does not exist or cannot be opened.").arg(filename);
         break;
         case (-2) : errormsg =
-                            i18n("The file %1 is not a MIDI file.").tqarg(filename);break;
+                            i18n("The file %1 is not a MIDI file.").arg(filename);break;
         case (-3) : errormsg =
                             i18n("Ticks per quarter note is negative. Please send this file to larrosa@kde.org");break;
         case (-4) : errormsg =
@@ -301,7 +301,7 @@ int kmidClient::openFile(const char *filename)
         case (-5) : errormsg =
                             i18n("This file is corrupted or not well built.");break;
         case (-6) : errormsg =
-                            i18n("%1 is not a regular file.").tqarg(filename);break;
+                            i18n("%1 is not a regular file.").arg(filename);break;
         default :   errormsg = i18n("Unknown error message");break;
         }
         KMessageBox::error(this, errormsg);
@@ -310,9 +310,9 @@ int kmidClient::openFile(const char *filename)
         midifile_opened=0L;
         timebar->setRange(0,240000);
         timebar->setValue(0);
-        timetags->tqrepaint(TRUE);
+        timetags->repaint(TRUE);
         kdispt->ClearEv();
-        kdispt->tqrepaint(TRUE);
+        kdispt->repaint(TRUE);
         topLevelWidget()->setCaption("KMid");
 
         return -1;
@@ -327,7 +327,7 @@ int kmidClient::openFile(const char *filename)
     //    noteArray=player->parseNotes();
     noteArray=player->noteArray();
     timebar->setRange(0,(int)(player->information()->millisecsTotal));
-    timetags->tqrepaint(TRUE);
+    timetags->repaint(TRUE);
     kdispt->ClearEv();
     spev=player->specialEvents();
     while (spev)
@@ -343,7 +343,7 @@ int kmidClient::openFile(const char *filename)
     kdispt->CursorToHome();
 //    kdispt->updateScrollBars();
     emit mustRechooseTextEvent();
-    kdispt->tqrepaint(TRUE);
+    kdispt->repaint(TRUE);
     tempoLCD->display(tempoToMetronomeTempo(m_kMid.pctl->tempo));
     currentTempo=tempoLCD->getValue();
     tempoLCD->setDefaultValue(tempoToMetronomeTempo(m_kMid.pctl->tempo)*m_kMid.pctl->ratioTempo);
@@ -1129,7 +1129,7 @@ void kmidClient::repaintText(int type)
 {
     kdispt->ChangeTypeOfTextEvents(type);
     typeoftextevents=type;
-    kdispt->tqrepaint(TRUE);
+    kdispt->repaint(TRUE);
 }
 
 int kmidClient::ChooseTypeOfTextEvents(void)
@@ -1265,11 +1265,11 @@ void kmidClient::slotSelectSong(int i)
         player->removeSong();
         timebar->setRange(0,240000);
         timebar->setValue(0);
-        timetags->tqrepaint(TRUE);
+        timetags->repaint(TRUE);
         kdispt->ClearEv();
-        kdispt->tqrepaint(TRUE);
+        kdispt->repaint(TRUE);
         comboSongs->clear();
-        comboSongs->tqrepaint(TRUE);
+        comboSongs->repaint(TRUE);
         topLevelWidget()->setCaption("KMid");
         return;
     }
@@ -1487,7 +1487,7 @@ void kmidClient::slotSetTempo(double value)
 
     timebar->setRange(0,(int)(player->information()->millisecsTotal));
     timebar->setValue(pausedatmillisec);
-    timetags->tqrepaint(TRUE);
+    timetags->repaint(TRUE);
 
     kdispt->ClearEv(false);
 

kmid/kmidframe.cpp

@@ -567,7 +567,7 @@ void kmidFrame::file_SaveLyrics()
 
   if (stat(TQFile::encodeName(filename), &statbuf)!=-1)
   {
-    TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").tqarg(filename);
+    TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").arg(filename);
     if (KMessageBox::warningYesNo(this,s,TQString(),i18n("Overwrite"),KStdGuiItem::cancel())==1)
       return;
   }

kmid/ktrianglebutton.cpp

@@ -47,7 +47,7 @@ void KTriangleButton::enterEvent( TQEvent* )
   if ( isEnabled() )
     {
       raised = TRUE;
-      tqrepaint(FALSE);
+      repaint(FALSE);
     }
 }
 
@@ -56,7 +56,7 @@ void KTriangleButton::leaveEvent( TQEvent * )
   if( raised != FALSE )
     {
       raised = FALSE;
-      tqrepaint();
+      repaint();
     }
 }
 

kmid/midicfgdlg.cpp

@@ -56,7 +56,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
   for (int i=0;i<devman->midiPorts()+devman->synthDevices();i++)
   {
     if (strcmp(devman->type(i),"")!=0)    
-      temp = TQString("%1 - %2").tqarg(devman->name(i)).tqarg(devman->type(i));
+      temp = TQString("%1 - %2").arg(devman->name(i)).arg(devman->type(i));
     else
       temp = devman->name(i);
 

kmix/kledbutton.cpp

@@ -33,8 +33,8 @@ KLedButton::KLedButton(const TQColor &col, TQWidget *parent, const char *name)
 }
 
 KLedButton::KLedButton(const TQColor& col, KLed::State st, KLed::Look look,
-		       KLed::Shape tqshape, TQWidget *parent, const char *name)
+		       KLed::Shape shape, TQWidget *parent, const char *name)
-   : KLed( col, st, look, tqshape, parent, name )
+   : KLed( col, st, look, shape, parent, name )
 {
 }
 

kmix/kledbutton.h

@@ -35,7 +35,7 @@ class KLedButton : public KLed  {
   TQ_OBJECT
   public: 
    KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
-   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape tqshape,
+   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
 	      TQWidget *parent=0, const char *name=0);
    ~KLedButton();	
 

kmix/kmix.cpp

@@ -551,7 +551,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
        show();
    }
 
-   this->tqrepaint(); // make KMix look fast (saveConfig() often uses several seconds)
+   this->repaint(); // make KMix look fast (saveConfig() often uses several seconds)
    kapp->processEvents();
    saveConfig();
 }

kmix/kmixdockwidget.cpp

@@ -191,7 +191,7 @@ KMixDockWidget::setVolumeTip()
         }
 	newToolTipValue = val + 10000*md->isMuted();
 	if ( _oldToolTipValue != newToolTipValue ) {
-	    tip = i18n( "Volume at %1%" ).tqarg( val );
+	    tip = i18n( "Volume at %1%" ).arg( val );
 	    if ( md->isMuted() ) {
 		tip += i18n( " (Muted)" );
 	    }

kmix/ksmallslider.cpp

@@ -486,7 +486,7 @@ void KSmallSlider::setGray( bool value )
    {
       grayed = value;
       update();
-      //tqrepaint();
+      //repaint();
    }
 }
 
@@ -501,7 +501,7 @@ void KSmallSlider::setColors( TQColor high, TQColor low, TQColor back )
     colLow = low;
     colBack = back;
     update();
-    //tqrepaint();
+    //repaint();
 }
 
 void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
@@ -510,7 +510,7 @@ void KSmallSlider::setGrayColors( TQColor high, TQColor low, TQColor back )
     grayLow = low;
     grayBack = back;
     update();
-    //tqrepaint();
+    //repaint();
 }
 
 #include "ksmallslider.moc"

kmix/mdwslider.cpp

@@ -81,11 +81,11 @@ MDWSlider::MDWSlider(Mixer *mixer, MixDevice* md,
 	// create widgets
 	createWidgets( showMuteLED, showRecordLED );
 
-	m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Increase volume", i18n( "Increase Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( increaseVolume() ) );
-	m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Decrease volume", i18n( "Decrease Volume of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( decreaseVolume() ) );
-	m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).tqarg(m_mixdevice->name().utf8().data()), TQString(),
+	m_keys->insert( "Toggle mute", i18n( "Toggle Mute of '%1'" ).arg(m_mixdevice->name().utf8().data()), TQString(),
 			KShortcut(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT( toggleMuted() ) );
 
 	installEventFilter( this ); // filter for popup

kmix/mixer_alsa9.cpp

@@ -115,7 +115,7 @@ Mixer_ALSA::open()
 
     // Card information
     if ((unsigned)m_devnum > 31) m_devnum = -1;
-    devName = m_devnum == -1 ? "default" : TQString("hw:%1").tqarg(m_devnum);
+    devName = m_devnum == -1 ? "default" : TQString("hw:%1").arg(m_devnum);
 
     TQString probeMessage;
 

kmix/mixertoolbox.cpp

@@ -148,9 +148,9 @@ void MixerToolBox::initMixer(TQPtrList<Mixer> &mixers, bool multiDriverMode, TQS
 			TQString mixerName = mixer->mixerName();
 			mixerName.replace(":","_");
 			TQString primaryKeyOfMixer = TQString("%1::%2:%3")
-			    .tqarg(driverName)
+			    .arg(driverName)
-			    .tqarg(mixerName)
+			    .arg(mixerName)
-			    .tqarg(mixerNums[mixer->mixerName()]);
+			    .arg(mixerNums[mixer->mixerName()]);
 			// The following 3 replaces are for not messing up the config file
 			primaryKeyOfMixer.replace("]","_");
 			primaryKeyOfMixer.replace("[","_"); // not strictly neccesary, but lets play safe

kmix/viewgrid.cpp

@@ -178,7 +178,7 @@ void ViewGrid::refreshVolumeLevels() {
 }
 
 /**
-   This implementation makes sure the Grid's tqgeometry is updated
+   This implementation makes sure the Grid's geometry is updated
    after hiding/showing channels.
 */
 void ViewGrid::configurationUpdate() {

krec/krecfile.cpp

@@ -94,7 +94,7 @@ KRecFile::KRecFile( const TQString &filename, TQObject* p, const char* n )
 		_config->setGroup( "File-" + TQString::number( i ) );
 		newBuffer( KRecBuffer::fromConfig( _config, _dir->qDir(), this ) );
 	}
-	KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).tqarg( filename ) );
+	KRecGlobal::the()->message( i18n( "\'%1\' loaded." ).arg( filename ) );
 
 	delete tar;
 
@@ -168,7 +168,7 @@ void KRecFile::save( const TQString &fname ) {
 	delete tar;
 	KIO::file_move( tmpname, filetosave, -1, true, false, true );
 
-	KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).tqarg( filename() ) );
+	KRecGlobal::the()->message( i18n( "Saving \"%1\" was successful." ).arg( filename() ) );
 	_saved = true;
 }
 
@@ -429,7 +429,7 @@ void KRecBuffer::setActive( bool n ) {
 }
 
 void KRecBuffer::deleteBuffer() {
-	if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).tqarg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue )
+	if ( KMessageBox::warningContinueCancel( KRecGlobal::the()->mainWidget(), i18n( "Do you really want to delete the selected part '%1'?" ).arg( filename() ), i18n("Delete Part?"), KStdGuiItem::del() ) == KMessageBox::Continue )
 		_krecfile->deleteBuffer( this );
 }
 

krec/krecfileviewhelpers.cpp

@@ -64,12 +64,12 @@ void KRecTimeBar::mouseReleaseEvent( TQMouseEvent* qme ) {
 
 void KRecTimeBar::newPos( int n ) {
 	_pos = n;
-	tqrepaint();
+	repaint();
 }
 
 void KRecTimeBar::newSize( int n ) {
 	_size = n;
-	tqrepaint();
+	repaint();
 }
 
 
@@ -216,10 +216,10 @@ TQString KRecTimeDisplay::formatTime( const int mode, const int sample ) const {
 void KRecTimeDisplay::timeContextMenu( TQPopupMenu* menu ) {
 	if ( !_filename.isNull() ) {
 		menu->insertSeparator( 0 );
-		menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _posvalue ) ), -1, 0 );
+		menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _posvalue ) ), -1, 0 );
-		menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _posvalue ) ), -1, 0 );
+		menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _posvalue ) ), -1, 0 );
-		menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _posvalue ) ), -1, 0 );
+		menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _posvalue ) ), -1, 0 );
-		menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _posvalue ) ), -1, 0 );
+		menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _posvalue ) ), -1, 0 );
 		KPopupTitle *tmp = new KPopupTitle( menu );
 		tmp->setTitle( i18n( "Position" ) );
 		menu->insertItem( tmp, -1, 0 );
@@ -235,10 +235,10 @@ void KRecTimeDisplay::timeContextMenu( const TQPoint &point ) {
 void KRecTimeDisplay::sizeContextMenu( TQPopupMenu* menu ) {
 	if ( !_filename.isNull() ) {
 		menu->insertSeparator( 0 );
-		menu->insertItem( i18n( "kByte: %1" ).tqarg( formatTime( 3, _sizevalue ) ), -1, 0 );
+		menu->insertItem( i18n( "kByte: %1" ).arg( formatTime( 3, _sizevalue ) ), -1, 0 );
-		menu->insertItem( i18n( "[h:]m:s.f %1" ).tqarg( formatTime( 2, _sizevalue ) ), -1, 0 );
+		menu->insertItem( i18n( "[h:]m:s.f %1" ).arg( formatTime( 2, _sizevalue ) ), -1, 0 );
-		menu->insertItem( i18n( "[h:]m:s.s %1" ).tqarg( formatTime( 1, _sizevalue ) ), -1, 0 );
+		menu->insertItem( i18n( "[h:]m:s.s %1" ).arg( formatTime( 1, _sizevalue ) ), -1, 0 );
-		menu->insertItem( i18n( "%1 Samples" ).tqarg( formatTime( 0, _sizevalue ) ), -1, 0 );
+		menu->insertItem( i18n( "%1 Samples" ).arg( formatTime( 0, _sizevalue ) ), -1, 0 );
 		KPopupTitle *tmp = new KPopupTitle( menu );
 		tmp->setTitle( i18n( "Size" ) );
 		menu->insertItem( tmp, -1, 0 );
@@ -255,10 +255,10 @@ void KRecTimeDisplay::jumpToTime() {
 }
 
 TQString KRecTimeDisplay::positionText( int m, int n ) {
-	return i18n( "Position: %1" ).tqarg( formatTime( m,n ) );
+	return i18n( "Position: %1" ).arg( formatTime( m,n ) );
 }
 TQString KRecTimeDisplay::sizeText( int m, int n ) {
-	return i18n( "Size: %1" ).tqarg( formatTime( m,n ) );
+	return i18n( "Size: %1" ).arg( formatTime( m,n ) );
 }
 
 void AKLabel::mousePressEvent( TQMouseEvent* qme ) {

krec/krecord.cpp

@@ -138,7 +138,7 @@ bool KRecPrivate::closeFile() {
 	//kdDebug( 60005 ) << k_funcinfo << endl;
 	if ( _currentFile ) {
 		if ( !_currentFile->saved() ) {
-			int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).tqarg( _currentFile->filename() ), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
+			int choice = KMessageBox::questionYesNoCancel( _impl, i18n( "The document \"%1\" has been modified.\nDo you want to save it?" ).arg( _currentFile->filename() ), TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
 			if ( choice == KMessageBox::Yes ) saveFile();
 			if ( choice == KMessageBox::Cancel ) return false;
 			// go on if KMessageBox::No
@@ -179,7 +179,7 @@ void KRecPrivate::exportFile() {
 				      "you did everything right, please file a bugreport saying what " \
 				      "you where about to do and please quote the following line:<br />" \
 				      "%1</li>" \
-				      "</ul></qt>" ).tqarg( KRecGlobal::the()->exportFormatEndings() ),
+				      "</ul></qt>" ).arg( KRecGlobal::the()->exportFormatEndings() ),
 				i18n( "Could not determine encodingmethod" ) );
 		}
 	} else KRecGlobal::the()->message( i18n( "There is nothing to export." ) );

kscd/bwlednum.cpp

@@ -168,9 +168,9 @@ void BW_LED_Number::setSmallLED(bool a_boolean){
 }
 
 
-void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool tqrepaint ){
+void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool repaint ){
 
-  //  printf("drawSymbol tqrepaint = %d\n",tqrepaint);
+  //  printf("drawSymbol repaint = %d\n",repaint);
 
  TQPoint  pos;
 
@@ -194,7 +194,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool tqrepaint ){
  pos = TQPoint( Xoffset , Yoffset );
 
 
- if(tqrepaint){
+ if(repaint){
 
    // this draw the non-illumintated segments
 
@@ -222,7 +222,7 @@ void BW_LED_Number::drawSymbol( TQPainter *p,char ,bool tqrepaint ){
      }
    }
  }
- else{ // we are not repainting ourselves due to a tqrepaint event but rather
+ else{ // we are not repainting ourselves due to a repaint event but rather
        // genuinely changing the symbol that is to be displayed
 
    for(int l = 0; l <= NUM_OF_SEGMENTS -1; l++){

kscd/bwlednum.h

@@ -68,7 +68,7 @@ private:
 
     bool    seg_contained_in( char c, char* seg);
     void    drawSegment( const TQPoint &, char, TQPainter &, int, bool = FALSE );
-    void    drawSymbol( TQPainter *p,char s ,bool tqrepaint);
+    void    drawSymbol( TQPainter *p,char s ,bool repaint);
 
     char* old_segments;
     char* current_segments;

kscd/cddbdlg.cpp

@@ -90,7 +90,7 @@ void CDDBDlg::submitFinished(KCDDB::CDDB::Result r)
   else
   {
     TQString str = i18n("Error sending record.\n\n%1")
-      .tqarg(KCDDB::CDDB::resultToString(r));
+      .arg(KCDDB::CDDB::resultToString(r));
     KMessageBox::error(this, str, i18n("Record Submission"));
   }
 } // submitFinished()

kscd/kcompactdisc.cpp

@@ -428,7 +428,7 @@ void KCompactDisc::timerExpired()
                 else
                 {
                     m_trackArtists.append(i18n("Unknown Artist"));
-                    m_trackTitles.append(i18n("Track %1").tqarg(TQString::number(i).rightJustify(2, '0')));
+                    m_trackTitles.append(i18n("Track %1").arg(TQString::number(i).rightJustify(2, '0')));
                 }
                 // FIXME: KDE4
                 // track.length = cd->trk[i - 1].length;

kscd/kscd.cpp

@@ -550,7 +550,7 @@ void KSCD::trackChanged(unsigned track, unsigned trackLength)
             justTheName = justTheName.right(justTheName.length() - 4);
 
             TQToolTip::remove(songListCB);
-            TQToolTip::add(songListCB, i18n("Current track: %1").tqarg(justTheName));
+            TQToolTip::add(songListCB, i18n("Current track: %1").arg(justTheName));
         }
         timeSlider->blockSignals(true);
         timeSlider->setRange(0, trackLength ? trackLength - 1 : 0);
@@ -800,7 +800,7 @@ void KSCD::setDevicePaths()
     {
         // This device did not seem usable.
         TQString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\
-                            "Please make sure you have access permissions to:\n%1").tqarg(
+                            "Please make sure you have access permissions to:\n%1").arg(
                              KCompactDisc::urlToDevice(Prefs::cdDevice()));
         KMessageBox::error(this, str, i18n("Error"));
     }
@@ -1211,8 +1211,8 @@ void KSCD::lookupCDDBDone(CDDB::Result result)
       CDInfoList::iterator it;
       TQStringList list;
       for ( it = cddb_info.begin(); it != cddb_info.end(); ++it  ) {
-        list.append( TQString("%1, %2, %3").tqarg((*it).artist).tqarg((*it).title)
+        list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title)
-            .tqarg((*it).genre));
+            .arg((*it).genre));
       }
 
       bool ok(false);
@@ -1419,62 +1419,62 @@ void KSCD::information(int i)
     {
         case 0:
             str = TQString("http://musicmoz.org/cgi-bin/ext.cgi?artist=%1")
-                   .tqarg(encodedArtist);
+                   .arg(encodedArtist);
             break;
 
          case 1:
             str = TQString("http://ubl.artistdirect.com/cgi-bin/gx.cgi/AppLogic+Search?select=MusicArtist&searchstr=%1&searchtype=NormalSearch")
-                .tqarg(encodedArtist);
+                .arg(encodedArtist);
             break;
 
         case 2:
             str = TQString("http://www.cduniverse.com/cgi-bin/cdubin.exe/rlinka/ean=%1")
-                  .tqarg(encodedArtist);
+                  .arg(encodedArtist);
             break;
 
         case 3:
             str = TQString("http://www.alltheweb.com/search?cat=web&q=%1")
-                    .tqarg(encodedArtist);
+                    .arg(encodedArtist);
             break;
 
         case 4:
             str = TQString("http://altavista.com/web/results?q=%1&kgs=0&kls=1&avkw=xytx")
-                  .tqarg(encodedArtist);
+                  .arg(encodedArtist);
             break;
 
         case 5:
             str = TQString("http://msxml.excite.com/_1_2UDOUB70SVHVHR__info.xcite/dog/results?otmpl=dog/webresults.htm&qkw=%1&qcat=web&qk=20&top=1&start=&ver=14060")
-                  .tqarg(encodedArtist);
+                  .arg(encodedArtist);
             break;
 
         case 6:
             str = TQString("http://www.google.com/search?q=%1")
-                  .tqarg(encodedArtist);
+                  .arg(encodedArtist);
             break;
 
         case 7:
             str = TQString("http://groups.google.com/groups?oi=djq&as_q=%1&num=20")
-                  .tqarg(encodedArtist);
+                  .arg(encodedArtist);
             break;
 
         case 8:
             str = TQString("http://www.hotbot.com/default.asp?prov=Inktomi&query=%1&ps=&loc=searchbox&tab=web")
-                  .tqarg(encodedArtist);
+                  .arg(encodedArtist);
             break;
 
         case 9:
             str = TQString("http://search.lycos.com/default.asp?lpv=1&loc=searchhp&tab=web&query=%1")
-                  .tqarg(encodedArtist);
+                  .arg(encodedArtist);
              break;
 
          case 10:
              str = TQString("http://search.dmoz.org/cgi-bin/search?search=%1")
-                   .tqarg(encodedArtist);
+                   .arg(encodedArtist);
              break;
 
          case 11:
              str = TQString("http://search.yahoo.com/bin/search?p=%1")
-                   .tqarg(encodedArtist);
+                   .arg(encodedArtist);
              break;
 
          default:
@@ -1569,7 +1569,7 @@ void KSCD::populateSongList(TQString infoStatus)
     if (!infoStatus.isEmpty())
         artistlabel->setText(infoStatus);
     else
-        artistlabel->setText(TQString("%1 - %2").tqarg(cddbInfo.artist, cddbInfo.title));
+        artistlabel->setText(TQString("%1 - %2").arg(cddbInfo.artist, cddbInfo.title));
 
     songListCB->clear();
     for (unsigned i = 0; i < cddbInfo.trackInfoList.count(); i++)

kscd/kscdmagic/README

@@ -15,14 +15,14 @@ Introduction
 This is a program for representing sounds visually from a CD or line
 input or piped from another program. It goes beyond the usual oscilliscope
 style program by combining an FFT and stereo positioning information to
-give a two dimensional display. Some of the tqshapes I have observed are:
+give a two dimensional display. Some of the shapes I have observed are:
   * Drums: clouds of color, fairly high
   * Clean guitar: several horizontal lines, low down
   * Rough guitar: a cloud, low down
   * Trumpet: Lots of horizontal lines everywhere
   * Flute: A single horizontal line, low down
   * Voice: A vertical line with some internal structure
-  * Synthesizer: All kinds of weird tqshapes!
+  * Synthesizer: All kinds of weird shapes!
 
 Synaesthesia can run in a window in X or full screen using SVGAlib.
 
@@ -139,7 +139,7 @@ Changes
       Support for SDL.
 2.0 - Bug fixes: Fixed problem in xlib.c that caused occasional segfaults,
         several endianness problems fixed.
-      New effects: Wave, heat, diamond tqshaped points.
+      New effects: Wave, heat, diamond shaped points.
       Piping sound now longer requires the twiddle factor.
       Yet another interface redesign.
       Partial support for LinuxPPC (pipe mode only)

kscd/ledlamp.h

@@ -42,10 +42,10 @@ public:
   State state() const { return s; }
   
 
-  void setState(State state) { s= state; tqrepaint(false); }
+  void setState(State state) { s= state; repaint(false); }
 
 
-  void toggleState() { if (s == On) s= Off; else if (s == Off) s= On; tqrepaint(false); }
+  void toggleState() { if (s == On) s= Off; else if (s == Off) s= On; repaint(false); }
 public slots:
   void toggle() { toggleState(); };
   void on() { setState(On); };

libkcddb/cddbplookup.cpp

@@ -40,10 +40,10 @@ namespace KCDDB
   CDDBPLookup::sendHandshake()
   {
     TQString handshake = TQString( "cddb hello %1 %2 %3 %4" )
-        .tqarg( user_ )
+        .arg( user_ )
-        .tqarg( localHostName_ )
+        .arg( localHostName_ )
-        .tqarg( clientName() )
+        .arg( clientName() )
-        .tqarg( clientVersion() );
+        .arg( clientVersion() );
 
     writeLine( handshake );
   }
@@ -58,8 +58,8 @@ namespace KCDDB
   CDDBPLookup::sendQuery()
   {
     TQString query = TQString( "cddb query %1 %2" )
-        .tqarg( trackOffsetListToId() )
+        .arg( trackOffsetListToId() )
-        .tqarg( trackOffsetListToString() );
+        .arg( trackOffsetListToString() );
 
     writeLine( query );
   }
@@ -71,8 +71,8 @@ namespace KCDDB
     TQString discid    = match.second;
 
     TQString readRequest = TQString( "cddb read %1 %2" )
-        .tqarg( category_ )
+        .arg( category_ )
-        .tqarg( discid );
+        .arg( discid );
 
     writeLine( readRequest );
   }

libkcddb/cdinfo.cpp

@@ -209,7 +209,7 @@ namespace KCDDB
     if (submit)
     {
       s += "#\n";
-      s += TQString("# Submitted via: %1 %2\n").tqarg(CDDB::clientName(),
+      s += TQString("# Submitted via: %1 %2\n").arg(CDDB::clientName(),
         CDDB::clientVersion());
     }
 
@@ -220,7 +220,7 @@ namespace KCDDB
 
     for (uint i = 0; i < trackInfoList.count(); ++i)
     {
-      s += createLine(TQString("TTITLE%1").tqarg(i), 
+      s += createLine(TQString("TTITLE%1").arg(i), 
                 escape( trackInfoList[ i ].title));
     }
 
@@ -228,7 +228,7 @@ namespace KCDDB
 
     for (uint i = 0; i < trackInfoList.count(); ++i)
     {
-      s += createLine(TQString("EXTT%1").tqarg(i), escape(trackInfoList[i].extt));
+      s += createLine(TQString("EXTT%1").arg(i), escape(trackInfoList[i].extt));
     }
 
     s +="PLAYORDER=\n";
@@ -251,11 +251,11 @@ namespace KCDDB
 
     while (tmpValue.length() > maxLength)
     {
-      lines += TQString("%1=%2\n").tqarg(name,tmpValue.left(maxLength));
+      lines += TQString("%1=%2\n").arg(name,tmpValue.left(maxLength));
       tmpValue = tmpValue.mid(maxLength);
     }
 
-    lines += TQString("%1=%2\n").tqarg(name,tmpValue);
+    lines += TQString("%1=%2\n").arg(name,tmpValue);
 
     return lines;
   }

libkcddb/cdinfoencodingwidget.cpp

@@ -62,7 +62,7 @@ namespace KCDDB
     songsBox->clear();
     songsBox->insertStringList(newTitles);
       
-    titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").tqarg(
+    titleLabel->setText(i18n("artist - cdtitle", "%1 - %2").arg(
           codec->toUnicode(m_artist.latin1()), codec->toUnicode(m_title.latin1())));
   }
 }

libkcddb/httplookup.cpp

@@ -40,7 +40,7 @@ namespace KCDDB
   HTTPLookup::sendQuery()
   {
     TQString cmd = TQString( "cddb query %1 %2" )
-      .tqarg( trackOffsetListToId(), trackOffsetListToString() ) ;
+      .arg( trackOffsetListToId(), trackOffsetListToString() ) ;
 
     makeURL( cmd );
     Result result = fetchURL();
@@ -55,7 +55,7 @@ namespace KCDDB
     TQString discid    = match.second;
 
     TQString cmd = TQString( "cddb read %1 %2" )
-        .tqarg( category_, discid );
+        .arg( category_, discid );
 
     makeURL( cmd );
     Result result = fetchURL();
@@ -83,7 +83,7 @@ namespace KCDDB
     cgiURL_.setQuery( TQString() );
 
     TQString hello = TQString("%1 %2 %3 %4")
-        .tqarg(user_, localHostName_, clientName(), clientVersion());
+        .arg(user_, localHostName_, clientName(), clientVersion());
 
     cgiURL_.addQueryItem( "cmd", cmd );
     cgiURL_.addQueryItem( "hello", hello );

libkcddb/kcmcddb/cddbconfigwidgetbase.ui

@@ -192,7 +192,7 @@
                                 <property name="text">
                                     <string>&amp;Port:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                                 <property name="buddy" stdset="0">
@@ -397,7 +397,7 @@
                                 <property name="text">
                                     <string>Port:</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignVCenter|AlignRight</set>
                                 </property>
                             </widget>

libkcddb/sites.cpp

@@ -44,7 +44,7 @@ namespace KCDDB
     url.setQuery( TQString() );
 
     TQString hello = TQString("%1 %2 %3 %4")
-        .tqarg(user_, localHostName_, clientName(), clientVersion());
+        .arg(user_, localHostName_, clientName(), clientVersion());
 
     url.addQueryItem( "cmd", "sites" );
     url.addQueryItem( "hello", hello );

libkcddb/smtpsubmit.cpp

@@ -43,7 +43,7 @@ namespace KCDDB
   KIO::Job* SMTPSubmit::createJob(const CDInfo& cdInfo)
   {
     url_.setQuery(TQString("to=%1&subject=cddb %2 %3&from=%4")
-      .tqarg(to_, cdInfo.category, cdInfo.id, from_));
+      .arg(to_, cdInfo.category, cdInfo.id, from_));
     kdDebug(60010) << "Url is: " << url_.prettyURL() << endl;
 
     return KIO::storedPut(diskData_.utf8(), url_, -1, false, false, false);

libkcddb/submit.cpp

@@ -74,10 +74,10 @@ namespace KCDDB
     diskData_ += "# Track frame offsets:\n";
 
     for (uint i=0; i < numTracks; i++)
-      diskData_ += TQString("#\t%1\n").tqarg(offsetList[i]);
+      diskData_ += TQString("#\t%1\n").arg(offsetList[i]);
 
     int l = offsetList[numTracks+1]/75;
-    diskData_ += TQString("# Disc length: %1 seconds\n").tqarg(l);
+    diskData_ += TQString("# Disc length: %1 seconds\n").arg(l);
 
     diskData_ += cdInfo.toString(true);
 

mpeglib/lib/frame/framer.cpp

@@ -223,7 +223,7 @@ int Framer::read_frame(RawDataBuffer* ,RawDataBuffer* ) {
 
 void Framer::unsync(RawDataBuffer* ,int ) {
   if (lConstruct == false) {
-    // tqinvalidate header in buffer
+    // invalidate header in buffer
     cout << "direct virtual call Framer::unsync"<<endl;
   }
 }

mpeglib/lib/mpegplay/macroBlock.cpp

@@ -1067,7 +1067,7 @@ void MacroBlock::ReconSkippedBlock(unsigned char* source,
   if (width == 16) {
     if ((!right_half) && (!down_half)) {
 	if (right & 0x1) {
-	  /* No tqalignment, use bye copy */
+	  /* No alignment, use bye copy */
 	  for (rr = 0; rr < 16; rr++) {
 
 	    memcpy(dest,source,sizeof(char)*16);

mpeglib/lib/mpegplay/picture.cpp

@@ -63,7 +63,7 @@ int Picture::processPicture(MpegVideoStream* mpegVideoStream) {
   stamp=mpegVideoStream->getCurrentTimeStamp();
 
   stamp->copyTo(startOfPicStamp);
-  // now tqinvalidate the PTSFlag
+  // now invalidate the PTSFlag
   stamp->setPTSFlag(false);
 
 

mpeglib/lib/mpegplay/recon.cpp

@@ -298,7 +298,7 @@ int Recon::ReconPMBlock(int bnum,
     } else {
       if (right_for & 0x1) {
 
-	/* No tqalignment, used byte copy */
+	/* No alignment, used byte copy */
 	copyFunctions->copy8_byte(rindex1,index,row_size);
 
 
@@ -498,7 +498,7 @@ int Recon::ReconBMBlock(int bnum,
       copyFunctions->copy8_src2linear_crop(rindex1,dct_start,index,row_size);
     } else {
       if (right_back & 0x1) {
-	/* No tqalignment, use byte copy */
+	/* No alignment, use byte copy */
 
 	copyFunctions->copy8_byte(rindex1,index,row_size);
 	

mpeglib/lib/splay/mpegAudioFrame.cpp

@@ -34,7 +34,7 @@ MpegAudioFrame::~MpegAudioFrame() {
 
 
 void MpegAudioFrame::unsync(RawDataBuffer* store,int ) {
-  // tqinvalidate header in buffer
+  // invalidate header in buffer
   unsigned char* start=store->ptr();
   start[0]=0x0;
   start[1]=0x0;

noatun/library/equalizerwidget.ui

@@ -37,7 +37,7 @@
                     <property name="text">
                         <string>Pre&amp;amp:</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -122,7 +122,7 @@
                             <property name="text">
                                 <string>+/-</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>

noatun/library/ksaver.cpp

@@ -78,7 +78,7 @@ bool Noatun::KSaver::open(void)
 		}
 		else
 		{
-			d->error = i18n("Could not write to %1.").tqarg(d->url.prettyURL());
+			d->error = i18n("Could not write to %1.").arg(d->url.prettyURL());
 			return false;
 		}
 	}

noatun/library/playlistsaver.cpp

@@ -107,7 +107,7 @@ bool PlaylistSaver::metalist(const KURL &url)
 
 		TQMap<TQString,TQString> map;
 		map["playObject"]="Arts::StreamPlayObject";
-		map["title"] = i18n("Stream from %1").tqarg(url.host());
+		map["title"] = i18n("Stream from %1").arg(url.host());
 
 		KURL u(url);
 		if (!u.hasPath())
@@ -303,7 +303,7 @@ public:
 								else
 								{
 									propMap["playObject"]="SplayPlayObject";
-									propMap["title"] = i18n("Stream from %1").tqarg(url.host());
+									propMap["title"] = i18n("Stream from %1").arg(url.host());
 									if (!url.hasPath())
 										url.setPath("/");
 									propMap["url"] = url.url();
@@ -556,7 +556,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
 			{
 				prop["playObject"]="SplayPlayObject";
 				// Default title, might be overwritten by #EXTINF later
-				prop["title"] = i18n("Stream from %1").tqarg(protourl.host());
+				prop["title"] = i18n("Stream from %1").arg(protourl.host());
 
 				if (!protourl.hasPath())
 					protourl.setPath("/");
@@ -748,9 +748,9 @@ bool PlaylistSaver::loadPLS(const KURL &file, int /*opt*/)
 
 		map["playObject"]="SplayPlayObject";
 		if (title.isEmpty())
-			map["title"] = i18n("Stream from %1 (port: %2)").tqarg( url.host() ).tqarg( url.port() );
+			map["title"] = i18n("Stream from %1 (port: %2)").arg( url.host() ).arg( url.port() );
 		else
-			map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").tqarg( title ).tqarg( url.host() ).tqarg(url.port() );
+			map["title"] = i18n("Stream from %1, (ip: %2, port: %3)").arg( title ).arg( url.host() ).arg(url.port() );
 
 		map["url"] = map["stream_"]= url.url();
 

noatun/library/plugin.cpp

@@ -94,7 +94,7 @@ Visualization::Visualization(int timeout, int pid)
 		c.attach();
 
 		TQCString appids[2];
-		appids[0]=TQString("noatun-%1").tqarg(parent).local8Bit();
+		appids[0]=TQString("noatun-%1").arg(parent).local8Bit();
 		appids[1]="noatun";
 		TQCString &appid=appids[0];
 
@@ -504,7 +504,7 @@ ExitNotifier::ExitNotifier(int pid, TQObject *parent) : NoatunListener(parent)
 
 
 	TQCString appids[2];
-	appids[0]=TQString("noatun-%1").tqarg(pid).local8Bit();
+	appids[0]=TQString("noatun-%1").arg(pid).local8Bit();
 	appids[1]="noatun";
 	appid=appids[0];
 

noatun/library/scrollinglabel.cpp

@@ -128,7 +128,7 @@ ScrollingLabel::_update()
 	if (d->scroll && (d->scrollSize > 0))
 		d->scrollTimer.start(100, true);
 
-	tqrepaint(false);
+	repaint(false);
 }
 
 	void
@@ -149,7 +149,7 @@ ScrollingLabel::scroll()
 {
 	d->scrollTimer.stop();
 
-	tqrepaint(false);
+	repaint(false);
 
 	int scrollTime = 100;
 

noatun/library/titleproxy.cpp

@@ -157,11 +157,11 @@ void Proxy::sendRequest() //SLOT
 		"%3"
 		"%4"
 		"\r\n" )
-		.tqarg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) )
+		.arg( m_url.path( -1 ).isEmpty() ? "/" : m_url.path( -1 ) )
-		.tqarg( m_url.host() )
+		.arg( m_url.host() )
-		.tqarg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() )
+		.arg( m_icyMode ? TQString( "Icy-MetaData:1\r\n" ) : TQString() )
-		.tqarg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() )
+		.arg( auth ? TQString( "Authorization: Basic " ).append( authString ) : TQString() )
-		.tqarg( NOATUN_VERSION );
+		.arg( NOATUN_VERSION );
 
 	m_sockRemote.writeBlock( request.latin1(), request.length() );
 

noatun/modules/excellent/userinterface.cpp

@@ -335,7 +335,7 @@ void Excellent::showMenubar(void)
 	}
 	else
 	{
-		KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").tqarg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning");
+		KMessageBox::information(this, i18n("<qt>Press %1 to show the menubar.</qt>").arg(menubarAction->shortcut().toString()), TQString(), "Hide Menu warning");
 		menuBar()->hide();
 	}
 }

noatun/modules/infrared/irprefs.cpp

@@ -109,9 +109,9 @@ void IRPrefs::save()
 	int i = 1;
 	for (TQMap<TQString, Command>::ConstIterator it = s_commands.begin(); it != s_commands.end(); ++it)
 	{
-		c->writePathEntry(TQString("Command_%1").tqarg(i), it.key());
+		c->writePathEntry(TQString("Command_%1").arg(i), it.key());
-		c->writeEntry(TQString("Action_%1").tqarg(i), (int)((*it).action));
+		c->writeEntry(TQString("Action_%1").arg(i), (int)((*it).action));
-		c->writeEntry(TQString("Interval_%1").tqarg(i), (*it).interval);
+		c->writeEntry(TQString("Interval_%1").arg(i), (*it).interval);
 		++i;
 	}
 }
@@ -288,9 +288,9 @@ void IRPrefs::readConfig()
 	for (int i = 1; i <= count; ++i)
 	{
 		Command cmd;
-		cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").tqarg(i)));
+		cmd.action = (Action)(c->readNumEntry(TQString("Action_%1").arg(i)));
-		cmd.interval = c->readNumEntry(TQString("Interval_%1").tqarg(i));
+		cmd.interval = c->readNumEntry(TQString("Interval_%1").arg(i));
-		s_commands.insert(c->readPathEntry(TQString("Command_%1").tqarg(i)), cmd);
+		s_commands.insert(c->readPathEntry(TQString("Command_%1").arg(i)), cmd);
 	}
 	s_configRead = true;
 }

noatun/modules/kaiman/SKIN-SPECS

@@ -56,7 +56,7 @@ options in the event that options are added to the skin spec in the future.
 
 PROPER TRANSPARENCY:
 The main background image uses a threshold of 1 (out of 256 levels) for the
-window tqshape, the rest is used for partially overwiting the background when
+window shape, the rest is used for partially overwiting the background when
 the Transparency option is true.
 
 Portions of items, buttons, sliders, numbers, and text that never change and
@@ -80,7 +80,7 @@ Background: filename
 
  filename
   The background image file, the window will be the same size as this image.
-  Add transparency to this image for tqshaped skins, the cutoff threshold for
+  Add transparency to this image for shaped skins, the cutoff threshold for
   transparency is 1 on images with muli-level alpha (like in png).
 
 Transparency: flag
@@ -95,7 +95,7 @@ Mask: filename
 (this is DEPRECATED!, for transparent skins just add transparency to the
  Background image, Mask remains merely for backwards compatibility)
  filename
-  The mask image file, only needed for skins which are tqshaped windows (not
+  The mask image file, only needed for skins which are shaped windows (not
   rectangular). Contains a transparency mask for the main window.
 
 ==========================

noatun/modules/kaiman/skins/circle/README

@@ -3,8 +3,8 @@ Author: Johne Ellis <gqview@geocities.ocm>
 Released: November 25, 1998
 Version: 1.0
 URL: http://www.geocities.com/SiliconValley/Haven/5235
-Comments: Skin with a doughnut tqshape to test tqshaped windows.
+Comments: Skin with a doughnut shape to test shaped windows.
-          (skins with a tqshape mask)
+          (skins with a shape mask)
 
 Note: For transparency to work, GQmpeg 0.4.2 is required.
       Previous versions will work, but will be _ugly_.

noatun/modules/kaiman/skins/circle/skindata

@@ -6,15 +6,15 @@
 #Released: November 25, 1998
 #Author: John Ellis <gqview@geocities.com>
 #URL: http://www.geocities.com/SiliconValley/Haven/5235/
-#Comments: Skin with a doughnut tqshape to test tqshaped windows.
+#Comments: Skin with a doughnut shape to test shaped windows.
-#          (skins with a tqshape mask)
+#          (skins with a shape mask)
 
 #run 'gqmpeg -skinhelp' for help with coordinates.
 #simply comment out items you do not want to display
 #only Background is required.
 Background: back.png
 
-#Mask is an image with transparency used to define a tqshaped window
+#Mask is an image with transparency used to define a shaped window
 Mask: back_mask.png
 
 #Title: filename length x y

noatun/modules/kaiman/skins/circle/skindata_alt

@@ -6,15 +6,15 @@
 #Released: November 25, 1998
 #Author: John Ellis <gqview@geocities.com>
 #URL: http://www.geocities.com/SiliconValley/Haven/5235/
-#Comments: Skin with a doughnut tqshape to test tqshaped windows.
+#Comments: Skin with a doughnut shape to test shaped windows.
-#          (skins with a tqshape mask)
+#          (skins with a shape mask)
 
 #run 'gqmpeg -skinhelp' for help with coordinates.
 #simply comment out items you do not want to display
 #only Background is required.
 Background: back_sm.png
 
-#Mask is an image with transparency used to define a tqshaped window
+#Mask is an image with transparency used to define a shaped window
 Mask: back_sm_mask.png
 
 #Title: filename length x y

noatun/modules/kaiman/style.cpp

@@ -160,7 +160,7 @@ void KaimanStyleElement::setPixmap( int num )
         if ( num<0 ) num = 0;
 
         _currentPixmap = num;
-        tqrepaint( FALSE );
+        repaint( FALSE );
     }
 }
 
@@ -321,7 +321,7 @@ void KaimanStyleButton::updateButtonState() {
     }
 
     setPixmap( *I_pmIndex[i_i_currentState] );
-    tqrepaint();
+    repaint();
 }
 
 
@@ -349,7 +349,7 @@ void KaimanStyleSlider::setValue( int value )
     if (value>_max) value=_max;
     if (value<_min) value=_min;
     _value = value;
-    tqrepaint();
+    repaint();
 }
 
 
@@ -359,7 +359,7 @@ void KaimanStyleSlider::setValue( int value, int min, int max )
         _min = min;
         _max = max;
         setValue( value );
-        tqrepaint();
+        repaint();
     }
 }
 
@@ -413,7 +413,7 @@ void KaimanStyleSlider::mouseReleaseEvent(TQMouseEvent *qme)
     {
         _down = false;
         releaseMouse();
-        tqrepaint();
+        repaint();
 
         setValue( pos2value(qme->x(), qme->y()) );
         emit newValue( value() );
@@ -465,7 +465,7 @@ void KaimanStyleSlider::enterEvent ( TQEvent * e )
     if ( !_lit && optionPrelight )
     {
         _lit = true;
-        tqrepaint();
+        repaint();
     }
 
     KaimanStyleMasked::enterEvent( e );
@@ -476,7 +476,7 @@ void KaimanStyleSlider::leaveEvent ( TQEvent * e )
     if ( _lit )
     {
         _lit = false;
-        tqrepaint();
+        repaint();
     }
 
     KaimanStyleMasked::leaveEvent( e );
@@ -522,7 +522,7 @@ void KaimanStyleBackground::mouseMoveEvent(TQMouseEvent *qme)
 
 void KaimanStyleBackground::mousePressEvent(TQMouseEvent *qme)
 {
-    // On the background we move the tqshaped toplevel around
+    // On the background we move the shaped toplevel around
     if (!i_b_move) {
         i_point_dragStart = qme->pos();
         i_point_lastPos = qme->globalPos();
@@ -599,7 +599,7 @@ void KaimanStyleNumber::setValue( int value )
     if ( _value!=value )
     {
         _value = value;
-        tqrepaint();
+        repaint();
     }
 }
 
@@ -667,7 +667,7 @@ void KaimanStyleText::setValue( TQString value )
         _pos = 0;
         _direction = 1;
         _value = value;
-        tqrepaint();
+        repaint();
     }
 }
 
@@ -698,7 +698,7 @@ void KaimanStyleText::timeout()
         // check new position
         if ( _pos+_direction>=0 && (int)_value.length()-(_pos+_direction)>=digits ) {
             _pos += _direction;
-            tqrepaint();
+            repaint();
         }
 
         _timer->start( _delay, TRUE );
@@ -1456,7 +1456,7 @@ bool KaimanStyle::loadPixmaps()
 
     if ( (l_pixmap_Background != 0) && (l_pixmap_Mask != 0) ) {
 
-        // OK, background and mask are defined. So now I can calculate the tqshape
+        // OK, background and mask are defined. So now I can calculate the shape
         int l_i_width_Mask  = l_pixmap_Mask->width();
         int l_i_height_Mask = l_pixmap_Mask->height();
 

noatun/modules/kaiman/style.h

@@ -346,7 +346,7 @@ private:
     TQString     i_s_styleBase;
 
 
-    // The mask of the complete style. Used for doing tqshaped windows
+    // The mask of the complete style. Used for doing shaped windows
     TQBitmap     i_bitmap_Mask;
 
     /// All style elements are stored here.

noatun/modules/kaiman/userinterface.cpp

@@ -88,10 +88,10 @@ Kaiman::Kaiman()
 
 	if ( !changeStyle(skinName, "skindata") )
 	{
-		KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").tqarg(skinName) );
+		KMessageBox::sorry( this, i18n("Cannot load skin %1. Switching to default skin.").arg(skinName) );
 		if ( !changeStyle( DEFAULT_SKIN, "skindata" ) )
 		{
-			KMessageBox::error( this, i18n("Cannot load default skin %1.").tqarg(DEFAULT_SKIN) );
+			KMessageBox::error( this, i18n("Cannot load default skin %1.").arg(DEFAULT_SKIN) );
 			TQTimer::singleShot( 0, this, TQT_SLOT(close()) );
 			return;
 		}
@@ -159,7 +159,7 @@ bool Kaiman::loadStyle( const TQString &style, const TQString &desc )
 
 	if ( _style->Mask() != 0 )
 	{
-		// Set the tqshaped window form
+		// Set the shaped window form
 		XShapeCombineMask( qt_xdisplay(), winId(), ShapeBounding, 0,0,
 		                   _style->Mask()->handle(), ShapeSet );
 	}
@@ -520,7 +520,7 @@ void Kaiman::newSong()
 			if ( title.isEmpty() )
 				title = napp->player()->current().file();
 
-			title = i18n("TITLE (LENGTH)", "%1 (%2)").tqarg(title,
+			title = i18n("TITLE (LENGTH)", "%1 (%2)").arg(title,
 				napp->player()->current().lengthString());
 		}
 		titleItem->setValue( title );

noatun/modules/kjofol-skin/kjbutton.cpp

@@ -165,9 +165,9 @@ void KJButton::showPressed(bool b)
 {
 	mShowPressed = b;
 	if ( mShowPressed )
-		tqrepaint(true); // tqrepaint with selected image
+		repaint(true); // repaint with selected image
 	else
-		tqrepaint(false); // tqrepaint with default image (player-background)
+		repaint(false); // repaint with default image (player-background)
 }
 
 void KJButton::slotPlaylistShown(void)
@@ -193,8 +193,8 @@ void KJButton::slotEqEnabled(bool on)
 
 void KJButton::mouseRelease(const TQPoint &, bool in)
 {
-	// tqrepaint with default image (player-background)
+	// repaint with default image (player-background)
-	tqrepaint(false);
+	repaint(false);
 
 	if (!in) // only do something if users is still inside the button
 		return;

noatun/modules/kjofol-skin/kjequalizer.cpp

@@ -110,7 +110,7 @@ void KJEqualizer::slotUpdateBuffer()
 	} // for()
 	// whole thingy has been drawn, now set the mask
 	mView->setMask( regionMask );
-	tqrepaint();
+	repaint();
 }
 
 void KJEqualizer::mouseMove(const TQPoint &p, bool in)

noatun/modules/kjofol-skin/kjequalizer.h

@@ -32,7 +32,7 @@ private:
 	int mBandWidth;
 	int mBandHalfHeight;
 	TQPixmap mBars; // holds all slider images
-	TQPixmap *mBack; // holds background of EQ for easy tqrepaint
+	TQPixmap *mBack; // holds background of EQ for easy repaint
 	TQPixmap *mView; // holds prepared img of all sliders
 	VInterpolation *mInterpEq;
 };

noatun/modules/kjofol-skin/kjloader.cpp

@@ -142,7 +142,7 @@ KJLoader::KJLoader()
 	else
 	{
 		KNotifyClient::event(winId(), "warning",
-			i18n("There was trouble loading skin %1. Please select another skin file.").tqarg(skin));
+			i18n("There was trouble loading skin %1. Please select another skin file.").arg(skin));
 		napp->preferences();
 	}
 
@@ -392,7 +392,7 @@ void KJLoader::loadSkin(const TQString &file)
 	show();
 	conserveMemory();
 
-	tqrepaint();
+	repaint();
 
 	// update displays if we are already playing
 	// This happens while changing skins

noatun/modules/kjofol-skin/kjseeker.cpp

@@ -156,7 +156,7 @@ void KJSeeker::mouseRelease(const TQPoint &pos, bool in)
 		return;
 
 	g = grayRgb(color);
-	tqrepaint();
+	repaint();
 
 //	kdDebug(66666) << "length : " << napp->player()->getLength() << endl;
 //	kdDebug(66666) << "skip to: " << ((long long)g*(long long)napp->player()->getLength())/255 << endl;

noatun/modules/kjofol-skin/kjskinselectorwidget.ui

@@ -135,7 +135,7 @@
                     <property name="scaledContents">
                         <bool>false</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">

noatun/modules/kjofol-skin/kjsliders.cpp

@@ -86,14 +86,14 @@ void KJVolumeBar::paint(TQPainter *p, const TQRect &)
 		TQt::CopyROP);
 
 	if (mText)
-		mText->tqrepaint();
+		mText->repaint();
 }
 
 bool KJVolumeBar::mousePress(const TQPoint &pos)
 {
 	mVolume = (pos.x()*100) / rect().width();
 //	kdDebug(66666) << "volume: " << mVolume << endl;
-	tqrepaint();
+	repaint();
 	napp->player()->setVolume(mVolume);
 	return true;
 }
@@ -112,7 +112,7 @@ void KJVolumeBar::mouseMove(const TQPoint &pos, bool in)
 void KJVolumeBar::timeUpdate(int)
 {
 	mVolume = napp->player()->volume();
-	tqrepaint();
+	repaint();
 }
 
 
@@ -148,7 +148,7 @@ void KJVolumeBMP::paint(TQPainter *p, const TQRect &)
 	TQRect from(mVolume*mCount/100*mWidth, 0, mWidth, mImages.height());
 	bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP);
 	if (mText)
-		mText->tqrepaint();
+		mText->repaint();
 }
 
 bool KJVolumeBMP::mousePress(const TQPoint &pos)
@@ -162,7 +162,7 @@ bool KJVolumeBMP::mousePress(const TQPoint &pos)
 //	kdDebug(66666) << "gray  : " << grayRgb(color) << endl;
 //	kdDebug(66666) << "volume: " << mVolume << endl;
 
-	tqrepaint();
+	repaint();
 
 	napp->player()->setVolume(mVolume);
 
@@ -187,7 +187,7 @@ void KJVolumeBMP::timeUpdate(int)
 
 	mOldVolume = mVolume;
 
-	tqrepaint();
+	repaint();
 }
 
 
@@ -236,7 +236,7 @@ KJPitchBMP::KJPitchBMP(const TQStringList &i, KJLoader *p)
 	readConfig();
 
 	if (mText)
-		mText->tqrepaint();
+		mText->repaint();
 }
 
 TQString KJPitchBMP::tip()
@@ -253,7 +253,7 @@ void KJPitchBMP::paint(TQPainter *p, const TQRect &)
 	bitBlt(p->device(), rect().topLeft(), &mImages, from, TQt::CopyROP);
 
 	if (mText)
-		mText->tqrepaint();
+		mText->repaint();
 }
 
 bool KJPitchBMP::mousePress(const TQPoint &pos)
@@ -266,7 +266,7 @@ bool KJPitchBMP::mousePress(const TQPoint &pos)
 	mCurrentPitch = mMinPitch + ( (grayRgb(color)*(mMaxPitch-mMinPitch)) / 255 );
 //	kdDebug(66666) << "[KJPitchBMP] mousePress()  mCurrentPitch: " << mCurrentPitch << endl;
 
-	tqrepaint();
+	repaint();
 
 	newFile(); // wrong naming, in fact it just sets pitch
 
@@ -300,7 +300,7 @@ void KJPitchBMP::timeUpdate(int)
 
 	mOldPitch = mCurrentPitch;
 
-	tqrepaint();
+	repaint();
 }
 
 void KJPitchBMP::newFile()

noatun/modules/kjofol-skin/kjtextdisplay.cpp

@@ -108,7 +108,7 @@ void KJFilename::timerEvent(TQTimerEvent *)
 	// apply the newly created mask
 	mView.setMask(newMask);
 
-	tqrepaint();
+	repaint();
 }
 
 bool KJFilename::mousePress(const TQPoint &)
@@ -142,7 +142,7 @@ void KJFilename::readConfig()
 		mDistance = 1;
 	mTimerUpdates = KJLoader::kjofol->prefs()->titleMovingUpdates();
 	textFont().recalcSysFont();
-	mLastTitle=""; // tqinvalidate title so it gets repainted on next timeUpdate()
+	mLastTitle=""; // invalidate title so it gets repainted on next timeUpdate()
 }
 
 void KJFilename::prepareString(const TQCString &str)
@@ -255,7 +255,7 @@ void KJTime::readConfig()
 //	kdDebug(66666) << "KJTime::readConfig()" << endl;
 	countDown = napp->displayRemaining();
 	timeFont().recalcSysFont();
-	mLastTime=""; // tqinvalidate time so it gets repainted on next timeUpdate()
+	mLastTime=""; // invalidate time so it gets repainted on next timeUpdate()
 }
 
 TQString KJTime::lengthString ( void )
@@ -325,7 +325,7 @@ void KJTime::prepareString(const TQCString &str)
 	mLastTime = str;
 	mTime = timeFont().draw(str, rect().width());
 
-	tqrepaint();
+	repaint();
 //	kdDebug(66666) << "END KJTime::prepareString(const TQCString &str)" << endl;
 }
 
@@ -398,7 +398,7 @@ bool KJVolumeText::mousePress(const TQPoint &)
 void KJVolumeText::readConfig()
 {
 	volumeFont().recalcSysFont();
-	mLastVolume=""; // tqinvalidate value so it gets repainted on next timeUpdate()
+	mLastVolume=""; // invalidate value so it gets repainted on next timeUpdate()
 }
 
 void KJVolumeText::timeUpdate(int)
@@ -421,7 +421,7 @@ void KJVolumeText::prepareString(const TQCString &str)
 	mLastVolume = str;
 	mVolume = volumeFont().draw(str, rect().width());
 
-	tqrepaint();
+	repaint();
 }
 
 TQString KJVolumeText::tip()
@@ -501,7 +501,7 @@ void KJPitchText::mouseRelease(const TQPoint &, bool in)
 void KJPitchText::readConfig()
 {
 	pitchFont().recalcSysFont();
-	mLastPitch=""; // tqinvalidate value so it gets repainted on next timeUpdate()
+	mLastPitch=""; // invalidate value so it gets repainted on next timeUpdate()
 }
 
 void KJPitchText::timeUpdate(int)
@@ -529,7 +529,7 @@ void KJPitchText::prepareString(const TQCString &str)
 	mLastPitch = str;
 	mSpeed = pitchFont().draw(str, rect().width());
 
-	tqrepaint();
+	repaint();
 }
 
 TQString KJPitchText::tip()
@@ -600,7 +600,7 @@ bool KJFileInfo::mousePress(const TQPoint &)
 void KJFileInfo::readConfig()
 {
 	textFont().recalcSysFont();
-	mLastTime=""; // tqinvalidate value so it gets repainted on next timeUpdate()
+	mLastTime=""; // invalidate value so it gets repainted on next timeUpdate()
 }
 
 void KJFileInfo::timeUpdate(int)
@@ -634,7 +634,7 @@ void KJFileInfo::prepareString(const TQCString &str)
 		return;
 	mLastTime = str;
 	mTime = textFont().draw(str, rect().width());
-	tqrepaint();
+	repaint();
 }
 
 TQString KJFileInfo::tip()

noatun/modules/kjofol-skin/kjvis.cpp

@@ -79,7 +79,7 @@ KJNullScope::KJNullScope(const TQStringList &l, KJLoader *parent)
 	mBack = new KPixmap ( TQSize(xs,ys) );
 	bitBlt( mBack, 0, 0, &tmp, x, y, xs, ys, TQt::CopyROP );
 	setRect ( x, y, xs, ys );
-	tqrepaint();
+	repaint();
 }
 
 void KJNullScope::paint(TQPainter *p, const TQRect &)
@@ -98,7 +98,7 @@ void KJNullScope::mouseRelease(const TQPoint &, bool in)
 	if (!in) // only do something if users is still inside the button
 		return;
 
-	parent()->tqrepaint(rect(), false);
+	parent()->repaint(rect(), false);
 	swapScope(FFT);
 }
 
@@ -108,7 +108,7 @@ void KJNullScope::readConfig()
 	Visuals v = (Visuals) KJLoader::kjofol->prefs()->visType();
 	if ( v != Null )
 	{
-		parent()->tqrepaint(rect(), false);
+		parent()->repaint(rect(), false);
 		swapScope ( v );
 	}
 }
@@ -163,7 +163,7 @@ void KJFFT::scopeEvent(float *d, int size)
 	if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
 	{
 		if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
-			parent()->tqrepaint(rect(), false);
+			parent()->repaint(rect(), false);
 		return;
 	}
 
@@ -203,7 +203,7 @@ void KJFFT::scopeEvent(float *d, int size)
 	mGradient->setMask(mGradientMask);
 	bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP );
 
-	tqrepaint();
+	repaint();
 }
 
 void KJFFT::paint(TQPainter *p, const TQRect &)
@@ -225,7 +225,7 @@ void KJFFT::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	parent()->tqrepaint(rect(), false);
+	parent()->repaint(rect(), false);
 	swapScope(Mono);
 }
 
@@ -236,7 +236,7 @@ void KJFFT::readConfig()
 	if ( v != FFT )
 	{
 		stop();
-		parent()->tqrepaint(rect(), false);
+		parent()->repaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -297,7 +297,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	if ( !napp->player()->isPlaying() ) // don't draw if we aren't playing (either paused or stopped)
 	{
 		if ( napp->player()->isStopped() ) // clear vis-window if playing has been stopped
-			parent()->tqrepaint(rect(), false);
+			parent()->repaint(rect(), false);
 		return;
 	}
 
@@ -356,7 +356,7 @@ void KJStereoFFT::scopeEvent(float *left, float *right, int len)
 	mGradient->setMask(mGradientMask);
 	bitBlt ( mAnalyzer, 0, 0, mGradient, 0, 0, -1, -1, TQt::CopyROP );
 
-	tqrepaint();
+	repaint();
 }
 
 void KJStereoFFT::paint(TQPainter *p, const TQRect &)
@@ -376,7 +376,7 @@ void KJStereoFFT::mouseRelease(const TQPoint &, bool in)
 	if (!in) // only do something if users is still inside the button
 		return;
 	stop();
-	parent()->tqrepaint(rect(), false);
+	parent()->repaint(rect(), false);
 	swapScope(Null);
 }
 
@@ -387,7 +387,7 @@ void KJStereoFFT::readConfig()
 	if ( v != StereoFFT )
 	{
 		stop();
-		parent()->tqrepaint(rect(), false);
+		parent()->repaint(rect(), false);
 		swapScope ( v );
 		return;
 	}
@@ -448,7 +448,7 @@ void KJScope::scopeEvent(float *d, int size)
 		if ( napp->player()->isStopped() )
 		{
 			bitBlt ( mOsci, 0, 0, mBack, 0, 0, -1, -1, TQt::CopyROP );
-			tqrepaint();
+			repaint();
 		}
 		return;
 	}
@@ -497,7 +497,7 @@ void KJScope::scopeEvent(float *d, int size)
 		x++;
 	}
 
-	tqrepaint();
+	repaint();
 }
 
 void KJScope::paint(TQPainter *p, const TQRect &)
@@ -517,7 +517,7 @@ void KJScope::mouseRelease(const TQPoint &, bool in)
 		return;
 
 	stop();
-	parent()->tqrepaint(rect(), false);
+	parent()->repaint(rect(), false);
 	swapScope(/*Null*/ StereoFFT);
 }
 
@@ -528,7 +528,7 @@ void KJScope::readConfig()
 	if ( v != Mono )
 	{
 		stop();
-		parent()->tqrepaint(rect(), false);
+		parent()->repaint(rect(), false);
 		swapScope ( v );
 		return;
 	}

noatun/modules/kjofol-skin/kjwidget.cpp

@@ -34,13 +34,13 @@ TQBitmap KJWidget::getMask(const TQImage &_rect, register TQRgb transparent)
 	return bm;
 }
 
-void KJWidget::tqrepaint(bool me, const TQRect &r, bool clear)
+void KJWidget::repaint(bool me, const TQRect &r, bool clear)
 {
 	TQPainter p(parent());
 	if (me)
 		paint(&p, r.isValid() ? r : rect());
 	else
-		parent()->tqrepaint(r.isValid() ? r : rect(), clear);
+		parent()->repaint(r.isValid() ? r : rect(), clear);
 }
 
 const TQString &KJWidget::backgroundPressed(const TQString &bmp) const

noatun/modules/kjofol-skin/kjwidget.h

@@ -25,8 +25,8 @@ public:
 	virtual void readConfig() {}
 
 	// called when the mouse is moved while clicked in this widget
-	// tqrepaint myself
+	// repaint myself
-	virtual void tqrepaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false);
+	virtual void repaint(bool me=true, const TQRect &rect=TQRect(), bool clear=false);
 
 	virtual TQString tip() { return 0; }
 

noatun/modules/monoscope/monoscope.cpp

@@ -27,7 +27,7 @@ Monoscope::Monoscope() : TQWidget(0,0,WRepaintNoErase), MonoScope(30), Plugin()
 	setCaption(i18n("Monoscope"));
 	show();
 	resizeEvent(0);
-	tqrepaint(0,0, TQWidget::width(), height(), false);
+	repaint(0,0, TQWidget::width(), height(), false);
 	resizeEvent(0);
 	setBackgroundColor(mLowColor);
 }
@@ -83,7 +83,7 @@ void Monoscope::scopeEvent(float *d, int size)
 	buffer.fill(mLowColor);
 	TQPainter p(&buffer);
 	p.setPen(mHighColor);
-	tqrepaint(rect());
+	repaint(rect());
 
 	if (line)
 		p.moveTo(0, y);

noatun/modules/noatunui/userinterface.cpp

@@ -199,7 +199,7 @@ void MilkChocolate::changeCaption(const TQString& text)
 void MilkChocolate::popup()
 {
 	NoatunStdAction::ContextMenu::showContextMenu(
-			mapToGlobal(mPopup->tqgeometry().bottomLeft())
+			mapToGlobal(mPopup->geometry().bottomLeft())
 		);
 }
 

noatun/modules/simple/propertiesdialog.ui

@@ -82,7 +82,7 @@
                         <property name="name">
                             <cstring>iconLabel</cstring>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>AlignVCenter|AlignLeft</set>
                         </property>
                     </widget>

noatun/modules/simple/propertiesdialog.ui.h

@@ -46,7 +46,7 @@ void PropertiesDialog::setPlayObject( PlaylistItem pi, Arts::PlayObject po )
     // PlaylistItem properties (name and mimetype)
     if (!pi.isNull())
     {
-	setCaption( i18n("Properties for %1").tqarg(pi.url().fileName()) );
+	setCaption( i18n("Properties for %1").arg(pi.url().fileName()) );
 
 	KSharedPtr<KMimeType> mime = KMimeType::mimeType( pi.mimetype() );
 	iconLabel->setPixmap( mime->pixmap( KIcon::Desktop, KIcon::SizeMedium ) );

noatun/modules/splitplaylist/playlist.cpp

@@ -220,11 +220,11 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC)
 		TQRect rect(view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data())));
 		rect.setWidth(view->listView()->viewport()->width());
 		currentItem=i;
-		view->listView()->viewport()->tqrepaint(rect,true);
+		view->listView()->viewport()->repaint(rect,true);
 
 		view->listView()->ensureItemVisible(static_cast<SafeListViewItem*>(current().data()));
 		TQRect currentRect= view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data()));
-		view->listView()->viewport()->tqrepaint(currentRect);
+		view->listView()->viewport()->repaint(currentRect);
 
 		now=static_cast<SafeListViewItem*>(current().data());
 		if(now)

noatun/modules/splitplaylist/view.cpp

@@ -467,7 +467,7 @@ bool View::saveToURL(const KURL &url)
 	}
 	else
 	{
-		KMessageBox::error( this, i18n("Could not write to %1.").tqarg(url.prettyURL()) );
+		KMessageBox::error( this, i18n("Could not write to %1.").arg(url.prettyURL()) );
 		return false;
 	}
 }

noatun/modules/systray/systray.cpp

@@ -213,21 +213,21 @@ void NoatunSystray::slotPlayPause()
 	if(!item.isProperty("title"))
 	{
 		// No metadata
-		s = TQString("<nobr>%1</nobr>").tqarg(item.title());
+		s = TQString("<nobr>%1</nobr>").arg(item.title());
 	}
 	else
 	{
-		s = TQString("<h2><nobr>%1</nobr></h2>").tqarg(item.property("title"));
+		s = TQString("<h2><nobr>%1</nobr></h2>").arg(item.property("title"));
 
 		if(item.isProperty("author"))
-			s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("author"));
+			s += TQString("<nobr>%1</nobr><br>").arg(item.property("author"));
 
 		if(item.isProperty("album"))
 		{
 			if(item.isProperty("date"))
-				s += TQString("<nobr>%1 (%2)</nobr><br>").tqarg(item.property("album")).tqarg(item.property("date"));
+				s += TQString("<nobr>%1 (%2)</nobr><br>").arg(item.property("album")).arg(item.property("date"));
 			else
-				s += TQString("<nobr>%1</nobr><br>").tqarg(item.property("album"));
+				s += TQString("<nobr>%1</nobr><br>").arg(item.property("album"));
 		}
 	}
 
@@ -242,11 +242,11 @@ void NoatunSystray::slotPlayPause()
 		setTipText(TQString("<qt><br><table cellspacing=0 cellpadding=0><tr>" \
 			"<td align=center valign=center><h4><nobr>%1</nobr></h4>%2</td>" \
 			"<td valign=center><img src='%3'></td>" \
-			"</qt></tr></table>").tqarg(status).tqarg(s).tqarg(tmpCoverPath));
+			"</qt></tr></table>").arg(status).arg(s).arg(tmpCoverPath));
 	}
 	else
 	{
-		setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").tqarg(status).tqarg(s));
+		setTipText(TQString("<qt><center><h4><nobr>%1</nobr></h4>%2</center></qt>").arg(status).arg(s));
 	}
 }
 
@@ -256,7 +256,7 @@ void NoatunSystray::slotStopped()
 	if(!napp->player()->current())
 		return;
 	changeTray("player_stop");
-	setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").tqarg(i18n("Noatun - Stopped")));
+	setTipText(TQString("<qt><nobr><h4>%1</h4></nobr></qt>").arg(i18n("Noatun - Stopped")));
 }
 
 

noatun/modules/voiceprint/voiceprint.cpp

@@ -113,12 +113,12 @@ void VoicePrint::scopeEvent(float *data, int bands)
 	// redraw changes with the minimum amount of work
 	if(newOffset != 0)
 	{
-		tqrepaint(mOffset,0,mSegmentWidth*2,height(),false);
+		repaint(mOffset,0,mSegmentWidth*2,height(),false);
 	}
 	else
 	{
-		tqrepaint(mOffset,0,mSegmentWidth,height(),false);
+		repaint(mOffset,0,mSegmentWidth,height(),false);
-		tqrepaint(newOffset,0,mSegmentWidth,height(),false);
+		repaint(newOffset,0,mSegmentWidth,height(),false);
 	}
 	mOffset = newOffset;
 }

noatun/modules/winskin/waInfo.cpp

@@ -55,7 +55,7 @@ void WaInfo::timeEvent()
         }
 
         if (isVisible())
-            tqrepaint(false);
+            repaint(false);
     }
 }
 

noatun/modules/winskin/waSkin.cpp

@@ -558,9 +558,9 @@ void WaSkin::balanceSetValue(int val)
         waInfo->setText(i18n("Balance: Center"));
     }
     else if (val < 0) {
-        waInfo->setText(i18n("Balance: %1% Left").tqarg(-val));
+        waInfo->setText(i18n("Balance: %1% Left").arg(-val));
     } else {
-        waInfo->setText(i18n("Balance: %1% Right").tqarg(val));
+        waInfo->setText(i18n("Balance: %1% Right").arg(val));
    }
 }
 
@@ -672,7 +672,7 @@ void WaSkin::volumeSliderReleased()
 void WaSkin::volumeSetValue(int val)
 {
     if (mVolumePressed)
-        waInfo->setText(i18n("Volume: %1%").tqarg(val));
+        waInfo->setText(i18n("Volume: %1%").arg(val));
 
     napp->player()->setVolume(val);
 }

noatun/modules/winskin/winSkinConfig.cpp

@@ -163,7 +163,7 @@ void WinSkinConfig::remove()
 
     // Ask the user first
     if( KMessageBox::warningContinueCancel( this,
-        i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").tqarg( skin_list->currentText() ), TQString(), KStdGuiItem::del() )
+        i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( skin_list->currentText() ), TQString(), KStdGuiItem::del() )
         == KMessageBox::Continue ) {
 
         mWaSkinManager->removeSkin( skin_list->currentText() );