diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp index 58b06534b5..cab189a48f 100644 --- a/src/bookmarkssettingspage.cpp +++ b/src/bookmarkssettingspage.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include @@ -57,7 +57,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) : hBox->setSpacing(spacing); hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored); - m_listView = new KListView(hBox); + m_listView = new K3ListView(hBox); m_listView->addColumn(i18n("Icon")); m_listView->addColumn(i18n("Name")); m_listView->addColumn(i18n("Location")); @@ -117,7 +117,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) : Q3ListViewItem* item = new Q3ListViewItem(m_listView); item->setPixmap(PixmapIdx, SmallIcon(bookmark.icon())); item->setText(NameIdx, bookmark.text()); - item->setText(URLIdx, bookmark.url().prettyURL()); + item->setText(URLIdx, bookmark.url().prettyUrl()); // add hidden column to be able to retrieve the icon name again item->setText(IconIdx, bookmark.icon()); @@ -156,7 +156,7 @@ void BookmarksSettingsPage::applySettings() while (item != 0) { root.addBookmark(manager, item->text(NameIdx), - KURL(item->text(URLIdx)), + KUrl(item->text(URLIdx)), item->text(IconIdx)); // hidden column item = item->itemBelow(); } @@ -199,14 +199,14 @@ void BookmarksSettingsPage::slotAddButtonClicked() { KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add Bookmark"), i18n("New bookmark"), - KURL(), + KUrl(), "bookmark"); if (!bookmark.isNull()) { // insert bookmark into listview Q3ListViewItem* item = new Q3ListViewItem(m_listView); item->setPixmap(PixmapIdx, SmallIcon(bookmark.icon())); item->setText(NameIdx, bookmark.text()); - item->setText(URLIdx, bookmark.url().prettyURL()); + item->setText(URLIdx, bookmark.url().prettyUrl()); item->setText(IconIdx, bookmark.icon()); m_listView->insertItem(item); @@ -227,12 +227,12 @@ void BookmarksSettingsPage::slotEditButtonClicked() KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Edit Bookmark"), item->text(NameIdx), - KURL(item->text(URLIdx)), + KUrl(item->text(URLIdx)), item->text(IconIdx)); if (!bookmark.isNull()) { item->setPixmap(PixmapIdx, SmallIcon(bookmark.icon())); item->setText(NameIdx, bookmark.text()); - item->setText(URLIdx, bookmark.url().prettyURL()); + item->setText(URLIdx, bookmark.url().prettyUrl()); item->setText(IconIdx, bookmark.icon()); } } diff --git a/src/bookmarkssettingspage.h b/src/bookmarkssettingspage.h index 8636ad7e81..f9da7ad5e4 100644 --- a/src/bookmarkssettingspage.h +++ b/src/bookmarkssettingspage.h @@ -24,7 +24,7 @@ #include #include -class KListView; +class K3ListView; class KPushButton; class Q3ListViewItem; @@ -70,7 +70,7 @@ private: IconIdx = 3 }; - KListView* m_listView; + K3ListView* m_listView; KPushButton* m_addButton; KPushButton* m_editButton; KPushButton* m_removeButton; diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp index deb3119145..1fc35048f9 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) : diff --git a/src/bookmarkssidebarpage.h b/src/bookmarkssidebarpage.h index 3292eaec0f..eb49e3e7d7 100644 --- a/src/bookmarkssidebarpage.h +++ b/src/bookmarkssidebarpage.h @@ -25,7 +25,7 @@ #include #include -class KURL; +class KUrl; class BookmarksListBox; /** @@ -65,7 +65,7 @@ private slots: * Is invoked whenever the URL of the active view has been changed. Adjusts * the selection of the listbox to the bookmark which is part of the current URL. */ - void slotURLChanged(const KURL& url); + void slotURLChanged(const KUrl& url); private: /** @@ -75,7 +75,7 @@ private: * is selected. If there are more than one possible parent URL candidates, * the bookmark which covers the bigger range of the URL is selected. */ - void adjustSelection(const KURL& url); + void adjustSelection(const KUrl& url); /** * Connects to signals from the currently active Dolphin view to get diff --git a/src/detailsmodesettings.kcfg b/src/detailsmodesettings.kcfg index 160ca260f6..c7ab10d15e 100644 --- a/src/detailsmodesettings.kcfg +++ b/src/detailsmodesettings.kcfg @@ -14,7 +14,7 @@ - KIcon::SizeSmall + K3Icon::SizeSmall diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index d0025501ed..3f400096e5 100644 --- a/src/detailsviewsettingspage.cpp +++ b/src/detailsviewsettingspage.cpp @@ -82,15 +82,15 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget *parent) : m_mediumIconSize = new QRadioButton(i18n("Medium"), iconSizeGroup); m_largeIconSize = new QRadioButton(i18n("Large"), iconSizeGroup); switch (settings->iconSize()) { - case KIcon::SizeLarge: + case K3Icon::SizeLarge: m_largeIconSize->setChecked(true); break; - case KIcon::SizeMedium: + case K3Icon::SizeMedium: m_mediumIconSize->setChecked(true); break; - case KIcon::SizeSmall: + case K3Icon::SizeSmall: default: m_smallIconSize->setChecked(true); } @@ -135,12 +135,12 @@ void DetailsViewSettingsPage::applySettings() settings->setShowOwner(m_ownerBox->isChecked()); settings->setShowGroup(m_groupBox->isChecked()); - int iconSize = KIcon::SizeSmall; + int iconSize = K3Icon::SizeSmall; if (m_mediumIconSize->isChecked()) { - iconSize = KIcon::SizeMedium; + iconSize = K3Icon::SizeMedium; } else if (m_largeIconSize->isChecked()) { - iconSize = KIcon::SizeLarge; + iconSize = K3Icon::SizeLarge; } settings->setIconSize(iconSize); diff --git a/src/dolphin.cpp b/src/dolphin.cpp index 602dafa2ca..495eb53f5e 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -298,7 +298,7 @@ void Dolphin::slotSelectionChanged() void Dolphin::closeEvent(QCloseEvent* event) { // KDE4-TODO - //KConfig* config = kapp->config(); + //KConfig* config = KGlobal::config(); //config->setGroup("General"); //config->writeEntry("First Run", false); diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index bea01afc44..e3313a89b3 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -38,6 +38,8 @@ #include #include #include +#include +#include #include "dolphin.h" #include "dolphinview.h" @@ -111,7 +113,7 @@ void DolphinContextMenu::openViewportContextMenu() // ++linkGroupIt; //} // - //KPopupMenu* linkToDeviceMenu = new KPopupMenu(); + //KMenu* linkToDeviceMenu = new KMenu(); //QPtrListIterator linkToDeviceIt(dolphin.linkToDeviceActions()); //while ((action = linkToDeviceIt.current()) != 0) { // action->plug(linkToDeviceMenu); @@ -151,9 +153,9 @@ void DolphinContextMenu::openViewportContextMenu() new KPropertiesDialog(dolphin.activeView()->url()); } else if (id == bookmarkID) { - const KURL& url = dolphin.activeView()->url(); + const KUrl& url = dolphin.activeView()->url(); KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - url.filename(), + url.fileName(), url, "bookmark"); if (!bookmark.isNull()) { @@ -178,7 +180,7 @@ void DolphinContextMenu::openItemContextMenu() KMenu* popup = new KMenu(m_dolphinView); Dolphin& dolphin = Dolphin::mainWin(); - const KURL::List urls = m_dolphinView->selectedURLs(); + const KUrl::List urls = m_dolphinView->selectedURLs(); // insert 'Cut', 'Copy' and 'Paste' const KStdAction::StdAction actionNames[] = { KStdAction::Cut, KStdAction::Copy, KStdAction::Paste }; @@ -196,7 +198,7 @@ void DolphinContextMenu::openItemContextMenu() renameAction->plug(popup); // insert 'Move to Trash' for local URLs, otherwise insert 'Delete' - const KURL& url = dolphin.activeView()->url(); + const KUrl& url = dolphin.activeView()->url(); if (url.isLocalFile()) { KAction* moveToTrashAction = dolphin.actionCollection()->action("move_to_trash"); moveToTrashAction->plug(popup); @@ -231,9 +233,9 @@ void DolphinContextMenu::openItemContextMenu() int id = popup->exec(m_pos); if (id == bookmarkID) { - const KURL selectedURL(m_fileInfo->url()); + const KUrl selectedURL(m_fileInfo->url()); KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"), - selectedURL.filename(), + selectedURL.fileName(), selectedURL, "bookmark"); if (!bookmark.isNull()) { @@ -301,7 +303,7 @@ int DolphinContextMenu::insertOpenWithItems(KMenu* popup, // will be skipped here. const QString appName((*it)->name()); if (!containsEntry(openWithMenu, appName)) { - openWithMenu->insertItem((*it)->pixmap(KIcon::Small), + openWithMenu->insertItem((*it)->pixmap(K3Icon::Small), appName, index); openWithVector.append(*it); ++index; diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index bffd134c97..255804ca34 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -85,8 +85,8 @@ DolphinDetailsView::DolphinDetailsView(DolphinView* parent) : this, SLOT(slotActivationUpdate())); connect(this, SIGNAL(itemRenamed(Q3ListViewItem*, const QString&, int)), this, SLOT(slotItemRenamed(Q3ListViewItem*, const QString&, int))); - connect(this, SIGNAL(dropped(QDropEvent*, const KURL::List&, const KURL&)), - parent, SLOT(slotURLListDropped(QDropEvent*, const KURL::List&, const KURL&))); + connect(this, SIGNAL(dropped(QDropEvent*, const KUrl::List&, const KUrl&)), + parent, SLOT(slotURLListDropped(QDropEvent*, const KUrl::List&, const KUrl&))); QClipboard* clipboard = QApplication::clipboard(); connect(clipboard, SIGNAL(dataChanged()), @@ -143,7 +143,7 @@ void DolphinDetailsView::insertItem(KFileItem* fileItem) DolphinListViewItem* item = new DolphinListViewItem(static_cast(this), fileItem); - QDir::SortSpec spec = KFileView::sorting(); + QDir::SortFlags spec = KFileView::sorting(); if (spec & QDir::Time) { item->setKey(sortingKey(fileItem->time(KIO::UDS_MODIFICATION_TIME), fileItem->isDir(), diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp index dbf03491ea..e722948b2b 100644 --- a/src/dolphiniconsview.cpp +++ b/src/dolphiniconsview.cpp @@ -68,8 +68,8 @@ DolphinIconsView::DolphinIconsView(DolphinView* parent, LayoutMode layoutMode) : this, SLOT(slotActivationUpdate())); connect(this, SIGNAL(itemRenamed(Q3IconViewItem*, const QString&)), this, SLOT(slotItemRenamed(Q3IconViewItem*, const QString&))); - connect(this, SIGNAL(dropped(QDropEvent*, const KURL::List&, const KURL&)), - parent, SLOT(slotURLListDropped(QDropEvent*, const KURL::List&, const KURL&))); + connect(this, SIGNAL(dropped(QDropEvent*, const KUrl::List&, const KUrl&)), + parent, SLOT(slotURLListDropped(QDropEvent*, const KUrl::List&, const KUrl&))); QClipboard* clipboard = QApplication::clipboard(); connect(clipboard, SIGNAL(dataChanged()), diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp index d1bb2765d3..8f48de3919 100644 --- a/src/dolphinsettingsdialog.cpp +++ b/src/dolphinsettingsdialog.cpp @@ -33,22 +33,22 @@ DolphinSettingsDialog::DolphinSettingsDialog() : Ok|Apply|Cancel, Ok) { KIconLoader iconLoader; - Q3Frame* generalSettingsFrame = addPage(i18n("General"), 0, + QFrame* generalSettingsFrame = addPage(i18n("General"), 0, iconLoader.loadIcon("exec", - KIcon::NoGroup, - KIcon::SizeMedium)); + K3Icon::NoGroup, + K3Icon::SizeMedium)); m_generalSettingsPage = new GeneralSettingsPage(generalSettingsFrame); - Q3Frame* viewSettingsFrame = addPage(i18n("View Modes"), 0, + QFrame* viewSettingsFrame = addPage(i18n("View Modes"), 0, iconLoader.loadIcon("view_choose", - KIcon::NoGroup, - KIcon::SizeMedium)); + K3Icon::NoGroup, + K3Icon::SizeMedium)); m_viewSettingsPage = new ViewSettingsPage(viewSettingsFrame); - Q3Frame* bookmarksSettingsFrame = addPage(i18n("Bookmarks"), 0, + QFrame* bookmarksSettingsFrame = addPage(i18n("Bookmarks"), 0, iconLoader.loadIcon("bookmark", - KIcon::NoGroup, - KIcon::SizeMedium)); + K3Icon::NoGroup, + K3Icon::SizeMedium)); m_bookmarksSettingsPage = new BookmarksSettingsPage(bookmarksSettingsFrame); } diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index d6dc75d23d..fb75f1c672 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -417,7 +417,7 @@ void DolphinView::setSorting(Sorting sorting) ViewProperties props(url()); props.setSorting(sorting); - view->setSorting(static_cast(spec)); + view->setSorting(static_cast(spec)); emit signalSortingChanged(sorting); } @@ -425,7 +425,7 @@ void DolphinView::setSorting(Sorting sorting) DolphinView::Sorting DolphinView::sorting() const { - const QDir::SortSpec spec = fileView()->sorting(); + const QDir::SortFlags spec = fileView()->sorting(); if (spec & QDir::Time) { return SortByDate; @@ -449,7 +449,7 @@ void DolphinView::setSortOrder(Qt::SortOrder order) ViewProperties props(url()); props.setSortOrder(order); - view->setSorting(static_cast(sorting)); + view->setSorting(static_cast(sorting)); emit signalSortOrderChanged(order); } diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp index d467db15d2..c5917fda8e 100644 --- a/src/editbookmarkdialog.cpp +++ b/src/editbookmarkdialog.cpp @@ -39,7 +39,7 @@ EditBookmarkDialog::~EditBookmarkDialog() KBookmark EditBookmarkDialog::getBookmark(const QString& title, const QString& name, - const KURL& url, + const KUrl& url, const QString& icon) { EditBookmarkDialog dialog(title, name, url, icon); @@ -50,7 +50,7 @@ KBookmark EditBookmarkDialog::getBookmark(const QString& title, void EditBookmarkDialog::slotOk() { m_bookmark = KBookmark::standaloneBookmark(m_name->text(), - KURL(m_location->text()), + KUrl(m_location->text()), m_iconName); KDialogBase::slotOk(); @@ -58,7 +58,7 @@ void EditBookmarkDialog::slotOk() EditBookmarkDialog::EditBookmarkDialog(const QString& title, const QString& name, - const KURL& url, + const KUrl& url, const QString& icon) : KDialogBase(Plain, title, Ok|Cancel, Ok), m_iconButton(0), @@ -90,7 +90,7 @@ EditBookmarkDialog::EditBookmarkDialog(const QString& title, Q3HBox* locationBox = new Q3HBox(grid); locationBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); locationBox->setSpacing(spacingHint()); - m_location = new QLineEdit(url.prettyURL(), locationBox); + m_location = new QLineEdit(url.prettyUrl(), locationBox); m_location->setMinimumWidth(320); QPushButton* selectLocationButton = new QPushButton(SmallIcon("folder"), QString::null, locationBox); @@ -103,7 +103,7 @@ EditBookmarkDialog::EditBookmarkDialog(const QString& title, void EditBookmarkDialog::selectIcon() { - const QString iconName(KIconDialog::getIcon(KIcon::Small, KIcon::FileSystem)); + const QString iconName(KIconDialog::getIcon(K3Icon::Small, K3Icon::FileSystem)); if (!iconName.isEmpty()) { m_iconName = iconName; m_iconButton->setIconSet(SmallIcon(iconName)); @@ -113,9 +113,9 @@ void EditBookmarkDialog::selectIcon() void EditBookmarkDialog::selectLocation() { const QString location(m_location->text()); - KURL url(KFileDialog::getExistingURL(location)); + KUrl url(KFileDialog::getExistingURL(location)); if (!url.isEmpty()) { - m_location->setText(url.prettyURL()); + m_location->setText(url.prettyUrl()); } } diff --git a/src/editbookmarkdialog.h b/src/editbookmarkdialog.h index e3578a9401..0d7051a6fa 100644 --- a/src/editbookmarkdialog.h +++ b/src/editbookmarkdialog.h @@ -34,7 +34,7 @@ class QPushButton; * \code * KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add Bookmark"), * i18n("New bookmark"), - * KURL(), + * KUrl(), * "bookmark"); * if (!bookmark.isNull()) { * // ... @@ -56,7 +56,7 @@ public: */ static KBookmark getBookmark(const QString& title, const QString& name, - const KURL& url, + const KUrl& url, const QString& icon); protected slots: @@ -65,7 +65,7 @@ protected slots: protected: EditBookmarkDialog(const QString& title, const QString& name, - const KURL& url, + const KUrl& url, const QString& icon); private slots: diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index d1d22eb480..7be6c3b496 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -127,10 +127,10 @@ void GeneralSettingsPage::applySettings() { GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - const KURL url(m_homeURL->text()); + const KUrl url(m_homeURL->text()); KFileItem fileItem(S_IFDIR, KFileItem::Unknown, url); if (url.isValid() && fileItem.isDir()) { - settings->setHomeURL(url.prettyURL()); + settings->setHomeURL(url.prettyUrl()); } DolphinView::Mode viewMode = DolphinView::IconsView; @@ -149,21 +149,21 @@ void GeneralSettingsPage::applySettings() void GeneralSettingsPage::selectHomeURL() { const QString homeURL(m_homeURL->text()); - KURL url(KFileDialog::getExistingURL(homeURL)); + KUrl url(KFileDialog::getExistingUrl(homeURL)); if (!url.isEmpty()) { - m_homeURL->setText(url.prettyURL()); + m_homeURL->setText(url.prettyUrl()); } } void GeneralSettingsPage::useCurrentLocation() { const DolphinView* view = Dolphin::mainWin().activeView(); - m_homeURL->setText(view->url().prettyURL()); + m_homeURL->setText(view->url().prettyUrl()); } void GeneralSettingsPage::useDefaulLocation() { - m_homeURL->setText("file://" + QDir::homeDirPath()); + m_homeURL->setText("file://" + QDir::homePath()); } #include "generalsettingspage.moc" diff --git a/src/iconsmodesettings.kcfg b/src/iconsmodesettings.kcfg index 18625237aa..371e7cabf5 100644 --- a/src/iconsmodesettings.kcfg +++ b/src/iconsmodesettings.kcfg @@ -18,7 +18,7 @@ - KIcon::SizeMedium + K3Icon::SizeMedium @@ -29,7 +29,7 @@ - KIcon::SizeMedium + K3Icon::SizeMedium @@ -37,7 +37,7 @@ - KIcon::SizeMedium + K3Icon::SizeMedium \ No newline at end of file diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index ad95155a87..fab0a56043 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -77,14 +77,14 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, new QLabel(i18n("Small"), iconSizeVBox); m_iconSizeSlider = new QSlider(0, 5, 1, 0, Qt::Horizontal, iconSizeVBox); m_iconSizeSlider->setValue(sliderValue(settings->iconSize())); - m_iconSizeSlider->setTickmarks(QSlider::Below); + m_iconSizeSlider->setTickmarks(QSlider::TicksBelow); connect(m_iconSizeSlider, SIGNAL(valueChanged(int)), this, SLOT(slotIconSizeChanged(int))); new QLabel(i18n("Large"), iconSizeVBox); m_iconSizeViewer = new PixmapViewer(iconSizeGroup); - m_iconSizeViewer->setMinimumWidth(KIcon::SizeEnormous); - m_iconSizeViewer->setFixedHeight(KIcon::SizeEnormous); + m_iconSizeViewer->setMinimumWidth(K3Icon::SizeEnormous); + m_iconSizeViewer->setFixedHeight(K3Icon::SizeEnormous); m_iconSizeViewer->setEraseColor(iconBackgroundColor); slotIconSizeChanged(m_iconSizeSlider->value()); @@ -99,14 +99,14 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode, new QLabel(i18n("Small"), previewSizeVBox); m_previewSizeSlider = new QSlider(0, 5, 1, 0, Qt::Horizontal, previewSizeVBox); m_previewSizeSlider->setValue(sliderValue(settings->previewSize())); - m_previewSizeSlider->setTickmarks(QSlider::Below); + m_previewSizeSlider->setTickmarks(QSlider::TicksBelow); connect(m_previewSizeSlider, SIGNAL(valueChanged(int)), this, SLOT(slotPreviewSizeChanged(int))); new QLabel(i18n("Large"), previewSizeVBox); m_previewSizeViewer = new PixmapViewer(previewSizeGroup); - m_previewSizeViewer->setMinimumWidth(KIcon::SizeEnormous); - m_previewSizeViewer->setFixedHeight(KIcon::SizeEnormous); + m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous); + m_previewSizeViewer->setFixedHeight(K3Icon::SizeEnormous); m_previewSizeViewer->setEraseColor(iconBackgroundColor); slotPreviewSizeChanged(m_previewSizeSlider->value()); @@ -200,7 +200,7 @@ void IconsViewSettingsPage::applySettings() void IconsViewSettingsPage::slotIconSizeChanged(int value) { KIconLoader iconLoader; - m_iconSizeViewer->setPixmap(iconLoader.loadIcon("folder", KIcon::Desktop, iconSize(value))); + m_iconSizeViewer->setPixmap(iconLoader.loadIcon("folder", K3Icon::Desktop, iconSize(value))); if (m_previewSizeSlider != 0) { int previewSizeValue = m_previewSizeSlider->value(); @@ -220,19 +220,19 @@ void IconsViewSettingsPage::slotPreviewSizeChanged(int value) // assure that the preview size is never smaller than the icon size value = iconSizeValue; } - m_previewSizeViewer->setPixmap(iconLoader.loadIcon("preview", KIcon::Desktop, iconSize(value))); + m_previewSizeViewer->setPixmap(iconLoader.loadIcon("preview", K3Icon::Desktop, iconSize(value))); } int IconsViewSettingsPage::iconSize(int sliderValue) const { - int size = KIcon::SizeMedium; + int size = K3Icon::SizeMedium; switch (sliderValue) { - case 0: size = KIcon::SizeSmall; break; - case 1: size = KIcon::SizeSmallMedium; break; - case 2: size = KIcon::SizeMedium; break; - case 3: size = KIcon::SizeLarge; break; - case 4: size = KIcon::SizeHuge; break; - case 5: size = KIcon::SizeEnormous; break; + case 0: size = K3Icon::SizeSmall; break; + case 1: size = K3Icon::SizeSmallMedium; break; + case 2: size = K3Icon::SizeMedium; break; + case 3: size = K3Icon::SizeLarge; break; + case 4: size = K3Icon::SizeHuge; break; + case 5: size = K3Icon::SizeEnormous; break; } return size; } @@ -241,12 +241,12 @@ int IconsViewSettingsPage::sliderValue(int iconSize) const { int value = 0; switch (iconSize) { - case KIcon::SizeSmall: value = 0; break; - case KIcon::SizeSmallMedium: value = 1; break; - case KIcon::SizeMedium: value = 2; break; - case KIcon::SizeLarge: value = 3; break; - case KIcon::SizeHuge: value = 4; break; - case KIcon::SizeEnormous: value = 5; break; + case K3Icon::SizeSmall: value = 0; break; + case K3Icon::SizeSmallMedium: value = 1; break; + case K3Icon::SizeMedium: value = 2; break; + case K3Icon::SizeLarge: value = 3; break; + case K3Icon::SizeHuge: value = 4; break; + case K3Icon::SizeEnormous: value = 5; break; default: break; } return value; diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 4419817b97..b9e345f62f 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -72,8 +72,8 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) : // preview m_preview = new PixmapViewer(this); - m_preview->setMinimumWidth(KIcon::SizeEnormous); - m_preview->setFixedHeight(KIcon::SizeEnormous); + m_preview->setMinimumWidth(K3Icon::SizeEnormous); + m_preview->setFixedHeight(K3Icon::SizeEnormous); // name m_name = new QLabel(this); @@ -125,7 +125,7 @@ void InfoSidebarPage::activeViewChanged() connectToActiveView(); } -void InfoSidebarPage::requestDelayedItemInfo(const KURL& url) +void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url) { cancelRequest(); @@ -135,7 +135,7 @@ void InfoSidebarPage::requestDelayedItemInfo(const KURL& url) } } -void InfoSidebarPage::requestItemInfo(const KURL& url) +void InfoSidebarPage::requestItemInfo(const KUrl& url) { cancelRequest(); @@ -161,14 +161,14 @@ void InfoSidebarPage::showItemInfo() if (m_multipleSelection) { KIconLoader iconLoader; QPixmap icon = iconLoader.loadIcon("exec", - KIcon::NoGroup, - KIcon::SizeEnormous); + K3Icon::NoGroup, + K3Icon::SizeEnormous); m_preview->setPixmap(icon); m_name->setText(i18n("%1 items selected").arg(selectedItems->count())); } else if (!applyBookmark()) { // try to get a preview pixmap from the item... - KURL::List list; + KUrl::List list; list.append(m_shownURL); m_pendingPreview = true; @@ -176,7 +176,7 @@ void InfoSidebarPage::showItemInfo() KIO::PreviewJob* job = KIO::filePreview(list, m_preview->width(), - KIcon::SizeEnormous); + K3Icon::SizeEnormous); connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)), this, SLOT(gotPreview(const KFileItem*, const QPixmap&))); connect(job, SIGNAL(failed(const KFileItem*)), @@ -202,7 +202,7 @@ void InfoSidebarPage::slotPreviewFailed(const KFileItem* item) { m_pendingPreview = false; if (!applyBookmark()) { - m_preview->setPixmap(item->pixmap(KIcon::SizeEnormous)); + m_preview->setPixmap(item->pixmap(K3Icon::SizeEnormous)); } } @@ -219,7 +219,7 @@ void InfoSidebarPage::startService(int index) { DolphinView* view = Dolphin::mainWin().activeView(); if (view->hasSelection()) { - KURL::List selectedURLs = view->selectedURLs(); + KUrl::List selectedURLs = view->selectedURLs(); KDEDesktopMimeType::executeService(selectedURLs, m_actionsVector[index]); } else { @@ -232,10 +232,10 @@ void InfoSidebarPage::connectToActiveView() cancelRequest(); DolphinView* view = Dolphin::mainWin().activeView(); - connect(view, SIGNAL(signalRequestItemInfo(const KURL&)), - this, SLOT(requestDelayedItemInfo(const KURL&))); - connect(view, SIGNAL(signalURLChanged(const KURL&)), - this, SLOT(requestItemInfo(const KURL&))); + connect(view, SIGNAL(signalRequestItemInfo(const KUrl&)), + this, SLOT(requestDelayedItemInfo(const KUrl&))); + connect(view, SIGNAL(signalURLChanged(const KUrl&)), + this, SLOT(requestItemInfo(const KUrl&))); m_shownURL = view->url(); showItemInfo(); @@ -254,8 +254,8 @@ bool InfoSidebarPage::applyBookmark() KIconLoader iconLoader; QPixmap icon = iconLoader.loadIcon(bookmark.icon(), - KIcon::NoGroup, - KIcon::SizeEnormous); + K3Icon::NoGroup, + K3Icon::SizeEnormous); m_preview->setPixmap(icon); return true; } @@ -399,7 +399,7 @@ void InfoSidebarPage::addInfoLine(const QString& labelText, const QString& infoT QLabel* info = new QLabel(infoText, m_infoGrid); info->setTextFormat(Qt::RichText); - info->setAlignment(Qt::AlignTop | Qt::WordBreak); + info->setAlignment(Qt::AlignTop | Qt::TextWordWrap); info->show(); m_infoWidgets.append(info); @@ -574,12 +574,12 @@ void ServiceButton::drawButton(QPainter* painter) // draw icon int x = spacing; - const int y = (buttonHeight - KIcon::SizeSmall) / 2; + const int y = (buttonHeight - K3Icon::SizeSmall) / 2; const QIcon* set = iconSet(); if (set != 0) { painter->drawPixmap(x, y, set->pixmap(QIcon::Small, QIcon::Normal)); } - x += KIcon::SizeSmall + spacing; + x += K3Icon::SizeSmall + spacing; // draw text painter->setPen(foregroundColor); diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h index 4b2152764a..dadda78806 100644 --- a/src/infosidebarpage.h +++ b/src/infosidebarpage.h @@ -72,7 +72,7 @@ private slots: * * @see InfoSidebarPage::showItemInfo() */ - void requestDelayedItemInfo(const KURL& url); + void requestDelayedItemInfo(const KUrl& url); /** * Does a request of information for the item of the given URL and @@ -80,7 +80,7 @@ private slots: * * @see InfoSidebarPage::showItemInfo() */ - void requestItemInfo(const KURL& url); + void requestItemInfo(const KUrl& url); /** * Shows the information for the item of the URL which has been provided by @@ -151,8 +151,8 @@ private: bool m_multipleSelection; bool m_pendingPreview; QTimer* m_timer; - KURL m_shownURL; - KURL m_urlCandidate; + KUrl m_shownURL; + KUrl m_urlCandidate; PixmapViewer* m_preview; QLabel* m_name; diff --git a/src/main.cpp b/src/main.cpp index 00e6aeb99d..8b52ba1660 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -59,7 +59,7 @@ int main(int argc, char **argv) Dolphin& mainWin = Dolphin::mainWin(); mainWin.show(); - if (false /* KDE4-TODO: app.isRestored() */) { + if (false /* KDE4-TODO: app.isSessionRestored() */) { int n = 1; while (KMainWindow::canBeRestored(n)){ Dolphin::mainWin().restore(n); diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp index 575f3eda11..bcbee2aaa8 100644 --- a/src/pixmapviewer.cpp +++ b/src/pixmapviewer.cpp @@ -30,8 +30,8 @@ PixmapViewer::PixmapViewer(QWidget* parent) : QWidget(parent) { - setMinimumWidth(KIcon::SizeEnormous); - setMinimumWidth(KIcon::SizeEnormous); + setMinimumWidth(K3Icon::SizeEnormous); + setMinimumWidth(K3Icon::SizeEnormous); } PixmapViewer::~PixmapViewer() diff --git a/src/portinglog.txt b/src/portinglog.txt deleted file mode 100644 index bef50128fd..0000000000 --- a/src/portinglog.txt +++ /dev/null @@ -1,445 +0,0 @@ -Log for qt3to4 on Mo Nov 13 07:24:50 2006. Number of log entries: 101 -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkselector.h at line 30 column 16: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkselector.h at line 67 column 14: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkselector.h: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.h at line 25 column 20: qvaluelist.h -> q3valuelist.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.h at line 29 column 19: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.h at line 46 column 48: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.h at line 54 column 42: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.h at line 26 column 18: qlistbox.h -> q3listbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.h at line 49 column 56: QListBoxItem -> Q3ListBoxItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.h at line 52 column 46: QListBoxItem -> Q3ListBoxItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.h at line 68 column 40: QListBox -> Q3ListBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.h at line 82 column 42: QListBoxPixmap -> Q3ListBoxPixmap -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.h at line 87 column 37: QListBox -> Q3ListBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.h: Added the following include directives: - #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.h at line 24 column 15: qvbox.h -> q3vbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.h at line 32 column 44: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.h at line 27 column 20: qvaluelist.h -> q3valuelist.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.h at line 29 column 22: qvaluevector.h -> q3valuevector.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.h at line 59 column 40: QValueVector -> Q3ValueVector -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.h at line 63 column 38: QValueVector -> Q3ValueVector -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.h at line 69 column 41: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.h at line 98 column 33: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.h at line 155 column 47: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.h at line 161 column 38: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.h at line 171 column 37: QListView -> Q3ListView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.h at line 191 column 41: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.h: Added the following include directives: - #include #include #include #include #include #include #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindirlister.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.h at line 33 column 20: qvaluelist.h -> q3valuelist.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.h at line 34 column 18: qptrlist.h -> q3ptrlist.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.h at line 45 column 11: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.h at line 46 column 19: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.h at line 78 column 18: QPtrList -> Q3PtrList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.h at line 315 column 14: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.h at line 327 column 12: QPtrList -> Q3PtrList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.h: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.h at line 113 column 23: QDragObject -> Q3DragObject -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.h at line 126 column 33: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.h at line 132 column 47: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.h at line 136 column 38: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.h: Added the following include directives: - #include #include #include #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettingsdialog.h -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinstatusbar.h at line 26 column 15: qhbox.h -> q3hbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinstatusbar.h at line 36 column 37: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinstatusbar.h: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 42 column 19: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 43 column 19: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 44 column 17: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 52 column 17: QScrollView -> Q3ScrollView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 133 column 20: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 247 column 43: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 248 column 45: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 251 column 45: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 275 column 15: QScrollView -> Q3ScrollView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h at line 292 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.h: Added the following include directives: - #include #include #include #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/filterbar.h: Added the following include directives: - #include #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.h at line 24 column 15: qvbox.h -> q3vbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.h at line 36 column 42: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 30 column 22: qvaluevector.h -> q3valuevector.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 42 column 14: QIconSet -> QIcon -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 47 column 11: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 48 column 11: QGrid -> Q3Grid -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 120 column 9: QGrid -> Q3Grid -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 121 column 12: QPtrList -> Q3PtrList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 123 column 9: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 124 column 12: QPtrList -> Q3PtrList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 125 column 16: QValueVector -> Q3ValueVector -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h at line 136 column 32: QIconSet -> QIcon -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.h: Added the following include directives: - #include #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/itemeffectsmanager.h at line 27 column 20: qvaluelist.h -> q3valuelist.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/itemeffectsmanager.h at line 77 column 14: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/pixmapviewer.h: Added the following include directives: - #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/progressindicator.h -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/protocolcombo.h -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/renamedialog.h -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/settingspagebase.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/sidebar.h at line 30 column 17: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/sidebar.h at line 56 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/sidebar.h: Added the following include directives: - #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/sidebarpage.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/statusbarmessagelabel.h: Added the following include directives: - #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/statusbarspaceinfo.h: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/undomanager.h at line 25 column 20: qvaluelist.h -> q3valuelist.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/undomanager.h at line 117 column 14: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.h: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigatorbutton.h: Added the following include directives: - #include #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.h at line 29 column 15: qhbox.h -> q3hbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.h at line 36 column 16: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.h at line 48 column 18: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.h at line 50 column 33: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.h at line 93 column 20: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.h at line 143 column 14: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.h at line 150 column 14: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.h: Added the following include directives: - #include #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.h at line 26 column 18: QButtonGroup -> Q3ButtonGroup -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewproperties.h -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewsettingspage.h - -Log for qt3to4 on Mo Nov 13 07:25:00 2006. Number of log entries: 301 -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkselector.cpp at line 23 column 20: qpopupmenu.h -> q3popupmenu.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkselector.cpp at line 43 column 36: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 31 column 15: qvbox.h -> q3vbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 51 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 51 column 44: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 55 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 55 column 27: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 64 column 39: QListView -> Q3ListView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 70 column 52: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 71 column 56: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 72 column 58: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 73 column 62: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 75 column 9: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 75 column 32: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 115 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 117 column 21: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 117 column 47: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 155 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 169 column 23: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 184 column 67: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 191 column 61: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 206 column 21: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 206 column 47: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 213 column 21: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 225 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 242 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 244 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 269 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 272 column 21: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 289 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp at line 291 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssettingspage.cpp: Added the following include directives: - #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 26 column 18: qlistbox.h -> q3listbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 30 column 20: qpopupmenu.h -> q3popupmenu.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 46 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 46 column 41: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 51 column 72: QListBoxItem -> Q3ListBoxItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 52 column 63: QListBoxItem -> Q3ListBoxItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 53 column 69: QListBoxItem -> Q3ListBoxItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 54 column 60: QListBoxItem -> Q3ListBoxItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 93 column 74: QListBoxItem -> Q3ListBoxItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 104 column 64: QListBoxItem -> Q3ListBoxItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 112 column 14: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 112 column 38: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 251 column 12: QListBox -> Q3ListBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 265 column 18: QListBoxPixmap -> Q3ListBoxPixmap -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 273 column 39: QListBox -> Q3ListBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp at line 275 column 25: QListBoxPixmap -> Q3ListBoxPixmap -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/bookmarkssidebarpage.cpp: Added the following include directives: - #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 28 column 15: qgrid.h -> q3grid.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 30 column 22: qbuttongroup.h -> q3buttongroup.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 33 column 19: qgroupbox.h -> q3groupbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 34 column 19: qgroupbox.h -> q3groupbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 40 column 9: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 60 column 13: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 60 column 43: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 64 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 64 column 43: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 78 column 16: QButtonGroup -> Q3ButtonGroup -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 78 column 50: QButtonGroup -> Q3ButtonGroup -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 105 column 13: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/detailsviewsettingspage.cpp at line 105 column 40: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.cpp at line 97 column 20: QPtrListIterator -> Q3PtrListIterator -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.cpp at line 219 column 16: QValueVector -> Q3ValueVector -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.cpp at line 223 column 16: QValueVector -> Q3ValueVector -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.cpp at line 268 column 56: QValueVector -> Q3ValueVector -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.cpp at line 336 column 55: QValueVector -> Q3ValueVector -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.cpp at line 404 column 34: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.cpp at line 407 column 34: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.cpp at line 442 column 26: QIconSet -> QIcon -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphincontextmenu.cpp: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.cpp at line 59 column 21: qdragobject.h -> q3dragobject.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.cpp at line 632 column 15: QDragObject -> Q3DragObject -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.cpp at line 640 column 15: QDragObject -> Q3DragObject -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.cpp at line 990 column 18: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.cpp at line 991 column 24: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.cpp at line 1452 column 20: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphin.cpp: Added the following include directives: - #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 34 column 21: qobjectlist.h -> qobject.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 35 column 17: qheader.h -> q3header.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 66 column 33: QScrollView -> Q3ScrollView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 75 column 45: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 76 column 47: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 79 column 59: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 80 column 61: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 85 column 50: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 86 column 52: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 94 column 11: QHeader -> Q3Header -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 101 column 36: QListView -> Q3ListView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 129 column 20: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 143 column 77: QListView -> Q3ListView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 161 column 57: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 243 column 49: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 351 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 393 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 426 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 525 column 63: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 561 column 17: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 625 column 26: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 645 column 54: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 686 column 70: QListView -> Q3ListView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 744 column 19: QListView -> Q3ListView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 758 column 21: QListView -> Q3ListView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 764 column 29: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 773 column 25: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 790 column 13: QListView -> Q3ListView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp at line 803 column 57: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindetailsview.cpp: Added the following include directives: - #include #include #include #include #include #include #include #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphindirlister.cpp -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 32 column 21: qobjectlist.h -> qobject.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 59 column 45: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 60 column 47: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 63 column 59: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 64 column 61: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 69 column 50: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 70 column 52: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 129 column 20: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 144 column 19: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 145 column 56: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 145 column 81: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 146 column 19: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 146 column 68: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 147 column 52: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 148 column 52: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 238 column 75: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 308 column 11: QDragObject -> Q3DragObject -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 332 column 15: QDragObject -> Q3DragObject -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 420 column 47: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 435 column 61: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp at line 445 column 52: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphiniconsview.cpp: Added the following include directives: - #include #include #include #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 96 column 19: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 97 column 56: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 97 column 81: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 101 column 32: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 118 column 39: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 135 column 19: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 136 column 56: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 136 column 81: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 142 column 32: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettings.cpp at line 150 column 39: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettingsdialog.cpp at line 36 column 10: QFrame -> Q3Frame -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettingsdialog.cpp at line 42 column 10: QFrame -> Q3Frame -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettingsdialog.cpp at line 48 column 10: QFrame -> Q3Frame -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinsettingsdialog.cpp: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinstatusbar.cpp at line 32 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 66 column 33: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 283 column 25: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 488 column 16: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 648 column 52: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 650 column 21: ButtonState -> Qt::ButtonState -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 651 column 64: ShiftButton -> Qt::ShiftModifier -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 652 column 66: ControlButton -> Qt::ControlModifier -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 661 column 54: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 680 column 54: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 849 column 58: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 850 column 61: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 851 column 63: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 852 column 61: QIconViewItem -> Q3IconViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 867 column 60: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 868 column 63: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 869 column 65: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 870 column 63: QListViewItem -> Q3ListViewItem -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 894 column 11: QScrollView -> Q3ScrollView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 896 column 60: QScrollView -> Q3ScrollView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp at line 897 column 60: QScrollView -> Q3ScrollView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/dolphinview.cpp: Added the following include directives: - #include #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.cpp at line 24 column 15: qgrid.h -> q3grid.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.cpp at line 34 column 15: qhbox.h -> q3hbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.cpp at line 68 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.cpp at line 68 column 44: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.cpp at line 70 column 9: QGrid -> Q3Grid -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.cpp at line 70 column 27: QGrid -> Q3Grid -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.cpp at line 90 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.cpp at line 90 column 34: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/editbookmarkdialog.cpp: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/filterbar.cpp at line 42 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/filterbar.cpp at line 42 column 38: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/filterbar.cpp at line 45 column 15: QHBoxLayout -> Q3HBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/filterbar.cpp at line 45 column 41: QHBoxLayout -> Q3HBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/filterbar.cpp: Added the following include directives: - #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 29 column 15: qvbox.h -> q3vbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 30 column 15: qgrid.h -> q3grid.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 31 column 19: qgroupbox.h -> q3groupbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 34 column 22: qbuttongroup.h -> q3buttongroup.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 50 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 50 column 44: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 58 column 9: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 58 column 27: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 65 column 13: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 65 column 40: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 69 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 69 column 33: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 80 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 80 column 32: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 91 column 16: QButtonGroup -> Q3ButtonGroup -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp at line 91 column 48: QButtonGroup -> Q3ButtonGroup -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/generalsettingspage.cpp: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 25 column 22: qbuttongroup.h -> q3buttongroup.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 43 column 9: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 64 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 64 column 34: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 69 column 13: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 69 column 44: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 75 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 75 column 35: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 93 column 17: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 93 column 51: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 97 column 13: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 97 column 42: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 115 column 13: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 115 column 40: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 137 column 13: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 137 column 40: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/iconsviewsettingspage.cpp at line 141 column 77: QIconView -> Q3IconView -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 32 column 15: qvbox.h -> q3vbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 33 column 20: qvgroupbox.h -> q3vgroupbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 34 column 20: qpopupmenu.h -> q3popupmenu.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 37 column 15: qgrid.h -> q3grid.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 38 column 20: qhgroupbox.h -> q3hgroupbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 70 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 70 column 41: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 86 column 34: QHGroupBox -> Q3HGroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 90 column 26: QGrid -> Q3Grid -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 93 column 34: QHGroupBox -> Q3HGroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 97 column 27: QVBox -> Q3VBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 324 column 24: QPtrListIterator -> Q3PtrListIterator -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 414 column 20: QPtrListIterator -> Q3PtrListIterator -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 489 column 34: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 492 column 50: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 503 column 34: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 507 column 34: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 534 column 43: QIconSet -> QIcon -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 543 column 26: QWidget -> Qt -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 578 column 18: QIconSet -> QIcon -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 580 column 54: QIconSet -> QIcon -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp at line 580 column 71: QIconSet -> QIcon -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/infosidebarpage.cpp: Added the following include directives: - #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/itemeffectsmanager.cpp at line 26 column 21: qobjectlist.h -> qobject.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/itemeffectsmanager.cpp at line 131 column 30: QValueListIterator -> Q3ValueListIterator -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/itemeffectsmanager.cpp: Added the following include directives: - #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/main.cpp -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/pixmapviewer.cpp: Added the following include directives: - #include #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/progressindicator.cpp -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/protocolcombo.cpp at line 20 column 20: qpopupmenu.h -> q3popupmenu.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/protocolcombo.cpp at line 33 column 13: qHeapSort -> qSort -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/protocolcombo.cpp at line 36 column 14: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/protocolcombo.cpp at line 36 column 37: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/renamedialog.cpp at line 27 column 15: qvbox.h -> q3vbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/renamedialog.cpp at line 37 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/renamedialog.cpp at line 37 column 44: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/renamedialog.cpp: Added the following include directives: - #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/settingspagebase.cpp -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/sidebar.cpp at line 43 column 30: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/sidebar.cpp: Added the following include directives: - #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/sidebarpage.cpp -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/statusbarmessagelabel.cpp at line 200 column 74: WordBreak -> TextWordWrap -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/statusbarmessagelabel.cpp: Added the following include directives: - #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/statusbarspaceinfo.cpp: Added the following include directives: - #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/undomanager.cpp -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 42 column 26: QWidget -> Qt -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 94 column 17: red -> Qt::red -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 94 column 29: red -> Qt::red -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 94 column 42: red -> Qt::red -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 95 column 19: green -> Qt::green -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 95 column 31: green -> Qt::green -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 95 column 44: green -> Qt::green -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 96 column 18: blue -> Qt::blue -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 96 column 30: blue -> Qt::blue -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 96 column 43: blue -> Qt::blue -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 97 column 21: red -> Qt::red -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 97 column 28: green -> Qt::green -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp at line 97 column 34: blue -> Qt::blue -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlbutton.cpp: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigatorbutton.cpp at line 338 column 14: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigatorbutton.cpp at line 338 column 41: QPopupMenu -> Q3PopupMenu -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigatorbutton.cpp: Added the following include directives: - #include #include #include #include #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp at line 32 column 18: qlistbox.h -> q3listbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp at line 34 column 21: qobjectlist.h -> qobject.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp at line 35 column 20: qpopupmenu.h -> q3popupmenu.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp at line 81 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp at line 164 column 28: QValueListIterator -> Q3ValueListIterator -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp at line 202 column 16: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp at line 271 column 9: QHBox -> Q3HBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp at line 360 column 14: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp at line 443 column 14: QValueList -> Q3ValueList -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigator.cpp: Added the following include directives: - #include #include -No changes made to file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewproperties.cpp -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp at line 27 column 15: qvbox.h -> q3vbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp at line 28 column 22: qbuttongroup.h -> q3buttongroup.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp at line 33 column 19: qgroupbox.h -> q3groupbox.h -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp at line 57 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp at line 57 column 44: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp at line 60 column 13: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp at line 60 column 41: QGroupBox -> Q3GroupBox -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp at line 97 column 16: QButtonGroup -> Q3ButtonGroup -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp at line 97 column 48: QButtonGroup -> Q3ButtonGroup -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewpropertiesdialog.cpp: Added the following include directives: - #include -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewsettingspage.cpp at line 38 column 15: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewsettingspage.cpp at line 38 column 44: QVBoxLayout -> Q3VBoxLayout -In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/viewsettingspage.cpp: Added the following include directives: - #include - diff --git a/src/previewsmodesettings.kcfg b/src/previewsmodesettings.kcfg index 70c6d8cae5..96f677f5b5 100644 --- a/src/previewsmodesettings.kcfg +++ b/src/previewsmodesettings.kcfg @@ -27,7 +27,7 @@ - KIcon::SizeMedium + K3Icon::SizeMedium @@ -35,7 +35,7 @@ - KIcon::SizeMedium + K3Icon::SizeMedium \ No newline at end of file diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp index b91b102cd0..1bfd5469ea 100644 --- a/src/protocolcombo.cpp +++ b/src/protocolcombo.cpp @@ -36,7 +36,7 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, URLNavigator* parent) Q3PopupMenu* menu = new Q3PopupMenu(this); while (it != itEnd) { - //kdDebug() << "info for " << *it << " " + //kDebug() << "info for " << *it << " " // << KProtocolInfo::protocolClass(*it) << endl; //TODO: wow this is ugly. or .. is it? ;) we need a way to determine // if a protocol is appropriate for use in a file manager. hum! @@ -44,7 +44,7 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, URLNavigator* parent) if (KProtocolInfo::protocolClass(*it) == ":" || !KProtocolInfo::supportsWriting(*it)) { - //kdDebug() << "!!! removing " << *it << endl; + //kDebug() << "!!! removing " << *it << endl; QStringList::iterator tempIt = it; ++tempIt; m_protocols.remove(it); @@ -100,7 +100,7 @@ void ProtocolCombo::setProtocol(int index) } QString protocol = m_protocols[index]; -kdDebug() << "setProtocol " << index << " " << protocol << endl; +kDebug() << "setProtocol " << index << " " << protocol << endl; setText(protocol); emit activated(protocol); /* */ diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp index 301c02713f..43db193542 100644 --- a/src/renamedialog.cpp +++ b/src/renamedialog.cpp @@ -44,14 +44,14 @@ RenameDialog::RenameDialog(const KUrl::List& items) : m_lineEdit = new KLineEdit(plainPage()); m_newName = i18n("New name #"); assert(itemCount > 1); - QString postfix(items[0].prettyURL().section('.',1)); + QString postfix(items[0].prettyUrl().section('.',1)); if (postfix.length() > 0) { // The first item seems to have a postfix (e. g. 'jpg' or 'txt'). Now // check whether all other items have the same postfix. If this is the // case, add this postfix to the name suggestion. postfix.insert(0, '.'); for (int i = 1; i < itemCount; ++i) { - if (!items[i].prettyURL().contains(postfix)) { + if (!items[i].prettyUrl().contains(postfix)) { // at least one item does not have the same postfix postfix.truncate(0); break; diff --git a/src/sidebar.h b/src/sidebar.h index 2ba984e384..29502836ca 100755 --- a/src/sidebar.h +++ b/src/sidebar.h @@ -25,7 +25,7 @@ //Added by qt3to4: #include -class KURL; +class KUrl; class QComboBox; class Q3VBoxLayout; class SidebarPage; @@ -50,7 +50,7 @@ signals: * The user selected an item on sidebar widget and item has * URL property, so inform the parent togo to this URL; */ - void urlChanged(const KURL& url); + void urlChanged(const KUrl& url); private slots: void createPage(int index); diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp index 9465f6de3c..4ab2a01292 100644 --- a/src/statusbarmessagelabel.cpp +++ b/src/statusbarmessagelabel.cpp @@ -37,7 +37,7 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) : m_minTextHeight(-1), m_timer(0) { - setMinimumHeight(KIcon::SizeSmall); + setMinimumHeight(K3Icon::SizeSmall); m_timer = new QTimer(this); connect(m_timer, SIGNAL(timeout()), @@ -133,7 +133,7 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */) // draw text painter.setPen(foregroundColor); - painter.drawText(QRect(x, 0, width() - x, height()), Qt::AlignVCenter | Qt::WordBreak, m_text); + painter.drawText(QRect(x, 0, width() - x, height()), Qt::AlignVCenter | Qt::TextWordWrap, m_text); painter.end(); bitBlt(this, 0, 0, &buffer); diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp index ddcf1b761b..fbb64c9a35 100644 --- a/src/statusbarspaceinfo.cpp +++ b/src/statusbarspaceinfo.cpp @@ -93,7 +93,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */) text = i18n("%1% of %2 used") .arg( 100 - (int)(100.0 * m_kBAvailable / m_kBSize)) - .arg(KIO::convertSizeFromKB(m_kBSize)); + .arg(KIO::convertSizeFromKiB(m_kBSize)); } else { if (m_gettingSize) { @@ -108,7 +108,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */) // draw text (usually 'X% of Y GB used') painter.setPen(KGlobalSettings::textColor()); painter.drawText(QRect(1, 1, barWidth - 2, barHeight + 4), - Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak, + Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextWordWrap, text); } diff --git a/src/undomanager.cpp b/src/undomanager.cpp index 4173b3c5e9..958816b9d3 100644 --- a/src/undomanager.cpp +++ b/src/undomanager.cpp @@ -147,7 +147,7 @@ void UndoManager::undo() KUrl::List sourceURLs = command.source(); KUrl::List::Iterator it = sourceURLs.begin(); const KUrl::List::Iterator end = sourceURLs.end(); - const QString destURL(command.destination().prettyURL(+1)); + const QString destURL(command.destination().prettyUrl(KUrl::AddTrailingSlash)); KIO::Job* job = 0; switch (command.type()) { @@ -155,7 +155,7 @@ void UndoManager::undo() case DolphinCommand::Copy: { KUrl::List list; while (it != end) { - const KUrl deleteURL(destURL + (*it).filename()); + const KUrl deleteURL(destURL + (*it).fileName()); list.append(deleteURL); ++it; } @@ -167,7 +167,7 @@ void UndoManager::undo() KUrl::List list; const KUrl newDestURL((*it).directory()); while (it != end) { - const KUrl newSourceURL(destURL + (*it).filename()); + const KUrl newSourceURL(destURL + (*it).fileName()); list.append(newSourceURL); ++it; } @@ -185,7 +185,7 @@ void UndoManager::undo() while (it != end) { // TODO: use KIO::special for accessing the trash protocol. See // also Dolphin::slotJobResult() for further details. - const QString originalFileName((*it).filename().section('-', 1)); + const QString originalFileName((*it).fileName().section('-', 1)); KUrl newDestURL(destURL + originalFileName); KIO::NetAccess::move(*it, newDestURL); ++it; @@ -275,11 +275,11 @@ void UndoManager::redo() } case DolphinCommand::Trash: { - const QString destURL(command.destination().prettyURL()); + const QString destURL(command.destination().prettyUrl()); while (it != end) { // TODO: use KIO::special for accessing the trash protocol. See // also Dolphin::slotJobResult() for further details. - const QString originalFileName((*it).filename().section('-', 1)); + const QString originalFileName((*it).fileName().section('-', 1)); KUrl originalSourceURL(destURL + "/" + originalFileName); KIO::Job* moveToTrashJob = KIO::trash(originalSourceURL); KIO::NetAccess::synchronousRun(moveToTrashJob, &dolphin); diff --git a/src/urlbutton.h b/src/urlbutton.h index c1833b2906..2b2f051f34 100644 --- a/src/urlbutton.h +++ b/src/urlbutton.h @@ -25,7 +25,7 @@ //Added by qt3to4: #include -class KURL; +class KUrl; class URLNavigator; class QPainter; diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index e1afa3ffc1..522198ff0e 100644 --- a/src/urlnavigator.cpp +++ b/src/urlnavigator.cpp @@ -134,7 +134,7 @@ URLNavigator::~URLNavigator() void URLNavigator::setURL(const KUrl& url) { QString urlStr(url.pathOrUrl()); - //kdDebug() << "setURL(" << url << ")" << endl; + //kDebug() << "setURL(" << url << ")" << endl; if (urlStr.at(0) == '~') { // replace '~' by the home directory urlStr.remove(0, 1); @@ -150,7 +150,7 @@ void URLNavigator::setURL(const KUrl& url) const KUrl& nextURL = m_history[m_historyIndex - 1].url(); if (transformedURL == nextURL) { goForward(); -// kdDebug() << "goin' forward in history" << endl; +// kDebug() << "goin' forward in history" << endl; return; } } @@ -158,7 +158,7 @@ void URLNavigator::setURL(const KUrl& url) const KUrl& currURL = m_history[m_historyIndex].url(); if (currURL == transformedURL) { // don't insert duplicate history elements -// kdDebug() << "currURL == transformedURL" << endl; +// kDebug() << "currURL == transformedURL" << endl; return; } @@ -179,15 +179,15 @@ void URLNavigator::setURL(const KUrl& url) --m_historyIndex; } -/* kdDebug() << "history starting ====================" << endl; +/* kDebug() << "history starting ====================" << endl; int i = 0; for (QValueListIterator it = m_history.begin(); it != m_history.end(); ++it, ++i) { - kdDebug() << i << ": " << (*it).url() << endl; + kDebug() << i << ": " << (*it).url() << endl; } - kdDebug() << "history done ========================" << endl;*/ + kDebug() << "history done ========================" << endl;*/ } const KUrl& URLNavigator::url() const @@ -414,8 +414,8 @@ void URLNavigator::slotBookmarkActivated(int index) void URLNavigator::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) { -// kdDebug() << "received redirection to " << newUrl << endl; -kdDebug() << "received redirection from " << oldUrl << " to " << newUrl << endl; +// kDebug() << "received redirection to " << newUrl << endl; +kDebug() << "received redirection from " << oldUrl << " to " << newUrl << endl; /* UrlStack::iterator it = m_urls.find(oldUrl); if (it != m_urls.end()) { diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp index cd13ca5716..0b6165ec6e 100644 --- a/src/urlnavigatorbutton.cpp +++ b/src/urlnavigatorbutton.cpp @@ -211,7 +211,7 @@ void URLNavigatorButton::dropEvent(QDropEvent* event) if (KUrlDrag::decode(event, urls) && !urls.isEmpty()) { setDisplayHintEnabled(DraggedHint, true); - QString path(urlNavigator()->url().prettyURL()); + QString path(urlNavigator()->url().prettyUrl()); path = path.section('/', 0, m_index); Dolphin::mainWin().dropURLs(urls, KUrl(path)); diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index f72e6fc40c..51474db8f0 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -214,7 +214,7 @@ void ViewPropertiesDialog::applyViewProperties() } } - ViewProperties props(QDir::homeDirPath()); + ViewProperties props(QDir::homePath()); props.setViewMode(m_viewProps->viewMode()); props.setSorting(m_viewProps->sorting()); props.setSortOrder(m_viewProps->sortOrder());