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 2198704d authored by Stephan Kulow's avatar Stephan Kulow

revert my porting here, so that the bleedingedge branch

can be merged in cleanly

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