summaryrefslogtreecommitdiff
path: root/src/webwindow
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-12-12 18:47:35 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-12-12 18:47:35 +0100
commita1b660daae9dd252d84ec44e8a5102277539b395 (patch)
treec4cfc40343592860e985437fb672389719125715 /src/webwindow
parentgetSaveFileName --> getSaveUrl (diff)
downloadrekonq-a1b660daae9dd252d84ec44e8a5102277539b395.tar.xz
- Code style check (codestyle script round)
- restored CTRL + ENTER code - applied Vedant's patch about (thanks!!!) CCMAIL: vedant.kota@gmail.com REVIEW: 107662 REVIEWED-BY: Tirtha and me
Diffstat (limited to 'src/webwindow')
-rw-r--r--src/webwindow/rekonqfactory.cpp2
-rw-r--r--src/webwindow/rekonqmenu.cpp4
-rw-r--r--src/webwindow/webwindow.cpp18
-rw-r--r--src/webwindow/webwindow.h4
4 files changed, 14 insertions, 14 deletions
diff --git a/src/webwindow/rekonqfactory.cpp b/src/webwindow/rekonqfactory.cpp
index 9de9e367..60ba3872 100644
--- a/src/webwindow/rekonqfactory.cpp
+++ b/src/webwindow/rekonqfactory.cpp
@@ -76,7 +76,7 @@ QAction *actionByName(const QString &name)
// NOTE: last action collection created is surely the one interests us more!
// So let's start from the end...
int lac_count = lac.count();
- for(int i = lac_count - 1; i>=0; i--)
+ for (int i = lac_count - 1; i >= 0; i--)
{
KActionCollection *ac = lac.at(i);
QAction *a = ac->action(name);
diff --git a/src/webwindow/rekonqmenu.cpp b/src/webwindow/rekonqmenu.cpp
index a89d883e..4ea01708 100644
--- a/src/webwindow/rekonqmenu.cpp
+++ b/src/webwindow/rekonqmenu.cpp
@@ -54,10 +54,10 @@ void RekonqMenu::showEvent(QShowEvent* event)
int w = width();
QWidget *parentWidget = qobject_cast<QWidget *>(parent());
- QPoint widgetGlobalPos = parentWidget->mapToGlobal(QPoint(0,0));
+ QPoint widgetGlobalPos = parentWidget->mapToGlobal(QPoint(0, 0));
int pw = parentWidget->width();
int px = widgetGlobalPos.x();
-
+
QPoint newPosition = QPoint(px + pw - w, y);
// Finally, move it there...
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index 35c6aed9..616ccc69 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -128,7 +128,7 @@ WebWindow::WebWindow(QWidget *parent, WebPage *pg)
connect(_tab->view(), SIGNAL(loadProgress(int)), this, SLOT(webLoadProgress(int)));
connect(_bar, SIGNAL(focusIn()), this, SLOT(urlbarFocused()));
-
+
// page signals
connect(page(), SIGNAL(pageCreated(WebPage *)), this, SIGNAL(pageCreated(WebPage *)));
@@ -140,7 +140,7 @@ WebWindow::WebWindow(QWidget *parent, WebPage *pg)
connect(m_hidePopupTimer, SIGNAL(timeout()), m_popup, SLOT(hide()));
connect(_tab->page(), SIGNAL(linkHovered(QString, QString, QString)), this, SLOT(notifyMessage(QString)));
connect(_tab, SIGNAL(infoToShow(QString)), this, SLOT(notifyMessage(QString)));
-
+
updateHistoryActions();
if (parent && parent->isFullScreen())
@@ -246,7 +246,7 @@ void WebWindow::setupActions()
KStandardAction::findNext(m_findBar, SLOT(findNext()), actionCollection());
KStandardAction::findPrev(m_findBar, SLOT(findPrevious()), actionCollection());
-
+
a = KStandardAction::redisplay(_tab->view(), SLOT(reload()), actionCollection());
a->setText(i18n("Reload"));
KShortcut reloadShortcut = KStandardShortcut::reload();
@@ -406,8 +406,8 @@ void WebWindow::webLoadFinished(bool b)
m_loadStopReloadAction->setText(i18n("Reload"));
connect(m_loadStopReloadAction, SIGNAL(triggered(bool)), _tab->view(), SLOT(reload()));
}
-
- updateHistoryActions();
+
+ updateHistoryActions();
}
@@ -415,7 +415,7 @@ void WebWindow::urlbarFocused()
{
m_loadStopReloadAction->setIcon(KIcon("go-jump-locationbar"));
m_loadStopReloadAction->setToolTip(i18n("Go"));
- m_loadStopReloadAction->setText(i18n("Go"));
+ m_loadStopReloadAction->setText(i18n("Go"));
connect(m_loadStopReloadAction, SIGNAL(triggered(bool)), _bar, SLOT(loadTypedUrl()));
}
@@ -933,19 +933,19 @@ void WebWindow::checkFocus()
void WebWindow::openDownloadsPage()
{
- rApp->loadUrl( QUrl("about:downloads"), Rekonq::NewFocusedTab );
+ rApp->loadUrl(QUrl("about:downloads"), Rekonq::NewFocusedTab);
}
void WebWindow::openHistoryPage()
{
- rApp->loadUrl( QUrl("about:history"), Rekonq::NewFocusedTab );
+ rApp->loadUrl(QUrl("about:history"), Rekonq::NewFocusedTab);
}
void WebWindow::openBookmarksPage()
{
- rApp->loadUrl( QUrl("about:bookmarks"), Rekonq::NewFocusedTab );
+ rApp->loadUrl(QUrl("about:bookmarks"), Rekonq::NewFocusedTab);
}
diff --git a/src/webwindow/webwindow.h b/src/webwindow/webwindow.h
index ce71e7b9..3f7fcc54 100644
--- a/src/webwindow/webwindow.h
+++ b/src/webwindow/webwindow.h
@@ -93,7 +93,7 @@ private:
public Q_SLOTS:
void setWidgetsHidden(bool hide);
void setPrivateBrowsing(bool);
-
+
private Q_SLOTS:
void webLoadProgress(int);
void webLoadStarted();
@@ -131,7 +131,7 @@ private Q_SLOTS:
void openHistoryPage();
void openBookmarksPage();
void openHomePage(Qt::MouseButtons, Qt::KeyboardModifiers);
-
+
// Tools Menu slots
void viewPageSource();