[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon
From:       Martin Tobias Holmedahl Sandsmark <sandsmark () samfundet ! no>
Date:       2010-08-18 13:27:02
Message-ID: 20100818132702.67ABCAC855 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1165189 by sandsmark:

fix the phonon-xine kcm so it actually uses qsettings, like the backend

 M  +9 -11     kcm/xine/xineoptions.cpp  
 M  +0 -1      kcm/xine/xineoptions.h  
 M  +1 -1      kded-module/phononserver.h  


--- trunk/KDE/kdebase/runtime/phonon/kcm/xine/xineoptions.cpp \
#1165188:1165189 @@ -33,8 +33,6 @@
 {
     setupUi(this);
 
-    m_config = KSharedConfig::openConfig("xinebackendrc");
-
     connect(deinterlaceMediaList, SIGNAL(clicked(const QModelIndex &)), \
                SLOT(changed()));
     connect(deinterlaceMethodBox, SIGNAL(currentIndexChanged(int)), \
SLOT(changed()));  
@@ -97,23 +95,23 @@
 
 void XineOptions::load()
 {
-    KConfigGroup cg(m_config, "Settings");
+    QSettings cg("kde.org", "Phonon-Xine");
     if (!m_noDeinterlace) {
-        deinterlaceMediaList->item(0)->setCheckState(cg.readEntry("deinterlaceDVD", \
                true) ? Qt::Checked : Qt::Unchecked);
-        deinterlaceMediaList->item(1)->setCheckState(cg.readEntry("deinterlaceVCD", \
                false) ? Qt::Checked : Qt::Unchecked);
-        deinterlaceMediaList->item(2)->setCheckState(cg.readEntry("deinterlaceFile", \
false) ? Qt::Checked : Qt::Unchecked); +        \
deinterlaceMediaList->item(0)->setCheckState(cg.value("deinterlaceDVD", \
true) ? Qt::Checked : Qt::Unchecked); +        \
deinterlaceMediaList->item(1)->setCheckState(cg.value("deinterlaceVCD", \
false) ? Qt::Checked : Qt::Unchecked); +        \
deinterlaceMediaList->item(2)->setCheckState(cg.value("deinterlaceFile", \
                false) ? Qt::Checked : Qt::Unchecked);
         deinterlaceMethodBox->setCurrentIndex(cg.readEntry("deinterlaceMethod", \
0));  }
 }
 
 void XineOptions::save()
 {
-    KConfigGroup cg(m_config, "Settings");
+    QSettings cg("kde.org", "Phonon-Xine");
     if (!m_noDeinterlace) {
-        cg.writeEntry("deinterlaceDVD", \
                deinterlaceMediaList->item(0)->checkState() == \
                Qt::Checked);
-        cg.writeEntry("deinterlaceVCD", \
                deinterlaceMediaList->item(1)->checkState() == \
                Qt::Checked);
-        cg.writeEntry("deinterlaceFile", \
                deinterlaceMediaList->item(2)->checkState() == \
                Qt::Checked);
-        cg.writeEntry("deinterlaceMethod", \
deinterlaceMethodBox->currentIndex()); +        \
cg.setValue("deinterlaceDVD", deinterlaceMediaList->item(0)->checkState() \
== Qt::Checked); +        cg.setValue("deinterlaceVCD", \
deinterlaceMediaList->item(1)->checkState() == Qt::Checked); +        \
cg.setValue("deinterlaceFile", deinterlaceMediaList->item(2)->checkState() \
== Qt::Checked); +        cg.setValue("deinterlaceMethod", \
deinterlaceMethodBox->currentIndex());  }
 }
 
--- trunk/KDE/kdebase/runtime/phonon/kcm/xine/xineoptions.h \
#1165188:1165189 @@ -37,7 +37,6 @@
         void defaults();
 
     private:
-        KSharedConfigPtr m_config;
         bool m_noDeinterlace;
 };
 
--- trunk/KDE/kdebase/runtime/phonon/kded-module/phononserver.h \
#1165188:1165189 @@ -23,7 +23,7 @@
 
 #include <kdedmodule.h>
 #include <ksharedconfig.h>
-#include <Phonon/ObjectDescription>
+#include <phonon/objectdescription.h>
 #include <QtCore/QBasicTimer>
 #include <QtCore/QHash>
 #include <QtCore/QVector>


[prev in list] [next in list] [prev in thread] [next in thread]