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

List:       kde-commits
Subject:    KDE/kdelibs/kio
From:       Jens Herden <jens () kdewebdev ! org>
Date:       2006-05-04 14:03:40
Message-ID: 1146751420.629981.1435.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 537333 by jens:

remove some warnings

 M  +3 -3      bookmarks/kbookmarkbar.cc  
 M  +1 -1      kio/dataprotocol.cpp  


--- trunk/KDE/kdelibs/kio/bookmarks/kbookmarkbar.cc #537332:537333
@@ -198,7 +198,7 @@
 
                 action->setToolTip( bm.url().pathOrURL() );
 
-                action->plug(m_toolBar);
+                m_toolBar->addAction(action);
 
                 d->m_actions.append( action );
             }
@@ -217,7 +217,7 @@
             KGlobal::config()->setGroup( "Settings" );
             bool addEntriesBookmarkBar = \
KGlobal::config()->readEntry("AddEntriesBookmarkBar", true);  
-            KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, \
action->popupMenu(), +            KBookmarkMenu *menu = new \
                KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->kMenu(),
                                                     m_actionCollection, false, \
addEntriesBookmarkBar,  bm.address());
             connect(menu, SIGNAL( aboutToShowContextMenu(const KBookmark &, QMenu * \
) ), @@ -225,7 +225,7 @@
             connect(menu, SIGNAL( openBookmark( const QString &, Qt::MouseButtons, \
                Qt::KeyboardModifiers) ),
                     this, SIGNAL( openBookmark( const QString &, Qt::MouseButtons, \
Qt::KeyboardModifiers) ));  menu->fillBookmarkMenu();
-            action->plug(m_toolBar);
+            m_toolBar->addAction(action);
             m_lstSubMenus.append( menu );
 
             d->m_actions.append( action );
--- trunk/KDE/kdelibs/kio/kio/dataprotocol.cpp #537332:537333
@@ -178,7 +178,7 @@
   header_info.is_base64 = false;
 
   // decode url and save it
-  QString &raw_url = header_info.url = KUrl::decode_string(url.url());
+  QString &raw_url = header_info.url = QUrl::fromPercentEncoding( \
url.url().toLatin1() );  int raw_url_len = raw_url.length();
 
   // jump over scheme part (must be "data:", we don't even check that)


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