From: APTX <marek321@gmail.com>
Date: Sun, 10 Nov 2019 12:16:42 +0000 (+0900)
Subject: Fix deprecated features
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;ds=sidebyside;p=localmylist.git

Fix deprecated features
---

diff --git a/localmylist-management/codeeditor.cpp b/localmylist-management/codeeditor.cpp
index 84016a5..2f9ef80 100644
--- a/localmylist-management/codeeditor.cpp
+++ b/localmylist-management/codeeditor.cpp
@@ -88,7 +88,7 @@ int CodeEditor::lineNumberAreaWidth()
 		++digits;
 	}
 
-	int space = 3 + fontMetrics().width(QLatin1Char('9')) * digits;
+	int space = 3 + fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits;
 
 	return space;
 }
diff --git a/localmylist-management/tabwidget.cpp b/localmylist-management/tabwidget.cpp
index cfc8a39..b8ddee3 100644
--- a/localmylist-management/tabwidget.cpp
+++ b/localmylist-management/tabwidget.cpp
@@ -18,11 +18,8 @@ TabWidget::TabWidget(QWidget *parent) :
 	setMovable(true);
 	setTabsClosable(true);
 
-	signalMapper = new QSignalMapper(this);
-
 	connect(this, SIGNAL(tabCloseRequested(int)), this, SLOT(removeTab(int)));
 	connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int)));
-	connect(signalMapper, SIGNAL(mapped(QString)), this, SLOT(addTabRequested(QString)));
 }
 
 TabWidget::~TabWidget()
@@ -33,15 +30,14 @@ TabWidget::~TabWidget()
 
 void TabWidget::populateMenu(QMenu *menu)
 {
-	for (const auto &action : menu->actions())
-		signalMapper->removeMappings(action);
 	qDeleteAll(menu->actions());
 
 	for (const QString &id : tabMenuOrder)
 	{
 		QAction *action = new QAction(registeredTabNames.value(id)(), menu);
-		connect(action, SIGNAL(triggered()), signalMapper, SLOT(map()));
-		signalMapper->setMapping(action, id);
+		connect(action, &QAction::triggered, [this, id] {
+			this->addTabRequested(id);
+		});
 		menu->addAction(action);
 	}
 	menu->addSeparator();
diff --git a/localmylist-management/tabwidget.h b/localmylist-management/tabwidget.h
index 8457268..7396264 100644
--- a/localmylist-management/tabwidget.h
+++ b/localmylist-management/tabwidget.h
@@ -67,8 +67,7 @@ private:
 	void deinitTab(AbstractTab *tab);
 
 	AbstractTab *previousTab;
-	QSignalMapper *signalMapper;
-	MainWindow * m_mainWindow;
+	MainWindow *m_mainWindow;
 
 public:
 	static AbstractTab *createTab(const QString &id, QWidget *parent = 0);