Rename obsolete tq methods to standard names

8 files changed, 26 insertions, 26 deletions

diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index fa5c35abd..6279aa049 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -117,14 +117,14 @@ bool KexiArrowTip::close ( bool alsoDelete )
 
 void KexiArrowTip::drawContents(TQPainter& p)
 {
-	p.setPen( TQPen(tqpalette().active().foreground(), 1) );
+	p.setPen( TQPen(palette().active().foreground(), 1) );
 	p.drawText(TQRect(0,m_arrowHeight,width(),height()-m_arrowHeight), 
 		TQt::AlignCenter, m_value.toString());
 }
 
 void KexiArrowTip::drawFrame(TQPainter& p)
 {
-	TQPen pen(tqpalette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
+	TQPen pen(palette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
 	p.setPen( pen );
 	/*
 	   /\
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index 60f99f85c..5e0b7ab81 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -34,7 +34,7 @@ KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *parent )
 	m_paintedCombo->setEditable(true);
 
 	setToggleButton(true);
-	styleChange(tqstyle());
+	styleChange(style());
 	m_paintedCombo->move(0,0);
 	m_paintedCombo->setFixedSize(size());
 }
@@ -58,30 +58,30 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
 			m_paintedCombo->move(0,0);
 			m_paintedCombo->setFixedSize(size()+TQSize(0, m_fixForHeight)); //last chance to fix size
 		}
-		tqstyle().drawComplexControl( TQStyle::CC_ComboBox, p,
+		style().drawComplexControl( TQStyle::CC_ComboBox, p,
 			m_fixForHeight>0 ? (const TQWidget*)m_paintedCombo : this, r, colorGroup(),
 			flags, (uint)(TQStyle::SC_ComboBoxArrow), TQStyle::SC_None );
 	}
 	else {
 		r.setWidth(r.width()+2);
-		tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
+		style().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
 	}
 }
 
 void KexiComboBoxDropDownButton::styleChange( TQStyle & oldStyle )
 {
 	//<hack>
-	if (qstricmp(tqstyle().name(),"thinkeramik")==0) {
+	if (qstricmp(style().name(),"thinkeramik")==0) {
 		m_fixForHeight = 3;
 	}
 	else
 		m_fixForHeight = 0;
 	//</hack>
 	m_drawComplexControl =
-		(tqstyle().inherits("KStyle") && qstricmp(tqstyle().name(),"qtcurve")!=0)
-		|| qstricmp(tqstyle().name(),"platinum")==0;
+		(style().inherits("KStyle") && qstricmp(style().name(),"qtcurve")!=0)
+		|| qstricmp(style().name(),"platinum")==0;
 	if (m_fixForHeight==0)
-		setFixedWidth( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, 
+		setFixedWidth( style().querySubControlMetrics( TQStyle::CC_ComboBox, 
 			(const TQWidget*)m_paintedCombo, TQStyle::SC_ComboBoxArrow ).width() +1 );
 	KPushButton::styleChange(oldStyle);
 }
diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp
index 1943b0869..0866cf652 100644
--- a/kexi/widget/utils/kexidisplayutils.cpp
+++ b/kexi/widget/utils/kexidisplayutils.cpp
@@ -92,7 +92,7 @@ KexiDisplayUtils::DisplayParameters::DisplayParameters()
 
 KexiDisplayUtils::DisplayParameters::DisplayParameters(TQWidget *w)
 {
-	textColor = w->tqpalette().active().foreground();
+	textColor = w->palette().active().foreground();
 	selectedTextColor = w->tqpalette().active().highlightedText();
 	font = w->font();
 }
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index 054192ce7..0710b4d06 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -33,10 +33,10 @@ KexiDropDownButton::KexiDropDownButton(TQWidget *parent)
 //	setFixedWidth(TQMAX(18, tqApp->globalStrut().width()));
 	int fixedWidth;
 	//hack
-	if (qstricmp(tqstyle().name(),"thinkeramik")==0)
+	if (qstricmp(style().name(),"thinkeramik")==0)
 		fixedWidth = 18; //typical width as in "windows" style
 	else
-		fixedWidth = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, 
+		fixedWidth = style().querySubControlMetrics( TQStyle::CC_ComboBox, 
 			this, TQStyle::SC_ComboBoxArrow ).width();
 	setFixedWidth( fixedWidth );
 	setPopupDelay(10/*ms*/);
@@ -54,7 +54,7 @@ void KexiDropDownButton::drawButton( TQPainter *p )
 		arrowFlags |= TQStyle::Style_Down;
 	if (isEnabled())
 		arrowFlags |= TQStyle::Style_Enabled;
-	tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
+	style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
 		TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(),
 		arrowFlags, TQStyleOption() );
 }
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index f6868a5e1..e2397ede8 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -64,7 +64,7 @@ KexiFlowLayoutIterator::takeCurrent()
 	return (m_idx < (int)count()) ? m_list->take(m_idx) : 0;
 }
 
-//// The tqlayout itself
+//// The layout itself
 
 KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name)
  : TQLayout(parent, border, space, name)
@@ -182,8 +182,8 @@ KexiFlowLayout::sizeHint() const
 TQSize
 KexiFlowLayout::minimumSize() const
 {
-//js: do we really need to simulate tqlayout here?
-//    I commented this out because it was impossible to stretch tqlayout conveniently.
+//js: do we really need to simulate layout here?
+//    I commented this out because it was impossible to stretch layout conveniently.
 //    Now, minimum size is computed automatically based on item's minimumSize...
 #if 0
 	if(m_cached_minSize.isEmpty()) {
@@ -246,7 +246,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 //		kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl;
 		TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if ((x + oSizeHint.width()) > r.right() && h > 0) {
-			// do the tqlayout of current line
+			// do the layout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
 			TQLayoutItem *item;
 			int wx = r.x();
@@ -298,7 +298,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		++it;
 	}
 
-	// don't forget to tqlayout the last line
+	// don't forget to layout the last line
 	TQPtrListIterator<TQLayoutItem> it2(currentLine);
 	TQLayoutItem *item;
 	int wx = r.x();
@@ -362,7 +362,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 
 		TQSize oSizeHint = o->sizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if (y + oSizeHint.height() > r.bottom() && w > 0) {
-			// do the tqlayout of current line
+			// do the layout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
 			TQLayoutItem *item;
 			int wy = r.y();
@@ -414,7 +414,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 		++it;
 	}
 
-	// don't forget to tqlayout the last line
+	// don't forget to layout the last line
 	TQPtrListIterator<TQLayoutItem> it2(currentLine);
 	TQLayoutItem *item;
 	int wy = r.y();
diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h
index aec6c6c3b..c23398e02 100644
--- a/kexi/widget/utils/kexiflowlayout.h
+++ b/kexi/widget/utils/kexiflowlayout.h
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqptrlist.h>
 
-//! @short a special "flow" tqlayout
+//! @short a special "flow" layout
 class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 {
 	public:
@@ -33,14 +33,14 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout
 
 		~KexiFlowLayout();
 
-		/*! \return the widgets in the order of the tqlayout,
+		/*! \return the widgets in the order of the layout,
 		 ie as it is stored in m_list. You must delete the list after using it. */
 		TQPtrList<TQWidget>* widgetList() const;
 
-		/*! Sets tqlayout's orientation to \a orientation. Default orientation isQt::Vertical. */
+		/*! Sets layout's orientation to \a orientation. Default orientation isQt::Vertical. */
 		void  setOrientation(Qt::Orientation orientation) { m_orientation = orientation; }
 
-		/*! \return tqlayout's orientation. */
+		/*! \return layout's orientation. */
 		Qt::Orientation orientation() const { return m_orientation; }
 
 		void setJustified(bool justify) { m_justify = justify; }
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index e3e281e3b..a2d6b3d60 100644
--- a/kexi/widget/utils/kexirecordmarker.cpp
+++ b/kexi/widget/utils/kexirecordmarker.cpp
@@ -205,7 +205,7 @@ void KexiRecordMarker::paintEvent(TQPaintEvent *e)
 		int y = ((d->rowHeight * i)-d->offset);
 		TQRect r(0, y, width(), d->rowHeight);
 		p.drawRect(r);
-		tqstyle().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
+		style().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
 			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), 
 			TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
 	}
diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp
index ad55774e2..2a36ef093 100644
--- a/kexi/widget/utils/kexitooltip.cpp
+++ b/kexi/widget/utils/kexitooltip.cpp
@@ -64,7 +64,7 @@ void KexiToolTip::paintEvent( TQPaintEvent *pev )
 
 void KexiToolTip::drawFrame(TQPainter& p)
 {
-	p.setPen( TQPen(tqpalette().active().foreground(), 1) );
+	p.setPen( TQPen(palette().active().foreground(), 1) );
 	p.drawRect(rect());
 }