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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm/kfrontend
From:       Barış Metin <baris () pardus ! org ! tr>
Date:       2007-02-28 21:52:57
Message-ID: 1172699577.338056.18670.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 638116 by baris:

more KConfigGroup porting

 M  +10 -10    kgreeter.cpp  
 M  +2 -2      kgreeter.h  


--- trunk/KDE/kdebase/workspace/kdm/kfrontend/kgreeter.cpp #638115:638116
@@ -33,9 +33,9 @@
 
 #include <klocale.h>
 #include <kseparator.h>
-#include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
+#include <KConfigGroup>
 
 #include <QAction>
 #include <QDir>
@@ -140,8 +140,7 @@
   , prevValid( true )
   , needLoad( false )
 {
-	stsFile = new KConfig( _stsFile, KConfig::OnlyLocal);
-	stsFile->setGroup( "PrevUser" );
+	stsGroup = new KConfigGroup(KSharedConfig::openConfig(_stsFile), "PrevUser");
 
 	if (_userList) {
 		userView = new UserListView( this );
@@ -171,7 +170,7 @@
 	hide();
 	delete userList;
 	delete verify;
-	delete stsFile;
+	delete stsGroup;
 }
 
 void
@@ -343,8 +342,9 @@
 	for (char **dit = _sessionsDirs; *dit; ++dit)
 		foreach (QString ent, QDir( *dit ).entryList())
 			if (ent.endsWith( ".desktop" )) {
-				KConfig dsk( QString( *dit ).append( '/' ).append( ent ), KConfig::OnlyLocal);
-				dsk.setGroup( "Desktop Entry" );
+				KConfigGroup dsk(
+				    KSharedConfig::openConfig(QString( *dit ).append( '/' ).append( ent )),
+				    "Desktop Entry");
 				putSession( ent.left( ent.length() - 8 ),
 				            dsk.readEntry( "Name" ),
 				            (dsk.readEntry( "Hidden", false ) ||
@@ -508,14 +508,14 @@
 	QString ent, pn( verify->pluginName() ), dn( dName + '_' + pn );
 
 	if (_preselUser != PRESEL_PREV)
-		stsFile->deleteEntry( verify->entitiesLocal() ? dName : dn, false );
+		stsGroup->deleteEntry( verify->entitiesLocal() ? dName : dn, false );
 	if (_preselUser != PRESEL_NONE && verify->entityPresettable()) {
 		if (verify->entitiesLocal())
 			ent = _preselUser == PRESEL_PREV ?
-				stsFile->readEntry( dName, QString() ) : _defaultUser;
+				stsGroup->readEntry( dName, QString() ) : _defaultUser;
 		else
 			ent = _preselUser == PRESEL_PREV ?
-				stsFile->readEntry( dn, QString() ) :
+				stsGroup->readEntry( dn, QString() ) :
 				verify->getConf( 0, (pn + ".DefaultEntity").toLatin1(), QVariant() ).toString();
 		field = verify->entitiesFielded() ?
 			verify->getConf( 0, (pn + ".FocusField").toLatin1(), QVariant( 0 ) ).toInt() :
@@ -544,7 +544,7 @@
 void
 KGreeter::verifyOk()
 {
-	if (_preselUser == PRESEL_PREV && verify->entityPresettable()) stsFile->writeEntry( \
verify->entitiesLocal() ? +	if (_preselUser == PRESEL_PREV && \
verify->entityPresettable()) stsGroup->writeEntry( verify->entitiesLocal() ?  dName :
 		                       dName + '_' + verify->pluginName(),
 		                     verify->getEntity() );
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/kgreeter.h #638115:638116
@@ -33,7 +33,7 @@
 class KdmClock;
 class KdmItem;
 
-class KConfig;
+class KConfigGroup;
 class QListWidgetItem;
 
 struct SessType {
@@ -77,7 +77,7 @@
 	void setPrevWM( QAction * );
 
 	QString curUser, dName;
-	KConfig *stsFile;
+	KConfigGroup *stsGroup;
 	UserListView *userView;
 	QStringList *userList;
 	QMenu *sessMenu;


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