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

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

kicker-applets/kolourpicker/simplebutton.cpp

@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().drawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )

kicker-applets/mediacontrol/simplebutton.cpp

@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().drawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )

konq-plugins/crashes/crashesplugin.cpp

@@ -139,12 +139,12 @@ void CrashesPlugin::slotAboutToShow()
 void CrashesPlugin::newBookmarkCallback( const TQString & text, const TQCString & url,
                                          const TQString & )
 {
-  m_crashesList.prepend(tqMakePair(text,url));
+  m_crashesList.prepend(qMakePair(text,url));
 }
 
 void CrashesPlugin::endFolderCallback( )
 {
-  m_crashesList.prepend(tqMakePair(TQString("-"),TQCString("-")));
+  m_crashesList.prepend(qMakePair(TQString("-"),TQCString("-")));
 }
 
 void CrashesPlugin::slotClearCrashes() {

konq-plugins/fsview/treemap.cpp

@@ -2152,7 +2152,7 @@ void TreeMapWidget::drawTreeMap()
 
   if (hasFocus()) {
     TQPainter p(this);
-    style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+    style().drawPrimitive( TQStyle::PE_FocusRect, &p,
                            TQRect(0, 0, TQWidget::width(), TQWidget::height()),
                            colorGroup() );
   }

konq-plugins/microformat/konqmficon.cpp

@@ -157,7 +157,7 @@ void KonqMFIcon::extractCard(DOM::Node node) {
 
 	if (!name.isEmpty()) {
 		value += "END:VCARD\n";
-		_cards.append(tqMakePair(name, value));
+		_cards.append(qMakePair(name, value));
 	}
 }
 
@@ -202,7 +202,7 @@ void KonqMFIcon::extractEvent(DOM::Node node) {
 
 	if (!name.isEmpty()) {
 		value += "END:VEVENT\nEND:VCALENDAR\n";
-		_events.append(tqMakePair(name, value));
+		_events.append(qMakePair(name, value));
 	}
 }
 

konq-plugins/minitools/minitoolsplugin.cpp

@@ -124,12 +124,12 @@ void MinitoolsPlugin::newBookmarkCallback(
    const TQString & text, const TQCString & url, const TQString & 
 ) {
   kdDebug(90150) << "MinitoolsPlugin::newBookmarkCallback" << text << url << endl;
-  m_minitoolsList.prepend(tqMakePair(text,url));
+  m_minitoolsList.prepend(qMakePair(text,url));
 }
 
 void MinitoolsPlugin::endFolderCallback() {
   kdDebug(90150) << "MinitoolsPlugin::endFolderCallback" << endl;
-  m_minitoolsList.prepend(tqMakePair(TQString("-"),TQCString("-")));
+  m_minitoolsList.prepend(qMakePair(TQString("-"),TQCString("-")));
 }
 
 TQString MinitoolsPlugin::minitoolsFilename(bool local) {

konq-plugins/searchbar/searchbar.cpp

@@ -363,7 +363,7 @@ void SearchBarPlugin::setIcon()
 	TQPainter p( &arrowmap );
 	p.drawPixmap(0, 2, m_searchIcon);
 	TQStyle::SFlags arrowFlags = TQStyle::Style_Default;
-	m_searchCombo->style().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, 
+	m_searchCombo->style().drawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, 
 	    arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() );
 	p.end();
 	m_searchIcon = arrowmap;