From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- juk/viewmode.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'juk/viewmode.cpp') diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp index 6c46278b..785f765b 100644 --- a/juk/viewmode.cpp +++ b/juk/viewmode.cpp @@ -49,7 +49,7 @@ ViewMode::~ViewMode() void ViewMode::paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int) { if(width < item->pixmap(column)->width()) @@ -71,7 +71,7 @@ void ViewMode::paintCell(PlaylistBox::Item *item, TQPen newPen = oldPen; newPen.setWidth(5); - newPen.setJoinStyle(RoundJoin); + newPen.setJoinStyle(Qt::RoundJoin); newPen.setColor(TQColorGroup::Highlight); painter->setPen(newPen); @@ -79,21 +79,21 @@ void ViewMode::paintCell(PlaylistBox::Item *item, painter->setPen(oldPen); painter->fillRect(border, border, width - border * 2, item->height() - border * 2 + 1, - colorGroup.brush(TQColorGroup::Highlight)); - painter->setPen(colorGroup.highlightedText()); + tqcolorGroup.brush(TQColorGroup::Highlight)); + painter->setPen(tqcolorGroup.highlightedText()); } else painter->eraseRect(0, 0, width, item->height()); if (!pm->isNull()) { int x = (width - pm->width()) / 2; - x = QMAX(x, item->listView()->itemMargin()); + x = TQMAX(x, item->listView()->itemMargin()); painter->drawPixmap(x, y, *pm); } y += pm->height() + fm.height() - fm.descent(); for(TQStringList::Iterator it = m_lines[item].begin(); it != m_lines[item].end(); ++it) { int x = (width - fm.width(*it)) / 2; - x = QMAX(x, item->listView()->itemMargin()); + x = TQMAX(x, item->listView()->itemMargin()); painter->drawText(x, y, *it); y += fm.height() - fm.descent(); } @@ -104,8 +104,8 @@ void ViewMode::paintCell(PlaylistBox::Item *item, bool ViewMode::eventFilter(TQObject *watched, TQEvent *e) { - if(m_visible && watched == m_playlistBox->viewport() && e->type() == TQEvent::Resize) { - TQResizeEvent *re = static_cast(e); + if(m_visible && TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_playlistBox->viewport()) && e->type() == TQEvent::Resize) { + TQResizeEvent *re = TQT_TQRESIZEEVENT(e); if(re->size().width() != re->oldSize().width()) m_needsRefresh = true; } @@ -168,7 +168,7 @@ void ViewMode::paintDropIndicator(TQPainter *painter, int width, int height) // TQPen newPen = oldPen; newPen.setWidth(lineWidth); - newPen.setStyle(DotLine); + newPen.setStyle(Qt::DotLine); painter->setPen(newPen); painter->drawRect(border, border, width - border * 2, height - border * 2); @@ -195,7 +195,7 @@ TQStringList ViewMode::lines(const PlaylistBox::Item *item, fm.width(line.mid(0, textLength).stripWhiteSpace()) + item->listView()->itemMargin() * 2 > width) { - int i = line.findRev(TQRegExp( "\\W"), textLength - 1); + int i = line.tqfindRev(TQRegExp( "\\W"), textLength - 1); if(i > 0) textLength = i; else @@ -224,10 +224,10 @@ CompactViewMode::~CompactViewMode() void CompactViewMode::paintCell(PlaylistBox::Item *item, TQPainter *painter, - const TQColorGroup &colorGroup, + const TQColorGroup &tqcolorGroup, int column, int width, int align) { - item->KListViewItem::paintCell(painter, colorGroup, column, width, align); + item->KListViewItem::paintCell(painter, tqcolorGroup, column, width, align); if(item == item->listView()->dropItem()) paintDropIndicator(painter, width, item->height()); } @@ -313,7 +313,7 @@ void TreeViewMode::removeItem(const TQString &item, unsigned column) return; } - if(!m_treeViewItems.find(itemKey)) + if(!m_treeViewItems.tqfind(itemKey)) return; TreeViewItemPlaylist *itemPlaylist = m_treeViewItems[itemKey]; @@ -363,7 +363,7 @@ void TreeViewMode::addItems(const TQStringList &items, unsigned column) item = *it; itemKey = searchCategory + item; - if(m_treeViewItems.find(itemKey)) + if(m_treeViewItems.tqfind(itemKey)) continue; components.clear(); -- cgit v1.2.1