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

List:       kde-commits
Subject:    kdeaddons/konq-plugins/kuick
From:       Pascal Létourneau <pletourn () globetrotter ! net>
Date:       2004-11-27 19:07:03
Message-ID: 20041127190703.3A0CD1B990 () office ! kde ! org
[Download RAW message or body]

CVS commit by pletourn: 

Escape '&'


  M +2 -1      kdirmenu.cpp   1.23
  M +2 -1      kmetamenu.cpp   1.25


--- kdeaddons/konq-plugins/kuick/kdirmenu.cpp  #1.22:1.23
@@ -59,5 +59,6 @@ KDirMenu::~KDirMenu( ) {
 void KDirMenu::insert( KDirMenu *submenu, const QString &_path ) {
     static const QIconSet folder = SmallIconSet("folder");
-    insertItem ( folder , _path,  submenu  );
+    QString escapedPath = _path;
+    insertItem( folder, escapedPath.replace( "&", "&&" ), submenu );
     children.append( submenu );
     connect(submenu, SIGNAL(fileChosen(const QString &)),

--- kdeaddons/konq-plugins/kuick/kmetamenu.cpp  #1.24:1.25
@@ -118,5 +118,6 @@ KMetaMenu::KMetaMenu( QWidget *parent, c
              continue;
          }
-         KAction *action = new KAction(*it, 0, this, SLOT(slotFastPath() ), this );
+         QString escapedDir = *it;
+         KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, this, \
SLOT(slotFastPath()), this);  action->plug(this );
          actions.append( action );


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