feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
In NavigationSubWidget and SideBarWidget
This commit is contained in:
dt
2009-08-20 17:27:33 +02:00
parent fdf6120d17
commit beb2916ea6
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/navigationwidget.cpp
View File

@@ -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)));