Commit ec588013 authored by Scott Wheeler's avatar Scott Wheeler

That last commit was a little half-baked. This one removes some unused

code that was causing a crash and moves some of the initialization to safer
places, but keeps the speed boost.

svn path=/trunk/kdemultimedia/juk/; revision=231701
parent ec5180e7
...@@ -114,6 +114,11 @@ CollectionList::CollectionList(QWidget *parent) : Playlist(parent, i18n("Collect ...@@ -114,6 +114,11 @@ CollectionList::CollectionList(QWidget *parent) : Playlist(parent, i18n("Collect
connect(m_dirWatch, SIGNAL(deleted(const QString &)), this, SLOT(slotRemoveItem(const QString &))); connect(m_dirWatch, SIGNAL(deleted(const QString &)), this, SLOT(slotRemoveItem(const QString &)));
connect(m_dirWatch, SIGNAL(dirty(const QString &)), this, SLOT(slotRefreshItem(const QString &))); connect(m_dirWatch, SIGNAL(dirty(const QString &)), this, SLOT(slotRefreshItem(const QString &)));
m_dirWatch->startScan(); m_dirWatch->startScan();
polish();
rmbMenu()->insertSeparator();
rmbMenu()->insertItem(SmallIcon("new"), i18n("Create Group From Selected Items"), this, SLOT(slotCreateGroup()));
} }
CollectionList::~CollectionList() CollectionList::~CollectionList()
...@@ -170,14 +175,6 @@ void CollectionList::addAlbum(const QString &album) ...@@ -170,14 +175,6 @@ void CollectionList::addAlbum(const QString &album)
previousAlbum = album; previousAlbum = album;
} }
void CollectionList::polish()
{
Playlist::polish();
rmbMenu()->insertSeparator();
rmbMenu()->insertItem(SmallIcon("new"), i18n("Create Group From Selected Items"), this, SLOT(slotCreateGroup()));
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// private slots // private slots
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
......
...@@ -94,8 +94,6 @@ protected: ...@@ -94,8 +94,6 @@ protected:
void addWatched(const QString &file) { m_dirWatch->addFile(file); } void addWatched(const QString &file) { m_dirWatch->addFile(file); }
void removeWatched(const QString &file) { m_dirWatch->removeFile(file); } void removeWatched(const QString &file) { m_dirWatch->removeFile(file); }
virtual void polish();
signals: signals:
void signalCollectionChanged(); void signalCollectionChanged();
void signalRequestPlaylistCreation(const PlaylistItemList &items); void signalRequestPlaylistCreation(const PlaylistItemList &items);
......
...@@ -465,11 +465,6 @@ void JuK::setupGlobalAccels() ...@@ -465,11 +465,6 @@ void JuK::setupGlobalAccels()
m_accel->updateConnections(); m_accel->updateConnections();
} }
void JuK::polish()
{
actionCollection()->insert(m_splitter->columnVisibleAction());
}
void JuK::processArgs() void JuK::processArgs()
{ {
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
......
...@@ -86,8 +86,6 @@ private: ...@@ -86,8 +86,6 @@ private:
void setupSystemTray(); void setupSystemTray();
void setupGlobalAccels(); void setupGlobalAccels();
virtual void polish();
void processArgs(); void processArgs();
void keyPressEvent(QKeyEvent *); void keyPressEvent(QKeyEvent *);
......
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