Commit e34e479f authored by Matthias Kretz's avatar Matthias Kretz

merge the kinstance-redesign branch back to trunk.

svn path=/trunk/KDE/kdemultimedia/juk/; revision=628283
parents cf0ad967 2eef6475
......@@ -38,6 +38,7 @@
#include <Q3ValueList>
#include <QDragMoveEvent>
#include <QDropEvent>
#include <kconfiggroup.h>
using ActionCollection::action;
......
......@@ -26,6 +26,7 @@
#include <QLabel>
#include <q3vbox.h>
#include <q3hbox.h>
#include <kconfiggroup.h>
#include "deletedialog.h"
......
......@@ -53,6 +53,7 @@
#include <QPixmap>
#include <Q3Frame>
#include <Q3ValueList>
#include <kconfiggroup.h>
#include "tag.h"
#include "filehandle.h"
......
......@@ -44,6 +44,7 @@
#include <kaction.h>
#include <ktoggleaction.h>
#include <kactionmenu.h>
#include <kconfiggroup.h>
using namespace ActionCollection;
......@@ -325,7 +326,7 @@ void JuK::slotProcessArgs()
void JuK::createDirs()
{
QDir dir(KGlobal::dirs()->saveLocation("data", kapp->instanceName() + '/'));
QDir dir(KGlobal::dirs()->saveLocation("data", KGlobal::mainComponent().componentName() + '/'));
if(!dir.exists("covers"))
dir.mkdir("covers");
......
......@@ -24,6 +24,7 @@
#include <QRadioButton>
#include <QGroupBox>
#include <q3vbox.h>
#include <kconfiggroup.h>
......
......@@ -20,6 +20,7 @@
#include <kconfig.h>
#include <klocale.h>
#include <kglobal.h>
#include <kconfiggroup.h>
#include "juk.h"
......
......@@ -80,6 +80,7 @@
#include "tagtransactionmanager.h"
#include "cache.h"
#include <kactioncollection.h>
#include <kconfiggroup.h>
using namespace ActionCollection;
......
......@@ -35,6 +35,7 @@
#include <Q3ValueList>
#include <QMenu>
#include <QMouseEvent>
#include <kconfiggroup.h>
#include "playlistbox.h"
#include "playlist.h"
......
......@@ -53,6 +53,7 @@
#include <kactioncollection.h>
#include <ktoggleaction.h>
#include <kactionmenu.h>
#include <kconfiggroup.h>
//Laurent: readd it
//#include "collectionadaptor.h"
......
......@@ -25,6 +25,7 @@
#include <QVBoxLayout>
#include <QList>
#include <kconfiggroup.h>
#include "playlistsplitter.h"
#include "searchwidget.h"
......
......@@ -52,6 +52,7 @@
#include <id3v1genres.h>
#include <kactioncollection.h>
#include <kconfiggroup.h>
#undef KeyRelease
......
......@@ -14,6 +14,7 @@
#include <kglobal.h>
#include <kmacroexpander.h>
#include <qhash.h>
#include <kconfiggroup.h>
FileNameScheme::FileNameScheme(const QString &s)
: m_regExp(),
......@@ -151,7 +152,7 @@ QStringList TagGuesser::schemeStrings()
void TagGuesser::setSchemeStrings(const QStringList &schemes)
{
KConfig *cfg = KGlobal::config();
KSharedConfig::Ptr cfg = KGlobal::config();
KConfigGroup group(cfg, "TagGuesser");
group.writeEntry("Filename schemes", schemes);
cfg->sync();
......
......@@ -70,7 +70,7 @@ void check( const QString &filename, const QString &title,
int main( int argc, char **argv )
{
//KAboutData aboutData("tagguessertest", "tagguessertest", "0.1");
//KInstance instance(&aboutData);
//KComponentData componentData(&aboutData);
QCoreApplication app( argc, argv );
check( "/home/frerich/Chemical Brothers - (01) - Block rockin' beats [Live].mp3",
......
......@@ -18,6 +18,7 @@
#include <klocale.h>
#include <kconfig.h>
#include <kconfigbase.h>
#include <kconfiggroup.h>
#include "tagrenameroptions.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