Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <[email protected]>

29 files changed, 45 insertions, 45 deletions

diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index be2e018b..8d4a7dc6 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -125,7 +125,7 @@ MatchView::MatchView(TQWidget *parent, const char *name)
   boxLayout->addSpacing(1);
 
   w_list = new TQListView(this);
-  w_list->setFocusPolicy(TQ_StrongFocus);
+  w_list->setFocusPolicy(TQWidget::StrongFocus);
   w_list->header()->hide();
   w_list->addColumn("foo");
   w_list->setColumnWidthMode(0,TQListView::Maximum);
diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp
index 902b412e..ea108c60 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -140,7 +140,7 @@ QueryView::QueryView(TQWidget *_parent)
   part->setJScriptEnabled(false);
   part->setJavaEnabled(false);
   part->setURLCursor(KCursor::handCursor());
-  setFocusPolicy(TQ_NoFocus);
+  setFocusPolicy(TQWidget::NoFocus);
   connect(part, TQT_SIGNAL(completed()), TQT_SLOT(partCompleted()));
   connect(part, TQT_SIGNAL(middleButtonClicked()), TQT_SLOT(middleButtonClicked()));
   rightBtnMenu = new TDEPopupMenu(this);
diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp
index 57f5fc6e..4a2cb8d6 100644
--- a/knewsticker/common/newsiconmgr.cpp
+++ b/knewsticker/common/newsiconmgr.cpp
@@ -64,7 +64,7 @@ void NewsIconMgr::getIcon(const KURL &url)
 			TQPixmap icon(url.encodedPathAndQuery());
 			if (!icon.isNull()) {
 				if (icon.size() != TQSize(16, 16)) {
-					if (!icon.convertFromImage(icon.convertToImage().smoothScale(16, 16, TQ_ScaleMin))) {
+					if (!icon.convertFromImage(icon.convertToImage().smoothScale(16, 16, TQImage::ScaleMin))) {
 						emit gotIcon(url, m_stdIcon);
 						return;
 					}
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index b98e9263..49344eaa 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -57,7 +57,7 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget
 	m_arrowButton = new KArrowButton(this);
 	TQToolTip::add(m_arrowButton, i18n("Show menu"));
 	connect(m_arrowButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotArrowButtonPressed()));
-	m_arrowButton->setFocusPolicy(TQ_NoFocus);
+	m_arrowButton->setFocusPolicy(TQWidget::NoFocus);
 	setupArrowButton();
 	layout->addWidget(m_arrowButton);
 
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index b13500f7..a9bcdcba 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -231,7 +231,7 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co
 	// Write the template to TDEHTMLPart
 	writeTemplate();
 
-	view()->setFocusPolicy( TQ_NoFocus );
+	view()->setFocusPolicy( TQWidget::NoFocus );
 
 	d->tt=new ToolTip( this );
 
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 279fe0c4..555c36a1 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -241,7 +241,7 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const
 	TDEHTMLView *htmlWidget = d->preview->view();
 	htmlWidget->setMarginWidth(4);
 	htmlWidget->setMarginHeight(4);
-	htmlWidget->setFocusPolicy(TQ_NoFocus);
+	htmlWidget->setFocusPolicy(TQWidget::NoFocus);
 	htmlWidget->setSizePolicy(
 		TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	l->addWidget(htmlWidget);
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
index d3c2b335..f57de188 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -383,7 +383,7 @@ void KopeteIdentityConfig::slotEnableAndDisableWidgets()
 	}
 
 	if(!photo.isNull())
-		d->m_view->labelPhoto->setPixmap(TQPixmap(photo.smoothScale(64, 92, TQ_ScaleMin)));
+		d->m_view->labelPhoto->setPixmap(TQPixmap(photo.smoothScale(64, 92, TQImage::ScaleMin)));
 	else
 		d->m_view->labelPhoto->setPixmap(TQPixmap());
 
@@ -528,7 +528,7 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl)
 		if(photo.width() > 96 || photo.height() > 96)
 		{
 			// Scale and crop the picture.
-			photo = photo.smoothScale( 96, 96, TQ_ScaleMin );
+			photo = photo.smoothScale( 96, 96, TQImage::ScaleMin );
 			// crop image if not square
 			if(photo.width() < photo.height()) 
 				photo = photo.copy((photo.width()-photo.height())/2, 0, 96, 96);
@@ -539,7 +539,7 @@ void KopeteIdentityConfig::slotChangePhoto(const TQString &photoUrl)
 		else if (photo.width() < 32 || photo.height() < 32)
 		{
 			// Scale and crop the picture.
-			photo = photo.smoothScale( 32, 32, TQ_ScaleMin );
+			photo = photo.smoothScale( 32, 32, TQImage::ScaleMin );
 			// crop image if not square
 			if(photo.width() < photo.height())
 				photo = photo.copy((photo.width()-photo.height())/2, 0, 32, 32);
diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp
index a6cec329..64fb1233 100644
--- a/kopete/kopete/contactlist/kopetelviprops.cpp
+++ b/kopete/kopete/contactlist/kopetelviprops.cpp
@@ -372,7 +372,7 @@ void KopeteMetaLVIProps::slotEnableAndDisableWidgets()
 		break;
 	}
 	if( !photo.isNull() )
-		mainWidget->photoLabel->setPixmap(TQPixmap(photo.smoothScale( 64, 92, TQ_ScaleMin )));
+		mainWidget->photoLabel->setPixmap(TQPixmap(photo.smoothScale( 64, 92, TQImage::ScaleMin )));
 	else
 		mainWidget->photoLabel->setPixmap( TQPixmap() );
 }
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index 66190c36..21cad8d2 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -521,7 +521,7 @@ void KopeteMetaContactLVI::slotPhotoChanged()
 		{
 			int photoSize = d->iconSize;
 
-			photoImg = photoImg.smoothScale( photoSize, photoSize, TQ_ScaleMin );
+			photoImg = photoImg.smoothScale( photoSize, photoSize, TQImage::ScaleMin );
 			
 			KImageEffect *effect = 0L;
 			switch ( m_metaContact->status() )
diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
index 869f8e62..92c88f2e 100644
--- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp
+++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp
@@ -100,7 +100,7 @@ void KopeteEditGlobalIdentityWidget::setIconSize(int size)
 	d->labelPicture->setMinimumSize(TQSize(d->iconSize, d->iconSize));
 	d->labelPicture->setMaximumSize(TQSize(d->iconSize, d->iconSize));
 	if( !d->myself->photo().isNull() )
-		d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQ_ScaleMin)));
+		d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQImage::ScaleMin)));
 }
 
 void KopeteEditGlobalIdentityWidget::iconSizeChanged()
@@ -115,7 +115,7 @@ void KopeteEditGlobalIdentityWidget::iconSizeChanged()
 		d->labelPicture->setMinimumSize(TQSize(d->iconSize, d->iconSize));
 		d->labelPicture->setMaximumSize(TQSize(d->iconSize, d->iconSize));
 		if( !d->myself->photo().isNull() )	
-			d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQ_ScaleMin)));
+			d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQImage::ScaleMin)));
 	}
 }
 
@@ -149,7 +149,7 @@ void KopeteEditGlobalIdentityWidget::updateGUI(const TQString &key, const TQVari
 		// Update the picture and the tooltip
 		if( !d->myself->photo().isNull() )
 		{
-			d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQ_ScaleMin)));
+			d->labelPicture->setPixmap(TQPixmap(d->myself->photo().smoothScale(d->iconSize, d->iconSize, TQImage::ScaleMin)));
 			TQToolTip::add(d->labelPicture, "<qt><img src=\""+ value.toString() +"\"></qt>");
 		}
 	}
@@ -183,7 +183,7 @@ void KopeteEditGlobalIdentityWidget::photoClicked()
 		if(photo.width() > 96 || photo.height() > 96)
 		{
 			// Scale and crop the picture.
-			photo = photo.smoothScale( 96, 96, TQ_ScaleMin );
+			photo = photo.smoothScale( 96, 96, TQImage::ScaleMin );
 			// crop image if not square
 			if(photo.width() < photo.height()) 
 				photo = photo.copy((photo.width()-photo.height())/2, 0, 96, 96);
@@ -194,7 +194,7 @@ void KopeteEditGlobalIdentityWidget::photoClicked()
 		else if (photo.width() < 32 || photo.height() < 32)
 		{
 			// Scale and crop the picture.
-			photo = photo.smoothScale( 32, 32, TQ_ScaleMin );
+			photo = photo.smoothScale( 32, 32, TQImage::ScaleMin );
 			// crop image if not square
 			if(photo.width() < photo.height())
 				photo = photo.copy((photo.width()-photo.height())/2, 0, 32, 32);
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index f1e0e1fd..ef8cec71 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -984,12 +984,12 @@ void KopeteWindow::slotBuildStatusMessageMenu()
 	m_newMessageEdit->setText(Kopete::Away::message());
 
 	newMessageBox->setFocusProxy( m_newMessageEdit );
-	newMessageBox->setFocusPolicy( TQ_ClickFocus );
+	newMessageBox->setFocusPolicy( TQWidget::ClickFocus );
 /*	newMessageLabel->setFocusProxy( newMessageEdit );
 	newMessageLabel->setBuddy( newMessageEdit );
-	newMessageLabel->setFocusPolicy( TQ_ClickFocus );*/
+	newMessageLabel->setFocusPolicy( TQWidget::ClickFocus );*/
 	newMessagePix->setFocusProxy( m_newMessageEdit );
-	newMessagePix->setFocusPolicy( TQ_ClickFocus );
+	newMessagePix->setFocusPolicy( TQWidget::ClickFocus );
 	connect( m_newMessageEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotNewStatusMessageEntered() ) );
 
 	m_globalStatusMessageMenu->insertItem( newMessageBox );
diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
index 69d33bd6..4c8cd6fd 100644
--- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
+++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp
@@ -426,7 +426,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height)
    {
          /* We have to resize the pixmap to get it complete on the screen */
          TQImage image=m_originalPixmap.convertToImage();
-         m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) );
+         m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) );
          double oldZoomFactor = m_zoomFactor;
          m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width();
 
diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp
index 5fadf390..18794350 100644
--- a/kopete/libkopete/kopetemetacontact.cpp
+++ b/kopete/libkopete/kopetemetacontact.cpp
@@ -690,7 +690,7 @@ TQImage MetaContact::photo() const
   if( picture().image().width() > 96 && picture().image().height() > 96 )
     {
       kdDebug( 14010 )  << k_funcinfo << "Resizing image from " << picture().image().width() << " x " << picture().image().height() << endl;
-      return picture().image().smoothScale(96,96,TQ_ScaleMin);
+      return picture().image().smoothScale(96,96,TQImage::ScaleMin);
     }
   else
     return picture().image();
diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp
index 94fbff0f..a71b19f5 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.cpp
+++ b/kopete/libkopete/ui/kopetelistviewitem.cpp
@@ -790,7 +790,7 @@ void ImageComponent::paint( TQPainter *painter, const TQColorGroup & )
 	painter->drawPixmap( rc & ourRc, d->image );
 }
 
-void ImageComponent::scale( int w, int h, TQ_ScaleMode mode )
+void ImageComponent::scale( int w, int h, TQImage::ScaleMode mode )
 {
 	TQImage im = d->image.convertToImage();
 	setPixmap( TQPixmap( im.smoothScale( w, h, mode ) ) );
@@ -1052,7 +1052,7 @@ void DisplayNameComponent::redraw()
 		case Kopete::Emoticons::Image:
 			ic = new ImageComponent( this );
 			ic->setPixmap( TQPixmap( (*token).picPath ) );
-			ic->scale( INT_MAX, fontHeight, TQ_ScaleMin );
+			ic->scale( INT_MAX, fontHeight, TQImage::ScaleMin );
 		break;
 		default:
 			kdDebug( 14010 ) << k_funcinfo << "This should have not happened!" << endl;
diff --git a/kopete/libkopete/ui/kopetelistviewitem.h b/kopete/libkopete/ui/kopetelistviewitem.h
index e4f254ce..d87a63a7 100644
--- a/kopete/libkopete/ui/kopetelistviewitem.h
+++ b/kopete/libkopete/ui/kopetelistviewitem.h
@@ -344,7 +344,7 @@ public:
 
 	virtual void paint( TQPainter *painter, const TQColorGroup &cg );
 
-	virtual void scale( int w, int h, TQ_ScaleMode );
+	virtual void scale( int w, int h, TQImage::ScaleMode );
 	static int RTTI;
 	virtual int rtti() const { return RTTI; }
 protected:
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 7497e046..8d049a5d 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -112,7 +112,7 @@ void MetaContactSelectorWidgetLVI::slotPhotoChanged()
 	{
 		int photoSize = d->photoSize;
 		
-		photoImg = photoImg.smoothScale( photoSize, photoSize, TQ_ScaleMin ) ;
+		photoImg = photoImg.smoothScale( photoSize, photoSize, TQImage::ScaleMin ) ;
 		
 		// draw a 1 pixel black border
 		photoPixmap = photoImg;
diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index e89ec981..0ce07aad 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -147,7 +147,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
 	mHtmlView = mHtmlPart->view();
 	mHtmlView->setMarginWidth(4);
 	mHtmlView->setMarginHeight(4);
-	mHtmlView->setFocusPolicy(TQ_NoFocus);
+	mHtmlView->setFocusPolicy(TQWidget::NoFocus);
 	mHtmlView->setSizePolicy(
 	TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 	l->addWidget(mHtmlView);
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index d5aadadb..54bc7f7e 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -732,7 +732,7 @@ void JabberContact::setPhoto( const TQString &photoPath )
 		TQString newLocation( locateLocal( "appdata", "jabberphotos/"+ KURL(photoPath).fileName().lower() ) );
 	
 		// Scale and crop the picture.
-		contactPhoto = contactPhoto.smoothScale( 96, 96, TQ_ScaleMin );
+		contactPhoto = contactPhoto.smoothScale( 96, 96, TQImage::ScaleMin );
 		// crop image if not square
 		if(contactPhoto.width() < contactPhoto.height()) 
 			contactPhoto = contactPhoto.copy((contactPhoto.width()-contactPhoto.height())/2, 0, 96, 96);
@@ -751,7 +751,7 @@ void JabberContact::setPhoto( const TQString &photoPath )
 		TQString newLocation( locateLocal( "appdata", "jabberphotos/"+ KURL(photoPath).fileName().lower() ) );
 	
 		// Scale and crop the picture.
-		contactPhoto = contactPhoto.smoothScale( 32, 32, TQ_ScaleMin );
+		contactPhoto = contactPhoto.smoothScale( 32, 32, TQImage::ScaleMin );
 		// crop image if not square
 		if(contactPhoto.width() < contactPhoto.height())
 			contactPhoto = contactPhoto.copy((contactPhoto.width()-contactPhoto.height())/2, 0, 32, 32);
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 58e92af7..3f12b2f5 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -493,7 +493,7 @@ void dlgJabberVCard::slotSelectPhoto()
 		if(img.width() > 96 || img.height() > 96)
 		{
 			// Scale and crop the picture.
-			img = img.smoothScale( 96, 96, TQ_ScaleMin );
+			img = img.smoothScale( 96, 96, TQImage::ScaleMin );
 			// crop image if not square
 			if(img.width() < img.height()) 
 				img = img.copy((img.width()-img.height())/2, 0, 96, 96);
@@ -504,7 +504,7 @@ void dlgJabberVCard::slotSelectPhoto()
 		else if (img.width() < 32 || img.height() < 32)
 		{
 			// Scale and crop the picture.
-			img = img.smoothScale( 32, 32, TQ_ScaleMin );
+			img = img.smoothScale( 32, 32, TQImage::ScaleMin );
 			// crop image if not square
 			if(img.width() < img.height())
 				img = img.copy((img.width()-img.height())/2, 0, 32, 32);
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index d2570586..2b7e8ab6 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -160,7 +160,7 @@ bool MSNProtocol::validContactId(const TQString& userid)
 TQImage MSNProtocol::scalePicture(const TQImage &picture)
 {
 	TQImage img(picture);
-	img = img.smoothScale( 96, 96, TQ_ScaleMin );
+	img = img.smoothScale( 96, 96, TQImage::ScaleMin );
 	// crop image if not square
 	if(img.width() < img.height())
 	{
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index c540f13e..6bb0edb9 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -475,7 +475,7 @@ void OscarAccount::setBuddyIcon( KURL url )
 		
 		const TQSize size = ( d->engine->isIcq() ) ? TQSize( 52, 64 ) : TQSize( 48, 48 );
 		
-		image = image.smoothScale( size, TQ_ScaleMax );
+		image = image.smoothScale( size, TQImage::ScaleMax );
 		if( image.width() > size.width())
 			image = image.copy( ( image.width() - size.width() ) / 2, 0, size.width(), image.height() );
 		
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 9e2925cf..91d845df 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -1791,7 +1791,7 @@ void YahooAccount::setBuddyIcon( const KURL &url )
 			KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), KMessageBox::Sorry, i18n( "<qt>The selected buddy icon could not be opened. <br />Please set a new buddy icon.</qt>" ), i18n( "Yahoo Plugin" ) );
 			return;
 		}
-		image = image.smoothScale( 96, 96, TQ_ScaleMin );
+		image = image.smoothScale( 96, 96, TQImage::ScaleMin );
 		if(image.width() < image.height())
 		{
 			image = image.copy((image.width()-image.height())/2, 0, 96, 96);
diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp
index cfd24c3a..352fdd5b 100644
--- a/kppp/accounts.cpp
+++ b/kppp/accounts.cpp
@@ -115,7 +115,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
   l121->addWidget(costlabel);
 
   costedit = new TQLineEdit(parent);
-  costedit->setFocusPolicy(TQ_NoFocus);
+  costedit->setFocusPolicy(TQWidget::NoFocus);
   costedit->setFixedHeight(costedit->sizeHint().height());
   costedit->setEnabled(FALSE);
   l121->addWidget(costedit);
@@ -134,7 +134,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name )
   l121->addWidget(vollabel);
 
   voledit = new TQLineEdit(parent,"voledit");
-  voledit->setFocusPolicy(TQ_NoFocus);
+  voledit->setFocusPolicy(TQWidget::NoFocus);
   voledit->setFixedHeight(voledit->sizeHint().height());
   voledit->setEnabled(FALSE);
   l121->addWidget(voledit);
diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp
index cc5386e7..f65c36ca 100644
--- a/kppp/pppstatdlg.cpp
+++ b/kppp/pppstatdlg.cpp
@@ -89,13 +89,13 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *,
   ip_address_label1->setText(i18n("Local Addr:"));
 
   ip_address_label2 = new IPLineEdit(this);
-  ip_address_label2->setFocusPolicy(TQ_NoFocus);
+  ip_address_label2->setFocusPolicy(TQWidget::NoFocus);
 
   ip_address_label3 = new TQLabel(this);
   ip_address_label3->setText(i18n("Remote Addr:"));
 
   ip_address_label4 = new IPLineEdit(this);
-  ip_address_label4->setFocusPolicy(TQ_NoFocus);
+  ip_address_label4->setFocusPolicy(TQWidget::NoFocus);
 
   l1112->addWidget(ip_address_label1, 0, 0);
   l1112->addWidget(ip_address_label2, 0, 1);
diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp
index c3fc516e..2af3efb4 100644
--- a/kppp/pwentry.cpp
+++ b/kppp/pwentry.cpp
@@ -49,7 +49,7 @@ PWEntry::PWEntry( TQWidget *parent, const char *name )
 
    frame = new TQGroupBox(name, this );
    
-   setFocusPolicy( TQ_StrongFocus );
+   setFocusPolicy( TQWidget::StrongFocus );
    
    pw = new TQLineEdit( this, "le" );
    pw->setEchoMode( TQLineEdit::Password ); 
diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp
index ea5e84f4..3cc22228 100644
--- a/krdc/vnc/kvncview.cpp
+++ b/krdc/vnc/kvncview.cpp
@@ -91,7 +91,7 @@ KVncView::KVncView(TQWidget *parent,
 	password = _password;
 	dpy = tqt_xdisplay();
 	setFixedSize(16,16);
-	setFocusPolicy(TQ_StrongFocus);
+	setFocusPolicy(TQWidget::StrongFocus);
 
 	m_cb = TQApplication::clipboard();
 	connect(m_cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp
index 848301df..84eb1eb0 100644
--- a/ksirc/colorpicker.cpp
+++ b/ksirc/colorpicker.cpp
@@ -45,7 +45,7 @@ ColorPicker::ColorPicker( TQWidget *parent, const char *name )
     sampleLayout->addWidget( preview );
 
     m_sample = new TQLineEdit( i18n( "Sample Text" ), sampleBox );
-    m_sample->setFocusPolicy( TQ_NoFocus );
+    m_sample->setFocusPolicy( TQWidget::NoFocus );
     m_sample->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum,
                              m_sample->sizePolicy().verData() ) );
     sampleLayout->addWidget( m_sample );
@@ -140,7 +140,7 @@ ColorBar::ColorBar( const TQValueVector<TQColor> &colors, TQWidget *parent,
 
     updateCellSize();
 
-    setFocusPolicy( TQ_StrongFocus );
+    setFocusPolicy( TQWidget::StrongFocus );
 }
 
 void ColorBar::drawContents( TQPainter *p )
diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp
index 76f24488..b2ab5840 100644
--- a/ksirc/topic.cpp
+++ b/ksirc/topic.cpp
@@ -184,7 +184,7 @@ KSircTopicEditor::KSircTopicEditor( TQWidget *parent, const char *name )
     : TQTextEdit( parent, name )
 {
     setWFlags( WDestructiveClose );
-    setFocusPolicy( TQ_ClickFocus );
+    setFocusPolicy( TQWidget::ClickFocus );
     connect( this, TQT_SIGNAL( textChanged () ), this, TQT_SLOT( slotMaybeResize() ) );
 }
 
diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp
index d0f05756..5bf678d2 100644
--- a/ksirc/toplevel.cpp
+++ b/ksirc/toplevel.cpp
@@ -244,7 +244,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
 #endif
 
   mainw = new KSircView(ksircProcess(), pan, kstn + "KSircView" );
-  mainw->setFocusPolicy(TQ_NoFocus);
+  mainw->setFocusPolicy(TQWidget::NoFocus);
 
   nicks_box = new TQVBox(pan);
 
@@ -253,7 +253,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
            this, TQT_SLOT(setMode(TQString, int, TQString)));
 
   nicks = new aListBox(nicks_box, kstn + "aListBox");
-  nicks->setFocusPolicy(TQ_NoFocus);
+  nicks->setFocusPolicy(TQWidget::NoFocus);
   //nicks->hide(); // default = only the main widget
 
   lag = new TQLabel(nicks_box);
@@ -360,7 +360,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
 
   // setup line editor
 
-  linee->setFocusPolicy(TQ_StrongFocus);
+  linee->setFocusPolicy(TQWidget::StrongFocus);
   linee->setFont(ksopts->defaultFont);
 
   if(ksopts->oneLineEntry == true) {