Commit ca382735 authored by Michael Pyne's avatar Michael Pyne

Forward port bugfix from 3.5 for JuK to trunk before I forget.

svn path=/trunk/KDE/kdemultimedia/juk/; revision=493294
parent 6aa0b52c
......@@ -70,11 +70,11 @@ JuK::JuK(QWidget *parent, const char *name) :
readConfig();
setupSystemTray();
setupGlobalAccels();
processArgs();
createDirs();
SplashScreen::finishedLoading();
QTimer::singleShot(0, CollectionList::instance(), SLOT(slotCheckCache()));
QTimer::singleShot(0, this, SLOT(slotProcessArgs()));
m_sliderAction->slotUpdateOrientation();
}
......@@ -246,7 +246,7 @@ void JuK::setupGlobalAccels()
m_accel->updateConnections();
}
void JuK::processArgs()
void JuK::slotProcessArgs()
{
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
QStringList files;
......@@ -254,8 +254,7 @@ void JuK::processArgs()
for(int i = 0; i < args->count(); i++)
files.append(args->arg(i));
// TODO: make this work again
// m_splitter->open(files);
CollectionList::instance()->addFiles(files);
}
void JuK::createDirs()
......
......@@ -50,7 +50,6 @@ private:
void setupActions();
void setupSystemTray();
void setupGlobalAccels();
void processArgs();
void createDirs();
void keyPressEvent(QKeyEvent *);
......@@ -76,6 +75,7 @@ private slots:
void slotConfigureFileRenamer();
void slotUndo();
void slotCheckAlbumNextAction(bool albumRandomEnabled);
void slotProcessArgs();
private:
PlaylistSplitter *m_splitter;
......
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