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

List:       kde-commits
Subject:    branches/work/bleedingedge/kdeaddons
From:       Laurent Montel <montel () kde ! org>
Date:       2006-07-10 15:26:34
Message-ID: 1152545194.290916.14800.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 560533 by mlaurent:

Port++


 M  +2 -2      konq-plugins/fsview/fsview_part.cpp  
 M  +2 -3      konq-plugins/searchbar/searchbar.cpp  
 M  +1 -2      konq-plugins/searchbar/searchbar.h  
 M  +2 -2      ksig/ksig.cpp  


--- branches/work/bleedingedge/kdeaddons/konq-plugins/fsview/fsview_part.cpp #560532:560533
@@ -78,10 +78,10 @@
     emitPercent(percent, 100);
     slotInfoMessage(this, i18np("Read 1 folder, in %1",
                                "Read %n folders, in %1",
-                               dirs , cDir));
+                               dirs , cDir),QString());
   }
   else
-    slotInfoMessage(this, i18np("1 folder", "%n folders", dirs));
+    slotInfoMessage(this, i18np("1 folder", "%n folders", dirs),QString());
 }
 
 
--- branches/work/bleedingedge/kdeaddons/konq-plugins/searchbar/searchbar.cpp #560532:560533
@@ -42,7 +42,6 @@
 #include <q3popupmenu.h>
 #include <qtimer.h>
 #include <qstyle.h>
-#include <k3widgetaction.h>
 
 //Added by qt3to4:
 #include <QPixmap>
@@ -69,8 +68,8 @@
 
 	m_popupMenu = 0;
 
-	m_searchComboAction = new K3WidgetAction(m_searchCombo, i18n("Search Bar"), 0,
-	                                                     0, 0, actionCollection(), "toolbar_search_bar");
+	m_searchComboAction = new KAction(i18n("Search Bar"),actionCollection(),"toolbar_search_bar");
+	m_searchComboAction->setDefaultWidget(m_searchCombo);
 	m_searchComboAction->setShortcutConfigurable(false);
 
 	connect(m_searchCombo, SIGNAL(activated(const QString &)),
--- branches/work/bleedingedge/kdeaddons/konq-plugins/searchbar/searchbar.h #560532:560533
@@ -35,7 +35,6 @@
 class KHTMLPart;
 class KProcess;
 class Q3PopupMenu;
-class K3WidgetAction;
 /**
  * Combo box which catches mouse clicks on the pixmap.
  */
@@ -158,7 +157,7 @@
 
 		QPointer<KHTMLPart> m_part;
 		SearchBarCombo        *m_searchCombo;
-                K3WidgetAction         *m_searchComboAction;
+                KAction         *m_searchComboAction;
 		Q3PopupMenu            *m_popupMenu;
 		QPixmap                m_searchIcon;
 		SearchModes            m_searchMode;
--- branches/work/bleedingedge/kdeaddons/ksig/ksig.cpp #560532:560533
@@ -24,7 +24,6 @@
 #include <kstatusbar.h>
 #include <ktextedit.h>
 #include <k3listviewsearchline.h>
-#include <k3widgetaction.h>
 #include <klocale.h>
 
 #include <qsplitter.h>
@@ -106,7 +105,8 @@
 void KSig::setupSearchLine()
 {
     K3ListViewSearchLineWidget *searchWidget = new K3ListViewSearchLineWidget(sigList, this);
-    new K3WidgetAction(searchWidget, i18n("Search"), KShortcut(), 0, 0, actionCollection(), "search");
+    KAction *act = new KAction(i18n("Search"),actionCollection(),"search");
+	act->setDefaultWidget(searchWidget);
 }
 
 void KSig::loadData()
[prev in list] [next in list] [prev in thread] [next in thread]