summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/application.cpp46
-rw-r--r--src/bookmarks/bookmarkowner.cpp2
-rw-r--r--src/bookmarks/bookmarkprovider.cpp (renamed from src/bookmarks/bookmarksmanager.cpp)2
-rw-r--r--src/bookmarks/bookmarkprovider.h (renamed from src/bookmarks/bookmarksmanager.h)0
-rw-r--r--src/bookmarks/bookmarkspanel.cpp2
-rw-r--r--src/bookmarks/bookmarkstoolbar.cpp2
-rw-r--r--src/bookmarks/bookmarkstreemodel.cpp2
-rw-r--r--src/mainwindow.cpp2
-rw-r--r--src/mainwindow.h10
-rw-r--r--src/newtabpage.cpp2
-rw-r--r--src/urlbar/bookmarkwidget.cpp2
-rw-r--r--src/urlbar/urlbar.cpp24
-rw-r--r--src/urlbar/urlresolver.cpp64
-rw-r--r--src/webtab.cpp8
-rw-r--r--src/webview.cpp16
16 files changed, 95 insertions, 95 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cc381c94..03c1e062 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ SET( rekonq_KDEINIT_SRCS
settings/webkitwidget.cpp
settings/networkwidget.cpp
#----------------------------------------
- bookmarks/bookmarksmanager.cpp
+ bookmarks/bookmarkprovider.cpp
bookmarks/bookmarkspanel.cpp
bookmarks/bookmarkstreemodel.cpp
bookmarks/bookmarksproxy.cpp
@@ -118,9 +118,9 @@ KDE4_ADD_KDEINIT_EXECUTABLE( rekonq ${rekonq_KDEINIT_SRCS} main.cpp )
### --------------- TARGETTING LINK LIBRARIES...
TARGET_LINK_LIBRARIES ( kdeinit_rekonq
- ${QT_LIBRARIES}
+ ${QT_LIBRARIES}
${QT_QTSCRIPT_LIBRARY}
- ${QT_QTWEBKIT_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
${KDE4_KDEWEBKIT_LIBS}
${KDE4_KUTILS_LIBS}
${KDE4_KDEUI_LIBS}
diff --git a/src/application.cpp b/src/application.cpp
index 065c0ef2..db71c602 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -36,7 +36,7 @@
// Local Includes
#include "mainwindow.h"
#include "historymanager.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "mainview.h"
#include "webtab.h"
#include "urlbar.h"
@@ -100,7 +100,7 @@ Application::~Application()
delete s_adblockManager.data();
s_adblockManager.clear();
-
+
delete s_opensearchManager.data();
s_opensearchManager.clear();
}
@@ -112,7 +112,7 @@ int Application::newInstance()
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
// not that easy, indeed
- // We have to consider 3 variables here:
+ // We have to consider 3 variables here:
// 1) Is first load?
// 2) Are there arguments?
// 3) Is rekonq recovering from crash?
@@ -120,13 +120,13 @@ int Application::newInstance()
bool isFirstLoad = m_mainWindows.isEmpty();
bool areThereArguments = (args->count() > 0);
bool isRekonqCrashed = (ReKonfig::recoverOnCrash() == 1);
-
+
kDebug() << "is first load? " << isFirstLoad;
kDebug() << "are there arguments? " << areThereArguments;
kDebug() << "is rekonq crashed? " << isRekonqCrashed;
-
+
int exitValue = 1 * isFirstLoad + 2 * areThereArguments + 4 * isRekonqCrashed;
-
+
if(isRekonqCrashed)
{
if( isFirstLoad && sessionManager()->restoreSession() )
@@ -144,7 +144,7 @@ int Application::newInstance()
loadUrl( KUrl("about:blank"), Rekonq::NewFocusedTab);
}
}
-
+
if(areThereArguments)
{
KUrl::List urlList;
@@ -156,7 +156,7 @@ int Application::newInstance()
else
urlList += KUrl( args->arg(i) ); // "rekonq kde.org" || "rekonq kde:kdialog" case
}
-
+
if (isFirstLoad)
{
// No windows in the current desktop? No windows at all?
@@ -183,7 +183,7 @@ int Application::newInstance()
Q_FOREACH(const KUrl &u, urlList)
loadUrl(u, Rekonq::NewFocusedTab);
}
- }
+ }
}
else
{
@@ -223,16 +223,16 @@ int Application::newInstance()
break;
}
- }
+ }
}
-
-
+
+
if(isFirstLoad)
{
// give me some time to do the other things..
QTimer::singleShot(100, this, SLOT(postLaunch()));
}
-
+
return exitValue;
}
@@ -408,7 +408,7 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
Q_ASSERT( tabIndex != -1 );
UrlBar *barForTab = qobject_cast<UrlBar *>(w->mainView()->widgetBar()->widget(tabIndex));
barForTab->setQUrl(url);
-
+
WebView *view = tab->view();
if (view)
@@ -486,16 +486,16 @@ void Application::updateConfiguration()
{
MainView *mv = w.data()->mainView();
mv->updateTabBar();
-
+
if (b)
mv->tabBar()->setSelectionBehaviorOnRemove(QTabBar::SelectPreviousTab);
else
mv->tabBar()->setSelectionBehaviorOnRemove(QTabBar::SelectRightTab);
}
- QWebSettings *defaultSettings = QWebSettings::globalSettings();
-
- // =========== Fonts ==============
+ QWebSettings *defaultSettings = QWebSettings::globalSettings();
+
+ // =========== Fonts ==============
defaultSettings->setFontFamily(QWebSettings::StandardFont, ReKonfig::standardFontFamily() );
defaultSettings->setFontFamily(QWebSettings::FixedFont, ReKonfig::fixedFontFamily() );
defaultSettings->setFontFamily(QWebSettings::SerifFont, ReKonfig::serifFontFamily() );
@@ -503,15 +503,15 @@ void Application::updateConfiguration()
defaultSettings->setFontFamily(QWebSettings::CursiveFont, ReKonfig::cursiveFontFamily());
defaultSettings->setFontFamily(QWebSettings::FantasyFont, ReKonfig::fantasyFontFamily());
- // compute font size
+ // compute font size
// (I have to admit I know nothing about these DPI questions..: copied from kwebkitpart, as someone suggested)
// font size in pixels = font size in inches × screen dpi
- int defaultFontSize = ReKonfig::defaultFontSize();
+ int defaultFontSize = ReKonfig::defaultFontSize();
int minimumFontSize = ReKonfig::minFontSize();
-
+
int logDpiY = mainWindow()->currentTab()->view()->logicalDpiY();
kDebug() << "Logical Dot per Inch Y: " << logDpiY;
-
+
float toPix = (logDpiY < 96.0)
? 96.0/72.0
: logDpiY/72.0 ;
@@ -519,7 +519,7 @@ void Application::updateConfiguration()
defaultSettings->setFontSize(QWebSettings::DefaultFontSize, qRound(defaultFontSize * toPix) );
defaultSettings->setFontSize(QWebSettings::MinimumFontSize, qRound(minimumFontSize * toPix) );
-
+
// ================ WebKit ============================
defaultSettings->setAttribute(QWebSettings::AutoLoadImages, ReKonfig::autoLoadImages());
defaultSettings->setAttribute(QWebSettings::DnsPrefetchEnabled, ReKonfig::dnsPrefetch());
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index d9df6e82..7861f0ac 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -32,7 +32,7 @@
// Local Includes
#include "application.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "mainwindow.h"
#include "webtab.h"
#include "mainview.h"
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarkprovider.cpp
index ea7b313d..03a3cc70 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarkprovider.cpp
@@ -28,7 +28,7 @@
// Self Includes
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
// Local Includes
#include "application.h"
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarkprovider.h
index 0c2b9ee2..0c2b9ee2 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarkprovider.h
diff --git a/src/bookmarks/bookmarkspanel.cpp b/src/bookmarks/bookmarkspanel.cpp
index 1b561515..08f99155 100644
--- a/src/bookmarks/bookmarkspanel.cpp
+++ b/src/bookmarks/bookmarkspanel.cpp
@@ -30,7 +30,7 @@
// Local Includes
#include "application.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "bookmarkstreemodel.h"
#include "bookmarksproxy.h"
#include "bookmarkscontextmenu.h"
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp
index bce2bd1e..64e9c3b9 100644
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@@ -33,7 +33,7 @@
#include "bookmarkscontextmenu.h"
#include "mainwindow.h"
#include "application.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "bookmarkowner.h"
// Qt Includes
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 7f0bf66f..14b9c734 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -30,7 +30,7 @@
// Local Includes
#include "application.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
// Qt Includes
#include <QtCore/QMimeData>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f0cb5e61..262714e1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -37,7 +37,7 @@
// Local Includes
#include "settingsdialog.h"
#include "historymanager.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "bookmarkstoolbar.h"
#include "webtab.h"
#include "mainview.h"
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 6ae99b5e..eeb58171 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -35,8 +35,8 @@
#include "rekonq_defines.h"
// Local Includes
-#include "bookmarksmanager.h"
-
+#include "bookmarkprovider.h"
+
// KDE Includes
#include <KXmlGuiWindow>
#include <KActionCollection>
@@ -75,7 +75,7 @@ public:
inline MainView *mainView() const { return m_view; }
inline QAction *actionByName(const QString &name) { return actionCollection()->action(name); }
-
+
WebTab *currentTab() const;
virtual QSize sizeHint() const;
void setWidgetsVisible(bool makeFullScreen);
@@ -123,7 +123,7 @@ protected:
void keyPressEvent(QKeyEvent *event);
bool queryClose();
-
+
private slots:
void postLaunch();
void browserLoading(bool);
@@ -167,7 +167,7 @@ private slots:
void enableNetworkAnalysis(bool);
void initBookmarkBar();
-
+
private:
MainView *m_view;
FindBar *m_findBar;
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 78496bc2..0f2a0bc7 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -34,7 +34,7 @@
// Local Includes
#include "historymodels.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "application.h"
#include "mainwindow.h"
#include "mainview.h"
diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp
index bcf85e1f..0e05e776 100644
--- a/src/urlbar/bookmarkwidget.cpp
+++ b/src/urlbar/bookmarkwidget.cpp
@@ -30,7 +30,7 @@
// Local includes
#include "application.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "bookmarkowner.h"
// KDE Includes
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index e64959bd..6a5599cd 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -41,7 +41,7 @@
#include "webpage.h"
#include "webview.h"
#include "completionwidget.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "bookmarkwidget.h"
// KDE Includes
@@ -105,7 +105,7 @@ UrlBar::UrlBar(QWidget *parent)
_tab = qobject_cast<WebTab *>(parent);
connect(_tab, SIGNAL(loadProgressing()), this, SLOT(update()));
-
+
connect(_tab->view(), SIGNAL(urlChanged(const QUrl &)), this, SLOT(setQUrl(const QUrl &)));
connect(_tab->view(), SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
connect(_tab->view(), SIGNAL(loadStarted()), this, SLOT(clearRightIcons()));
@@ -114,13 +114,13 @@ UrlBar::UrlBar(QWidget *parent)
_icon->setIcon(KIcon("bookmarks").pixmap(32,32, QIcon::Disabled));
connect(Application::bookmarkProvider()->bookmarkManager(), SIGNAL(changed(const QString &, const QString &)), this, SLOT(onBookmarksChanged()));
connect(_icon, SIGNAL(clicked(const QPoint &)), this, SLOT(showBookmarkInfo(const QPoint &)));
-
+
// load typed urls
connect(this, SIGNAL(returnPressed(const QString &)), this, SLOT(loadTyped(const QString &)));
_suggestionTimer->setSingleShot(true);
connect(_suggestionTimer, SIGNAL(timeout()), this, SLOT(suggest()));
-
+
activateSuggestions(true);
}
@@ -163,10 +163,10 @@ void UrlBar::activated(const KUrl& url, Rekonq::OpenType type)
void UrlBar::paintEvent(QPaintEvent *event)
-{
+{
QColor backgroundColor;
QColor foregroundColor;
-
+
if (_privateMode)
{
backgroundColor = QColor(220, 220, 220); // light gray
@@ -199,7 +199,7 @@ void UrlBar::paintEvent(QPaintEvent *event)
int r = (highlight.red()+2*backgroundColor.red())/3;
int g = (highlight.green()+2*backgroundColor.green())/3;
int b = (highlight.blue()+2*backgroundColor.blue())/3;
-
+
QColor loadingColor(r, g, b);
if (abs(loadingColor.lightness() - backgroundColor.lightness()) < 20) //eg. Gaia color scheme
@@ -320,7 +320,7 @@ void UrlBar::loadFinished()
_icon->setIcon(KIcon("bookmarks"));
_icon->setToolTip(i18n("Edit this bookmark"));
}
-
+
// show KGet downloads??
if (!KStandardDirs::findExe("kget").isNull() && ReKonfig::kgetList())
{
@@ -343,7 +343,7 @@ void UrlBar::loadFinished()
}
// we need to update urlbar after the right icon settings
- // removing this code (where setStyleSheet automatically calls update) needs adding again
+ // removing this code (where setStyleSheet automatically calls update) needs adding again
// an update call
kDebug() << "resetting stylesheet";
int rightIconWidth = 25 * (_rightIconsList.count());
@@ -355,7 +355,7 @@ void UrlBar::showBookmarkInfo(const QPoint &pos)
{
if( _tab->url().scheme() == QL1S("about") )
return;
-
+
KBookmark bookmark = Application::bookmarkProvider()->bookmarkForUrl(_tab->url());
IconButton *bt = qobject_cast<IconButton *>(this->sender());
@@ -367,7 +367,7 @@ void UrlBar::showBookmarkInfo(const QPoint &pos)
bookmark = Application::bookmarkProvider()->rootGroup().addBookmark(_tab->view()->title(), _tab->url());
Application::bookmarkProvider()->bookmarkManager()->emitChanged();
}
-
+
BookmarkWidget *widget = new BookmarkWidget(bookmark, window());
widget->showAt(pos);
}
@@ -480,7 +480,7 @@ void UrlBar::detectTypedString(const QString &typed)
QTimer::singleShot(0, this, SLOT(suggest()));
return;
}
-
+
if(_suggestionTimer->isActive())
_suggestionTimer->stop();
_suggestionTimer->start(50);
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 0505dad1..db1276dc 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -30,7 +30,7 @@
// Local Includes
#include "application.h"
#include "historymanager.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "searchengine.h"
// KDE Includes
@@ -47,7 +47,7 @@
#define MAX_ELEMENTS 10
#define MIN_SUGGESTIONS 3
-// NOTE
+// NOTE
// default kurifilter plugin list (at least in my box):
// 1. "kshorturifilter"
// 2. "kurisearchfilter"
@@ -69,18 +69,18 @@ UrlResolver::UrlResolver(const QString &typedUrl)
if ( _browseRegexp.isEmpty() )
{
kDebug() << "browse regexp empty. Setting value..";
-
+
QString protocol = "^(http://|https://|file://|ftp://|man:|info:|apt:)";
-
+
QString localhost = "^localhost";
-
+
QString local = "^/";
-
+
QString ipv4 = "^0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])"\
"\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])\\.0*([1-9]?\\d|1\\d\\d|2[0-4]\\d|25[0-5])";
-
+
QString ipv6 = "^([0-9a-fA-F]{4}|0)(\\:([0-9a-fA-F]{4}|0)){7}";
-
+
QString address = "[\\d\\w-.]+\\.(a[cdefgilmnoqrstuwz]|b[abdefghijmnorstvwyz]|"\
"c[acdfghiklmnoruvxyz]|d[ejkmnoz]|e[ceghrst]|f[ijkmnor]|g[abdefghilmnpqrstuwy]|"\
"h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|"\
@@ -88,10 +88,10 @@ UrlResolver::UrlResolver(const QString &typedUrl)
"s[abcdeghijklmnortuvyz]|t[cdfghjkmnoprtvwz]|u[augkmsyz]|v[aceginu]|w[fs]|"\
"y[etu]|z[amw]|aero|arpa|biz|com|coop|edu|info|int|gov|mil|museum|name|net|org|"\
"pro)";
-
+
_browseRegexp = QRegExp('(' + protocol + ")|(" + localhost + ")|(" + local + ")|(" + address + ")|(" + ipv6 + ")|(" + ipv4 +')');
}
-
+
if ( _searchEnginesRegexp.isEmpty() )
{
QString reg;
@@ -99,9 +99,9 @@ UrlResolver::UrlResolver(const QString &typedUrl)
Q_FOREACH(KService::Ptr s, SearchEngine::favorites())
{
engineUrl = QRegExp::escape(s->property("Query").toString()).replace("\\\\\\{@\\}","[\\d\\w-.]+");
- if (reg.isEmpty())
+ if (reg.isEmpty())
reg = '(' + engineUrl + ')';
- else
+ else
reg = reg + "|(" + engineUrl + ')';
}
_searchEnginesRegexp = QRegExp(reg);
@@ -126,10 +126,10 @@ UrlSearchList UrlResolver::orderedSearchItems()
list << hist;
UrlSearchItem down(UrlSearchItem::Browse, QString("about:downloads"), QL1S("downloads") );
list << down;
-
+
return list;
}
-
+
_computedListsCount = 0;
//compute lists
@@ -144,7 +144,7 @@ UrlSearchList UrlResolver::orderedSearchItems()
while (_computedListsCount < 5 && time.msec() < 1000)
{
- Application::instance()->processEvents(QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents);
+ Application::instance()->processEvents(QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents);
}
return orderLists();
@@ -153,7 +153,7 @@ UrlSearchList UrlResolver::orderedSearchItems()
UrlSearchList UrlResolver::orderLists()
{
- // NOTE
+ // NOTE
// the logic here is : "we wanna suggest (at least) 10 elements"
// so we have (more or less) 2 from first results (1 from QUrl Resolutions, 1 from
// search engines).
@@ -162,9 +162,9 @@ UrlSearchList UrlResolver::orderLists()
QTime myTime;
myTime.start();
-
+
UrlSearchList list;
-
+
if(_browseRegexp.indexIn(_typedString) != -1)
{
list << _qurlFromUserInput;
@@ -179,7 +179,7 @@ UrlSearchList UrlResolver::orderLists()
//find the history items that match the typed string
UrlSearchItem privileged = privilegedItem(&_history);
int historyCount = _history.count();
-
+
//find the bookmarks items that match the typed string
if (privileged.type == UrlSearchItem::Undefined)
{
@@ -190,14 +190,14 @@ UrlSearchList UrlResolver::orderLists()
privileged.type |= UrlSearchItem::Bookmark;
}
int bookmarksCount = _bookmarks.count();
-
+
if (privileged.type != UrlSearchItem::Undefined)
{
list.prepend(privileged);
}
int availableEntries = MAX_ELEMENTS - list.count() - MIN_SUGGESTIONS;
-
+
UrlSearchList common;
int commonCount = 0;
@@ -221,7 +221,7 @@ UrlSearchList UrlResolver::orderLists()
}
}
}
-
+
commonCount = common.count();
if(commonCount >= availableEntries)
{
@@ -265,10 +265,10 @@ UrlSearchList UrlResolver::orderLists()
common << urlSearchItem;
}
}
-
+
availableEntries -= common.count();
}
-
+
historyCount = _history.count();
bookmarksCount = _bookmarks.count();
commonCount = common.count();
@@ -278,7 +278,7 @@ UrlSearchList UrlResolver::orderLists()
{
int historyEntries = ((int) (availableEntries / 2)) + availableEntries % 2;
int bookmarksEntries = availableEntries - historyEntries;
-
+
if (historyCount >= historyEntries && bookmarksCount >= bookmarksEntries)
{
_history = _history.mid(0, historyEntries);
@@ -310,7 +310,7 @@ UrlSearchList UrlResolver::orderLists()
list = list + _history + common + _bookmarks + _suggestions;
qWarning() << "orderedSearchItems leave: " << " elapsed: " << myTime.elapsed();
-
+
return list;
}
@@ -382,9 +382,9 @@ void UrlResolver::computeSuggestions()
{
if (Application::opensearchManager()->isSuggestionAvailable())
{
- connect(Application::opensearchManager(),
- SIGNAL(suggestionReceived(const QStringList &)),
- this,
+ connect(Application::opensearchManager(),
+ SIGNAL(suggestionReceived(const QStringList &)),
+ this,
SLOT(suggestionsReceived(const QStringList &)));
Application::opensearchManager()->requestSuggestion(_typedString);
@@ -398,7 +398,7 @@ void UrlResolver::computeSuggestions()
void UrlResolver::suggestionsReceived(const QStringList &suggestion)
{
-
+
foreach (QString s, suggestion)
{
UrlSearchItem gItem(UrlSearchItem::Suggestion, s, s);
@@ -412,10 +412,10 @@ void UrlResolver::suggestionsReceived(const QStringList &suggestion)
UrlSearchItem UrlResolver::privilegedItem(UrlSearchList* list)
{
UrlSearchItem item;
- QString dot = QString(QL1C('.'));
+ QString dot = QString(QL1C('.'));
QString test1 = QString(QL1C('/')) + _typedString + dot;
QString test2 = dot + _typedString + dot;
-
+
for(int i = 0; i<list->count(); i++)
{
item = list->at(i);
diff --git a/src/webtab.cpp b/src/webtab.cpp
index 9e168d36..0b58d7c5 100644
--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -36,7 +36,7 @@
#include "application.h"
#include "mainwindow.h"
#include "mainview.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "walletbar.h"
#include "previewselectorbar.h"
#include "rsswidget.h"
@@ -66,7 +66,7 @@ WebTab::WebTab(QWidget *parent)
, m_progress(0)
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
+
QVBoxLayout *l = new QVBoxLayout(this);
l->setMargin(0);
l->setSpacing(0);
@@ -158,7 +158,7 @@ void WebTab::createPreviewSelectorBar(int index)
{
PreviewSelectorBar *bar = new PreviewSelectorBar(index, this);
qobject_cast<QVBoxLayout *>(layout())->insertWidget(0, bar);
-
+
connect(page(), SIGNAL(loadStarted()), bar, SLOT(loadProgress()));
connect(page(), SIGNAL(loadProgress(int)), bar, SLOT(loadProgress()));
connect(page(), SIGNAL(loadFinished(bool)), bar, SLOT(loadFinished()));
@@ -183,7 +183,7 @@ void WebTab::showRSSInfo(QPoint pos)
col.append(page()->mainFrame()->findAllElements("link[type=\"application/atom+xml\"]"));
QMap<KUrl, QString> map;
-
+
foreach(const QWebElement &el, col)
{
QString urlString;
diff --git a/src/webview.cpp b/src/webview.cpp
index c15478c2..1ffb2f1e 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -36,7 +36,7 @@
#include "mainwindow.h"
#include "mainview.h"
#include "webpage.h"
-#include "bookmarksmanager.h"
+#include "bookmarkprovider.h"
#include "searchengine.h"
#include "websnap.h"
@@ -79,8 +79,8 @@ WebView::WebView(QWidget* parent)
{
WebPage *page = new WebPage(this);
setPage(page);
-
- // // NOTE This is a lot hackish. We copied it from Arora, but using a "Windows Style"
+
+ // // NOTE This is a lot hackish. We copied it from Arora, but using a "Windows Style"
// // seems really a pity to me. The problem is that using a KStyle everything seems "broken"
// // (at least with dark colors). So I think the code should be somthing like:
// KStyle s;
@@ -93,7 +93,7 @@ WebView::WebView(QWidget* parent)
p = s.standardPalette();
setPalette(p);
}
-
+
// download system
connect(this, SIGNAL(linkShiftClicked(const KUrl &)), page, SLOT(downloadUrl(const KUrl &)));
connect(page, SIGNAL(downloadRequested(const QNetworkRequest &)), page, SLOT(downloadRequest(const QNetworkRequest &)));
@@ -126,7 +126,7 @@ WebView::~WebView()
disconnect();
WebPage* p = page();
-
+
QPixmap preview = WebSnap::renderClosingPagePreview(*p);
QString path = WebSnap::imagePathFromUrl(p->mainFrame()->url().toString());
QFile::remove(path);
@@ -168,7 +168,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
menu.addAction(pageAction(KWebPage::DownloadLinkToDisk));
menu.addAction(pageAction(KWebPage::CopyLinkToClipboard));
- menu.addSeparator();
+ menu.addSeparator();
}
// is content editable && selected? Add CUT
@@ -215,7 +215,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
}
menu.addSeparator();
-
+
menu.addAction(inspectAction);
// TODO Add translate, show translation
}
@@ -234,7 +234,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
menu.addAction(pageAction(KWebPage::DownloadImageToDisk));
menu.addAction(pageAction(KWebPage::CopyImageToClipboard));
menu.addSeparator();
-
+
menu.addAction(inspectAction);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 19:18:08 +0000