Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

[RSSManager] Fix some small leaks.

Browse Source
This commit is contained in:
S. Razi Alavizadeh 2013-07-10 08:06:05 +04:30
parent 3a06549c70
commit b153324484
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/other/browsinglibrary.cpp
View File

@ -158,6 +158,9 @@ void BrowsingLibrary::closeEvent(QCloseEvent* e)
settings.setValue("historyState", m_historyManager->saveState());
settings.endGroup();
e->accept();
// saves a few megabytes
m_rssManager->deleteAllTabs();
}
void BrowsingLibrary::keyPressEvent(QKeyEvent* e)

39
src/lib/rss/rssmanager.cpp
View File

@ -72,6 +72,15 @@ QupZilla* RSSManager::getQupZilla()
return p_QupZilla.data();
}
void RSSManager::deleteAllTabs()
{
while (ui->tabWidget->count() > 0) {
QWidget* w = ui->tabWidget->widget(0);
ui->tabWidget->removeTab(0);
delete w;
}
}
void RSSManager::setMainWindow(QupZilla* window)
{
if (window) {
@ -82,7 +91,9 @@ void RSSManager::setMainWindow(QupZilla* window)
void RSSManager::refreshTable()
{
QSqlQuery query;
ui->tabWidget->clear();
ui->tabWidget->setUpdatesEnabled(false);
deleteAllTabs();
query.exec("SELECT address, title, icon FROM rss");
int i = 0;
while (query.next()) {
@ -130,6 +141,7 @@ void RSSManager::refreshTable()
verticalLayout->addWidget(label);
ui->tabWidget->addTab(frame, tr("Empty"));
}
ui->tabWidget->setUpdatesEnabled(true);
}
void RSSManager::reloadFeeds()
@ -182,16 +194,16 @@ void RSSManager::editFeed()
return;
}
QDialog* dialog = new QDialog(this);
QFormLayout* layout = new QFormLayout(dialog);
QLabel* label = new QLabel(dialog);
QLineEdit* editUrl = new QLineEdit(dialog);
QLineEdit* editTitle = new QLineEdit(dialog);
QDialogButtonBox* box = new QDialogButtonBox(dialog);
QDialog dialog(this);
QFormLayout* layout = new QFormLayout(&dialog);
QLabel* label = new QLabel(&dialog);
QLineEdit* editUrl = new QLineEdit(&dialog);
QLineEdit* editTitle = new QLineEdit(&dialog);
QDialogButtonBox* box = new QDialogButtonBox(&dialog);
box->addButton(QDialogButtonBox::Ok);
box->addButton(QDialogButtonBox::Cancel);
connect(box, SIGNAL(rejected()), dialog, SLOT(reject()));
connect(box, SIGNAL(accepted()), dialog, SLOT(accept()));
connect(box, SIGNAL(rejected()), &dialog, SLOT(reject()));
connect(box, SIGNAL(accepted()), &dialog, SLOT(accept()));
label->setText(tr("Fill title and URL of a feed: "));
layout->addRow(label);
@ -202,10 +214,10 @@ void RSSManager::editFeed()
editUrl->setText(ui->tabWidget->tabToolTip(ui->tabWidget->currentIndex()));
editTitle->setText(ui->tabWidget->tabText(ui->tabWidget->currentIndex()));
dialog->setWindowTitle(tr("Edit RSS Feed"));
dialog->setMinimumSize(400, 100);
dialog->exec();
if (dialog->result() == QDialog::Rejected) {
dialog.setWindowTitle(tr("Edit RSS Feed"));
dialog.setMinimumSize(400, 100);
dialog.exec();
if (dialog.result() == QDialog::Rejected) {
return;
}
@ -224,7 +236,6 @@ void RSSManager::editFeed()
query.exec();
refreshTable();
}
void RSSManager::customContextMenuRequested(const QPoint &position)

5
src/lib/rss/rssmanager.h
View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2012 David Rosca <nowrep@gmail.com>
* Copyright (C) 2010-2013 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -42,6 +42,7 @@ class QT_QUPZILLA_EXPORT RSSManager : public QWidget
{
Q_OBJECT
friend class BrowsingLibrary;
public:
explicit RSSManager(QupZilla* mainClass, QWidget* parent = 0);
~RSSManager();
@ -67,6 +68,8 @@ private slots:
private:
QupZilla* getQupZilla();
void deleteAllTabs();
QList<QPair<FollowRedirectReply*, QUrl> > m_replies;
NetworkManager* m_networkManager;