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

Use new qt5 connect api

Browse Source 
Change-Id: I6c0d4ec60759b3c2fedac3e6649b7ec5102a6487
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Montel Laurent
2015-01-29 14:32:36 +01:00
committed by hjk
parent 1eb507afbd
commit 0d0a6d119a
20 changed files with 87 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/help/filtersettingspage.cpp
View File

@@ -60,14 +60,14 @@ QWidget *FilterSettingsPage::widget()
updateFilterPage();
connect(m_ui.attributeWidget, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
this, SLOT(updateFilterMap()));
connect(m_ui.filterWidget,
SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), this,
SLOT(updateAttributes(QListWidgetItem*)));
connect(m_ui.filterAddButton, SIGNAL(clicked()), this, SLOT(addFilter()));
connect(m_ui.filterRemoveButton, SIGNAL(clicked()), this,
SLOT(removeFilter()));
connect(m_ui.attributeWidget, &QTreeWidget::itemChanged,
this, &FilterSettingsPage::updateFilterMap);
connect(m_ui.filterWidget, &QListWidget::currentItemChanged,
this, &FilterSettingsPage::updateAttributes);
connect(m_ui.filterAddButton, &QPushButton::clicked,
this, &FilterSettingsPage::addFilter);
connect(m_ui.filterRemoveButton, &QPushButton::clicked,
this, &FilterSettingsPage::removeFilter);
connect(HelpManager::instance(), SIGNAL(documentationChanged()),
this, SLOT(updateFilterPage()));
}

15
src/plugins/help/generalsettingspage.cpp
View File

@@ -102,17 +102,22 @@ QWidget *GeneralSettingsPage::widget()
Core::HelpManager::SideBySideIfPossible).toInt();
m_ui->contextHelpComboBox->setCurrentIndex(m_contextOption);
connect(m_ui->currentPageButton, SIGNAL(clicked()), this, SLOT(setCurrentPage()));
connect(m_ui->blankPageButton, SIGNAL(clicked()), this, SLOT(setBlankPage()));
connect(m_ui->defaultPageButton, SIGNAL(clicked()), this, SLOT(setDefaultPage()));
connect(m_ui->currentPageButton, &QPushButton::clicked,
this, &GeneralSettingsPage::setCurrentPage);
connect(m_ui->blankPageButton, &QPushButton::clicked,
this, &GeneralSettingsPage::setBlankPage);
connect(m_ui->defaultPageButton, &QPushButton::clicked,
this, &GeneralSettingsPage::setDefaultPage);
HelpViewer *viewer = CentralWidget::instance()->currentViewer();
if (!viewer)
m_ui->currentPageButton->setEnabled(false);
m_ui->errorLabel->setVisible(false);
connect(m_ui->importButton, SIGNAL(clicked()), this, SLOT(importBookmarks()));
connect(m_ui->exportButton, SIGNAL(clicked()), this, SLOT(exportBookmarks()));
connect(m_ui->importButton, &QPushButton::clicked,
this, &GeneralSettingsPage::importBookmarks);
connect(m_ui->exportButton, &QPushButton::clicked,
this, &GeneralSettingsPage::exportBookmarks);
m_returnOnClose = HelpManager::customValue(QLatin1String("ReturnOnClose"),
false).toBool();

3
src/plugins/help/openpagesmodel.cpp
View File

@@ -75,7 +75,8 @@ void OpenPagesModel::addPage(const QUrl &url, qreal zoom)
{
beginInsertRows(QModelIndex(), rowCount(), rowCount());
HelpViewer *page = HelpPlugin::createHelpViewer(zoom);
connect(page, SIGNAL(titleChanged()), this, SLOT(handleTitleChanged()));
connect(page, &HelpViewer::titleChanged,
this, &OpenPagesModel::handleTitleChanged);
m_pages << page;
endInsertRows();
if (url.isValid())

8
src/plugins/help/openpagesswitcher.cpp
View File

@@ -67,10 +67,10 @@ OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model)
layout->setMargin(0);
layout->addWidget(m_openPagesWidget);
connect(m_openPagesWidget, SIGNAL(closePage(QModelIndex)), this,
SIGNAL(closePage(QModelIndex)));
connect(m_openPagesWidget, SIGNAL(setCurrentPage(QModelIndex)), this,
SIGNAL(setCurrentPage(QModelIndex)));
connect(m_openPagesWidget, &OpenPagesWidget::closePage,
this, &OpenPagesSwitcher::closePage);
connect(m_openPagesWidget, &OpenPagesWidget::setCurrentPage,
this, &OpenPagesSwitcher::setCurrentPage);
}
OpenPagesSwitcher::~OpenPagesSwitcher()

6
src/plugins/help/remotehelpfilter.cpp
View File

@@ -49,8 +49,10 @@ RemoteFilterOptions::RemoteFilterOptions(RemoteHelpFilter *filter, QWidget *pare
item->setFlags(item->flags() | Qt::ItemIsEditable);
}
connect(m_ui.add, SIGNAL(clicked()), this, SLOT(addNewItem()));
connect(m_ui.remove, SIGNAL(clicked()), this, SLOT(removeItem()));
connect(m_ui.add, &QPushButton::clicked,
this, &RemoteFilterOptions::addNewItem);
connect(m_ui.remove, &QPushButton::clicked,
this, &RemoteFilterOptions::removeItem);
connect(m_ui.listWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), SLOT(updateRemoveButton()));
updateRemoveButton();
}