From fb652a2be46ce1a2081e5dde268cd9f4ebe6fdd0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Nov 2011 15:08:51 -0600 Subject: Fix kdelibs FTBFS on native TQt3 --- tdeprint/management/kmiconview.cpp | 8 ++++---- tdeprint/management/kmlistview.cpp | 2 +- tdeprint/management/sidepixmap.cpp | 2 +- tdeprint/management/sidepixmap.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tdeprint/management') diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index 1fa5a6da9..905f4d248 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -38,7 +38,7 @@ void KMIconViewItem::paintItem(TQPainter *p, const TQColorGroup& cg) { if (m_state != 0) { - QFont f(p->font()); + TQFont f(p->font()); if (m_state & 0x1) f.setBold(true); if (m_state & 0x2) f.setItalic(true); p->setFont(f); @@ -48,17 +48,17 @@ void KMIconViewItem::paintItem(TQPainter *p, const TQColorGroup& cg) void KMIconViewItem::calcRect(const TQString&) { - QRect ir(rect()), pr, tr; + TQRect ir(rect()), pr, tr; // pixmap rect pr.setWidth(pixmap()->width()); pr.setHeight(pixmap()->height()); // text rect - QFont f(iconView()->font()); + TQFont f(iconView()->font()); if (m_state & 0x1) f.setBold(true); if (m_state & 0x2) f.setItalic(true); - QFontMetrics fm(f); + TQFontMetrics fm(f); if (m_mode == TQIconView::Bottom) tr = fm.boundingRect(0, 0, iconView()->maxItemWidth(), 0xFFFFFF, AlignHCenter|AlignTop|WordBreak|BreakAnywhere, text()+"X"); else diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 72d6872cb..4332a8678 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/management/kmlistview.cpp @@ -96,7 +96,7 @@ void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int { if (m_state != 0) { - QFont f(p->font()); + TQFont f(p->font()); if (m_state & 0x1) f.setBold(true); if (m_state & 0x2) f.setItalic(true); p->setFont(f); diff --git a/tdeprint/management/sidepixmap.cpp b/tdeprint/management/sidepixmap.cpp index 8824dd5fc..dc5dc901f 100644 --- a/tdeprint/management/sidepixmap.cpp +++ b/tdeprint/management/sidepixmap.cpp @@ -49,7 +49,7 @@ TQSize SidePixmap::tqsizeHint() const void SidePixmap::drawContents(TQPainter *p) { - QRect r = contentsRect(); + TQRect r = contentsRect(); if (r.height() <= m_side.height()) { // case where the main pixmap is enough, just center it diff --git a/tdeprint/management/sidepixmap.h b/tdeprint/management/sidepixmap.h index 54f7a1f5e..2d3916ff3 100644 --- a/tdeprint/management/sidepixmap.h +++ b/tdeprint/management/sidepixmap.h @@ -36,7 +36,7 @@ protected: void drawContents(TQPainter*); private: - QPixmap m_side, m_tileup, m_tiledown; + TQPixmap m_side, m_tileup, m_tiledown; }; #endif -- cgit v1.2.1