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

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

src/kvilib/tal/kvi_tal_listview.cpp

@@ -691,7 +691,7 @@
 		if(!parentControl)
 		    x += 3;
 		if ( !pixmap( 0 ) ) {
-		    lv->style().tqdrawPrimitive(TQStyle::PE_CheckListController, p,
+		    lv->style().drawPrimitive(TQStyle::PE_CheckListController, p,
 					  TQRect(x, 0, boxsize,
 						fm.height() + 2 + marg),
 					  cg, styleflags, TQStyleOption(this));
@@ -709,12 +709,12 @@
 		    y = (fm.height() + 2 + marg - boxsize) / 2;
 	
 		if ( ( myType == CheckBox ) || ( myType == CheckBoxController ) ) {
-		    lv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
+		    lv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p,
 					      TQRect(x, y, boxsize,
 						    fm.height() + 2 + marg),
 					      cg, styleflags, TQStyleOption(this));
 		} else { //radio button look
-		    lv->style().tqdrawPrimitive(TQStyle::PE_CheckListExclusiveIndicator,
+		    lv->style().drawPrimitive(TQStyle::PE_CheckListExclusiveIndicator,
 						      p, TQRect(x, y, boxsize,
 							       fm.height() + 2 + marg),
 						      cg, styleflags, TQStyleOption(this));

src/kvirc/ui/kvi_customtoolbar.cpp

@@ -66,7 +66,7 @@ void KviCustomToolBarSeparator::paintEvent(TQPaintEvent *)
 	TQPainter p(this);
 	TQStyle::SFlags flags = TQStyle::Style_Default;
 	if(m_pToolBar->orientation() == TQt::Horizontal)flags |= TQStyle::Style_Horizontal;
-	style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags);
+	style().drawPrimitive(TQStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags);
 }
 
 

src/kvirc/ui/kvi_input.cpp

@@ -292,7 +292,7 @@ TQSize KviInputEditor::sizeHint() const
 	int h = TQMAX(fm.lineSpacing(), 14) + 2*2; /* innerMargin */
 	int w = fm.width( 'x' ) * 17; // "some"
 	int m = frameWidth() * 2;
-	return (style().tqsizeFromContents(TQStyle::CT_LineEdit, this,
+	return (style().sizeFromContents(TQStyle::CT_LineEdit, this,
 				     TQSize( w + m, h + m ).
 				     expandedTo(TQApplication::globalStrut())));
 }