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

List:       kde-commits
Subject:    KDE/kdebase/kicker
From:       Laurent Montel <montel () kde ! org>
Date:       2006-01-13 9:28:42
Message-ID: 1137144522.607021.13034.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 497591 by mlaurent:

read*entry--


 M  +2 -2      applets/naughty/NaughtyApplet.cpp  
 M  +9 -9      extensions/kasbar/kastasker.cpp  
 M  +1 -1      kicker/core/container_base.cpp  
 M  +2 -2      libkicker/utils.cpp  
 M  +1 -1      taskmanager/taskmanager.cpp  


--- trunk/KDE/kdebase/kicker/applets/naughty/NaughtyApplet.cpp #497590:497591
@@ -205,8 +205,8 @@
 NaughtyApplet::loadSettings()
 {
   ignoreList_ = config()->readListEntry("IgnoreList");
-  monitor_->setInterval(config()->readUnsignedNumEntry("UpdateInterval", 2));
-  monitor_->setTriggerLevel(config()->readUnsignedNumEntry("Threshold", 20));
+  monitor_->setInterval(config()->readEntry("UpdateInterval", 2));
+  monitor_->setTriggerLevel(config()->readEntry("Threshold", 20));
 
   // Add 'X' as a default.
   if (ignoreList_.isEmpty() && !config()->hasKey("IgnoreList"))
--- trunk/KDE/kdebase/kicker/extensions/kasbar/kastasker.cpp #497590:497591
@@ -594,7 +594,7 @@
        setItemSize( conf->readEntry( "ItemSize", KasBar::Medium ) );
 
    setTint( conf->readEntry( "EnableTint", QVariant(false )).toBool() );
-   setTintColor( conf->readColorEntry( "TintColor", &black ) );
+   setTintColor( conf->readEntry( "TintColor", &black ) );
    setTintAmount( conf->readDoubleNumEntry( "TintAmount", 0.1 ) );
    setTransparent( conf->readEntry( "Transparent", QVariant(true )).toBool() );
    setPaintInactiveFrames( conf->readEntry( "PaintInactiveFrames", QVariant(true )).toBool() );
@@ -606,14 +606,14 @@
 
    KasResources *res = resources();
    
-   res->setLabelPenColor( conf->readColorEntry( "LabelPenColor", &white ) );
-   res->setLabelBgColor( conf->readColorEntry( "LabelBgColor", &black ) );
-   res->setInactivePenColor( conf->readColorEntry( "InactivePenColor", &black ) );
-   res->setInactiveBgColor( conf->readColorEntry( "InactiveBgColor", &white ) );
-   res->setActivePenColor( conf->readColorEntry( "ActivePenColor", &black ) );
-   res->setActiveBgColor( conf->readColorEntry( "ActiveBgColor", &white ) );
-   res->setProgressColor( conf->readColorEntry( "ProgressColor", &green ) );
-   res->setAttentionColor( conf->readColorEntry( "AttentionColor", &red ) );
+   res->setLabelPenColor( conf->readEntry( "LabelPenColor", &white ) );
+   res->setLabelBgColor( conf->readEntry( "LabelBgColor", &black ) );
+   res->setInactivePenColor( conf->readEntry( "InactivePenColor", &black ) );
+   res->setInactiveBgColor( conf->readEntry( "InactiveBgColor", &white ) );
+   res->setActivePenColor( conf->readEntry( "ActivePenColor", &black ) );
+   res->setActiveBgColor( conf->readEntry( "ActiveBgColor", &white ) );
+   res->setProgressColor( conf->readEntry( "ProgressColor", &green ) );
+   res->setAttentionColor( conf->readEntry( "AttentionColor", &red ) );
 
    //
    // Thumbnail Settings
--- trunk/KDE/kdebase/kicker/kicker/core/container_base.cpp #497590:497591
@@ -72,7 +72,7 @@
 
 void BaseContainer::loadConfiguration( KConfigGroup& group )
 {
-    setFreeSpace( qMin( group.readDoubleNumEntry( "FreeSpace2", 0 ), 1.0 ) );
+    setFreeSpace( qMin( group.readEntry( "FreeSpace2", 0.0 ), 1.0 ) );
     doLoadConfiguration( group );
 }
 
--- trunk/KDE/kdebase/kicker/libkicker/utils.cpp #497590:497591
@@ -268,8 +268,8 @@
     KConfig *config = KGlobal::config();
     config->setGroup("WM");
     QColor color = QApplication::palette().active().highlight();
-    QColor activeTitle = config->readColorEntry("activeBackground", &color);
-    QColor inactiveTitle = config->readColorEntry("inactiveBackground", &color);
+    QColor activeTitle = config->readEntry("activeBackground", color);
+    QColor inactiveTitle = config->readEntry("inactiveBackground", color);
 
     // figure out which color is most suitable for recoloring to
     int h1, s1, v1, h2, s2, v2, h3, s3, v3;
--- trunk/KDE/kdebase/kicker/taskmanager/taskmanager.cpp #497590:497591
@@ -112,7 +112,7 @@
         SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )),
         SLOT( killStartup( const KStartupInfoId& )));
     c.setGroup( "TaskbarButtonSettings" );
-    _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 ));
+    _startup_info->setTimeout( c.readEntry( "Timeout", 30 ));
 }
 
 #ifdef THUMBNAILING_POSSIBLE
[prev in list] [next in list] [prev in thread] [next in thread]