Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance

9 files changed, 20 insertions, 20 deletions

diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index a96de06cf..c06331994 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -192,7 +192,7 @@ TQString KonqAboutPageFactory::intro()
 
     TDEIconLoader *iconloader = TDEGlobal::iconLoader();
     TQString back_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("forward", TDEIcon::Small ):iconloader->iconPath("back", TDEIcon::Small );
-    TQString gohome_icon_path = iconloader->iconPath("gohome", TDEIcon::Small );
+    TQString gohome_icon_path = iconloader->iconPath("go-home", TDEIcon::Small );
     TQString continue_icon_path = TQApplication::reverseLayout()?iconloader->iconPath("1leftarrow", TDEIcon::Small ):iconloader->iconPath("1rightarrow", TDEIcon::Small );
 
     res = res.arg( locate( "data", "tdeui/about/kde_infopage.css" ) );
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 197d5ab99..67e694dd5 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -105,7 +105,7 @@ void KEBApp::createActions() {
 
     // actions
     (void) new TDEAction(
-        i18n("&Delete"), "editdelete", Key_Delete,
+        i18n("&Delete"), "edit-delete", Key_Delete,
         TQT_TQOBJECT(actn), TQT_SLOT( slotDelete() ), actionCollection(), "delete");
     (void) new TDEAction(
         i18n("Rename"), "text", Key_F2,
@@ -126,7 +126,7 @@ void KEBApp::createActions() {
         i18n("Recursive Sort"), 0,
         TQT_TQOBJECT(actn), TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort");
     (void) new TDEAction(
-        i18n("&New Folder..."), "folder_new", CTRL+Key_N,
+        i18n("&New Folder..."), "folder-new", CTRL+Key_N,
         TQT_TQOBJECT(actn), TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder");
     (void) new TDEAction(
         i18n("&New Bookmark"), "www", 0,
@@ -154,7 +154,7 @@ void KEBApp::createActions() {
         i18n("Collapse &All Folders"), 0,
         TQT_TQOBJECT(actn), TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" );
     (void) new TDEAction(
-        i18n("&Open in Konqueror"), "fileopen", 0,
+        i18n("&Open in Konqueror"), "document-open", 0,
         TQT_TQOBJECT(actn), TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" );
     (void) new TDEAction(
         i18n("Check &Status"), "bookmark", 0,
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 9a89cc87f..bd2d6164e 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -3813,7 +3813,7 @@ void KonqMainWindow::initActions()
   {
      (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, TQT_TQOBJECT(this), TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" );
   }
-  (void) new TDEAction( i18n( "&Open Location..." ), "fileopen", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
+  (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), TQT_TQOBJECT(this), TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" );
 
   m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), TQT_TQOBJECT(this), TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" );
 
@@ -3848,7 +3848,7 @@ void KonqMainWindow::initActions()
   connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( slotGoMenuAboutToShow() ) );
   connect( m_paHistory, TQT_SIGNAL( activated( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotGoHistoryActivated( int ) ) );
 
-  m_paHome = new TDEAction( i18n( "Home" ), "gohome", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" );
+  m_paHome = new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" );
   connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
 	   TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) );
 
@@ -3957,7 +3957,7 @@ void KonqMainWindow::initActions()
   connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
            TQT_TQOBJECT(this), TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) );
 
-  m_paDelete = new TDEAction( i18n( "&Delete" ), "editdelete", SHIFT+Key_Delete, actionCollection(), "del" );
+  m_paDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, actionCollection(), "del" );
   // F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default.
   m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, TQT_TQOBJECT(this), TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" );
   m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, TQT_TQOBJECT(this), TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" );
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc
index 5f8626f8e..f7241713b 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cc
@@ -76,7 +76,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese
 : KDialogBase( parent, "konq_profile_dialog", true, i18n( "Profile Management" ),
     KDialogBase::Close | BTN_RENAME | BTN_DELETE | BTN_SAVE, BTN_SAVE, true,
     KGuiItem( i18n( "&Rename Profile" ) ),
-    KGuiItem( i18n( "&Delete Profile" ), "editdelete"),
+    KGuiItem( i18n( "&Delete Profile" ), "edit-delete"),
     KStdGuiItem::save() )
 {
   m_pViewManager = manager;
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc
index cc0f00ef7..0ccaa4b55 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cc
@@ -282,7 +282,7 @@ void KonqFrameTabs::setTabIcon( const KURL &url, TQWidget* sender )
   //kdDebug(1202) << "KonqFrameTabs::setTabIcon( " << url << " , " << sender << " )" << endl;
   TQIconSet iconSet;
   if (m_permanentCloseButtons)
-    iconSet =  SmallIcon( "fileclose" );
+    iconSet =  SmallIcon( "window-close" );
   else
     iconSet =  SmallIconSet( KonqPixmapProvider::self()->iconNameFor( url.url() ) );
   if (tabIconSet( sender ).pixmap().serialNumber() != iconSet.pixmap().serialNumber())
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index e8e2f9f91..8eefa7c34 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -879,7 +879,7 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev)
 						m_buttonPopup->insertItem(SmallIconSet("www"), i18n("Set URL..."),2);
 						m_buttonPopup->insertItem(SmallIconSet("icons"), i18n("Set Icon..."),1);
 						m_buttonPopup->insertSeparator();
-						m_buttonPopup->insertItem(SmallIconSet("editdelete"), i18n("Remove"),3);
+						m_buttonPopup->insertItem(SmallIconSet("edit-delete"), i18n("Remove"),3);
 						m_buttonPopup->insertSeparator();
 						m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4);
 						connect(m_buttonPopup, TQT_SIGNAL(activated(int)),
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 675642c36..692241d8c 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -56,11 +56,11 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr
             this,   TQT_SLOT(slotOpenChange(TQListViewItem*)));
 
     m_collection = new TDEActionCollection( this, "bookmark actions" );
-    (void) new TDEAction( i18n("&Create New Folder"), "folder_new", 0, this,
+    (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this,
                         TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
-    (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, this,
+    (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this,
                         TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
-    (void) new TDEAction( i18n("Delete Bookmark"), "editdelete", 0, this,
+    (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this,
                         TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark");
     (void) new TDEAction( i18n("Properties"), "edit", 0, this,
                         TQT_SLOT( slotProperties() ), m_collection, "item_properties");
@@ -70,7 +70,7 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr
                         TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
     (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this,
                         TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs");
-    (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, this,
+    (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this,
                         TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
 
     KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ),
@@ -309,7 +309,7 @@ void KonqSidebarBookmarkModule::slotDelete()
                     : i18n("Are you sure you wish to remove the bookmark\n\"%1\"?").arg(bookmark.text()),
             folder ? i18n("Bookmark Folder Deletion")
                     : i18n("Bookmark Deletion"),
-            KGuiItem( i18n("&Delete"), "editdelete"), KStdGuiItem::cancel())
+            KGuiItem( i18n("&Delete"), "edit-delete"), KStdGuiItem::cancel())
             != KMessageBox::Yes
         )
         return;
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 6d5ac5094..3ebb339a0 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -77,7 +77,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
     m_collection = new TDEActionCollection( this, "history actions" );
     (void) new TDEAction( i18n("New &Window"), "window_new", 0, this,
  			TQT_SLOT( slotNewWindow() ), m_collection, "open_new");
-    (void) new TDEAction( i18n("&Remove Entry"), "editdelete", 0, this,
+    (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this,
 			TQT_SLOT( slotRemoveEntry() ), m_collection, "remove");
     (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this,
 			TQT_SLOT( slotClearHistory() ), m_collection, "clear");
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index cd915c4ab..f5cf661b3 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -911,13 +911,13 @@ void KonqSidebarTree::showToplevelContextMenu()
     if (!m_collection)
     {
         m_collection = new TDEActionCollection( this, "bookmark actions" );
-        (void) new TDEAction( i18n("&Create New Folder..."), "folder_new", 0, TQT_TQOBJECT(this),
+        (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, TQT_TQOBJECT(this),
                             TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder");
-        (void) new TDEAction( i18n("Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this),
+        (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this),
                             TQT_SLOT( slotDelete() ), m_collection, "delete_folder");
         (void) new TDEAction( i18n("Rename"), 0, TQT_TQOBJECT(this),
                             TQT_SLOT( slotRename() ), m_collection, "rename");
-        (void) new TDEAction( i18n("Delete Link"), "editdelete", 0, TQT_TQOBJECT(this),
+        (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, TQT_TQOBJECT(this),
                             TQT_SLOT( slotDelete() ), m_collection, "delete_link");
         (void) new TDEAction( i18n("Properties"), "edit", 0, TQT_TQOBJECT(this),
                             TQT_SLOT( slotProperties() ), m_collection, "item_properties");
@@ -925,7 +925,7 @@ void KonqSidebarTree::showToplevelContextMenu()
                             TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window");
         (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, TQT_TQOBJECT(this),
                             TQT_SLOT( slotOpenTab() ), m_collection, "open_tab");
-        (void) new TDEAction( i18n("Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this),
+        (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this),
                             TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location");
     }