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

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

6 files changed, 12 insertions, 12 deletions

diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index 9388b668..9539a372 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -171,7 +171,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
     if ( orientation() ==TQt::Horizontal )
 	flags |= TQStyle::Style_Horizontal;
 
-    style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
+    style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
 			   colorGroup(), flags );
 }
 
diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 19f2057e..4facece2 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -585,7 +585,7 @@ void MenuBarEditor::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
     TQRect r = rect();
-    style().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
+    style().drawPrimitive( TQStyle::PE_PanelMenuBar, &p,
 			   r, colorGroup() );
     drawItems( p );
 }
diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp
index a23c14a7..8dcf7ba5 100644
--- a/kdevdesigner/designer/outputwindow.cpp
+++ b/kdevdesigner/designer/outputwindow.cpp
@@ -57,14 +57,14 @@ OutputWindow::~OutputWindow()
     debugoutput = debugView = 0;
     errorView = 0;
     if ( !debugToStderr )
-	tqInstallMsgHandler( oldMsgHandler );
+	qInstallMsgHandler( oldMsgHandler );
     delete iface;
 }
 
 void OutputWindow::shuttingDown()
 {
     if ( !debugToStderr )
-	tqInstallMsgHandler( oldMsgHandler );
+	qInstallMsgHandler( oldMsgHandler );
 }
 
 void OutputWindow::setupError()
@@ -119,7 +119,7 @@ void OutputWindow::setupDebug()
     addTab( debugView, "Debug Output" );
 
     if ( !debugToStderr )
-	oldMsgHandler = tqInstallMsgHandler( debugMessageOutput );
+	oldMsgHandler = qInstallMsgHandler( debugMessageOutput );
 }
 
 void OutputWindow::setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines,
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index 8c835b95..f7d420d6 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * )
 		 rect().width() - borderSize * 2, rect().height() - borderSize * 2 );
     reg -= mid;
     p.setClipRegion( reg );
-    style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
+    style().drawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
     p.restore();
     drawItems( &p );
 }
@@ -1034,7 +1034,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
 
     if ( i->isSeparator() ) {
-	style().tqdrawPrimitive( TQStyle::PE_Separator, p,
+	style().drawPrimitive( TQStyle::PE_Separator, p,
 			       TQRect( r.x(), r.y() + 2, r.width(), 1 ),
 			       colorGroup(), TQStyle::Style_Sunken | f );
 	return;
@@ -1042,7 +1042,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
 
     const TQAction * a = i->action();
     if ( a->isToggleAction() && a->isOn() ) {
-	style().tqdrawPrimitive( TQStyle::PE_CheckMark, p,
+	style().drawPrimitive( TQStyle::PE_CheckMark, p,
 			       TQRect( x , y, iconWidth, h ),
 			       colorGroup(), f );
     } else {
@@ -1064,7 +1064,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
 		 TQPainter::AlignLeft | TQPainter::AlignVCenter,
 		 a->accel() );
     if ( i->count() ) // Item has submenu
-	style().tqdrawPrimitive( TQStyle::PE_ArrowRight, p,
+	style().drawPrimitive( TQStyle::PE_ArrowRight, p,
 			       TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ),
 			       colorGroup(), f );
 }
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index cd1c1696..1bb7e680 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -294,7 +294,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg,
 void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r )
 {
     p->save();
-    TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg,
+    TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg,
 					TQStyle::Style_Sunken, TQStyleOption(1,1) );
     p->restore();
 }
diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp
index 82c9ddb8..798e0a09 100644
--- a/kdevdesigner/designer/styledbutton.cpp
+++ b/kdevdesigner/designer/styledbutton.cpp
@@ -151,12 +151,12 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
 
 void StyledButton::drawButton( TQPainter *paint )
 {
-    style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
+    style().drawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
 			  isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
     drawButtonLabel(paint);
 
     if (hasFocus())
-	style().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
+	style().drawPrimitive(TQStyle::PE_FocusRect, paint,
 			      style().subRect(TQStyle::SR_PushButtonFocusRect, this),
 			      colorGroup(), TQStyle::Style_Default);
 }