diff options
| -rw-r--r-- | digikam/digikam/folderitem.cpp | 2 | ||||
| -rw-r--r-- | digikam/digikam/iconview.cpp | 2 | ||||
| -rw-r--r-- | digikam/digikam/scanlib.cpp | 6 | ||||
| -rw-r--r-- | digikam/digikam/tagspopupmenu.cpp | 4 | ||||
| -rw-r--r-- | digikam/libs/widgets/common/dpopupmenu.cpp | 2 | ||||
| -rw-r--r-- | digikam/libs/widgets/common/squeezedcombobox.cpp | 2 | ||||
| -rw-r--r-- | digikam/utilities/imageeditor/canvas/canvas.cpp | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/digikam/digikam/folderitem.cpp b/digikam/digikam/folderitem.cpp index eae4491c..45b875f8 100644 --- a/digikam/digikam/folderitem.cpp +++ b/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)); } diff --git a/digikam/digikam/iconview.cpp b/digikam/digikam/iconview.cpp index 169e11a4..336fc447 100644 --- a/digikam/digikam/iconview.cpp +++ b/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, diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp index a94cbed3..71ea425c 100644 --- a/digikam/digikam/scanlib.cpp +++ b/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)); } } } diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp index bb0e0525..1c986f21 100644 --- a/digikam/digikam/tagspopupmenu.cpp +++ b/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); diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp index 55139df4..f41404ce 100644 --- a/digikam/libs/widgets/common/dpopupmenu.cpp +++ b/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)); diff --git a/digikam/libs/widgets/common/squeezedcombobox.cpp b/digikam/libs/widgets/common/squeezedcombobox.cpp index 996b9cf7..e200f9be 100644 --- a/digikam/libs/widgets/common/squeezedcombobox.cpp +++ b/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()); } diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index 09d4a6a9..f91e4186 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/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())); |