(BIG commit) API change

I fixed rekonq API removing all slotName call switching to
a proper getter call (so, name() functions)

16 files changed, 158 insertions, 159 deletions

diff --git a/src/application.cpp b/src/application.cpp
index d29bcc78..1c0c42e3 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -190,7 +190,7 @@ void Application::postLaunch()
 }
 
 
-void Application::slotSaveConfiguration() const
+void Application::saveConfiguration() const
 {
     ReKonfig::self()->writeConfig();
 }
diff --git a/src/application.h b/src/application.h
index e5616d59..0f256a45 100644
--- a/src/application.h
+++ b/src/application.h
@@ -115,7 +115,7 @@ public slots:
      * Save application's configuration
      * @see ReKonfig::self()->writeConfig();
      */
-    void slotSaveConfiguration() const;
+    void saveConfiguration() const;
 
     MainWindow *newMainWindow();
 
diff --git a/src/findbar.cpp b/src/findbar.cpp
index f6c05702..09cc46f1 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -72,14 +72,14 @@ FindBar::FindBar(KMainWindow *mainwindow)
     // lineEdit, focusProxy
     setFocusProxy(m_lineEdit);
     m_lineEdit->setMaximumWidth(250);
-    connect(m_lineEdit, SIGNAL(textChanged(const QString &)), mainwindow, SLOT(slotFind(const QString &)));
+    connect(m_lineEdit, SIGNAL(textChanged(const QString &)), mainwindow, SLOT(find(const QString &)));
     layout->addWidget(m_lineEdit);
 
     // buttons
     KPushButton *findNext = new KPushButton(KIcon("go-down"), i18n("&Next"), this);
     KPushButton *findPrev = new KPushButton(KIcon("go-up"), i18n("&Previous"), this);
-    connect(findNext, SIGNAL(clicked()), mainwindow, SLOT(slotFindNext()));
-    connect(findPrev, SIGNAL(clicked()), mainwindow, SLOT(slotFindPrevious()));
+    connect(findNext, SIGNAL(clicked()), mainwindow, SLOT(findNext()));
+    connect(findPrev, SIGNAL(clicked()), mainwindow, SLOT(findPrevious()));
     layout->addWidget(findNext);
     layout->addWidget(findPrev);
 
diff --git a/src/homepage.cpp b/src/homepage.cpp
index 5c34bcd7..f3a987fe 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -26,7 +26,6 @@
 
 // Self Includes
 #include "homepage.h"
-#include "homepage.moc"
 
 // Auto Includes
 #include "rekonq.h"
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 10007140..608064fe 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -81,19 +81,19 @@ MainView::MainView(MainWindow *parent)
     m_loadingGitPath = KStandardDirs::locate("appdata" , "pics/loading.mng");
 
     // connecting tabbar signals
-    connect(m_tabBar, SIGNAL(closeTab(int)), this, SLOT(slotCloseTab(int)));
-    connect(m_tabBar, SIGNAL(mouseMiddleClick(int)), this, SLOT(slotCloseTab(int)));
+    connect(m_tabBar, SIGNAL(closeTab(int)), this, SLOT(closeTab(int)));
+    connect(m_tabBar, SIGNAL(mouseMiddleClick(int)), this, SLOT(closeTab(int)));
     connect(m_tabBar, SIGNAL(newTabRequest()), this, SLOT(newTab()));
     
-    connect(m_tabBar, SIGNAL(cloneTab(int)), this, SLOT(slotCloneTab(int)));
-    connect(m_tabBar, SIGNAL(closeOtherTabs(int)), this, SLOT(slotCloseOtherTabs(int)));
-    connect(m_tabBar, SIGNAL(reloadTab(int)), this, SLOT(slotReloadTab(int)));
-    connect(m_tabBar, SIGNAL(reloadAllTabs()), this, SLOT(slotReloadAllTabs()));
+    connect(m_tabBar, SIGNAL(cloneTab(int)), this, SLOT(cloneTab(int)));
+    connect(m_tabBar, SIGNAL(closeOtherTabs(int)), this, SLOT(closeOtherTabs(int)));
+    connect(m_tabBar, SIGNAL(reloadTab(int)), this, SLOT(reloadTab(int)));
+    connect(m_tabBar, SIGNAL(reloadAllTabs()), this, SLOT(reloadAllTabs()));
 
-    connect(m_tabBar, SIGNAL(tabCloseRequested(int)), this, SLOT(slotCloseTab(int)));
+    connect(m_tabBar, SIGNAL(tabCloseRequested(int)), this, SLOT(closeTab(int)));
     
     // current page index changing
-    connect(this, SIGNAL(currentChanged(int)), this, SLOT(slotCurrentChanged(int)));
+    connect(this, SIGNAL(currentChanged(int)), this, SLOT(currentChanged(int)));
     
     QTimer::singleShot(0, this, SLOT(postLaunch()));
 }
@@ -219,7 +219,7 @@ void MainView::updateTabBar()
 }
 
 
-void MainView::slotWebReload()
+void MainView::webReload()
 {
     WebView *webView = currentWebView();
     QAction *action = webView->page()->action(QWebPage::Reload);
@@ -227,7 +227,7 @@ void MainView::slotWebReload()
 }
 
 
-void MainView::slotWebStop()
+void MainView::webStop()
 {
     WebView *webView = currentWebView();
     QAction *action = webView->page()->action(QWebPage::Stop);
@@ -247,7 +247,7 @@ void MainView::clear()
 
 
 // When index is -1 index chooses the current tab
-void MainView::slotReloadTab(int index)
+void MainView::reloadTab(int index)
 {
     if (index < 0)
         index = currentIndex();
@@ -261,7 +261,7 @@ void MainView::slotReloadTab(int index)
 
 
 // this slot is called on tab switching
-void MainView::slotCurrentChanged(int index)
+void MainView::currentChanged(int index)
 {
     // retrieve the webview related to the index
     WebView *webView = this->webView(index);
@@ -277,8 +277,8 @@ void MainView::slotCurrentChanged(int index)
     if (oldWebView)
     {        
         // disconnecting webview from urlbar
-        disconnect(oldWebView, SIGNAL(loadProgress(int)), urlBar(), SLOT(slotUpdateProgress(int)));
-        disconnect(oldWebView, SIGNAL(loadFinished(bool)), urlBar(), SLOT(slotLoadFinished(bool)));
+        disconnect(oldWebView, SIGNAL(loadProgress(int)), urlBar(), SLOT(updateProgress(int)));
+        disconnect(oldWebView, SIGNAL(loadFinished(bool)), urlBar(), SLOT(loadFinished(bool)));
         disconnect(oldWebView, SIGNAL(urlChanged(const QUrl &)), urlBar(), SLOT(setUrl(const QUrl &)));
     
         // disconnecting webpage from mainview
@@ -289,8 +289,8 @@ void MainView::slotCurrentChanged(int index)
     }
 
     // connecting webview with urlbar
-    connect(webView, SIGNAL(loadProgress(int)), urlBar(), SLOT(slotUpdateProgress(int)));
-    connect(webView, SIGNAL(loadFinished(bool)), urlBar(), SLOT(slotLoadFinished(bool)));
+    connect(webView, SIGNAL(loadProgress(int)), urlBar(), SLOT(updateProgress(int)));
+    connect(webView, SIGNAL(loadFinished(bool)), urlBar(), SLOT(loadFinished(bool)));
     connect(webView, SIGNAL(urlChanged(const QUrl &)), urlBar(), SLOT(setUrl(const QUrl &)));
     
     connect(webView->page(), SIGNAL(statusBarMessage(const QString&)), 
@@ -384,7 +384,7 @@ void MainView::newTab()
 }
 
 
-void MainView::slotReloadAllTabs()
+void MainView::reloadAllTabs()
 {
     for (int i = 0; i < count(); ++i)
     {
@@ -411,7 +411,7 @@ void MainView::windowCloseRequested()
         }
         else
         {
-            slotCloseTab(index);
+            closeTab(index);
         }
         return;
     }
@@ -419,19 +419,19 @@ void MainView::windowCloseRequested()
 }
 
 
-void MainView::slotCloseOtherTabs(int index)
+void MainView::closeOtherTabs(int index)
 {
     if (-1 == index)
         return;
 
     for (int i = count() - 1; i > index; --i)
     {
-        slotCloseTab(i);
+        closeTab(i);
     }
 
     for (int i = index - 1; i >= 0; --i)
     {
-        slotCloseTab(i);
+        closeTab(i);
     }
 
     updateTabBar();
@@ -439,7 +439,7 @@ void MainView::slotCloseOtherTabs(int index)
 
 
 // When index is -1 index chooses the current tab
-void MainView::slotCloneTab(int index)
+void MainView::cloneTab(int index)
 {
     if (index < 0)
         index = currentIndex();
@@ -460,7 +460,7 @@ void MainView::slotCloneTab(int index)
 
 
 // When index is -1 index chooses the current tab
-void MainView::slotCloseTab(int index)
+void MainView::closeTab(int index)
 {
     // do nothing if just one tab is opened
     if (count() == 1)
@@ -575,7 +575,7 @@ void MainView::webViewIconChanged()
         label->setMovie(0);
         label->setPixmap(icon.pixmap(16, 16));
 
-        urlBar()->slotUpdateUrl();
+        urlBar()->updateUrl();
     }
 }
 
diff --git a/src/mainview.h b/src/mainview.h
index 3ddd9e24..9c8a24aa 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -121,20 +121,20 @@ public slots:
      */
     void newTab();
 
-    void slotCloneTab(int index = -1);
-    void slotCloseTab(int index = -1);
-    void slotCloseOtherTabs(int index);
-    void slotReloadTab(int index = -1);
-    void slotReloadAllTabs();
+    void cloneTab(int index = -1);
+    void closeTab(int index = -1);
+    void closeOtherTabs(int index);
+    void reloadTab(int index = -1);
+    void reloadAllTabs();
     void nextTab();
     void previousTab();
 
     // WEB slot actions
-    void slotWebReload();
-    void slotWebStop();
+    void webReload();
+    void webStop();
 
 private slots:
-    void slotCurrentChanged(int index);
+    void currentChanged(int index);
 
     void webViewLoadStarted();
     void webViewLoadFinished(bool ok);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4d9cc89d..40274987 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -108,7 +108,7 @@ MainWindow::MainWindow()
     setAutoSaveSettings();
 
     // updating rekonq configuration
-    slotUpdateConfiguration();
+    updateConfiguration();
 
     // creating a centralWidget containing panel, m_view and the hidden findbar
     QWidget *centralWidget = new QWidget;
@@ -206,7 +206,7 @@ void MainWindow::postLaunch()
     connect(m_view, SIGNAL(linkHovered(const QString&)), this, SLOT(notifyMessage(const QString&)));
 
     // --------- connect signals and slots
-    connect(m_view, SIGNAL(setCurrentTitle(const QString &)), this, SLOT(slotUpdateWindowTitle(const QString &)));
+    connect(m_view, SIGNAL(setCurrentTitle(const QString &)), this, SLOT(updateWindowTitle(const QString &)));
     connect(m_view, SIGNAL(printRequested(QWebFrame *)), this, SLOT(printRequested(QWebFrame *)));
 
     // (shift +) ctrl + tab switching 
@@ -214,14 +214,14 @@ void MainWindow::postLaunch()
     connect(this, SIGNAL(shiftCtrlTabPressed()), m_view, SLOT(previousTab()));
 
     // update toolbar actions signals
-    connect(m_view, SIGNAL(tabsChanged()), this, SLOT(slotUpdateActions()));
-    connect(m_view, SIGNAL(currentChanged(int)), this, SLOT(slotUpdateActions()));
+    connect(m_view, SIGNAL(tabsChanged()), this, SLOT(updateActions()));
+    connect(m_view, SIGNAL(currentChanged(int)), this, SLOT(updateActions()));
 
     // launch it manually. Just the first time...
-    slotUpdateActions();
+    updateActions();
     
     // Find Bar signal
-    connect(m_findBar, SIGNAL(searchString(const QString &)), this, SLOT(slotFind(const QString &)));
+    connect(m_findBar, SIGNAL(searchString(const QString &)), this, SLOT(find(const QString &)));
 
     // setting up toolbars to NOT have context menu enabled
     setContextMenuPolicy(Qt::DefaultContextMenu);
@@ -262,89 +262,89 @@ void MainWindow::setupActions()
     connect(a, SIGNAL(triggered(bool)), Application::instance(), SLOT(newMainWindow()));
 
     // Standard Actions
-    KStandardAction::open(this, SLOT(slotFileOpen()), actionCollection());
-    KStandardAction::saveAs(this, SLOT(slotFileSaveAs()), actionCollection());
+    KStandardAction::open(this, SLOT(fileOpen()), actionCollection());
+    KStandardAction::saveAs(this, SLOT(fileSaveAs()), actionCollection());
     KStandardAction::print(this, SLOT(printRequested()), actionCollection());
     KStandardAction::quit(this , SLOT(close()), actionCollection());
+
     KStandardAction::find(m_findBar, SLOT(show()) , actionCollection());
-    KStandardAction::findNext(this, SLOT(slotFindNext()) , actionCollection());
-    KStandardAction::findPrev(this, SLOT(slotFindPrevious()) , actionCollection());
+    KStandardAction::findNext(this, SLOT(findNext()) , actionCollection());
+    KStandardAction::findPrev(this, SLOT(findPrevious()) , actionCollection());
 
-    // we all like "short" shortcuts.. ;)
-    a = KStandardAction::fullScreen(this, SLOT(slotViewFullScreen(bool)), this, actionCollection());
+    a = KStandardAction::fullScreen(this, SLOT(viewFullScreen(bool)), this, actionCollection());
     QList<QKeySequence> shortcutFullScreenList;
     shortcutFullScreenList << KStandardShortcut::fullScreen() << QKeySequence( Qt::Key_F11 );
     a->setShortcuts( shortcutFullScreenList );
 
     KStandardAction::home(this, SLOT(homePage()), actionCollection());
-    KStandardAction::preferences(this, SLOT(slotPreferences()), actionCollection());
+    KStandardAction::preferences(this, SLOT(preferences()), actionCollection());
 
-    a = KStandardAction::redisplay(m_view, SLOT(slotWebReload()), actionCollection());
+    a = KStandardAction::redisplay(m_view, SLOT(webReload()), actionCollection());
     a->setText(i18n("Reload"));
 
     a = new KAction(KIcon("process-stop"), i18n("&Stop"), this);
     a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_Period));
     actionCollection()->addAction(QLatin1String("stop"), a);
-    connect(a, SIGNAL(triggered(bool)), m_view, SLOT(slotWebStop()));
+    connect(a, SIGNAL(triggered(bool)), m_view, SLOT(webStop()));
 
     // stop reload Action
     m_stopReloadAction = new KAction(this);
     actionCollection()->addAction(QLatin1String("stop_reload") , m_stopReloadAction);
     m_stopReloadAction->setShortcutConfigurable(false);
-    connect(m_view, SIGNAL(browserTabLoading(bool)), this, SLOT(slotBrowserLoading(bool)));
-    slotBrowserLoading(false); //first init for blank start page
+    connect(m_view, SIGNAL(browserTabLoading(bool)), this, SLOT(browserLoading(bool)));
+    browserLoading(false); //first init for blank start page
 
     a = new KAction(i18n("Open Location"), this);
     a->setShortcut(Qt::CTRL + Qt::Key_L);
     actionCollection()->addAction(QLatin1String("open_location"), a);
-    connect(a, SIGNAL(triggered(bool)) , this, SLOT(slotOpenLocation()));
+    connect(a, SIGNAL(triggered(bool)) , this, SLOT(openLocation()));
 
 
     // ============================= Zoom Actions ===================================
     a = new KAction(KIcon("zoom-in"), i18n("&Enlarge Font"), this);
     a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_Plus));
     actionCollection()->addAction(QLatin1String("bigger_font"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(slotViewTextBigger()));
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(viewTextBigger()));
 
     a = new KAction(KIcon("zoom-original"),  i18n("&Normal Font"), this);
     a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_0));
     actionCollection()->addAction(QLatin1String("normal_font"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(slotViewTextNormal()));
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(viewTextNormal()));
 
     a = new KAction(KIcon("zoom-out"),  i18n("&Shrink Font"), this);
     a->setShortcut(KShortcut(Qt::CTRL | Qt::Key_Minus));
     actionCollection()->addAction(QLatin1String("smaller_font"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(slotViewTextSmaller()));
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(viewTextSmaller()));
 
     // =============================== Tools Actions =================================
     a = new KAction(i18n("Page S&ource"), this);
     a->setIcon(KIcon("application-xhtml+xml"));
     actionCollection()->addAction(QLatin1String("page_source"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(slotViewPageSource()));
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(viewPageSource()));
 
     a = new KAction(KIcon("tools-report-bug"), i18n("Web &Inspector"), this);
     a->setCheckable(true);
     actionCollection()->addAction(QLatin1String("web_inspector"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(slotToggleInspector(bool)));
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(toggleInspector(bool)));
 
     a = new KAction(KIcon("view-media-artist"), i18n("Private &Browsing"), this);
     a->setCheckable(true);
     actionCollection()->addAction(QLatin1String("private_browsing"), a);
-    connect(a, SIGNAL(triggered(bool)), this, SLOT(slotPrivateBrowsing(bool)));
+    connect(a, SIGNAL(triggered(bool)), this, SLOT(privateBrowsing(bool)));
 
     a = new KAction(KIcon("edit-clear"), i18n("Clear Private Data..."), this);
     actionCollection()->addAction(QLatin1String("clear_private_data"), a);
     connect(a, SIGNAL(triggered(bool)), this, SLOT(clearPrivateData()));
 
     // ========================= History related actions ==============================
-    a = KStandardAction::back(this, SLOT(slotOpenPrevious()) , actionCollection());
+    a = KStandardAction::back(this, SLOT(openPrevious()) , actionCollection());
 
     m_historyBackMenu = new KMenu(this);
     a->setMenu(m_historyBackMenu);
-    connect(m_historyBackMenu, SIGNAL(aboutToShow()), this, SLOT(slotAboutToShowBackMenu()));
-    connect(m_historyBackMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotOpenActionUrl(QAction *)));
+    connect(m_historyBackMenu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowBackMenu()));
+    connect(m_historyBackMenu, SIGNAL(triggered(QAction *)), this, SLOT(openActionUrl(QAction *)));
 
-    KStandardAction::forward(this, SLOT(slotOpenNext()) , actionCollection());
+    KStandardAction::forward(this, SLOT(openNext()) , actionCollection());
 
     // ============================== General Tab Actions ====================================
     a = new KAction(KIcon("tab-new"), i18n("New &Tab"), this);
@@ -354,7 +354,7 @@ void MainWindow::setupActions()
 
     a = new KAction(KIcon("view-refresh"), i18n("Reload All Tabs"), this);
     actionCollection()->addAction( QLatin1String("reload_all_tabs"), a);
-    connect(a, SIGNAL(triggered(bool)), m_view, SLOT(slotReloadAllTabs()) );
+    connect(a, SIGNAL(triggered(bool)), m_view, SLOT(reloadAllTabs()) );
 
     a = new KAction(i18n("Show Next Tab"), this);
     a->setShortcuts(QApplication::isRightToLeft() ? KStandardShortcut::tabPrev() : KStandardShortcut::tabNext());
@@ -447,7 +447,7 @@ void MainWindow::setupSidePanel()
     // Setup history side panel
     m_sidePanel = new SidePanel(i18n("History Panel"), this);
     connect(m_sidePanel, SIGNAL(openUrl(const KUrl&)), Application::instance(), SLOT(loadUrl(const KUrl&)));
-    connect(m_sidePanel, SIGNAL(destroyed()), Application::instance(), SLOT(slotSaveConfiguration()));
+    connect(m_sidePanel, SIGNAL(destroyed()), Application::instance(), SLOT(saveConfiguration()));
 
     addDockWidget(Qt::LeftDockWidgetArea, m_sidePanel);
 
@@ -459,7 +459,7 @@ void MainWindow::setupSidePanel()
 }
 
 
-void MainWindow::slotUpdateConfiguration()
+void MainWindow::updateConfiguration()
 {
     // ============== General ==================
     kDebug() << "update conf";
@@ -512,21 +512,21 @@ void MainWindow::slotUpdateConfiguration()
 }
 
 
-void MainWindow::slotUpdateBrowser()
+void MainWindow::updateBrowser()
 {
-    slotUpdateConfiguration();
-    mainView()->slotReloadAllTabs();
+    updateConfiguration();
+    mainView()->reloadAllTabs();
 }
 
 
-void MainWindow::slotOpenLocation()
+void MainWindow::openLocation()
 {
     m_view->urlBar()->selectAll();
     m_view->urlBar()->setFocus();
 }
 
 
-void MainWindow::slotFileSaveAs()
+void MainWindow::fileSaveAs()
 {
     KUrl srcUrl = currentTab()->url();
 
@@ -544,7 +544,7 @@ void MainWindow::slotFileSaveAs()
 }
 
 
-void MainWindow::slotPreferences()
+void MainWindow::preferences()
 {
     // an instance the dialog could be already created and could be cached,
     // in which case you want to display the cached dialog
@@ -555,14 +555,14 @@ void MainWindow::slotPreferences()
     QPointer<SettingsDialog> s = new SettingsDialog(this);
 
     // keep us informed when the user changes settings
-    connect(s, SIGNAL(settingsChanged(const QString&)), this, SLOT(slotUpdateBrowser()));
+    connect(s, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateBrowser()));
 
     s->exec();
     delete s;
 }
 
 
-void MainWindow::slotUpdateActions()
+void MainWindow::updateActions()
 {
     QAction *historyBackAction = actionByName(KStandardAction::name(KStandardAction::Back));
     historyBackAction->setEnabled(currentTab()->history()->canGoBack());
@@ -572,7 +572,7 @@ void MainWindow::slotUpdateActions()
 }
 
 
-void MainWindow::slotUpdateWindowTitle(const QString &title)
+void MainWindow::updateWindowTitle(const QString &title)
 {
     if (title.isEmpty())
     {
@@ -585,7 +585,7 @@ void MainWindow::slotUpdateWindowTitle(const QString &title)
 }
 
 
-void MainWindow::slotFileOpen()
+void MainWindow::fileOpen()
 {
     QString filePath = KFileDialog::getOpenFileName(KUrl(),
                        i18n("*.html *.htm *.svg *.png *.gif *.svgz|Web Resources (*.html *.htm *.svg *.png *.gif *.svgz)\n" 
@@ -624,7 +624,7 @@ void MainWindow::printRequested(QWebFrame *frame)
 }
 
 
-void MainWindow::slotPrivateBrowsing(bool enable)
+void MainWindow::privateBrowsing(bool enable)
 {
     QWebSettings *settings = QWebSettings::globalSettings();
     if (enable && !settings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
@@ -657,21 +657,21 @@ void MainWindow::slotPrivateBrowsing(bool enable)
 
         m_lastSearch.clear();
         m_view->clear();
-        m_view->slotReloadAllTabs();
+        m_view->reloadAllTabs();
     }
 }
 
 
-void MainWindow::slotFind(const QString & search)
+void MainWindow::find(const QString & search)
 {
     if (!currentTab())
         return;
     m_lastSearch = search;
-    slotFindNext();
+    findNext();
 }
 
 
-void MainWindow::slotFindNext()
+void MainWindow::findNext()
 {
     if (!currentTab() && m_lastSearch.isEmpty())
         return;
@@ -684,7 +684,7 @@ void MainWindow::slotFindNext()
 }
 
 
-void MainWindow::slotFindPrevious()
+void MainWindow::findPrevious()
 {
     if (!currentTab() && m_lastSearch.isEmpty())
         return;
@@ -697,7 +697,7 @@ void MainWindow::slotFindPrevious()
 }
 
 
-void MainWindow::slotViewTextBigger()
+void MainWindow::viewTextBigger()
 {
     if (!currentTab())
         return;
@@ -705,7 +705,7 @@ void MainWindow::slotViewTextBigger()
 }
 
 
-void MainWindow::slotViewTextNormal()
+void MainWindow::viewTextNormal()
 {
     if (!currentTab())
         return;
@@ -713,7 +713,7 @@ void MainWindow::slotViewTextNormal()
 }
 
 
-void MainWindow::slotViewTextSmaller()
+void MainWindow::viewTextSmaller()
 {
     if (!currentTab())
         return;
@@ -721,7 +721,7 @@ void MainWindow::slotViewTextSmaller()
 }
 
 
-void MainWindow::slotViewFullScreen(bool makeFullScreen)
+void MainWindow::viewFullScreen(bool makeFullScreen)
 {
     // state flags
     static bool bookmarksToolBarFlag;
@@ -755,7 +755,7 @@ void MainWindow::slotViewFullScreen(bool makeFullScreen)
 }
 
 
-void MainWindow::slotViewPageSource()
+void MainWindow::viewPageSource()
 {
     if (!currentTab())
         return;
@@ -789,7 +789,7 @@ void MainWindow::homePage()
 }
 
 
-void MainWindow::slotToggleInspector(bool enable)
+void MainWindow::toggleInspector(bool enable)
 {
     QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, enable);
     if (enable)
@@ -802,7 +802,7 @@ void MainWindow::slotToggleInspector(bool enable)
 
         if (result == KMessageBox::Yes)
         {
-            m_view->slotReloadAllTabs();
+            m_view->reloadAllTabs();
         }
     }
 }
@@ -821,7 +821,7 @@ WebView *MainWindow::currentTab() const
 }
 
 
-void MainWindow::slotBrowserLoading(bool v)
+void MainWindow::browserLoading(bool v)
 {
     QAction *stop = actionCollection()->action("stop");
     QAction *reload = actionCollection()->action("view_redisplay");
@@ -845,7 +845,7 @@ void MainWindow::slotBrowserLoading(bool v)
 }
 
 
-void MainWindow::slotOpenPrevious()
+void MainWindow::openPrevious()
 {
     QWebHistory *history = currentTab()->history();
     if (history->canGoBack())
@@ -853,7 +853,7 @@ void MainWindow::slotOpenPrevious()
 }
 
 
-void MainWindow::slotOpenNext()
+void MainWindow::openNext()
 {
     QWebHistory *history = currentTab()->history();
     if (history->canGoForward())
@@ -887,7 +887,7 @@ bool MainWindow::queryClose()
             break;
         case KMessageBox::No:
             // Close only the current tab
-            m_view->slotCloseTab();
+            m_view->closeTab();
         default:
             return false;
         }
@@ -923,7 +923,7 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
     // close current tab action
     if ((event->modifiers() == Qt::ControlModifier) && event->key() == Qt::Key_W)
     {
-        m_view->slotCloseTab(m_view->currentIndex());
+        m_view->closeTab(m_view->currentIndex());
         return;
     }
     
@@ -1064,7 +1064,7 @@ void MainWindow::clearPrivateData()
 }
 
 
-void MainWindow::slotAboutToShowBackMenu()
+void MainWindow::aboutToShowBackMenu()
 {
     m_historyBackMenu->clear();
     if (!currentTab())
@@ -1091,7 +1091,7 @@ void MainWindow::slotAboutToShowBackMenu()
 }
 
 
-void MainWindow::slotOpenActionUrl(QAction *action)
+void MainWindow::openActionUrl(QAction *action)
 {
     int offset = action->data().toInt();
     kDebug() << "Offset: " << offset;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 02302aca..08a99b24 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -82,7 +82,7 @@ private:
     SidePanel *sidePanel();
 
 public slots:
-    void slotUpdateBrowser();
+    void updateBrowser();
     void homePage();
 
     /**
@@ -115,45 +115,45 @@ protected:
 
 private slots:
     void postLaunch();
-    void slotUpdateConfiguration();
-    void slotBrowserLoading(bool);
-    void slotUpdateActions();
-    void slotUpdateWindowTitle(const QString &title = QString());
+    void updateConfiguration();
+    void browserLoading(bool);
+    void updateActions();
+    void updateWindowTitle(const QString &title = QString());
 
     // history related
-    void slotOpenPrevious();
-    void slotOpenNext();
+    void openPrevious();
+    void openNext();
 
     // Find Action slots
-    void slotFind(const QString &);
-    void slotFindNext();
-    void slotFindPrevious();
+    void find(const QString &);
+    void findNext();
+    void findPrevious();
 
     // Zoom slots
-    void slotViewTextBigger();
-    void slotViewTextNormal();
-    void slotViewTextSmaller();
+    void viewTextBigger();
+    void viewTextNormal();
+    void viewTextSmaller();
 
     // File Menu slots
-    void slotOpenLocation();
-    void slotFileOpen();
-    void slotFileSaveAs();
+    void openLocation();
+    void fileOpen();
+    void fileSaveAs();
 
-    void slotViewPageSource();
-    void slotViewFullScreen(bool enable);
+    void viewPageSource();
+    void viewFullScreen(bool enable);
 
     // Tools Menu slots
-    void slotToggleInspector(bool enable);
-    void slotPrivateBrowsing(bool enable);
+    void toggleInspector(bool enable);
+    void privateBrowsing(bool enable);
 
     // Settings Menu slot
-    void slotPreferences();
+    void preferences();
 
     // clear private data
     void clearPrivateData();
 
-    void slotAboutToShowBackMenu();
-    void slotOpenActionUrl(QAction *action);
+    void aboutToShowBackMenu();
+    void openActionUrl(QAction *action);
 
 private:
     MainView *m_view;
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 96d79d42..4ef1c4dd 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -73,8 +73,8 @@ TabBar::TabBar(MainView *parent)
 
     setContextMenuPolicy(Qt::CustomContextMenu);
 
-    connect(this, SIGNAL(contextMenu(int, const QPoint &)), this, SLOT(slotContextMenuRequested(int, const QPoint &)));
-    connect(this, SIGNAL(emptyAreaContextMenu(const QPoint &)), this, SLOT(slotEmptyAreaContextMenu(const QPoint &)));
+    connect(this, SIGNAL(contextMenu(int, const QPoint &)), this, SLOT(contextMenu(int, const QPoint &)));
+    connect(this, SIGNAL(emptyAreaContextMenu(const QPoint &)), this, SLOT(emptyAreaContextMenu(const QPoint &)));
 }
 
 
@@ -236,7 +236,7 @@ void TabBar::mousePressEvent(QMouseEvent *event)
 }
 
 
-void TabBar::slotContextMenuRequested(int tab, const QPoint &pos)
+void TabBar::contextMenu(int tab, const QPoint &pos)
 {
     m_actualIndex = tab;
 
@@ -256,7 +256,7 @@ void TabBar::slotContextMenuRequested(int tab, const QPoint &pos)
 }
 
 
-void TabBar::slotEmptyAreaContextMenu(const QPoint &pos)
+void TabBar::emptyAreaContextMenu(const QPoint &pos)
 {
     KMenu menu;
     MainWindow *mainWindow = Application::instance()->mainWindow();
diff --git a/src/tabbar.h b/src/tabbar.h
index e70c7914..b78e9b24 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -87,8 +87,8 @@ private slots:
     void closeOtherTabs();
     void reloadTab();
 
-    void slotContextMenuRequested(int, const QPoint &);
-    void slotEmptyAreaContextMenu(const QPoint &);
+    void contextMenu(int, const QPoint &);
+    void emptyAreaContextMenu(const QPoint &);
 
 private:
     friend class MainView;
diff --git a/src/urlbar.cpp b/src/urlbar.cpp
index 81185409..68e3182f 100644
--- a/src/urlbar.cpp
+++ b/src/urlbar.cpp
@@ -69,10 +69,10 @@ UrlBar::UrlBar(QWidget *parent)
     setupLineEdit();
 
     // add every item to history
-    connect(this, SIGNAL(returnPressed(const QString&)), SLOT(slotActivated(const QString&)));
-    connect(completionBox(), SIGNAL(activated(const QString&)), SLOT(slotActivated(const QString&)));
+    connect(this, SIGNAL(returnPressed(const QString&)), SLOT(activated(const QString&)));
+    connect(completionBox(), SIGNAL(activated(const QString&)), SLOT(activated(const QString&)));
 
-    connect(this, SIGNAL(cleared()), SLOT(slotCleared()));
+    connect(this, SIGNAL(cleared()), SLOT(cleared()));
 
     // setup completion box
     setCompletionObject( Application::historyManager()->completionObject() );
@@ -144,7 +144,7 @@ void UrlBar::setUrl(const QUrl& url)
     else
         m_currentUrl = url;
 
-    slotUpdateUrl();
+    updateUrl();
 }
 
 
@@ -155,7 +155,7 @@ void UrlBar::setProgress(int progress)
 }
 
 
-void UrlBar::slotUpdateUrl()
+void UrlBar::updateUrl()
 {
     // Don't change my typed url...
     // FIXME this is not a proper solution (also if it works...)
@@ -190,7 +190,7 @@ void UrlBar::slotUpdateUrl()
 }
 
 
-void UrlBar::slotActivated(const QString& url)
+void UrlBar::activated(const QString& url)
 {
     if (url.isEmpty())
         return;
@@ -203,7 +203,7 @@ void UrlBar::slotActivated(const QString& url)
 }
 
 
-void UrlBar::slotCleared()
+void UrlBar::cleared()
 {
     // clear the history on user's request from context menu
     clear();
@@ -211,7 +211,7 @@ void UrlBar::slotCleared()
 }
 
 
-void UrlBar::slotLoadFinished(bool)
+void UrlBar::loadFinished(bool)
 {
     // reset progress bar after small delay
     m_progress = 0;
@@ -219,7 +219,7 @@ void UrlBar::slotLoadFinished(bool)
 }
 
 
-void UrlBar::slotUpdateProgress(int progress)
+void UrlBar::updateProgress(int progress)
 {
     m_progress = progress;
     repaint();
diff --git a/src/urlbar.h b/src/urlbar.h
index 787032fb..6d8422d6 100644
--- a/src/urlbar.h
+++ b/src/urlbar.h
@@ -69,13 +69,13 @@ signals:
 
 public slots:
     void setUrl(const QUrl &url);
-    void slotUpdateProgress(int progress);
-    void slotUpdateUrl();
+    void updateProgress(int progress);
+    void updateUrl();
     
 private slots:
-    void slotActivated(const QString&);
-    void slotLoadFinished(bool);
-    void slotCleared();
+    void activated(const QString& url);
+    void loadFinished(bool);
+    void cleared();
 
 protected:
     virtual void paintEvent(QPaintEvent *event);
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 54b28e74..cc003bfb 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -78,8 +78,8 @@ WebPage::WebPage(QObject *parent)
     setNetworkAccessManager(Application::networkAccessManager());
     connect(networkAccessManager(), SIGNAL(finished(QNetworkReply*)), this, SLOT(manageNetworkErrors(QNetworkReply*)));
     
-    connect(this, SIGNAL(downloadRequested(const QNetworkRequest &)), this, SLOT(slotDownloadRequested(const QNetworkRequest &)));
-    connect(this, SIGNAL(unsupportedContent(QNetworkReply *)), this, SLOT(slotHandleUnsupportedContent(QNetworkReply *)));
+    connect(this, SIGNAL(downloadRequested(const QNetworkRequest &)), this, SLOT(downloadRequested(const QNetworkRequest &)));
+    connect(this, SIGNAL(unsupportedContent(QNetworkReply *)), this, SLOT(handleUnsupportedContent(QNetworkReply *)));
 }
 
 
@@ -155,7 +155,7 @@ WebPage *WebPage::newWindow(WebWindowType type)
 }
 
 
-void WebPage::slotHandleUnsupportedContent(QNetworkReply *reply)
+void WebPage::handleUnsupportedContent(QNetworkReply *reply)
 {
     if (reply->error() == QNetworkReply::NoError)
     {
@@ -166,14 +166,14 @@ void WebPage::slotHandleUnsupportedContent(QNetworkReply *reply)
 
         if( offer.isNull() ) // no service can handle this. We can just download it..
         {
-            slotDownloadRequested(reply->request());
+            downloadRequested(reply->request());
         }
         else
         {
             switch ( KParts::BrowserRun::askSave( url, offer, mimetype, filename ) )
             {
                 case KParts::BrowserRun::Save:
-                    slotDownloadRequested(reply->request());
+                    downloadRequested(reply->request());
                     return;
                 case KParts::BrowserRun::Cancel:
                     return;
@@ -263,7 +263,7 @@ QString WebPage::errorPage(QNetworkReply *reply)
 
 
 // TODO FIXME: sometimes url.fileName() fails to retrieve url file name
-void WebPage::slotDownloadRequested(const QNetworkRequest &request)
+void WebPage::downloadRequested(const QNetworkRequest &request)
 {
     const KUrl url(request.url());
 
diff --git a/src/webpage.h b/src/webpage.h
index 0d9868b9..45fc0c51 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -64,8 +64,8 @@ protected:
     virtual QString userAgentForUrl(const QUrl& url) const;
     
 protected Q_SLOTS:    
-    virtual void slotHandleUnsupportedContent(QNetworkReply *reply);
-    virtual void slotDownloadRequested(const QNetworkRequest &request);
+    virtual void handleUnsupportedContent(QNetworkReply *reply);
+    virtual void downloadRequested(const QNetworkRequest &request);
 
 private:
     friend class WebView;
diff --git a/src/webview.cpp b/src/webview.cpp
index 705a3aa7..b8634410 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -63,8 +63,8 @@ WebView::WebView(QWidget* parent)
     setPage(m_page);
     
     connect(page(), SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&)));
-    connect(this, SIGNAL(loadProgress(int)), this, SLOT(slotUpdateProgress(int)));
-    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool)));
+    connect(this, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int)));
+    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
 }
 
 
@@ -200,7 +200,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
                     a = new KAction(service->name(), this);
                     a->setIcon(Application::icon(KUrl(data.uri())));
                     a->setData(searchProviderPrefix);
-                    connect(a, SIGNAL(triggered(bool)), this, SLOT(slotSearch()));
+                    connect(a, SIGNAL(triggered(bool)), this, SLOT(search()));
                     searchMenu->addAction(a);
                 }
             }
@@ -399,7 +399,7 @@ void WebView::wheelEvent(QWheelEvent *event)
 }
 
 
-void WebView::slotSearch()
+void WebView::search()
 {
     KAction *a = qobject_cast<KAction*>(sender());
     QString search = a->data().toString() + selectedText();
@@ -408,13 +408,13 @@ void WebView::slotSearch()
 }
 
 
-void WebView::slotUpdateProgress(int p)
+void WebView::updateProgress(int p)
 {
     m_progress = p;
 }
 
 
-void WebView::slotLoadFinished(bool)
+void WebView::loadFinished(bool)
 {
     m_progress = 0;
 }
diff --git a/src/webview.h b/src/webview.h
index 03ceb739..e860b8c8 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -62,9 +62,9 @@ protected:
     
 private slots:
     void setStatusBarText(const QString &string);
-    void slotSearch();
-    void slotUpdateProgress(int progress);
-    void slotLoadFinished(bool);
+    void search();
+    void updateProgress(int progress);
+    void loadFinished(bool);
 
     void printFrame();