From c328e203e0d84177a0028d8ba5b0af4b82c16eeb Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 5 Feb 2010 00:29:13 +0100 Subject: QPointers --> QWeakPointers --- src/application.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 4b951ded..0c3bd3f5 100644 --- a/src/application.h +++ b/src/application.h @@ -38,7 +38,7 @@ #include // Qt Includes -#include +#include #include // Forward Declarations @@ -52,7 +52,7 @@ class AdBlockManager; class WebView; -typedef QList< QPointer > MainWindowList; +typedef QList< QWeakPointer > MainWindowList; namespace Rekonq @@ -139,10 +139,10 @@ private slots: void loadResolvedUrl(ThreadWeaver::Job *); private: - static QPointer s_historyManager; - static QPointer s_bookmarkProvider; - static QPointer s_sessionManager; - static QPointer s_adblockManager; + static QWeakPointer s_historyManager; + static QWeakPointer s_bookmarkProvider; + static QWeakPointer s_sessionManager; + static QWeakPointer s_adblockManager; MainWindowList m_mainWindows; }; -- cgit v1.2.1 From 067b99a053b6f8b1ccab507be8e828b2f72a1e43 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 10 Feb 2010 10:57:57 +0100 Subject: Fix copyright for 0.4 beta release --- src/application.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 0c3bd3f5..f20f537b 100644 --- a/src/application.h +++ b/src/application.h @@ -2,9 +2,9 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2008-2009 by Andrea Diamantini +* Copyright (C) 2008-2010 by Andrea Diamantini * Copyright (C) 2009 by Paweł Prażak -* Copyright (C) 2009 by Lionel Chauvin +* Copyright (C) 2009-2010 by Lionel Chauvin * * * This program is free software; you can redistribute it and/or -- cgit v1.2.1 From eaeb2fd551b212eff656b65169ce98ca20485370 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 19 Feb 2010 02:20:18 +0100 Subject: Set rekonq page (and fix focus) on new window creation. BUG: 226851 --- src/application.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index f20f537b..30ec4839 100644 --- a/src/application.h +++ b/src/application.h @@ -100,6 +100,7 @@ public: static Application *instance(); MainWindow *mainWindow(); + MainWindow *newMainWindow(); MainWindowList mainWindowList(); static KIcon icon(const KUrl &url); @@ -117,8 +118,6 @@ public slots: */ void saveConfiguration() const; - MainWindow *newMainWindow(); - void loadUrl( const KUrl& url, const Rekonq::OpenType& type = Rekonq::CurrentTab ); @@ -127,6 +126,7 @@ public slots: const Rekonq::OpenType& type = Rekonq::CurrentTab ); + void newWindow(); void removeMainWindow(MainWindow *window); private slots: -- cgit v1.2.1 From 8dda858403d283f1850c0298aac0fb5212a27952 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 26 Feb 2010 11:37:11 +0100 Subject: tests support for every Qt derived rekonq class --- src/application.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 30ec4839..4340b004 100644 --- a/src/application.h +++ b/src/application.h @@ -29,6 +29,8 @@ #ifndef APPLICATION_H #define APPLICATION_H +// Local Includes +#include "rekonqprivate_export.h" // KDE Includes #include @@ -89,7 +91,7 @@ namespace Rekonq /** * */ -class Application : public KUniqueApplication +class REKONQ_TESTS_EXPORT Application : public KUniqueApplication { Q_OBJECT -- cgit v1.2.1 From 2000e8acb0e5f851dfc4024b48c7f08610fc857e Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 9 Apr 2010 00:57:44 +0200 Subject: Re-enabling all KDE url magics --- src/application.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 4340b004..760f7943 100644 --- a/src/application.h +++ b/src/application.h @@ -141,6 +141,8 @@ private slots: void loadResolvedUrl(ThreadWeaver::Job *); private: + void prepareLoading(const QString& urlString, const Rekonq::OpenType& type); + static QWeakPointer s_historyManager; static QWeakPointer s_bookmarkProvider; static QWeakPointer s_sessionManager; -- cgit v1.2.1 From 85dec247bde3a46298d0b9a9a6b7faa5e8d33bf8 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 14 Apr 2010 10:30:16 +0200 Subject: Finally cleaning Application class, getting rid of loadUrl(string) slot --- src/application.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/application.h') diff --git a/src/application.h b/src/application.h index 760f7943..c268d586 100644 --- a/src/application.h +++ b/src/application.h @@ -123,10 +123,6 @@ public slots: void loadUrl( const KUrl& url, const Rekonq::OpenType& type = Rekonq::CurrentTab ); - - void loadUrl( const QString& urlString, - const Rekonq::OpenType& type = Rekonq::CurrentTab - ); void newWindow(); void removeMainWindow(MainWindow *window); @@ -141,8 +137,6 @@ private slots: void loadResolvedUrl(ThreadWeaver::Job *); private: - void prepareLoading(const QString& urlString, const Rekonq::OpenType& type); - static QWeakPointer s_historyManager; static QWeakPointer s_bookmarkProvider; static QWeakPointer s_sessionManager; -- cgit v1.2.1