Diffstat (limited to 'microkde/kdeui/klistview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | microkde/kdeui/klistview.cpp | 337 |
1 files changed, 176 insertions, 161 deletions
diff --git a/microkde/kdeui/klistview.cpp b/microkde/kdeui/klistview.cpp index 60f3084..0e98160 100644 --- a/microkde/kdeui/klistview.cpp +++ b/microkde/kdeui/klistview.cpp @@ -20,5 +20,5 @@ -#include <qdragobject.h> +#include <q3dragobject.h> #include <qtimer.h> -#include <qheader.h> +#include <q3header.h> #include <qcursor.h> @@ -27,2 +27,16 @@ #include <qpainter.h> +//Added by qt3to4: +#include <QDragLeaveEvent> +#include <QKeyEvent> +#include <Q3ValueList> +#include <Q3PtrList> +#include <QPixmap> +#include <QDragEnterEvent> +#include <QDragMoveEvent> +#include <QDropEvent> +#include <QResizeEvent> +#include <QFocusEvent> +#include <QMouseEvent> +#include <QEvent> +#include <QPaintEvent> @@ -40,3 +54,3 @@ #define private public -#include <qlistview.h> +#include <q3listview.h> #undef private @@ -48,5 +62,6 @@ #endif +#include <Q3Action> // /*US -class KListView::Tooltip : public QToolTip +class KListView::Tooltip /* TODO:hacker:TODO: : public QToolTip */ { @@ -69,3 +84,3 @@ private: KListView::Tooltip::Tooltip (KListView* parent, QToolTipGroup* group) - : QToolTip (parent, group), + : /* XXX:hacker:XXX: QToolTip (parent, group), */ mParent (parent) @@ -125,3 +140,3 @@ public: - QListViewItem* pCurrentItem; + Q3ListViewItem* pCurrentItem; @@ -131,3 +146,3 @@ public: QTimer dragExpand; - QListViewItem* dragOverItem; + Q3ListViewItem* dragOverItem; QPoint dragOverPoint; @@ -138,3 +153,3 @@ public: //US KListViewLineEdit *editor; - QValueList<int> renameable; + Q3ValueList<int> renameable; @@ -172,4 +187,4 @@ public: QRect mOldDropHighlighter; - QListViewItem *afterItemDrop; - QListViewItem *parentItemDrop; + Q3ListViewItem *afterItemDrop; + Q3ListViewItem *parentItemDrop; @@ -228,3 +243,3 @@ void KListViewLineEdit::load(QListViewItem *i, int c) -static int nextCol (KListView *pl, QListViewItem *pi, int start, int dir) +static int nextCol (KListView *pl, Q3ListViewItem *pi, int start, int dir) { @@ -241,5 +256,5 @@ static int nextCol (KListView *pl, QListViewItem *pi, int start, int dir) -static QListViewItem *prevItem (QListViewItem *pi) +static Q3ListViewItem *prevItem (Q3ListViewItem *pi) { - QListViewItem *pa = pi->itemAbove(); + Q3ListViewItem *pa = pi->itemAbove(); @@ -254,3 +269,3 @@ static QListViewItem *prevItem (QListViewItem *pi) -static QListViewItem *lastQChild (QListViewItem *pi) +static Q3ListViewItem *lastQChild (Q3ListViewItem *pi) { @@ -262,3 +277,3 @@ static QListViewItem *lastQChild (QListViewItem *pi) */ - for (QListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling()) + for (Q3ListViewItem *pt = pi->nextSibling(); pt; pt = pt->nextSibling()) pi = pt; @@ -330,6 +345,6 @@ bool KListViewLineEdit::event (QEvent *pe) p->tabOrderedRenaming() && p->itemsRenameable() && - !(k->state() & ControlButton || k->state() & AltButton)) + !(k->state() & Qt::ControlButton || k->state() & AltButton)) { selectNextCell(item, col, - (k->key() == Key_Tab && !(k->state() & ShiftButton))); + (k->key() == Key_Tab && !(k->state() & Qt::ShiftButton))); return true; @@ -408,3 +423,3 @@ void KListViewLineEdit::slotSelectionChanged() KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse ) - : QListView( parent, name ), + : Q3ListView( parent, name ), d (new KListViewPrivate (this)) @@ -419,4 +434,4 @@ KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse this, SLOT( slotOnViewport() ) ); - connect( this, SIGNAL( onItem( QListViewItem * ) ), - this, SLOT( slotOnItem( QListViewItem * ) ) ); + connect( this, SIGNAL( onItem( Q3ListViewItem * ) ), + this, SLOT( slotOnItem( Q3ListViewItem * ) ) ); @@ -447,4 +462,4 @@ KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse { - connect (this, SIGNAL (rightButtonPressed (QListViewItem*, const QPoint&, int)), - this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); + connect (this, SIGNAL (rightButtonPressed (Q3ListViewItem*, const QPoint&, int)), + this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int))); } @@ -452,8 +467,8 @@ KListView::KListView( QWidget *parent, const char *name ,bool emulateRightMouse { - connect (this, SIGNAL (rightButtonClicked (QListViewItem*, const QPoint&, int)), - this, SLOT (emitContextMenu (QListViewItem*, const QPoint&, int))); + connect (this, SIGNAL (rightButtonClicked (Q3ListViewItem*, const QPoint&, int)), + this, SLOT (emitContextMenu (Q3ListViewItem*, const QPoint&, int))); } - connect (this, SIGNAL (menuShortCutPressed (KListView*, QListViewItem*)), - this, SLOT (emitContextMenu (KListView*, QListViewItem*))); + connect (this, SIGNAL (menuShortCutPressed (KListView*, Q3ListViewItem*)), + this, SLOT (emitContextMenu (KListView*, Q3ListViewItem*))); @@ -482,3 +497,3 @@ QSize KListView::sizeHint() const #ifdef DESKTOP_VERSION - return QListView::sizeHint(); + return Q3ListView::sizeHint(); #else @@ -505,3 +520,3 @@ bool KListView::isExecuteArea( int x ) -void KListView::slotOnItem( QListViewItem *item ) +void KListView::slotOnItem( Q3ListViewItem *item ) { @@ -536,8 +551,8 @@ void KListView::slotSettingsChanged(int category) - disconnect(this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), - this, SLOT (slotMouseButtonClicked (int, QListViewItem*, const QPoint &, int))); + disconnect(this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)), + this, SLOT (slotMouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int))); if( d->bUseSingle ) - connect (this, SIGNAL (mouseButtonClicked (int, QListViewItem*, const QPoint &, int)), - this, SLOT (slotMouseButtonClicked( int, QListViewItem*, const QPoint &, int))); + connect (this, SIGNAL (mouseButtonClicked (int, Q3ListViewItem*, const QPoint &, int)), + this, SLOT (slotMouseButtonClicked( int, Q3ListViewItem*, const QPoint &, int))); @@ -613,3 +628,3 @@ void KListView::slotAutoSelect() - QListViewItem* previousItem = currentItem(); + Q3ListViewItem* previousItem = currentItem(); setCurrentItem( d->pCurrentItem ); @@ -634,3 +649,3 @@ void KListView::slotAutoSelect() bool down = previousItem->itemPos() < d->pCurrentItem->itemPos(); - QListViewItemIterator lit( down ? previousItem : d->pCurrentItem ); + Q3ListViewItemIterator lit( down ? previousItem : d->pCurrentItem ); for ( ; lit.current(); ++lit ) { @@ -653,3 +668,3 @@ void KListView::slotAutoSelect() - if( selectionMode() == QListView::Single ) + if( selectionMode() == Q3ListView::Single ) emit selectionChanged( d->pCurrentItem ); @@ -686,3 +701,3 @@ void KListView::slotHeaderChanged() -void KListView::emitExecute( int buttonstate, QListViewItem *item, const QPoint &pos, int c) +void KListView::emitExecute( int buttonstate, Q3ListViewItem *item, const QPoint &pos, int c) { @@ -703,3 +718,3 @@ void KListView::emitExecute( int buttonstate, QListViewItem *item, const QPoint //Dont emit executed if in SC mode and Shift or Ctrl are pressed - if( !( (buttonstate==ShiftButton) || (buttonstate==ControlButton) )) { + if( !( (buttonstate==Qt::ShiftButton) || (buttonstate==Qt::ControlButton) )) { // if( !( ((keybstate & ShiftMask) || (keybstate & ControlMask)) ) ) { @@ -716,3 +731,3 @@ void KListView::focusInEvent( QFocusEvent *fe ) // kdDebug()<<"KListView::focusInEvent()"<<endl; - QListView::focusInEvent( fe ); + Q3ListView::focusInEvent( fe ); if ((d->selectedBySimpleMove) @@ -749,3 +764,3 @@ void KListView::focusOutEvent( QFocusEvent *fe ) - QListView::focusOutEvent( fe ); + Q3ListView::focusOutEvent( fe ); } @@ -756,3 +771,3 @@ void KListView::leaveEvent( QEvent *e ) - QListView::leaveEvent( e ); + Q3ListView::leaveEvent( e ); } @@ -767,3 +782,3 @@ bool KListView::event( QEvent *e ) - return QListView::event(e); + return Q3ListView::event(e); } @@ -773,3 +788,3 @@ void KListView::contentsMousePressEvent( QMouseEvent *e ) //qDebug("KListView::contentsMousePressEvent"); - if( (selectionModeExt() == Extended) && (e->state() & ShiftButton) && !(e->state() & ControlButton) ) + if( (selectionModeExt() == Extended) && (e->state() & Qt::ShiftButton) && !(e->state() & Qt::ControlButton) ) { @@ -795,3 +810,3 @@ void KListView::contentsMousePressEvent( QMouseEvent *e ) QPoint p( contentsToViewport( e->pos() ) ); - QListViewItem *at = itemAt (p); + Q3ListViewItem *at = itemAt (p); @@ -803,3 +818,3 @@ void KListView::contentsMousePressEvent( QMouseEvent *e ) - if (e->button() == LeftButton && !rootDecoClicked) + if (e->button() == Qt::LeftButton && !rootDecoClicked) { @@ -815,3 +830,3 @@ void KListView::contentsMousePressEvent( QMouseEvent *e ) - QListView::contentsMousePressEvent( e ); + Q3ListView::contentsMousePressEvent( e ); } @@ -821,3 +836,3 @@ void KListView::contentsMouseMoveEvent( QMouseEvent *e ) if (!dragEnabled() || d->startDragPos.isNull() || !d->validDrag) { - QListView::contentsMouseMoveEvent (e); + Q3ListView::contentsMouseMoveEvent (e); return; @@ -826,3 +841,3 @@ void KListView::contentsMouseMoveEvent( QMouseEvent *e ) QPoint vp = contentsToViewport(e->pos()); - QListViewItem *item = itemAt( vp ); + Q3ListViewItem *item = itemAt( vp ); @@ -855,3 +870,3 @@ void KListView::contentsMouseMoveEvent( QMouseEvent *e ) { - QListView::contentsMouseReleaseEvent( 0 ); + Q3ListView::contentsMouseReleaseEvent( 0 ); startDrag(); @@ -864,3 +879,3 @@ void KListView::contentsMouseReleaseEvent( QMouseEvent *e ) { - if (e->button() == LeftButton) + if (e->button() == Qt::LeftButton) { @@ -870,3 +885,3 @@ void KListView::contentsMouseReleaseEvent( QMouseEvent *e ) QPoint p( contentsToViewport( e->pos() ) ); - QListViewItem *at = itemAt (p); + Q3ListViewItem *at = itemAt (p); if ( at ) @@ -892,3 +907,3 @@ void KListView::contentsMouseReleaseEvent( QMouseEvent *e ) } - QListView::contentsMouseReleaseEvent( e ); + Q3ListView::contentsMouseReleaseEvent( e ); } @@ -903,4 +918,4 @@ void KListView::contentsMouseDoubleClickEvent ( QMouseEvent *e ) QPoint vp = contentsToViewport(e->pos()); - QListViewItem *item = itemAt( vp ); - emit QListView::doubleClicked( item ); // we do it now + Q3ListViewItem *item = itemAt( vp ); + emit Q3ListView::doubleClicked( item ); // we do it now @@ -913,3 +928,3 @@ void KListView::contentsMouseDoubleClickEvent ( QMouseEvent *e ) - if( (e->button() == LeftButton) && !d->bUseSingle ) { + if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) { //qDebug("KListView::contentsMouseDoubleClickEvent: emitExecute"); @@ -921,3 +936,3 @@ void KListView::contentsMouseDoubleClickEvent ( QMouseEvent *e ) -void KListView::slotMouseButtonClicked( int btn, QListViewItem *item, const QPoint &pos, int c ) +void KListView::slotMouseButtonClicked( int btn, Q3ListViewItem *item, const QPoint &pos, int c ) { @@ -925,3 +940,3 @@ void KListView::slotMouseButtonClicked( int btn, QListViewItem *item, const QPoi - if( (btn == LeftButton) && item ) { + if( (btn == Qt::LeftButton) && item ) { //qDebug("KListView::slotMouseButtonClicked: emitExecute"); @@ -963,8 +978,8 @@ qDebug("KListView::contentsDropEvent drag&drop not supported yet"); -void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* afterme) +void KListView::movableDropEvent (Q3ListViewItem* parent, Q3ListViewItem* afterme) { - QPtrList<QListViewItem> items, afterFirsts, afterNows; - QListViewItem *current=currentItem(); + Q3PtrList<Q3ListViewItem> items, afterFirsts, afterNows; + Q3ListViewItem *current=currentItem(); bool hasMoved=false; - for (QListViewItem *i = firstChild(), *iNext=0; i != 0; i = iNext) + for (Q3ListViewItem *i = firstChild(), *iNext=0; i != 0; i = iNext) { @@ -981,3 +996,3 @@ void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* afterme) - QListViewItem *afterFirst = i->itemAbove(); + Q3ListViewItem *afterFirst = i->itemAbove(); @@ -1002,3 +1017,3 @@ void KListView::movableDropEvent (QListViewItem* parent, QListViewItem* afterme) clearSelection(); - for (QListViewItem *i=items.first(); i != 0; i=items.next() ) + for (Q3ListViewItem *i=items.first(); i != 0; i=items.next() ) i->setSelected(true); @@ -1088,3 +1103,3 @@ int KListView::depthToPixels( int depth ) -void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewItem *&after) +void KListView::findDrop(const QPoint &pos, Q3ListViewItem *&parent, Q3ListViewItem *&after) { @@ -1093,5 +1108,5 @@ void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewIte // Get the position to put it in - QListViewItem *atpos = itemAt(p); + Q3ListViewItem *atpos = itemAt(p); - QListViewItem *above; + Q3ListViewItem *above; if (!atpos) // put it at the end @@ -1125,4 +1140,4 @@ void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewIte // sibling, but of an upper-level group, rather than the "above" item - QListViewItem * betterAbove = above->parent(); - QListViewItem * last = above; + Q3ListViewItem * betterAbove = above->parent(); + Q3ListViewItem * last = above; while ( betterAbove ) @@ -1148,5 +1163,5 @@ void KListView::findDrop(const QPoint &pos, QListViewItem *&parent, QListViewIte -QListViewItem* KListView::lastChild () const +Q3ListViewItem* KListView::lastChild () const { - QListViewItem* lastchild = firstChild(); + Q3ListViewItem* lastchild = firstChild(); @@ -1158,7 +1173,7 @@ QListViewItem* KListView::lastChild () const -QListViewItem *KListView::lastItem() const +Q3ListViewItem *KListView::lastItem() const { - QListViewItem* last = lastChild(); + Q3ListViewItem* last = lastChild(); - for (QListViewItemIterator it (last); it.current(); ++it) + for (Q3ListViewItemIterator it (last); it.current(); ++it) last = it.current(); @@ -1189,3 +1204,3 @@ qDebug("KListView::startDrag drag&drop not supported yet."); -QDragObject *KListView::dragObject() +Q3DragObject *KListView::dragObject() { @@ -1194,3 +1209,3 @@ QDragObject *KListView::dragObject() - return new QStoredDrag("application/x-qlistviewitem", viewport()); + return new Q3StoredDrag("application/x-qlistviewitem", viewport()); } @@ -1248,6 +1263,6 @@ void KListView::setDropVisualizer(bool b) -QPtrList<QListViewItem> KListView::selectedItems() const +Q3PtrList<Q3ListViewItem> KListView::selectedItems() const { - QPtrList<QListViewItem> list; - for (QListViewItem *i=firstChild(); i!=0; i=i->itemBelow()) + Q3PtrList<Q3ListViewItem> list; + for (Q3ListViewItem *i=firstChild(); i!=0; i=i->itemBelow()) if (i->isSelected()) list.append(i); @@ -1257,6 +1272,6 @@ QPtrList<QListViewItem> KListView::selectedItems() const -void KListView::moveItem(QListViewItem *item, QListViewItem *parent, QListViewItem *after) +void KListView::moveItem(Q3ListViewItem *item, Q3ListViewItem *parent, Q3ListViewItem *after) { // sanity check - don't move a item into it's own child structure - QListViewItem *i = parent; + Q3ListViewItem *i = parent; while(i) @@ -1298,4 +1313,4 @@ void KListView::setDropVisualizerWidth (int w) -QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent, - QListViewItem *after) +QRect KListView::drawDropVisualizer(QPainter *p, Q3ListViewItem *parent, + Q3ListViewItem *after) { @@ -1310,3 +1325,3 @@ QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent, { - QListViewItem* it = 0L; + Q3ListViewItem* it = 0L; if (after->isOpen()) @@ -1340,3 +1355,3 @@ QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent, if (p) - p->fillRect(insertmarker, Dense4Pattern); + p->fillRect(insertmarker, Qt::Dense4Pattern); @@ -1345,3 +1360,3 @@ QRect KListView::drawDropVisualizer(QPainter *p, QListViewItem *parent, -QRect KListView::drawItemHighlighter(QPainter *painter, QListViewItem *item) +QRect KListView::drawItemHighlighter(QPainter *painter, Q3ListViewItem *item) { @@ -1378,3 +1393,3 @@ void KListView::cleanItemHighlighter () -void KListView::rename(QListViewItem *item, int c) +void KListView::rename(Q3ListViewItem *item, int c) { @@ -1405,3 +1420,3 @@ void KListView::setRenameable (int col, bool yesno) -void KListView::doneEditing(QListViewItem *item, int row) +void KListView::doneEditing(Q3ListViewItem *item, int row) { @@ -1449,3 +1464,3 @@ bool KListView::dropHighlighter() const -bool KListView::showTooltip(QListViewItem *item, const QPoint &, int column) const +bool KListView::showTooltip(Q3ListViewItem *item, const QPoint &, int column) const { @@ -1454,3 +1469,3 @@ bool KListView::showTooltip(QListViewItem *item, const QPoint &, int column) con -QString KListView::tooltip(QListViewItem *item, int column) const +QString KListView::tooltip(Q3ListViewItem *item, int column) const { @@ -1484,3 +1499,3 @@ void KListView::keyPressEvent (QKeyEvent* e) if (d->selectionMode != FileManager) - QListView::keyPressEvent (e); + Q3ListView::keyPressEvent (e); else @@ -1515,3 +1530,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) //don't care whether it's on the keypad or not - int e_state=(e->state() & ~Keypad); + int e_state=(e->state() & ~Qt::Keypad); @@ -1519,27 +1534,27 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - if ((e->key()!=Key_Shift) && (e->key()!=Key_Control) - && (e->key()!=Key_Meta) && (e->key()!=Key_Alt)) + if ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control) + && (e->key()!=Qt::Key_Meta) && (e->key()!=Qt::Key_Alt)) { - if ((e_state==ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove)) + if ((e_state==Qt::ShiftButton) && (!d->wasShiftEvent) && (!d->selectedBySimpleMove)) selectAll(FALSE); d->selectionDirection=0; - d->wasShiftEvent = (e_state == ShiftButton); + d->wasShiftEvent = (e_state == Qt::ShiftButton); }; - //d->wasShiftEvent = (e_state == ShiftButton); + //d->wasShiftEvent = (e_state == Qt::ShiftButton); - QListViewItem* item = currentItem(); + Q3ListViewItem* item = currentItem(); if (item==0) return; - QListViewItem* repaintItem1 = item; - QListViewItem* repaintItem2 = 0L; - QListViewItem* visItem = 0L; + Q3ListViewItem* repaintItem1 = item; + Q3ListViewItem* repaintItem2 = 0L; + Q3ListViewItem* visItem = 0L; - QListViewItem* nextItem = 0L; + Q3ListViewItem* nextItem = 0L; int items = 0; - bool shiftOrCtrl((e_state==ControlButton) || (e_state==ShiftButton)); + bool shiftOrCtrl((e_state==Qt::ControlButton) || (e_state==Qt::ShiftButton)); int selectedItems(0); - for (QListViewItem *tmpItem=firstChild(); tmpItem!=0; tmpItem=tmpItem->nextSibling()) + for (Q3ListViewItem *tmpItem=firstChild(); tmpItem!=0; tmpItem=tmpItem->nextSibling()) if (tmpItem->isSelected()) selectedItems++; @@ -1547,9 +1562,9 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) if (((selectedItems==0) || ((selectedItems==1) && (d->selectedUsingMouse))) - && (e_state==NoButton) - && ((e->key()==Key_Down) - || (e->key()==Key_Up) - || (e->key()==Key_Next) - || (e->key()==Key_Prior) - || (e->key()==Key_Home) - || (e->key()==Key_End))) + && (e_state==Qt::NoButton) + && ((e->key()==Qt::Key_Down) + || (e->key()==Qt::Key_Up) + || (e->key()==Qt::Key_Next) + || (e->key()==Qt::Key_Prior) + || (e->key()==Qt::Key_Home) + || (e->key()==Qt::Key_End))) { @@ -1565,3 +1580,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) { - case Key_Escape: + case Qt::Key_Escape: selectAll(FALSE); @@ -1570,3 +1585,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - case Key_Space: + case Qt::Key_Space: //toggle selection of current item @@ -1578,3 +1593,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - case Key_Insert: + case Qt::Key_Insert: //toggle selection of current item and move to the next item @@ -1602,3 +1617,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - case Key_Down: + case Qt::Key_Down: nextItem=item->itemBelow(); @@ -1635,3 +1650,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - case Key_Up: + case Qt::Key_Up: nextItem=item->itemAbove(); @@ -1670,3 +1685,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - case Key_End: + case Qt::Key_End: //move to the last item and toggle selection of all items inbetween @@ -1695,3 +1710,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - case Key_Home: + case Qt::Key_Home: // move to the first item and toggle selection of all items inbetween @@ -1717,3 +1732,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - case Key_Next: + case Qt::Key_Next: items=visibleHeight()/item->height(); @@ -1753,3 +1768,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - case Key_Prior: + case Qt::Key_Prior: items=visibleHeight()/item->height(); @@ -1787,3 +1802,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) - case Key_Minus: + case Qt::Key_Minus: if ( item->isOpen() ) @@ -1791,3 +1806,3 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) break; - case Key_Plus: + case Qt::Key_Plus: if ( !item->isOpen() && (item->isExpandable() || item->childCount()) ) @@ -1796,4 +1811,4 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) default: - bool realKey = ((e->key()!=Key_Shift) && (e->key()!=Key_Control) - && (e->key()!=Key_Meta) && (e->key()!=Key_Alt)); + bool realKey = ((e->key()!=Qt::Key_Shift) && (e->key()!=Qt::Key_Control) + && (e->key()!=Qt::Key_Meta) && (e->key()!=Qt::Key_Alt)); @@ -1803,5 +1818,5 @@ void KListView::fileManagerKeyPressEvent (QKeyEvent* e) //this is mainly for the "goto filename beginning with pressed char" feature (aleXXX) - QListView::SelectionMode oldSelectionMode = selectionMode(); - setSelectionMode (QListView::Multi); - QListView::keyPressEvent (e); + Q3ListView::SelectionMode oldSelectionMode = selectionMode(); + setSelectionMode (Q3ListView::Multi); + Q3ListView::keyPressEvent (e); setSelectionMode (oldSelectionMode); @@ -1852,3 +1867,3 @@ void KListView::setSelectionModeExt (SelectionModeExt mode) case NoSelection: - setSelectionMode (static_cast<QListView::SelectionMode>(static_cast<int>(mode))); + setSelectionMode (static_cast<Q3ListView::SelectionMode>(static_cast<int>(mode))); break; @@ -1856,3 +1871,3 @@ void KListView::setSelectionModeExt (SelectionModeExt mode) case FileManager: - setSelectionMode (QListView::Extended); + setSelectionMode (Q3ListView::Extended); break; @@ -1870,3 +1885,3 @@ KListView::SelectionModeExt KListView::selectionModeExt () const -int KListView::itemIndex( const QListViewItem *item ) const +int KListView::itemIndex( const Q3ListViewItem *item ) const { @@ -1878,3 +1893,3 @@ int KListView::itemIndex( const QListViewItem *item ) const else { - QListViewItemIterator it(firstChild()); + Q3ListViewItemIterator it(firstChild()); uint j = 0; @@ -1889,3 +1904,3 @@ int KListView::itemIndex( const QListViewItem *item ) const -QListViewItem* KListView::itemAtIndex(int index) +Q3ListViewItem* KListView::itemAtIndex(int index) { @@ -1895,3 +1910,3 @@ QListViewItem* KListView::itemAtIndex(int index) int j(0); - for (QListViewItemIterator it=firstChild(); it.current(); it++) + for (Q3ListViewItemIterator it=firstChild(); it.current(); it++) { @@ -1905,3 +1920,3 @@ QListViewItem* KListView::itemAtIndex(int index) -void KListView::emitContextMenu (KListView*, QListViewItem* i) +void KListView::emitContextMenu (KListView*, Q3ListViewItem* i) { @@ -1918,5 +1933,5 @@ void KListView::emitContextMenu (KListView*, QListViewItem* i) -void KListView::emitContextMenu (QListViewItem* i, const QPoint& p, int col) +void KListView::emitContextMenu (Q3ListViewItem* i, const QPoint& p, int col) { - QListViewItem* item = i; + Q3ListViewItem* item = i; int c = col; @@ -1935,3 +1950,3 @@ void KListView::setAcceptDrops (bool val) { - QListView::setAcceptDrops (val); + Q3ListView::setAcceptDrops (val); viewport()->setAcceptDrops (val); @@ -1947,3 +1962,3 @@ void KListView::viewportPaintEvent(QPaintEvent *e) { - QListView::viewportPaintEvent(e); + Q3ListView::viewportPaintEvent(e); @@ -1954,3 +1969,3 @@ void KListView::viewportPaintEvent(QPaintEvent *e) // This is where we actually draw the drop-visualizer - painter.fillRect(d->mOldDropVisualizer, Dense4Pattern); + painter.fillRect(d->mOldDropVisualizer, Qt::Dense4Pattern); } @@ -1990,3 +2005,3 @@ int KListView::addColumn(const QString& label, int width) { - int result = QListView::addColumn(label, width); + int result = Q3ListView::addColumn(label, width); if (d->fullWidth) { @@ -1998,5 +2013,5 @@ int KListView::addColumn(const QString& label, int width) -int KListView::addColumn(const QIconSet& iconset, const QString& label, int width) +int KListView::addColumn(const QIcon& iconset, const QString& label, int width) { - int result = QListView::addColumn(iconset, label, width); + int result = Q3ListView::addColumn(iconset, label, width); if (d->fullWidth) { @@ -2010,3 +2025,3 @@ void KListView::removeColumn(int index) { - QListView::removeColumn(index); + Q3ListView::removeColumn(index); //US if (d->fullWidth && index == columns()) header()->setStretchEnabled(true, columns()-1); @@ -2016,3 +2031,3 @@ void KListView::viewportResizeEvent(QResizeEvent* e) { - QListView::viewportResizeEvent(e); + Q3ListView::viewportResizeEvent(e); } @@ -2072,3 +2087,3 @@ void KListView::setSorting(int column, bool ascending) d->sortAscending = ascending; - QListView::setSorting(column, ascending); + Q3ListView::setSorting(column, ascending); } @@ -2085,4 +2100,4 @@ bool KListView::ascendingSort(void) const -KListViewItem::KListViewItem(QListView *parent) - : QListViewItem(parent) +KListViewItem::KListViewItem(Q3ListView *parent) + : Q3ListViewItem(parent) { @@ -2091,4 +2106,4 @@ KListViewItem::KListViewItem(QListView *parent) -KListViewItem::KListViewItem(QListViewItem *parent) - : QListViewItem(parent) +KListViewItem::KListViewItem(Q3ListViewItem *parent) + : Q3ListViewItem(parent) { @@ -2097,4 +2112,4 @@ KListViewItem::KListViewItem(QListViewItem *parent) -KListViewItem::KListViewItem(QListView *parent, QListViewItem *after) - : QListViewItem(parent, after) +KListViewItem::KListViewItem(Q3ListView *parent, Q3ListViewItem *after) + : Q3ListViewItem(parent, after) { @@ -2103,4 +2118,4 @@ KListViewItem::KListViewItem(QListView *parent, QListViewItem *after) -KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after) - : QListViewItem(parent, after) +KListViewItem::KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after) + : Q3ListViewItem(parent, after) { @@ -2109,6 +2124,6 @@ KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after) -KListViewItem::KListViewItem(QListView *parent, +KListViewItem::KListViewItem(Q3ListView *parent, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8) - : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) + : Q3ListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { @@ -2117,6 +2132,6 @@ KListViewItem::KListViewItem(QListView *parent, -KListViewItem::KListViewItem(QListViewItem *parent, +KListViewItem::KListViewItem(Q3ListViewItem *parent, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8) - : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) + : Q3ListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { @@ -2125,6 +2140,6 @@ KListViewItem::KListViewItem(QListViewItem *parent, -KListViewItem::KListViewItem(QListView *parent, QListViewItem *after, +KListViewItem::KListViewItem(Q3ListView *parent, Q3ListViewItem *after, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8) - : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8) + : Q3ListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8) { @@ -2133,6 +2148,6 @@ KListViewItem::KListViewItem(QListView *parent, QListViewItem *after, -KListViewItem::KListViewItem(QListViewItem *parent, QListViewItem *after, +KListViewItem::KListViewItem(Q3ListViewItem *parent, Q3ListViewItem *after, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8) - : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8) + : Q3ListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8) { @@ -2214,3 +2229,3 @@ void KListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, in //US if (listView()->viewport()->backgroundMode()==Qt::FixedColor) - if (listView()->viewport()->backgroundMode()==QWidget::PaletteBackground) + if (listView()->viewport()->backgroundMode()==Qt::PaletteBackground) _cg.setColor(QColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); @@ -2219,3 +2234,3 @@ void KListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, in } - QListViewItem::paintCell(p, _cg, column, width, alignment); + Q3ListViewItem::paintCell(p, _cg, column, width, alignment); } |