Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 99a6ea08 authored by Stephan Kulow's avatar Stephan Kulow

some trunk porting

svn path=/trunk/KDE/kdemultimedia/juk/; revision=560210
parent e0eea2da
......@@ -17,11 +17,11 @@
#include <kmessagebox.h>
#include <kconfig.h>
#include <klocale.h>
#include <kactionclasses.h>
#include <kdebug.h>
#include <QDir>
#include <qbuffer.h>
#include <ktoggleaction.h>
#include "cache.h"
#include "tag.h"
......
......@@ -20,7 +20,6 @@
#include <kdebug.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
#include <kactionclasses.h>
#include <kactioncollection.h>
#include <kstdaction.h>
......@@ -40,6 +39,8 @@
#include "tagtransactionmanager.h"
#include <QKeyEvent>
#include <ktoggleaction.h>
#include <kactionmenu.h>
using namespace ActionCollection;
......
......@@ -862,8 +862,8 @@ void Playlist::slotAddCover(bool retrieveLocal)
QPixmap newCover;
if(retrieveLocal) {
KUrl file = KFileDialog::getImageOpenURL(
":homedir", this, i18n("Select Cover Image File"));
KUrl file = KFileDialog::getImageOpenUrl(
KUrl( "kfiledialog://homedir" ), this, i18n("Select Cover Image File"));
newCover = QPixmap(file.directory() + "/" + file.fileName());
}
else {
......
......@@ -37,7 +37,6 @@
#include "tracksequencemanager.h"
#include <kiconloader.h>
#include <kactionclasses.h>
#include <kapplication.h>
#include <kinputdialog.h>
#include <kmessagebox.h>
......@@ -47,6 +46,8 @@
#include <q3hbox.h>
#include <QtDBus>
#include <kactionmenu.h>
#include <ktoggleaction.h>
#include "collectionadaptor.h"
#define widget (kapp->mainWidget())
......
......@@ -31,7 +31,6 @@
#include <kiconloader.h>
#include <kicon.h>
#include <kshortcut.h>
#include <kactionclasses.h>
#include <QLabel>
#include <qapplication.h>
......@@ -49,6 +48,7 @@
#include <QBoxLayout>
#include <QShowEvent>
#include <QVBoxLayout>
#include <ktoggleaction.h>
#include <id3v1genres.h>
......
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