diff options
42 files changed, 18 insertions, 133 deletions
diff --git a/src/analyzer/analyzerpanel.cpp b/src/analyzer/analyzerpanel.cpp index 964a512b..0d573109 100644 --- a/src/analyzer/analyzerpanel.cpp +++ b/src/analyzer/analyzerpanel.cpp @@ -48,12 +48,6 @@ NetworkAnalyzerPanel::NetworkAnalyzerPanel(const QString &title, QWidget *parent } -NetworkAnalyzerPanel::~NetworkAnalyzerPanel() -{ - delete _viewer; -} - - void NetworkAnalyzerPanel::closeEvent(QCloseEvent *event) { Q_UNUSED(event); diff --git a/src/analyzer/analyzerpanel.h b/src/analyzer/analyzerpanel.h index 56fcb300..bf1220e7 100644 --- a/src/analyzer/analyzerpanel.h +++ b/src/analyzer/analyzerpanel.h @@ -51,7 +51,6 @@ class REKONQ_TESTS_EXPORT NetworkAnalyzerPanel : public QDockWidget public: NetworkAnalyzerPanel(const QString &title, QWidget *parent); - ~NetworkAnalyzerPanel(); public slots: void toggle(bool enable); diff --git a/src/analyzer/networkanalyzer.cpp b/src/analyzer/networkanalyzer.cpp index 8c271727..97ea1240 100644 --- a/src/analyzer/networkanalyzer.cpp +++ b/src/analyzer/networkanalyzer.cpp @@ -73,11 +73,6 @@ NetworkAnalyzer::NetworkAnalyzer(QWidget *parent) } -NetworkAnalyzer::~NetworkAnalyzer() -{ -} - - void NetworkAnalyzer::popupContextMenu(const QPoint& pos) { if (_requestList->topLevelItemCount() >= 1) diff --git a/src/analyzer/networkanalyzer.h b/src/analyzer/networkanalyzer.h index 9ff1bae6..ec9d33e0 100644 --- a/src/analyzer/networkanalyzer.h +++ b/src/analyzer/networkanalyzer.h @@ -56,7 +56,6 @@ class NetworkAnalyzer : public QWidget public: NetworkAnalyzer(QWidget *parent = 0); - ~NetworkAnalyzer(); private slots: void addRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &req, QNetworkReply *reply); diff --git a/src/bookmarks/bookmarkowner.h b/src/bookmarks/bookmarkowner.h index 918e25d1..8f0cd3b8 100644 --- a/src/bookmarks/bookmarkowner.h +++ b/src/bookmarks/bookmarkowner.h @@ -48,7 +48,6 @@ class REKONQ_TESTS_EXPORT BookmarkOwner : public QObject, public KBookmarkOwner public: explicit BookmarkOwner(KBookmarkManager *manager, QObject *parent = 0); - virtual ~BookmarkOwner() {} enum BookmarkAction { @@ -133,7 +132,6 @@ class CustomBookmarkAction : public KAction public: CustomBookmarkAction(const KBookmark &bookmark, const KIcon &icon, const QString &text, QObject *parent); - virtual ~CustomBookmarkAction() {} Q_SIGNALS: void triggered(const KBookmark &); diff --git a/src/bookmarks/bookmarkscontextmenu.h b/src/bookmarks/bookmarkscontextmenu.h index f2b7c502..416416ef 100644 --- a/src/bookmarks/bookmarkscontextmenu.h +++ b/src/bookmarks/bookmarkscontextmenu.h @@ -37,7 +37,6 @@ class BookmarksContextMenu : public KBookmarkContextMenu { public: BookmarksContextMenu(const KBookmark &bookmark, KBookmarkManager *manager, BookmarkOwner *owner, QWidget *parent = 0); - virtual ~BookmarksContextMenu() {} virtual void addActions(); diff --git a/src/bookmarks/bookmarkspanel.h b/src/bookmarks/bookmarkspanel.h index 06873b1a..7fdcda92 100644 --- a/src/bookmarks/bookmarkspanel.h +++ b/src/bookmarks/bookmarkspanel.h @@ -49,7 +49,7 @@ class REKONQ_TESTS_EXPORT BookmarksPanel : public UrlPanel public: explicit BookmarksPanel(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0); - virtual ~BookmarksPanel(); + ~BookmarksPanel(); public Q_SLOTS: void loadFoldedState(); diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 072f9db7..8da30c62 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -179,11 +179,6 @@ BookmarkToolBar::BookmarkToolBar(KToolBar *toolBar, QObject *parent) } -BookmarkToolBar::~BookmarkToolBar() -{ -} - - KToolBar* BookmarkToolBar::toolBar() { return m_toolBar; diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h index 83e4605f..f97c461a 100644 --- a/src/bookmarks/bookmarkstoolbar.h +++ b/src/bookmarks/bookmarkstoolbar.h @@ -86,7 +86,6 @@ class BookmarkToolBar : public QObject public: BookmarkToolBar(KToolBar *toolBar, QObject *parent); - ~BookmarkToolBar(); KToolBar* toolBar(); diff --git a/src/findbar.cpp b/src/findbar.cpp index aefdffe1..ebb6e641 100644 --- a/src/findbar.cpp +++ b/src/findbar.cpp @@ -116,11 +116,6 @@ FindBar::FindBar(MainWindow *window) } -FindBar::~FindBar() -{ -} - - void FindBar::keyPressEvent(QKeyEvent *event) { if (event->key() == Qt::Key_Return) diff --git a/src/findbar.h b/src/findbar.h index 06d50a96..117e2e3c 100644 --- a/src/findbar.h +++ b/src/findbar.h @@ -50,7 +50,6 @@ class REKONQ_TESTS_EXPORT FindBar : public QWidget public: FindBar(MainWindow *parent); - ~FindBar(); bool matchCase() const; void notifyMatch(bool match); diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp index 9138ab10..8113add4 100644 --- a/src/history/historymanager.cpp +++ b/src/history/historymanager.cpp @@ -86,9 +86,6 @@ HistoryManager::HistoryManager(QObject *parent) HistoryManager::~HistoryManager() { m_saveTimer->saveIfNeccessary(); - - delete m_historyFilterModel; - delete m_historyTreeModel; } diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp index 579c3015..c4082d27 100644 --- a/src/iconmanager.cpp +++ b/src/iconmanager.cpp @@ -55,11 +55,6 @@ IconManager::IconManager(QObject *parent) } -IconManager::~IconManager() -{ -} - - KIcon IconManager::iconForUrl(const KUrl &url) { // first things first.. avoid infinite loop at startup diff --git a/src/iconmanager.h b/src/iconmanager.h index 6836175e..8f55b7df 100644 --- a/src/iconmanager.h +++ b/src/iconmanager.h @@ -45,7 +45,6 @@ class REKONQ_TESTS_EXPORT IconManager : public QObject public: IconManager(QObject *parent = 0); - virtual ~IconManager(); KIcon iconForUrl(const KUrl &url); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b50679a3..66122265 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -165,23 +165,6 @@ MainWindow::~MainWindow() rApp->bookmarkProvider()->removeBookmarkBar(m_bookmarksBar); rApp->bookmarkProvider()->removeBookmarkPanel(m_bookmarksPanel); rApp->removeMainWindow(this); - - delete m_view; - delete m_findBar; - delete m_zoomBar; - - delete m_historyPanel; - delete m_bookmarksPanel; - delete m_webInspectorPanel; - - delete m_stopReloadAction; - delete m_historyBackMenu; - delete m_historyForwardMenu; - - delete m_bookmarksBar; - - delete m_popup; - delete m_hidePopup; } diff --git a/src/messagebar.cpp b/src/messagebar.cpp index 5072735b..b5959d59 100644 --- a/src/messagebar.cpp +++ b/src/messagebar.cpp @@ -23,6 +23,7 @@ * * ============================================================ */ + // Self Includes #include "messagebar.h" #include "messagebar.moc" @@ -38,6 +39,7 @@ #include <QPushButton> #include <QToolButton> + MessageBar::MessageBar(const QString &message, QWidget *parent, QMessageBox::Icon icon, StandardButtons buttons) : NotificationBar(parent) , m_icon(0) diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp index 44b6fc89..a598066a 100644 --- a/src/newtabpage.cpp +++ b/src/newtabpage.cpp @@ -76,11 +76,6 @@ NewTabPage::NewTabPage(QWebFrame *frame) } -NewTabPage::~NewTabPage() -{ -} - - void NewTabPage::generate(const KUrl &url) { if (KUrl("about:preview").isParentOf(url)) diff --git a/src/newtabpage.h b/src/newtabpage.h index b953c3dc..482eb9ae 100644 --- a/src/newtabpage.h +++ b/src/newtabpage.h @@ -50,7 +50,6 @@ class REKONQ_TESTS_EXPORT NewTabPage : public QObject public: NewTabPage(QWebFrame *frame); - ~NewTabPage(); /** * This method takes an about: url and loads diff --git a/src/notificationbar.cpp b/src/notificationbar.cpp index 78bdd004..e7ee77d4 100644 --- a/src/notificationbar.cpp +++ b/src/notificationbar.cpp @@ -22,6 +22,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * * ============================================================ */ + + // Self includes #include "notificationbar.h" #include "notificationbar.moc" @@ -35,17 +37,12 @@ NotificationBar::NotificationBar(QWidget *parent) : QWidget(parent) , m_blinkEffect(new BlinkEffect(this)) - , m_opacityAnimation(new QPropertyAnimation(m_blinkEffect, "opacity")) + , m_opacityAnimation(new QPropertyAnimation(m_blinkEffect, "opacity", this)) { m_blinkEffect->setOpacity(0); setGraphicsEffect(m_blinkEffect); } -NotificationBar::~NotificationBar() -{ - delete m_opacityAnimation; - delete m_blinkEffect; -} void NotificationBar::notifyUser(int animationDuration) { @@ -56,6 +53,7 @@ void NotificationBar::notifyUser(int animationDuration) } + void NotificationBar::destroy() { qDebug() << Q_FUNC_INFO << "deleting the bar" << this; diff --git a/src/notificationbar.h b/src/notificationbar.h index 4b098584..49fc8e8d 100644 --- a/src/notificationbar.h +++ b/src/notificationbar.h @@ -23,6 +23,7 @@ * * ============================================================ */ + #ifndef NOTIFICATIONBAR_H #define NOTIFICATIONBAR_H @@ -37,6 +38,7 @@ // Forward Declarations class QPropertyAnimation; + class BlinkEffect : public QGraphicsEffect { Q_OBJECT @@ -73,12 +75,15 @@ private: }; + +// ------------------------------------------------------------------------------------------ + + class NotificationBar : public QWidget { Q_OBJECT public: explicit NotificationBar(QWidget *parent = 0); - ~NotificationBar(); void notifyUser(int animationDuration = 400); diff --git a/src/paneltreeview.cpp b/src/paneltreeview.cpp index 23bcd20e..7b28142e 100644 --- a/src/paneltreeview.cpp +++ b/src/paneltreeview.cpp @@ -49,11 +49,6 @@ PanelTreeView::PanelTreeView(QWidget *parent) } -PanelTreeView::~PanelTreeView() -{ -} - - void PanelTreeView::mousePressEvent(QMouseEvent *event) { const QModelIndex index = indexAt(event->pos()); diff --git a/src/paneltreeview.h b/src/paneltreeview.h index 79d4bdfd..3198aeea 100644 --- a/src/paneltreeview.h +++ b/src/paneltreeview.h @@ -43,7 +43,6 @@ class REKONQ_TESTS_EXPORT PanelTreeView : public QTreeView public: PanelTreeView(QWidget *parent = 0); - ~PanelTreeView(); signals: void openUrl(const KUrl &, const Rekonq::OpenType & = Rekonq::CurrentTab); diff --git a/src/previewselectorbar.cpp b/src/previewselectorbar.cpp index ef391761..16f4a9c1 100644 --- a/src/previewselectorbar.cpp +++ b/src/previewselectorbar.cpp @@ -81,11 +81,6 @@ PreviewSelectorBar::PreviewSelectorBar(int index, QWidget* parent) } -PreviewSelectorBar::~PreviewSelectorBar() -{ -} - - void PreviewSelectorBar::verifyUrl() { diff --git a/src/previewselectorbar.h b/src/previewselectorbar.h index 424b2420..396f763f 100644 --- a/src/previewselectorbar.h +++ b/src/previewselectorbar.h @@ -43,7 +43,6 @@ class REKONQ_TESTS_EXPORT PreviewSelectorBar : public NotificationBar public: PreviewSelectorBar(int index, QWidget *parent); - ~PreviewSelectorBar(); inline void setIndex(int index) { diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp index 6a1f1534..2c5f2ada 100644 --- a/src/protocolhandler.cpp +++ b/src/protocolhandler.cpp @@ -89,19 +89,13 @@ static KFileItemList sortFileList(const KFileItemList &list) ProtocolHandler::ProtocolHandler(QObject *parent) - : QObject(parent) - , _lister(new KDirLister(this)) - , _frame(0) + : QObject(parent) + , _lister(new KDirLister(this)) + , _frame(0) { } -ProtocolHandler::~ProtocolHandler() -{ - delete _lister; -} - - bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *frame) { _url = request.url(); diff --git a/src/protocolhandler.h b/src/protocolhandler.h index 76eeec92..a7041d33 100644 --- a/src/protocolhandler.h +++ b/src/protocolhandler.h @@ -52,7 +52,6 @@ class REKONQ_TESTS_EXPORT ProtocolHandler : public QObject public: ProtocolHandler(QObject *parent = 0); - ~ProtocolHandler(); /** * This function handles all the protocols that have to be handled before diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp index 65acff77..68bc6350 100644 --- a/src/sessionmanager.cpp +++ b/src/sessionmanager.cpp @@ -52,11 +52,6 @@ SessionManager::SessionManager(QObject *parent) } -SessionManager::~SessionManager() -{ -} - - void SessionManager::saveSession() { if (!m_safe || QWebSettings::globalSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled)) diff --git a/src/sessionmanager.h b/src/sessionmanager.h index bb66041c..22972906 100644 --- a/src/sessionmanager.h +++ b/src/sessionmanager.h @@ -48,7 +48,7 @@ class REKONQ_TESTS_EXPORT SessionManager : public QObject Q_OBJECT public: SessionManager(QObject *parent = 0); - ~SessionManager(); + inline void setSessionManagementEnabled(bool on) { m_safe = on; diff --git a/src/tabbar.h b/src/tabbar.h index 6c63a7e9..39516fc0 100644 --- a/src/tabbar.h +++ b/src/tabbar.h @@ -57,7 +57,6 @@ class REKONQ_TESTS_EXPORT TabBar : public KTabBar public: explicit TabBar(QWidget *parent); - virtual ~TabBar() {} void setTabHighlighted(int index); void resetTabHighlighted(int index); diff --git a/src/urlbar/rsswidget.cpp b/src/urlbar/rsswidget.cpp index aba03a4c..006b2999 100644 --- a/src/urlbar/rsswidget.cpp +++ b/src/urlbar/rsswidget.cpp @@ -107,11 +107,6 @@ RSSWidget::RSSWidget(const QMap< KUrl, QString > &map, QWidget *parent) } -RSSWidget::~RSSWidget() -{ -} - - void RSSWidget::showAt(const QPoint &pos) { adjustSize(); diff --git a/src/urlbar/rsswidget.h b/src/urlbar/rsswidget.h index 2f9f819e..904f8ad2 100644 --- a/src/urlbar/rsswidget.h +++ b/src/urlbar/rsswidget.h @@ -42,7 +42,6 @@ class RSSWidget : public QMenu public: // QMap< feedUrl, feedTitle> RSSWidget(const QMap<KUrl, QString> &map, QWidget *parent = 0); - ~RSSWidget(); void showAt(const QPoint &pos); diff --git a/src/urlbar/stackedurlbar.cpp b/src/urlbar/stackedurlbar.cpp index 2e652180..c24bd6c7 100644 --- a/src/urlbar/stackedurlbar.cpp +++ b/src/urlbar/stackedurlbar.cpp @@ -42,11 +42,6 @@ StackedUrlBar::StackedUrlBar(QWidget *parent) } -StackedUrlBar::~StackedUrlBar() -{ -} - - UrlBar *StackedUrlBar::currentUrlBar() { return urlBar(currentIndex()); diff --git a/src/urlbar/stackedurlbar.h b/src/urlbar/stackedurlbar.h index 5009d49a..b0583df1 100644 --- a/src/urlbar/stackedurlbar.h +++ b/src/urlbar/stackedurlbar.h @@ -44,7 +44,6 @@ class REKONQ_TESTS_EXPORT StackedUrlBar : public QStackedWidget public: StackedUrlBar(QWidget *parent = 0); - ~StackedUrlBar(); UrlBar *currentUrlBar(); UrlBar *urlBar(int index); diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index f82468b8..8f3e11ec 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -122,7 +122,6 @@ UrlBar::UrlBar(QWidget *parent) UrlBar::~UrlBar() { activateSuggestions(false); - delete _icon; _box.clear(); } diff --git a/src/urlpanel.h b/src/urlpanel.h index 1f53bc1e..48dfcffe 100644 --- a/src/urlpanel.h +++ b/src/urlpanel.h @@ -47,7 +47,6 @@ class REKONQ_TESTS_EXPORT UrlPanel : public QDockWidget public: explicit UrlPanel(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0); - virtual ~UrlPanel() {} Q_SIGNALS: void openUrl(const KUrl &, const Rekonq::OpenType &); diff --git a/src/walletbar.cpp b/src/walletbar.cpp index 851edec4..cc084001 100644 --- a/src/walletbar.cpp +++ b/src/walletbar.cpp @@ -74,11 +74,6 @@ WalletBar::WalletBar(QWidget *parent) } -WalletBar::~WalletBar() -{ -} - - void WalletBar::rememberData() { emit saveFormDataAccepted(m_key); diff --git a/src/walletbar.h b/src/walletbar.h index 5091349b..8c85c442 100644 --- a/src/walletbar.h +++ b/src/walletbar.h @@ -43,7 +43,6 @@ class REKONQ_TESTS_EXPORT WalletBar : public NotificationBar public: WalletBar(QWidget *parent); - ~WalletBar(); private slots: diff --git a/src/webicon.cpp b/src/webicon.cpp index ae285cc0..755d0c2e 100644 --- a/src/webicon.cpp +++ b/src/webicon.cpp @@ -50,11 +50,6 @@ WebIcon::WebIcon(const KUrl& url, QObject *parent) } -WebIcon::~WebIcon() -{ -} - - void WebIcon::load() { m_page.mainFrame()->load(m_url); diff --git a/src/webicon.h b/src/webicon.h index d93d42e4..34afadd3 100644 --- a/src/webicon.h +++ b/src/webicon.h @@ -43,7 +43,6 @@ class REKONQ_TESTS_EXPORT WebIcon : public QObject public: explicit WebIcon(const KUrl &url, QObject *parent = 0); - ~WebIcon(); private slots: void load(); diff --git a/src/webpage.h b/src/webpage.h index 86a4cb5b..09977bff 100644 --- a/src/webpage.h +++ b/src/webpage.h @@ -74,6 +74,7 @@ public: { return _loadingUrl; }; + inline QString suggestedFileName() { return _suggestedFileName; diff --git a/src/zoombar.cpp b/src/zoombar.cpp index 64c32b8b..7399b000 100644 --- a/src/zoombar.cpp +++ b/src/zoombar.cpp @@ -102,15 +102,6 @@ ZoomBar::ZoomBar(QWidget *parent) } -ZoomBar::~ZoomBar() -{ - delete m_zoomIn; - delete m_zoomOut; - delete m_zoomNormal; - delete m_zoomSlider; -} - - void ZoomBar::setupActions(MainWindow *window) { KAction *a; diff --git a/src/zoombar.h b/src/zoombar.h index 345d7a05..8261447b 100644 --- a/src/zoombar.h +++ b/src/zoombar.h @@ -49,7 +49,6 @@ class REKONQ_TESTS_EXPORT ZoomBar : public QWidget public: ZoomBar(QWidget *parent); - ~ZoomBar(); public Q_SLOTS: void show(); |