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

9 files changed, 19 insertions, 19 deletions

diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index e1b00bc40..cbeadc413 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -276,7 +276,7 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address,
     id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) );
     contextMenu->setItemParameter( id, val );
     contextMenu->insertSeparator();
-    id = contextMenu->insertItem( SmallIcon("editdelete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
+    id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
     contextMenu->setItemParameter( id, val );
     contextMenu->insertSeparator();
     id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) );
@@ -287,7 +287,7 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address,
     id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) );
     contextMenu->setItemParameter( id, val );
     contextMenu->insertSeparator();
-    id = contextMenu->insertItem( SmallIcon("editdelete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
+    id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
     contextMenu->setItemParameter( id, val );
     contextMenu->insertSeparator();
     id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) );
@@ -541,7 +541,7 @@ void KBookmarkMenu::addNewFolder()
     title.remove( p, 1 );
 
   TDEAction * paNewFolder = new TDEAction( title,
-                                       "folder_new", //"folder",
+                                       "folder-new", //"folder",
                                        0,
                                        this,
                                        TQT_SLOT( slotNewFolder() ),
@@ -828,7 +828,7 @@ KBookmarkEditDialog::KBookmarkEditDialog(const TQString& title, const TQString&
 {
   setButtonOK( (editType == InsertionMode) ? KGuiItem( i18n( "&Add" ), "bookmark_add") : i18n( "&Update" ) );
   if (editType == InsertionMode) {
-    setButtonGuiItem( User1, KGuiItem( i18n( "&New Folder..." ), "folder_new") );
+    setButtonGuiItem( User1, KGuiItem( i18n( "&New Folder..." ), "folder-new") );
   }
 
   bool folder = url.isNull();
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 62cbd1d43..5d73df4e6 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -440,7 +440,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
 					kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</b>'. Please enter the password for this wallet below.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet)));
 				}
 				brandNew = false;
-				kpd->setButtonOK(KGuiItem(i18n("&Open"),"fileopen"));
+				kpd->setButtonOK(KGuiItem(i18n("&Open"),"document-open"));
 			} else {
 				emptyPass = true;
 			}
@@ -454,7 +454,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
 				kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to open the TDE wallet. This is used to store sensitive data in a secure fashion. Please enter a password to use with this wallet or click cancel to deny the application's request.").arg(TQStyleSheet::escape(appid)));
 			}
 			brandNew = true;
-			kpd->setButtonOK(KGuiItem(i18n("&Open"),"fileopen"));
+			kpd->setButtonOK(KGuiItem(i18n("&Open"),"document-open"));
 		} else {
 			kpd = new KPasswordDialog(KPasswordDialog::NewPassword, false, 0);
 			if (appid.length() == 0) {
@@ -463,7 +463,7 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
 				kpd->setPrompt(i18n("<qt>The application '<b>%1</b>' has requested to create a new wallet named '<b>%2</b>'. Please choose a password for this wallet, or cancel to deny the application's request.").arg(TQStyleSheet::escape(appid)).arg(TQStyleSheet::escape(wallet)));
 			}
 			brandNew = true;
-			kpd->setButtonOK(KGuiItem(i18n("C&reate"),"filenew"));
+			kpd->setButtonOK(KGuiItem(i18n("C&reate"),"document-new"));
 		}
 
 		if (kpd) {
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index c23628eae..c929028db 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -97,7 +97,7 @@ class UIServerSystemTray:public KSystemTray
          TDEPopupMenu* pop= contextMenu();
          pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
          pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
-         setPixmap(loadIcon("filesave"));
+         setPixmap(loadIcon("document-save"));
          //actionCollection()->action("file_quit")->setEnabled(true);
          KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection());
       }
@@ -595,7 +595,7 @@ UIServer::UIServer()
   readSettings();
 
   // setup toolbar
-  toolBar()->insertButton("editdelete", TOOL_CANCEL,
+  toolBar()->insertButton("edit-delete", TOOL_CANCEL,
                           TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
                           TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
   toolBar()->insertButton("configure", TOOL_CONFIGURE,
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 5027f631c..8087f206d 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -89,7 +89,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
                                    bool modal)
     : KDialogBase( parent, name, modal, i18n("Select Folder"),
                    Ok|Cancel|User1, Ok, false,
-                   KGuiItem( i18n("New Folder..."), "folder_new" ) ),
+                   KGuiItem( i18n("New Folder..."), "folder-new" ) ),
       m_localOnly( localOnly )
 {
     d = new KDirSelectDialogPrivate;
@@ -122,7 +122,7 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
              TQT_SLOT( slotComboTextChanged( const TQString& ) ));
 
     m_contextMenu = new TQPopupMenu( this );
-    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
+    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
     newFolder->plug(m_contextMenu);
     m_contextMenu->insertSeparator();
     m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index e4f86fbed..64f5f4fb2 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -752,11 +752,11 @@ void KURLBar::slotContextMenuRequested( TQListBoxItem *_item, const TQPoint& pos
         popup->insertSeparator();
     }
 
-    popup->insertItem(SmallIconSet("filenew"), i18n("&Add Entry..."), AddItem);
+    popup->insertItem(SmallIconSet("document-new"), i18n("&Add Entry..."), AddItem);
 
     if (item != 0L && item->isPersistent())
     {
-        popup->insertItem( SmallIconSet("editdelete"), i18n("&Remove Entry"),
+        popup->insertItem( SmallIconSet("edit-delete"), i18n("&Remove Entry"),
                           RemoveItem );
     }
 
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 7ecfd543d..64e25b93c 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -206,7 +206,7 @@ void KURLRequester::init()
 	d->edit = new KLineEdit( this, "line edit" );
 
     myButton = new KURLDragPushButton( this, "tdefile button");
-    TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
+    TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("document-open"));
     TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
     myButton->setIconSet( iconSet );
     myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp
index dc44aa8ba..c7dc845cc 100644
--- a/tdeio/tdefile/tdediroperator.cpp
+++ b/tdeio/tdefile/tdediroperator.cpp
@@ -1271,9 +1271,9 @@ void KDirOperator::setupActions()
     TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
     connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
 	     this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
-    new TDEAction( i18n( "Delete" ), "editdelete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
+    new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
                   TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
-    mkdirAction->setIcon( TQString::fromLatin1("folder_new") );
+    mkdirAction->setIcon( TQString::fromLatin1("folder-new") );
     reloadAction->setText( i18n("Reload") );
     reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload ));
 
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 03bc17757..a004ae177 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -1838,7 +1838,7 @@ void KFileDialog::setOperationMode( OperationMode mode )
     d->keepLocation = (mode == Saving);
     filterWidget->setEditable( !d->hasDefaultFilter || mode != Saving );
     if ( mode == Opening )
-       d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "fileopen") );
+       d->okButton->setGuiItem( KGuiItem( i18n("&Open"), "document-open") );
     else if ( mode == Saving ) {
        d->okButton->setGuiItem( KStdGuiItem::save() );
        setNonExtSelection();
diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 5db9c5a0c..7198a3fd5 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -89,8 +89,8 @@ void DefaultProgress::init()
 #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS
   // Set a useful icon for this window!
   KWin::setIcons( winId(),
-          TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 32 ),
-          TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 16 ) );
+          TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 32 ),
+          TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 16 ) );
 #endif
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),