Commit b42828e3 authored by Laurent Montel's avatar Laurent Montel

adapt to new kdelis api

svn path=/trunk/KDE/kdemultimedia/juk/; revision=518198
parent 26cfeea7
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
* * * *
***************************************************************************/ ***************************************************************************/
#include <klistview.h> #include <k3listview.h>
#include <kiconview.h> #include <k3iconview.h>
#include <kiconviewsearchline.h> #include <kiconviewsearchline.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kapplication.h> #include <kapplication.h>
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
using CoverUtility::CoverIconViewItem; using CoverUtility::CoverIconViewItem;
class AllArtistsListViewItem : public KListViewItem class AllArtistsListViewItem : public K3ListViewItem
{ {
public: public:
AllArtistsListViewItem(Q3ListView *parent) : AllArtistsListViewItem(Q3ListView *parent) :
KListViewItem(parent, i18n("<All Artists>")) K3ListViewItem(parent, i18n("<All Artists>"))
{ {
} }
...@@ -47,11 +47,11 @@ public: ...@@ -47,11 +47,11 @@ public:
} }
}; };
class CaseInsensitiveItem : public KListViewItem class CaseInsensitiveItem : public K3ListViewItem
{ {
public: public:
CaseInsensitiveItem(Q3ListView *parent, const QString &text) : CaseInsensitiveItem(Q3ListView *parent, const QString &text) :
KListViewItem(parent, text) K3ListViewItem(parent, text)
{ {
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView"> <widget class="K3ListView">
<column> <column>
<property name="text"> <property name="text">
<string>Artist</string> <string>Artist</string>
......
...@@ -19,21 +19,21 @@ ...@@ -19,21 +19,21 @@
using CoverUtility::CoverIconViewItem; using CoverUtility::CoverIconViewItem;
CoverIconViewItem::CoverIconViewItem(coverKey id, Q3IconView *parent) : CoverIconViewItem::CoverIconViewItem(coverKey id, Q3IconView *parent) :
KIconViewItem(parent), m_id(id) K3IconViewItem(parent), m_id(id)
{ {
CoverDataPtr data = CoverManager::coverInfo(id); CoverDataPtr data = CoverManager::coverInfo(id);
setText(QString("%1 - %2").arg(data->artist, data->album)); setText(QString("%1 - %2").arg(data->artist, data->album));
setPixmap(data->thumbnail()); setPixmap(data->thumbnail());
} }
CoverIconView::CoverIconView(QWidget *parent, const char *name) : KIconView(parent, name) CoverIconView::CoverIconView(QWidget *parent, const char *name) : K3IconView(parent, name)
{ {
setResizeMode(Adjust); setResizeMode(Adjust);
} }
CoverIconViewItem *CoverIconView::currentItem() const CoverIconViewItem *CoverIconView::currentItem() const
{ {
return static_cast<CoverIconViewItem *>(KIconView::currentItem()); return static_cast<CoverIconViewItem *>(K3IconView::currentItem());
} }
Q3DragObject *CoverIconView::dragObject() Q3DragObject *CoverIconView::dragObject()
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#ifndef COVERICONVIEW_H #ifndef COVERICONVIEW_H
#define COVERICONVIEW_H #define COVERICONVIEW_H
#include <kiconview.h> #include <k3iconview.h>
#include "covermanager.h" #include "covermanager.h"
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
namespace CoverUtility namespace CoverUtility
{ {
class CoverIconViewItem : public KIconViewItem class CoverIconViewItem : public K3IconViewItem
{ {
public: public:
CoverIconViewItem(coverKey id, Q3IconView *parent); CoverIconViewItem(coverKey id, Q3IconView *parent);
...@@ -42,12 +42,12 @@ namespace CoverUtility ...@@ -42,12 +42,12 @@ namespace CoverUtility
using CoverUtility::CoverIconViewItem; using CoverUtility::CoverIconViewItem;
/** /**
* This class subclasses KIconView in order to provide cover drag-and-drop * This class subclasses K3IconView in order to provide cover drag-and-drop
* support. * support.
* *
* @author Michael Pyne <michael.pyne@kdemail.net> * @author Michael Pyne <michael.pyne@kdemail.net>
*/ */
class CoverIconView : public KIconView class CoverIconView : public K3IconView
{ {
public: public:
CoverIconView(QWidget *parent, const char *name = 0); CoverIconView(QWidget *parent, const char *name = 0);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <kfiledialog.h> #include <kfiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <klistview.h> #include <k3listview.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <qcheckbox.h> #include <qcheckbox.h>
...@@ -46,7 +46,7 @@ DirectoryList::DirectoryList(const QStringList &directories, bool importPlaylist ...@@ -46,7 +46,7 @@ DirectoryList::DirectoryList(const QStringList &directories, bool importPlaylist
QStringList::ConstIterator it = directories.begin(); QStringList::ConstIterator it = directories.begin();
for(; it != directories.end(); ++it) for(; it != directories.end(); ++it)
new KListViewItem(m_base->directoryListView, *it); new K3ListViewItem(m_base->directoryListView, *it);
m_base->importPlaylistsCheckBox->setChecked(importPlaylists); m_base->importPlaylistsCheckBox->setChecked(importPlaylists);
...@@ -80,7 +80,7 @@ void DirectoryList::slotAddDirectory() ...@@ -80,7 +80,7 @@ void DirectoryList::slotAddDirectory()
QString dir = KFileDialog::getExistingDirectory(); QString dir = KFileDialog::getExistingDirectory();
if(!dir.isEmpty() && m_dirList.find(dir) == m_dirList.end()) { if(!dir.isEmpty() && m_dirList.find(dir) == m_dirList.end()) {
m_dirList.append(dir); m_dirList.append(dir);
new KListViewItem(m_base->directoryListView, dir); new K3ListViewItem(m_base->directoryListView, dir);
m_result.addedDirs.append(dir); m_result.addedDirs.append(dir);
} }
} }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView"> <widget class="K3ListView">
<column> <column>
<property name="text"> <property name="text">
<string>Folders</string> <string>Folders</string>
......
...@@ -78,7 +78,7 @@ public: ...@@ -78,7 +78,7 @@ public:
"Are you sure you want to continue?"), hbox); "Are you sure you want to continue?"), hbox);
hbox->setStretchFactor(l, 1); hbox->setStretchFactor(l, 1);
KListView *lv = new KListView(vbox); K3ListView *lv = new K3ListView(vbox);
lv->addColumn(i18n("Original Name")); lv->addColumn(i18n("Original Name"));
lv->addColumn(i18n("New Name")); lv->addColumn(i18n("New Name"));
...@@ -87,9 +87,9 @@ public: ...@@ -87,9 +87,9 @@ public:
QMap<QString, QString>::ConstIterator it = files.begin(); QMap<QString, QString>::ConstIterator it = files.begin();
for(; it != files.end(); ++it) { for(; it != files.end(); ++it) {
KListViewItem *i = it.key() != it.data() K3ListViewItem *i = it.key() != it.data()
? new KListViewItem(lv, it.key(), it.data()) ? new K3ListViewItem(lv, it.key(), it.data())
: new KListViewItem(lv, it.key(), i18n("No Change")); : new K3ListViewItem(lv, it.key(), i18n("No Change"));
lvHeight += i->height(); lvHeight += i->height();
} }
......
...@@ -45,7 +45,7 @@ GoogleFetcherDialog::GoogleFetcherDialog(const QString &name, ...@@ -45,7 +45,7 @@ GoogleFetcherDialog::GoogleFetcherDialog(const QString &name,
disableResize(); disableResize();
Q3HBox *mainBox = new Q3HBox(this); Q3HBox *mainBox = new Q3HBox(this);
m_iconWidget = new KIconView(mainBox); m_iconWidget = new K3IconView(mainBox);
m_iconWidget->setResizeMode(Q3IconView::Adjust); m_iconWidget->setResizeMode(Q3IconView::Adjust);
m_iconWidget->setSpacing(10); m_iconWidget->setSpacing(10);
m_iconWidget->setFixedSize(500,550); m_iconWidget->setFixedSize(500,550);
...@@ -200,7 +200,7 @@ QPixmap GoogleFetcherDialog::pixmapFromURL(const KUrl &url) const ...@@ -200,7 +200,7 @@ QPixmap GoogleFetcherDialog::pixmapFromURL(const KUrl &url) const
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
CoverIconViewItem::CoverIconViewItem(Q3IconView *parent, const GoogleImage &image) : CoverIconViewItem::CoverIconViewItem(Q3IconView *parent, const GoogleImage &image) :
QObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0) QObject(parent), K3IconViewItem(parent, parent->lastItem(), image.size()), m_job(0)
{ {
// Set up the iconViewItem // Set up the iconViewItem
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef GOOGLEFETCHERDIALOG_H #ifndef GOOGLEFETCHERDIALOG_H
#define GOOGLEFETCHERDIALOG_H #define GOOGLEFETCHERDIALOG_H
#include <kiconview.h> #include <k3iconview.h>
#include <kio/job.h> #include <kio/job.h>
...@@ -63,7 +63,7 @@ private: ...@@ -63,7 +63,7 @@ private:
QPixmap m_pixmap; QPixmap m_pixmap;
GoogleImageList m_imageList; GoogleImageList m_imageList;
KIconView *m_iconWidget; K3IconView *m_iconWidget;
bool m_takeIt; bool m_takeIt;
bool m_newSearch; bool m_newSearch;
FileHandle m_file; FileHandle m_file;
...@@ -74,7 +74,7 @@ namespace KIO ...@@ -74,7 +74,7 @@ namespace KIO
class TransferJob; class TransferJob;
} }
class CoverIconViewItem : public QObject, public KIconViewItem class CoverIconViewItem : public QObject, public K3IconViewItem
{ {
Q_OBJECT Q_OBJECT
......
...@@ -327,7 +327,7 @@ int Playlist::m_leftColumn = 0; ...@@ -327,7 +327,7 @@ int Playlist::m_leftColumn = 0;
Playlist::Playlist(PlaylistCollection *collection, const QString &name, Playlist::Playlist(PlaylistCollection *collection, const QString &name,
const QString &iconName) : const QString &iconName) :
KListView(collection->playlistStack()), K3ListView(collection->playlistStack()),
m_collection(collection), m_collection(collection),
m_selectedCount(0), m_selectedCount(0),
m_allowDuplicates(false), m_allowDuplicates(false),
...@@ -350,7 +350,7 @@ Playlist::Playlist(PlaylistCollection *collection, const QString &name, ...@@ -350,7 +350,7 @@ Playlist::Playlist(PlaylistCollection *collection, const QString &name,
Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items, Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items,
const QString &name, const QString &iconName) : const QString &name, const QString &iconName) :
KListView(collection->playlistStack()), K3ListView(collection->playlistStack()),
m_collection(collection), m_collection(collection),
m_selectedCount(0), m_selectedCount(0),
m_allowDuplicates(false), m_allowDuplicates(false),
...@@ -374,7 +374,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items ...@@ -374,7 +374,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items
Playlist::Playlist(PlaylistCollection *collection, const QFileInfo &playlistFile, Playlist::Playlist(PlaylistCollection *collection, const QFileInfo &playlistFile,
const QString &iconName) : const QString &iconName) :
KListView(collection->playlistStack()), K3ListView(collection->playlistStack()),
m_collection(collection), m_collection(collection),
m_selectedCount(0), m_selectedCount(0),
m_allowDuplicates(false), m_allowDuplicates(false),
...@@ -397,7 +397,7 @@ Playlist::Playlist(PlaylistCollection *collection, const QFileInfo &playlistFile ...@@ -397,7 +397,7 @@ Playlist::Playlist(PlaylistCollection *collection, const QFileInfo &playlistFile
} }
Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) : Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) :
KListView(collection->playlistStack()), K3ListView(collection->playlistStack()),
m_collection(collection), m_collection(collection),
m_selectedCount(0), m_selectedCount(0),
m_allowDuplicates(false), m_allowDuplicates(false),
...@@ -657,7 +657,7 @@ PlaylistItemList Playlist::selectedItems() ...@@ -657,7 +657,7 @@ PlaylistItemList Playlist::selectedItems()
PlaylistItem *Playlist::firstChild() const PlaylistItem *Playlist::firstChild() const
{ {
return static_cast<PlaylistItem *>(KListView::firstChild()); return static_cast<PlaylistItem *>(K3ListView::firstChild());
} }
void Playlist::updateLeftColumn() void Playlist::updateLeftColumn()
...@@ -1037,7 +1037,7 @@ Q3DragObject *Playlist::dragObject(QWidget *parent) ...@@ -1037,7 +1037,7 @@ Q3DragObject *Playlist::dragObject(QWidget *parent)
void Playlist::contentsDragEnterEvent(QDragEnterEvent *e) void Playlist::contentsDragEnterEvent(QDragEnterEvent *e)
{ {
KListView::contentsDragEnterEvent(e); K3ListView::contentsDragEnterEvent(e);
if(CoverDrag::canDecode(e)) { if(CoverDrag::canDecode(e)) {
setDropHighlighter(true); setDropHighlighter(true);
...@@ -1152,7 +1152,7 @@ bool Playlist::eventFilter(QObject *watched, QEvent *e) ...@@ -1152,7 +1152,7 @@ bool Playlist::eventFilter(QObject *watched, QEvent *e)
} }
} }
return KListView::eventFilter(watched, e); return K3ListView::eventFilter(watched, e);
} }
void Playlist::keyPressEvent(QKeyEvent *event) void Playlist::keyPressEvent(QKeyEvent *event)
...@@ -1170,7 +1170,7 @@ void Playlist::keyPressEvent(QKeyEvent *event) ...@@ -1170,7 +1170,7 @@ void Playlist::keyPressEvent(QKeyEvent *event)
} }
KListView::keyPressEvent(event); K3ListView::keyPressEvent(event);
} }
void Playlist::contentsDropEvent(QDropEvent *e) void Playlist::contentsDropEvent(QDropEvent *e)
...@@ -1219,7 +1219,7 @@ void Playlist::contentsDropEvent(QDropEvent *e) ...@@ -1219,7 +1219,7 @@ void Playlist::contentsDropEvent(QDropEvent *e)
setSorting(columns() + 1); setSorting(columns() + 1);
QList<Q3ListViewItem *> items = KListView::selectedItems(); QList<Q3ListViewItem *> items = K3ListView::selectedItems();
for(QList<Q3ListViewItem *>::Iterator it = items.begin(); it != items.end(); ++it) { for(QList<Q3ListViewItem *>::Iterator it = items.begin(); it != items.end(); ++it) {
if(!item) { if(!item) {
...@@ -1243,7 +1243,7 @@ void Playlist::contentsDropEvent(QDropEvent *e) ...@@ -1243,7 +1243,7 @@ void Playlist::contentsDropEvent(QDropEvent *e)
dataChanged(); dataChanged();
emit signalPlaylistItemsDropped(this); emit signalPlaylistItemsDropped(this);
KListView::contentsDropEvent(e); K3ListView::contentsDropEvent(e);
} }
void Playlist::contentsMouseDoubleClickEvent(QMouseEvent *e) void Playlist::contentsMouseDoubleClickEvent(QMouseEvent *e)
...@@ -1252,7 +1252,7 @@ void Playlist::contentsMouseDoubleClickEvent(QMouseEvent *e) ...@@ -1252,7 +1252,7 @@ void Playlist::contentsMouseDoubleClickEvent(QMouseEvent *e)
// weird experience of switching songs from a double right-click. // weird experience of switching songs from a double right-click.
if(e->button() == Qt::LeftButton) if(e->button() == Qt::LeftButton)
KListView::contentsMouseDoubleClickEvent(e); K3ListView::contentsMouseDoubleClickEvent(e);
} }
void Playlist::showEvent(QShowEvent *e) void Playlist::showEvent(QShowEvent *e)
...@@ -1261,7 +1261,7 @@ void Playlist::showEvent(QShowEvent *e) ...@@ -1261,7 +1261,7 @@ void Playlist::showEvent(QShowEvent *e)
SharedSettings::instance()->apply(this); SharedSettings::instance()->apply(this);
m_applySharedSettings = false; m_applySharedSettings = false;
} }
KListView::showEvent(e); K3ListView::showEvent(e);
} }
void Playlist::applySharedSettings() void Playlist::applySharedSettings()
...@@ -1302,7 +1302,7 @@ void Playlist::viewportPaintEvent(QPaintEvent *pe) ...@@ -1302,7 +1302,7 @@ void Playlist::viewportPaintEvent(QPaintEvent *pe)
slotUpdateColumnWidths(); slotUpdateColumnWidths();
} }
KListView::viewportPaintEvent(pe); K3ListView::viewportPaintEvent(pe);
} }
void Playlist::viewportResizeEvent(QResizeEvent *re) void Playlist::viewportResizeEvent(QResizeEvent *re)
...@@ -1313,7 +1313,7 @@ void Playlist::viewportResizeEvent(QResizeEvent *re) ...@@ -1313,7 +1313,7 @@ void Playlist::viewportResizeEvent(QResizeEvent *re)
if(re->size().width() != re->oldSize().width() && !manualResize()) if(re->size().width() != re->oldSize().width() && !manualResize())
slotUpdateColumnWidths(); slotUpdateColumnWidths();
KListView::viewportResizeEvent(re); K3ListView::viewportResizeEvent(re);
} }
void Playlist::insertItem(Q3ListViewItem *item) void Playlist::insertItem(Q3ListViewItem *item)
...@@ -1324,7 +1324,7 @@ void Playlist::insertItem(Q3ListViewItem *item) ...@@ -1324,7 +1324,7 @@ void Playlist::insertItem(Q3ListViewItem *item)
// you need to use the PlaylistItem from here. // you need to use the PlaylistItem from here.
m_addTime.append(static_cast<PlaylistItem *>(item)); m_addTime.append(static_cast<PlaylistItem *>(item));
KListView::insertItem(item); K3ListView::insertItem(item);
} }
void Playlist::takeItem(Q3ListViewItem *item) void Playlist::takeItem(Q3ListViewItem *item)
...@@ -1332,13 +1332,13 @@ void Playlist::takeItem(Q3ListViewItem *item) ...@@ -1332,13 +1332,13 @@ void Playlist::takeItem(Q3ListViewItem *item)
// See the warning in Playlist::insertItem. // See the warning in Playlist::insertItem.
m_subtractTime.append(static_cast<PlaylistItem *>(item)); m_subtractTime.append(static_cast<PlaylistItem *>(item));
KListView::takeItem(item); K3ListView::takeItem(item);
} }
void Playlist::addColumn(const QString &label) void Playlist::addColumn(const QString &label)
{ {
slotWeightDirty(columns()); slotWeightDirty(columns());
KListView::addColumn(label, 30); K3ListView::addColumn(label, 30);
} }
PlaylistItem *Playlist::createItem(const FileHandle &file, PlaylistItem *Playlist::createItem(const FileHandle &file,
...@@ -1511,7 +1511,7 @@ bool Playlist::isColumnVisible(int c) const ...@@ -1511,7 +1511,7 @@ bool Playlist::isColumnVisible(int c) const
void Playlist::polish() void Playlist::polish()
{ {
KListView::polish(); K3ListView::polish();
if(m_polished) if(m_polished)
return; return;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#ifndef PLAYLIST_H #ifndef PLAYLIST_H
#define PLAYLIST_H #define PLAYLIST_H
#include <klistview.h> #include <k3listview.h>
#include <k3urldrag.h> #include <k3urldrag.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
...@@ -54,7 +54,7 @@ class UpcomingPlaylist; ...@@ -54,7 +54,7 @@ class UpcomingPlaylist;
typedef Q3ValueList<PlaylistItem *> PlaylistItemList; typedef Q3ValueList<PlaylistItem *> PlaylistItemList;
class Playlist : public KListView, public PlaylistInterface class Playlist : public K3ListView, public PlaylistInterface
{ {
Q_OBJECT Q_OBJECT
...@@ -363,7 +363,7 @@ public slots: ...@@ -363,7 +363,7 @@ public slots:
* @see clearItems() * @see clearItems()
*/ */
virtual void clear(); virtual void clear();
virtual void selectAll() { KListView::selectAll(true); } virtual void selectAll() { K3ListView::selectAll(true); }
/** /**
* Refreshes the tags of the selection from disk, or all of the files in the * Refreshes the tags of the selection from disk, or all of the files in the
......
...@@ -55,7 +55,7 @@ using namespace ActionCollection; ...@@ -55,7 +55,7 @@ using namespace ActionCollection;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
PlaylistBox::PlaylistBox(QWidget *parent, Q3WidgetStack *playlistStack) : PlaylistBox::PlaylistBox(QWidget *parent, Q3WidgetStack *playlistStack) :
KListView(parent), K3ListView(parent),
PlaylistCollection(playlistStack), PlaylistCollection(playlistStack),
m_viewModeIndex(0), m_viewModeIndex(0),
m_hasSelection(false), m_hasSelection(false),
...@@ -526,14 +526,14 @@ void PlaylistBox::contentsDragLeaveEvent(QDragLeaveEvent *e) ...@@ -526,14 +526,14 @@ void PlaylistBox::contentsDragLeaveEvent(QDragLeaveEvent *e)
m_dropItem = 0; m_dropItem = 0;
old->repaint(); old->repaint();
} }
KListView::contentsDragLeaveEvent(e); K3ListView::contentsDragLeaveEvent(e);
} }
void PlaylistBox::contentsMousePressEvent(QMouseEvent *e) void PlaylistBox::contentsMousePressEvent(QMouseEvent *e)
{ {
if(e->button() == Qt::LeftButton) if(e->button() == Qt::LeftButton)
m_doingMultiSelect = true; m_doingMultiSelect = true;
KListView::contentsMousePressEvent(e); K3ListView::contentsMousePressEvent(e);
} }
void PlaylistBox::contentsMouseReleaseEvent(QMouseEvent *e) void PlaylistBox::contentsMouseReleaseEvent(QMouseEvent *e)
...@@ -542,14 +542,14 @@ void PlaylistBox::contentsMouseReleaseEvent(QMouseEvent *e) ...@@ -542,14 +542,14 @@ void PlaylistBox::contentsMouseReleaseEvent(QMouseEvent *e)
m_doingMultiSelect = false; m_doingMultiSelect = false;
slotPlaylistChanged(); slotPlaylistChanged();
} }
KListView::contentsMouseReleaseEvent(e); K3ListView::contentsMouseReleaseEvent(e);
} }
void PlaylistBox::keyPressEvent(QKeyEvent *e) void PlaylistBox::keyPressEvent(QKeyEvent *e)
{ {
if((e->key() == Qt::Key_Up || e->key() == Qt::Key_Down) && e->state() == Qt::ShiftButton) if((e->key() == Qt::Key_Up || e->key() == Qt::Key_Down) && e->state() == Qt::ShiftButton)
m_doingMultiSelect = true; m_doingMultiSelect = true;
KListView::keyPressEvent(e); K3ListView::keyPressEvent(e);
} }
void PlaylistBox::keyReleaseEvent(QKeyEvent *e) void PlaylistBox::keyReleaseEvent(QKeyEvent *e)
...@@ -558,7 +558,7 @@ void PlaylistBox::keyReleaseEvent(QKeyEvent *e) ...@@ -558,7 +558,7 @@ void PlaylistBox::keyReleaseEvent(QKeyEvent *e)
m_doingMultiSelect = false; m_doingMultiSelect = false;
slotPlaylistChanged(); slotPlaylistChanged();
} }
KListView::keyReleaseEvent(e); K3ListView::keyReleaseEvent(e);
} }
PlaylistBox::ItemList PlaylistBox::selectedItems() const PlaylistBox::ItemList PlaylistBox::selectedItems() const
...@@ -575,7 +575,7 @@ PlaylistBox::ItemList PlaylistBox::selectedItems() const ...@@ -575,7 +575,7 @@ PlaylistBox::ItemList PlaylistBox::selectedItems() const
void PlaylistBox::setSingleItem(Q3ListViewItem *item) void PlaylistBox::setSingleItem(Q3ListViewItem *item)
{ {
setSelectionModeExt(Single); setSelectionModeExt(Single);
KListView::setCurrentItem(item); K3ListView::setCurrentItem(item);
setSelectionModeExt(Extended); setSelectionModeExt(Extended);
} }
...@@ -693,14 +693,14 @@ void PlaylistBox::setupUpcomingPlaylist() ...@@ -693,14 +693,14 @@ void PlaylistBox::setupUpcomingPlaylist()
PlaylistBox::Item *PlaylistBox::Item::m_collectionItem = 0; PlaylistBox::Item *PlaylistBox::Item::m_collectionItem = 0;
PlaylistBox::Item::Item(PlaylistBox *listBox, const QString &icon, const QString &text, Playlist *l) PlaylistBox::Item::Item(PlaylistBox *listBox, const QString &icon, const QString &text, Playlist *l)
: QObject(listBox), KListViewItem(listBox, 0, text), : QObject(listBox), K3ListViewItem(listBox, 0, text),
m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false) m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false)
{ {
init(); init();
} }
PlaylistBox::Item::Item(Item *parent, const QString &icon, const QString &text, Playlist *l) PlaylistBox::Item::Item(Item *parent, const QString &icon, const QString &text, Playlist *l)
: QObject(parent->listView()), KListViewItem(parent, text), : QObject(parent->listView()), K3ListViewItem(parent, text),
m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false) m_playlist(l), m_text(text), m_iconName(icon), m_sortedFirst(false)
{ {
init(); init();
...@@ -738,7 +738,7 @@ void PlaylistBox::Item::paintCell(QPainter *painter, const QColorGroup &colorGro ...@@ -738,7 +738,7 @@ void PlaylistBox::Item::paintCell(QPainter *painter, const QColorGroup &colorGro
void PlaylistBox::Item::setText(int column, const QString &text) void PlaylistBox::Item::setText(int column, const QString &text)
{ {
m_text = text; m_text = text;
KListViewItem::setText(column, text); K3ListViewItem::setText(column, text);
} }
void PlaylistBox::Item::setup() void PlaylistBox::Item::setup()
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "playlistcollection.h" #include "playlistcollection.h"
#include <klistview.h> #include <k3listview.h>
#include <q3ptrdict.h> #include <q3ptrdict.h>
...@@ -45,7 +45,7 @@ typedef Q3ValueList<Playlist *> PlaylistList; ...@@ -45,7 +45,7 @@ typedef Q3ValueList<Playlist *> PlaylistList;
* JuK's main widget (PlaylistSplitter). * JuK's main widget (PlaylistSplitter).
*/ */
class PlaylistBox : public KListView, public PlaylistCollection class PlaylistBox : public K3ListView, public PlaylistCollection
{ {
Q_OBJECT Q_OBJECT
...@@ -138,7 +138,7 @@ private: ...@@ -138,7 +138,7 @@ private:
class PlaylistBox::Item : public QObject, public KListViewItem class PlaylistBox::Item : public QObject, public K3ListViewItem
{