Some port

Remove not necessary file

svn path=/trunk/playground/utils/dolphin/; revision=606884

diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp
index 58b06534b583823f95812126385921b34e025ed1..cab189a48f3c768e5b496fda62b51b6f1918abc2 100644 (file)
--- a/src/bookmarkssettingspage.cpp
+++ b/src/bookmarkssettingspage.cpp
@@ -34,7 +34,7 @@
 #include <kbookmarkmanager.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <kbookmarkmanager.h>
 #include <kdialog.h>
 #include <kiconloader.h>

-#include <klistview.h>
+#include <k3listview.h>

 #include <klocale.h>
 #include <kpushbutton.h>
 
 #include <klocale.h>
 #include <kpushbutton.h>
 


@@ -57,7 +57,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
     hBox->setSpacing(spacing);
     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
 
     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"));
     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());
         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());
 
         // 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),
     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();
     }
                          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"),
 {
     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());
                                                          "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);
 
         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),
 
     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->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());
     }
 }
         item->setText(IconIdx, bookmark.icon());
     }
 }

diff --git a/src/bookmarkssettingspage.h b/src/bookmarkssettingspage.h
index 8636ad7e817515450afa2efd7ee578eaaa750ee4..f9da7ad5e4ecbedaa0a95b33dbb6feeaf88e6de2 100644 (file)
--- a/src/bookmarkssettingspage.h
+++ b/src/bookmarkssettingspage.h
@@ -24,7 +24,7 @@
 #include <settingspagebase.h>
 #include <q3valuelist.h>
 
 #include <settingspagebase.h>
 #include <q3valuelist.h>
 

-class KListView;
+class K3ListView;

 class KPushButton;
 class Q3ListViewItem;
 
 class KPushButton;
 class Q3ListViewItem;
 


@@ -70,7 +70,7 @@ private:
         IconIdx   = 3
     };
 
         IconIdx   = 3
     };
 

-    KListView* m_listView;
+    K3ListView* m_listView;

     KPushButton* m_addButton;
     KPushButton* m_editButton;
     KPushButton* m_removeButton;
     KPushButton* m_addButton;
     KPushButton* m_editButton;
     KPushButton* m_removeButton;

diff --git a/src/bookmarkssidebarpage.cpp b/src/bookmarkssidebarpage.cpp
index deb311914589f250abaa8e9fb512f17c52043955..1fc35048f98350c3e0e30905ad302179a5fce6f0 100644 (file)
--- 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(),
     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);
 
         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",
         case insertID: {
             KBookmark newBookmark = EditBookmarkDialog::getBookmark(i18n("Insert Bookmark"),
                                                                     "New bookmark",

-                                                                    KURL(),
+                                                                    KUrl(),

                                                                     "bookmark");
             if (!newBookmark.isNull()) {
                 root.addBookmark(manager, newBookmark);
                                                                     "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",
         case addID: {
             KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add Bookmark"),
                                                                  "New bookmark",

-                                                                 KURL(),
+                                                                 KUrl(),

                                                                  "bookmark");
             if (!bookmark.isNull()) {
                 root.addBookmark(manager, bookmark);
                                                                  "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().
 {
     // 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()) {
     // 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)) {
         if (bookmarkURL.isParentOf(url)) {

-            const int length = bookmarkURL.prettyURL().length();
+            const int length = bookmarkURL.prettyUrl().length();

             if (length > maxLength) {
                 selectedIndex = i;
                 maxLength = length;
             if (length > maxLength) {
                 selectedIndex = i;
                 maxLength = length;


@@ -234,7 +234,7 @@ void BookmarksSidebarPage::adjustSelection(const KURL& url)
     m_bookmarksList->blockSignals(block);
 }
 
     m_bookmarksList->blockSignals(block);
 }
 

-void BookmarksSidebarPage::slotURLChanged(const KURL& url)
+void BookmarksSidebarPage::slotURLChanged(const KUrl& url)

 {
     adjustSelection(url);
 }
 {
     adjustSelection(url);
 }


@@ -243,8 +243,8 @@ void BookmarksSidebarPage::connectToActiveView()
 {
     DolphinView* view = Dolphin::mainWin().activeView();
     adjustSelection(view->url());
 {
     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) :
 }
 
 BookmarksListBox::BookmarksListBox(QWidget* parent) :

diff --git a/src/bookmarkssidebarpage.h b/src/bookmarkssidebarpage.h
index 3292eaec0f28cd5e9f05b04278b3d466014b032b..eb49e3e7d7cc9fc7f596f0a45da6cbc1535baa9b 100644 (file)
--- a/src/bookmarkssidebarpage.h
+++ b/src/bookmarkssidebarpage.h
@@ -25,7 +25,7 @@
 #include <QPaintEvent>
 #include <QPixmap>
 
 #include <QPaintEvent>
 #include <QPixmap>
 

-class KURL;
+class KUrl;

 class BookmarksListBox;
 
 /**
 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.
      */
      * 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:
     /**
 
 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.
      */
      * 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
 
     /**
      * Connects to signals from the currently active Dolphin view to get

diff --git a/src/detailsmodesettings.kcfg b/src/detailsmodesettings.kcfg
index 160ca260f6a4a4536f9969858af7a1d66cbef141..c7ab10d15e323a83b12cff597119747b7aa916cc 100644 (file)
--- a/src/detailsmodesettings.kcfg
+++ b/src/detailsmodesettings.kcfg
@@ -14,7 +14,7 @@
         </entry>
         <entry name="IconSize" type="Int">
             <label>Icon size</label>
         </entry>
         <entry name="IconSize" type="Int">
             <label>Icon size</label>

-            <default code="true">KIcon::SizeSmall</default>
+            <default code="true">K3Icon::SizeSmall</default>

         </entry>
         <entry name="ShowDate" type="Bool">
             <label>Show date</label>
         </entry>
         <entry name="ShowDate" type="Bool">
             <label>Show date</label>

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index d0025501ede6739c231eab8d7ae4992872c4b1e0..3f400096e5d3937397acf31795bb3e56188915d5 100644 (file)
--- 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()) {
     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;
 
             m_largeIconSize->setChecked(true);
             break;
 

-        case KIcon::SizeMedium:
+        case K3Icon::SizeMedium:

             m_mediumIconSize->setChecked(true);
             break;
 
             m_mediumIconSize->setChecked(true);
             break;
 

-        case KIcon::SizeSmall:
+        case K3Icon::SizeSmall:

         default:
             m_smallIconSize->setChecked(true);
     }
         default:
             m_smallIconSize->setChecked(true);
     }


@@ -135,12 +135,12 @@ void DetailsViewSettingsPage::applySettings()
     settings->setShowOwner(m_ownerBox->isChecked());
     settings->setShowGroup(m_groupBox->isChecked());
 
     settings->setShowOwner(m_ownerBox->isChecked());
     settings->setShowGroup(m_groupBox->isChecked());
 

-    int iconSize = KIcon::SizeSmall;
+    int iconSize = K3Icon::SizeSmall;

     if (m_mediumIconSize->isChecked()) {
     if (m_mediumIconSize->isChecked()) {

-        iconSize = KIcon::SizeMedium;
+        iconSize = K3Icon::SizeMedium;

     }
     else if (m_largeIconSize->isChecked()) {
     }
     else if (m_largeIconSize->isChecked()) {

-        iconSize = KIcon::SizeLarge;
+        iconSize = K3Icon::SizeLarge;

     }
     settings->setIconSize(iconSize);
 
     }
     settings->setIconSize(iconSize);
 

diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index 602dafa2ca9802073b10a77999740c5df27cf56d..495eb53f5ec4de7deda98152161b9d362dbbf7e1 100644 (file)
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -298,7 +298,7 @@ void Dolphin::slotSelectionChanged()
 void Dolphin::closeEvent(QCloseEvent* event)
 {
     // KDE4-TODO
 void Dolphin::closeEvent(QCloseEvent* event)
 {
     // KDE4-TODO

-    //KConfig* config = kapp->config();
+    //KConfig* config = KGlobal::config();

     //config->setGroup("General");
     //config->writeEntry("First Run", false);
 
     //config->setGroup("General");
     //config->writeEntry("First Run", false);
 

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index bea01afc44dc516212770693f71265b45d495500..e3313a89b319f8dc268a049025ad28a07e9df0f1 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -38,6 +38,8 @@
 #include <assert.h>
 #include <ksortablevaluelist.h>
 #include <kio/netaccess.h>
 #include <assert.h>
 #include <ksortablevaluelist.h>
 #include <kio/netaccess.h>

+#include <kmenu.h>
+#include <kstdaction.h>

 
 #include "dolphin.h"
 #include "dolphinview.h"
 
 #include "dolphin.h"
 #include "dolphinview.h"


@@ -111,7 +113,7 @@ void DolphinContextMenu::openViewportContextMenu()
     //    ++linkGroupIt;
     //}
     //
     //    ++linkGroupIt;
     //}
     //

-    //KPopupMenu* linkToDeviceMenu = new KPopupMenu();
+    //KMenu* linkToDeviceMenu = new KMenu();

     //QPtrListIterator<KAction> linkToDeviceIt(dolphin.linkToDeviceActions());
     //while ((action = linkToDeviceIt.current()) != 0) {
     //    action->plug(linkToDeviceMenu);
     //QPtrListIterator<KAction> 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) {
         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"),
         KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),

-                                                             url.filename(),
+                                                             url.fileName(),

                                                              url,
                                                              "bookmark");
         if (!bookmark.isNull()) {
                                                              url,
                                                              "bookmark");
         if (!bookmark.isNull()) {


@@ -178,7 +180,7 @@ void DolphinContextMenu::openItemContextMenu()
 
     KMenu* popup = new KMenu(m_dolphinView);
     Dolphin& dolphin = Dolphin::mainWin();
 
     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 };
 
     // 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'
     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);
     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) {
     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"),
         KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add folder as bookmark"),

-                                                             selectedURL.filename(),
+                                                             selectedURL.fileName(),

                                                              selectedURL,
                                                              "bookmark");
         if (!bookmark.isNull()) {
                                                              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)) {
                 // 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;
                                             appName, index);
                     openWithVector.append(*it);
                     ++index;

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index bffd134c9712037f0a0f57554ac72f0cdb043acc..255804ca347b82a91317bd65ae7ccae9997f1d55 100644 (file)
--- 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)));
             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()),
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),


@@ -143,7 +143,7 @@ void DolphinDetailsView::insertItem(KFileItem* fileItem)
 
     DolphinListViewItem* item = new DolphinListViewItem(static_cast<Q3ListView*>(this), fileItem);
 
 
     DolphinListViewItem* item = new DolphinListViewItem(static_cast<Q3ListView*>(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(),
     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 dbf03491ea80e65df09f2d2172227b1703026547..e722948b2b5607d5c1196afac048213e9f6b96e5 100644 (file)
--- 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&)));
             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()),
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index d1bb2765d399950be53bb5901c1c7f00d4c69b5d..8f48de3919b0d4149f6459f294edeff30158b0e2 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -33,22 +33,22 @@ DolphinSettingsDialog::DolphinSettingsDialog() :
                 Ok|Apply|Cancel, Ok)
 {
     KIconLoader iconLoader;
                 Ok|Apply|Cancel, Ok)
 {
     KIconLoader iconLoader;

-    Q3Frame* generalSettingsFrame = addPage(i18n("General"), 0,
+    QFrame* generalSettingsFrame = addPage(i18n("General"), 0,

                                                 iconLoader.loadIcon("exec",
                                                 iconLoader.loadIcon("exec",

-                                                                    KIcon::NoGroup,
-                                                                    KIcon::SizeMedium));
+                                                                    K3Icon::NoGroup,
+                                                                    K3Icon::SizeMedium));

     m_generalSettingsPage = new GeneralSettingsPage(generalSettingsFrame);
 
     m_generalSettingsPage = new GeneralSettingsPage(generalSettingsFrame);
 

-    Q3Frame* viewSettingsFrame = addPage(i18n("View Modes"), 0,
+    QFrame* viewSettingsFrame = addPage(i18n("View Modes"), 0,

                                         iconLoader.loadIcon("view_choose",
                                         iconLoader.loadIcon("view_choose",

-                                                            KIcon::NoGroup,
-                                                            KIcon::SizeMedium));
+                                                            K3Icon::NoGroup,
+                                                            K3Icon::SizeMedium));

     m_viewSettingsPage = new ViewSettingsPage(viewSettingsFrame);
 
     m_viewSettingsPage = new ViewSettingsPage(viewSettingsFrame);
 

-    Q3Frame* bookmarksSettingsFrame = addPage(i18n("Bookmarks"), 0,
+    QFrame* bookmarksSettingsFrame = addPage(i18n("Bookmarks"), 0,

                                              iconLoader.loadIcon("bookmark",
                                              iconLoader.loadIcon("bookmark",

-                                                                 KIcon::NoGroup,
-                                                                 KIcon::SizeMedium));
+                                                                 K3Icon::NoGroup,
+                                                                 K3Icon::SizeMedium));

     m_bookmarksSettingsPage = new BookmarksSettingsPage(bookmarksSettingsFrame);
 }
 
     m_bookmarksSettingsPage = new BookmarksSettingsPage(bookmarksSettingsFrame);
 }
 

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index d6dc75d23d625d4697aa8c394639d37cef9e30c5..fb75f1c6728a397a19d3debaafa8e7113c8aeb11 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -417,7 +417,7 @@ void DolphinView::setSorting(Sorting sorting)
         ViewProperties props(url());
         props.setSorting(sorting);
 
         ViewProperties props(url());
         props.setSorting(sorting);
 

-        view->setSorting(static_cast<QDir::SortSpec>(spec));
+        view->setSorting(static_cast<QDir::SortFlags>(spec));

 
         emit signalSortingChanged(sorting);
     }
 
         emit signalSortingChanged(sorting);
     }


@@ -425,7 +425,7 @@ void DolphinView::setSorting(Sorting sorting)
 
 DolphinView::Sorting DolphinView::sorting() const
 {
 
 DolphinView::Sorting DolphinView::sorting() const
 {

-    const QDir::SortSpec spec = fileView()->sorting();
+    const QDir::SortFlags spec = fileView()->sorting();

 
     if (spec & QDir::Time) {
         return SortByDate;
 
     if (spec & QDir::Time) {
         return SortByDate;


@@ -449,7 +449,7 @@ void DolphinView::setSortOrder(Qt::SortOrder order)
         ViewProperties props(url());
         props.setSortOrder(order);
 
         ViewProperties props(url());
         props.setSortOrder(order);
 

-        view->setSorting(static_cast<QDir::SortSpec>(sorting));
+        view->setSorting(static_cast<QDir::SortFlags>(sorting));

 
         emit signalSortOrderChanged(order);
     }
 
         emit signalSortOrderChanged(order);
     }

diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp
index d467db15d289cbec4b2a0e2cc944652b55d27843..c5917fda8e381232ce9fcdf48f5820a3245e75d3 100644 (file)
--- a/src/editbookmarkdialog.cpp
+++ b/src/editbookmarkdialog.cpp
@@ -39,7 +39,7 @@ EditBookmarkDialog::~EditBookmarkDialog()
 
 KBookmark EditBookmarkDialog::getBookmark(const QString& title,
                                           const QString& name,
 
 KBookmark EditBookmarkDialog::getBookmark(const QString& title,
                                           const QString& name,

-                                          const KURL& url,
+                                          const KUrl& url,

                                           const QString& icon)
 {
     EditBookmarkDialog dialog(title, name, url, icon);
                                           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(),
 void EditBookmarkDialog::slotOk()
 {
     m_bookmark = KBookmark::standaloneBookmark(m_name->text(),

-                                               KURL(m_location->text()),
+                                               KUrl(m_location->text()),

                                                m_iconName);
 
     KDialogBase::slotOk();
                                                m_iconName);
 
     KDialogBase::slotOk();


@@ -58,7 +58,7 @@ void EditBookmarkDialog::slotOk()
 
 EditBookmarkDialog::EditBookmarkDialog(const QString& title,
                                        const QString& name,
 
 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),
                                        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());
     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);
     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()
 {
 
 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));
     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());
 void EditBookmarkDialog::selectLocation()
 {
     const QString location(m_location->text());

-    KURL url(KFileDialog::getExistingURL(location));
+    KUrl url(KFileDialog::getExistingURL(location));

     if (!url.isEmpty()) {
     if (!url.isEmpty()) {

-        m_location->setText(url.prettyURL());
+        m_location->setText(url.prettyUrl());

     }
 }
 
     }
 }
 

diff --git a/src/editbookmarkdialog.h b/src/editbookmarkdialog.h
index e3578a94014e0bd4e0fcff28826863249ba91088..0d7051a6fa67c5604a0df44cda51bfd270264667 100644 (file)
--- 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"),
  * \code
  * KBookmark bookmark = EditBookmarkDialog::getBookmark(i18n("Add Bookmark"),
  *                                                      i18n("New bookmark"),

- *                                                      KURL(),
+ *                                                      KUrl(),

  *                                                      "bookmark");
  * if (!bookmark.isNull()) {
  *     // ...
  *                                                      "bookmark");
  * if (!bookmark.isNull()) {
  *     // ...


@@ -56,7 +56,7 @@ public:
      */
     static KBookmark getBookmark(const QString& title,
                                  const QString& name,
      */
     static KBookmark getBookmark(const QString& title,
                                  const QString& name,

-                                 const KURL& url,
+                                 const KUrl& url,

                                  const QString& icon);
 
 protected slots:
                                  const QString& icon);
 
 protected slots:


@@ -65,7 +65,7 @@ protected slots:
 protected:
     EditBookmarkDialog(const QString& title,
                        const QString& name,
 protected:
     EditBookmarkDialog(const QString& title,
                        const QString& name,

-                       const KURL& url,
+                       const KUrl& url,

                        const QString& icon);
 
 private slots:
                        const QString& icon);
 
 private slots:

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index d1d22eb480072875f24e2ccf3db0bf92061808b4..7be6c3b49613d70d2a03b66f46a068afa995c49f 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -127,10 +127,10 @@ void GeneralSettingsPage::applySettings()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 
 {
     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()) {
     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;
     }
 
     DolphinView::Mode viewMode = DolphinView::IconsView;


@@ -149,21 +149,21 @@ void GeneralSettingsPage::applySettings()
 void GeneralSettingsPage::selectHomeURL()
 {
     const QString homeURL(m_homeURL->text());
 void GeneralSettingsPage::selectHomeURL()
 {
     const QString homeURL(m_homeURL->text());

-    KURL url(KFileDialog::getExistingURL(homeURL));
+    KUrl url(KFileDialog::getExistingUrl(homeURL));

     if (!url.isEmpty()) {
     if (!url.isEmpty()) {

-        m_homeURL->setText(url.prettyURL());
+        m_homeURL->setText(url.prettyUrl());

     }
 }
 
 void GeneralSettingsPage::useCurrentLocation()
 {
     const DolphinView* view = Dolphin::mainWin().activeView();
     }
 }
 
 void GeneralSettingsPage::useCurrentLocation()
 {
     const DolphinView* view = Dolphin::mainWin().activeView();

-    m_homeURL->setText(view->url().prettyURL());
+    m_homeURL->setText(view->url().prettyUrl());

 }
 
 void GeneralSettingsPage::useDefaulLocation()
 {
 }
 
 void GeneralSettingsPage::useDefaulLocation()
 {

-    m_homeURL->setText("file://" + QDir::homeDirPath());
+    m_homeURL->setText("file://" + QDir::homePath());

 }
 
 #include "generalsettingspage.moc"
 }
 
 #include "generalsettingspage.moc"

diff --git a/src/iconsmodesettings.kcfg b/src/iconsmodesettings.kcfg
index 18625237aad04488101f2b8decb541c7facffcdd..371e7cabf5aec121c64f2ec1b0479434e1508dc6 100644 (file)
--- a/src/iconsmodesettings.kcfg
+++ b/src/iconsmodesettings.kcfg
@@ -18,7 +18,7 @@
         </entry>
         <entry name="GridHeight" type="Int">
             <label>Grid height</label>
         </entry>
         <entry name="GridHeight" type="Int">
             <label>Grid height</label>

-            <default code="true">KIcon::SizeMedium</default>
+            <default code="true">K3Icon::SizeMedium</default>

         </entry>
         <entry name="GridWidth" type="Int">
             <label>Grid width</label>
         </entry>
         <entry name="GridWidth" type="Int">
             <label>Grid width</label>


@@ -29,7 +29,7 @@
         </entry>
         <entry name="IconSize" type="Int">
             <label>Icon size</label>
         </entry>
         <entry name="IconSize" type="Int">
             <label>Icon size</label>

-            <default code="true">KIcon::SizeMedium</default>
+            <default code="true">K3Icon::SizeMedium</default>

         </entry>
         <entry name="NumberOfTexlines" type="Int">
             <label>Number of textlines</label>
         </entry>
         <entry name="NumberOfTexlines" type="Int">
             <label>Number of textlines</label>


@@ -37,7 +37,7 @@
         </entry>
         <entry name="PreviewSize" type="Int">
             <label>Preview size</label>
         </entry>
         <entry name="PreviewSize" type="Int">
             <label>Preview size</label>

-            <default code="true">KIcon::SizeMedium</default>
+            <default code="true">K3Icon::SizeMedium</default>

         </entry>
     </group>
 </kcfg>
\ No newline at end of file
         </entry>
     </group>
 </kcfg>
\ No newline at end of file

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index ad95155a877acb5d3e1fd5624a3145d7d98c3270..fab0a560436a0632a89f2c8efa10478fd2efaf42 100644 (file)
--- 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()));
     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);
     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());
 
     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()));
         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);
         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());
         m_previewSizeViewer->setEraseColor(iconBackgroundColor);
 
         slotPreviewSizeChanged(m_previewSizeSlider->value());


@@ -200,7 +200,7 @@ void IconsViewSettingsPage::applySettings()
 void IconsViewSettingsPage::slotIconSizeChanged(int value)
 {
     KIconLoader iconLoader;
 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();
 
     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;
     }
         // 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 IconsViewSettingsPage::iconSize(int sliderValue) const
 {

-    int size = KIcon::SizeMedium;
+    int size = K3Icon::SizeMedium;

     switch (sliderValue) {
     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;
 }
     }
     return size;
 }


@@ -241,12 +241,12 @@ int IconsViewSettingsPage::sliderValue(int iconSize) const
 {
     int value = 0;
     switch (iconSize) {
 {
     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;
         default: break;
     }
     return value;

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 4419817b9771c6aa1ef1d6ac6df91bde259702f8..b9e345f62fd54b51cb05e25699d56a460d6bb567 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -72,8 +72,8 @@ InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
 
     // preview
     m_preview = new PixmapViewer(this);
 
     // 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);
 
     // name
     m_name = new QLabel(this);


@@ -125,7 +125,7 @@ void InfoSidebarPage::activeViewChanged()
     connectToActiveView();
 }
 
     connectToActiveView();
 }
 

-void InfoSidebarPage::requestDelayedItemInfo(const KURL& url)
+void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url)

 {
     cancelRequest();
 
 {
     cancelRequest();
 


@@ -135,7 +135,7 @@ void InfoSidebarPage::requestDelayedItemInfo(const KURL& url)
     }
 }
 
     }
 }
 

-void InfoSidebarPage::requestItemInfo(const KURL& url)
+void InfoSidebarPage::requestItemInfo(const KUrl& url)

 {
     cancelRequest();
 
 {
     cancelRequest();
 


@@ -161,14 +161,14 @@ void InfoSidebarPage::showItemInfo()
     if (m_multipleSelection) {
         KIconLoader iconLoader;
         QPixmap icon = iconLoader.loadIcon("exec",
     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...
         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;
         list.append(m_shownURL);
 
         m_pendingPreview = true;


@@ -176,7 +176,7 @@ void InfoSidebarPage::showItemInfo()
 
         KIO::PreviewJob* job = KIO::filePreview(list,
                                                 m_preview->width(),
 
         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*)),
         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_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()) {
 {
     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 {
         KDEDesktopMimeType::executeService(selectedURLs, m_actionsVector[index]);
     }
     else {


@@ -232,10 +232,10 @@ void InfoSidebarPage::connectToActiveView()
     cancelRequest();
 
     DolphinView* view = Dolphin::mainWin().activeView();
     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();
 
     m_shownURL = view->url();
     showItemInfo();


@@ -254,8 +254,8 @@ bool InfoSidebarPage::applyBookmark()
 
             KIconLoader iconLoader;
             QPixmap icon = iconLoader.loadIcon(bookmark.icon(),
 
             KIconLoader iconLoader;
             QPixmap icon = iconLoader.loadIcon(bookmark.icon(),

-                                               KIcon::NoGroup,
-                                               KIcon::SizeEnormous);
+                                               K3Icon::NoGroup,
+                                               K3Icon::SizeEnormous);

             m_preview->setPixmap(icon);
             return true;
         }
             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);
 
         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);
 
         info->show();
         m_infoWidgets.append(info);
 


@@ -574,12 +574,12 @@ void ServiceButton::drawButton(QPainter* painter)
 
     // draw icon
     int x = spacing;
 
     // 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));
     }
     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);
 
     // draw text
     painter->setPen(foregroundColor);

diff --git a/src/infosidebarpage.h b/src/infosidebarpage.h
index 4b2152764a0b063047fd0d4a108ac5024308fa5c..dadda7880615bbdd0aef1ea60c36b097786b836f 100644 (file)
--- a/src/infosidebarpage.h
+++ b/src/infosidebarpage.h
@@ -72,7 +72,7 @@ private slots:
      *
      * @see InfoSidebarPage::showItemInfo()
      */
      *
      * @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
 
     /**
      * Does a request of information for the item of the given URL and


@@ -80,7 +80,7 @@ private slots:
      *
      * @see InfoSidebarPage::showItemInfo()
      */
      *
      * @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
 
     /**
      * 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;
     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;
 
     PixmapViewer* m_preview;
     QLabel* m_name;

diff --git a/src/main.cpp b/src/main.cpp
index 00e6aeb99dd268dcbb3563419a0a90a6a8acb469..8b52ba166055f8a4f4e2e52d8c546d12c36c91bd 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
     Dolphin& mainWin = Dolphin::mainWin();
     mainWin.show();
 
     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);
         int n = 1;
         while (KMainWindow::canBeRestored(n)){
             Dolphin::mainWin().restore(n);

diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp
index 575f3eda112b0652417c62627144b960161a4208..bcbee2aaa8170d64a74c311626486c73cbca54bb 100644 (file)
--- a/src/pixmapviewer.cpp
+++ b/src/pixmapviewer.cpp
@@ -30,8 +30,8 @@
 PixmapViewer::PixmapViewer(QWidget* parent) :
     QWidget(parent)
 {
 PixmapViewer::PixmapViewer(QWidget* parent) :
     QWidget(parent)
 {

-    setMinimumWidth(KIcon::SizeEnormous);
-    setMinimumWidth(KIcon::SizeEnormous);
+    setMinimumWidth(K3Icon::SizeEnormous);
+    setMinimumWidth(K3Icon::SizeEnormous);

 }
 
 PixmapViewer::~PixmapViewer()
 }
 
 PixmapViewer::~PixmapViewer()

diff --git a/src/portinglog.txt b/src/portinglog.txt
deleted file mode 100644 (file)
index bef5012..0000000
--- 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 <Q3PopupMenu> 
-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 <QPaintEvent>  #include <QPixmap> 
-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 <QPixmap>      #include <QResizeEvent>         #include <QEvent>       #include <QDropEvent>   #include <QMouseEvent>  #include <QDragMoveEvent>       #include <QPaintEvent> 
-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 <QCloseEvent> 
-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 <QDragEnterEvent>      #include <QDropEvent>   #include <QMouseEvent>  #include <QDragMoveEvent> 
-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 <QLabel> 
-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 <QDropEvent>   #include <Q3ValueList>  #include <QMouseEvent>  #include <Q3VBoxLayout> 
-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 <QKeyEvent>    #include <QLabel> 
-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 <QPixmap>      #include <QEvent>       #include <QLabel>       #include <Q3PtrList> 
-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 <QPaintEvent> 
-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 <Q3VBoxLayout> 
-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 <QPaintEvent>  #include <QResizeEvent> 
-In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/statusbarspaceinfo.h: Added the following include directives:
-       #include <QPaintEvent> 
-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 <QEvent> 
-In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/urlnavigatorbutton.h: Added the following include directives:
-       #include <QEvent>       #include <QDragLeaveEvent>      #include <QDropEvent>   #include <QDragEnterEvent> 
-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 <QLabel>       #include <Q3ValueList>  #include <QKeyEvent>    #include <Q3PopupMenu> 
-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 <QPixmap>      #include <Q3VBoxLayout> 
-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 <QPixmap>      #include <Q3VBoxLayout>         #include <QPaintEvent> 
-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 <Q3ValueList> 
-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 <Q3ValueList>  #include <QCloseEvent> 
-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 <Q3ValueList>  #include <QPixmap>      #include <QDragMoveEvent>       #include <QDropEvent>   #include <QResizeEvent>         #include <QMouseEvent>  #include <QEvent>       #include <QPaintEvent> 
-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 <QDragMoveEvent>       #include <QDropEvent>   #include <Q3ValueList>  #include <QPixmap>      #include <QMouseEvent>  #include <QDragEnterEvent> 
-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 <Q3Frame> 
-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 <Q3ValueList>  #include <QDropEvent>   #include <QMouseEvent>  #include <Q3VBoxLayout> 
-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 <Q3VBoxLayout> 
-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 <Q3VBoxLayout>         #include <QKeyEvent>    #include <Q3HBoxLayout> 
-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 <Q3VBoxLayout> 
-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 <Q3ValueList>  #include <QEvent>       #include <Q3VBoxLayout> 
-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 <QPixmap> 
-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 <QPixmap>      #include <QPaintEvent> 
-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 <Q3VBoxLayout> 
-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 <Q3VBoxLayout> 
-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 <QPixmap>      #include <QResizeEvent>         #include <QPaintEvent> 
-In file /home/kde4peter/Temp/dolphin_svn/dolphin/src/statusbarspaceinfo.cpp: Added the following include directives:
-       #include <QPaintEvent> 
-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 <QEvent> 
-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 <QDropEvent>   #include <QDragLeaveEvent>      #include <Q3PopupMenu>  #include <QEvent>       #include <QDragEnterEvent> 
-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 <Q3ValueList>  #include <QKeyEvent> 
-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 <Q3VBoxLayout> 
-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 <Q3VBoxLayout> 
-

diff --git a/src/previewsmodesettings.kcfg b/src/previewsmodesettings.kcfg
index 70c6d8cae5347449e700e6b1d02228fbf60e2bb1..96f677f5b5f6a58a12ae9020f1deb32dc18e229f 100644 (file)
--- a/src/previewsmodesettings.kcfg
+++ b/src/previewsmodesettings.kcfg
@@ -27,7 +27,7 @@
         </entry>
         <entry name="IconSize" type="Int">
             <label>Icon size</label>
         </entry>
         <entry name="IconSize" type="Int">
             <label>Icon size</label>

-            <default code="true">KIcon::SizeMedium</default>
+            <default code="true">K3Icon::SizeMedium</default>

         </entry>
         <entry name="NumberOfTexlines" type="Int">
             <label>Number of textlines</label>
         </entry>
         <entry name="NumberOfTexlines" type="Int">
             <label>Number of textlines</label>


@@ -35,7 +35,7 @@
         </entry>
         <entry name="PreviewSize" type="Int">
             <label>Preview size</label>
         </entry>
         <entry name="PreviewSize" type="Int">
             <label>Preview size</label>

-            <default code="true">KIcon::SizeMedium</default>
+            <default code="true">K3Icon::SizeMedium</default>

         </entry>
     </group>
 </kcfg>
\ No newline at end of file
         </entry>
     </group>
 </kcfg>
\ No newline at end of file

diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp
index b91b102cd0a68488991b189faa8a45c9787e5e42..1bfd5469ea12c2b4449a76ec4ef4c9f1f1576ea3 100644 (file)
--- 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)
     {
     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!
         //          << 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))
         {
         if (KProtocolInfo::protocolClass(*it) == ":" ||
             !KProtocolInfo::supportsWriting(*it))
         {

-        //kdDebug() << "!!! removing " << *it << endl;
+        //kDebug() << "!!! removing " << *it << endl;

             QStringList::iterator tempIt = it;
             ++tempIt;
             m_protocols.remove(it);
             QStringList::iterator tempIt = it;
             ++tempIt;
             m_protocols.remove(it);


@@ -100,7 +100,7 @@ void ProtocolCombo::setProtocol(int index)
     }
 
     QString protocol = m_protocols[index];
     }
 
     QString protocol = m_protocols[index];

-kdDebug() << "setProtocol " << index << " " << protocol << endl;
+kDebug() << "setProtocol " << index << " " << protocol << endl;

     setText(protocol);
     emit activated(protocol);
 /*    */
     setText(protocol);
     emit activated(protocol);
 /*    */

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index 301c02713fb69256949f1f8a20069a1a211d338e..43db19354290452a7ba5b15b592568772d965512 100644 (file)
--- 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);
     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 (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;
                 // 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 2ba984e38494ec4cea337397e60888c3be3d2b62..29502836ca3ed7186b2717ecd78af6c5fcb8dfd9 100755 (executable)
--- a/src/sidebar.h
+++ b/src/sidebar.h
@@ -25,7 +25,7 @@
 //Added by qt3to4:
 #include <Q3VBoxLayout>
 
 //Added by qt3to4:
 #include <Q3VBoxLayout>
 

-class KURL;
+class KUrl;

 class QComboBox;
 class Q3VBoxLayout;
 class SidebarPage;
 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;
         */
         * 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);
 
 private slots:
     void createPage(int index);

diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 9465f6de3cc2fa1a4d4bfbb558805eaca01eeecc..4ab2a0129242e077a29ed70ae09cf3557caae0e3 100644 (file)
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -37,7 +37,7 @@ StatusBarMessageLabel::StatusBarMessageLabel(QWidget* parent) :
     m_minTextHeight(-1),
     m_timer(0)
 {
     m_minTextHeight(-1),
     m_timer(0)
 {

-    setMinimumHeight(KIcon::SizeSmall);
+    setMinimumHeight(K3Icon::SizeSmall);

 
     m_timer = new QTimer(this);
     connect(m_timer, SIGNAL(timeout()),
 
     m_timer = new QTimer(this);
     connect(m_timer, SIGNAL(timeout()),


@@ -133,7 +133,7 @@ void StatusBarMessageLabel::paintEvent(QPaintEvent* /* event */)
 
     // draw text
     painter.setPen(foregroundColor);
 
     // 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);
     painter.end();
 
     bitBlt(this, 0, 0, &buffer);

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index ddcf1b761b04b0ed17a825256c161058bdecb377..fbb64c9a358fa4179ddf8b13387201a99debd2ee 100644 (file)
--- 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))
 
         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) {
     }
     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),
     // 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);
 }
 
                      text);
 }
 

diff --git a/src/undomanager.cpp b/src/undomanager.cpp
index 4173b3c5e90b0af21d75ff2f73d3911faf550cf7..958816b9d37811a1add3c4908e146f6d9ce84ca1 100644 (file)
--- 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();
         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()) {
 
         KIO::Job* job = 0;
         switch (command.type()) {


@@ -155,7 +155,7 @@ void UndoManager::undo()
             case DolphinCommand::Copy: {
                 KUrl::List list;
                 while (it != end) {
             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;
                 }
                     list.append(deleteURL);
                     ++it;
                 }


@@ -167,7 +167,7 @@ void UndoManager::undo()
                 KUrl::List list;
                 const KUrl newDestURL((*it).directory());
                 while (it != end) {
                 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;
                 }
                     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.
                 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;
                     KUrl newDestURL(destURL + originalFileName);
                     KIO::NetAccess::move(*it, newDestURL);
                     ++it;


@@ -275,11 +275,11 @@ void UndoManager::redo()
             }
 
             case DolphinCommand::Trash: {
             }
 
             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.
                 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);
                     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 c1833b290698c9a3beb093058ff3760adb278a76..2b2f051f3417ac8d6cced82c69c21c6993bb8816 100644 (file)
--- a/src/urlbutton.h
+++ b/src/urlbutton.h
@@ -25,7 +25,7 @@
 //Added by qt3to4:
 #include <QEvent>
 
 //Added by qt3to4:
 #include <QEvent>
 

-class KURL;
+class KUrl;

 class URLNavigator;
 class QPainter;
 
 class URLNavigator;
 class QPainter;
 

diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index e1afa3ffc174dea306e93114d5e3cdc2ae516cd2..522198ff0e1f79116a434a1597e2c5e44a8d859e 100644 (file)
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -134,7 +134,7 @@ URLNavigator::~URLNavigator()
 void URLNavigator::setURL(const KUrl& url)
 {
     QString urlStr(url.pathOrUrl());
 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);
     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();
         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;
         }
     }
             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
     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;
     }
 
         return;
     }
 


@@ -179,15 +179,15 @@ void URLNavigator::setURL(const KUrl& url)
         --m_historyIndex;
     }
 
         --m_historyIndex;
     }
 

-/*    kdDebug() << "history starting ====================" << endl;
+/*    kDebug() << "history starting ====================" << endl;

     int i = 0;
     for (QValueListIterator<URLNavigator::HistoryElem> it = m_history.begin();
          it != m_history.end();
          ++it, ++i)
     {
     int i = 0;
     for (QValueListIterator<URLNavigator::HistoryElem> 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
 }
 
 const KUrl& URLNavigator::url() const


@@ -414,8 +414,8 @@ void URLNavigator::slotBookmarkActivated(int index)
 
 void URLNavigator::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
 {
 
 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())
     {
 /*    UrlStack::iterator it = m_urls.find(oldUrl);
     if (it != m_urls.end())
     {

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index cd13ca5716dbb1e24d2b8998cc613618b2459fd3..0b6165ec6ec4ed0cd40a551ed10831623bdd24a3 100644 (file)
--- 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);
 
     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));
         path = path.section('/', 0, m_index);
 
         Dolphin::mainWin().dropURLs(urls, KUrl(path));

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index f72e6fc40c928e2fb9184445ace9ba5bee2b95fd..51474db8f0b3641eb36b38d6904ce6eda5b8027e 100644 (file)
--- 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());
         props.setViewMode(m_viewProps->viewMode());
         props.setSorting(m_viewProps->sorting());
         props.setSortOrder(m_viewProps->sortOrder());