FCL/sf/mw/hb: comparison src/hbcore/gui/hbviewactionmanager.cpp

equal deleted inserted replaced

-:11d3954df52a
+:627c4a0fd0e7
 /*!
 @proto
 @hbcore
 \class HbViewActionManager
 \brief HbViewActionManager is the class that decides switch to container
 the action is placed (options menu or toolbar).
 Decision is based the UI commands distribution guide that is read
 automatically.
 \internal
 */
 /*!
 Constructor.
 */
 HbViewActionManager::HbViewActionManager(HbView *view) :
 QObject(view), view(view), toolBarMaxCount(99),
 defaultContainer(HbView::OptionsMenu), orientation(Qt::Vertical)
 {
 if (view) {
-HbMainWindow* mainWin = view->mainWindow();
+HbMainWindow *mainWin = view->mainWindow();
 if (mainWin) {
 connect(mainWin, SIGNAL(orientationChanged(Qt::Orientation)),
 this, SLOT(orientationChanged(Qt::Orientation)));
 orientation = mainWin->orientation();
 }
 }
 createTemplate();
 }
 /*!
 Destructor.
 */
 HbViewActionManager::~HbViewActionManager()
 {
 }
 /*!
 The function adds \a action to either menu's or toolbar's list of actions.
 The ownership of \a action is not transferred.
 \sa removeAction
 */
 // Find the right container from the guide
 if (preferredContainer == HbView::NotSpecified) {
 container = actualContainer(action, preferredContainer);
 }
 // Add action to right container
 if (container == HbView::OptionsMenu) {
 view->menu()->addAction(action);
-}
+} else if (container == HbView::ToolBar) {
-else if (container == HbView::ToolBar) {
 view->toolBar()->addAction(action);
 if (view->toolBar()->actions().count() > toolBarMaxCount) {
 moveActionToMenu();
 }
 }
 // Insert data to private structure
 Placement placement(container, preferredContainer);
 distributedActions.insert(action, placement);
 }
 /*!
 The function removes \a action either menu's or toolbar's list of actions.
 The ownership of \a action is not transferred.
 */
 void HbViewActionManager::removeAction(QAction *action)
 {
 removeAction(action, true);
 }
 /*!
 The function replaces an old \a action either menu's or
 toolbar's list of actions.
 The ownership of \a action is transferred to the caller.
 */
 void HbViewActionManager::replaceAction(QAction *oldAction, QAction *newAction)
 {
-QMap<QAction*, Placement>::const_iterator i =
+QMap<QAction *, Placement>::const_iterator i =
 distributedActions.find(oldAction);
 if (i != distributedActions.end()) {
 HbViewActionManager::Placement placement = i.value();
 QList<QAction *> list = containerActions(placement.container);
 int index = list.indexOf(oldAction);
 if (index >= 0) {
 if (placement.container == HbView::OptionsMenu) {
 view->menu()->insertAction(oldAction, newAction);
 view->menu()->removeAction(oldAction);
-}
+} else if (placement.container == HbView::ToolBar) {
-else if (placement.container == HbView::ToolBar) {
 view->toolBar()->insertAction(oldAction, newAction);
 view->toolBar()->removeAction(oldAction);
 }
 // Update private structure
 distributedActions.remove(oldAction);
 */
 void HbViewActionManager::setDefaultContainer(const QString &containerString)
 {
 if (containerString == "ToolBar") {
 defaultContainer = HbView::ToolBar;
-}
+} else if (containerString == "OptionsMenu") {
-else if (containerString == "OptionsMenu") {
 defaultContainer = HbView::OptionsMenu;
-}
+} else {
-else {
 defaultContainer = HbView::NotSpecified;
 }
 }
 /*!
 Adds a new item to the distribution guide. Used by HbActionManagerXmlParser.
 \internal
 */
 void HbViewActionManager::addGuideItem(const GuideItem &guideItem)
 {
 distributionGuide.append(guideItem);
 }
 /*!
 This signal is emitted when orientation change is done.
 // clear the current guide and create it again
 distributionGuide.clear();
 createTemplate();
 // Remove actions from containers
-QMapIterator<QAction*, Placement> i(distributedActions);
+QMapIterator<QAction *, Placement> i(distributedActions);
 while (i.hasNext()) {
 i.next();
 removeAction(i.key(), false);
 }
 // Add them again with the new guide
 {
 QFile file;
 QString path(":/actionmanager/");
 if (orientation == Qt::Vertical) {
 file.setFileName(path + "distribution_guide_vertical.xml");
-}
+} else {
-else {
 file.setFileName(path + "distribution_guide_horizontal.xml");
 }
 if (!file.open(QIODevice::ReadOnly)) {
 qWarning("HbViewActionManager::createTemplate: opening file failed");
-}
+} else {
-else {
 HbActionManagerXmlParser reader(this);
 if (!reader.read(&file)) {
 qWarning("HbViewActionManager::createTemplate: reading file failed");
 }
 }
 }
 HbView::ActionContainer HbViewActionManager::actualContainer(QAction *action,
 HbView::ActionContainer preferredContainer)
 {
 HbView::ActionContainer container(preferredContainer);
 HbAction *hbAction = qobject_cast<HbAction *>(action);
 // use the default container, if the downcast failed cause then
 // we are not able to obtain the commandRole from the action
-if(!hbAction){
+if (!hbAction) {
 return defaultContainer;
 }
 // Find the container from the distribution guide
 HbViewActionManager::GuideItem guideItem;
 view->toolBar()->removeAction(action);
 distributedActions.remove(action);
 // Add actions to menu if it does not exist already
 if (view->menu()->actions().indexOf(action) < 0) {
 view->menu()->addAction(action);
 // Update private structure
 Placement placement(HbView::OptionsMenu, HbView::ToolBar);
 distributedActions.insert(action, placement);
 }
 }
 void HbViewActionManager::removeAction(QAction *action, bool removeFromMap)
 {
-QMap<QAction*, Placement>::const_iterator i =
+QMap<QAction *, Placement>::const_iterator i =
 distributedActions.find(action);
 if (i != distributedActions.end()) {
 // Remove from the container
 HbViewActionManager::Placement placement = i.value();
 if (placement.container == HbView::OptionsMenu) {
 view->menu()->removeAction(action);
-}
+} else if (placement.container == HbView::ToolBar) {
-else if (placement.container == HbView::ToolBar) {
 view->toolBar()->removeAction(action);
 }
 if (removeFromMap) {
 // Remove from private structure
 distributedActions.remove(action);
 }
 }

changeset 5	627c4a0fd0e7
parent 0	16d8024aca5e