From 209d9a8db7b1d2194b923ba5810e83921d26a09d Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Tue, 10 Nov 2015 20:36:02 +0900 Subject: [PATCH] KeySequence: remove unnecessary function and etc - remove unnecessary function - modify some variable names Change-Id: Ia9988078c47a2d934d1aacb845b1100df168d7b3 Signed-off-by: GiWoong Kim --- tizen/src/ui/input/keyboardshortcut.cpp | 29 ---------- tizen/src/ui/input/keyboardshortcut.h | 1 - tizen/src/ui/menu/contextmenu.cpp | 71 ++++++++++++------------ tizen/src/ui/menu/detailedinfodialog.cpp | 6 +- tizen/src/ui/menu/menuitem.cpp | 6 +- tizen/src/ui/menu/menuitem.h | 6 +- tizen/src/ui/skinview.cpp | 3 +- tizen/src/ui/xmllayoutparser.cpp | 6 +- 8 files changed, 48 insertions(+), 80 deletions(-) diff --git a/tizen/src/ui/input/keyboardshortcut.cpp b/tizen/src/ui/input/keyboardshortcut.cpp index c683677c89..8e2b52b1e0 100644 --- a/tizen/src/ui/input/keyboardshortcut.cpp +++ b/tizen/src/ui/input/keyboardshortcut.cpp @@ -80,35 +80,6 @@ void KeyboardShortcut::cancelHwKeyShortcuts(QList &list) qDebug() << hwKeyShortcutMap.count() << "shortcuts have been registered"; } -// TODO: move to context menu class -void KeyboardShortcut::slotShortcutHostKeyboard() -{ - QAction *action = win->getPopupMenu()->keyboardGroup->checkedAction(); - QList keyboardStatusList = win->getPopupMenu()->keyboardGroup->actions(); - - if (!action) { - qWarning() << "HostKeyboard enable/disable failed"; - return; - } - - int index = 0; - if (action->text().contains(MENU_ON_ITEM_TEXT)) { - for (index = 0; index < keyboardStatusList.count(); index++) { - if (keyboardStatusList.at(index)->text().contains(MENU_OFF_ITEM_TEXT)) { - break; - } - } - } else { - for (index = 0; index < keyboardStatusList.count(); index++) { - if (keyboardStatusList.at(index)->text().contains(MENU_ON_ITEM_TEXT)) { - break; - } - } - } - - keyboardStatusList.at(index)->setChecked(true); -} - void KeyboardShortcut::slotHwKeyShortcut(int keycode) { qDebug() << "shortcut: \"HW key\"" << keycode; diff --git a/tizen/src/ui/input/keyboardshortcut.h b/tizen/src/ui/input/keyboardshortcut.h index e17d9f25fd..35e98b5851 100644 --- a/tizen/src/ui/input/keyboardshortcut.h +++ b/tizen/src/ui/input/keyboardshortcut.h @@ -51,7 +51,6 @@ public: public slots: void slotHwKeyShortcut(int keycode); - void slotShortcutHostKeyboard(); private: MainWindow *win; diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp index 098e0a7e09..e8dcb37210 100644 --- a/tizen/src/ui/menu/contextmenu.cpp +++ b/tizen/src/ui/menu/contextmenu.cpp @@ -189,8 +189,8 @@ void ContextMenu::createInfoItem(QMenu *menu, MenuItem *item) actionDetailedInfo = addGeneralAction( menu, QIcon(QPixmap(":/icons/detailed_info.png")), menuName.isEmpty() ? vmName : menuName, - item->getShortcutMap().isEmpty()? NULL : - new QShortcut(item->getShortcutMap().begin().value(), parent), + item->getShortcuts().isEmpty()? NULL : + new QShortcut(item->getShortcuts().begin().value(), parent), SLOT(slotDetailedInfo())); actionDetailedInfo->setIconText(menuName.isEmpty() ? QString(DETAILED_INFO_TITLE) : menuName); @@ -214,9 +214,9 @@ void ContextMenu::createOnTopItem(QMenu *menu, MenuItem *item) connect(actionTopMost, SIGNAL(triggered(bool)), this, SLOT(slotTopMost(bool))); /* shortcut */ - if (item->getShortcutMap().isEmpty() == false) { + if (item->getShortcuts().isEmpty() == false) { QShortcut *shortcut = new QShortcut( - item->getShortcutMap().begin().value(), parent); + item->getShortcuts().begin().value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotTopMostShortcut())); actionTopMost->setShortcut(shortcut->key()); @@ -238,12 +238,9 @@ void ContextMenu::createMoveItem(QMenu *menu, MenuItem *item) connect(actionMove, SIGNAL(triggered()), this, SLOT(slotMove())); /* shortcut */ - QMap shortcutMap = item->getShortcutMap(); - QShortcut *shortcut = NULL; - - if (shortcutMap.isEmpty() == false) { - shortcut = new QShortcut( - item->getShortcutMap().begin().value(), parent); + if (item->getShortcuts().isEmpty() == false) { + QShortcut *shortcut = new QShortcut( + item->getShortcuts().begin().value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotMove())); actionMove->setShortcut(shortcut->key()); @@ -271,17 +268,17 @@ void ContextMenu::createSwitchItem(QMenu *menu, MenuItem *item) /* shortcuts */ QAction *switchAction = switchMenu->menuAction(); - QMap shortcutMap = item->getShortcutMap(); + QMap shortcuts = item->getShortcuts(); - if (shortcutMap.isEmpty() == false) { + if (shortcuts.isEmpty() == false) { QMap::const_iterator iter; - if ((iter = shortcutMap.find("prev")) != shortcutMap.end()) { + if ((iter = shortcuts.find("prev")) != shortcuts.end()) { QShortcut *shortcut = new QShortcut(iter.value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotSwitchShortcutPrev())); switchAction->setShortcut(shortcut->key()); } - if ((iter = shortcutMap.find("next")) != shortcutMap.end()) { + if ((iter = shortcuts.find("next")) != shortcuts.end()) { QShortcut *shortcut = new QShortcut(iter.value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotSwitchShortcutNext())); @@ -290,7 +287,7 @@ void ContextMenu::createSwitchItem(QMenu *menu, MenuItem *item) if (switchAction->shortcut().isEmpty() == true) { QShortcut *shortcut = new QShortcut( - item->getShortcutMap().begin().value(), parent); + item->getShortcuts().begin().value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotSwitchShortcutNext())); switchAction->setShortcut(shortcut->key()); @@ -335,17 +332,17 @@ void ContextMenu::createScaleItem(QMenu *menu, MenuItem *item) /* shortcuts */ QAction *scaleAction = scaleMenu->menuAction(); - QMap shortcutMap = item->getShortcutMap(); + QMap shortcuts = item->getShortcuts(); - if (shortcutMap.isEmpty() == false) { + if (shortcuts.isEmpty() == false) { QMap::const_iterator shortcutIter; - if ((shortcutIter = shortcutMap.find("prev")) != shortcutMap.end()) { + if ((shortcutIter = shortcuts.find("prev")) != shortcuts.end()) { QShortcut *shortcut = new QShortcut(shortcutIter.value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotScaleShortcutPrev())); scaleAction->setShortcut(shortcut->key()); } - if ((shortcutIter = shortcutMap.find("next")) != shortcutMap.end()) { + if ((shortcutIter = shortcuts.find("next")) != shortcuts.end()) { QShortcut *shortcut = new QShortcut(shortcutIter.value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotScaleShortcutNext())); @@ -354,7 +351,7 @@ void ContextMenu::createScaleItem(QMenu *menu, MenuItem *item) if (scaleAction->shortcut().isEmpty() == true) { QShortcut *shortcut = new QShortcut( - item->getShortcutMap().begin().value(), parent); + item->getShortcuts().begin().value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotScaleShortcutNext())); scaleAction->setShortcut(shortcut->key()); @@ -408,17 +405,17 @@ void ContextMenu::createControllerItem(QMenu *menu, MenuItem *item) /* shortcuts */ QAction *conAction = controllerMenu->menuAction(); - QMap shortcutMap = item->getShortcutMap(); + QMap shortcuts = item->getShortcuts(); - if (shortcutMap.isEmpty() == false) { + if (shortcuts.isEmpty() == false) { QMap::const_iterator iter; - if ((iter = shortcutMap.find("prev")) != shortcutMap.end()) { + if ((iter = shortcuts.find("prev")) != shortcuts.end()) { QShortcut *shortcut = new QShortcut(iter.value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotConShortcutPrev())); conAction->setShortcut(shortcut->key()); } - if ((iter = shortcutMap.find("next")) != shortcutMap.end()) { + if ((iter = shortcuts.find("next")) != shortcuts.end()) { QShortcut *shortcut = new QShortcut(iter.value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotConShortcutNext())); @@ -427,7 +424,7 @@ void ContextMenu::createControllerItem(QMenu *menu, MenuItem *item) if (conAction->shortcut().isEmpty() == true) { QShortcut *shortcut = new QShortcut( - item->getShortcutMap().begin().value(), parent); + item->getShortcuts().begin().value(), parent); connect(shortcut, SIGNAL(activated()), this, SLOT(slotConShortcutNext())); conAction->setShortcut(shortcut->key()); @@ -492,8 +489,8 @@ void ContextMenu::createShellItem(QMenu *menu, MenuItem *item) actionShell = addGeneralAction( menu, QIcon(QPixmap(":/icons/shell.png")), menuName.isEmpty() ? MENU_SHELL_ITEM_TEXT : menuName, - item->getShortcutMap().isEmpty()? NULL : - new QShortcut(item->getShortcutMap().begin().value(), parent), + item->getShortcuts().isEmpty()? NULL : + new QShortcut(item->getShortcuts().begin().value(), parent), SLOT(slotShell())); item->setAction(actionShell); @@ -509,8 +506,8 @@ void ContextMenu::createControlPanelItem(QMenu *menu, MenuItem *item) actionControlPanel = addGeneralAction( menu, QIcon(QPixmap(":/icons/control_panel.png")), menuName.isEmpty() ? MENU_ECP_ITEM_TEXT : menuName, - item->getShortcutMap().isEmpty()? NULL : - new QShortcut(item->getShortcutMap().begin().value(), parent), + item->getShortcuts().isEmpty()? NULL : + new QShortcut(item->getShortcuts().begin().value(), parent), SLOT(slotControlPanel())); item->setAction(actionControlPanel); @@ -526,8 +523,8 @@ void ContextMenu::createScreenShotItem(QMenu *menu, MenuItem *item) actionScreenShot = addGeneralAction( menu, QIcon(QPixmap(":/icons/screen_shot.png")), menuName.isEmpty() ? MENU_SCREENSHOT_ITEM_TEXT : menuName, - item->getShortcutMap().isEmpty()? NULL : - new QShortcut(item->getShortcutMap().begin().value(), parent), + item->getShortcuts().isEmpty()? NULL : + new QShortcut(item->getShortcuts().begin().value(), parent), SLOT(slotRequestScreenshot())); item->setAction(actionScreenShot); @@ -543,8 +540,8 @@ void ContextMenu::createAboutItem(QMenu *menu, MenuItem *item) actionAbout = addGeneralAction( menu, QIcon(QPixmap(":/icons/about.png")), menuName.isEmpty() ? MENU_ABOUT_ITEM_TEXT : menuName, - item->getShortcutMap().isEmpty()? NULL : - new QShortcut(item->getShortcutMap().begin().value(), parent), + item->getShortcuts().isEmpty()? NULL : + new QShortcut(item->getShortcuts().begin().value(), parent), SLOT(slotAbout())); item->setAction(actionAbout); @@ -560,8 +557,8 @@ void ContextMenu::createForceCloseItem(QMenu *menu, MenuItem *item) actionForceClose = addGeneralAction( menu, QIcon(QPixmap(":/icons/force_close.png")), menuName.isEmpty() ? MENU_FORCECLOSE_ITEM_TEXT : menuName, - item->getShortcutMap().isEmpty()? NULL : - new QShortcut(item->getShortcutMap().begin().value(), parent), + item->getShortcuts().isEmpty()? NULL : + new QShortcut(item->getShortcuts().begin().value(), parent), SLOT(slotForceClose())); item->setAction(actionForceClose); @@ -577,8 +574,8 @@ void ContextMenu::createCloseItem(QMenu *menu, MenuItem *item) actionClose = addGeneralAction( menu, QIcon(QPixmap(":/icons/close.png")), menuName.isEmpty() ? MENU_CLOSE_ITEM_TEXT : menuName, - item->getShortcutMap().isEmpty()? NULL : - new QShortcut(item->getShortcutMap().begin().value(), parent), + item->getShortcuts().isEmpty()? NULL : + new QShortcut(item->getShortcuts().begin().value(), parent), SLOT(slotClose())); item->setAction(actionClose); diff --git a/tizen/src/ui/menu/detailedinfodialog.cpp b/tizen/src/ui/menu/detailedinfodialog.cpp index 07641e9bae..909bc56f13 100644 --- a/tizen/src/ui/menu/detailedinfodialog.cpp +++ b/tizen/src/ui/menu/detailedinfodialog.cpp @@ -269,10 +269,10 @@ void DetailedInfoDialog::insertMenuShortcutInfo(QList &list) AdvancedMenuItem *advItem = (AdvancedMenuItem *)item; insertMenuShortcutInfo(advItem->getMenuList()); } else if (item->getAction() != NULL && - item->getShortcutMap().isEmpty() == false) { + item->getShortcuts().isEmpty() == false) { - QMap::iterator iter = item->getShortcutMap().begin(); - for ( ; iter != item->getShortcutMap().end(); iter++) { + QMap::iterator iter = item->getShortcuts().begin(); + for ( ; iter != item->getShortcuts().end(); iter++) { QString function = item->getAction()->iconText().isEmpty() ? item->getAction()->text() : item->getAction()->iconText(); function += " " + iter.key(); diff --git a/tizen/src/ui/menu/menuitem.cpp b/tizen/src/ui/menu/menuitem.cpp index 097d9de327..d8b2326e60 100644 --- a/tizen/src/ui/menu/menuitem.cpp +++ b/tizen/src/ui/menu/menuitem.cpp @@ -29,7 +29,7 @@ #include "menuitem.h" -MenuItem::MenuItem(int type, QString name) +MenuItem::MenuItem(int type, const QString &name) { this->type = type; this->name = name; @@ -46,9 +46,9 @@ QString MenuItem::getName() return name; } -QMap &MenuItem::getShortcutMap() +QMap &MenuItem::getShortcuts() { - return shortcutMap; + return shortcuts; } void MenuItem::setAction(QAction *action) diff --git a/tizen/src/ui/menu/menuitem.h b/tizen/src/ui/menu/menuitem.h index 30f7fec3e2..d271700c3b 100644 --- a/tizen/src/ui/menu/menuitem.h +++ b/tizen/src/ui/menu/menuitem.h @@ -58,19 +58,19 @@ namespace MenuItemType class MenuItem { public: - MenuItem(int type, QString name); + MenuItem(int type, const QString &name); virtual ~MenuItem(); int getType(); QString getName(); - QMap &getShortcutMap(); + QMap &getShortcuts(); void setAction(QAction *action); QAction *getAction(); private: int type; QString name; - QMap shortcutMap; + QMap shortcuts; QAction *action; }; diff --git a/tizen/src/ui/skinview.cpp b/tizen/src/ui/skinview.cpp index 079c5fbc4c..4208156653 100644 --- a/tizen/src/ui/skinview.cpp +++ b/tizen/src/ui/skinview.cpp @@ -38,7 +38,8 @@ SkinView::SkinView(QWidget *parent, QGraphicsScene *scene) : this->grabPos = QPoint(-1, -1); /* note: do not call setStyleSheet() separately for each style */ - setStyleSheet("border-style: none; " + QString(STYLE_TOOLTIP)); + setStyleSheet("QGraphicsView { border-style: none; }" + + QString(STYLE_TOOLTIP)); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); diff --git a/tizen/src/ui/xmllayoutparser.cpp b/tizen/src/ui/xmllayoutparser.cpp index 88789681c4..a7c841909e 100644 --- a/tizen/src/ui/xmllayoutparser.cpp +++ b/tizen/src/ui/xmllayoutparser.cpp @@ -391,7 +391,7 @@ AdvancedMenuItem *XmlLayoutParser::parseAdvancedMenuItem(QXmlStreamReader &xml) { if (token == QXmlStreamReader::StartElement) { if (xml.name() == SHORTCUT_KEYWORD) { - parseShortcuts(xml, item->getShortcutMap()); + parseShortcuts(xml, item->getShortcuts()); } else if (xml.name() == MENULIST_KEYWORD) { int cnt = parseMenuList(xml, item->getMenuList()); qDebug("- advanced menuList: %d", cnt); @@ -419,7 +419,7 @@ ScaleMenuItem *XmlLayoutParser::parseScaleMenuItem(QXmlStreamReader &xml) { if (token == QXmlStreamReader::StartElement) { if (xml.name() == SHORTCUT_KEYWORD) { - parseShortcuts(xml, item->getShortcutMap()); + parseShortcuts(xml, item->getShortcuts()); } else if (xml.name() == FACTORLIST_KEYWORD) { int defaultFactor = 0; int cnt = parseFactorList(xml, item->getFactorMap(), &defaultFactor); @@ -454,7 +454,7 @@ MenuItem *XmlLayoutParser::parseGeneralMenuItem( { if (token == QXmlStreamReader::StartElement) { if (xml.name() == SHORTCUT_KEYWORD) { - parseShortcuts(xml, item->getShortcutMap()); + parseShortcuts(xml, item->getShortcuts()); } else { qWarning() << "undefined element:" << xml.name(); } -- 2.34.1