Commit 4db5fb89 authored by Kurt Hindenburg's avatar Kurt Hindenburg

More changes to QLatin1String, QLatin1Char and QStringLiteral

parent 3a69411f
...@@ -425,11 +425,11 @@ void TabbedViewContainer::setStyleSheet(const QString& styleSheet) ...@@ -425,11 +425,11 @@ void TabbedViewContainer::setStyleSheet(const QString& styleSheet)
void TabbedViewContainer::navigationTextModeChanged(bool useTextWidth) void TabbedViewContainer::navigationTextModeChanged(bool useTextWidth)
{ {
if (useTextWidth) { if (useTextWidth) {
_tabBar->setStyleSheet("QTabBar::tab { }"); _tabBar->setStyleSheet(QStringLiteral("QTabBar::tab { }"));
_tabBar->setExpanding(false); _tabBar->setExpanding(false);
_tabBar->setElideMode(Qt::ElideNone); _tabBar->setElideMode(Qt::ElideNone);
} else { } else {
_tabBar->setStyleSheet("QTabBar::tab { min-width: 2em; max-width: 25em }"); _tabBar->setStyleSheet(QStringLiteral("QTabBar::tab { min-width: 2em; max-width: 25em }"));
_tabBar->setExpanding(true); _tabBar->setExpanding(true);
_tabBar->setElideMode(Qt::ElideLeft); _tabBar->setElideMode(Qt::ElideLeft);
} }
...@@ -695,7 +695,7 @@ void TabbedViewContainer::updateTitle(ViewProperties* item) ...@@ -695,7 +695,7 @@ void TabbedViewContainer::updateTitle(ViewProperties* item)
_tabBar->setTabToolTip(index , tabText); _tabBar->setTabToolTip(index , tabText);
// To avoid having & replaced with _ (shortcut indicator) // To avoid having & replaced with _ (shortcut indicator)
tabText.replace('&', "&&"); tabText.replace(QLatin1Char('&'), QLatin1String("&&"));
_tabBar->setTabText(index , tabText); _tabBar->setTabText(index , tabText);
} }
} }
......
...@@ -173,7 +173,7 @@ void ViewContainerTabBar::setDropIndicator(int index, bool drawDisabled) ...@@ -173,7 +173,7 @@ void ViewContainerTabBar::setDropIndicator(int index, bool drawDisabled)
} }
QIcon::Mode drawMode = drawDisabled ? QIcon::Disabled : QIcon::Normal; QIcon::Mode drawMode = drawDisabled ? QIcon::Disabled : QIcon::Normal;
const QString iconName = north ? "arrow-up" : "arrow-down"; const QString iconName = north ? QStringLiteral("arrow-up") : QStringLiteral("arrow-down");
_dropIndicator->setPixmap(QIcon::fromTheme(iconName).pixmap(ARROW_SIZE, ARROW_SIZE, drawMode)); _dropIndicator->setPixmap(QIcon::fromTheme(iconName).pixmap(ARROW_SIZE, ARROW_SIZE, drawMode));
_drawIndicatorDisabled = drawDisabled; _drawIndicatorDisabled = drawDisabled;
} }
......
...@@ -145,20 +145,20 @@ void ViewManager::setupActions() ...@@ -145,20 +145,20 @@ void ViewManager::setupActions()
i18nc("@action:inmenu", "Split View Left/Right"), i18nc("@action:inmenu", "Split View Left/Right"),
this); this);
collection->setDefaultShortcut(splitLeftRightAction, Konsole::ACCEL + Qt::Key_ParenLeft); collection->setDefaultShortcut(splitLeftRightAction, Konsole::ACCEL + Qt::Key_ParenLeft);
collection->addAction("split-view-left-right", splitLeftRightAction); collection->addAction(QStringLiteral("split-view-left-right"), splitLeftRightAction);
connect(splitLeftRightAction , &QAction::triggered , this , &Konsole::ViewManager::splitLeftRight); connect(splitLeftRightAction , &QAction::triggered , this , &Konsole::ViewManager::splitLeftRight);
QAction* splitTopBottomAction = new QAction(QIcon::fromTheme(QStringLiteral("view-split-top-bottom")) , QAction* splitTopBottomAction = new QAction(QIcon::fromTheme(QStringLiteral("view-split-top-bottom")) ,
i18nc("@action:inmenu", "Split View Top/Bottom"), this); i18nc("@action:inmenu", "Split View Top/Bottom"), this);
collection->setDefaultShortcut(splitTopBottomAction, Konsole::ACCEL + Qt::Key_ParenRight); collection->setDefaultShortcut(splitTopBottomAction, Konsole::ACCEL + Qt::Key_ParenRight);
collection->addAction("split-view-top-bottom", splitTopBottomAction); collection->addAction(QStringLiteral("split-view-top-bottom"), splitTopBottomAction);
connect(splitTopBottomAction , &QAction::triggered , this , &Konsole::ViewManager::splitTopBottom); connect(splitTopBottomAction , &QAction::triggered , this , &Konsole::ViewManager::splitTopBottom);
QAction* closeActiveAction = new QAction(i18nc("@action:inmenu Close Active View", "Close Active") , this); QAction* closeActiveAction = new QAction(i18nc("@action:inmenu Close Active View", "Close Active") , this);
closeActiveAction->setIcon(QIcon::fromTheme(QStringLiteral("view-close"))); closeActiveAction->setIcon(QIcon::fromTheme(QStringLiteral("view-close")));
collection->setDefaultShortcut(closeActiveAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_X); collection->setDefaultShortcut(closeActiveAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_X);
closeActiveAction->setEnabled(false); closeActiveAction->setEnabled(false);
collection->addAction("close-active-view", closeActiveAction); collection->addAction(QStringLiteral("close-active-view"), closeActiveAction);
connect(closeActiveAction , &QAction::triggered , this , &Konsole::ViewManager::closeActiveContainer); connect(closeActiveAction , &QAction::triggered , this , &Konsole::ViewManager::closeActiveContainer);
multiViewOnlyActions << closeActiveAction; multiViewOnlyActions << closeActiveAction;
...@@ -166,7 +166,7 @@ void ViewManager::setupActions() ...@@ -166,7 +166,7 @@ void ViewManager::setupActions()
QAction* closeOtherAction = new QAction(i18nc("@action:inmenu Close Other Views", "Close Others") , this); QAction* closeOtherAction = new QAction(i18nc("@action:inmenu Close Other Views", "Close Others") , this);
collection->setDefaultShortcut(closeOtherAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_O); collection->setDefaultShortcut(closeOtherAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_O);
closeOtherAction->setEnabled(false); closeOtherAction->setEnabled(false);
collection->addAction("close-other-views", closeOtherAction); collection->addAction(QStringLiteral("close-other-views"), closeOtherAction);
connect(closeOtherAction , &QAction::triggered , this , &Konsole::ViewManager::closeOtherContainers); connect(closeOtherAction , &QAction::triggered , this , &Konsole::ViewManager::closeOtherContainers);
multiViewOnlyActions << closeOtherAction; multiViewOnlyActions << closeOtherAction;
...@@ -175,7 +175,7 @@ void ViewManager::setupActions() ...@@ -175,7 +175,7 @@ void ViewManager::setupActions()
QAction* expandActiveAction = new QAction(i18nc("@action:inmenu", "Expand View") , this); QAction* expandActiveAction = new QAction(i18nc("@action:inmenu", "Expand View") , this);
collection->setDefaultShortcut(expandActiveAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_BracketRight); collection->setDefaultShortcut(expandActiveAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_BracketRight);
expandActiveAction->setEnabled(false); expandActiveAction->setEnabled(false);
collection->addAction("expand-active-view", expandActiveAction); collection->addAction(QStringLiteral("expand-active-view"), expandActiveAction);
connect(expandActiveAction , &QAction::triggered , this , &Konsole::ViewManager::expandActiveContainer); connect(expandActiveAction , &QAction::triggered , this , &Konsole::ViewManager::expandActiveContainer);
multiViewOnlyActions << expandActiveAction; multiViewOnlyActions << expandActiveAction;
...@@ -183,13 +183,13 @@ void ViewManager::setupActions() ...@@ -183,13 +183,13 @@ void ViewManager::setupActions()
QAction* shrinkActiveAction = new QAction(i18nc("@action:inmenu", "Shrink View") , this); QAction* shrinkActiveAction = new QAction(i18nc("@action:inmenu", "Shrink View") , this);
collection->setDefaultShortcut(shrinkActiveAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_BracketLeft); collection->setDefaultShortcut(shrinkActiveAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_BracketLeft);
shrinkActiveAction->setEnabled(false); shrinkActiveAction->setEnabled(false);
collection->addAction("shrink-active-view", shrinkActiveAction); collection->addAction(QStringLiteral("shrink-active-view"), shrinkActiveAction);
connect(shrinkActiveAction , &QAction::triggered , this , &Konsole::ViewManager::shrinkActiveContainer); connect(shrinkActiveAction , &QAction::triggered , this , &Konsole::ViewManager::shrinkActiveContainer);
multiViewOnlyActions << shrinkActiveAction; multiViewOnlyActions << shrinkActiveAction;
#if defined(ENABLE_DETACHING) #if defined(ENABLE_DETACHING)
QAction* detachViewAction = collection->addAction("detach-view"); QAction* detachViewAction = collection->addAction(QStringLiteral("detach-view"));
detachViewAction->setIcon(QIcon::fromTheme(QStringLiteral("tab-detach"))); detachViewAction->setIcon(QIcon::fromTheme(QStringLiteral("tab-detach")));
detachViewAction->setText(i18nc("@action:inmenu", "D&etach Current Tab")); detachViewAction->setText(i18nc("@action:inmenu", "D&etach Current Tab"));
// Ctrl+Shift+D is not used as a shortcut by default because it is too close // Ctrl+Shift+D is not used as a shortcut by default because it is too close
...@@ -201,12 +201,12 @@ void ViewManager::setupActions() ...@@ -201,12 +201,12 @@ void ViewManager::setupActions()
#endif #endif
// Next / Previous View , Next Container // Next / Previous View , Next Container
collection->addAction("next-view", nextViewAction); collection->addAction(QStringLiteral("next-view"), nextViewAction);
collection->addAction("previous-view", previousViewAction); collection->addAction(QStringLiteral("previous-view"), previousViewAction);
collection->addAction("last-tab", lastViewAction); collection->addAction(QStringLiteral("last-tab"), lastViewAction);
collection->addAction("next-container", nextContainerAction); collection->addAction(QStringLiteral("next-container"), nextContainerAction);
collection->addAction("move-view-left", moveViewLeftAction); collection->addAction(QStringLiteral("move-view-left"), moveViewLeftAction);
collection->addAction("move-view-right", moveViewRightAction); collection->addAction(QStringLiteral("move-view-right"), moveViewRightAction);
// Switch to tab N shortcuts // Switch to tab N shortcuts
const int SWITCH_TO_TAB_COUNT = 19; const int SWITCH_TO_TAB_COUNT = 19;
...@@ -216,7 +216,7 @@ void ViewManager::setupActions() ...@@ -216,7 +216,7 @@ void ViewManager::setupActions()
QAction* switchToTabAction = new QAction(i18nc("@action Shortcut entry", "Switch to Tab %1", i + 1), this); QAction* switchToTabAction = new QAction(i18nc("@action Shortcut entry", "Switch to Tab %1", i + 1), this);
switchToTabMapper->setMapping(switchToTabAction, i); switchToTabMapper->setMapping(switchToTabAction, i);
connect(switchToTabAction, &QAction::triggered, switchToTabMapper, static_cast<void(QSignalMapper::*)()>(&QSignalMapper::map)); connect(switchToTabAction, &QAction::triggered, switchToTabMapper, static_cast<void(QSignalMapper::*)()>(&QSignalMapper::map));
collection->addAction(QString("switch-to-tab-%1").arg(i), switchToTabAction); collection->addAction(QStringLiteral("switch-to-tab-%1").arg(i), switchToTabAction);
} }
foreach(QAction* action, multiViewOnlyActions) { foreach(QAction* action, multiViewOnlyActions) {
...@@ -275,7 +275,7 @@ void ViewManager::updateDetachViewState() ...@@ -275,7 +275,7 @@ void ViewManager::updateDetachViewState()
auto activeContainer = _viewSplitter->activeContainer(); auto activeContainer = _viewSplitter->activeContainer();
const bool shouldEnable = splitView || ((activeContainer != nullptr) && activeContainer->views().count() >= 2); const bool shouldEnable = splitView || ((activeContainer != nullptr) && activeContainer->views().count() >= 2);
QAction* detachAction = _actionCollection->action("detach-view"); QAction* detachAction = _actionCollection->action(QStringLiteral("detach-view"));
if ((detachAction != nullptr) && shouldEnable != detachAction->isEnabled()) if ((detachAction != nullptr) && shouldEnable != detachAction->isEnabled())
detachAction->setEnabled(shouldEnable); detachAction->setEnabled(shouldEnable);
...@@ -690,28 +690,28 @@ void ViewManager::setNavigationMethod(NavigationMethod method) ...@@ -690,28 +690,28 @@ void ViewManager::setNavigationMethod(NavigationMethod method)
const bool enable = (_navigationMethod != NoNavigation); const bool enable = (_navigationMethod != NoNavigation);
QAction* action; QAction* action;
action = collection->action("next-view"); action = collection->action(QStringLiteral("next-view"));
if (action != nullptr) action->setEnabled(enable); if (action != nullptr) action->setEnabled(enable);
action = collection->action("previous-view"); action = collection->action(QStringLiteral("previous-view"));
if (action != nullptr) action->setEnabled(enable); if (action != nullptr) action->setEnabled(enable);
action = collection->action("last-tab"); action = collection->action(QStringLiteral("last-tab"));
if (action != nullptr) action->setEnabled(enable); if (action != nullptr) action->setEnabled(enable);
action = collection->action("split-view-left-right"); action = collection->action(QStringLiteral("split-view-left-right"));
if (action != nullptr) action->setEnabled(enable); if (action != nullptr) action->setEnabled(enable);
action = collection->action("split-view-top-bottom"); action = collection->action(QStringLiteral("split-view-top-bottom"));
if (action != nullptr) action->setEnabled(enable); if (action != nullptr) action->setEnabled(enable);
action = collection->action("rename-session"); action = collection->action(QStringLiteral("rename-session"));
if (action != nullptr) action->setEnabled(enable); if (action != nullptr) action->setEnabled(enable);
action = collection->action("move-view-left"); action = collection->action(QStringLiteral("move-view-left"));
if (action != nullptr) action->setEnabled(enable); if (action != nullptr) action->setEnabled(enable);
action = collection->action("move-view-right"); action = collection->action(QStringLiteral("move-view-right"));
if (action != nullptr) action->setEnabled(enable); if (action != nullptr) action->setEnabled(enable);
} }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
using Konsole::ViewProperties; using Konsole::ViewProperties;
QHash<int, ViewProperties*> ViewProperties::_viewProperties; QHash<int, ViewProperties*> ViewProperties::_viewProperties;
QString ViewProperties::_mimeType = "application/x-konsole-view-id"; QString ViewProperties::_mimeType = QStringLiteral("application/x-konsole-view-id");
ViewProperties::ViewProperties(QObject* parent) ViewProperties::ViewProperties(QObject* parent)
: QObject(parent) : QObject(parent)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment