Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 04e50e547f8ed2d6db996bc4816179fa962bd6b1)

14 files changed, 29 insertions, 29 deletions

diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 52272fc7..c9b14274 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -300,9 +300,9 @@ KexiDBAutoField::setInvalidState( const TQString &text )
 		return;
 	d->widgetType = Auto;
 	createEditor();
-	setFocusPolicy(TQ_NoFocus);
+	setFocusPolicy(TQWidget::NoFocus);
 	if (m_subwidget)
-		m_subwidget->setFocusPolicy(TQ_NoFocus);
+		m_subwidget->setFocusPolicy(TQWidget::NoFocus);
 //! @todo or set this to editor's text?
 	d->label->setText( text );
 }
@@ -667,7 +667,7 @@ KexiDBAutoField::sizeHint() const
 }
 
 void
-KexiDBAutoField::setFocusPolicy( TQ_FocusPolicy policy )
+KexiDBAutoField::setFocusPolicy( TQWidget::FocusPolicy policy )
 {
 	d->focusPolicyChanged = true;
 	TQWidget::setFocusPolicy(policy);
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.h b/kexi/plugins/forms/widgets/kexidbautofield.h
index a45289d0..3c0c7548 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.h
+++ b/kexi/plugins/forms/widgets/kexidbautofield.h
@@ -133,7 +133,7 @@ class KEXIFORMUTILS_EXPORT KexiDBAutoField :
 		TQString fieldCaptionInternal() const;
 
 		virtual TQSize sizeHint() const;
-		virtual void setFocusPolicy ( TQ_FocusPolicy policy );
+		virtual void setFocusPolicy ( TQWidget::FocusPolicy policy );
 
 		//! Reimplemented to return internal editor's color.
 		const TQColor & paletteForegroundColor() const;
diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
index 5d123d4d..d97fe7d9 100644
--- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp
@@ -29,7 +29,7 @@ KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const cha
  , m_tristateChanged(false)
  , m_tristate(TristateDefault)
 {
-	setFocusPolicy(TQ_StrongFocus);
+	setFocusPolicy(TQWidget::StrongFocus);
 	updateTristate();
 	connect(this, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotStateChanged(int)));
 }
@@ -44,8 +44,8 @@ void KexiDBCheckBox::setInvalidState( const TQString& displayText )
 	setState(NoChange);
 	m_invalidState = true;
 //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ?
-	if (focusPolicy() & TQ_TabFocus)
-		setFocusPolicy(TQ_ClickFocus);
+	if (focusPolicy() & TQWidget::TabFocus)
+		setFocusPolicy(TQWidget::ClickFocus);
 	setText(displayText);
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 26ba8ebe..afe2e3aa 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -78,7 +78,7 @@ KexiDBComboBox::KexiDBComboBox(TQWidget *parent, const char *name, bool designMo
  , d(new Private())
 {
 	setMouseTracking(true);
-	setFocusPolicy(TQ_WheelFocus);
+	setFocusPolicy(TQWidget::WheelFocus);
 	installEventFilter(this);
 	d->designMode = designMode;
 	d->paintedCombo = new KComboBox(this);
diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
index 2b72fc53..da8c9fc4 100644
--- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp
@@ -82,7 +82,7 @@ void KexiDBDateEdit::setInvalidState( const TQString& )
 	m_invalidState = true;
 //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ?
 	if (focusPolicy() & TabFocus)
-		setFocusPolicy(TQ_ClickFocus);
+		setFocusPolicy(TQWidget::ClickFocus);
 }
 
 void
diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
index 65edd28a..35506591 100644
--- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp
@@ -91,7 +91,7 @@ void KexiDBDateTimeEdit::setInvalidState(const TQString & /*! @todo paint this t
 	m_invalidState = true;
 //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ?
 	if (focusPolicy() & TabFocus)
-		setFocusPolicy(TQ_ClickFocus);
+		setFocusPolicy(TQWidget::ClickFocus);
 }
 
 void
diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
index 99afcbd6..0fdc08cf 100644
--- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp
@@ -39,7 +39,7 @@ void KexiDBDoubleSpinBox::setInvalidState( const TQString& displayText )
 	setReadOnly(true);
 //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ?
 	if (focusPolicy() & TabFocus)
-		setFocusPolicy(TQ_ClickFocus);
+		setFocusPolicy(TQWidget::ClickFocus);
 	setSpecialValueText(displayText);
 	KDoubleSpinBox::setValue(minValue());
 }
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 106e465b..a6603867 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -310,7 +310,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 //	if (d->orderedFocusWidgets.isEmpty()) {
 		//generate a new list
 		for (KFormDesigner::ObjectTreeListIterator it(form->tabStopsIterator()); it.current(); ++it) {
-			if (it.current()->widget()->focusPolicy() & TQ_TabFocus) {
+			if (it.current()->widget()->focusPolicy() & TQWidget::TabFocus) {
 				//this widget has tab focus:
 				it.current()->widget()->installEventFilter(this);
 				//also filter events for data-aware children of this widget (i.e. KexiDBAutoField's editors)
@@ -368,7 +368,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
 void KexiDBForm::updateTabStopsOrder()
 {
 	for (TQPtrListIterator<TQWidget> it( d->orderedFocusWidgets ); it.current();) {
-		if (! (it.current()->focusPolicy() & TQ_TabFocus))
+		if (! (it.current()->focusPolicy() & TQWidget::TabFocus))
 			d->orderedFocusWidgets.remove( it.current() );
 		else
 			++it;
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index e8b7aa93..1d81cc1c 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -91,7 +91,7 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n
 	}
 	else {
 		m_chooser = new KexiDropDownButton(this);
-		m_chooser->setFocusPolicy(TQ_StrongFocus);
+		m_chooser->setFocusPolicy(TQWidget::StrongFocus);
 		m_chooser->setPopup(m_popupMenu);
 		setFocusProxy(m_chooser);
 		m_chooser->installEventFilter(this);
@@ -711,7 +711,7 @@ void KexiDBImageBox::updatePixmap()
 		KexiDBImageBox_pmDeleter.setObject( KexiDBImageBox_pm, new TQPixmap(fname, "PNG") );
 		TQImage img(KexiDBImageBox_pm->convertToImage());
 		KexiDBImageBox_pmSmallDeleter.setObject( KexiDBImageBox_pmSmall, 
-			new TQPixmap( img.smoothScale(img.width()/2, img.height()/2, TQ_ScaleMin) ) );
+			new TQPixmap( img.smoothScale(img.width()/2, img.height()/2, TQImage::ScaleMin) ) );
 	}
 }
 
@@ -849,19 +849,19 @@ bool KexiDBImageBox::eventFilter( TQObject * watched, TQEvent * e )
 	return KexiFrame::eventFilter(watched, e);
 }
 
-TQ_FocusPolicy KexiDBImageBox::focusPolicy() const
+TQWidget::FocusPolicy KexiDBImageBox::focusPolicy() const
 {
 	if (dataSource().isEmpty())
-		return TQ_NoFocus;
+		return TQWidget::NoFocus;
 	return m_focusPolicyInternal;
 }
 
-TQ_FocusPolicy KexiDBImageBox::focusPolicyInternal() const
+TQWidget::FocusPolicy KexiDBImageBox::focusPolicyInternal() const
 {
 	return m_focusPolicyInternal;
 }
 
-void KexiDBImageBox::setFocusPolicy( TQ_FocusPolicy policy )
+void KexiDBImageBox::setFocusPolicy( TQWidget::FocusPolicy policy )
 {
 	m_focusPolicyInternal = policy;
 	KexiFrame::setFocusPolicy( focusPolicy() ); //set modified policy
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.h b/kexi/plugins/forms/widgets/kexidbimagebox.h
index 4abb9fb3..8c0be858 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.h
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.h
@@ -127,14 +127,14 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 		/*! Overriden to change the policy behaviour a bit:
 		 NoFocus is returned regardless the real focus flag 
 		 if the data source is empty (see dataSource()). */
-		TQ_FocusPolicy focusPolicy() const;
+		TQWidget::FocusPolicy focusPolicy() const;
 
 		//! \return the internal focus policy value, i.e. the one unrelated to data source presence.
-		TQ_FocusPolicy focusPolicyInternal() const;
+		TQWidget::FocusPolicy focusPolicyInternal() const;
 
 		/*! Sets the internal focus policy value. 
 		 "Internal" means that if there is no data source set, real policy becomes NoFocus. */
-		virtual void setFocusPolicy( TQ_FocusPolicy policy );
+		virtual void setFocusPolicy( TQWidget::FocusPolicy policy );
 
 	public slots:
 		void setPixmapId(uint id);
@@ -259,7 +259,7 @@ class KEXIFORMUTILS_EXPORT KexiDBImageBox :
 //			*m_deleteAction, *m_propertiesAction;
 //		TQTimer m_clickTimer;
 		int m_alignment;
-		TQ_FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal()
+		TQWidget::FocusPolicy m_focusPolicyInternal; //!< Used for focusPolicyInternal()
 		bool m_designMode : 1;
 		bool m_readOnly : 1;
 		bool m_scaledContents : 1;
diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
index a48d06c8..633fe6fc 100644
--- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp
@@ -40,7 +40,7 @@ void KexiDBIntSpinBox::setInvalidState( const TQString& displayText )
 	setReadOnly(true);
 //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ?
 	if (focusPolicy() & TabFocus)
-		setFocusPolicy(TQ_ClickFocus);
+		setFocusPolicy(TQWidget::ClickFocus);
 	setSpecialValueText(displayText);
 	KIntSpinBox::setValue(minValue());
 }
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 8e74324a..5d1fadf6 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -80,8 +80,8 @@ void KexiDBLineEdit::setInvalidState( const TQString& displayText )
 {
 	KLineEdit::setReadOnly(true);
 //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ?
-	if (focusPolicy() & TQ_TabFocus)
-		setFocusPolicy(TQ_ClickFocus);
+	if (focusPolicy() & TQWidget::TabFocus)
+		setFocusPolicy(TQWidget::ClickFocus);
 	setText(displayText);
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index 6352f334..98ad8bd5 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -47,8 +47,8 @@ void KexiDBTextEdit::setInvalidState( const TQString& displayText )
 {
 	setReadOnly(true);
 //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ?
-	if (focusPolicy() & TQ_TabFocus)
-		setFocusPolicy(TQ_ClickFocus);
+	if (focusPolicy() & TQWidget::TabFocus)
+		setFocusPolicy(TQWidget::ClickFocus);
 	KTextEdit::setText(displayText);
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
index 5473a9cb..ac42fa85 100644
--- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp
@@ -56,7 +56,7 @@ void KexiDBTimeEdit::setInvalidState( const TQString&)
 	m_invalidState = true;
 //! @todo move this to KexiDataItemInterface::setInvalidStateInternal() ?
 	if (focusPolicy() & TabFocus)
-		setFocusPolicy(TQ_ClickFocus);
+		setFocusPolicy(TQWidget::ClickFocus);
 }
 
 void