Rename old tq methods that no longer need a unique name

2 files changed, 53 insertions, 53 deletions

diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index df40c1a5..227369cd 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -211,7 +211,7 @@ void dotNETstyle::renderButton(TQPainter *p,
 			p->setBrush(TQBrush::NoBrush);
 			p->drawConvexPolygon(outline);
 			p->setPen(g.button().light());
-			p->tqdrawPolyline(outline, 0, 3);
+			p->drawPolyline(outline, 0, 3);
 		} else {
 			p->setPen(g.button().dark());
 			p->setBrush(g.button());
@@ -335,13 +335,13 @@ void dotNETstyle::renderPanel(TQPainter *p,
 			p->setPen(g.background().dark());
 			p->drawConvexPolygon(TQPointArray(4, corners));
 			p->setPen(g.background().light());
-			p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+			p->drawPolyline(TQPointArray(4, corners), 0, 3);
 		} else {
 			const TQCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 };
 			p->setPen(g.background().dark());
 			p->drawPolygon(TQPointArray(4, corners));
 			p->setPen(g.background().light());
-			p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+			p->drawPolyline(TQPointArray(4, corners), 0, 3);
 		}
 	}
 
@@ -353,13 +353,13 @@ void dotNETstyle::renderPanel(TQPainter *p,
 				p->setPen(g.background().dark());
 				p->drawConvexPolygon(TQPointArray(4, corners));
 				p->setPen(g.background().light());
-				p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+				p->drawPolyline(TQPointArray(4, corners), 0, 3);
 			} else {
 				const TQCOORD corners[] = { x, y2, x, y, x2, y, x2, y2 };
 				p->setPen(g.background().dark());
 				p->drawPolygon(TQPointArray(4, corners));
 				p->setPen(g.background().light());
-				p->tqdrawPolyline(TQPointArray(4, corners), 0, 3);
+				p->drawPolyline(TQPointArray(4, corners), 0, 3);
 			}
 		}
 	}
@@ -719,8 +719,8 @@ void dotNETstyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
 			p->save();
 
 			if (flags & Style_Down) {
-				p->translate(tqpixelMetric(PM_ButtonShiftHorizontal),
-				             tqpixelMetric(PM_ButtonShiftVertical));
+				p->translate(pixelMetric(PM_ButtonShiftHorizontal),
+				             pixelMetric(PM_ButtonShiftVertical));
 			}
 
 			if (flags & Style_Enabled) {
@@ -757,7 +757,7 @@ void dotNETstyle::tqdrawPrimitive(TQ_PrimitiveElement pe,
 }
 
 
-void dotNETstyle::tqdrawControl(TQ_ControlElement element,
+void dotNETstyle::drawControl(TQ_ControlElement element,
                               TQPainter *p,
                               const TQWidget *widget,
                               const TQRect &r,
@@ -827,7 +827,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 					p->setPen(cg.highlight().dark(120));
 					p->drawConvexPolygon(corners);
 					p->setPen(cg.highlight().light(120));
-					p->tqdrawPolyline(corners, 0, 3);
+					p->drawPolyline(corners, 0, 3);
 					if (roundedCorners) {
 						p->setPen(cg.background().dark());
 						p->drawPoints(corners);
@@ -878,7 +878,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 						p->setPen(cg.background().dark());
 						if (selected) {
 							const TQCOORD oCorners[] = { x, y2, x, y, x2, y, x2, y2 };
-							p->tqdrawPolyline(TQPointArray(4, oCorners));
+							p->drawPolyline(TQPointArray(4, oCorners));
 
 							if (roundedCorners) {
 								p->setPen(cg.background());
@@ -898,7 +898,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 							p->fillRect(r2, TQColor(cg.mid().light(105)));
 
 							const TQCOORD oCorners[] = { x, y2, x, y + 2, x2, y + 2, x2, y2 };
-							p->tqdrawPolyline(TQPointArray(4, oCorners));
+							p->drawPolyline(TQPointArray(4, oCorners));
 
 							p->setPen(cg.background());
 
@@ -952,7 +952,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 						p->setPen(cg.background().dark());
 						if (selected) {
 							const TQCOORD oCorners[] = { x, y + 1, x, y2, x2, y2, x2, y + 1 };
-							p->tqdrawPolyline(TQPointArray(4, oCorners));
+							p->drawPolyline(TQPointArray(4, oCorners));
 
 							p->setPen(cg.background().dark(115));
 							p->drawLine(x + 1, y + h - 2, x + w - 2, y + h - 2);
@@ -967,7 +967,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 							TQRect r2(x + 1, y + 2, w - 2, h - 5);
 							p->fillRect(r2, cg.mid().light(105));
 
-							p->tqdrawPolyline(TQPointArray(4, oCorners));
+							p->drawPolyline(TQPointArray(4, oCorners));
 
 							p->setPen(cg.mid().dark(115));
 						/*	Inner right border */
@@ -1019,7 +1019,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 				}
 
 				default:
-					winstyle->tqdrawControl(element, p, widget, r, cg, flags, opt);
+					winstyle->drawControl(element, p, widget, r, cg, flags, opt);
 			}
 
 			break;
@@ -1039,8 +1039,8 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 			p->setPen(flags & Style_Enabled ? TQColor(cg.foreground()) : TQColor(cg.mid().dark()));
 
 			if (!flags & Style_Selected) {
-				p->translate(tqpixelMetric(PM_ButtonShiftHorizontal),
-				             tqpixelMetric(PM_ButtonShiftVertical));
+				p->translate(pixelMetric(PM_ButtonShiftHorizontal),
+				             pixelMetric(PM_ButtonShiftVertical));
 			}
 
 			p->drawText(r, text_flags, opt.tab()->text());
@@ -1057,7 +1057,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 			TQRect br = r;
 			bool btnDefault = button->isDefault();
 
-			static int di = tqpixelMetric(PM_ButtonDefaultIndicator);
+			static int di = pixelMetric(PM_ButtonDefaultIndicator);
 			br.addCoords(di, di, -di, -di);
 
 			if (btnDefault) {
@@ -1076,8 +1076,8 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 			TQRect ur(r);
 
 			if (flags & Style_Down) {
-				p->translate(tqpixelMetric(PM_ButtonShiftHorizontal),
-				             tqpixelMetric(PM_ButtonShiftVertical));
+				p->translate(pixelMetric(PM_ButtonShiftHorizontal),
+				             pixelMetric(PM_ButtonShiftVertical));
 			}
 
 			if (!pb->text().isEmpty() && (flags & Style_ButtonDefault)) {
@@ -1126,7 +1126,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 
 			if ( flags & Style_HasFocus )
 				tqdrawPrimitive( PE_FocusRect, p,
-				               tqvisualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
+				               visualRect( subRect( SR_PushButtonFocusRect, widget ), widget ),
 				               cg, flags );
 
 			break;
@@ -1257,7 +1257,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 				pmr.moveCenter(cr.center());
 
 				if (TQApplication::reverseLayout())
-					pmr = tqvisualRect( pmr, r );
+					pmr = visualRect( pmr, r );
 
 				p->setPen(cg.highlightedText());
 				p->drawPixmap(pmr.topLeft(), pixmap);
@@ -1295,7 +1295,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 
 						TQRect rr = TQRect(xp, y+m, tab, h-(2*m));
 						if (TQApplication::reverseLayout())
-							rr = tqvisualRect(rr, r);
+							rr = visualRect(rr, r);
 
 						if (useTextShadows) {
 							TQPen op = p->pen();
@@ -1310,7 +1310,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 
 					TQRect rr = TQRect(xpos, y+m, w-xm-tab+1, h-(2*m));
 					if (TQApplication::reverseLayout()) {
-						rr = tqvisualRect(rr, r);
+						rr = visualRect(rr, r);
 						text_flags |= AlignRight;
 					}
 
@@ -1335,7 +1335,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 			}
 
 			if (mi->popup()) {
-				int dim = tqpixelMetric(PM_MenuButtonIndicator);
+				int dim = pixelMetric(PM_MenuButtonIndicator);
 
 				xpos = x+w - arrowHMargin - 2*itemFrame - dim;
 
@@ -1347,7 +1347,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 
 				TQRect rr = TQRect(xpos, y + h/2 - dim/2, dim, dim);
 				if (TQApplication::reverseLayout())
-					rr = tqvisualRect( rr, r );
+					rr = visualRect( rr, r );
 				tqdrawPrimitive((TQApplication::reverseLayout() ? PE_ArrowLeft : PE_ArrowRight), p, rr, cg, Style_Enabled);
 			}
 
@@ -1364,7 +1364,7 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 
 					TQRect rr = TQRect( xp + 6, y + 6, 16, h - 6 );
 					if (TQApplication::reverseLayout())
-						rr = tqvisualRect( rr, r );
+						rr = visualRect( rr, r );
 
 					tqdrawPrimitive(PE_CheckMark, p, rr, cg, cflags);
 				}
@@ -1380,11 +1380,11 @@ void dotNETstyle::tqdrawControl(TQ_ControlElement element,
 			p->fillRect(r, cg.button());
 			break;
 		default:
-			winstyle->tqdrawControl(element, p, widget, r, cg, flags, opt);
+			winstyle->drawControl(element, p, widget, r, cg, flags, opt);
 	}
 }
 
-void dotNETstyle::tqdrawControlMask(TQ_ControlElement element,
+void dotNETstyle::drawControlMask(TQ_ControlElement element,
                                   TQPainter *p,
                                   const TQWidget *w,
                                   const TQRect &r,
@@ -1407,12 +1407,12 @@ void dotNETstyle::tqdrawControlMask(TQ_ControlElement element,
 		}
 
 		default: {
-			KStyle::tqdrawControlMask (element, p, w, r, opt);
+			KStyle::drawControlMask (element, p, w, r, opt);
 		}
 	}
 }
 
-void dotNETstyle::tqdrawComplexControlMask(ComplexControl c,
+void dotNETstyle::drawComplexControlMask(ComplexControl c,
                                          TQPainter *p,
                                          const TQWidget *w,
                                          const TQRect &r,
@@ -1434,12 +1434,12 @@ void dotNETstyle::tqdrawComplexControlMask(ComplexControl c,
 			break;
 		}
 		default: {
-			KStyle::tqdrawComplexControlMask (c, p, w, r, o);
+			KStyle::drawComplexControlMask (c, p, w, r, o);
 		}
 	}
 }
 
-void dotNETstyle::tqdrawComplexControl(ComplexControl control,
+void dotNETstyle::drawComplexControl(ComplexControl control,
                                      TQPainter *p,
                                      const TQWidget *widget,
                                      const TQRect &r,
@@ -1489,13 +1489,13 @@ void dotNETstyle::tqdrawComplexControl(ComplexControl control,
 			}
 
 			TQRect hr = (pseudo3D ? TQRect(w - handle_offset - 1, y, handle_width + 2, h) : TQRect(w - handle_offset - 1, y + 1, handle_width + 2, h - 1));
-			if (TQApplication::reverseLayout()) { hr = tqvisualRect(hr, r); }
+			if (TQApplication::reverseLayout()) { hr = visualRect(hr, r); }
 
 			p->drawRect(hr);
 			p->setBrush(NoBrush);
 			TQRect rr = (pseudo3D ? TQRect(x + 1, y + 1, w - 2, h - 2) : TQRect(x + 1, y + 1, w - 1, h - 1));
 
-			if (TQApplication::reverseLayout()) { rr = tqvisualRect( rr, r ); }
+			if (TQApplication::reverseLayout()) { rr = visualRect( rr, r ); }
 
 			if (flags & Style_HasFocus || cg.highlight() == cg.midlight() ||
 			    (cb->listBox() && cb->listBox()->isVisible())) {
@@ -1516,10 +1516,10 @@ void dotNETstyle::tqdrawComplexControl(ComplexControl control,
 				ca.setPoint(1, hr.bottomRight());
 				ca.setPoint(2, hr.bottomLeft());
 				p->setPen(test.dark(120));
-				p->tqdrawPolyline(ca);
+				p->drawPolyline(ca);
 				p->setPen(test.light(120));
 				ca.setPoint(1, hr.topLeft());
-				p->tqdrawPolyline(ca);
+				p->drawPolyline(ca);
 				p->restore();
 			}
 
@@ -1544,7 +1544,7 @@ void dotNETstyle::tqdrawComplexControl(ComplexControl control,
 			TQRect pmr(0, 0, 7, 4);
 			pmr.moveCenter(cr.center());
 			if (TQApplication::reverseLayout()) {
-				pmr = tqvisualRect( pmr, r );
+				pmr = visualRect( pmr, r );
 			}
 
 			p->drawPixmap(pmr.topLeft(), downArrow);
@@ -1608,7 +1608,7 @@ void dotNETstyle::tqdrawComplexControl(ComplexControl control,
 			TQ_PrimitiveElement pe;
 
 			TQRect swf = querySubControlMetrics(control, sw, SC_SpinWidgetFrame);
-			swf = tqvisualRect( swf, sw );
+			swf = visualRect( swf, sw );
 
 			if (controls & SC_SpinWidgetFrame) {
 			// Don't draw the WindowsStyle thick frame.
@@ -1690,7 +1690,7 @@ void dotNETstyle::tqdrawComplexControl(ComplexControl control,
 		}
 
 		default:
-			KStyle::tqdrawComplexControl(control, p, widget,
+			KStyle::drawComplexControl(control, p, widget,
 			                           r, cg, flags, controls,
 			                           active, opt);
 			break;
@@ -1708,7 +1708,7 @@ TQRect dotNETstyle::subRect(SubRect r, const TQWidget *widget) const
 
 		case SR_PushButtonFocusRect: {
 			TQRect rect = widget->rect();
-			int margin = tqpixelMetric(PM_ButtonDefaultIndicator, widget) + tqpixelMetric(PM_DefaultFrameWidth, widget) + 2;
+			int margin = pixelMetric(PM_ButtonDefaultIndicator, widget) + pixelMetric(PM_DefaultFrameWidth, widget) + 2;
 
 			rect.addCoords(margin, margin, -margin, -margin);
 			return rect;
@@ -1749,7 +1749,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control,
 		}
 
 		case CC_SpinWidget: {
-			int fw = tqpixelMetric(PM_SpinBoxFrameWidth, widget);
+			int fw = pixelMetric(PM_SpinBoxFrameWidth, widget);
 			TQSize bs;
 			bs.setHeight(TQMAX(8, widget->height()/2));
 			bs.setWidth(TQMIN(bs.height() * 8 / 5, widget->width() / 4));
@@ -1787,7 +1787,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control,
 	return KStyle::querySubControlMetrics(control, widget, subcontrol, opt);
 }
 
-int dotNETstyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
+int dotNETstyle::pixelMetric(PixelMetric m, const TQWidget *widget) const
 {
 	switch(m) {
 	//	TABS
@@ -1878,7 +1878,7 @@ int dotNETstyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const
 		}
 
 		default:
-			return KStyle::tqpixelMetric(m, widget);
+			return KStyle::pixelMetric(m, widget);
 	}
 }
 
@@ -1901,8 +1901,8 @@ TQSize dotNETstyle::tqsizeFromContents(ContentsType t,
 			bool checkable = popup->isCheckable();
 
 			if (mi->custom()) {
-				w = mi->custom()->tqsizeHint().width();
-				h = mi->custom()->tqsizeHint().height();
+				w = mi->custom()->sizeHint().width();
+				h = mi->custom()->sizeHint().height();
 			} else if (mi->widget()) {
 			// don't change the size in this case.
 			} else if (mi->isSeparator()) {
@@ -1945,8 +1945,8 @@ TQSize dotNETstyle::tqsizeFromContents(ContentsType t,
 			const TQPushButton* button = (const TQPushButton*) widget;
 			int w  = s.width();
 			int h  = s.height();
-			int bm = tqpixelMetric( PM_ButtonMargin, widget );
-			int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2;
+			int bm = pixelMetric( PM_ButtonMargin, widget );
+			int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2;
 
 			//We use bold font sometimes, so that make take more space than TQt allocated.
 			TQFontMetrics origFM = button->fontMetrics();
@@ -1968,7 +1968,7 @@ TQSize dotNETstyle::tqsizeFromContents(ContentsType t,
 
 			// Compensate for default indicator. Doing it for all widgets lets us
 			// workaround changes in auto-default behavior in KDialogBase in 3.3
-			int di = tqpixelMetric( PM_ButtonDefaultIndicator );
+			int di = pixelMetric( PM_ButtonDefaultIndicator );
 			w += di * 2;
 			h += di * 2;
 
diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h
index f2dbcf8a..5e4f104a 100644
--- a/styles/dotnet/dotnet.h
+++ b/styles/dotnet/dotnet.h
@@ -62,7 +62,7 @@ public:
 		SFlags flags = Style_Default,
 		const TQStyleOption &opt = TQStyleOption::Default ) const;
 
-	void tqdrawControl( TQ_ControlElement element,
+	void drawControl( TQ_ControlElement element,
 		TQPainter *p,
 		const TQWidget *widget,
 		const TQRect &r,
@@ -70,9 +70,9 @@ public:
 		SFlags flags = Style_Default,
 		const TQStyleOption& = TQStyleOption::Default ) const;
 
-	void tqdrawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
+	void drawControlMask( TQ_ControlElement, TQPainter *, const TQWidget *, const TQRect &, const TQStyleOption &) const;
 
-	void tqdrawComplexControl( ComplexControl control,
+	void drawComplexControl( ComplexControl control,
 		TQPainter *p,
 		const TQWidget *widget,
 		const TQRect &r,
@@ -82,7 +82,7 @@ public:
 		SCFlags active = SC_None,
 		const TQStyleOption& = TQStyleOption::Default ) const;
 
-	int tqpixelMetric( PixelMetric m,
+	int pixelMetric( PixelMetric m,
 		const TQWidget *widget = 0 ) const;
 
 	TQRect subRect( SubRect r,
@@ -93,7 +93,7 @@ public:
 		SubControl subcontrol,
 		const TQStyleOption &opt = TQStyleOption::Default ) const;
 
-	void tqdrawComplexControlMask(TQStyle::ComplexControl c,
+	void drawComplexControlMask(TQStyle::ComplexControl c,
 	                            TQPainter *p,
 	                            const TQWidget *w,
 	                            const TQRect &r,