Commit fc6f947a authored by dt's avatar dt Committed by con

Fix warnings that a signal conflicts with a slot of base classes.

In NavigationSubWidget and SideBarWidget
(cherry picked from commit beb2916e)
parent 32f45ff6
......@@ -176,8 +176,8 @@ void NavigationWidget::resizeEvent(QResizeEvent *re)
NavigationSubWidget *NavigationWidget::insertSubItem(int position)
{
NavigationSubWidget *nsw = new NavigationSubWidget(this);
connect(nsw, SIGNAL(split()), this, SLOT(split()));
connect(nsw, SIGNAL(close()), this, SLOT(close()));
connect(nsw, SIGNAL(splitMe()), this, SLOT(splitSubWidget()));
connect(nsw, SIGNAL(closeMe()), this, SLOT(closeSubWidget()));
insertWidget(position, nsw);
m_subWidgets.insert(position, nsw);
return nsw;
......@@ -199,7 +199,7 @@ void NavigationWidget::activateSubWidget()
m_subWidgets.first()->setFocusWidget();
}
void NavigationWidget::split()
void NavigationWidget::splitSubWidget()
{
NavigationSubWidget *original = qobject_cast<NavigationSubWidget *>(sender());
int pos = indexOf(original) + 1;
......@@ -207,7 +207,7 @@ void NavigationWidget::split()
newnsw->setFactory(original->factory());
}
void NavigationWidget::close()
void NavigationWidget::closeSubWidget()
{
if (m_subWidgets.count() != 1) {
NavigationSubWidget *subWidget = qobject_cast<NavigationSubWidget *>(sender());
......@@ -389,8 +389,8 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget)
setLayout(lay);
lay->addWidget(m_toolBar);
connect(splitAction, SIGNAL(clicked()), this, SIGNAL(split()));
connect(close, SIGNAL(clicked()), this, SIGNAL(close()));
connect(splitAction, SIGNAL(clicked()), this, SIGNAL(splitMe()));
connect(close, SIGNAL(clicked()), this, SIGNAL(closeMe()));
connect(m_navigationComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(setCurrentIndex(int)));
......
......@@ -103,8 +103,8 @@ protected:
private slots:
void objectAdded(QObject*);
void activateSubWidget();
void split();
void close();
void splitSubWidget();
void closeSubWidget();
private:
NavigationSubWidget *insertSubItem(int position);
......@@ -136,8 +136,8 @@ public:
Core::Command *command(const QString &title) const;
signals:
void split();
void close();
void splitMe();
void closeMe();
private slots:
void objectAdded(QObject*);
......
......@@ -101,8 +101,8 @@ SideBarItem *SideBar::item(const QString &title)
SideBarWidget *SideBar::insertSideBarWidget(int position, const QString &title)
{
SideBarWidget *item = new SideBarWidget(this, title);
connect(item, SIGNAL(split()), this, SLOT(split()));
connect(item, SIGNAL(close()), this, SLOT(close()));
connect(item, SIGNAL(splitMe()), this, SLOT(splitSubWidget()));
connect(item, SIGNAL(closeMe()), this, SLOT(closeSubWidget()));
connect(item, SIGNAL(currentWidgetChanged()), this, SLOT(updateWidgets()));
insertWidget(position, item);
m_widgets.insert(position, item);
......@@ -118,7 +118,7 @@ void SideBar::removeSideBarWidget(SideBarWidget *widget)
widget->deleteLater();
}
void SideBar::split()
void SideBar::splitSubWidget()
{
SideBarWidget *original = qobject_cast<SideBarWidget*>(sender());
int pos = indexOf(original) + 1;
......@@ -126,7 +126,7 @@ void SideBar::split()
updateWidgets();
}
void SideBar::close()
void SideBar::closeSubWidget()
{
if (m_widgets.count() != 1) {
SideBarWidget *widget = qobject_cast<SideBarWidget*>(sender());
......@@ -245,7 +245,7 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &title)
m_closeButton->setIcon(QIcon(":/core/images/closebutton.png"));
m_closeButton->setToolTip(tr("Close"));
connect(m_closeButton, SIGNAL(clicked(bool)), this, SIGNAL(close()));
connect(m_closeButton, SIGNAL(clicked(bool)), this, SIGNAL(closeMe()));
QWidget *spacerItem = new QWidget(this);
spacerItem->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
......
......@@ -111,8 +111,8 @@ public:
QMap<QString, Core::Command*> shortcutMap() const;
private slots:
void split();
void close();
void splitSubWidget();
void closeSubWidget();
void updateWidgets();
private:
......@@ -146,8 +146,8 @@ public:
Core::Command *command(const QString &title) const;
signals:
void split();
void close();
void splitMe();
void closeMe();
void currentWidgetChanged();
private slots:
......
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