Commit cf046a30 authored by Laurent Montel's avatar Laurent Montel

qt3to4 + my script

svn path=/trunk/KDE/kdemultimedia/juk/; revision=455930
parent 32d1f3ee
...@@ -19,12 +19,14 @@ ...@@ -19,12 +19,14 @@
#include <klocale.h> #include <klocale.h>
#include <qradiobutton.h> #include <qradiobutton.h>
#include <qvgroupbox.h>
#include <qlabel.h> #include <qlabel.h>
#include <qhbox.h> #include <q3hbox.h>
#include <qvbox.h> #include <q3vbox.h>
#include <qlayout.h> #include <qlayout.h>
#include <qhbuttongroup.h> #include <qhbuttongroup.h>
//Added by qt3to4:
#include <QHBoxLayout>
#include <QBoxLayout>
#include "collectionlist.h" #include "collectionlist.h"
#include "advancedsearchdialog.h" #include "advancedsearchdialog.h"
...@@ -42,20 +44,20 @@ AdvancedSearchDialog::AdvancedSearchDialog(const QString &defaultName, ...@@ -42,20 +44,20 @@ AdvancedSearchDialog::AdvancedSearchDialog(const QString &defaultName,
{ {
makeVBoxMainWidget(); makeVBoxMainWidget();
QHBox *box = new QHBox(mainWidget()); Q3HBox *box = new Q3HBox(mainWidget());
box->setSpacing(5); box->setSpacing(5);
new QLabel(i18n("Playlist name:"), box); new QLabel(i18n("Playlist name:"), box);
m_playlistNameLineEdit = new KLineEdit(defaultName, box); m_playlistNameLineEdit = new KLineEdit(defaultName, box);
QVGroupBox *criteriaGroupBox = new QVGroupBox(i18n("Search Criteria"), mainWidget()); QVGroupBox *criteriaGroupBox = new QVGroupBox(i18n("Search Criteria"), mainWidget());
static_cast<QHBox *>(mainWidget())->setStretchFactor(criteriaGroupBox, 1); static_cast<Q3HBox *>(mainWidget())->setStretchFactor(criteriaGroupBox, 1);
QHButtonGroup *group = new QHButtonGroup(criteriaGroupBox); Q3HButtonGroup *group = new Q3HButtonGroup(criteriaGroupBox);
m_matchAnyButton = new QRadioButton(i18n("Match any of the following"), group); m_matchAnyButton = new QRadioButton(i18n("Match any of the following"), group);
m_matchAllButton = new QRadioButton(i18n("Match all of the following"), group); m_matchAllButton = new QRadioButton(i18n("Match all of the following"), group);
m_criteria = new QVBox(criteriaGroupBox); m_criteria = new Q3VBox(criteriaGroupBox);
if(defaultSearch.isNull()) { if(defaultSearch.isNull()) {
m_searchLines.append(new SearchLine(m_criteria)); m_searchLines.append(new SearchLine(m_criteria));
...@@ -127,7 +129,7 @@ void AdvancedSearchDialog::accept() ...@@ -127,7 +129,7 @@ void AdvancedSearchDialog::accept()
m_search.addPlaylist(CollectionList::instance()); m_search.addPlaylist(CollectionList::instance());
QValueListConstIterator<SearchLine *> it = m_searchLines.begin(); Q3ValueListConstIterator<SearchLine *> it = m_searchLines.begin();
for(; it != m_searchLines.end(); ++it) for(; it != m_searchLines.end(); ++it)
m_search.addComponent((*it)->searchComponent()); m_search.addComponent((*it)->searchComponent());
...@@ -141,7 +143,7 @@ void AdvancedSearchDialog::accept() ...@@ -141,7 +143,7 @@ void AdvancedSearchDialog::accept()
void AdvancedSearchDialog::clear() void AdvancedSearchDialog::clear()
{ {
QValueListConstIterator<SearchLine *> it = m_searchLines.begin(); Q3ValueListConstIterator<SearchLine *> it = m_searchLines.begin();
for(; it != m_searchLines.end(); ++it) for(; it != m_searchLines.end(); ++it)
(*it)->clear(); (*it)->clear();
} }
......
...@@ -17,10 +17,12 @@ ...@@ -17,10 +17,12 @@
#define ADVANCEDSEARCHDIALOG_H #define ADVANCEDSEARCHDIALOG_H
#include <kdialogbase.h> #include <kdialogbase.h>
//Added by qt3to4:
#include <Q3ValueList>
class KLineEdit; class KLineEdit;
class KPushButton; class KPushButton;
class QGroupBox; class Q3GroupBox;
class QRadioButton; class QRadioButton;
class SearchLine; class SearchLine;
...@@ -58,7 +60,7 @@ private: ...@@ -58,7 +60,7 @@ private:
QWidget *m_criteria; QWidget *m_criteria;
PlaylistSearch m_search; PlaylistSearch m_search;
QString m_playlistName; QString m_playlistName;
QValueList<SearchLine *> m_searchLines; Q3ValueList<SearchLine *> m_searchLines;
KLineEdit *m_playlistNameLineEdit; KLineEdit *m_playlistNameLineEdit;
QRadioButton *m_matchAnyButton; QRadioButton *m_matchAnyButton;
QRadioButton *m_matchAllButton; QRadioButton *m_matchAllButton;
......
...@@ -66,11 +66,11 @@ void Cache::save() ...@@ -66,11 +66,11 @@ void Cache::save()
QFile f(cacheFileName); QFile f(cacheFileName);
if(!f.open(IO_WriteOnly)) if(!f.open(QIODevice::WriteOnly))
return; return;
QByteArray data; QByteArray data;
QDataStream s(data, IO_WriteOnly); QDataStream s(data, QIODevice::WriteOnly);
for(Iterator it = begin(); it != end(); ++it) { for(Iterator it = begin(); it != end(); ++it) {
s << (*it).absFilePath(); s << (*it).absFilePath();
...@@ -96,7 +96,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static ...@@ -96,7 +96,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
QFile f(playlistsFile); QFile f(playlistsFile);
if(!f.open(IO_ReadOnly)) if(!f.open(QIODevice::ReadOnly))
return; return;
QDataStream fs(&f); QDataStream fs(&f);
...@@ -120,7 +120,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static ...@@ -120,7 +120,7 @@ void Cache::loadPlaylists(PlaylistCollection *collection) // static
// Create a new stream just based on the data. // Create a new stream just based on the data.
QDataStream s(data, IO_ReadOnly); QDataStream s(data, QIODevice::ReadOnly);
while(!s.atEnd()) { while(!s.atEnd()) {
...@@ -203,11 +203,11 @@ void Cache::savePlaylists(const PlaylistList &playlists) ...@@ -203,11 +203,11 @@ void Cache::savePlaylists(const PlaylistList &playlists)
QString playlistsFile = dirName + "playlists.new"; QString playlistsFile = dirName + "playlists.new";
QFile f(playlistsFile); QFile f(playlistsFile);
if(!f.open(IO_WriteOnly)) if(!f.open(QIODevice::WriteOnly))
return; return;
QByteArray data; QByteArray data;
QDataStream s(data, IO_WriteOnly); QDataStream s(data, QIODevice::WriteOnly);
for(PlaylistList::ConstIterator it = playlists.begin(); it != playlists.end(); ++it) { for(PlaylistList::ConstIterator it = playlists.begin(); it != playlists.end(); ++it) {
if(*it) { if(*it) {
...@@ -267,7 +267,7 @@ void Cache::load() ...@@ -267,7 +267,7 @@ void Cache::load()
QFile f(cacheFileName); QFile f(cacheFileName);
if(!f.open(IO_ReadOnly)) if(!f.open(QIODevice::ReadOnly))
return; return;
CacheDataStream s(&f); CacheDataStream s(&f);
...@@ -289,7 +289,7 @@ void Cache::load() ...@@ -289,7 +289,7 @@ void Cache::load()
>> data; >> data;
buffer.setBuffer(data); buffer.setBuffer(data);
buffer.open(IO_ReadOnly); buffer.open(QIODevice::ReadOnly);
s.setDevice(&buffer); s.setDevice(&buffer);
if(checksum != qChecksum(data.data(), data.size())) { if(checksum != qChecksum(data.data(), data.size())) {
......
...@@ -18,12 +18,14 @@ ...@@ -18,12 +18,14 @@
#include "stringhash.h" #include "stringhash.h"
//Added by qt3to4:
#include <Q3ValueList>
class Tag; class Tag;
class Playlist; class Playlist;
class PlaylistCollection; class PlaylistCollection;
typedef QValueList<Playlist *> PlaylistList; typedef Q3ValueList<Playlist *> PlaylistList;
class Cache : public FileHandleHash class Cache : public FileHandleHash
{ {
...@@ -54,7 +56,7 @@ class CacheDataStream : public QDataStream ...@@ -54,7 +56,7 @@ class CacheDataStream : public QDataStream
{ {
public: public:
CacheDataStream(QIODevice *d) : QDataStream(d), m_cacheVersion(0) {} CacheDataStream(QIODevice *d) : QDataStream(d), m_cacheVersion(0) {}
CacheDataStream(QByteArray a, int mode) : QDataStream(a, mode), m_cacheVersion(0) {} CacheDataStream(QByteArray &a, int mode) : QDataStream(a, mode), m_cacheVersion(0) {}
virtual ~CacheDataStream() {} virtual ~CacheDataStream() {}
......
//Added by qt3to4:
#include <Q3ValueList>
/*************************************************************************** /***************************************************************************
begin : Sun Oct 31 2004 begin : Sun Oct 31 2004
copyright : (C) 2004 by Michael Pyne copyright : (C) 2004 by Michael Pyne
...@@ -19,7 +21,7 @@ ...@@ -19,7 +21,7 @@
class QString; class QString;
template<class T> class QValueList; template<class T> class Q3ValueList;
/** /**
* This class is used to map categories into values. You should implement the * This class is used to map categories into values. You should implement the
...@@ -75,7 +77,7 @@ public: ...@@ -75,7 +77,7 @@ public:
*/ */
virtual QString emptyText(TagType category) const = 0; virtual QString emptyText(TagType category) const = 0;
virtual QValueList<TagType> categoryOrder() const = 0; virtual Q3ValueList<TagType> categoryOrder() const = 0;
// You probably shouldn't reimplement this // You probably shouldn't reimplement this
virtual QString value(TagType category) const; virtual QString value(TagType category) const;
......
...@@ -32,6 +32,11 @@ ...@@ -32,6 +32,11 @@
#include "tag.h" #include "tag.h"
#include "viewmode.h" #include "viewmode.h"
#include "coverinfo.h" #include "coverinfo.h"
//Added by qt3to4:
#include <Q3ValueList>
#include <QDragMoveEvent>
#include <Q3CString>
#include <QDropEvent>
using namespace ActionCollection; using namespace ActionCollection;
...@@ -84,7 +89,7 @@ void CollectionList::initialize(PlaylistCollection *collection) ...@@ -84,7 +89,7 @@ void CollectionList::initialize(PlaylistCollection *collection)
// public methods // public methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
PlaylistItem *CollectionList::createItem(const FileHandle &file, QListViewItem *, bool) PlaylistItem *CollectionList::createItem(const FileHandle &file, Q3ListViewItem *, bool)
{ {
// It's probably possible to optimize the line below away, but, well, right // It's probably possible to optimize the line below away, but, well, right
// now it's more important to not load duplicate items. // now it's more important to not load duplicate items.
...@@ -124,13 +129,13 @@ void CollectionList::setupTreeViewEntries(ViewMode *viewMode) const ...@@ -124,13 +129,13 @@ void CollectionList::setupTreeViewEntries(ViewMode *viewMode) const
return; return;
} }
QValueList<int> columnList; Q3ValueList<int> columnList;
columnList << PlaylistItem::ArtistColumn; columnList << PlaylistItem::ArtistColumn;
columnList << PlaylistItem::GenreColumn; columnList << PlaylistItem::GenreColumn;
columnList << PlaylistItem::AlbumColumn; columnList << PlaylistItem::AlbumColumn;
QStringList items; QStringList items;
for(QValueList<int>::Iterator colIt = columnList.begin(); colIt != columnList.end(); ++colIt) { for(Q3ValueList<int>::Iterator colIt = columnList.begin(); colIt != columnList.end(); ++colIt) {
items.clear(); items.clear();
for(TagCountDictIterator it(*m_columnTags[*colIt]); it.current(); ++it) for(TagCountDictIterator it(*m_columnTags[*colIt]); it.current(); ++it)
items << it.currentKey(); items << it.currentKey();
...@@ -198,7 +203,7 @@ void CollectionList::slotCheckCache() ...@@ -198,7 +203,7 @@ void CollectionList::slotCheckCache()
{ {
PlaylistItemList invalidItems; PlaylistItemList invalidItems;
for(QDictIterator<CollectionListItem>it(m_itemsDict); it.current(); ++it) { for(Q3DictIterator<CollectionListItem>it(m_itemsDict); it.current(); ++it) {
if(!it.current()->checkCurrent()) if(!it.current()->checkCurrent())
invalidItems.append(*it); invalidItems.append(*it);
processEvents(); processEvents();
...@@ -361,7 +366,7 @@ void CollectionListItem::refresh() ...@@ -361,7 +366,7 @@ void CollectionListItem::refresh()
if(id != TrackNumberColumn && id != LengthColumn) { if(id != TrackNumberColumn && id != LengthColumn) {
// All columns other than track num and length need local-encoded data for sorting // All columns other than track num and length need local-encoded data for sorting
QCString lower = text(i).lower().local8Bit(); Q3CString lower = text(i).lower().local8Bit();
// For some columns, we may be able to share some strings // For some columns, we may be able to share some strings
...@@ -428,7 +433,7 @@ void CollectionListItem::updateCollectionDict(const QString &oldPath, const QStr ...@@ -428,7 +433,7 @@ void CollectionListItem::updateCollectionDict(const QString &oldPath, const QStr
void CollectionListItem::repaint() const void CollectionListItem::repaint() const
{ {
QListViewItem::repaint(); Q3ListViewItem::repaint();
for(PlaylistItemList::ConstIterator it = m_children.begin(); it != m_children.end(); ++it) for(PlaylistItemList::ConstIterator it = m_children.begin(); it != m_children.end(); ++it)
(*it)->repaint(); (*it)->repaint();
} }
......
...@@ -20,9 +20,12 @@ ...@@ -20,9 +20,12 @@
#include <kdirwatch.h> #include <kdirwatch.h>
#include <kfileitem.h> #include <kfileitem.h>
#include <qdict.h> #include <q3dict.h>
#include <qclipboard.h> #include <qclipboard.h>
#include <qvaluevector.h> #include <q3valuevector.h>
//Added by qt3to4:
#include <QDragMoveEvent>
#include <QDropEvent>
#include "playlist.h" #include "playlist.h"
#include "playlistitem.h" #include "playlistitem.h"
...@@ -37,8 +40,8 @@ class ViewMode; ...@@ -37,8 +40,8 @@ class ViewMode;
* that hold the string. * that hold the string.
*/ */
typedef QDict<int> TagCountDict; typedef Q3Dict<int> TagCountDict;
typedef QDictIterator<int> TagCountDictIterator; typedef Q3DictIterator<int> TagCountDictIterator;
/** /**
* We then have an array of dicts, one for each column in the list view. We * We then have an array of dicts, one for each column in the list view. We
...@@ -46,7 +49,7 @@ typedef QDictIterator<int> TagCountDictIterator; ...@@ -46,7 +49,7 @@ typedef QDictIterator<int> TagCountDictIterator;
* doesn't copy the case sensitivity setting. * doesn't copy the case sensitivity setting.
*/ */
typedef QValueVector<TagCountDict*> TagCountDicts; typedef Q3ValueVector<TagCountDict*> TagCountDicts;
/** /**
* This is the "collection", or all of the music files that have been opened * This is the "collection", or all of the music files that have been opened
...@@ -83,7 +86,7 @@ public: ...@@ -83,7 +86,7 @@ public:
CollectionListItem *lookup(const QString &file) { return m_itemsDict.find(file); } CollectionListItem *lookup(const QString &file) { return m_itemsDict.find(file); }
virtual PlaylistItem *createItem(const FileHandle &file, virtual PlaylistItem *createItem(const FileHandle &file,
QListViewItem * = 0, Q3ListViewItem * = 0,
bool = false); bool = false);
void emitVisibleColumnsChanged() { emit signalVisibleColumnsChanged(); } void emitVisibleColumnsChanged() { emit signalVisibleColumnsChanged(); }
...@@ -151,7 +154,7 @@ private: ...@@ -151,7 +154,7 @@ private:
static const int m_uniqueSetCount = 3; static const int m_uniqueSetCount = 3;
static CollectionList *m_list; static CollectionList *m_list;
QDict<CollectionListItem> m_itemsDict; Q3Dict<CollectionListItem> m_itemsDict;
KDirWatch *m_dirWatch; KDirWatch *m_dirWatch;
TagCountDicts m_columnTags; TagCountDicts m_columnTags;
}; };
...@@ -165,7 +168,7 @@ class CollectionListItem : public PlaylistItem ...@@ -165,7 +168,7 @@ class CollectionListItem : public PlaylistItem
/** /**
* Needs access to the destructor, even though the destructor isn't used by QDict. * Needs access to the destructor, even though the destructor isn't used by QDict.
*/ */
friend class QDict<CollectionListItem>; friend class Q3Dict<CollectionListItem>;
public: public:
virtual void refresh(); virtual void refresh();
......
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#include <qtimer.h> #include <qtimer.h>
#include <qtoolbutton.h> #include <qtoolbutton.h>
//Added by qt3to4:
#include <Q3ValueList>
#include "coverdialog.h" #include "coverdialog.h"
#include "covericonview.h" #include "covericonview.h"
...@@ -34,21 +36,21 @@ using CoverUtility::CoverIconViewItem; ...@@ -34,21 +36,21 @@ using CoverUtility::CoverIconViewItem;
class AllArtistsListViewItem : public KListViewItem class AllArtistsListViewItem : public KListViewItem
{ {
public: public:
AllArtistsListViewItem(QListView *parent) : AllArtistsListViewItem(Q3ListView *parent) :
KListViewItem(parent, i18n("<All Artists>")) KListViewItem(parent, i18n("<All Artists>"))
{ {
} }
int compare(QListViewItem *, int, bool) const int compare(Q3ListViewItem *, int, bool) const
{ {
return -1; // Always be at the top. return -1; // Always be at the top.
} }
}; };
CoverDialog::CoverDialog(QWidget *parent) : CoverDialog::CoverDialog(QWidget *parent) :
CoverDialogBase(parent, "juk_cover_dialog", WType_Dialog) CoverDialogBase(parent, "juk_cover_dialog", Qt::WType_Dialog)
{ {
m_covers->setResizeMode(QIconView::Adjust); m_covers->setResizeMode(Q3IconView::Adjust);
m_covers->setGridX(140); m_covers->setGridX(140);
m_covers->setGridY(150); m_covers->setGridY(150);
...@@ -82,8 +84,8 @@ void CoverDialog::show() ...@@ -82,8 +84,8 @@ void CoverDialog::show()
// covers. // covers.
void CoverDialog::loadCovers() void CoverDialog::loadCovers()
{ {
QValueList<coverKey> keys = CoverManager::keys(); Q3ValueList<coverKey> keys = CoverManager::keys();
QValueList<coverKey>::ConstIterator it; Q3ValueList<coverKey>::ConstIterator it;
int i = 0; int i = 0;
for(it = keys.begin(); it != keys.end(); ++it) { for(it = keys.begin(); it != keys.end(); ++it) {
...@@ -97,7 +99,7 @@ void CoverDialog::loadCovers() ...@@ -97,7 +99,7 @@ void CoverDialog::loadCovers()
} }
// TODO: Add a way to show cover art for tracks with no artist. // TODO: Add a way to show cover art for tracks with no artist.
void CoverDialog::slotArtistClicked(QListViewItem *item) void CoverDialog::slotArtistClicked(Q3ListViewItem *item)
{ {
m_covers->clear(); m_covers->clear();
...@@ -107,8 +109,8 @@ void CoverDialog::slotArtistClicked(QListViewItem *item) ...@@ -107,8 +109,8 @@ void CoverDialog::slotArtistClicked(QListViewItem *item)
} }
else { else {
QString artist = item->text(0).lower(); QString artist = item->text(0).lower();
QValueList<coverKey> keys = CoverManager::keys(); Q3ValueList<coverKey> keys = CoverManager::keys();
QValueList<coverKey>::ConstIterator it; Q3ValueList<coverKey>::ConstIterator it;
for(it = keys.begin(); it != keys.end(); ++it) { for(it = keys.begin(); it != keys.end(); ++it) {
CoverDataPtr data = CoverManager::coverInfo(*it); CoverDataPtr data = CoverManager::coverInfo(*it);
...@@ -118,7 +120,7 @@ void CoverDialog::slotArtistClicked(QListViewItem *item) ...@@ -118,7 +120,7 @@ void CoverDialog::slotArtistClicked(QListViewItem *item)
} }
} }
void CoverDialog::slotContextRequested(QIconViewItem *item, const QPoint &pt) void CoverDialog::slotContextRequested(Q3IconViewItem *item, const QPoint &pt)
{ {
static KPopupMenu *menu = 0; static KPopupMenu *menu = 0;
......
...@@ -28,8 +28,8 @@ public: ...@@ -28,8 +28,8 @@ public:
virtual void show(); virtual void show();
public slots: public slots:
void slotArtistClicked(QListViewItem *item); void slotArtistClicked(Q3ListViewItem *item);
void slotContextRequested(QIconViewItem *item, const QPoint &pt); void slotContextRequested(Q3IconViewItem *item, const QPoint &pt);
private slots: private slots:
void loadCovers(); void loadCovers();
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
using CoverUtility::CoverIconViewItem; using CoverUtility::CoverIconViewItem;
CoverIconViewItem::CoverIconViewItem(coverKey id, QIconView *parent) : CoverIconViewItem::CoverIconViewItem(coverKey id, Q3IconView *parent) :
KIconViewItem(parent), m_id(id) KIconViewItem(parent), m_id(id)
{ {
CoverDataPtr data = CoverManager::coverInfo(id); CoverDataPtr data = CoverManager::coverInfo(id);
...@@ -36,7 +36,7 @@ CoverIconViewItem *CoverIconView::currentItem() const ...@@ -36,7 +36,7 @@ CoverIconViewItem *CoverIconView::currentItem() const
return static_cast<CoverIconViewItem *>(KIconView::currentItem()); return static_cast<CoverIconViewItem *>(KIconView::currentItem());
} }
QDragObject *CoverIconView::dragObject() Q3DragObject *CoverIconView::dragObject()
{ {
CoverIconViewItem *item = currentItem(); CoverIconViewItem *item = currentItem();
if(item) if(item)
......
...@@ -29,7 +29,7 @@ namespace CoverUtility ...@@ -29,7 +29,7 @@ namespace CoverUtility
class CoverIconViewItem : public KIconViewItem class CoverIconViewItem : public KIconViewItem
{ {
public: public:
CoverIconViewItem(coverKey id, QIconView *parent); CoverIconViewItem(coverKey id, Q3IconView *parent);
coverKey id() const { return m_id; } coverKey id() const { return m_id; }
...@@ -54,7 +54,7 @@ public: ...@@ -54,7 +54,7 @@ public:
CoverIconViewItem *currentItem() const; CoverIconViewItem *currentItem() const;
protected: protected:
virtual QDragObject *dragObject(); virtual Q3DragObject *dragObject();
}; };
#endif /* JUK_COVERICONVIEW_H */ #endif /* JUK_COVERICONVIEW_H */
......
...@@ -22,6 +22,12 @@ ...@@ -22,6 +22,12 @@
#include <qlayout.h> #include <qlayout.h>
#include <qlabel.h> #include <qlabel.h>
#include <qcursor.h> #include <qcursor.h>
//Added by qt3to4:
#include <QPixmap>
#include <QMouseEvent>
#include <Q3Frame>
#include <QHBoxLayout>
#include <QEvent>
#include "coverinfo.h" #include "coverinfo.h"
#include "tag.h" #include "tag.h"
...@@ -29,13 +35,13 @@ ...@@ -29,13 +35,13 @@
struct CoverPopup : public QWidget struct CoverPopup : public QWidget
{ {
CoverPopup(const QPixmap &image, const QPoint &p) : CoverPopup(const QPixmap &image, const QPoint &p) :
QWidget(0, 0, WDestructiveClose | WX11BypassWM) QWidget(0, 0, Qt::WDestructiveClose | Qt::WX11BypassWM)
{ {
QHBoxLayout *layout = new QHBoxLayout(this); QHBoxLayout *layout = new QHBoxLayout(this);
QLabel *label = new QLabel(this); QLabel *label = new QLabel(this);
layout->addWidget(label); layout->addWidget(label);
label->setFrameStyle(QFrame::Box | QFrame::Raised); label->setFrameStyle(Q3Frame::Box | Q3Frame::Raised);
label->setLineWidth(1); label->setLineWidth(1);
label->setPixmap(image); label->setPixmap(image);
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#define COVERINFO_H #define COVERINFO_H
#include <qimage.h> #include <qimage.h>
//Added by qt3to4:
#include <QPixmap>
#include "filehandle.h" #include "filehandle.h"
#include "covermanager.h" #include "covermanager.h"
......
...@@ -20,9 +20,11 @@ ...@@ -20,9 +20,11 @@
#include <qimage.h> #include <qimage.h>
#include <qdir.h> #include <qdir.h>
#include <qdatastream.h> #include <qdatastream.h>
#include <qdict.h> #include <q3dict.h>
#include <qcache.h> #include <q3cache.h>
#include <qmime.h> #include <qmime.h>
//Added by qt3to4:
#include <Q3ValueList>
#include <kdebug.h> #include <kdebug.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
...