Replaced various '#define' with actual strings - part 3

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

6 files changed, 8 insertions, 8 deletions

diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index bb3b0ec8..e7d5c6b9 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -124,7 +124,7 @@ void KexiSmallToolButton::drawButton( TQPainter *_painter )
 			arrowFlags |= TQStyle::Style_Down;
 		if (isEnabled())
 			arrowFlags |= TQStyle::Style_Enabled;
-		style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
+		style().drawPrimitive(TQStyle::PE_ArrowDown, _painter,
 			TQRect(width()-7, height()-7, 5, 5), colorGroup(),
 			arrowFlags, TQStyleOption() );
 	}
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 3ad9e556..9248916c 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -60,7 +60,7 @@ PixmapCollection::addPixmapPath(const KURL &url)
 			name += "2";
 	}
 
-	m_pixmaps.insert(name, tqMakePair(url.path(), 0));
+	m_pixmaps.insert(name, qMakePair(url.path(), 0));
 	return name;
 }
 
@@ -78,7 +78,7 @@ PixmapCollection::addPixmapName(const TQString &icon, int size)
 			name += "2";
 	}
 
-	m_pixmaps.insert(name, tqMakePair(icon, size));
+	m_pixmaps.insert(name, qMakePair(icon, size));
 	return name;
 }
 
@@ -144,7 +144,7 @@ PixmapCollection::load(TQDomNode node)
 	for(TQDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling())
 	{
 		TQDomElement el = n.toElement();
-		TQPair<TQString, int> pair = tqMakePair(el.text(), el.attribute("size").toInt());
+		TQPair<TQString, int> pair = qMakePair(el.text(), el.attribute("size").toInt());
 		m_pixmaps[el.attribute("name")] = pair;
 	}
 }
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 2e18e00a..347805be 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -420,7 +420,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
 {
 	if (painter) {
-		style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
+		style().drawPrimitive(TQStyle::PE_FocusRect, painter, itemRect(item), colorGroup(),
 			TQStyle::Style_FocusAtBorder);
 	}
 	return itemRect(item);
diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
index 319bf305..dd55920c 100644
--- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
+++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp
@@ -64,7 +64,7 @@ void KexiComboBoxDropDownButton::drawButton(TQPainter *p)
 	}
 	else {
 		r.setWidth(r.width()+2);
-		style().tqdrawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
+		style().drawPrimitive( TQStyle::PE_ArrowDown, p, r, colorGroup(), flags);
 	}
 }
 
diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp
index 68ba7deb..17501673 100644
--- a/kexi/widget/utils/kexidropdownbutton.cpp
+++ b/kexi/widget/utils/kexidropdownbutton.cpp
@@ -54,7 +54,7 @@ void KexiDropDownButton::drawButton( TQPainter *p )
 		arrowFlags |= TQStyle::Style_Down;
 	if (isEnabled())
 		arrowFlags |= TQStyle::Style_Enabled;
-	style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
+	style().drawPrimitive(TQStyle::PE_ArrowDown, p,
 		TQRect((width()-7)/2, height()-9, 7, 7), colorGroup(),
 		arrowFlags, TQStyleOption() );
 }
diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp
index ff97d21a..4309cd7f 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);
-		style().tqdrawPrimitive( TQStyle::PE_HeaderSection, &p, r,
+		style().drawPrimitive( TQStyle::PE_HeaderSection, &p, r,
 			(d->currentRow == i) ? selectedColorGroup : (d->highlightedRow == i ? highlightedColorGroup : colorGroup()), 
 			TQStyle::Style_Raised | (isEnabled() ? TQStyle::Style_Enabled : 0));
 	}