Fix deprecated features

diff --git a/localmylist-management/codeeditor.cpp b/localmylist-management/codeeditor.cpp
index 84016a5ba4679d93cfa3a05d0defc7ededf2210d..2f9ef80d7a15546abecd78e384bc6216641fe334 100644 (file)
--- a/localmylist-management/codeeditor.cpp
+++ b/localmylist-management/codeeditor.cpp
@@ -88,7 +88,7 @@ int CodeEditor::lineNumberAreaWidth()
                ++digits;
        }
 
                ++digits;
        }
 

-       int space = 3 + fontMetrics().width(QLatin1Char('9')) * digits;
+       int space = 3 + fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits;

 
        return space;
 }
 
        return space;
 }

diff --git a/localmylist-management/tabwidget.cpp b/localmylist-management/tabwidget.cpp
index cfc8a39eb4d4a6b7147917720f22842a1f1972bf..b8ddee36a78e3102731f37aa31be39a728cf17e1 100644 (file)
--- a/localmylist-management/tabwidget.cpp
+++ b/localmylist-management/tabwidget.cpp
@@ -18,11 +18,8 @@ TabWidget::TabWidget(QWidget *parent) :
        setMovable(true);
        setTabsClosable(true);
 
        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(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()
 }
 
 TabWidget::~TabWidget()


@@ -33,15 +30,14 @@ TabWidget::~TabWidget()
 
 void TabWidget::populateMenu(QMenu *menu)
 {
 
 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);
        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();
                menu->addAction(action);
        }
        menu->addSeparator();

diff --git a/localmylist-management/tabwidget.h b/localmylist-management/tabwidget.h
index 84572680ec1eae7b30df4c474d0c136e52c7af03..7396264de575701c70e878910bf3df334910da18 100644 (file)
--- a/localmylist-management/tabwidget.h
+++ b/localmylist-management/tabwidget.h
@@ -67,8 +67,7 @@ private:
        void deinitTab(AbstractTab *tab);
 
        AbstractTab *previousTab;
        void deinitTab(AbstractTab *tab);
 
        AbstractTab *previousTab;

-       QSignalMapper *signalMapper;
-       MainWindow * m_mainWindow;
+       MainWindow *m_mainWindow;

 
 public:
        static AbstractTab *createTab(const QString &id, QWidget *parent = 0);
 
 public:
        static AbstractTab *createTab(const QString &id, QWidget *parent = 0);