Remove generated include from headers

Not only fixes compilation with CMake 3.8 (without messing with include
paths) but makes sources cleaner.
This commit is contained in:
Eugene Shalygin
2017-04-11 14:35:10 +02:00
parent 34798399da
commit 4e1b7c3b87
21 changed files with 459 additions and 334 deletions

View File

@@ -29,6 +29,8 @@
* Contact : chris@qbittorrent.org
*/
#include "pluginselectdlg.h"
#include <QHeaderView>
#include <QMenu>
#include <QMessageBox>
@@ -48,7 +50,7 @@
#include "pluginsourcedlg.h"
#include "guiiconprovider.h"
#include "autoexpandabledialog.h"
#include "pluginselectdlg.h"
#include "ui_pluginselectdlg.h"
enum PluginColumns
{
@@ -61,30 +63,31 @@ enum PluginColumns
PluginSelectDlg::PluginSelectDlg(SearchEngine *pluginManager, QWidget *parent)
: QDialog(parent)
, m_ui(new Ui::PluginSelectDlg())
, m_pluginManager(pluginManager)
, m_asyncOps(0)
{
setupUi(this);
m_ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
// This hack fixes reordering of first column with Qt5.
// https://github.com/qtproject/qtbase/commit/e0fc088c0c8bc61dbcaf5928b24986cd61a22777
QTableView unused;
unused.setVerticalHeader(pluginsTree->header());
pluginsTree->header()->setParent(pluginsTree);
unused.setVerticalHeader(m_ui->pluginsTree->header());
m_ui->pluginsTree->header()->setParent(m_ui->pluginsTree);
unused.setVerticalHeader(new QHeaderView(Qt::Horizontal));
pluginsTree->setRootIsDecorated(false);
pluginsTree->header()->resizeSection(0, 160);
pluginsTree->header()->resizeSection(1, 80);
pluginsTree->header()->resizeSection(2, 200);
pluginsTree->hideColumn(PLUGIN_ID);
m_ui->pluginsTree->setRootIsDecorated(false);
m_ui->pluginsTree->header()->resizeSection(0, 160);
m_ui->pluginsTree->header()->resizeSection(1, 80);
m_ui->pluginsTree->header()->resizeSection(2, 200);
m_ui->pluginsTree->hideColumn(PLUGIN_ID);
actionUninstall->setIcon(GuiIconProvider::instance()->getIcon("list-remove"));
m_ui->actionUninstall->setIcon(GuiIconProvider::instance()->getIcon("list-remove"));
connect(actionEnable, SIGNAL(toggled(bool)), this, SLOT(enableSelection(bool)));
connect(pluginsTree, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayContextMenu(const QPoint&)));
connect(pluginsTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(togglePluginState(QTreeWidgetItem*, int)));
connect(m_ui->actionEnable, SIGNAL(toggled(bool)), this, SLOT(enableSelection(bool)));
connect(m_ui->pluginsTree, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayContextMenu(const QPoint&)));
connect(m_ui->pluginsTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(togglePluginState(QTreeWidgetItem*, int)));
loadSupportedSearchPlugins();
@@ -101,6 +104,7 @@ PluginSelectDlg::PluginSelectDlg(SearchEngine *pluginManager, QWidget *parent)
PluginSelectDlg::~PluginSelectDlg()
{
emit pluginsChanged();
delete m_ui;
}
void PluginSelectDlg::dropEvent(QDropEvent *event)
@@ -156,11 +160,11 @@ void PluginSelectDlg::togglePluginState(QTreeWidgetItem *item, int)
m_pluginManager->enablePlugin(plugin->name, !plugin->enabled);
if (plugin->enabled) {
item->setText(PLUGIN_STATE, tr("Yes"));
setRowColor(pluginsTree->indexOfTopLevelItem(item), "green");
setRowColor(m_ui->pluginsTree->indexOfTopLevelItem(item), "green");
}
else {
item->setText(PLUGIN_STATE, tr("No"));
setRowColor(pluginsTree->indexOfTopLevelItem(item), "red");
setRowColor(m_ui->pluginsTree->indexOfTopLevelItem(item), "red");
}
}
@@ -168,14 +172,14 @@ void PluginSelectDlg::displayContextMenu(const QPoint&)
{
QMenu myContextMenu(this);
// Enable/disable pause/start action given the DL state
QList<QTreeWidgetItem *> items = pluginsTree->selectedItems();
QList<QTreeWidgetItem *> items = m_ui->pluginsTree->selectedItems();
if (items.isEmpty()) return;
QString first_id = items.first()->text(PLUGIN_ID);
actionEnable->setChecked(m_pluginManager->pluginInfo(first_id)->enabled);
myContextMenu.addAction(actionEnable);
m_ui->actionEnable->setChecked(m_pluginManager->pluginInfo(first_id)->enabled);
myContextMenu.addAction(m_ui->actionEnable);
myContextMenu.addSeparator();
myContextMenu.addAction(actionUninstall);
myContextMenu.addAction(m_ui->actionUninstall);
myContextMenu.exec(QCursor::pos());
}
@@ -187,8 +191,8 @@ void PluginSelectDlg::on_closeButton_clicked()
void PluginSelectDlg::on_actionUninstall_triggered()
{
bool error = false;
foreach (QTreeWidgetItem *item, pluginsTree->selectedItems()) {
int index = pluginsTree->indexOfTopLevelItem(item);
foreach (QTreeWidgetItem *item, m_ui->pluginsTree->selectedItems()) {
int index = m_ui->pluginsTree->indexOfTopLevelItem(item);
Q_ASSERT(index != -1);
QString id = item->text(PLUGIN_ID);
if (m_pluginManager->uninstallPlugin(id)) {
@@ -211,8 +215,8 @@ void PluginSelectDlg::on_actionUninstall_triggered()
void PluginSelectDlg::enableSelection(bool enable)
{
foreach (QTreeWidgetItem *item, pluginsTree->selectedItems()) {
int index = pluginsTree->indexOfTopLevelItem(item);
foreach (QTreeWidgetItem *item, m_ui->pluginsTree->selectedItems()) {
int index = m_ui->pluginsTree->indexOfTopLevelItem(item);
Q_ASSERT(index != -1);
QString id = item->text(PLUGIN_ID);
m_pluginManager->enablePlugin(id, enable);
@@ -230,8 +234,8 @@ void PluginSelectDlg::enableSelection(bool enable)
// Set the color of a row in data model
void PluginSelectDlg::setRowColor(int row, QString color)
{
QTreeWidgetItem *item = pluginsTree->topLevelItem(row);
for (int i = 0; i < pluginsTree->columnCount(); ++i) {
QTreeWidgetItem *item = m_ui->pluginsTree->topLevelItem(row);
for (int i = 0; i < m_ui->pluginsTree->columnCount(); ++i) {
item->setData(i, Qt::ForegroundRole, QVariant(QColor(color)));
}
}
@@ -240,8 +244,8 @@ QList<QTreeWidgetItem*> PluginSelectDlg::findItemsWithUrl(QString url)
{
QList<QTreeWidgetItem*> res;
for (int i = 0; i < pluginsTree->topLevelItemCount(); ++i) {
QTreeWidgetItem *item = pluginsTree->topLevelItem(i);
for (int i = 0; i < m_ui->pluginsTree->topLevelItemCount(); ++i) {
QTreeWidgetItem *item = m_ui->pluginsTree->topLevelItem(i);
if (url.startsWith(item->text(PLUGIN_URL), Qt::CaseInsensitive))
res << item;
}
@@ -251,8 +255,8 @@ QList<QTreeWidgetItem*> PluginSelectDlg::findItemsWithUrl(QString url)
QTreeWidgetItem* PluginSelectDlg::findItemWithID(QString id)
{
for (int i = 0; i < pluginsTree->topLevelItemCount(); ++i) {
QTreeWidgetItem *item = pluginsTree->topLevelItem(i);
for (int i = 0; i < m_ui->pluginsTree->topLevelItemCount(); ++i) {
QTreeWidgetItem *item = m_ui->pluginsTree->topLevelItem(i);
if (id == item->text(PLUGIN_ID))
return item;
}
@@ -263,25 +267,25 @@ QTreeWidgetItem* PluginSelectDlg::findItemWithID(QString id)
void PluginSelectDlg::loadSupportedSearchPlugins()
{
// Some clean up first
pluginsTree->clear();
m_ui->pluginsTree->clear();
foreach (QString name, m_pluginManager->allPlugins())
addNewPlugin(name);
}
void PluginSelectDlg::addNewPlugin(QString pluginName)
{
QTreeWidgetItem *item = new QTreeWidgetItem(pluginsTree);
QTreeWidgetItem *item = new QTreeWidgetItem(m_ui->pluginsTree);
PluginInfo *plugin = m_pluginManager->pluginInfo(pluginName);
item->setText(PLUGIN_NAME, plugin->fullName);
item->setText(PLUGIN_URL, plugin->url);
item->setText(PLUGIN_ID, plugin->name);
if (plugin->enabled) {
item->setText(PLUGIN_STATE, tr("Yes"));
setRowColor(pluginsTree->indexOfTopLevelItem(item), "green");
setRowColor(m_ui->pluginsTree->indexOfTopLevelItem(item), "green");
}
else {
item->setText(PLUGIN_STATE, tr("No"));
setRowColor(pluginsTree->indexOfTopLevelItem(item), "red");
setRowColor(m_ui->pluginsTree->indexOfTopLevelItem(item), "red");
}
// Handle icon
if (QFile::exists(plugin->iconPath)) {

View File

@@ -32,12 +32,19 @@
#ifndef PLUGINSELECTDLG_H
#define PLUGINSELECTDLG_H
#include "ui_pluginselectdlg.h"
#include <QDialog>
class QDropEvent;
class QTreeWidgetItem;
class SearchEngine;
class PluginSelectDlg: public QDialog, private Ui::PluginSelectDlg
namespace Ui
{
class PluginSelectDlg;
}
class PluginSelectDlg: public QDialog
{
Q_OBJECT
@@ -82,6 +89,7 @@ private:
void startAsyncOp();
void finishAsyncOp();
Ui::PluginSelectDlg *m_ui;
SearchEngine *m_pluginManager;
int m_asyncOps;
};

View File

@@ -30,14 +30,22 @@
#include "pluginsourcedlg.h"
#include "ui_pluginsourcedlg.h"
PluginSourceDlg::PluginSourceDlg(QWidget *parent)
: QDialog(parent)
, m_ui(new Ui::PluginSourceDlg())
{
setupUi(this);
m_ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose);
show();
}
PluginSourceDlg::~PluginSourceDlg()
{
delete m_ui;
}
void PluginSourceDlg::on_localButton_clicked()
{
emit askForLocalFile();

View File

@@ -32,14 +32,19 @@
#define PLUGINSOURCEDLG_H
#include <QDialog>
#include "ui_pluginsourcedlg.h"
class PluginSourceDlg: public QDialog, private Ui::PluginSourceDlg
namespace Ui
{
class PluginSourceDlg;
}
class PluginSourceDlg: public QDialog
{
Q_OBJECT
public:
explicit PluginSourceDlg(QWidget *parent = 0);
~PluginSourceDlg();
signals:
void askForUrl();
@@ -48,6 +53,9 @@ signals:
private slots:
void on_localButton_clicked();
void on_urlButton_clicked();
private:
Ui::PluginSourceDlg *m_ui;
};
#endif // PLUGINSOURCEDLG_H

View File

@@ -29,6 +29,8 @@
* Contact : chris@qbittorrent.org
*/
#include "searchwidget.h"
#include <QHeaderView>
#include <QMessageBox>
#include <QSystemTrayIcon>
@@ -45,6 +47,7 @@
#include <QProcess>
#include <QDebug>
#include <QTextStream>
#include <QTreeView>
#include <iostream>
#ifdef Q_OS_WIN
@@ -63,18 +66,20 @@
#include "pluginselectdlg.h"
#include "searchsortmodel.h"
#include "searchtab.h"
#include "searchwidget.h"
#include "ui_searchwidget.h"
#define SEARCHHISTORY_MAXSIZE 50
#define URL_COLUMN 5
SearchWidget::SearchWidget(MainWindow *mainWindow)
: QWidget(mainWindow)
, m_ui(new Ui::SearchWidget())
, m_mainWindow(mainWindow)
, m_isNewQueryString(false)
, m_noSearchResults(true)
{
setupUi(this);
m_ui->setupUi(this);
QString searchPatternHint;
QTextStream stream(&searchPatternHint, QIODevice::WriteOnly);
@@ -92,15 +97,15 @@ SearchWidget::SearchWidget(MainWindow *mainWindow)
"Search phrase example, illustrates quotes usage, double quoted"
"pair of space delimited words, the whole pair is highlighted")
<< "</p></body></html>" << flush;
m_searchPattern->setToolTip(searchPatternHint);
m_ui->m_searchPattern->setToolTip(searchPatternHint);
// Icons
searchButton->setIcon(GuiIconProvider::instance()->getIcon("edit-find"));
downloadButton->setIcon(GuiIconProvider::instance()->getIcon("download"));
goToDescBtn->setIcon(GuiIconProvider::instance()->getIcon("application-x-mswinurl"));
pluginsButton->setIcon(GuiIconProvider::instance()->getIcon("preferences-system-network"));
copyURLBtn->setIcon(GuiIconProvider::instance()->getIcon("edit-copy"));
connect(tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
m_ui->searchButton->setIcon(GuiIconProvider::instance()->getIcon("edit-find"));
m_ui->downloadButton->setIcon(GuiIconProvider::instance()->getIcon("download"));
m_ui->goToDescBtn->setIcon(GuiIconProvider::instance()->getIcon("application-x-mswinurl"));
m_ui->pluginsButton->setIcon(GuiIconProvider::instance()->getIcon("preferences-system-network"));
m_ui->copyURLBtn->setIcon(GuiIconProvider::instance()->getIcon("edit-copy"));
connect(m_ui->tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
m_searchEngine = new SearchEngine;
connect(m_searchEngine, SIGNAL(searchStarted()), SLOT(searchStarted()));
@@ -113,16 +118,16 @@ SearchWidget::SearchWidget(MainWindow *mainWindow)
fillCatCombobox();
fillPluginComboBox();
connect(m_searchPattern, SIGNAL(returnPressed()), searchButton, SLOT(click()));
connect(m_searchPattern, SIGNAL(textEdited(QString)), this, SLOT(searchTextEdited(QString)));
connect(selectPlugin, SIGNAL(currentIndexChanged(int)), this, SLOT(selectMultipleBox(int)));
connect(m_ui->m_searchPattern, SIGNAL(returnPressed()), m_ui->searchButton, SLOT(click()));
connect(m_ui->m_searchPattern, SIGNAL(textEdited(QString)), this, SLOT(searchTextEdited(QString)));
connect(m_ui->selectPlugin, SIGNAL(currentIndexChanged(int)), this, SLOT(selectMultipleBox(int)));
}
void SearchWidget::fillCatCombobox()
{
comboCategory->clear();
comboCategory->addItem(SearchEngine::categoryFullName("all"), QVariant("all"));
comboCategory->insertSeparator(1);
m_ui->comboCategory->clear();
m_ui->comboCategory->addItem(SearchEngine::categoryFullName("all"), QVariant("all"));
m_ui->comboCategory->insertSeparator(1);
using QStrPair = QPair<QString, QString>;
QList<QStrPair> tmpList;
@@ -132,17 +137,17 @@ void SearchWidget::fillCatCombobox()
foreach (const QStrPair &p, tmpList) {
qDebug("Supported category: %s", qPrintable(p.second));
comboCategory->addItem(p.first, QVariant(p.second));
m_ui->comboCategory->addItem(p.first, QVariant(p.second));
}
}
void SearchWidget::fillPluginComboBox()
{
selectPlugin->clear();
selectPlugin->addItem(tr("Only enabled"), QVariant("enabled"));
selectPlugin->addItem(tr("All plugins"), QVariant("all"));
selectPlugin->addItem(tr("Select..."), QVariant("multi"));
selectPlugin->insertSeparator(3);
m_ui->selectPlugin->clear();
m_ui->selectPlugin->addItem(tr("Only enabled"), QVariant("enabled"));
m_ui->selectPlugin->addItem(tr("All plugins"), QVariant("all"));
m_ui->selectPlugin->addItem(tr("Select..."), QVariant("multi"));
m_ui->selectPlugin->insertSeparator(3);
using QStrPair = QPair<QString, QString>;
QList<QStrPair> tmpList;
@@ -151,23 +156,24 @@ void SearchWidget::fillPluginComboBox()
std::sort(tmpList.begin(), tmpList.end(), [](const QStrPair &l, const QStrPair &r) { return (l.first < r.first); } );
foreach (const QStrPair &p, tmpList)
selectPlugin->addItem(p.first, QVariant(p.second));
m_ui->selectPlugin->addItem(p.first, QVariant(p.second));
}
QString SearchWidget::selectedCategory() const
{
return comboCategory->itemData(comboCategory->currentIndex()).toString();
return m_ui->comboCategory->itemData(m_ui->comboCategory->currentIndex()).toString();
}
QString SearchWidget::selectedPlugin() const
{
return selectPlugin->itemData(selectPlugin->currentIndex()).toString();
return m_ui->selectPlugin->itemData(m_ui->selectPlugin->currentIndex()).toString();
}
SearchWidget::~SearchWidget()
{
qDebug("Search destruction");
delete m_searchEngine;
delete m_ui;
}
void SearchWidget::downloadTorrent(const QString &siteUrl, const QString &url)
@@ -184,16 +190,16 @@ void SearchWidget::tab_changed(int t)
//doesn't have to be available
if (t > -1) {
//-1 = no more tab
m_currentSearchTab = m_allTabs.at(tabWidget->currentIndex());
m_currentSearchTab = m_allTabs.at(m_ui->tabWidget->currentIndex());
if (m_currentSearchTab->getCurrentSearchListModel()->rowCount()) {
downloadButton->setEnabled(true);
goToDescBtn->setEnabled(true);
copyURLBtn->setEnabled(true);
m_ui->downloadButton->setEnabled(true);
m_ui->goToDescBtn->setEnabled(true);
m_ui->copyURLBtn->setEnabled(true);
}
else {
downloadButton->setEnabled(false);
goToDescBtn->setEnabled(false);
copyURLBtn->setEnabled(false);
m_ui->downloadButton->setEnabled(false);
m_ui->goToDescBtn->setEnabled(false);
m_ui->copyURLBtn->setEnabled(false);
}
}
}
@@ -223,18 +229,18 @@ void SearchWidget::on_pluginsButton_clicked()
void SearchWidget::searchTextEdited(QString)
{
// Enable search button
searchButton->setText(tr("Search"));
m_ui->searchButton->setText(tr("Search"));
m_isNewQueryString = true;
}
void SearchWidget::giveFocusToSearchInput()
{
m_searchPattern->setFocus();
m_ui->m_searchPattern->setFocus();
}
QTabWidget *SearchWidget::searchTabs() const
{
return tabWidget;
return m_ui->tabWidget;
}
// Function called when we click on search button
@@ -249,14 +255,14 @@ void SearchWidget::on_searchButton_clicked()
m_searchEngine->cancelSearch();
if (!m_isNewQueryString) {
searchButton->setText(tr("Search"));
m_ui->searchButton->setText(tr("Search"));
return;
}
}
m_isNewQueryString = false;
const QString pattern = m_searchPattern->text().trimmed();
const QString pattern = m_ui->m_searchPattern->text().trimmed();
// No search pattern entered
if (pattern.isEmpty()) {
QMessageBox::critical(0, tr("Empty search pattern"), tr("Please type a search pattern first"));
@@ -269,8 +275,8 @@ void SearchWidget::on_searchButton_clicked()
m_allTabs.append(m_currentSearchTab);
QString tabName = pattern;
tabName.replace(QRegExp("&{1}"), "&&");
tabWidget->addTab(m_currentSearchTab, tabName);
tabWidget->setCurrentWidget(m_currentSearchTab);
m_ui->tabWidget->addTab(m_currentSearchTab, tabName);
m_ui->tabWidget->setCurrentWidget(m_currentSearchTab);
m_currentSearchTab->getCurrentSearchListProxy()->setNameFilter(pattern);
QStringList plugins;
@@ -295,7 +301,7 @@ void SearchWidget::searchStarted()
{
// Update SearchEngine widgets
m_activeSearchTab->setStatus(SearchTab::Status::Ongoing);
searchButton->setText(tr("Stop"));
m_ui->searchButton->setText(tr("Stop"));
}
// Slot called when search is Finished
@@ -316,7 +322,7 @@ void SearchWidget::searchFinished(bool cancelled)
m_activeSearchTab->setStatus(SearchTab::Status::Finished);
m_activeSearchTab = 0;
searchButton->setText(tr("Search"));
m_ui->searchButton->setText(tr("Search"));
}
void SearchWidget::searchFailed()
@@ -363,15 +369,15 @@ void SearchWidget::appendSearchResults(const QList<SearchResult> &results)
m_activeSearchTab->updateResultsCount();
// Enable clear & download buttons
downloadButton->setEnabled(true);
goToDescBtn->setEnabled(true);
copyURLBtn->setEnabled(true);
m_ui->downloadButton->setEnabled(true);
m_ui->goToDescBtn->setEnabled(true);
m_ui->copyURLBtn->setEnabled(true);
}
void SearchWidget::closeTab(int index)
{
// Search is run for active tab so if user decided to close it, then stop search
if (!m_activeSearchTab.isNull() && index == tabWidget->indexOf(m_activeSearchTab)) {
if (!m_activeSearchTab.isNull() && index == m_ui->tabWidget->indexOf(m_activeSearchTab)) {
qDebug("Closed active search Tab");
if (m_searchEngine->isActive())
m_searchEngine->cancelSearch();
@@ -381,9 +387,9 @@ void SearchWidget::closeTab(int index)
delete m_allTabs.takeAt(index);
if (!m_allTabs.size()) {
downloadButton->setEnabled(false);
goToDescBtn->setEnabled(false);
copyURLBtn->setEnabled(false);
m_ui->downloadButton->setEnabled(false);
m_ui->goToDescBtn->setEnabled(false);
m_ui->copyURLBtn->setEnabled(false);
}
}
@@ -391,19 +397,21 @@ void SearchWidget::closeTab(int index)
void SearchWidget::on_downloadButton_clicked()
{
//QModelIndexList selectedIndexes = currentSearchTab->getCurrentTreeView()->selectionModel()->selectedIndexes();
QModelIndexList selectedIndexes = m_allTabs.at(tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
QModelIndexList selectedIndexes =
m_allTabs.at(m_ui->tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
foreach (const QModelIndex &index, selectedIndexes) {
if (index.column() == SearchSortModel::NAME)
m_allTabs.at(tabWidget->currentIndex())->downloadItem(index);
m_allTabs.at(m_ui->tabWidget->currentIndex())->downloadItem(index);
}
}
void SearchWidget::on_goToDescBtn_clicked()
{
QModelIndexList selectedIndexes = m_allTabs.at(tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
QModelIndexList selectedIndexes =
m_allTabs.at(m_ui->tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
foreach (const QModelIndex &index, selectedIndexes) {
if (index.column() == SearchSortModel::NAME) {
QSortFilterProxyModel *model = m_allTabs.at(tabWidget->currentIndex())->getCurrentSearchListProxy();
QSortFilterProxyModel *model = m_allTabs.at(m_ui->tabWidget->currentIndex())->getCurrentSearchListProxy();
const QString descUrl = model->data(model->index(index.row(), SearchSortModel::DESC_LINK)).toString();
if (!descUrl.isEmpty())
QDesktopServices::openUrl(QUrl::fromEncoded(descUrl.toUtf8()));
@@ -414,11 +422,12 @@ void SearchWidget::on_goToDescBtn_clicked()
void SearchWidget::on_copyURLBtn_clicked()
{
QStringList urls;
QModelIndexList selectedIndexes = m_allTabs.at(tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
QModelIndexList selectedIndexes =
m_allTabs.at(m_ui->tabWidget->currentIndex())->getCurrentTreeView()->selectionModel()->selectedIndexes();
foreach (const QModelIndex &index, selectedIndexes) {
if (index.column() == SearchSortModel::NAME) {
QSortFilterProxyModel *model = m_allTabs.at(tabWidget->currentIndex())->getCurrentSearchListProxy();
QSortFilterProxyModel *model = m_allTabs.at(m_ui->tabWidget->currentIndex())->getCurrentSearchListProxy();
const QString descUrl = model->data(model->index(index.row(), SearchSortModel::DESC_LINK)).toString();
if (!descUrl.isEmpty())
urls << descUrl.toUtf8();

View File

@@ -34,15 +34,21 @@
#include <QList>
#include <QPointer>
#include <QWidget>
#include "ui_searchwidget.h"
class QTabWidget;
class MainWindow;
class SearchEngine;
struct SearchResult;
class SearchTab;
class SearchWidget: public QWidget, private Ui::SearchWidget
namespace Ui
{
class SearchWidget;
}
class SearchWidget: public QWidget
{
Q_OBJECT
Q_DISABLE_COPY(SearchWidget)
@@ -82,6 +88,7 @@ private:
QString selectedCategory() const;
QString selectedPlugin() const;
Ui::SearchWidget *m_ui;
SearchEngine *m_searchEngine;
QPointer<SearchTab> m_currentSearchTab; // Selected tab
QPointer<SearchTab> m_activeSearchTab; // Tab with running search