diff options
Diffstat (limited to 'src/dolphindetailsview.cpp')
| -rw-r--r-- | src/dolphindetailsview.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index 03282fb..8fd25e6 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -24,7 +24,7 @@ #include <tqpainter.h> #include <tqobjectlist.h> #include <tqheader.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqpainter.h> #include <klocale.h> #include <kglobalsettings.h> @@ -78,7 +78,7 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* parent) : connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const KURL::List&, const KURL&)), parent, TQT_SLOT(slotURLListDropped(TQDropEvent*, const KURL::List&, const KURL&))); - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotUpdateDisabledItems())); @@ -441,7 +441,7 @@ void DolphinDetailsView::paintEmptyArea(TQPainter* painter, const TQRect& rect) KFileDetailView::paintEmptyArea(painter, rect); } else { - const TQBrush brush(tqcolorGroup().background()); + const TQBrush brush(colorGroup().background()); painter->fillRect(rect, brush); } } @@ -467,7 +467,7 @@ void DolphinDetailsView::drawRubber() point = contentsToViewport(point); tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &p, TQRect(point.x(), point.y(), m_rubber->width(), m_rubber->height()), - tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base()); + colorGroup(), TQStyle::Style_Default, colorGroup().base()); p.end(); } @@ -489,7 +489,7 @@ void DolphinDetailsView::slotActivationUpdate() update(); // TODO: there must be a simpler way to say - // "update all tqchildren" + // "update all children" const TQObjectList list = childrenListObject(); if (list.isEmpty()) { return; @@ -553,7 +553,7 @@ void DolphinDetailsView::slotAutoScroll() // select all items which intersect with the rubber, deselect all others bool bottomReached = false; while ((item != 0) && !bottomReached) { - TQRect rect(tqitemRect(item)); + TQRect rect(itemRect(item)); rect.setWidth(filenameWidth(item)); rect = TQRect(viewportToContents(rect.topLeft()), viewportToContents(rect.bottomRight())); @@ -710,10 +710,10 @@ DolphinDetailsView::DolphinListViewItem::~DolphinListViewItem() } void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, int column, int cellWidth, - int tqalignment) + int alignment) { const TQListView* view = listView(); const bool isActive = TQT_BASE_OBJECT(view->parent()) == TQT_BASE_OBJECT(Dolphin::mainWin().activeView()); @@ -721,30 +721,30 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, // Per default the selection is drawn above the whole width of the item. As a consistent // behavior with the icon view is wanted, only the the column containing the file name // should be shown as selected. - TQColorGroup defaultColorGroup(tqcolorGroup); - const TQColor highlightColor(isActive ? backgroundColor(column) : view->tqcolorGroup().background()); + TQColorGroup defaultColorGroup(colorGroup); + const TQColor highlightColor(isActive ? backgroundColor(column) : view->colorGroup().background()); defaultColorGroup.setColor(TQColorGroup::Highlight , highlightColor); - defaultColorGroup.setColor(TQColorGroup::HighlightedText, tqcolorGroup.color(TQColorGroup::Text)); - KFileListViewItem::paintCell(painter, defaultColorGroup, column, cellWidth, tqalignment); + defaultColorGroup.setColor(TQColorGroup::HighlightedText, colorGroup.color(TQColorGroup::Text)); + KFileListViewItem::paintCell(painter, defaultColorGroup, column, cellWidth, alignment); if (column == 0) { // draw the selection only on the first column TQListView* parent = listView(); const int itemWidth = width(parent->fontMetrics(), parent, 0); if (isActive) { - KFileListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); + KFileListViewItem::paintCell(painter, colorGroup, column, itemWidth, alignment); } else { - TQListViewItem::paintCell(painter, tqcolorGroup, column, itemWidth, tqalignment); + TQListViewItem::paintCell(painter, colorGroup, column, itemWidth, alignment); } } } else { if (isActive) { - KFileListViewItem::paintCell(painter, tqcolorGroup, column, cellWidth, tqalignment); + KFileListViewItem::paintCell(painter, colorGroup, column, cellWidth, alignment); } else { - TQListViewItem::paintCell(painter, tqcolorGroup, column, cellWidth, tqalignment); + TQListViewItem::paintCell(painter, colorGroup, column, cellWidth, alignment); } } @@ -756,7 +756,7 @@ void DolphinDetailsView::DolphinListViewItem::paintCell(TQPainter* painter, } void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter, - const TQColorGroup& tqcolorGroup, + const TQColorGroup& colorGroup, const TQRect& rect) { // draw the focus consistently with the selection (see implementation notes @@ -771,7 +771,7 @@ void DolphinDetailsView::DolphinListViewItem::paintFocus(TQPainter* painter, TQRect focusRect(rect); focusRect.setWidth(visibleWidth); - KFileListViewItem::paintFocus(painter, tqcolorGroup, focusRect); + KFileListViewItem::paintFocus(painter, colorGroup, focusRect); } int DolphinDetailsView::filenameWidth(const TQListViewItem* item) const |