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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 6 insertions, 6 deletions

diff --git a/libk3b/tools/k3bintmapcombobox.cpp b/libk3b/tools/k3bintmapcombobox.cpp
index 3dd9731..c78280e 100644
--- a/libk3b/tools/k3bintmapcombobox.cpp
+++ b/libk3b/tools/k3bintmapcombobox.cpp
@@ -82,7 +82,7 @@ bool K3bIntMapComboBox::insertItem( int value, const TQString& text, const TQStr
   index = KComboBox::count();
 
   d->valueIndexMap[value] = index;
-  d->indexValueDescriptionMap[index] = tqMakePair<int, TQString>( value, description );
+  d->indexValueDescriptionMap[index] = qMakePair<int, TQString>( value, description );
 
   KComboBox::insertItem( text );
 
diff --git a/libk3b/tools/k3blibdvdcss.cpp b/libk3b/tools/k3blibdvdcss.cpp
index 5baf8b4..bb0e375 100644
--- a/libk3b/tools/k3blibdvdcss.cpp
+++ b/libk3b/tools/k3blibdvdcss.cpp
@@ -226,7 +226,7 @@ bool K3bLibDvdCss::crackAllKeys()
 
     const K3bIso9660File* file = dynamic_cast<const K3bIso9660File*>( dir->entry( filename ) );
     if( file && file->size() > 0 ) {
-      d->titleOffsets.append( tqMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) );
+      d->titleOffsets.append( qMakePair( (int)file->startSector(), (int)(file->size() / 2048U) ) );
       kdDebug() << "(K3bLibDvdCss) Get key for /" << filename << " at " << file->startSector() << endl;
       if( seek( (int)file->startSector(), DVDCSS_SEEK_KEY ) < 0 ) {
 	kdDebug() << "(K3bLibDvdCss) unable to seek to " << file->startSector() << endl;
diff --git a/libk3b/tools/k3blistview.cpp b/libk3b/tools/k3blistview.cpp
index 20acae5..335bd8d 100644
--- a/libk3b/tools/k3blistview.cpp
+++ b/libk3b/tools/k3blistview.cpp
@@ -520,7 +520,7 @@ void K3bCheckListViewItem::paintK3bCell( TQPainter* p, const TQColorGroup& cg, i
       else
 	flags |= TQStyle::Style_Off;
 
-      listView()->style().tqdrawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags );
+      listView()->style().drawPrimitive( TQStyle::PE_CheckMark, p, r, cg, flags );
     }
   }
 }
diff --git a/libk3b/tools/k3bmsfedit.cpp b/libk3b/tools/k3bmsfedit.cpp
index 07ed77d..0e467dc 100644
--- a/libk3b/tools/k3bmsfedit.cpp
+++ b/libk3b/tools/k3bmsfedit.cpp
@@ -60,7 +60,7 @@ TQSize K3bMsfEdit::sizeHint() const
   int w = fm.width( "00:00:00" );
   int wx = fm.width( ' ' )*2;
   int frame = style().pixelMetric( TQStyle::PM_SpinBoxFrameWidth );
-  return style().tqsizeFromContents(TQStyle::CT_SpinBox, this,
+  return style().sizeFromContents(TQStyle::CT_SpinBox, this,
 				  TQSize( w + wx + downRect().width() + frame*2,
 					 h + frame*2).
 				  expandedTo( TQApplication::globalStrut() ));
diff --git a/libk3b/tools/k3btoolbox.cpp b/libk3b/tools/k3btoolbox.cpp
index c6a5df2..b7fa687 100644
--- a/libk3b/tools/k3btoolbox.cpp
+++ b/libk3b/tools/k3btoolbox.cpp
@@ -71,7 +71,7 @@ void K3bToolBoxSeparator::paintEvent( TQPaintEvent* )
   TQPainter p( this );
   TQStyle::SFlags flags = TQStyle::Style_Default|TQStyle::Style_Horizontal;
 
-  style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
+  style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
 			 colorGroup(), flags );
 }
 
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index cdc26b9..65e8c51 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -68,7 +68,7 @@ void K3bToolButton::drawButton( TQPainter* p )
     if( isEnabled() )
       arrowFlags |= TQStyle::Style_Enabled;
     
-    style().tqdrawPrimitive(TQStyle::PE_ArrowDown, p,
+    style().drawPrimitive(TQStyle::PE_ArrowDown, p,
 			  TQRect(width()-7, height()-7, 7, 7), colorGroup(),
 			  arrowFlags, TQStyleOption() );
   }