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

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

digikam/digikam/folderitem.cpp

@@ -218,7 +218,7 @@ void FolderCheckListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int co
 
         p->fillRect(0, 0, r, height(), cg.base());
 
-        fv->style().tqdrawPrimitive(TQStyle::PE_CheckListIndicator, p,
+        fv->style().drawPrimitive(TQStyle::PE_CheckListIndicator, p,
                                   TQRect(x, y, boxsize, height()),
                                   cg, styleflags, TQStyleOption(this));
     }

digikam/digikam/iconview.cpp

@@ -1067,7 +1067,7 @@ void IconView::drawRubber(TQPainter* p)
 
     TQPoint pnt(r.x(), r.y());
 
-    style().tqdrawPrimitive(TQStyle::PE_FocusRect, p,
+    style().drawPrimitive(TQStyle::PE_FocusRect, p,
                           TQRect( pnt.x(), pnt.y(),
                                  r.width(), r.height() ),
                           colorGroup(), TQStyle::Style_Default,

digikam/digikam/scanlib.cpp

@@ -278,7 +278,7 @@ void ScanLib::updateItemsWithoutDate()
         }
         else
         {
-            TQPair<TQString, int> fileID = tqMakePair(fi.fileName(),albumID);
+            TQPair<TQString, int> fileID = qMakePair(fi.fileName(),albumID);
             
             if (m_filesToBeDeleted.findIndex(fileID) == -1)
             {
@@ -393,9 +393,9 @@ void ScanLib::allFiles(const TQString& directory)
         TQMapIterator<TQString,bool> it;
         for (it = filesFoundInDB.begin(); it != filesFoundInDB.end(); ++it)
         {
-            if (m_filesToBeDeleted.findIndex(tqMakePair(it.key(),albumID)) == -1)
+            if (m_filesToBeDeleted.findIndex(qMakePair(it.key(),albumID)) == -1)
             {
-                m_filesToBeDeleted.append(tqMakePair(it.key(),albumID));
+                m_filesToBeDeleted.append(qMakePair(it.key(),albumID));
             }
         }
     }

digikam/digikam/tagspopupmenu.cpp

@@ -103,7 +103,7 @@ public:
         TQFont fn = m_popup->font();
         TQFontMetrics fm(fn);
         TQRect r(x + 5 + fm.width(m_txt), y + (h/2-checkHeight/2), checkWidth, checkHeight);
-        kapp->style().tqdrawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags);
+        kapp->style().drawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags);
     }
 
 private:
@@ -290,7 +290,7 @@ void TagsPopupMenu::iterateAndBuildMenu(TQPopupMenu *menu, TAlbum *album)
 
     for (Album* a = album->firstChild(); a; a = a->next())
     {
-        sortedTags.push_back(tqMakePair(a->title(), a));
+        sortedTags.push_back(qMakePair(a->title(), a));
     }
 
     qHeapSort(sortedTags);

digikam/libs/widgets/common/dpopupmenu.cpp

@@ -188,7 +188,7 @@ void DPopupMenu::paintEvent(TQPaintEvent* e)
 
     drawContents(&p);
 
-    style().tqdrawPrimitive(TQStyle::PE_PanelPopup, &p,
+    style().drawPrimitive(TQStyle::PE_PanelPopup, &p,
                           TQRect(0, 0, width(), height()),
                           colorGroup(), TQStyle::Style_Default,
                           TQStyleOption( frameWidth(), 0));

digikam/libs/widgets/common/squeezedcombobox.cpp

@@ -97,7 +97,7 @@ TQSize SqueezedComboBox::sizeHint() const
     int maxW = count() ? 18 : 7 * fm.width(TQChar('x')) + 18;
     int maxH = TQMAX( fm.lineSpacing(), 14 ) + 2;
 
-    return style().tqsizeFromContents(TQStyle::CT_ComboBox, this,
+    return style().sizeFromContents(TQStyle::CT_ComboBox, this,
     TQSize(maxW, maxH)).expandedTo(TQApplication::globalStrut());
 }
 

digikam/utilities/imageeditor/canvas/canvas.cpp

@@ -637,7 +637,7 @@ void Canvas::drawRubber()
 
     TQPoint pnt(r.x(), r.y());
 
-    style().tqdrawPrimitive(TQStyle::PE_FocusRect, &p,
+    style().drawPrimitive(TQStyle::PE_FocusRect, &p,
                           TQRect(pnt.x(), pnt.y(), r.width(), r.height()),
                           colorGroup(), TQStyle::Style_Default,
                           TQStyleOption(colorGroup().base()));