diff --git a/coverdialog.cpp b/coverdialog.cpp index a22920dd396259c5013e61e19ac6129cb0283fc6..6d1ddd8baf3924a16a106ffef3f45e2f3857a511 100644 --- a/coverdialog.cpp +++ b/coverdialog.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include -#include +#include +#include #include #include #include @@ -33,11 +33,11 @@ using CoverUtility::CoverIconViewItem; -class AllArtistsListViewItem : public KListViewItem +class AllArtistsListViewItem : public K3ListViewItem { public: AllArtistsListViewItem(Q3ListView *parent) : - KListViewItem(parent, i18n("")) + K3ListViewItem(parent, i18n("")) { } @@ -47,11 +47,11 @@ public: } }; -class CaseInsensitiveItem : public KListViewItem +class CaseInsensitiveItem : public K3ListViewItem { public: CaseInsensitiveItem(Q3ListView *parent, const QString &text) : - KListViewItem(parent, text) + K3ListViewItem(parent, text) { } diff --git a/coverdialogbase.ui b/coverdialogbase.ui index 180dc8b00898a0a78f47260d2bfe65c2a38a4dd0..9fdcedc54448a6d94cb9841e93419e896991d687 100644 --- a/coverdialogbase.ui +++ b/coverdialogbase.ui @@ -19,7 +19,7 @@ unnamed - + Artist diff --git a/covericonview.cpp b/covericonview.cpp index 4b295a70d94df04e02fada9211c73255b404a939..9bfdac66b2396b6890715c582def664e938d6489 100644 --- a/covericonview.cpp +++ b/covericonview.cpp @@ -19,21 +19,21 @@ using CoverUtility::CoverIconViewItem; CoverIconViewItem::CoverIconViewItem(coverKey id, Q3IconView *parent) : - KIconViewItem(parent), m_id(id) + K3IconViewItem(parent), m_id(id) { CoverDataPtr data = CoverManager::coverInfo(id); setText(QString("%1 - %2").arg(data->artist, data->album)); 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); } CoverIconViewItem *CoverIconView::currentItem() const { - return static_cast(KIconView::currentItem()); + return static_cast(K3IconView::currentItem()); } Q3DragObject *CoverIconView::dragObject() diff --git a/covericonview.h b/covericonview.h index cca06868e50d7b2780f235039f6dcb81f4cf8380..bbbc6b1128a1c6641eb8a2db88474a79d3adb0c8 100644 --- a/covericonview.h +++ b/covericonview.h @@ -16,7 +16,7 @@ #ifndef COVERICONVIEW_H #define COVERICONVIEW_H -#include +#include #include "covermanager.h" @@ -27,7 +27,7 @@ namespace CoverUtility { - class CoverIconViewItem : public KIconViewItem + class CoverIconViewItem : public K3IconViewItem { public: CoverIconViewItem(coverKey id, Q3IconView *parent); @@ -42,12 +42,12 @@ namespace CoverUtility 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. * * @author Michael Pyne */ -class CoverIconView : public KIconView +class CoverIconView : public K3IconView { public: CoverIconView(QWidget *parent, const char *name = 0); diff --git a/directorylist.cpp b/directorylist.cpp index 8e973570f2aae12ae32179ec34deb6d5b333fb3b..34802ffe1318444e3227f71fd7ca9ee9ddcc7417 100644 --- a/directorylist.cpp +++ b/directorylist.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include @@ -46,7 +46,7 @@ DirectoryList::DirectoryList(const QStringList &directories, bool importPlaylist QStringList::ConstIterator it = directories.begin(); for(; it != directories.end(); ++it) - new KListViewItem(m_base->directoryListView, *it); + new K3ListViewItem(m_base->directoryListView, *it); m_base->importPlaylistsCheckBox->setChecked(importPlaylists); @@ -80,7 +80,7 @@ void DirectoryList::slotAddDirectory() QString dir = KFileDialog::getExistingDirectory(); if(!dir.isEmpty() && m_dirList.find(dir) == m_dirList.end()) { m_dirList.append(dir); - new KListViewItem(m_base->directoryListView, dir); + new K3ListViewItem(m_base->directoryListView, dir); m_result.addedDirs.append(dir); } } diff --git a/directorylistbase.ui b/directorylistbase.ui index 643417d349b978d4618761734b05c271f8797464..a166096dfdc17ee381200f8fd297ce55222ab2bb 100644 --- a/directorylistbase.ui +++ b/directorylistbase.ui @@ -16,7 +16,7 @@ unnamed - + Folders diff --git a/filerenamer.cpp b/filerenamer.cpp index 4c4fcae44622132dd7c76e9d5aa63009b5f08ae7..dfb225ba773451270c996e6f6628394a1b10bcbd 100644 --- a/filerenamer.cpp +++ b/filerenamer.cpp @@ -78,7 +78,7 @@ public: "Are you sure you want to continue?"), hbox); hbox->setStretchFactor(l, 1); - KListView *lv = new KListView(vbox); + K3ListView *lv = new K3ListView(vbox); lv->addColumn(i18n("Original Name")); lv->addColumn(i18n("New Name")); @@ -87,9 +87,9 @@ public: QMap::ConstIterator it = files.begin(); for(; it != files.end(); ++it) { - KListViewItem *i = it.key() != it.data() - ? new KListViewItem(lv, it.key(), it.data()) - : new KListViewItem(lv, it.key(), i18n("No Change")); + K3ListViewItem *i = it.key() != it.data() + ? new K3ListViewItem(lv, it.key(), it.data()) + : new K3ListViewItem(lv, it.key(), i18n("No Change")); lvHeight += i->height(); } diff --git a/googlefetcherdialog.cpp b/googlefetcherdialog.cpp index 927b31f46ceaf13554c44feb75914f3b99364ce3..ee59c4e310c94a54ddf2d7163399db254cf768c8 100644 --- a/googlefetcherdialog.cpp +++ b/googlefetcherdialog.cpp @@ -45,7 +45,7 @@ GoogleFetcherDialog::GoogleFetcherDialog(const QString &name, disableResize(); Q3HBox *mainBox = new Q3HBox(this); - m_iconWidget = new KIconView(mainBox); + m_iconWidget = new K3IconView(mainBox); m_iconWidget->setResizeMode(Q3IconView::Adjust); m_iconWidget->setSpacing(10); m_iconWidget->setFixedSize(500,550); @@ -200,7 +200,7 @@ QPixmap GoogleFetcherDialog::pixmapFromURL(const KUrl &url) const //////////////////////////////////////////////////////////////////////////////// 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 diff --git a/googlefetcherdialog.h b/googlefetcherdialog.h index 9b65187791d6d4928cddd51e0b1ac817d0b7281e..0c634cf9ad7e2ae172d640c8b1affb402479a6e9 100644 --- a/googlefetcherdialog.h +++ b/googlefetcherdialog.h @@ -15,7 +15,7 @@ #ifndef GOOGLEFETCHERDIALOG_H #define GOOGLEFETCHERDIALOG_H -#include +#include #include @@ -63,7 +63,7 @@ private: QPixmap m_pixmap; GoogleImageList m_imageList; - KIconView *m_iconWidget; + K3IconView *m_iconWidget; bool m_takeIt; bool m_newSearch; FileHandle m_file; @@ -74,7 +74,7 @@ namespace KIO class TransferJob; } -class CoverIconViewItem : public QObject, public KIconViewItem +class CoverIconViewItem : public QObject, public K3IconViewItem { Q_OBJECT diff --git a/playlist.cpp b/playlist.cpp index 0a8330da6b77c3e9e26bfc12c7ad13cb906501dd..b8410491e50e75b8cccb9b0a1ded9aba9963ed49 100644 --- a/playlist.cpp +++ b/playlist.cpp @@ -327,7 +327,7 @@ int Playlist::m_leftColumn = 0; Playlist::Playlist(PlaylistCollection *collection, const QString &name, const QString &iconName) : - KListView(collection->playlistStack()), + K3ListView(collection->playlistStack()), m_collection(collection), m_selectedCount(0), m_allowDuplicates(false), @@ -350,7 +350,7 @@ Playlist::Playlist(PlaylistCollection *collection, const QString &name, Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items, const QString &name, const QString &iconName) : - KListView(collection->playlistStack()), + K3ListView(collection->playlistStack()), m_collection(collection), m_selectedCount(0), m_allowDuplicates(false), @@ -374,7 +374,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items Playlist::Playlist(PlaylistCollection *collection, const QFileInfo &playlistFile, const QString &iconName) : - KListView(collection->playlistStack()), + K3ListView(collection->playlistStack()), m_collection(collection), m_selectedCount(0), m_allowDuplicates(false), @@ -397,7 +397,7 @@ Playlist::Playlist(PlaylistCollection *collection, const QFileInfo &playlistFile } Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) : - KListView(collection->playlistStack()), + K3ListView(collection->playlistStack()), m_collection(collection), m_selectedCount(0), m_allowDuplicates(false), @@ -657,7 +657,7 @@ PlaylistItemList Playlist::selectedItems() PlaylistItem *Playlist::firstChild() const { - return static_cast(KListView::firstChild()); + return static_cast(K3ListView::firstChild()); } void Playlist::updateLeftColumn() @@ -1037,7 +1037,7 @@ Q3DragObject *Playlist::dragObject(QWidget *parent) void Playlist::contentsDragEnterEvent(QDragEnterEvent *e) { - KListView::contentsDragEnterEvent(e); + K3ListView::contentsDragEnterEvent(e); if(CoverDrag::canDecode(e)) { setDropHighlighter(true); @@ -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) @@ -1170,7 +1170,7 @@ void Playlist::keyPressEvent(QKeyEvent *event) } - KListView::keyPressEvent(event); + K3ListView::keyPressEvent(event); } void Playlist::contentsDropEvent(QDropEvent *e) @@ -1219,7 +1219,7 @@ void Playlist::contentsDropEvent(QDropEvent *e) setSorting(columns() + 1); - QList items = KListView::selectedItems(); + QList items = K3ListView::selectedItems(); for(QList::Iterator it = items.begin(); it != items.end(); ++it) { if(!item) { @@ -1243,7 +1243,7 @@ void Playlist::contentsDropEvent(QDropEvent *e) dataChanged(); emit signalPlaylistItemsDropped(this); - KListView::contentsDropEvent(e); + K3ListView::contentsDropEvent(e); } void Playlist::contentsMouseDoubleClickEvent(QMouseEvent *e) @@ -1252,7 +1252,7 @@ void Playlist::contentsMouseDoubleClickEvent(QMouseEvent *e) // weird experience of switching songs from a double right-click. if(e->button() == Qt::LeftButton) - KListView::contentsMouseDoubleClickEvent(e); + K3ListView::contentsMouseDoubleClickEvent(e); } void Playlist::showEvent(QShowEvent *e) @@ -1261,7 +1261,7 @@ void Playlist::showEvent(QShowEvent *e) SharedSettings::instance()->apply(this); m_applySharedSettings = false; } - KListView::showEvent(e); + K3ListView::showEvent(e); } void Playlist::applySharedSettings() @@ -1302,7 +1302,7 @@ void Playlist::viewportPaintEvent(QPaintEvent *pe) slotUpdateColumnWidths(); } - KListView::viewportPaintEvent(pe); + K3ListView::viewportPaintEvent(pe); } void Playlist::viewportResizeEvent(QResizeEvent *re) @@ -1313,7 +1313,7 @@ void Playlist::viewportResizeEvent(QResizeEvent *re) if(re->size().width() != re->oldSize().width() && !manualResize()) slotUpdateColumnWidths(); - KListView::viewportResizeEvent(re); + K3ListView::viewportResizeEvent(re); } void Playlist::insertItem(Q3ListViewItem *item) @@ -1324,7 +1324,7 @@ void Playlist::insertItem(Q3ListViewItem *item) // you need to use the PlaylistItem from here. m_addTime.append(static_cast(item)); - KListView::insertItem(item); + K3ListView::insertItem(item); } void Playlist::takeItem(Q3ListViewItem *item) @@ -1332,13 +1332,13 @@ void Playlist::takeItem(Q3ListViewItem *item) // See the warning in Playlist::insertItem. m_subtractTime.append(static_cast(item)); - KListView::takeItem(item); + K3ListView::takeItem(item); } void Playlist::addColumn(const QString &label) { slotWeightDirty(columns()); - KListView::addColumn(label, 30); + K3ListView::addColumn(label, 30); } PlaylistItem *Playlist::createItem(const FileHandle &file, @@ -1511,7 +1511,7 @@ bool Playlist::isColumnVisible(int c) const void Playlist::polish() { - KListView::polish(); + K3ListView::polish(); if(m_polished) return; diff --git a/playlist.h b/playlist.h index a11c4db20ab40d785a506a5c3a9a83f46624f33b..daa4a85be53485fc25dddbd7361af27d5e07e94b 100644 --- a/playlist.h +++ b/playlist.h @@ -16,7 +16,7 @@ #ifndef PLAYLIST_H #define PLAYLIST_H -#include +#include #include #include #include @@ -54,7 +54,7 @@ class UpcomingPlaylist; typedef Q3ValueList PlaylistItemList; -class Playlist : public KListView, public PlaylistInterface +class Playlist : public K3ListView, public PlaylistInterface { Q_OBJECT @@ -363,7 +363,7 @@ public slots: * @see clearItems() */ 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 diff --git a/playlistbox.cpp b/playlistbox.cpp index b8d9a982bec1de6eef0401706de69fb1d15db577..ffb760353adfb9481bb525fb48b73a52007bf33a 100644 --- a/playlistbox.cpp +++ b/playlistbox.cpp @@ -55,7 +55,7 @@ using namespace ActionCollection; //////////////////////////////////////////////////////////////////////////////// PlaylistBox::PlaylistBox(QWidget *parent, Q3WidgetStack *playlistStack) : - KListView(parent), + K3ListView(parent), PlaylistCollection(playlistStack), m_viewModeIndex(0), m_hasSelection(false), @@ -526,14 +526,14 @@ void PlaylistBox::contentsDragLeaveEvent(QDragLeaveEvent *e) m_dropItem = 0; old->repaint(); } - KListView::contentsDragLeaveEvent(e); + K3ListView::contentsDragLeaveEvent(e); } void PlaylistBox::contentsMousePressEvent(QMouseEvent *e) { if(e->button() == Qt::LeftButton) m_doingMultiSelect = true; - KListView::contentsMousePressEvent(e); + K3ListView::contentsMousePressEvent(e); } void PlaylistBox::contentsMouseReleaseEvent(QMouseEvent *e) @@ -542,14 +542,14 @@ void PlaylistBox::contentsMouseReleaseEvent(QMouseEvent *e) m_doingMultiSelect = false; slotPlaylistChanged(); } - KListView::contentsMouseReleaseEvent(e); + K3ListView::contentsMouseReleaseEvent(e); } void PlaylistBox::keyPressEvent(QKeyEvent *e) { if((e->key() == Qt::Key_Up || e->key() == Qt::Key_Down) && e->state() == Qt::ShiftButton) m_doingMultiSelect = true; - KListView::keyPressEvent(e); + K3ListView::keyPressEvent(e); } void PlaylistBox::keyReleaseEvent(QKeyEvent *e) @@ -558,7 +558,7 @@ void PlaylistBox::keyReleaseEvent(QKeyEvent *e) m_doingMultiSelect = false; slotPlaylistChanged(); } - KListView::keyReleaseEvent(e); + K3ListView::keyReleaseEvent(e); } PlaylistBox::ItemList PlaylistBox::selectedItems() const @@ -575,7 +575,7 @@ PlaylistBox::ItemList PlaylistBox::selectedItems() const void PlaylistBox::setSingleItem(Q3ListViewItem *item) { setSelectionModeExt(Single); - KListView::setCurrentItem(item); + K3ListView::setCurrentItem(item); setSelectionModeExt(Extended); } @@ -693,14 +693,14 @@ void PlaylistBox::setupUpcomingPlaylist() PlaylistBox::Item *PlaylistBox::Item::m_collectionItem = 0; 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) { init(); } 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) { init(); @@ -738,7 +738,7 @@ void PlaylistBox::Item::paintCell(QPainter *painter, const QColorGroup &colorGro void PlaylistBox::Item::setText(int column, const QString &text) { m_text = text; - KListViewItem::setText(column, text); + K3ListViewItem::setText(column, text); } void PlaylistBox::Item::setup() diff --git a/playlistbox.h b/playlistbox.h index df5dde496c3f1a9daf4b2cf6709dfb6e77f6a8f6..4f493a69947a35cb9cabcb64b9c4fc184a9c03d3 100644 --- a/playlistbox.h +++ b/playlistbox.h @@ -18,7 +18,7 @@ #include "playlistcollection.h" -#include +#include #include @@ -45,7 +45,7 @@ typedef Q3ValueList PlaylistList; * JuK's main widget (PlaylistSplitter). */ -class PlaylistBox : public KListView, public PlaylistCollection +class PlaylistBox : public K3ListView, public PlaylistCollection { Q_OBJECT @@ -138,7 +138,7 @@ private: -class PlaylistBox::Item : public QObject, public KListViewItem +class PlaylistBox::Item : public QObject, public K3ListViewItem { friend class PlaylistBox; friend class ViewMode; @@ -159,7 +159,7 @@ protected: Item(Item *parent, const QString &icon, const QString &text, Playlist *l = 0); Playlist *playlist() const { return m_playlist; } - PlaylistBox *listView() const { return static_cast(KListViewItem::listView()); } + PlaylistBox *listView() const { return static_cast(K3ListViewItem::listView()); } QString iconName() const { return m_iconName; } QString text() const { return m_text; } void setSortedFirst(bool first = true) { m_sortedFirst = first; } @@ -169,7 +169,7 @@ protected: virtual void paintFocus(QPainter *, const QColorGroup &, const QRect &) {} virtual void setText(int column, const QString &text); - virtual QString text(int column) const { return KListViewItem::text(column); } + virtual QString text(int column) const { return K3ListViewItem::text(column); } virtual void setup(); diff --git a/playlistitem.cpp b/playlistitem.cpp index a78ca6298e42d0222d5ca01520cd6619d558cf63..1bb20bb52a019afb129c92116d5e12053c92999f 100644 --- a/playlistitem.cpp +++ b/playlistitem.cpp @@ -100,7 +100,7 @@ const QPixmap *PlaylistItem::pixmap(int column) const m_playingItems.contains(const_cast(this))) return &playing; - return KListViewItem::pixmap(column); + return K3ListViewItem::pixmap(column); } QString PlaylistItem::text(int column) const @@ -140,7 +140,7 @@ QString PlaylistItem::text(int column) const case FullPathColumn: return d->fileHandle.fileInfo().absFilePath(); default: - return KListViewItem::text(column); + return K3ListViewItem::text(column); } } @@ -148,11 +148,11 @@ void PlaylistItem::setText(int column, const QString &text) { int offset = playlist()->columnOffset(); if(column - offset >= 0 && column + offset <= lastColumn()) { - KListViewItem::setText(column, QString::null); + K3ListViewItem::setText(column, QString::null); return; } - KListViewItem::setText(column, text); + K3ListViewItem::setText(column, text); playlist()->slotWeightDirty(column); } @@ -181,7 +181,7 @@ void PlaylistItem::setPlaying(bool playing, bool master) void PlaylistItem::setSelected(bool selected) { playlist()->markItemSelected(this, selected); - KListViewItem::setSelected(selected); + K3ListViewItem::setSelected(selected); } void PlaylistItem::guessTagInfo(TagGuesser::Type type) @@ -243,7 +243,7 @@ void PlaylistItem::clear() //////////////////////////////////////////////////////////////////////////////// PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) : - KListViewItem(parent), + K3ListViewItem(parent), d(0), m_watched(0) { @@ -251,7 +251,7 @@ PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent) : } PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, Q3ListViewItem *after) : - KListViewItem(parent, after), + K3ListViewItem(parent, after), d(0), m_watched(0) { @@ -262,7 +262,7 @@ PlaylistItem::PlaylistItem(CollectionListItem *item, Playlist *parent, Q3ListVie // This constructor should only be used by the CollectionList subclass. PlaylistItem::PlaylistItem(CollectionList *parent) : - KListViewItem(parent), + K3ListViewItem(parent), m_watched(0) { d = new Data; @@ -273,7 +273,7 @@ PlaylistItem::PlaylistItem(CollectionList *parent) : void PlaylistItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align) { if(!m_playingItems.contains(this)) - return KListViewItem::paintCell(p, cg, column, width, align); + return K3ListViewItem::paintCell(p, cg, column, width, align); QColorGroup colorGroup = cg; diff --git a/playlistitem.h b/playlistitem.h index 98219dc23bf00ea6a825fafe2990ff7e39c5b829..1b44f64cb0d768a60fea719e2f83899049dfa925 100644 --- a/playlistitem.h +++ b/playlistitem.h @@ -16,7 +16,7 @@ #ifndef PLAYLISTITEM_H #define PLAYLISTITEM_H -#include +#include #include #include @@ -45,7 +45,7 @@ typedef Q3ValueList PlaylistItemList; * Playlist::clearItem(). */ -class PlaylistItem : public KListViewItem +class PlaylistItem : public K3ListViewItem { friend class Playlist; friend class SearchPlaylist; @@ -141,12 +141,12 @@ public: /** * Returns properly casted item below this one. */ - PlaylistItem *itemBelow() { return static_cast(KListViewItem::itemBelow()); } + PlaylistItem *itemBelow() { return static_cast(K3ListViewItem::itemBelow()); } /** * Returns properly casted item above this one. */ - PlaylistItem *itemAbove() { return static_cast(KListViewItem::itemAbove()); } + PlaylistItem *itemAbove() { return static_cast(K3ListViewItem::itemAbove()); } /** * Returns a reference to the list of the currnetly playing items, with the diff --git a/playlistsplitter.cpp b/playlistsplitter.cpp index 9d5308bcf8c2663961ab43a6e6f2f6e59a7c987a..53df3d8f4f63e5d10e70795e706358b366765cff 100644 --- a/playlistsplitter.cpp +++ b/playlistsplitter.cpp @@ -86,7 +86,7 @@ void PlaylistSplitter::slotFocusCurrentPlaylist() if(playlist) { playlist->setFocus(); - playlist->KListView::selectAll(false); + playlist->K3ListView::selectAll(false); // Select the top visible (and matching) item. diff --git a/tagguesserconfigdlg.cpp b/tagguesserconfigdlg.cpp index 03fe57662134f424fa557f6589b1feca3992b97e..bf4489467a72e67bff719b32390da48738669b4a 100644 --- a/tagguesserconfigdlg.cpp +++ b/tagguesserconfigdlg.cpp @@ -11,7 +11,7 @@ #include "tagguesserconfigdlgwidget.h" #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ TagGuesserConfigDlg::TagGuesserConfigDlg(QWidget *parent, const char *name) QStringList::ConstIterator it = schemes.begin(); QStringList::ConstIterator end = schemes.end(); for (; it != end; ++it) { - KListViewItem *item = new KListViewItem(m_child->lvSchemes, *it); + K3ListViewItem *item = new K3ListViewItem(m_child->lvSchemes, *it); item->moveItem(m_child->lvSchemes->lastItem()); } @@ -107,7 +107,7 @@ void TagGuesserConfigDlg::slotMoveDownClicked() void TagGuesserConfigDlg::slotAddClicked() { - KListViewItem *item = new KListViewItem(m_child->lvSchemes); + K3ListViewItem *item = new K3ListViewItem(m_child->lvSchemes); m_child->lvSchemes->rename(item, 0); } diff --git a/tagguesserconfigdlgwidget.ui b/tagguesserconfigdlgwidget.ui index 25d86c0bd326a911a4f343e59fd88c54012dc37f..7d3c5ee6492b5bfb6f5bbc54a78f717397a899ca 100644 --- a/tagguesserconfigdlgwidget.ui +++ b/tagguesserconfigdlgwidget.ui @@ -17,7 +17,7 @@ unnamed - + File Name Scheme diff --git a/trackpickerdialog.cpp b/trackpickerdialog.cpp index 7dd135c13b0c51c921a644deedf3641d564913ea..9955403f0f763347f7fcd974ca89440128bfdd3f 100644 --- a/trackpickerdialog.cpp +++ b/trackpickerdialog.cpp @@ -19,7 +19,7 @@ #include -#include +#include #include #include "trackpickerdialog.h" @@ -27,11 +27,11 @@ #define NUMBER(x) (x == 0 ? QString::null : QString::number(x)) -class TrackPickerItem : public KListViewItem +class TrackPickerItem : public K3ListViewItem { public: - TrackPickerItem(KListView *parent, const KTRMResult &result) : - KListViewItem(parent, parent->lastChild(), + TrackPickerItem(K3ListView *parent, const KTRMResult &result) : + K3ListViewItem(parent, parent->lastChild(), result.title(), result.artist(), result.album(), NUMBER(result.track()), NUMBER(result.year())), m_result(result) {} diff --git a/trackpickerdialogbase.ui b/trackpickerdialogbase.ui index b938fb1960397b4d37905e6b92b4e43d17460869..ba15aa16ed553f406a789ad607d112a7c21a525e 100644 --- a/trackpickerdialogbase.ui +++ b/trackpickerdialogbase.ui @@ -83,7 +83,7 @@ unnamed - + Track Name diff --git a/viewmode.cpp b/viewmode.cpp index f8839cc4b3fd1c2299452b1cbc64d278f98dfdc0..e81014c33fd57611450518064b56a53f805133fe 100644 --- a/viewmode.cpp +++ b/viewmode.cpp @@ -231,7 +231,7 @@ void CompactViewMode::paintCell(PlaylistBox::Item *item, const QColorGroup &colorGroup, int column, int width, int align) { - item->KListViewItem::paintCell(painter, colorGroup, column, width, align); + item->K3ListViewItem::paintCell(painter, colorGroup, column, width, align); if(item == item->listView()->dropItem()) paintDropIndicator(painter, width, item->height()); } diff --git a/viewmode.h b/viewmode.h index 7c0d2544a6fdb470ee719eb099dd4c9e51fd4840..5043ed61c02cfea715fa05b567129cc4ae9e4cd7 100644 --- a/viewmode.h +++ b/viewmode.h @@ -110,7 +110,7 @@ public: const QColorGroup &colorGroup, int column, int width, int align); - virtual void setupItem(PlaylistBox::Item *item) const { item->KListViewItem::setup(); } + virtual void setupItem(PlaylistBox::Item *item) const { item->K3ListViewItem::setup(); } protected: virtual void updateHeights(); };