┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/bookmarkssidebarpage.cpp
diff options
context:
space:
mode:
authorLaurent Montel <[email protected]>2006-11-22 08:22:45 +0000
committerLaurent Montel <[email protected]>2006-11-22 08:22:45 +0000
commit20b58b6c03f6fa56d0cc1da90c13658664c153f1 (patch)
tree1ac95537c3d0c6f35e5ca9dbbf7fe9c90e14a3b7 /src/bookmarkssidebarpage.cpp
parent6987f297e6e275a1f46aa0f33919e86684c9ed8b (diff)
Some port
Remove not necessary file svn path=/trunk/playground/utils/dolphin/; revision=606884
Diffstat (limited to 'src/bookmarkssidebarpage.cpp')
-rw-r--r--src/bookmarkssidebarpage.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp
index deb311914..1fc35048f 100644
--- a/src/bookmarkssidebarpage.cpp
+++ b/src/bookmarkssidebarpage.cpp
@@ -79,8 +79,8 @@ void BookmarksSidebarPage::updateBookmarks()
KBookmark bookmark = root.first();
while (!bookmark.isNull()) {
QPixmap icon(iconLoader.loadIcon(bookmark.icon(),
- KIcon::NoGroup,
- KIcon::SizeMedium));
+ K3Icon::NoGroup,
+ K3Icon::SizeMedium));
BookmarkItem* item = new BookmarkItem(icon, bookmark.text());
m_bookmarksList->insertItem(item);
@@ -128,7 +128,7 @@ void BookmarksSidebarPage::slotContextMenuRequested(Q3ListBoxItem* item,
case insertID: {
KBookmark newBookmark = EditBookmarkDialog::getBookmark(i18n("Insert Bookmark"),
"New bookmark",
- KURL(),
+ KUrl(),
"bookmark");
if (!newBookmark.isNull()) {
root.addBookmark(manager, newBookmark);
@@ -173,7 +173,7 @@ void BookmarksSidebarPage::slotContextMenuRequested(Q3ListBoxItem* item,
case addID: {
KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add Bookmark"),
"New bookmark",
- KURL(),
+ KUrl(),
"bookmark");
if (!bookmark.isNull()) {
root.addBookmark(manager, bookmark);
@@ -192,7 +192,7 @@ void BookmarksSidebarPage::slotContextMenuRequested(Q3ListBoxItem* item,
}
-void BookmarksSidebarPage::adjustSelection(const KURL& url)
+void BookmarksSidebarPage::adjustSelection(const KUrl& url)
{
// TODO (remarked in dolphin/TODO): the following code is quite equal
// to BookmarkSelector::updateSelection().
@@ -208,9 +208,9 @@ void BookmarksSidebarPage::adjustSelection(const KURL& url)
// which covers the bigger range of the URL.
int i = 0;
while (!bookmark.isNull()) {
- const KURL bookmarkURL = bookmark.url();
+ const KUrl bookmarkURL = bookmark.url();
if (bookmarkURL.isParentOf(url)) {
- const int length = bookmarkURL.prettyURL().length();
+ const int length = bookmarkURL.prettyUrl().length();
if (length > maxLength) {
selectedIndex = i;
maxLength = length;
@@ -234,7 +234,7 @@ void BookmarksSidebarPage::adjustSelection(const KURL& url)
m_bookmarksList->blockSignals(block);
}
-void BookmarksSidebarPage::slotURLChanged(const KURL& url)
+void BookmarksSidebarPage::slotURLChanged(const KUrl& url)
{
adjustSelection(url);
}
@@ -243,8 +243,8 @@ void BookmarksSidebarPage::connectToActiveView()
{
DolphinView* view = Dolphin::mainWin().activeView();
adjustSelection(view->url());
- connect(view, SIGNAL(signalURLChanged(const KURL&)),
- this, SLOT(slotURLChanged(const KURL&)));
+ connect(view, SIGNAL(signalURLChanged(const KUrl&)),
+ this, SLOT(slotURLChanged(const KUrl&)));
}
BookmarksListBox::BookmarksListBox(QWidget* parent) :