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

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdebase/klipper
From:       Stephan Binner <binner () kde ! org>
Date:       2003-02-06 12:09:28
[Download RAW message or body]

CVS commit by binner: 

Escape "&" at all places. Still doesn't work for "&&" clipboard content. :-|


  M +3 -3      toplevel.cpp   1.115.2.3


--- kdebase/klipper/toplevel.cpp  #1.115.2.2:1.115.2.3
@@ -281,5 +281,5 @@ void KlipperWidget::readProperties(KConf
       {
           QString data( *it );
-          data.replace( QRegExp( "&" ), "&&" );
+          data.replace( "&", "&&" );
 
           long id = m_popup->insertItem( KStringHandler::csqueeze(data, 45),
@@ -587,5 +587,5 @@ void KlipperWidget::applyClipChanges( co
     trimClipHistory(maxClipItems - 1);
 
-    m_selectedItem = \
m_popup->insertItem(KStringHandler::csqueeze(clipData.simplifyWhiteSpace(), 45), -2, \
1); // -2 means unique id, 1 means first location +    m_selectedItem = \
m_popup->insertItem(KStringHandler::csqueeze(clipData.simplifyWhiteSpace().replace( \
"&", "&&" ), 45), -2, 1); // -2 means unique id, 1 means first location  \
m_clipDict.insert(m_selectedItem, clipData);  if ( bClipEmpty )
@@ -606,5 +606,5 @@ void KlipperWidget::slotMoveSelectedToTo
     m_clipDict.remove( m_selectedItem );
 
-    m_selectedItem = m_popup->insertItem( \
KStringHandler::csqueeze(m_lastString.simplifyWhiteSpace(), 45), -2, 1 ); +    \
m_selectedItem = m_popup->insertItem( \
KStringHandler::csqueeze(m_lastString.simplifyWhiteSpace().replace( "&", "&&" ), 45), \
-2, 1 );  m_popup->setItemChecked( m_selectedItem, true );
     m_clipDict.insert( m_selectedItem, m_lastString );


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