From 36b5ff88b15d8793c64ad1a361ea0c28f9cbe169 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 23 Jul 2012 17:56:30 +0200 Subject: Coding style --- src/tabmain.cpp | 24 ++++++++++++------------ src/tabwindow/tabbar.cpp | 10 +++++----- src/tabwindow/tabbar.h | 4 ++-- src/tabwindow/tabwindow.cpp | 20 ++++++++++---------- src/tabwindow/tabwindow.h | 6 +++--- src/webwindow/webwindow.cpp | 12 ++++++------ src/webwindow/webwindow.h | 4 ++-- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/tabmain.cpp b/src/tabmain.cpp index 7eb229dd..e64be12b 100644 --- a/src/tabmain.cpp +++ b/src/tabmain.cpp @@ -34,19 +34,19 @@ static const char description[] = I18N_NOOP("A lightweight Web Browser for KDE based on WebKit"); - + extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { KAboutData about("rekonq", - 0, - ki18n("rekonq"), - REKONQ_VERSION, - ki18n(description), - KAboutData::License_GPL_V3, - ki18n("(C) 2008-2012 Andrea Diamantini"), - KLocalizedString(), - "http://rekonq.kde.org" - ); + 0, + ki18n("rekonq"), + REKONQ_VERSION, + ki18n(description), + KAboutData::License_GPL_V3, + ki18n("(C) 2008-2012 Andrea Diamantini"), + KLocalizedString(), + "http://rekonq.kde.org" + ); // Initialize command line args KCmdLineArgs::init(argc, argv, &about); @@ -63,9 +63,9 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KApplication app; QWebSettings::setIconDatabasePath("/tmp/iconcache"); - + TabWindow *w = new TabWindow; - + // no session.. just start up normally KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); if (args->count() == 0) diff --git a/src/tabwindow/tabbar.cpp b/src/tabwindow/tabbar.cpp index 06b90897..bcb39b10 100644 --- a/src/tabwindow/tabbar.cpp +++ b/src/tabwindow/tabbar.cpp @@ -38,7 +38,7 @@ TabBar::TabBar(QWidget *parent) setTabsClosable(true); setMovable(true); setAcceptDrops(true); - + // avoid ambiguos shortcuts. See BUG:275858 KAcceleratorManager::setNoAccel(this); @@ -144,9 +144,9 @@ void TabBar::reopenLastClosedTab() void TabBar::contextMenu(int tab, const QPoint &pos) { TabWindow *w = qobject_cast(parent()); - + KAction *a; - + KMenu menu; a = new KAction(KIcon("tab-new"), i18n("New &Tab"), this); @@ -187,7 +187,7 @@ void TabBar::contextMenu(int tab, const QPoint &pos) a->setData(tab); menu.addAction(a); } - + menu.addSeparator(); @@ -206,7 +206,7 @@ void TabBar::contextMenu(int tab, const QPoint &pos) a = new KAction(KIcon("bookmark-new"), i18n("Bookmark"), this); menu.addAction(a); } - + menu.exec(pos); } diff --git a/src/tabwindow/tabbar.h b/src/tabwindow/tabbar.h index e3bf6d9a..9de5fe0a 100644 --- a/src/tabwindow/tabbar.h +++ b/src/tabwindow/tabbar.h @@ -34,7 +34,7 @@ public: TabBar(QWidget *parent); static const int genericTabNumber = 6; - + protected: virtual QSize tabSizeHint(int index) const; @@ -45,7 +45,7 @@ Q_SIGNALS: void reloadTab(int); void detachTab(int); void restoreClosedTab(int); - + private Q_SLOTS: void cloneTab(); void closeTab(); diff --git a/src/tabwindow/tabwindow.cpp b/src/tabwindow/tabwindow.cpp index 4a9a8abf..772fe3e2 100644 --- a/src/tabwindow/tabwindow.cpp +++ b/src/tabwindow/tabwindow.cpp @@ -84,13 +84,13 @@ TabWindow::TabWindow(QWidget *parent) connect(_addTabButton, SIGNAL(triggered(QAction *)), this, SLOT(newCleanTab())); connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentChanged(int))); - + // FIXME: Manage sizes... kDebug() << "SIZE: " << size(); kDebug() << "SIZE HINT: " << sizeHint(); resize(sizeHint()); - + } @@ -135,7 +135,7 @@ WebWindow *TabWindow::prepareNewTab(WebPage *page) tab = new WebWindow(page, this); else tab = new WebWindow(this); - + connect(tab, SIGNAL(titleChanged(QString)), this, SLOT(tabTitleChanged(QString))); connect(tab, SIGNAL(loadStarted()), this, SLOT(tabLoadStarted())); @@ -157,12 +157,12 @@ void TabWindow::loadUrlInNewTab(const QUrl &url, TabHistory *history) tab->load(url); setCurrentWidget(tab); - + if (history) { history->applyHistory(tab->page()->history()); } - + updateTabBar(); } @@ -227,7 +227,7 @@ void TabWindow::updateTabBar() _addTabButton->move(tabBarWidth, 0); _addTabButton->show(); - } + } } @@ -295,13 +295,13 @@ void TabWindow::tabLoadProgress(int p) void TabWindow::tabLoadFinished(bool ok) { Q_UNUSED(ok); - + WebWindow *tab = qobject_cast(sender()); if (!tab) return; int index = indexOf(tab); - + if (-1 != index) { QLabel *label = qobject_cast(tabBar()->tabButton(index, QTabBar::LeftSide)); @@ -326,7 +326,7 @@ void TabWindow::cloneTab(int index) QUrl u = webWindow(index)->url(); QWebHistory* history = webWindow(index)->page()->history(); TabHistory tHistory(history); - + loadUrlInNewTab(u, &tHistory); } @@ -366,7 +366,7 @@ void TabWindow::closeTab(int index, bool del) m_recentlyClosedTabs.removeLast(); m_recentlyClosedTabs.prepend(history); } - + removeTab(index); updateTabBar(); // UI operation: do it ASAP!! diff --git a/src/tabwindow/tabwindow.h b/src/tabwindow/tabwindow.h index 147fac40..65746fe7 100644 --- a/src/tabwindow/tabwindow.h +++ b/src/tabwindow/tabwindow.h @@ -50,7 +50,7 @@ public: WebWindow* webWindow(int index) const; TabBar* tabBar() const; - + public Q_SLOTS: void loadUrlInNewTab(const QUrl &, TabHistory *history = 0); void newCleanTab(); @@ -65,7 +65,7 @@ private: * Prepares the new WebWindow to be open */ WebWindow *prepareNewTab(WebPage *page = 0); - + private Q_SLOTS: void tabTitleChanged(const QString &); @@ -84,7 +84,7 @@ private Q_SLOTS: void reloadTab(int index = -1); void reloadAllTabs(); void restoreClosedTab(int i); - + protected: virtual void resizeEvent(QResizeEvent *); diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp index 4351f331..631c9a2c 100644 --- a/src/webwindow/webwindow.cpp +++ b/src/webwindow/webwindow.cpp @@ -36,7 +36,7 @@ WebWindow::WebWindow(QWidget *parent) { WebPage *p = new WebPage(_view); _view->setPage(p); - + // layout QVBoxLayout *l = new QVBoxLayout; l->addWidget(_edit); @@ -44,7 +44,7 @@ WebWindow::WebWindow(QWidget *parent) l->setContentsMargins(0, 0, 0, 0); setLayout(l); - setContentsMargins(0,0,0,0); + setContentsMargins(0, 0, 0, 0); // line edit signals connect(_edit, SIGNAL(returnPressed()), this, SLOT(checkLoadUrl())); @@ -72,7 +72,7 @@ WebWindow::WebWindow(WebPage *page, QWidget *parent) { _view->setPage(page); page->setParent(_view); - + // layout QVBoxLayout *l = new QVBoxLayout; l->addWidget(_edit); @@ -80,7 +80,7 @@ WebWindow::WebWindow(WebPage *page, QWidget *parent) l->setContentsMargins(0, 0, 0, 0); setLayout(l); - setContentsMargins(0,0,0,0); + setContentsMargins(0, 0, 0, 0); // line edit signals connect(_edit, SIGNAL(returnPressed()), this, SLOT(checkLoadUrl())); @@ -98,7 +98,7 @@ WebWindow::WebWindow(WebPage *page, QWidget *parent) // page signals connect(page, SIGNAL(pageCreated(WebPage *)), this, SIGNAL(pageCreated(WebPage *))); - + } @@ -112,7 +112,7 @@ WebPage *WebWindow::page() { if (!_view) return 0; - + WebPage *p = qobject_cast(_view->page()); return p; } diff --git a/src/webwindow/webwindow.h b/src/webwindow/webwindow.h index e5f68567..7d72ed34 100644 --- a/src/webwindow/webwindow.h +++ b/src/webwindow/webwindow.h @@ -43,7 +43,7 @@ public: void load(const QUrl &); WebPage *page(); - + QUrl url() const; QString title() const; QIcon icon() const; @@ -60,7 +60,7 @@ Q_SIGNALS: void loadFinished(bool); void pageCreated(WebPage *); - + private: QWebView *_view; QLineEdit *_edit; -- cgit v1.2.1