Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ee077affc0b8b1df873d13d00e66e8044e5d505b)

8 files changed, 12 insertions, 12 deletions

diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 8fdd1bd0..705233f3 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -659,7 +659,7 @@ KviActionEditor::KviActionEditor(TQWidget * par)
 	m_pListView = new KviActionEditorListView(box);
 	//m_pListView->setMultiSelection(false);
 	m_pListView->setShowSortIndicator(true);
-	m_pListView->setFocusPolicy(TQ_StrongFocus);
+	m_pListView->setFocusPolicy(TQWidget::StrongFocus);
 	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentChanged(KviTalListViewItem *)));
 
 
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index 67c0793d..1de90892 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -52,7 +52,7 @@ KviHelpWidget::KviHelpWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 //#warning "Re enable this when using TQt 3.0 : TQProcess "
 	m_pTextBrowser = new TQTextBrowser(this,"text_browser");
 	m_pTextBrowser->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken);
-	m_pTextBrowser->setFocusPolicy(TQ_NoFocus);
+	m_pTextBrowser->setFocusPolicy(TQWidget::NoFocus);
 	m_pToolBar = new KviTalHBox(this);
 
 	m_pBtnIndex = new KviStyledToolButton(m_pToolBar);
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 1faa6146..ea92cfc7 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -145,7 +145,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	layout->addWidget(w,11,1);
 
 	m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
-		m_pIrcView->setFocusPolicy(TQ_ClickFocus);
+		m_pIrcView->setFocusPolicy(TQWidget::ClickFocus);
 	KviValueList<int> li;
 	li.append(110);
 	li.append(width()-110);
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 25afa711..fa55316e 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -119,7 +119,7 @@ KviNotifierWindow::KviNotifierWindow()
 	if(m_iInputHeight < 10)m_iInputHeight = 10;
 
 	setBackgroundMode(TQt::NoBackground);
-	setFocusPolicy(TQ_NoFocus);
+	setFocusPolicy(TQWidget::NoFocus);
 	setMouseTracking(true);
 	//setCursor(m_cursor);
 	
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index de92fc98..74e5dc1d 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -78,10 +78,10 @@ const int widgettypes_cod[] = {
 };
 
 
-	#define TQT_WIDGET_TABFOCUS TQ_TabFocus
-	#define	TQT_WIDGET_CLICKFOCUS TQ_ClickFocus
-	#define TQT_WIDGET_STRONGFOCUS TQ_StrongFocus
-	#define TQT_WIDGET_NOFOCUS TQ_NoFocus
+	#define TQT_WIDGET_TABFOCUS TQWidget::TabFocus
+	#define	TQT_WIDGET_CLICKFOCUS TQWidget::ClickFocus
+	#define TQT_WIDGET_STRONGFOCUS TQWidget::StrongFocus
+	#define TQT_WIDGET_NOFOCUS TQWidget::NoFocus
 
 
 #define widgettypes_num	(sizeof(widgettypes_tbl) / sizeof(widgettypes_tbl[0]))
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 7ae09b77..8afd2b3b 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -328,7 +328,7 @@ void KviPackThemeDialog::imageSelectionChanged(const TQString &szImagePath)
 	{
 		TQPixmap out;
 		if(pix.width() > 300 || pix.height() > 225)
-			out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin));
+			out.convertFromImage(pix.smoothScale(300,225,TQImage::ScaleMin));
 		else
 			out.convertFromImage(pix);
 		m_pImageLabel->setPixmap(out);
@@ -365,7 +365,7 @@ bool KviPackThemeDialog::packTheme()
 	if(!pix.isNull())
 	{
 		if(pix.width() > 300 || pix.height() > 225)
-			out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin));
+			out.convertFromImage(pix.smoothScale(300,225,TQImage::ScaleMin));
 		else
 			out.convertFromImage(pix);
 	} else {
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index 8e015309..e7b78334 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -187,7 +187,7 @@ void KviSaveThemeDialog::imageSelectionChanged(const TQString &szImagePath)
 	{
 		TQPixmap out;
 		if(pix.width() > 300 || pix.height() > 225)
-			out.convertFromImage(pix.smoothScale(300,225,TQ_ScaleMin));
+			out.convertFromImage(pix.smoothScale(300,225,TQImage::ScaleMin));
 		else
 			out.convertFromImage(pix);
 		m_pImageLabel->setPixmap(out);
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 3556fd3b..dfd884e8 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -144,7 +144,7 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *g_pList)
 	connect(m_pUrlList,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *, const TQPoint &, int)),TQT_SLOT(popup(KviTalListViewItem *, const TQPoint &, int)));
 
 //	setFocusHandlerNoChildren(m_pUrlList);
-	m_pUrlList->setFocusPolicy(TQ_StrongFocus);
+	m_pUrlList->setFocusPolicy(TQWidget::StrongFocus);
 	m_pUrlList->setFocus();
 }