Commit 1b37be4b authored by Michael Pyne's avatar Michael Pyne
Browse files

Significantly reduce number of warnings while compiling JuK by unmasking some...

Significantly reduce number of warnings while compiling JuK by unmasking some hidden virtual functions (and renaming/reimplementing some others)

svn path=/trunk/KDE/kdemultimedia/juk/; revision=807150
parent 8655625b
......@@ -63,6 +63,8 @@ private slots:
void slotCreateNewItem();
private:
using Playlist::createItems;
FileHandle m_file;
QTimer *m_timer;
};
......
......@@ -1328,10 +1328,10 @@ void Playlist::takeItem(Q3ListViewItem *item)
K3ListView::takeItem(item);
}
void Playlist::addColumn(const QString &label)
int Playlist::addColumn(const QString &label, int)
{
slotWeightDirty(columns());
K3ListView::addColumn(label, 30);
return K3ListView::addColumn(label, 30);
}
PlaylistItem *Playlist::createItem(const FileHandle &file,
......
......@@ -440,7 +440,8 @@ protected:
virtual bool hasItem(const QString &file) const { return m_members.contains(file); }
void addColumn(const QString &label);
virtual int addColumn(const QString &label, int width = -1);
using K3ListView::addColumn;
/**
* Do some finial initialization of created items. Notably ensure that they
......@@ -560,6 +561,8 @@ private:
*/
class SharedSettings;
using K3ListView::selectAll; // Avoid warning about hiding this function.
private slots:
/**
......
......@@ -292,7 +292,7 @@ void PlaylistBox::saveConfig()
void PlaylistBox::remove()
{
ItemList items = selectedItems();
ItemList items = selectedBoxItems();
if(items.isEmpty())
return;
......@@ -581,7 +581,7 @@ void PlaylistBox::keyReleaseEvent(QKeyEvent *e)
K3ListView::keyReleaseEvent(e);
}
PlaylistBox::ItemList PlaylistBox::selectedItems() const
PlaylistBox::ItemList PlaylistBox::selectedBoxItems() const
{
ItemList l;
......@@ -610,7 +610,7 @@ void PlaylistBox::slotPlaylistChanged()
if(m_doingMultiSelect)
return;
ItemList items = selectedItems();
ItemList items = selectedBoxItems();
m_hasSelection = !items.isEmpty();
bool allowReload = false;
......
......@@ -92,7 +92,9 @@ private:
virtual void keyPressEvent(QKeyEvent *e);
virtual void keyReleaseEvent(QKeyEvent *e);
ItemList selectedItems() const;
// selectedItems already used for something different
ItemList selectedBoxItems() const;
void setSingleItem(Q3ListViewItem *item);
void setupItem(Item *item);
......
......@@ -195,6 +195,8 @@ private:
KSharedPtr<Data> d;
void setup(CollectionListItem *item);
using Q3ListViewItem::setup; // Avoid warning about hidden function.
CollectionListItem *m_collectionItem;
bool m_watched;
static PlaylistItemList m_playingItems;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment