diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-04-27 01:05:20 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-04-27 01:05:20 +0200 |
| commit | 038facd4fcca60aa92fe29bbb47e9669029d0fe9 (patch) | |
| tree | 61b57a16e83c5a170799f9abfc6b667911966992 /src/urlbar | |
| parent | Fix opensearch add shortcut handling (diff) | |
| download | rekonq-038facd4fcca60aa92fe29bbb47e9669029d0fe9.tar.xz | |
Revert "Fix opensearch add shortcut handling"
This reverts commit d09b430f9835fd19f9a0088a5620af20bdf36b0e.
Diffstat (limited to 'src/urlbar')
| -rw-r--r-- | src/urlbar/urlbar.cpp | 3 | ||||
| -rw-r--r-- | src/urlbar/webshortcutwidget.cpp | 9 | ||||
| -rw-r--r-- | src/urlbar/webshortcutwidget.h | 14 |
3 files changed, 9 insertions, 17 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index 97a3c1c7..2b4b7bf0 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -134,7 +134,8 @@ UrlBar::UrlBar(QWidget *parent) connect(_tab->view(), SIGNAL(iconChanged()), this, SLOT(refreshFavicon())); // search icon - connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString)), this, SLOT(updateRightIcons())); + connect(rApp->opensearchManager(), SIGNAL(openSearchEngineAdded(QString,QString,QString)), + this, SLOT(updateRightIcons())); // bookmark icon connect(rApp->bookmarkManager(), SIGNAL(bookmarksUpdated()), this, SLOT(updateRightIcons())); diff --git a/src/urlbar/webshortcutwidget.cpp b/src/urlbar/webshortcutwidget.cpp index c6dc3b79..409d0b32 100644 --- a/src/urlbar/webshortcutwidget.cpp +++ b/src/urlbar/webshortcutwidget.cpp @@ -4,7 +4,6 @@ * * Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com> * Copyright (C) 2010-2011 by Lionel Chauvin <megabigbug@yahoo.fr> -* Copyright (C) 2012 by Andrea Diamantini <adjam7 at gmail dot com> * * * This program is free software; you can redistribute it and/or @@ -28,7 +27,7 @@ // Self Includes #include "webshortcutwidget.h" -#include "webshortcutwidget.moc" +#include "rekonq_defines.h" // KDE Includes #include <KGlobalSettings> @@ -114,8 +113,6 @@ void WebShortcutWidget::show(const KUrl &url, const QString &openSearchName, con void WebShortcutWidget::accept() { emit webShortcutSet(m_url, m_nameLineEdit->text(), m_wsLineEdit->text()); - - // close widget (and destroy it) close(); } @@ -161,3 +158,7 @@ void WebShortcutWidget::shortcutsChanged(const QString& newShorthands) } } } + +#include "webshortcutwidget.moc" + + diff --git a/src/urlbar/webshortcutwidget.h b/src/urlbar/webshortcutwidget.h index d1291714..bc072f47 100644 --- a/src/urlbar/webshortcutwidget.h +++ b/src/urlbar/webshortcutwidget.h @@ -4,7 +4,6 @@ * * Copyright (C) 2009 by Fredy Yanardi <fyanardi@gmail.com> * Copyright (C) 2010-2011 by Lionel Chauvin <megabigbug@yahoo.fr> -* Copyright (C) 2012 by Andrea Diamantini <adjam7 at gmail dot com> * * * This program is free software; you can redistribute it and/or @@ -29,24 +28,15 @@ #ifndef WEBSHORTCUTWIDGET_H #define WEBSHORTCUTWIDGET_H - -// Rekonq Includes -#include "rekonq_defines.h" - -// KDE Includes +#include <QMenu> #include <KUrl> #include <KService> -// Qt Includes -#include <QMenu> - -// Forward Declarations class QLabel; class QLineEdit; class QPushButton; - -class REKONQ_TESTS_EXPORT WebShortcutWidget : public QMenu +class WebShortcutWidget : public QMenu { Q_OBJECT public: |