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

List:       kde-commits
Subject:    extragear/network/choqok/choqok/config/behavior
From:       Mehrdad Momeny <mehrdad.momeny () gmail ! com>
Date:       2009-10-03 12:39:39
Message-ID: 1254573579.045569.29390.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1030891 by momeny:

Renamed a field to prevent a crash
BUG:206356

 M  +7 -7      behaviorconfig_shorten.cpp  
 M  +2 -2      behaviorconfig_shorten_base.ui  


--- trunk/extragear/network/choqok/choqok/config/behavior/behaviorconfig_shorten.cpp \
#1030890:1030891 @@ -36,7 +36,7 @@
     kDebug();
     setupUi(this);
     Choqok::ShortenManager::self();
-    connect(kcfg_shortenPlugins, SIGNAL(currentIndexChanged(int)), \
SLOT(currentPluginChanged(int))); +    connect(shortenPlugins, \
SIGNAL(currentIndexChanged(int)), SLOT(currentPluginChanged(int)));  }
 
 BehaviorConfig_Shorten::~BehaviorConfig_Shorten()
@@ -46,7 +46,7 @@
 
 void BehaviorConfig_Shorten::currentPluginChanged( int index )
 {
-    if( kcfg_shortenPlugins->itemData(index).toString() == prevShortener)
+    if( shortenPlugins->itemData(index).toString() == prevShortener)
         emit changed(false);
     else
         emit changed(true);
@@ -64,21 +64,21 @@
 void BehaviorConfig_Shorten::load()
 {
     availablePlugins = \
                Choqok::PluginManager::self()->availablePlugins("Shorteners");
-    kcfg_shortenPlugins->clear();
-    kcfg_shortenPlugins->addItem( i18n("None") );
+    shortenPlugins->clear();
+    shortenPlugins->addItem( i18n("None") );
     foreach(const KPluginInfo& plugin, availablePlugins){
-        kcfg_shortenPlugins->addItem( KIcon(plugin.icon()), plugin.name(), \
plugin.pluginName()); +        shortenPlugins->addItem( KIcon(plugin.icon()), \
plugin.name(), plugin.pluginName());  }
     prevShortener = Choqok::BehaviorSettings::shortenerPlugin();
     if(!prevShortener.isEmpty()) {
-        kcfg_shortenPlugins->setCurrentIndex(kcfg_shortenPlugins->findData(prevShortener));
 +        shortenPlugins->setCurrentIndex(shortenPlugins->findData(prevShortener));
         //         currentPluginChanged(kcfg_plugins->currentIndex());
     }
 }
 
 void BehaviorConfig_Shorten::save()
 {
-    const QString shorten = \
kcfg_shortenPlugins->itemData(kcfg_shortenPlugins->currentIndex()).toString(); +    \
const QString shorten = \
shortenPlugins->itemData(shortenPlugins->currentIndex()).toString();  \
Choqok::BehaviorSettings::setShortenerPlugin(shorten);  if( prevShortener != shorten \
) {  kDebug()<<prevShortener<<" -> "<<shorten;
--- trunk/extragear/network/choqok/choqok/config/behavior/behaviorconfig_shorten_base.ui \
#1030890:1030891 @@ -29,12 +29,12 @@
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
        <property name="buddy">
-        <cstring>kcfg_shortenPlugins</cstring>
+        <cstring>shortenPlugins</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="KComboBox" name="kcfg_shortenPlugins"/>
+      <widget class="KComboBox" name="shortenPlugins"/>
      </item>
     </layout>
    </item>


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