Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 22 insertions, 22 deletions

diff --git a/configdialog/kbfxconfigapp.cpp b/configdialog/kbfxconfigapp.cpp
index 80f77fd..d9f3ac8 100644
--- a/configdialog/kbfxconfigapp.cpp
+++ b/configdialog/kbfxconfigapp.cpp
@@ -365,7 +365,7 @@ void KbfxConfigApp::KbfxNewsBrowserLoad()
 		browser->view()->resize ( KBFXNewsBrowser->width(), KBFXNewsBrowser->height() );
 		browser->view()->setVScrollBarMode ( TQScrollView::AlwaysOff );
 		browser->view()->setHScrollBarMode ( TQScrollView::AlwaysOff );
-		browser->view()->setFocusPolicy ( TQ_NoFocus );
+		browser->view()->setFocusPolicy ( TQWidget::NoFocus );
 		browser->view()->show();
 
 		connect ( browser->browserExtension(),
diff --git a/kbfxlib/common/kbfxpushbutton.cpp b/kbfxlib/common/kbfxpushbutton.cpp
index 29033da..35acf17 100644
--- a/kbfxlib/common/kbfxpushbutton.cpp
+++ b/kbfxlib/common/kbfxpushbutton.cpp
@@ -26,7 +26,7 @@ KbfxPushButton::KbfxPushButton ( TQWidget *parent, const char *name )
 {
 	setText ( "P R E V I E W" );
 	setToggleButton ( TRUE );
-	setFocusPolicy ( TQ_NoFocus );
+	setFocusPolicy ( TQWidget::NoFocus );
 }
 
 KbfxPushButton::~KbfxPushButton()
diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp
index 1d4b91a..f89a61a 100644
--- a/src/kbfxbutton.cpp
+++ b/src/kbfxbutton.cpp
@@ -69,23 +69,23 @@ void KbfxButton::loadSkins()
 		: TQImage ( ConfigInit ().m_KbfxNormalButtonPathDefault );
 
 	TQSize _sizeNormal = _tmpNormal.size();
-	_tmpHover = _tmpHover.smoothScale ( _sizeNormal, TQ_ScaleFree );
-	_tmpPressed = _tmpPressed.smoothScale ( _sizeNormal, TQ_ScaleFree );
+	_tmpHover = _tmpHover.smoothScale ( _sizeNormal, TQImage::ScaleFree );
+	_tmpPressed = _tmpPressed.smoothScale ( _sizeNormal, TQImage::ScaleFree );
 
 
 	if ( !m_kicker_auto_adjust )
 	{
 		if ( m_sizeHeight )
 		{
-			_tmpHover = _tmpHover.smoothScale ( _tmpHover.width(), m_size, TQ_ScaleMin );
-			_tmpPressed = _tmpPressed.smoothScale ( _tmpPressed.width(), m_size, TQ_ScaleMin );
-			_tmpNormal = _tmpNormal.smoothScale ( _tmpNormal.width(), m_size, TQ_ScaleMin );
+			_tmpHover = _tmpHover.smoothScale ( _tmpHover.width(), m_size, TQImage::ScaleMin );
+			_tmpPressed = _tmpPressed.smoothScale ( _tmpPressed.width(), m_size, TQImage::ScaleMin );
+			_tmpNormal = _tmpNormal.smoothScale ( _tmpNormal.width(), m_size, TQImage::ScaleMin );
 		}
 		else
 		{
-			_tmpHover = _tmpHover.smoothScale ( m_size, _tmpHover.height(), TQ_ScaleMin );
-			_tmpPressed = _tmpPressed.smoothScale ( m_size, _tmpPressed.height(), TQ_ScaleMin );
-			_tmpNormal = _tmpNormal.smoothScale ( m_size, _tmpNormal.height(), TQ_ScaleMin );
+			_tmpHover = _tmpHover.smoothScale ( m_size, _tmpHover.height(), TQImage::ScaleMin );
+			_tmpPressed = _tmpPressed.smoothScale ( m_size, _tmpPressed.height(), TQImage::ScaleMin );
+			_tmpNormal = _tmpNormal.smoothScale ( m_size, _tmpNormal.height(), TQImage::ScaleMin );
 		}
 	}
 	m_over_skin = TQPixmap ( _tmpHover );
diff --git a/src/kbfxplasmacanvasitemwrapper.cpp b/src/kbfxplasmacanvasitemwrapper.cpp
index 294eead..08c8ec5 100644
--- a/src/kbfxplasmacanvasitemwrapper.cpp
+++ b/src/kbfxplasmacanvasitemwrapper.cpp
@@ -36,17 +36,17 @@ KbfxPlasmaCanvasItemWrapper::item ( KbfxPlasmaCanvasItem::Type __type )
 {
 	TQPixmap _img_sep = ( *KbfxPlasmaPixmapProvider::pixmap ( "separator" ) );
 	TQImage _tmp_img = _img_sep.convertToImage();
-	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_sep.height (),TQ_ScaleFree );
+	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_sep.height (),TQImage::ScaleFree );
 	_img_sep = TQPixmap ( _tmp_img );
 
 	TQPixmap _img_tnorm = ( *KbfxPlasmaPixmapProvider::pixmap ( "tilenormal" ) );
 	_tmp_img = _img_tnorm.convertToImage();
-	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_tnorm.height (),TQ_ScaleFree );
+	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_tnorm.height (),TQImage::ScaleFree );
 	_img_tnorm = TQPixmap ( _tmp_img );
 
 	TQPixmap _img_thov = ( *KbfxPlasmaPixmapProvider::pixmap ( "tilehover" ) );
 	_tmp_img = _img_thov.convertToImage();
-	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_thov.height (),TQ_ScaleFree );
+	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, _img_thov.height (),TQImage::ScaleFree );
 	_img_thov = TQPixmap ( _tmp_img );
 
 	if ( __type == KbfxPlasmaCanvasItem::SEPARATOR )
@@ -85,17 +85,17 @@ KbfxPlasmaCanvasItemWrapper::itemIndex ( KbfxPlasmaCanvasItem::Type __type )
 {
 	TQPixmap _img_isep = ( *KbfxPlasmaPixmapProvider::pixmap ( "indexseparator" ) );
 	TQImage _tmp_img = _img_isep.convertToImage();
-	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_isep.height (),TQ_ScaleFree );
+	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_isep.height (),TQImage::ScaleFree );
 	_img_isep = TQPixmap ( _tmp_img );
 
 	TQPixmap _img_r = ( *KbfxPlasmaPixmapProvider::pixmap ( "rhstile" ) );
 	_tmp_img = _img_r.convertToImage();
-	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_r.height (),TQ_ScaleFree );
+	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_r.height (),TQImage::ScaleFree );
 	_img_r = TQPixmap ( _tmp_img );
 
 	TQPixmap _img_rhov = ( *KbfxPlasmaPixmapProvider::pixmap ( "rhshovertile" ) );
 	_tmp_img = _img_rhov.convertToImage();
-	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_rhov.height (),TQ_ScaleFree );
+	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_listBox_w, _img_rhov.height (),TQImage::ScaleFree );
 	_img_rhov = TQPixmap ( _tmp_img );
 
 	if ( __type == KbfxPlasmaCanvasItem::SEPARATOR )
diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp
index d7c8511..6be8623 100644
--- a/src/kbfxplasmacanvasview.cpp
+++ b/src/kbfxplasmacanvasview.cpp
@@ -329,7 +329,7 @@ KbfxPlasmaCanvasView::setKbfxCanvas ( TQCanvas * cnv )
 	if ( pixmap != NULL )
 	{
 		TQImage img = pixmap->convertToImage();
-		img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree );
+		img = img.smoothScale ( this->width(),pixmap->height(),TQImage::ScaleFree );
 		pixmap->convertFromImage ( img );
 		this->canvas ()->setBackgroundPixmap ( *pixmap );
 	}
@@ -463,7 +463,7 @@ KbfxPlasmaCanvasView::search_R ( const TQString name )
 	if ( pixmap != NULL )
 	{
 		TQImage img = pixmap->convertToImage();
-		img = img.smoothScale ( this->width(),pixmap->height(),TQ_ScaleFree );
+		img = img.smoothScale ( this->width(),pixmap->height(),TQImage::ScaleFree );
 		pixmap->convertFromImage ( img );
 		this->canvas ()->setBackgroundPixmap ( *pixmap );
 	}
diff --git a/src/kbfxspinxmenu.cpp b/src/kbfxspinxmenu.cpp
index 91f1eb3..4506da0 100644
--- a/src/kbfxspinxmenu.cpp
+++ b/src/kbfxspinxmenu.cpp
@@ -80,7 +80,7 @@ KbfxSpinxMenuWidget::init()
 	m_search = new TQLineEdit ( this, "Search BOX" );
 	TQToolTip::add( m_search, tr2i18n( "Type here to search..." ) );
 	m_search->setFrameShape ( TQFrame::NoFrame );
-	m_search->setFocusPolicy ( TQ_StrongFocus );
+	m_search->setFocusPolicy ( TQWidget::StrongFocus );
 	m_search->move ( ConfigInit ().m_searchBox_x + m_searchTag->width (),
 	                 ConfigInit ().m_searchBox_y );
 	m_search->resize ( ConfigInit ().m_searchBox_w - m_searchTag->width (),
@@ -238,7 +238,7 @@ KbfxSpinxMenuWidget::createMask ()
 	rawimg =
 	    rawimg.smoothScale ( ConfigInit ().m_userMenuWidth,
 	                   ConfigInit ().m_userMenuHeight,
-	                   TQ_ScaleFree );
+	                   TQImage::ScaleFree );
 
 	maskpng.convertFromImage ( rawimg );
 
diff --git a/src/kbfxspinxscrollbar.cpp b/src/kbfxspinxscrollbar.cpp
index d47c6e6..f4cd784 100644
--- a/src/kbfxspinxscrollbar.cpp
+++ b/src/kbfxspinxscrollbar.cpp
@@ -30,7 +30,7 @@ KbfxSpinxScrollBar::KbfxSpinxScrollBar ( TQWidget * parent, const char *name, in
         m_normal = ( *KbfxPlasmaPixmapProvider::pixmap ( "scrollnormalbot" ) );
     }
         TQImage _tmp_img = m_normal.convertToImage();
-	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, m_normal.height (),TQ_ScaleFree );
+	_tmp_img = _tmp_img.smoothScale ( ConfigInit().m_itemView_w, m_normal.height (),TQImage::ScaleFree );
 	m_normal = TQPixmap ( _tmp_img );
 
 	this->resize ( m_normal.width (), m_normal.height () );
diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp
index 3e851e7..c82e147 100644
--- a/src/kbfxspinxtoolbutton.cpp
+++ b/src/kbfxspinxtoolbutton.cpp
@@ -85,7 +85,7 @@ KbfxSpinxToolButton::setPixmaps ( TQPixmap normal, TQPixmap hover )
 {
 	TQSize _sizeNormal = normal.size();
 	TQImage _tmpHover = hover.convertToImage ();
-	_tmpHover = _tmpHover.smoothScale ( _sizeNormal, TQ_ScaleFree );
+	_tmpHover = _tmpHover.smoothScale ( _sizeNormal, TQImage::ScaleFree );
 
 	m_normal = normal;
 	m_hover = TQPixmap ( _tmpHover );