Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

30 files changed, 202 insertions, 202 deletions

diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c
index 43ef6d5b0..f0981afe8 100644
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
@@ -580,7 +580,7 @@ static const char def_setup[] =
 "#! /bin/sh\n"
 "# Xsetup - run as root before the login dialog appears\n"
 "\n"
-"#xconsole -tqgeometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &\n";
+"#xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &\n";
 
 static const char def_startup[] =
 "#! /bin/sh\n"
@@ -591,7 +591,7 @@ static const char def_startup[] =
 "if [ -e /etc/nologin ]; then\n"
 "  # always display the nologin message, if possible\n"
 "  if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
-"    xmessage -file /etc/nologin -tqgeometry 640x480\n"
+"    xmessage -file /etc/nologin -geometry 640x480\n"
 "  fi\n"
 "  if [ \"$(id -u)\" != \"0\" ] && \\\n"
 "     ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n"
@@ -940,7 +940,7 @@ mem_mem( char *mem, int lmem, const char *smem, int lsmem )
 	return 0;
 }
 
-static int maxTTY, TTYtqmask;
+static int maxTTY, TTYmask;
 
 static void
 getInitTab( void )
@@ -953,7 +953,7 @@ getInitTab( void )
 		return;
 	if (!maxTTY) {
 		maxTTY = 6;
-		TTYtqmask = 0x3f;
+		TTYmask = 0x3f;
 	}
 }
 #endif
@@ -1111,7 +1111,7 @@ absorb_xservers( const char *sect ATTR_UNUSED, char **value )
 	char *sdpys, *rdpys;
 	StrList **argp, **arglp, *ap, *ap2;
 	File file;
-	int nldpys = 0, nrdpys = 0, dpytqmask = 0;
+	int nldpys = 0, nrdpys = 0, dpymask = 0;
 	int cpcmd, cpcmdl;
 #ifdef HAVE_VTS
 	int dn, cpvt, mtty;
@@ -1193,7 +1193,7 @@ absorb_xservers( const char *sect ATTR_UNUSED, char **value )
 		*argp = *arglp = 0;
 		if ((se->type & dLocation) == dLocal) {
 			nldpys++;
-			dpytqmask |= 1 << atoi( se->name + 1 );
+			dpymask |= 1 << atoi( se->name + 1 );
 			if (se->reserve)
 				nrdpys++;
 		}
@@ -1266,8 +1266,8 @@ absorb_xservers( const char *sect ATTR_UNUSED, char **value )
 	/* add reserve dpys */
 	if (nldpys < 4 && nldpys && !nrdpys)
 		for (; nldpys < 4; nldpys++) {
-			for (dn = 0; dpytqmask & (1 << dn); dn++);
-			dpytqmask |= (1 << dn);
+			for (dn = 0; dpymask & (1 << dn); dn++);
+			dpymask |= (1 << dn);
 			StrCat( &rdpys, ",:%d", dn );
 		}
 #endif
@@ -1302,7 +1302,7 @@ upd_consolettys( Entry *ce, Section *cs ATTR_UNUSED )
 
 		getInitTab();
 		for (i = 0, buf = 0; i < 16; i++)
-			if (TTYtqmask & (1 << i))
+			if (TTYmask & (1 << i))
 				StrCat( &buf, ",tty%d", i + 1 );
 		if (buf) {
 			ce->value = buf + 1;
diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp
index fb1954d95..df602efea 100644
--- a/kdm/kfrontend/kchooser.cpp
+++ b/kdm/kfrontend/kchooser.cpp
@@ -59,13 +59,13 @@ ChooserDlg::ChooserDlg()
 	TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 );
 
 	TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this );
-	title->tqsetAlignment( AlignCenter );
+	title->setAlignment( AlignCenter );
 	vbox->addWidget( title );
 
 	host_view = new TQListView( this, "hosts" );
 	host_view->addColumn( i18n("Hostname") );
 	host_view->setColumnWidth( 0, fontMetrics().width( "login.crap.net" ) );
-	host_view->addColumn( i18n("tqStatus") );
+	host_view->addColumn( i18n("Status") );
 	host_view->setMinimumWidth( fontMetrics().width( "login.crap.com Display not authorized to connect this server" ) );
 	host_view->setResizeMode( TQListView::LastColumn );
 	host_view->setAllColumnsShowFocus( true );
@@ -145,14 +145,14 @@ void ChooserDlg::pingHosts()
 
 void ChooserDlg::accept()
 {
-	if (tqfocusWidget() == iline) {
+	if (focusWidget() == iline) {
 		if (!iline->text().isEmpty()) {
 			GSendInt( G_Ch_DirectChoice );
 			GSendStr( iline->text().latin1() );
 			iline->clear();
 		}
 		return;
-	} else /*if (tqfocusWidget() == host_view)*/ {
+	} else /*if (focusWidget() == host_view)*/ {
 		TQListViewItem *item = host_view->currentItem();
 		if (item) {
 			GSendInt( G_Ready );
@@ -170,7 +170,7 @@ TQString ChooserDlg::recvStr()
 {
 	char *arr = GRecvStr();
 	if (arr) {
-		TQString str = TQString::tqfromLatin1( arr );
+		TQString str = TQString::fromLatin1( arr );
 		free( arr );
 		return str;
 	} else
diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c
index d9c39e35f..b03d96e15 100644
--- a/kdm/kfrontend/kdm_greet.c
+++ b/kdm/kfrontend/kdm_greet.c
@@ -4,7 +4,7 @@ KDE Greeter module for xdm
 
 Copyright (C) 2001-2003 Oswald Buddenhagen <[email protected]>
 
-This file tqcontains code from the old xdm core,
+This file contains code from the old xdm core,
 Copyright 1988, 1998  Keith Packard, MIT X Consortium/The Open Group
 
 This program is free software; you can redistribute it and/or modify
@@ -560,7 +560,7 @@ xkb_init( Display *dpy )
 }
 
 static unsigned int
-xkb_modifier_tqmask_work( XkbDescPtr xkb, const char *name )
+xkb_modifier_mask_work( XkbDescPtr xkb, const char *name )
 {
 	int i;
 
@@ -569,23 +569,23 @@ xkb_modifier_tqmask_work( XkbDescPtr xkb, const char *name )
 	for (i = 0; i < XkbNumVirtualMods; i++) {
 		char *modStr = XGetAtomName( xkb->dpy, xkb->names->vmods[i] );
 		if (modStr != NULL && strcmp( name, modStr ) == 0) {
-			unsigned int tqmask;
-			XkbVirtualModsToReal( xkb, 1 << i, &tqmask );
-			return tqmask;
+			unsigned int mask;
+			XkbVirtualModsToReal( xkb, 1 << i, &mask );
+			return mask;
 		}
 	}
 	return 0;
 }
 
 static unsigned int
-xkb_modifier_tqmask( Display *dpy, const char *name )
+xkb_modifier_mask( Display *dpy, const char *name )
 {
 	XkbDescPtr xkb;
 
 	if ((xkb = XkbGetKeyboard( dpy, XkbAllComponentsMask, XkbUseCoreKbd ))) {
-		unsigned int tqmask = xkb_modifier_tqmask_work( xkb, name );
+		unsigned int mask = xkb_modifier_mask_work( xkb, name );
 		XkbFreeKeyboard( xkb, 0, True );
-		return tqmask;
+		return mask;
 	}
 	return 0;
 }
@@ -593,23 +593,23 @@ xkb_modifier_tqmask( Display *dpy, const char *name )
 static int
 xkb_get_modifier_state( Display *dpy, const char *name )
 {
-	unsigned int tqmask;
+	unsigned int mask;
 	XkbStateRec state;
 
-	if (!(tqmask = xkb_modifier_tqmask( dpy, name )))
+	if (!(mask = xkb_modifier_mask( dpy, name )))
 		return 0;
 	XkbGetState( dpy, XkbUseCoreKbd, &state );
-	return (tqmask & state.locked_mods) != 0;
+	return (mask & state.locked_mods) != 0;
 }
 
 static int
 xkb_set_modifier( Display *dpy, const char *name, int sts )
 {
-	unsigned int tqmask;
+	unsigned int mask;
 
-	if (!(tqmask = xkb_modifier_tqmask( dpy, name )))
+	if (!(mask = xkb_modifier_mask( dpy, name )))
 		return 0;
-	XkbLockModifiers( dpy, XkbUseCoreKbd, tqmask, sts ? tqmask : 0 );
+	XkbLockModifiers( dpy, XkbUseCoreKbd, mask, sts ? mask : 0 );
 	return 1;
 }
 #endif /* HAVE_XKB */
@@ -620,7 +620,7 @@ xtest_get_modifier_state( Display *dpy, int key )
 {
 	XModifierKeymap *map;
 	KeyCode modifier_keycode;
-	unsigned int i, tqmask;
+	unsigned int i, mask;
 	Window dummy1, dummy2;
 	int dummy3, dummy4, dummy5, dummy6;
 
@@ -632,8 +632,8 @@ xtest_get_modifier_state( Display *dpy, int key )
 			XFreeModifiermap( map );
 			XQueryPointer( dpy, DefaultRootWindow( dpy ),
 			               &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6,
-			               &tqmask );
-			return (tqmask & (1 << i)) != 0;
+			               &mask );
+			return (mask & (1 << i)) != 0;
 		}
 	XFreeModifiermap( map );
 	return 0;
@@ -700,11 +700,11 @@ restore_modifiers( void )
 }
 
 void
-setCursor( Display *mdpy, int window, int tqshape )
+setCursor( Display *mdpy, int window, int shape )
 {
 	Cursor xcursor;
 
-	if ((xcursor = XCreateFontCursor( mdpy, tqshape ))) {
+	if ((xcursor = XCreateFontCursor( mdpy, shape ))) {
 		XDefineCursor( mdpy, window, xcursor );
 		XFreeCursor( mdpy, xcursor );
 		XFlush( mdpy );
diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h
index eaead7b62..df325c28d 100644
--- a/kdm/kfrontend/kdm_greet.h
+++ b/kdm/kfrontend/kdm_greet.h
@@ -4,7 +4,7 @@ KDE Greeter module for xdm
 
 Copyright (C) 2001-2003 Oswald Buddenhagen <[email protected]>
 
-This file tqcontains code from the old xdm core,
+This file contains code from the old xdm core,
 Copyright 1988, 1998  Keith Packard, MIT X Consortium/The Open Group
 
 This program is free software; you can redistribute it and/or modify
@@ -77,7 +77,7 @@ int PingServer( struct _XDisplay *dpy );
 void setup_modifiers( struct _XDisplay *mdpy, int numlock );
 void restore_modifiers( void );
 
-void setCursor( struct _XDisplay *mdpy, int window, int tqshape );
+void setCursor( struct _XDisplay *mdpy, int window, int shape );
 
 
 extern int rfd; /* for select() loops */
diff --git a/kdm/kfrontend/kdmadmindialog.cpp b/kdm/kfrontend/kdmadmindialog.cpp
index 7c9bbb7d5..637d6dd90 100644
--- a/kdm/kfrontend/kdmadmindialog.cpp
+++ b/kdm/kfrontend/kdmadmindialog.cpp
@@ -75,10 +75,10 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent )
     box->addWidget( new KSeparator( KSeparator::HLine, this ) );
 
     okButton = new KPushButton( KStdGuiItem::ok(), this );
-    okButton->tqsetSizePolicy( fp );
+    okButton->setSizePolicy( fp );
     okButton->setDefault( true );
     cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
-    cancelButton->tqsetSizePolicy( fp );
+    cancelButton->setSizePolicy( fp );
 
     hlay = new TQHBoxLayout( box );
     hlay->addStretch( 1 );
@@ -103,8 +103,8 @@ void
 KDMAdmin::slotActivatePlugMenu()
 {
     TQPopupMenu *cmnu = verify->getPlugMenu();
-    TQSize sh( cmnu->tqsizeHint() / 2 );
-    cmnu->exec( tqgeometry().center() - TQPoint( sh.width(), sh.height() ) );
+    TQSize sh( cmnu->sizeHint() / 2 );
+    cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
 }
 
 void
diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp
index 87e6a32ba..88cd53970 100644
--- a/kdm/kfrontend/kdmclock.cpp
+++ b/kdm/kfrontend/kdmclock.cpp
@@ -50,7 +50,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
 	mBorder = false;//config->readNumEntry( "border", FALSE );
 
 	//config->setGroup( "Font" );
-	mFont.setFamily( TQString::tqfromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
+	mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
 	mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ );
 	mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ );
 	mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ );
@@ -76,19 +76,19 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
 	//setBackgroundOrigin( WindowOrigin );
 	mBackgroundBrush = backgroundBrush();
 	setBackgroundMode( NoBackground );
-	tqrepaint();
+	repaint();
 }
 
 
 void KdmClock::showEvent( TQShowEvent * )
 {
-	tqrepaint();
+	repaint();
 }
 
 
 void KdmClock::timeout()
 {
-	tqrepaint();
+	repaint();
 }
 
 void KdmClock::paintEvent( TQPaintEvent * )
diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp
index 6c79a6918..15a63fa67 100644
--- a/kdm/kfrontend/kdmconfig.cpp
+++ b/kdm/kfrontend/kdmconfig.cpp
@@ -72,7 +72,7 @@ Str2Font( const TQString &aValue )
 	TQFont aRetFont;
 	TQString chStr;
 
-	TQStringList sl = TQStringList::split( TQString::tqfromLatin1(","), aValue );
+	TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue );
 
 	if (sl.count() == 1) {
 		/* X11 font spec */
@@ -160,7 +160,7 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
 			sess->vt ?
 				TQString("vt%1").arg( sess->vt ) :
 #endif
-				TQString::tqfromLatin1( *sess->from ? sess->from : sess->display );
+				TQString::fromLatin1( *sess->from ? sess->from : sess->display );
 	} else {
 		user =
 			!sess->user ?
@@ -174,6 +174,6 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
 			sess->vt ?
 				TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) :
 #endif
-				TQString::tqfromLatin1( sess->display );
+				TQString::fromLatin1( sess->display );
 	}
 }
diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp
index 1097e0074..dcd8a4cf1 100644
--- a/kdm/kfrontend/kdmshutdown.cpp
+++ b/kdm/kfrontend/kdmshutdown.cpp
@@ -115,7 +115,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
 	hlay->addStretch( 1 );
 	if (mayOk) {
 		okButton = new KPushButton( KStdGuiItem::ok(), this );
-		okButton->tqsetSizePolicy( fp );
+		okButton->setSizePolicy( fp );
 		okButton->setDefault( true );
 		hlay->addWidget( okButton );
 		hlay->addStretch( 1 );
@@ -124,13 +124,13 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
 	if (maySched) {
 		KPushButton *schedButton =
 			new KPushButton( KGuiItem( i18n("&Schedule...") ), this );
-		schedButton->tqsetSizePolicy( fp );
+		schedButton->setSizePolicy( fp );
 		hlay->addWidget( schedButton );
 		hlay->addStretch( 1 );
 		connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
 	}
 	cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
-	cancelButton->tqsetSizePolicy( fp );
+	cancelButton->setSizePolicy( fp );
 	if (!mayOk)
 		cancelButton->setDefault( true );
 	hlay->addWidget( cancelButton );
@@ -147,8 +147,8 @@ KDMShutdownBase::slotActivatePlugMenu()
 		TQPopupMenu *cmnu = verify->getPlugMenu();
 		if (!cmnu)
 			return;
-		TQSize sh( cmnu->tqsizeHint() / 2 );
-		cmnu->exec( tqgeometry().center() - TQPoint( sh.width(), sh.height() ) );
+		TQSize sh( cmnu->sizeHint() / 2 );
+		cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
 	}
 }
 
@@ -272,7 +272,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
 		freeStrArr( tlist );
 		targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
 		TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh );
-		int spc = kapp->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
+		int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
 		          + howGroup->insideSpacing();
 		hb->addSpacing( spc );
 		hb->addWidget( targets );
@@ -280,7 +280,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
 	}
 	GSet( 0 );
 
-	howGroup->tqsetSizePolicy( fp );
+	howGroup->setSizePolicy( fp );
 
 	schedGroup = new TQGroupBox( i18n("Scheduling"), this );
 	hlay->addWidget( schedGroup, 0, AlignTop );
@@ -306,7 +306,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
 	grid->addWidget( le_timeout, 2, 1 );
 	grid->addMultiCellWidget( cb_force, 3,3, 0,1 );
 
-	schedGroup->tqsetSizePolicy( fp );
+	schedGroup->setSizePolicy( fp );
 
 	le_start->setText( "0" );
 	if (_defSdMode == SHUT_SCHEDULE)
@@ -477,7 +477,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 	if(doUbuntuLogout)
 	{		
 		lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
-		lfrm->setLineWidth( style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
+		lfrm->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
 		// we need to set the minimum size for the logout box, since it
 		// gets too small if there isn't all options available
 		lfrm->setMinimumSize(300,120);
@@ -487,7 +487,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 
 		// first line of buttons
 		hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
-		hbuttonbox->tqsetAlignment( Qt::AlignHCenter );
+		hbuttonbox->setAlignment( Qt::AlignHCenter );
 
 		// Reboot
 		FlatButton* btnReboot = new FlatButton( lfrm );
@@ -531,7 +531,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 
 		// cancel buttonbox
 		TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint()  );
-		hbuttonbox2->tqsetAlignment( Qt::AlignRight );
+		hbuttonbox2->setAlignment( Qt::AlignRight );
 
 		// Back to kdm
 		KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp
index 8fd5a8097..78359e237 100644
--- a/kdm/kfrontend/kfdialog.cpp
+++ b/kdm/kfrontend/kfdialog.cpp
@@ -59,7 +59,7 @@ FDialog::resizeEvent( TQResizeEvent *e )
 void
 FDialog::adjustGeometry()
 {
-	TQDesktopWidget *dsk = tqApp->desktop();
+	TQDesktopWidget *dsk = qApp->desktop();
 
 	if (_greeterScreen < 0)
 		_greeterScreen = _greeterScreen == -2 ?
@@ -74,7 +74,7 @@ FDialog::adjustGeometry()
 		adjustSize();
 	}
 
-	if (tqparentWidget())
+	if (parentWidget())
 		return;
 
 	TQRect grt( rect() );
@@ -140,10 +140,10 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t
 	TQLabel *label2 = new TQLabel( text, this );
 	TQRect d = KGlobalSettings::desktopGeometry(this);
 	if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5) 
-		label2->tqsetAlignment(Qt::WordBreak | Qt::AlignAuto );
+		label2->setAlignment(Qt::WordBreak | Qt::AlignAuto );
 	KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );
 	button->setDefault( true );
-	button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+	button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
 	connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
 
 	TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index 2f1ba913c..50e65e916 100644
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -167,7 +167,7 @@ kg_main( const char *argv0 )
 
 	app.setFont( _normalFont );
 
-	setup_modifiers( dpy, _numLocktqStatus );
+	setup_modifiers( dpy, _numLockStatus );
 	SecureDisplay( dpy );
 	KProcess *proc = 0;
 	if (!_grabServer) {
@@ -201,7 +201,7 @@ kg_main( const char *argv0 )
 		}
 
 		if (cmd == G_ErrorGreet) {
-			if (KGVerify::handleFailVerify( tqApp->desktop()->screen( _greeterScreen ) ))
+			if (KGVerify::handleFailVerify( qApp->desktop()->screen( _greeterScreen ) ))
 				break;
 			_autoLoginDelay = 0;
 			cmd = G_Greet;
diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp
index d85157bce..f4ed918c6 100644
--- a/kdm/kfrontend/kgdialog.cpp
+++ b/kdm/kfrontend/kgdialog.cpp
@@ -134,8 +134,8 @@ void
 KGDialog::slotActivateMenu( int id )
 {
 	TQPopupMenu *cmnu = optMenu->findItem( id )->popup();
-	TQSize sh( cmnu->tqsizeHint() / 2 );
-	cmnu->exec( tqgeometry().center() - TQPoint( sh.width(), sh.height() ) );
+	TQSize sh( cmnu->sizeHint() / 2 );
+	cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
 }
 
 void
diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
index 8e144f06f..bd2e2651a 100644
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
@@ -79,7 +79,7 @@ class UserListView : public KListView {
 		: KListView( parent, name )
 		, themed(_them), cachedSizeHint( -1, 0 )
 	{
-		tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
+		setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
 		header()->hide();
 		addColumn( TQString::null );
 		setColumnAlignment( 0, AlignVCenter );
@@ -105,10 +105,10 @@ class UserListView : public KListView {
         return sum;
     }
 public:
-	virtual TQSize tqsizeHint() const
+	virtual TQSize sizeHint() const
 	{
 	  if (themed)
-            return KListView::tqsizeHint();
+            return KListView::sizeHint();
 
 		if (!cachedSizeHint.isValid()) {
 			constPolish();
@@ -119,7 +119,7 @@ public:
 					maxw = thisw;
 			}
 			cachedSizeHint.setWidth(
-				style().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) +
+				style().pixelMetric( TQStyle::PM_ScrollBarExtent ) +
 				frameWidth() * 2 + maxw );
 		}
 		return cachedSizeHint;
@@ -235,12 +235,12 @@ class UserListViewItem : public KListViewItem {
 		parent->cachedSizeHint.setWidth( -1 );
 	}
 
-        virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+        virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
     {
       if (((UserListView*)listView())->themed)
-        TQListViewItem::paintCell(p, cg, column, width, tqalignment);
+        TQListViewItem::paintCell(p, cg, column, width, alignment);
       else
-	KListViewItem::paintCell(p, cg, column, width, tqalignment);
+	KListViewItem::paintCell(p, cg, column, width, alignment);
     }
 
 	TQString login;
@@ -343,7 +343,7 @@ KGreeter::insertUser( const TQImage &default_pix,
 
 class KCStringList : public TQValueList<TQCString> {
   public:
-	bool tqcontains( const char *str ) const
+	bool contains( const char *str ) const
 	{
 		for (ConstIterator it = begin(); it != end(); ++it)
 			if (*it == str)
@@ -355,7 +355,7 @@ class KCStringList : public TQValueList<TQCString> {
 class UserList {
   public:
 	UserList( char **in );
-	bool hasUser( const char *str ) const { return users.tqcontains( str ); }
+	bool hasUser( const char *str ) const { return users.contains( str ); }
 	bool hasGroup( gid_t gid ) const
 		{ return groups.find( gid ) != groups.end(); }
 	bool hasGroups() const { return !groups.isEmpty(); }
@@ -786,14 +786,14 @@ KStdGreeter::KStdGreeter()
 		               i18n("This display requires no X authorization.\n"
 		                    "This means that anybody can connect to it,\n"
 		                    "open windows on it or intercept your input.") );
-		complainLabel->tqsetAlignment( AlignCenter );
+		complainLabel->setAlignment( AlignCenter );
 		complainLabel->setFont( _failFont );
 		complainLabel->setPaletteForegroundColor( Qt::red );
 		inner_box->addWidget( complainLabel );
 	}
 	if (!_greetString.isEmpty()) {
 		TQLabel *welcomeLabel = new TQLabel( _greetString, this );
-		welcomeLabel->tqsetAlignment( AlignCenter );
+		welcomeLabel->setAlignment( AlignCenter );
 		welcomeLabel->setFont( _greetFont );
 		inner_box->addWidget( welcomeLabel );
 	}
@@ -1092,7 +1092,7 @@ TQString KThemedGreeter::timedUser = TQString::null;
 int KThemedGreeter::timedDelay = -1;
 
 void
-KThemedGreeter::updatetqStatus( bool fail, bool caps, int timedleft )
+KThemedGreeter::updateStatus( bool fail, bool caps, int timedleft )
 {
 	if (pam_error) {
 		if (fail)
diff --git a/kdm/kfrontend/kgreeter.h b/kdm/kfrontend/kgreeter.h
index 2eb76674b..fdbd56209 100644
--- a/kdm/kfrontend/kgreeter.h
+++ b/kdm/kfrontend/kgreeter.h
@@ -149,7 +149,7 @@ class KThemedGreeter : public KGreeter {
 	void slotAskAdminPassword();
 
   protected:
-	virtual void updatetqStatus( bool fail, bool caps, int timedleft );
+	virtual void updateStatus( bool fail, bool caps, int timedleft );
 	virtual void pluginSetup();
 	virtual void keyPressEvent( TQKeyEvent * );
 	virtual bool event( TQEvent *e );
diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp
index 460336d45..98abb4fb5 100644
--- a/kdm/kfrontend/kgverify.cpp
+++ b/kdm/kfrontend/kgverify.cpp
@@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <X11/Xlib.h> // for updateLocktqStatus()
+#include <X11/Xlib.h> // for updateLockStatus()
 #include <fixx11h.h> // ... and make eventFilter() work again
 
 #define FULL_GREET_TO 40 // normal inactivity timeout
@@ -62,7 +62,7 @@ void KGVerifyHandler::verifyClear()
 {
 }
 
-void KGVerifyHandler::updatetqStatus( bool, bool, int )
+void KGVerifyHandler::updateStatus( bool, bool, int )
 {
 }
 
@@ -150,7 +150,7 @@ KGVerify::pluginName() const
 	TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() );
 	uint st = name.findRev( '/' ) + 1;
 	uint en = name.find( '.', st );
-	if (en - st > 7 && TQConstString( name.tqunicode() + st, 7 ).string() == "kgreet_")
+	if (en - st > 7 && TQConstString( name.unicode() + st, 7 ).string() == "kgreet_")
 		st += 7;
 	return name.mid( st, en - st );
 }
@@ -163,7 +163,7 @@ showWidgets( TQLayoutItem *li )
 
 	if ((w = li->widget()))
 		w->show();
-	else if ((l = li->tqlayout())) {
+	else if ((l = li->layout())) {
 		TQLayoutIterator it = l->iterator();
 		for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 			 showWidgets( itm );
@@ -233,7 +233,7 @@ KGVerify::scheduleAutoLogin( bool initial )
 			timedLeft = QMAX( _autoLoginDelay - TIMED_GREET_TO, MIN_TIMED_TO );
 			deadTicks = DEAD_TIMED_TO;
 		}
-		updatetqStatus();
+		updateStatus();
 		running = false;
 		isClear = true;
 		return true;
@@ -310,7 +310,7 @@ KGVerify::suspend()
 		greet->abort();
 	}
 	suspended = true;
-	updatetqStatus();
+	updateStatus();
 	timer.suspend();
 }
 
@@ -319,7 +319,7 @@ KGVerify::resume()
 {
 	timer.resume();
 	suspended = false;
-	updateLocktqStatus();
+	updateLockStatus();
 	if (running) {
 		Debug( "%s->start()\n", pName.data() );
 		greet->start();
@@ -373,7 +373,7 @@ KGVerify::setEnabled( bool on )
 	Debug( "%s->setEnabled(%s)\n", pName.data(), on ? "true" : "false" );
 	greet->setEnabled( on );
 	enabled = on;
-	updatetqStatus();
+	updateStatus();
 }
 
 void // private
@@ -381,7 +381,7 @@ KGVerify::slotTimeout()
 {
 	if (failed) {
 		failed = false;
-		updatetqStatus();
+		updateStatus();
 		Debug( "%s->revive()\n", pName.data() );
 		greet->revive();
 		handler->verifyRetry();
@@ -402,7 +402,7 @@ KGVerify::slotTimeout()
 			performAutoLogin();
 		else
 			timer.start( 1000 );
-		updatetqStatus();
+		updateStatus();
 	} else {
 		// assert( ctx == Login );
 		isClear = true;
@@ -420,7 +420,7 @@ KGVerify::slotActivity()
 		greet->start();
 		running = true;
 		timedLeft = 0;
-		updatetqStatus();
+		updateStatus();
 		timer.start( TIMED_GREET_TO * SECONDS );
 	} else if (timeable)
 		timer.start( TIMED_GREET_TO * SECONDS );
@@ -709,7 +709,7 @@ KGVerify::handleVerify()
 		if (ret == V_AUTH) {
 			Debug( " V_AUTH\n" );
 			failed = true;
-			updatetqStatus();
+			updateStatus();
 			handler->verifyFailed();
 			timer.start( 1500 + kapp->random()/(RAND_MAX/1000) );
 			return;
@@ -733,7 +733,7 @@ void
 KGVerify::gplugReturnText( const char *text, int tag )
 {
 	Debug( "%s: gplugReturnText(%\"s, %d)\n", pName.data(),
-	       tag & V_IS_SECRET ? "<tqmasked>" : text, tag );
+	       tag & V_IS_SECRET ? "<masked>" : text, tag );
 	GSendStr( text );
 	if (text) {
 		GSendInt( tag );
@@ -813,7 +813,7 @@ KGVerify::eventFilter( TQObject *o, TQEvent *e )
 		}
 		/* fall through */
 	case TQEvent::KeyRelease:
-		updateLocktqStatus();
+		updateLockStatus();
 		/* fall through */
 	default:
 		break;
@@ -822,16 +822,16 @@ KGVerify::eventFilter( TQObject *o, TQEvent *e )
 }
 
 void
-KGVerify::updateLocktqStatus()
+KGVerify::updateLockStatus()
 {
-	unsigned int ltqmask;
+	unsigned int lmask;
 	Window dummy1, dummy2;
 	int dummy3, dummy4, dummy5, dummy6;
 	XQueryPointer( qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ),
 	               &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6,
-	               &ltqmask );
-	capsLocked = ltqmask & LockMask;
-	updatetqStatus();
+	               &lmask );
+	capsLocked = lmask & LockMask;
+	updateStatus();
 }
 
 void
@@ -849,7 +849,7 @@ KGVerify::getConf( void *, const char *key, const TQVariant &dflt )
 	if (!qstrcmp( key, "EchoMode" ))
 		return TQVariant( _echoMode );
 	else {
-		TQString fkey = TQString::tqfromLatin1( key ) + '=';
+		TQString fkey = TQString::fromLatin1( key ) + '=';
 		for (TQStringList::ConstIterator it = _pluginOptions.begin();
 		     it != _pluginOptions.end(); ++it)
 			if ((*it).startsWith( fkey ))
@@ -923,13 +923,13 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent,
 	, failedLabelState( 0 )
 {
 	grid = new TQGridLayout;
-	grid->tqsetAlignment( AlignCenter );
+	grid->setAlignment( AlignCenter );
 
 	failedLabel = new TQLabel( parent );
 	failedLabel->setFont( _failFont );
 	grid->addWidget( failedLabel, 1, 0, AlignCenter );
 
-	updateLocktqStatus();
+	updateLockStatus();
 }
 
 KGStdVerify::~KGStdVerify()
@@ -965,7 +965,7 @@ KGStdVerify::slotPluginSelected( int id )
 }
 
 void
-KGStdVerify::updatetqStatus()
+KGStdVerify::updateStatus()
 {
 	int nfls;
 
@@ -1019,7 +1019,7 @@ KGThemedVerify::KGThemedVerify( KGVerifyHandler *_handler,
 	: inherited( _handler, _themer, _parent, _predecessor, _fixedUser,
 	             _pluginList, _func, _ctx )
 {
-	updateLocktqStatus();
+	updateLockStatus();
 }
 
 KGThemedVerify::~KGThemedVerify()
@@ -1063,9 +1063,9 @@ KGThemedVerify::slotPluginSelected( int id )
 }
 
 void
-KGThemedVerify::updatetqStatus()
+KGThemedVerify::updateStatus()
 {
-	handler->updatetqStatus( enabled && failed,
+	handler->updateStatus( enabled && failed,
 	                       enabled && !suspended && capsLocked,
 	                       timedLeft );
 }
@@ -1080,10 +1080,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user,
 {
 	TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 	okButton = new KPushButton( KStdGuiItem::ok(), this );
-	okButton->tqsetSizePolicy( fp );
+	okButton->setSizePolicy( fp );
 	okButton->setDefault( true );
 	cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
-	cancelButton->tqsetSizePolicy( fp );
+	cancelButton->setSizePolicy( fp );
 
 	verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx );
 	verify->selectPlugin( curPlugin );
diff --git a/kdm/kfrontend/kgverify.h b/kdm/kfrontend/kgverify.h
index b5daad969..0276b2f97 100644
--- a/kdm/kfrontend/kgverify.h
+++ b/kdm/kfrontend/kgverify.h
@@ -68,7 +68,7 @@ class KGVerifyHandler {
 	virtual void verifyFailed() = 0;
 	virtual void verifyRetry() = 0;
 	virtual void verifySetUser( const TQString &user ) = 0;
-	virtual void updatetqStatus( bool fail, bool caps, int left ); // for themed only
+	virtual void updateStatus( bool fail, bool caps, int left ); // for themed only
 };
 
 class TQWidget;
@@ -126,8 +126,8 @@ class KGVerify : public TQObject, public KGreeterPluginHandler {
 	bool eventFilter( TQObject *, TQEvent * );
 	void MsgBox( TQMessageBox::Icon typ, const TQString &msg );
 	void setTimer();
-	void updateLocktqStatus();
-	virtual void updatetqStatus() = 0;
+	void updateLockStatus();
+	virtual void updateStatus() = 0;
 	void handleVerify();
 
 	QXTimer timer;
@@ -188,7 +188,7 @@ class KGStdVerify : public KGVerify {
 	void selectPlugin( int id );
 
   protected:
-	void updatetqStatus();
+	void updateStatus();
 
   private:
 	TQGridLayout *grid;
@@ -214,7 +214,7 @@ class KGThemedVerify : public KGVerify {
 	void selectPlugin( int id );
 
   protected:
-	void updatetqStatus();
+	void updateStatus();
 
   private slots:
 	void slotPluginSelected( int id );
diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp
index bb9d897b2..67b575c5f 100644
--- a/kdm/kfrontend/krootimage.cpp
+++ b/kdm/kfrontend/krootimage.cpp
@@ -61,7 +61,7 @@ void
 MyApplication::renderDone()
 {
 	desktop()->setBackgroundPixmap( renderer.pixmap() );
-	desktop()->tqrepaint( true );
+	desktop()->repaint( true );
 	renderer.saveCacheFile();
 	renderer.cleanup();
 	for (unsigned i=0; i<renderer.numRenderers(); ++i)
diff --git a/kdm/kfrontend/sessions/ratpoison.desktop b/kdm/kfrontend/sessions/ratpoison.desktop
index ededb43d8..1127db151 100644
--- a/kdm/kfrontend/sessions/ratpoison.desktop
+++ b/kdm/kfrontend/sessions/ratpoison.desktop
@@ -59,7 +59,7 @@ Comment[ne]=पर्दा पछाडि सञ्झ्याल प्र�
 Comment[nl]=Een eenvoudige windowmanager die alleen met het toetsenbord te bedienen is, geïnspireerd door Screen
 Comment[nn]=Ein enkel tastaturbasert vindaugssjef, med Screen som førebilete
 Comment[pa]=ਪਰਦੇ ਮੈਡੀਊਲ ਬਾਅਦ ਸਿਰਫ ਕੀ-ਬੋਰਡ ਤੇ ਆਧਾਰਿਤ ਝਰੋਖਾ ਮੈਨੇਜਰ
-Comment[pl]=Prosty menedżer okien obsługiwany wyłącznie za potqmocą klawiatury, stworzony na podobieństwo programu screen
+Comment[pl]=Prosty menedżer okien obsługiwany wyłącznie za pomocą klawiatury, stworzony na podobieństwo programu screen
 Comment[pt]=Um gestor de janelas simples, só para o teclado e modelado sobre o Screen
 Comment[pt_BR]=Um simples gerenciador de janelas baseado somente em teclado, modelado após a tela
 Comment[ro]=Un manager de ferestre manipulat din tastatură, modelat după Screen
diff --git a/kdm/kfrontend/sessions/sawfish.desktop b/kdm/kfrontend/sessions/sawfish.desktop
index 59482d1f9..668620fff 100644
--- a/kdm/kfrontend/sessions/sawfish.desktop
+++ b/kdm/kfrontend/sessions/sawfish.desktop
@@ -52,7 +52,7 @@ Comment[ne]=इमाक्स लिस्प जस्तो भाषसँ�
 Comment[nl]=Een uitbreidbare windowmanager, scriptbaar via een Emacs Lisp-achtige taal
 Comment[nn]=Ein utvidbar vindaugssjef som kan skriptast med eit språk som liknar Emacs Lisp
 Comment[pa]= Emacs Lisp-ਵਰਗੀ ਭਾਸ਼ਾ ਸਕ੍ਰਿਪਟਯੋਗ ਝਰੋਖਾ ਮੈਨੇਜਰ
-Comment[pl]=Menedżer okien, który można rozszerzać za potqmocą skrytów w języku podobnym do Emacs Lisp
+Comment[pl]=Menedżer okien, który można rozszerzać za pomocą skrytów w języku podobnym do Emacs Lisp
 Comment[pt]=Um gestor de janelas extensível e programável com uma linguagem semelhante ao Emacs Lisp
 Comment[pt_BR]=um gerenciador de janelas extensível, baseado em scripts, com uma linguagem parecida com o Lisp do Emacs
 Comment[ro]=Un manager de ferestre extensibil scriptabil cu un limbaj similar cu Emacs Lisp
diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp
index 1233a96d2..a171bd1bb 100644
--- a/kdm/kfrontend/themer/kdmitem.cpp
+++ b/kdm/kfrontend/themer/kdmitem.cpp
@@ -66,7 +66,7 @@ KdmItem::KdmItem( TQWidget *parent, const TQDomNode &node, const char *name )
 void
 KdmItem::init( const TQDomNode &node, const char * )
 {
-	// Set default tqlayout for every item
+	// Set default layout for every item
 	currentManager = MNone;
 	pos.x = pos.y = 0;
 	pos.width = pos.height = 1;
@@ -146,7 +146,7 @@ KdmItem::show( bool force )
 
 	if (myWidget)
 		myWidget->show();
-	// XXX showing of tqlayouts not implemented, prolly pointless anyway
+	// XXX showing of layouts not implemented, prolly pointless anyway
 
 	needUpdate();
 }
@@ -170,7 +170,7 @@ KdmItem::hide( bool force )
 
 	if (myWidget)
 		myWidget->hide();
-	// XXX hiding of tqlayouts not implemented, prolly pointless anyway
+	// XXX hiding of layouts not implemented, prolly pointless anyway
 
 	needUpdate();
 }
@@ -236,14 +236,14 @@ KdmItem::setLayoutItem( TQLayoutItem *item )
 	// XXX hiding not supported - it think it's pointless here
 	if (myLayoutItem->widget())
 		connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()),
-		         TQT_SLOT(tqlayoutItemGone()) );
-	else if (myLayoutItem->tqlayout())
-		connect( myLayoutItem->tqlayout(), TQT_SIGNAL(destroyed()),
-		         TQT_SLOT(tqlayoutItemGone()) );
+		         TQT_SLOT(layoutItemGone()) );
+	else if (myLayoutItem->layout())
+		connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()),
+		         TQT_SLOT(layoutItemGone()) );
 }
 
 void
-KdmItem::tqlayoutItemGone()
+KdmItem::layoutItemGone()
 {
 	myLayoutItem = 0;
 }
@@ -278,7 +278,7 @@ KdmItem::setGeometry( const TQRect &newGeometry, bool force )
 	if (fixedManager && !fixedManager->isEmpty())
 		fixedManager->update( newGeometry, force );
 
-	// TODO send *selective* tqrepaint signal
+	// TODO send *selective* repaint signal
 }
 
 void
@@ -295,8 +295,8 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
             // Maybe set a darker version of the background instead of an exact copy?
             if ( myWidget && myWidget->isA( "KListView" ) ) {
                 TQPixmap copy( myWidget->size() );
-                kdDebug() <<  myWidget->tqgeometry() << " " << area << " " << myWidget->size() << endl;
-                bitBlt( &copy, TQPoint( 0, 0), p->device(), myWidget->tqgeometry(), Qt::CopyROP );
+                kdDebug() <<  myWidget->geometry() << " " << area << " " << myWidget->size() << endl;
+                bitBlt( &copy, TQPoint( 0, 0), p->device(), myWidget->geometry(), Qt::CopyROP );
                 // Lighten it slightly
                 TQImage lightVersion;
                 lightVersion = copy.convertToImage();
@@ -368,7 +368,7 @@ KdmItem::mouseEvent( int x, int y, bool pressed, bool released )
 	}
 
 	ItemState oldState = state;
-	if (area.tqcontains( x, y )) {
+	if (area.contains( x, y )) {
 		if (released && oldState == Sactive) {
 			if (buttonParent)
 				emit activated( id );
@@ -415,12 +415,12 @@ KdmItem::statusChanged()
 // BEGIN protected inheritable
 
 QSize
-KdmItem::tqsizeHint()
+KdmItem::sizeHint()
 {
 	if (myWidget)
 		return myWidget->size();
 	if (myLayoutItem)
-		return myLayoutItem->tqsizeHint();
+		return myLayoutItem->sizeHint();
 	int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1,
 	    h = pos.hType == DTpixel ? kAbs( pos.height ) : -1;
 	return TQSize( w, h );
@@ -429,7 +429,7 @@ KdmItem::tqsizeHint()
 QRect
 KdmItem::placementHint( const TQRect &parentRect )
 {
-	TQSize hintedSize = tqsizeHint();
+	TQSize hintedSize = sizeHint();
 	TQSize boxHint;
 
 	int x = parentRect.left(),
@@ -446,7 +446,7 @@ KdmItem::placementHint( const TQRect &parentRect )
 		else {
 			if (!boxManager)
 				return parentRect;
-			boxHint = boxManager->tqsizeHint();
+			boxHint = boxManager->sizeHint();
 		}
 		kdDebug() << timestamp() << " boxHint " << boxHint << endl;
 	}
@@ -456,21 +456,21 @@ KdmItem::placementHint( const TQRect &parentRect )
 	else if (pos.xType == DTnpixel)
 		x = parentRect.right() - pos.x;
 	else if (pos.xType == DTpercent)
-		x += tqRound( parentRect.width() / 100.0 * pos.x );
+		x += qRound( parentRect.width() / 100.0 * pos.x );
 
 	if (pos.yType == DTpixel)
 		y += pos.y;
 	else if (pos.yType == DTnpixel)
 		y = parentRect.bottom() - pos.y;
 	else if (pos.yType == DTpercent)
-		y += tqRound( parentRect.height() / 100.0 * pos.y );
+		y += qRound( parentRect.height() / 100.0 * pos.y );
 
 	if (pos.wType == DTpixel)
 		w = pos.width;
 	else if (pos.wType == DTnpixel)
 		w -= pos.width;
 	else if (pos.wType == DTpercent)
-		w = tqRound( parentRect.width() / 100.0 * pos.width );
+		w = qRound( parentRect.width() / 100.0 * pos.width );
 	else if (pos.wType == DTbox)
 		w = boxHint.width();
 	else if (hintedSize.width() > 0)
@@ -483,7 +483,7 @@ KdmItem::placementHint( const TQRect &parentRect )
 	else if (pos.hType == DTnpixel)
 		h -= pos.height;
 	else if (pos.hType == DTpercent)
-		h = tqRound( parentRect.height() / 100.0 * pos.height );
+		h = qRound( parentRect.height() / 100.0 * pos.height );
 	else if (pos.hType == DTbox)
 		h = boxHint.height();
 	else if (hintedSize.height() > 0) {
@@ -496,7 +496,7 @@ KdmItem::placementHint( const TQRect &parentRect )
 
 	// we choose to take the hinted size, but it's better to listen to the aspect ratio
 	if (pos.wType == DTnone && pos.hType != DTnone && h && w) {
-	        w = tqRound(float(hintedSize.width() * h) / hintedSize.height());
+	        w = qRound(float(hintedSize.width() * h) / hintedSize.height());
 	}
 
 	// defaults to center
@@ -559,7 +559,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
 		dType = DTpercent;
 		TQString sCopy = s;
 		sCopy.remove( p, 1 );
-		sCopy.tqreplace( ',', '.' );
+		sCopy.replace( ',', '.' );
 		val = (int)sCopy.toDouble();
 	} else {		// int value
 		dType = DTpixel;
@@ -568,7 +568,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
 			sCopy.remove( 0, 1 );
 			dType = DTnpixel;
 		}
-		sCopy.tqreplace( ',', '.' );
+		sCopy.replace( ',', '.' );
 		val = (int)sCopy.toDouble();
 	}
 }
@@ -614,7 +614,7 @@ KdmItem::setFixedLayout( const TQDomNode &node )
 }
 
 TQWidget *
-KdmItem::tqparentWidget() const
+KdmItem::parentWidget() const
 {
   if (myWidget)
     return myWidget;
@@ -623,7 +623,7 @@ KdmItem::tqparentWidget() const
 
   if (parent()->qt_cast("TQWidget"))
     return (TQWidget*)parent();
-  return ((KdmItem*)parent())->tqparentWidget();
+  return ((KdmItem*)parent())->parentWidget();
 }
 
 #include "kdmitem.moc"
diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h
index 975033b33..230ed71c4 100644
--- a/kdm/kfrontend/themer/kdmitem.h
+++ b/kdm/kfrontend/themer/kdmitem.h
@@ -52,14 +52,14 @@ class TQLayoutItem;
  */
 
 /**
- * A note on tqlayouting - how does it work?
- *  - settqgeometry is called by parent (passing the new tqgeometry)
- *    - item changes its tqgeometry
+ * A note on layouting - how does it work?
+ *  - setgeometry is called by parent (passing the new geometry)
+ *    - item changes its geometry
  *    - if item embeds a widget, reposition it too
  *    - call children's box manager. box->update( my geom )
  *      - sum up the whole space taken by children (via *hint calls) if
  *        needed for box width / height computation. note that the computed
- *        tqgeometry should be equal or similar to parent's tqgeometry.
+ *        geometry should be equal or similar to parent's geometry.
  *      - pad the rectangle bounding box' contents
  *      - for every child
  *        - if vertical
@@ -74,7 +74,7 @@ class TQLayoutItem;
  *            and insertion entry points are vertical lines
  *    - call to children's fix manager. fixed->update( my geom )
  *      - for every child
- *          - S = get child's tqgeometry hint (and we'll give item the whole
+ *          - S = get child's geometry hint (and we'll give item the whole
  *            space it needs, without constraints)
  *          - call to child->setGeometry( S )
  *    - TODO: send a selective redraw signal also merging children's areas
@@ -95,8 +95,8 @@ public:
 	virtual ~KdmItem();
 
 	/**
-	 * Fixup the tqgeometry of an item and its children (even if fixed
-	 * or boxed ones). Note that this will generate tqrepaint signals
+	 * Fixup the geometry of an item and its children (even if fixed
+	 * or boxed ones). Note that this will generate repaint signals
 	 * when needed. The default implementation should fit all needs.
 	 */
 	virtual void setGeometry( const TQRect &newGeometry, bool force );
@@ -109,7 +109,7 @@ public:
 	void paint( TQPainter *painter, const TQRect &boundaries );
 
 	/**
-	 * Update representation of contents and tqrepaint.
+	 * Update representation of contents and repaint.
 	 */
 	virtual void update();
 
@@ -120,22 +120,22 @@ public:
 	void mouseEvent( int x, int y, bool pressed = false, bool released = false );
 
 	/**
-	 * Similar to tqsizeHint(..), this returns the area of the item
+	 * Similar to sizeHint(..), this returns the area of the item
 	 * given the @p parentGeometry. The default implementation
-	 * takes into account geometric constraints and tqlayoutings.
-	 * @param parentGeometry the tqgeometry of the caller item or a
-	 * null rect if the tqgeometry of the parent is not yet defined.
+	 * takes into account geometric constraints and layoutings.
+	 * @param parentGeometry the geometry of the caller item or a
+	 * null rect if the geometry of the parent is not yet defined.
 	 */
 	virtual TQRect placementHint( const TQRect &parentGeometry );
 
 	/**
-	 * Create the box tqlayout manager; next children will be
-	 * managed by the box tqlayouter
+	 * Create the box layout manager; next children will be
+	 * managed by the box layouter
 	 */
 	void setBoxLayout( const TQDomNode &node = TQDomNode() );
 
 	/**
-	 * Create the fixed tqlayout manager; next children will be
+	 * Create the fixed layout manager; next children will be
 	 * in fixed position relative to this item
 	 */
 	void setFixedLayout( const TQDomNode &node = TQDomNode() );
@@ -163,7 +163,7 @@ public:
 	bool isExplicitlyHidden() const { return isShown == ExplicitlyHidden; }
 	TQRect rect() const { return area; }
 
-	TQWidget *tqparentWidget() const;
+	TQWidget *parentWidget() const;
 	TQString getId() const { return id; }
 
 signals:
@@ -172,7 +172,7 @@ signals:
 
 protected slots:
 	void widgetGone();
-	void tqlayoutItemGone();
+	void layoutItemGone();
 
 protected:
 	/**
@@ -181,7 +181,7 @@ protected:
 	 * @return (-1,-1) if no size can be determined (so it should
 	 * default to parent's size).
 	 */
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 
 	/**
 	 * Low level graphical function to paint the item.
@@ -195,7 +195,7 @@ protected:
 
 	/**
 	 * Called when item changes its 'state' variable. This must
-	 * handle item's tqrepaint.
+	 * handle item's repaint.
 	 */
 	virtual void statusChanged();
 
diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp
index fb6a03b91..e83ae9dc7 100644
--- a/kdm/kfrontend/themer/kdmlabel.cpp
+++ b/kdm/kfrontend/themer/kdmlabel.cpp
@@ -115,8 +115,8 @@ KdmLabel::setTextInt( const TQString &txt)
 	myAccel = 0;
 	if (cAccel != -1) {
 	  cText.remove('&');
-	  myAccel = new TQAccel(tqparentWidget());
-	  myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().tqunicode());
+	  myAccel = new TQAccel(parentWidget());
+	  myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode());
 	  connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
 	}
 }
@@ -138,7 +138,7 @@ KdmLabel::setText( const TQString &txt )
 }
 
 QSize
-KdmLabel::tqsizeHint()
+KdmLabel::sizeHint()
 {
 	// choose the correct label class
 	struct LabelStruct::LabelClass *l = &label.normal;
@@ -250,7 +250,7 @@ KdmLabel::lookupText( const TQString &t )
 {
 	TQString text = t;
 
-	text.tqreplace( '_', '&' );
+	text.replace( '_', '&' );
 
 	TQMap<TQChar,TQString> m;
 	struct utsname uts;
@@ -268,7 +268,7 @@ KdmLabel::lookupText( const TQString &t )
 	m['s'] = KThemedGreeter::timedUser;
 	// xgettext:no-c-format
 	KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") );
-	m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false, false );
+	m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false );
 
 	return KMacroExpander::expandMacros( text, m );
 }
diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h
index 33ce1cc00..1ec2f88ec 100644
--- a/kdm/kfrontend/themer/kdmlabel.h
+++ b/kdm/kfrontend/themer/kdmlabel.h
@@ -42,7 +42,7 @@ public:
 
 protected:
 	// reimplemented; returns the minimum size of rendered text
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 
 	// draw the label
 	virtual void drawContents( TQPainter *p, const TQRect &r );
diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp
index bc1a059c5..b17d2e7b7 100644
--- a/kdm/kfrontend/themer/kdmlayout.cpp
+++ b/kdm/kfrontend/themer/kdmlayout.cpp
@@ -38,7 +38,7 @@ KdmLayoutFixed::update( const TQRect &parentGeometry, bool force )
 {
 	kdDebug() << timestamp() << " KdmLayoutFixed::update " << parentGeometry << endl;
 
-	// I can't tqlayout children if the parent rectangle is not valid
+	// I can't layout children if the parent rectangle is not valid
 	if (parentGeometry.width() < 0 || parentGeometry.height() < 0) {
 		kdDebug() << timestamp() << " invalid\n";
 		return;
@@ -67,14 +67,14 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
 {
 	kdDebug() << this << " update " << parentGeometry << endl;
 
-	// I can't tqlayout children if the parent rectangle is not valid
+	// I can't layout children if the parent rectangle is not valid
 	if (!parentGeometry.isValid() || parentGeometry.isEmpty())
 		return;
 
 	// Check if box size was computed. If not compute it
 	// TODO check if this prevents updating changing items
 //	if (!hintedSize.isValid())
-//		tqsizeHint();
+//		sizeHint();
 
 //	kdDebug() << this << " hintedSize " << hintedSize << endl;
 
@@ -114,30 +114,30 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
 			if ((*it)->isExplicitlyHidden())
 				continue;
 
-			TQRect temp = childrenRect, tqitemRect;
+			TQRect temp = childrenRect, itemRect;
 			if (box.isVertical) {
 				temp.setHeight( 0 );
-				tqitemRect = (*it)->placementHint( temp );
-				temp.setHeight( tqitemRect.height() );
-				childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing );
+				itemRect = (*it)->placementHint( temp );
+				temp.setHeight( itemRect.height() );
+				childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing );
 			} else {
 				temp.setWidth( 0 );
-				tqitemRect = (*it)->placementHint( temp );
-				kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl;
-				temp.setWidth( tqitemRect.width() );
-				childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing );
+				itemRect = (*it)->placementHint( temp );
+				kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl;
+				temp.setWidth( itemRect.width() );
+				childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing );
 				kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl;
 			}
-			tqitemRect = (*it)->placementHint( temp );
-			kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl;
-			(*it)->setGeometry( tqitemRect, force );
+			itemRect = (*it)->placementHint( temp );
+			kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl;
+			(*it)->setGeometry( itemRect, force );
 		}
 	}
 }
 
-//FIXME truly experimental (is so close to greeter_tqgeometry.c)
+//FIXME truly experimental (is so close to greeter_geometry.c)
 QSize
-KdmLayoutBox::tqsizeHint()
+KdmLayoutBox::sizeHint()
 {
 	// Sum up area taken by children
 	int w = 0, h = 0;
diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h
index 75e90d573..4c73e9a1b 100644
--- a/kdm/kfrontend/themer/kdmlayout.h
+++ b/kdm/kfrontend/themer/kdmlayout.h
@@ -43,11 +43,11 @@ public:
 	// Adds an item that will be managed
 	void addItem( KdmItem *item ) { m_children.append( item ); }
 
-	// Return false if any item are managed by this tqlayouter
+	// Return false if any item are managed by this layouter
 	bool isEmpty() { return m_children.isEmpty(); }
 
-	// Updates the tqlayout of all items knowing that the parent
-	// has the @p parentGeometry tqgeometry
+	// Updates the layout of all items knowing that the parent
+	// has the @p parentGeometry geometry
 //	virtual void update( const TQRect &parentGeometry ) = 0;
 
 protected:
@@ -59,8 +59,8 @@ class KdmLayoutFixed : public KdmLayout {
 public:
 	KdmLayoutFixed( const TQDomNode &node );
 
-	// Updates the tqlayout of all boxed items knowing that the parent
-	// has the @p parentGeometry tqgeometry
+	// Updates the layout of all boxed items knowing that the parent
+	// has the @p parentGeometry geometry
 	void update( const TQRect &parentGeometry, bool force );
 };
 
@@ -74,13 +74,13 @@ class KdmLayoutBox : public KdmLayout {
 public:
 	KdmLayoutBox( const TQDomNode &node );
 
-	// Updates the tqlayout of all boxed items knowing that they
+	// Updates the layout of all boxed items knowing that they
 	// should fit into @p parentGeometry container
 	void update( const TQRect &parentGeometry, bool force );
 
 	// Computes the size hint of the box, telling which is the
 	// smallest size inside which boxed items will fit
-	TQSize tqsizeHint();
+	TQSize sizeHint();
 
 private:
 	struct {
diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp
index ce7ef8e07..0fcbc065c 100644
--- a/kdm/kfrontend/themer/kdmpixmap.cpp
+++ b/kdm/kfrontend/themer/kdmpixmap.cpp
@@ -97,7 +97,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
 }
 
 QSize
-KdmPixmap::tqsizeHint()
+KdmPixmap::sizeHint()
 {
 	// choose the correct pixmap class
 	PixmapStruct::PixmapClass * pClass = &pixmap.normal;
@@ -108,7 +108,7 @@ KdmPixmap::tqsizeHint()
 	// use the pixmap size as the size hint
 	if (!pClass->pixmap.isNull())
 		return pClass->pixmap.size();
-	return KdmItem::tqsizeHint();
+	return KdmItem::sizeHint();
 }
 
 void
@@ -268,11 +268,11 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
 				QRgb *ls = (QRgb *)scaledImage.scanLine( y );
 				for (int x = 0; x < w; ++x) {
 					QRgb l = ls[x];
-					int r = int( tqRed( l ) * tint_red );
-					int g = int( tqGreen( l ) * tint_green );
-					int b = int( tqBlue( l ) * tint_blue );
-					int a = int( tqAlpha( l ) * tint_alpha );
-					ls[x] = tqRgba( r, g, b, a );
+					int r = int( qRed( l ) * tint_red );
+					int g = int( qGreen( l ) * tint_green );
+					int b = int( qBlue( l ) * tint_blue );
+					int a = int( qAlpha( l ) * tint_alpha );
+					ls[x] = qRgba( r, g, b, a );
 				}
 			}
 
diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h
index d49394bc9..a12c9fea4 100644
--- a/kdm/kfrontend/themer/kdmpixmap.h
+++ b/kdm/kfrontend/themer/kdmpixmap.h
@@ -42,7 +42,7 @@ public:
 
 protected:
 	// reimplemented; returns the size of loaded pixmap
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 
 	// draw the pixmap
 	virtual void drawContents( TQPainter *p, const TQRect &r );
diff --git a/kdm/kfrontend/themer/kdmrect.cpp b/kdm/kfrontend/themer/kdmrect.cpp
index 5a252151c..1d854d213 100644
--- a/kdm/kfrontend/themer/kdmrect.cpp
+++ b/kdm/kfrontend/themer/kdmrect.cpp
@@ -141,7 +141,7 @@ KdmRect::recursiveSetAttribs( TQLayoutItem *li )
 
     if ((w = li->widget()))
 	setAttribs( w );
-    else if ((l = li->tqlayout())) {
+    else if ((l = li->layout())) {
 	TQLayoutIterator it = l->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 	     recursiveSetAttribs( itm );
diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp
index 16d9e4f86..9e6db33db 100644
--- a/kdm/kfrontend/themer/kdmthemer.cpp
+++ b/kdm/kfrontend/themer/kdmthemer.cpp
@@ -223,7 +223,7 @@ KdmThemer::generateItems( KdmItem *parent, const TQDomNode &node )
 			TQString id = el.attribute("id");
 			if (id.startsWith("plugin-specific-")) {
 			        id = id.mid(strlen("plugin-specific-"));
-			        if (!_pluginsLogin.tqcontains(id))
+			        if (!_pluginsLogin.contains(id))
 			               continue;
 			}
 
diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h
index 0c4cd3753..6dc2318dd 100644
--- a/kdm/kfrontend/themer/kdmthemer.h
+++ b/kdm/kfrontend/themer/kdmthemer.h
@@ -60,9 +60,9 @@ public:
 
 	bool isOK() { return rootItem != 0; }
 	/*
-	 * Gives a tqsizeHint to the widget (parent size)
+	 * Gives a sizeHint to the widget (parent size)
 	 */
-	//TQSize tqsizeHint() const{ return tqparentWidget()->size(); }
+	//TQSize sizeHint() const{ return parentWidget()->size(); }
 
 	/*
 	 * Takes a shot of the current widget
diff --git a/kdm/kfrontend/themes/o2_enterprise/gpl.txt b/kdm/kfrontend/themes/o2_enterprise/gpl.txt
index 4ab04989b..b6f92f3db 100644
--- a/kdm/kfrontend/themes/o2_enterprise/gpl.txt
+++ b/kdm/kfrontend/themes/o2_enterprise/gpl.txt
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions:
     stating that you changed the files and the date of any change.
 
     b) You must cause any work that you distribute or publish, that in
-    whole or in part tqcontains or is derived from the Program or any
+    whole or in part contains or is derived from the Program or any
     part thereof, to be licensed as a whole at no charge to all third
     parties under the terms of this License.
 
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include