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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2008-07-05 10:02:42
Message-ID: 1215252162.368811.3032.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 828298 by ossi:

beautify code


 M  +15 -19    kdm-theme.cpp  
 M  +1 -2      kdm-theme.h  


--- trunk/KDE/kdebase/workspace/kcontrol/kdm/kdm-theme.cpp #828297:828298
@@ -172,6 +172,7 @@
 	QString name = themeGroup.readEntry( "Name" );
 	if (name.isEmpty())
 		return;
+
 	ThemeData *child = new ThemeData( themeWidget );
 	child->setText( 0, name );
 	child->setText( 1, themeGroup.readEntry( "Author" ) );
@@ -181,6 +182,16 @@
 	child->description = themeGroup.readEntry( "Description" );
 }
 
+void KDMThemeWidget::removeTheme( const QString &name )
+{
+	if (name.isEmpty())
+		return;
+
+	QList<QTreeWidgetItem *> ls = themeWidget->findItems( name, Qt::MatchExactly );
+	if (!ls.isEmpty())
+		delete ls.first();
+}
+
 void KDMThemeWidget::updateInfoView( ThemeData *theme )
 {
 	if (!(defaultTheme = theme)) {
@@ -287,15 +298,10 @@
 	else
 		updateInfoView( 0 );
 	if (bInstallTheme->isEnabled()) // not read-only
-		updateButton();
+		bRemoveTheme->setEnabled( !themeWidget->selectedItems().isEmpty() );
 	emit changed();
 }
 
-void KDMThemeWidget::updateButton()
-{
-    bRemoveTheme->setEnabled( !themeWidget->selectedItems().isEmpty() );
-}
-
 void KDMThemeWidget::removeSelectedThemes()
 {
 	QStringList delList, nameList;
@@ -320,8 +326,8 @@
 {
 	KNS::Engine engine( this );
 	if (engine.init( "kdm.knsrc" )) {
-	    KNS::Entry::List entries = engine.downloadDialogModal( this );
-	    for (int i = 0; i < entries.size(); i ++) {
+		KNS::Entry::List entries = engine.downloadDialogModal( this );
+		for (int i = 0; i < entries.size(); i ++) {
 			if (entries.at( i )->status() == KNS::Entry::Installed) {
 				QString name = entries.at( i )->installedFiles().at( 0 ).section( '/', -2, -2 );
 				insertTheme( themeDir + name );
@@ -331,18 +337,8 @@
 					removeTheme( themeDir + name );
 				}
 			}
-	    }
+		}
 	}
 }
 
-void KDMThemeWidget::removeTheme( const QString &name )
-{
-	if (name.isEmpty())
-		return;
-
-	QList<QTreeWidgetItem *> ls = themeWidget->findItems( name, Qt::MatchExactly );
-	if (!ls.isEmpty())
-		delete ls.first();
-}
-
 #include "kdm-theme.moc"
--- trunk/KDE/kdebase/workspace/kcontrol/kdm/kdm-theme.h #828297:828298
@@ -43,9 +43,8 @@
   private:
 	void selectTheme( const QString & );
 	void insertTheme( const QString & );
-	void removeTheme( const QString &name );
+	void removeTheme( const QString & );
 	void updateInfoView( ThemeData * );
-	void updateButton();
 	QTreeWidget *themeWidget;
 	QLabel *preview;
 	QLabel *info;
[prev in list] [next in list] [prev in thread] [next in thread]