diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-02-16 19:23:13 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-02-16 19:23:13 +0100 |
| commit | 739df1fcbcae90a4b15ec9c411514b547062905a (patch) | |
| tree | 8f070c3fbd584528fc03753f2f1a10358db8dbb3 /src/bookmarks | |
| parent | Update RELEASE_HOWTO file (diff) | |
| parent | Krazy fixes (diff) | |
| download | rekonq-739df1fcbcae90a4b15ec9c411514b547062905a.tar.xz | |
Merge branch 'Branches.0.9'
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/bookmarkmanager.cpp | 6 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkstoolbar.cpp | 2 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkstreemodel.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bookmarks/bookmarkmanager.cpp b/src/bookmarks/bookmarkmanager.cpp index 43f4dd3a..165966d2 100644 --- a/src/bookmarks/bookmarkmanager.cpp +++ b/src/bookmarks/bookmarkmanager.cpp @@ -69,12 +69,12 @@ BookmarkManager::BookmarkManager(QObject *parent) delete tempManager; } - connect(m_manager, SIGNAL(changed(QString, QString)), this, SLOT(slotBookmarksChanged())); + connect(m_manager, SIGNAL(changed(QString,QString)), this, SLOT(slotBookmarksChanged())); // setup menu m_owner = new BookmarkOwner(m_manager, this); - connect(m_owner, SIGNAL(openUrl(KUrl, Rekonq::OpenType)), - this, SIGNAL(openUrl(KUrl, Rekonq::OpenType))); + connect(m_owner, SIGNAL(openUrl(KUrl,Rekonq::OpenType)), + this, SIGNAL(openUrl(KUrl,Rekonq::OpenType))); KAction *a = KStandardAction::addBookmark(m_owner, SLOT(bookmarkCurrentPage()), this); m_actionCollection->addAction(QL1S("rekonq_add_bookmark"), a); diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 9a94f938..8dbda960 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -164,7 +164,7 @@ BookmarkToolBar::BookmarkToolBar(KToolBar *toolBar, QObject *parent) { toolBar->setContextMenuPolicy(Qt::CustomContextMenu); connect(toolBar, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint))); - connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString, QString)), this, SLOT(hideMenu())); + connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString,QString)), this, SLOT(hideMenu())); toolBar->setAcceptDrops(true); toolBar->installEventFilter(this); toolBar->setShortcutEnabled(false); diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp index 4121a6ee..534e9698 100644 --- a/src/bookmarks/bookmarkstreemodel.cpp +++ b/src/bookmarks/bookmarkstreemodel.cpp @@ -167,7 +167,7 @@ BookmarksTreeModel::BookmarksTreeModel(QObject *parent) , m_root(0) { resetModel(); - connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString, QString)), + connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString,QString)), this, SLOT(bookmarksChanged(QString))); } |