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

List:       kde-commits
Subject:    KDE/kdevplatform/plugins/execute
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2009-07-19 0:53:30
Message-ID: 1247964810.222516.938.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 999035 by apaku:

Revert "Same as in the build set model. It is not possible to save \
QVariantList(QStringList()) and it was failing due to that fact."

Will do the storage in a different way that doesn't need extra escaping.

 M  +1 -3      executeplugin.cpp  
 M  +6 -4      nativeappconfig.cpp  


--- trunk/KDE/kdevplatform/plugins/execute/executeplugin.cpp #999034:999035
@@ -38,7 +38,6 @@
 #include <interfaces/iprojectcontroller.h>
 #include <interfaces/iuicontroller.h>
 #include <util/environmentgrouplist.h>
-#include <util/kdevstringhandler.h>
 
 #include "nativeappconfig.h"
 #include <project/projectmodel.h>
@@ -122,8 +121,7 @@
         QList<KDevelop::ProjectBaseItem*> items;
         foreach( const QVariant& dep, deps )
         {
-            KDevelop::ProjectBaseItem* item = model->item( model->pathToIndex(
-                                KDevStringHandler::splitWithEscaping(dep.toString(), \
'/', '\\') )); +            KDevelop::ProjectBaseItem* item = model->item( \
model->pathToIndex( dep.toStringList() ) );  if( item )
             {
                 items << item;
--- trunk/KDE/kdevplatform/plugins/execute/nativeappconfig.cpp #999034:999035
@@ -67,8 +67,10 @@
     environment->setCurrentProfile( cfg.readEntry( \
                ExecutePlugin::environmentGroupEntry, "default" ) );
     runInTerminal->setChecked( cfg.readEntry( ExecutePlugin::useTerminalEntry, false \
                ) );
     QVariantList deps = cfg.readEntry( ExecutePlugin::dependencyEntry, \
                QVariantList() );
-    foreach(const QVariant& dep, deps ) {
-        QListWidgetItem* item = new QListWidgetItem(dep.toString(), dependencies );
+    QStringList strDeps;
+    foreach( QVariant dep, deps ) {
+        QListWidgetItem* item = new QListWidgetItem( \
KDevStringHandler::joinWithEscaping( dep.toStringList(), '/', '\\' ), dependencies ); \
+        item->setData( Qt::UserRole, dep );  }
     dependencyAction->setCurrentIndex( dependencyAction->findData( cfg.readEntry( \
ExecutePlugin::dependencyActionEntry, "Nothing" ) ) );  blockSignals( b );
@@ -190,7 +192,7 @@
 void NativeAppConfigPage::addDep()
 {
     dependencies->addItem( targetDependency->text() );
-    targetDependency->clear();
+    targetDependency->setText("");
     addDependency->setEnabled( false );
     dependencies->selectionModel()->select( dependencies->model()->index( \
dependencies->model()->rowCount() - 1, 0, QModelIndex() ), \
QItemSelectionModel::ClearAndSelect | QItemSelectionModel::SelectCurrent );  }
@@ -228,7 +230,7 @@
     QVariantList deps;
     for( int i = 0; i < dependencies->count(); i++ )
     {
-        deps << dependencies->item( i )->data( Qt::DisplayRole );
+        deps << dependencies->item( i )->data( Qt::UserRole );
     }
     cfg.writeEntry( ExecutePlugin::dependencyEntry, deps );
 }


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