summaryrefslogtreecommitdiff
path: root/src/mainwindow.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-05-27 22:58:44 +0200
committerAndrea Diamantini <adjam7@gmail.com>2012-05-27 23:34:32 +0200
commit807e20570cbfef6e258313565598905564f1bb86 (patch)
tree695b3c940bce02305224e5781a7c48b5a6fdab94 /src/mainwindow.cpp
parentRuntime Nepomuk tagging check (diff)
downloadrekonq-807e20570cbfef6e258313565598905564f1bb86.tar.xz
Kitchen sink clean up
- astyle - copyrights - (some) includes
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r--src/mainwindow.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 68772bea..7553a424 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -173,7 +173,7 @@ MainWindow::MainWindow()
setStatusBar(0);
// setting popup notification
- connect(rApp, SIGNAL(focusChanged(QWidget*,QWidget*)), m_popup, SLOT(hide()));
+ connect(rApp, SIGNAL(focusChanged(QWidget*, QWidget*)), m_popup, SLOT(hide()));
m_popup->setAutoFillBackground(true);
m_popup->setMargin(4);
m_popup->raise();
@@ -181,10 +181,10 @@ MainWindow::MainWindow()
connect(m_hidePopupTimer, SIGNAL(timeout()), m_popup, SLOT(hide()));
// notification system
- connect(m_view, SIGNAL(showStatusBarMessage(QString,Rekonq::Notify)), this, SLOT(notifyMessage(QString,Rekonq::Notify)));
+ connect(m_view, SIGNAL(showStatusBarMessage(QString, Rekonq::Notify)), this, SLOT(notifyMessage(QString, Rekonq::Notify)));
connect(m_view, SIGNAL(linkHovered(QString)), this, SLOT(notifyMessage(QString)));
- connect(rApp->downloadManager(), SIGNAL(notifyDownload(QString,Rekonq::Notify)),
- this, SLOT(notifyMessage(QString,Rekonq::Notify)));
+ connect(rApp->downloadManager(), SIGNAL(notifyDownload(QString, Rekonq::Notify)),
+ this, SLOT(notifyMessage(QString, Rekonq::Notify)));
// connect signals and slots
connect(m_view, SIGNAL(currentTitle(QString)), this, SLOT(updateWindowTitle(QString)));
@@ -253,11 +253,11 @@ void MainWindow::setupToolbars()
void MainWindow::postLaunch()
{
setupBookmarksAndToolsShortcuts();
-
+
// this just to fix reopening rekonq after fullscreen close
KToolBar *mainBar = toolBar("mainToolBar");
- mainBar->show();
-
+ mainBar->show();
+
// Bookmarks Bar
KToolBar *XMLGUIBkBar = toolBar("bookmarkToolBar");
if (!XMLGUIBkBar)
@@ -358,7 +358,7 @@ void MainWindow::setupActions()
a->setShortcut(fullScreenShortcut);
a = actionCollection()->addAction(KStandardAction::Home);
- connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(homePage()));
+ connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(homePage()));
KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
a = KStandardAction::redisplay(m_view, SLOT(webReload()), actionCollection());
@@ -423,8 +423,8 @@ void MainWindow::setupActions()
// ========================= History related actions ==============================
a = actionCollection()->addAction(KStandardAction::Back);
- connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
- this, SLOT(openPrevious(Qt::MouseButtons,Qt::KeyboardModifiers)));
+ connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
+ this, SLOT(openPrevious(Qt::MouseButtons, Qt::KeyboardModifiers)));
m_historyBackMenu = new KMenu(this);
a->setMenu(m_historyBackMenu);
@@ -432,8 +432,8 @@ void MainWindow::setupActions()
connect(m_historyBackMenu, SIGNAL(triggered(QAction*)), this, SLOT(openActionUrl(QAction*)));
a = actionCollection()->addAction(KStandardAction::Forward);
- connect(a, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
- this, SLOT(openNext(Qt::MouseButtons,Qt::KeyboardModifiers)));
+ connect(a, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)),
+ this, SLOT(openNext(Qt::MouseButtons, Qt::KeyboardModifiers)));
m_historyForwardMenu = new KMenu(this);
a->setMenu(m_historyForwardMenu);
@@ -578,8 +578,8 @@ void MainWindow::setupPanels()
// Setup history panel
const QString historyTitle = i18n("History Panel");
m_historyPanel = new HistoryPanel(historyTitle, this);
- connect(m_historyPanel, SIGNAL(openUrl(KUrl,Rekonq::OpenType)),
- rApp, SLOT(loadUrl(KUrl,Rekonq::OpenType)));
+ connect(m_historyPanel, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
+ rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
connect(m_historyPanel, SIGNAL(itemHovered(QString)), this, SLOT(notifyMessage(QString)));
connect(m_historyPanel, SIGNAL(destroyed()), rApp, SLOT(saveConfiguration()));
@@ -597,8 +597,8 @@ void MainWindow::setupPanels()
// Setup bookmarks panel
const QString bookmarksTitle = i18n("Bookmarks Panel");
m_bookmarksPanel = new BookmarksPanel(bookmarksTitle, this);
- connect(m_bookmarksPanel, SIGNAL(openUrl(KUrl,Rekonq::OpenType)),
- rApp, SLOT(loadUrl(KUrl,Rekonq::OpenType)));
+ connect(m_bookmarksPanel, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
+ rApp, SLOT(loadUrl(KUrl, Rekonq::OpenType)));
connect(m_bookmarksPanel, SIGNAL(itemHovered(QString)), this, SLOT(notifyMessage(QString)));
connect(m_bookmarksPanel, SIGNAL(destroyed()), rApp, SLOT(saveConfiguration()));
@@ -743,7 +743,7 @@ void MainWindow::preferences()
// keep us informed when the user changes settings
connect(s, SIGNAL(settingsChanged(QString)), rApp, SLOT(updateConfiguration()));
connect(s, SIGNAL(finished(int)), s, SLOT(deleteLater()));
-
+
s->show();
}
@@ -1545,7 +1545,7 @@ void MainWindow::setupBookmarksAndToolsShortcuts()
m_rekonqMenu->setButtonWidget(toolsButton);
return;
}
-
+
kWarning() << "oh oh, something went wrong with rekonq tools button...";
}
@@ -1620,7 +1620,7 @@ void MainWindow::loadCheckedUrl(const KUrl& url, const Rekonq::OpenType& type, Q
{
// NOTE: At this point, url should just be resolved via urlresolver.
// No need to check it twice
-
+
WebTab *tab = 0;
switch (type)
{