[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 608263 by mlaurent:

Compile++


 M  +1 -1      kbabel/commonui/toolaction.cpp  
 M  +1 -1      kbabel/kbabeldict/dictionarymenu.cpp  
 M  +1 -1      kbugbuster/gui/kbbmainwindow.cpp  
 M  +3 -3      kcachegrind/kcachegrind/toplevel.cpp  
 M  +1 -1      umbrello/umbrello/uml.cpp  


--- trunk/KDE/kdesdk/kbabel/commonui/toolaction.cpp #608262:608263
@@ -81,7 +81,7 @@
                 QString sc;
 		if(shortcuts.size() !=0)
 		    sc=*sit;
-		ToolAction * action = new ToolAction( *uit, (sc.isEmpty()?QString::null:sc), *entry, *cit
+		ToolAction * action = new ToolAction( *uit, KShortcut(sc.isEmpty()?QString::null:sc), *entry, *cit
 		    , parent
 		    , QString(namePrefix+(*entry).service()->library()+'_'+(*cit)).toUtf8() );
 		connect( action, SIGNAL( toolActivated( const KDataToolInfo &, const QString & ) ),
--- trunk/KDE/kdesdk/kbabel/kbabeldict/dictionarymenu.cpp #608262:608263
@@ -110,7 +110,7 @@
 
         dictionaryActions.append( dictionaryAction );
 
-        if( !k.isNull() ) {
+        if( !k.isEmpty() ) {
             QString *idString = new QString( moduleId );
             accel2id.insert( id, idString );
 
--- trunk/KDE/kdesdk/kbugbuster/gui/kbbmainwindow.cpp #608262:608263
@@ -247,7 +247,7 @@
     toggleTmp->setCheckedState(KGuiItem(i18n("Hide Wishes")));
     toggleTmp->setChecked(KBBPrefs::instance()->mShowWishes);
 
-    mSelectServerAction = new KSelectAction( i18n( "Select Server" ), 0, 0,
+    mSelectServerAction = new KSelectAction( i18n( "Select Server" ), 0, KShortcut(),
                                              this,
                                              SLOT( slotSelectServer() ),
                                              actionCollection(),
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/toplevel.cpp #608262:608263
@@ -672,7 +672,7 @@
   action->setWhatsThis( hint );
 #else
   _paUp = new KToolBarPopupAction( i18n( "&Up" ), "up",
-                                   Qt::ALT+Qt::Key_Up,
+                                   KShortcut(Qt::ALT+Qt::Key_Up),
                                    _stackSelection, SLOT( browserUp() ),
                                    actionCollection(), "go_up" );
   connect( _paUp->popupMenu(), SIGNAL( aboutToShow() ),
@@ -686,7 +686,7 @@
   _paUp->setWhatsThis( hint );
 
   QPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward();
-  _paBack = new KToolBarPopupAction( backForward.first, Qt::ALT+Qt::Key_Left,
+  _paBack = new KToolBarPopupAction( backForward.first, KShortcut(Qt::ALT+Qt::Key_Left),
                                      _stackSelection, SLOT(browserBack()),
                                      actionCollection(), "go_back" );
   connect( _paBack->popupMenu(), SIGNAL( aboutToShow() ),
@@ -697,7 +697,7 @@
   _paBack->setToolTip( hint );
   _paBack->setWhatsThis( hint );
 
-  _paForward = new KToolBarPopupAction( backForward.second, Qt::ALT+Qt::Key_Right,
+  _paForward = new KToolBarPopupAction( backForward.second, KShortcut(Qt::ALT+Qt::Key_Right),
                                         _stackSelection,
                                         SLOT(browserForward()),
                                         actionCollection(), "go_forward" );
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #608262:608263
@@ -337,7 +337,7 @@
     viewExportImage->setEnabled(false);
     viewProperties->setEnabled(false);
 
-    zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Qt::Key_F9,
+    zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", KShortcut(Qt::Key_F9),
                  this, SLOT(slotZoomSliderMoved(int)),
                  actionCollection(), "popup_zoom");
     zoom100Action = new KAction( "viewmag1",