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

10 files changed, 31 insertions, 31 deletions

diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index 1df590b..8750b68 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -71,7 +71,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
   grid->addWidget( bClear, 2, 2 );
 
   bClip = new KPushButton( KGuiItem( i18n( "&To Clipboard" ),
-            "editcopy" ), mainWidget );
+            "edit-copy" ), mainWidget );
   bClip->setFixedSize( bClip->sizeHint() );
   connect(bClip,TQT_SIGNAL(clicked()),this,TQT_SLOT(toClip()));
   grid->addWidget( bClip, 2, 3 );
@@ -79,7 +79,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
   // Build menu
   KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(_exit()), actionCollection() );
   
-  new TDEAction(i18n("&To Clipboard"), "editcopy",
+  new TDEAction(i18n("&To Clipboard"), "edit-copy",
          TDEStdAccel::shortcut(TDEStdAccel::Copy), TQT_TQOBJECT(this), TQT_SLOT(toClip()), actionCollection(), "copy_clip" );
 
   (void)new TDEAction(i18n("To Clipboard &UTF-8"), 0, TQT_TQOBJECT(this),
@@ -87,7 +87,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
   (void)new TDEAction(i18n("To Clipboard &HTML"), 0, TQT_TQOBJECT(this),
       TQT_SLOT(toClipHTML()), actionCollection(), "copy_html" );
  
-  new TDEAction(i18n("&From Clipboard"), "editpaste",
+  new TDEAction(i18n("&From Clipboard"), "edit-paste",
          TDEStdAccel::shortcut(TDEStdAccel::Paste), TQT_TQOBJECT(this), TQT_SLOT(fromClip()), actionCollection(), "from_clip" );
   (void)new TDEAction(i18n("From Clipboard UTF-8"), 0, TQT_TQOBJECT(this),
       TQT_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" );
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index ecc036c..33ac62c 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -166,9 +166,9 @@ void TopLevel::setupEditWidget()
 
   right_mouse_button->insertItem (i18n("Open..."),
 				  this, 	TQT_SLOT(file_open()));
-  right_mouse_button->insertItem (SmallIcon("filesave"),i18n("Save"),
+  right_mouse_button->insertItem (SmallIcon("document-save"),i18n("Save"),
 				  this, 	TQT_SLOT(file_save()));
-  right_mouse_button->insertItem (SmallIcon("filesaveas"),i18n("Save As..."),
+  right_mouse_button->insertItem (SmallIcon("document-save-as"),i18n("Save As..."),
 				  this, TQT_SLOT(file_save_as()));
   right_mouse_button->insertSeparator(-1);
   right_mouse_button->insertItem(i18n("Copy"),
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 215bbd7..b434d72 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -535,9 +535,9 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
 
         (void) new TDEAction(i18n("&Open Editor"), "edit",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
         TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),TQT_TQOBJECT(this), TQT_SLOT(slotexport()),actionCollection(),"key_export");
-        TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"editdelete", TQt::Key_Delete,TQT_TQOBJECT(this), TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete");
+        TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"edit-delete", TQt::Key_Delete,TQT_TQOBJECT(this), TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete");
         signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,TQT_TQOBJECT(this), TQT_SLOT(signkey()),actionCollection(),"key_sign");
-        TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"editdelete", 0,TQT_TQOBJECT(this), TQT_SLOT(delsignkey()),actionCollection(),"key_delsign");
+        TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,TQT_TQOBJECT(this), TQT_SLOT(delsignkey()),actionCollection(),"key_delsign");
         TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,TQT_TQOBJECT(this), TQT_SLOT(listsigns()),actionCollection(),"key_info");
         TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),TQT_TQOBJECT(this), TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import");
         TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default");
@@ -550,7 +550,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
         TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(editGroup()),actionCollection(),"edit_group");
 
 	TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,TQT_TQOBJECT(this), TQT_SLOT(addToKAB()),actionCollection(),"add_kab");
-        (void) new TDEAction(i18n("&Go to Default Key"), "gohome",TQKeySequence(CTRL+TQt::Key_Home) ,TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key");
+        (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key");
 
         KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitApp()), actionCollection());
         KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(findKey()), actionCollection());
@@ -966,7 +966,7 @@ void listKeys::slotGpgError(TQString errortxt)
 
 void listKeys::slotDeletePhoto()
 {
-        if (KMessageBox::warningContinueCancel(this,i18n("<qt>Are you sure you want to delete Photo id <b>%1</b><br>from key <b>%2 &lt;%3&gt;</b> ?</qt>").arg(keysList2->currentItem()->text(6)).arg(keysList2->currentItem()->parent()->text(0)).arg(keysList2->currentItem()->parent()->text(1)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete"))!=KMessageBox::Continue)
+        if (KMessageBox::warningContinueCancel(this,i18n("<qt>Are you sure you want to delete Photo id <b>%1</b><br>from key <b>%2 &lt;%3&gt;</b> ?</qt>").arg(keysList2->currentItem()->text(6)).arg(keysList2->currentItem()->parent()->text(0)).arg(keysList2->currentItem()->parent()->text(1)),i18n("Warning"),KGuiItem(i18n("Delete"),"edit-delete"))!=KMessageBox::Continue)
                 return;
 
         KgpgInterface *delPhotoProcess=new KgpgInterface();
@@ -1667,7 +1667,7 @@ void listKeys::deleteGroup()
         if (!keysList2->currentItem() || !keysList2->currentItem()->text(6).isEmpty())
                 return;
 
-        int result=KMessageBox::warningContinueCancel(this,i18n("<qt>Are you sure you want to delete group <b>%1</b> ?</qt>").arg(keysList2->currentItem()->text(0)),i18n("Warning"),KGuiItem(i18n("Delete"),"editdelete"));
+        int result=KMessageBox::warningContinueCancel(this,i18n("<qt>Are you sure you want to delete group <b>%1</b> ?</qt>").arg(keysList2->currentItem()->text(0)),i18n("Warning"),KGuiItem(i18n("Delete"),"edit-delete"));
         if (result!=KMessageBox::Continue)
                 return;
         KgpgInterface::delGpgGroup(keysList2->currentItem()->text(0), KGpgSettings::gpgConfigPath());
@@ -2347,7 +2347,7 @@ void listKeys::deleteseckey()
         int result=KMessageBox::warningContinueCancel(this,
                         i18n("<p>Delete <b>SECRET KEY</b> pair <b>%1</b>?</p>Deleting this key pair means you will never be able to decrypt files encrypted with this key again.").arg(res),
                         i18n("Warning"),
-                        KGuiItem(i18n("Delete"),"editdelete"));
+                        KGuiItem(i18n("Delete"),"edit-delete"));
         if (result!=KMessageBox::Continue)
                 return;
 
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index dfb8425..5146536 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -134,9 +134,9 @@ KJotsMain::KJotsMain(const char* name)
             TQT_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html");
     actions[ACTION_BOOK2HTML]->plug(exportBookMenu->popupMenu());
 
-    actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "editdelete", CTRL + Key_Delete, TQT_TQOBJECT(this),
+    actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "edit-delete", CTRL + Key_Delete, TQT_TQOBJECT(this),
             TQT_SLOT(deleteEntry()), actionCollection(), "del_page");
-    actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "editdelete", CTRL + SHIFT + Key_Delete, TQT_TQOBJECT(this),
+    actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "edit-delete", CTRL + SHIFT + Key_Delete, TQT_TQOBJECT(this),
             TQT_SLOT(deleteBook()), actionCollection(), "del_folder");
 
     actions[ACTION_MANUAL_SAVE] = new TDEAction(i18n("Manual Save"), 0, TDEStdAccel::save(),
@@ -150,7 +150,7 @@ KJotsMain::KJotsMain(const char* name)
     actions[ACTION_COPY]  = KStdAction::copy(TQT_TQOBJECT(me_text), TQT_SLOT(copy()), actionCollection());
     connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQT_SLOT(setEnabled(bool)));
     actions[ACTION_COPY]->setEnabled(false);
-    actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "editcopy", CTRL+Key_T, TQT_TQOBJECT(this),
+    actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "edit-copy", CTRL+Key_T, TQT_TQOBJECT(this),
             TQT_SLOT(copySelection()), actionCollection(), "copyIntoTitle");
     connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQT_SLOT(setEnabled(bool)));
     actions[ACTION_PASTE2TITLE]->setEnabled(false);
diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp
index c88fe49..ffa47c1 100644
--- a/kregexpeditor/auxbuttons.cpp
+++ b/kregexpeditor/auxbuttons.cpp
@@ -50,25 +50,25 @@ AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0)
   TQToolTip::add( _redo, i18n( "Redo" ) );
 
   _cut = new TQToolButton( this );
-  _cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcut") ) );
+  _cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-cut") ) );
   layout->addWidget( _cut );
   connect( _cut, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(cut()) );
   TQToolTip::add( _cut, i18n( "Cut" ) );
 
   _copy = new TQToolButton( this );
-  _copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcopy") ) );
+  _copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-copy") ) );
   layout->addWidget( _copy );
   connect( _copy, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(copy()) );
   TQToolTip::add( _copy, i18n( "Copy" ) );
 
   _paste = new TQToolButton( this );
-  _paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editpaste")) );
+  _paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-paste")) );
   layout->addWidget( _paste );
   connect( _paste, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(paste()) );
   TQToolTip::add( _paste, i18n( "Paste" ) );
 
   _save = new TQToolButton( this );
-  _save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("filesave")) );
+  _save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("document-save")) );
   layout->addWidget( _save );
   connect( _save, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(save()) );
   TQToolTip::add( _save, i18n( "Save" ) );
diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp
index 1b43041..58afa1d 100644
--- a/kregexpeditor/editorwindow.cpp
+++ b/kregexpeditor/editorwindow.cpp
@@ -319,16 +319,16 @@ void RegExpEditorWindow::showRMBMenu( bool enableCutCopy )
 
     if ( !_menu ) {
         _menu = new TQPopupMenu( 0 );
-        _menu->insertItem(getIcon(TQString::fromLocal8Bit("editcut")),
+        _menu->insertItem(getIcon(TQString::fromLocal8Bit("edit-cut")),
                           i18n("C&ut"), CUT);
-        _menu->insertItem(getIcon(TQString::fromLocal8Bit("editcopy")),
+        _menu->insertItem(getIcon(TQString::fromLocal8Bit("edit-copy")),
                           i18n("&Copy"), COPY);
-        _menu->insertItem(getIcon(TQString::fromLocal8Bit("editpaste")),
+        _menu->insertItem(getIcon(TQString::fromLocal8Bit("edit-paste")),
                           i18n("&Paste"), PASTE);
         _menu->insertSeparator();
         _menu->insertItem(getIcon(TQString::fromLocal8Bit("edit")),
                           i18n("&Edit"), EDIT);
-        _menu->insertItem(getIcon(TQString::fromLocal8Bit("filesave")),
+        _menu->insertItem(getIcon(TQString::fromLocal8Bit("document-save")),
                           i18n("&Save Regular Expression..."), SAVE);
     }
 
diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp
index 5f60e0b..d9fe294 100644
--- a/kregexpeditor/verifybuttons.cpp
+++ b/kregexpeditor/verifybuttons.cpp
@@ -54,7 +54,7 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
     connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) );
 
     TQToolButton* button = new TQToolButton(this);
-    button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("fileopen")) );
+    button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("document-open")) );
     layout->addWidget( button );
     connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadText()));
     TQToolTip::add( button, i18n("Load text in the verifier window") );
diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp
index 4306ad6..42148d6 100644
--- a/ksim/generalprefs.cpp
+++ b/ksim/generalprefs.cpp
@@ -160,8 +160,8 @@ void KSim::ClockPrefs::readConfig(KSim::Config *config)
 KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name)
    : TQWidget(parent, name)
 {
-  m_addIcon = SmallIconSet("filenew");
-  m_removeIcon = SmallIconSet("editdelete");
+  m_addIcon = SmallIconSet("document-new");
+  m_removeIcon = SmallIconSet("edit-delete");
 
   m_mainLayout = new TQVBoxLayout(this);
   m_mainLayout->setSpacing(6);
@@ -297,8 +297,8 @@ void KSim::UptimePrefs::removeUptimeItem()
 KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name)
    : TQWidget(parent, name)
 {
-  m_addIcon = SmallIconSet("filenew");
-  m_removeIcon = SmallIconSet("editdelete");
+  m_addIcon = SmallIconSet("document-new");
+  m_removeIcon = SmallIconSet("edit-delete");
 
   m_mainLayout = new TQVBoxLayout(this);
   m_mainLayout->setSpacing(6);
@@ -445,8 +445,8 @@ void KSim::MemoryPrefs::removeMemoryItem()
 KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name)
    : TQWidget(parent, name)
 {
-  m_addIcon = SmallIconSet("filenew");
-  m_removeIcon = SmallIconSet("editdelete");
+  m_addIcon = SmallIconSet("document-new");
+  m_removeIcon = SmallIconSet("edit-delete");
 
   m_mainLayout = new TQVBoxLayout(this);
   m_mainLayout->setSpacing(6);
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 95c6c23..19b30b5 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -222,7 +222,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance,
 
   kpop->insertItem( SmallIconSet("reload3"),i18n("&Reload Theme"),this,
                     TQT_SLOT(reloadConfig()), CTRL+Key_R );
-  kpop->insertItem( SmallIconSet("fileclose"),i18n("&Close This Theme"), this,
+  kpop->insertItem( SmallIconSet("window-close"),i18n("&Close This Theme"), this,
                     TQT_SLOT(killWidget()), CTRL+Key_C );
 
   if(!SuperKarambaSettings::showSysTray())
diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index d0a9897..4fd16f5 100644
--- a/tdewallet/tdewalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -158,7 +158,7 @@ void TDEWalletEditor::layout() {
 }
 
 void TDEWalletEditor::createActions() {
-	_newFolderAction = new TDEAction(i18n("&New Folder..."), "folder_new",
+	_newFolderAction = new TDEAction(i18n("&New Folder..."), "folder-new",
 			0, TQT_TQOBJECT(this), TQT_SLOT(createFolder()), actionCollection(),
 			"create_folder");
 	connect(this, TQT_SIGNAL(enableFolderActions(bool)),