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

filesharing/advanced/kcm_sambaconf/kcminterface.ui.h

@@ -28,14 +28,14 @@
 
 void KcmInterface::init()
 {
-    addShareBtn->setIconSet(SmallIconSet("filenew"));
+    addShareBtn->setIconSet(SmallIconSet("document-new"));
     editShareBtn->setIconSet(SmallIconSet("edit"));
-    removeShareBtn->setIconSet(SmallIconSet("editdelete"));
+    removeShareBtn->setIconSet(SmallIconSet("edit-delete"));
     editDefaultShareBtn->setIconSet(SmallIconSet("queue"));
     
-    addPrinterBtn->setIconSet(SmallIconSet("filenew"));
+    addPrinterBtn->setIconSet(SmallIconSet("document-new"));
     editPrinterBtn->setIconSet(SmallIconSet("edit"));
-    removePrinterBtn->setIconSet(SmallIconSet("editdelete"));
+    removePrinterBtn->setIconSet(SmallIconSet("edit-delete"));
     editDefaultPrinterBtn->setIconSet(SmallIconSet("print_class"));
 
     advancedWarningPixLbl->setPixmap(SmallIcon("messagebox_warning"));

filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp

@@ -155,7 +155,7 @@ TQPixmap ShareListViewItem::createPropertyPixmap()
 
   if (_share->getBoolValue("printable"))
   {
-    p.drawPixmap(x,0,SmallIcon("fileprint"));
+    p.drawPixmap(x,0,SmallIcon("document-print"));
     x = x+w+margin;
   }
 
@@ -308,7 +308,7 @@ void KcmSambaConf::initAdvancedTab()
       icon = SmallIcon("system-lock-screen");
     else
     if (label == i18n("Printing"))
-      icon = SmallIcon("fileprint");
+      icon = SmallIcon("document-print");
     else
     if (label == i18n("Logon"))
       icon = SmallIcon("tdmconfig");

filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp

@@ -295,7 +295,7 @@ void ShareDlgImpl::initAdvancedTab()
 			 icon = SmallIcon("folder");
 		else
 		if (label.lower() == "printing")
-			 icon = SmallIcon("fileprint");
+			 icon = SmallIcon("document-print");
 		else
 		if (label.lower() == "locking")
 			 icon = SmallIcon("system-lock-screen");

kdict/queryview.cpp

@@ -418,14 +418,14 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
       }
       if(type=="realhttp") {
         popupLink.prepend("http://");
-        rightBtnMenu->insertItem(SmallIcon("fileopen"),
+        rightBtnMenu->insertItem(SmallIcon("document-open"),
                                  i18n("&Open Link"),
                                  this,TQT_SLOT(popupOpenLink()));
         rightBtnMenu->insertSeparator();
       }
       if(type=="realftp") {
         popupLink.prepend("ftp://");
-        rightBtnMenu->insertItem(SmallIcon("fileopen"),
+        rightBtnMenu->insertItem(SmallIcon("document-open"),
                                  i18n("&Open Link"),
                                  this,TQT_SLOT(popupOpenLink()));
         rightBtnMenu->insertSeparator();

kget/tdemainwidget.cpp

@@ -365,7 +365,7 @@ void TDEMainWidget::setupGUI()
 #endif
     m_paResume = new TDEAction(i18n("&Resume"),"tool_resume", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResumeCurrent()), coll, "resume");
     m_paPause = new TDEAction(i18n("&Pause"),"tool_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPauseCurrent()), coll, "pause");
-    m_paDelete = new TDEAction(i18n("&Delete"),"editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrent()), coll, "delete");
+    m_paDelete = new TDEAction(i18n("&Delete"),"edit-delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrent()), coll, "delete");
     m_paRestart = new TDEAction(i18n("Re&start"),"tool_restart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartCurrent()), coll, "restart");
 
     m_paQueue = new TDERadioAction(i18n("&Queue"),"tool_queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQueueCurrent()), coll, "queue");

kget/transfer.cpp

@@ -130,7 +130,7 @@ Transfer::init(const uint _id)
 
     m_paPause = new TDEAction(i18n("&Pause"), "tool_pause", 0, this, TQT_SLOT(slotRequestPause()), this, "pause");
 
-    m_paDelete = new TDEAction(i18n("&Delete"), "editdelete", 0, this, TQT_SLOT(slotRequestRemove()), this, "delete");
+    m_paDelete = new TDEAction(i18n("&Delete"), "edit-delete", 0, this, TQT_SLOT(slotRequestRemove()), this, "delete");
 
     m_paRestart = new TDEAction(i18n("Re&start"), "tool_restart", 0, this, TQT_SLOT(slotRequestRestart()), this, "restart");
 

kopete/kopete/chatwindow/chatmessagepart.cpp

@@ -264,7 +264,7 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co
 	d->printAction = KStdAction::print( this, TQT_SLOT(print()),actionCollection() );
 	d->closeAction = KStdAction::close( this, TQT_SLOT(slotCloseView()),actionCollection() );
         d->importEmoticon = new TDEAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() );
-	d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() );
+	d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() );
 
 	// read formatting override flags
 	readOverrides();

kopete/kopete/config/accounts/kopeteaccountconfig.cpp

@@ -232,7 +232,7 @@ void KopeteAccountConfig::slotRemoveAccount()
 
 	Kopete::Account *i = lvi->account();
 	if ( KMessageBox::warningContinueCancel( this, i18n( "Are you sure you want to remove the account \"%1\"?" ).arg( i->accountLabel() ),
-		i18n( "Remove Account" ), KGuiItem(i18n( "Remove Account" ), "editdelete"),
+		i18n( "Remove Account" ), KGuiItem(i18n( "Remove Account" ), "edit-delete"),
 		 "askRemoveAccount", KMessageBox::Notify | KMessageBox::Dangerous ) == KMessageBox::Continue )
 	{
 		Kopete::AccountManager::self()->removeAccount( i );

kopete/kopete/config/identity/kopeteidentityconfig.cpp

@@ -121,7 +121,7 @@ KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *parent, const char */*name*
 	
 	// Set icon for KPushButton
 	d->m_view->buttonNewIdentity->setIconSet(SmallIconSet("new"));
-	d->m_view->buttonCopyIdentity->setIconSet(SmallIconSet("editcopy"));
+	d->m_view->buttonCopyIdentity->setIconSet(SmallIconSet("edit-copy"));
 	d->m_view->buttonRenameIdentity->setIconSet(SmallIconSet("edit"));
 	d->m_view->buttonRemoveIdentity->setIconSet(SmallIconSet("delete_user"));
 	d->m_view->buttonClearPhoto->setIconSet(  SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) );

kopete/kopete/contactlist/kopetecontactlistview.cpp

@@ -475,9 +475,9 @@ void KopeteContactListView::initActions( TDEActionCollection *ac )
 	actionStartChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( slotStartChat() ),
 		ac, "contactStartChat" );
 
-	actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "editcut" ),
+	actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "edit-cut" ),
 														  0, TQT_TQOBJECT(this), TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" );
-	actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "editcopy" ), 0,
+	actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "edit-copy" ), 0,
 														 TQT_TQOBJECT(this), TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" );
 
 	actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ),
@@ -485,7 +485,7 @@ void KopeteContactListView::initActions( TDEActionCollection *ac )
 	actionSendEmail = new TDEAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ),
 		0, TQT_TQOBJECT(this), TQT_SLOT(  slotSendEmail() ), ac, "contactSendEmail" );
 	/* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/
-	actionRename = new TDEAction( i18n( "Rename" ), "filesaveas", 0,
+	actionRename = new TDEAction( i18n( "Rename" ), "document-save-as", 0,
 		TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), ac, "contactRename" );
 	actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ),
 		ac, "contactSendFile" );
@@ -1566,7 +1566,7 @@ void KopeteContactListView::slotRemove()
 		else
 			return; // this should never happen
 
-		if( KMessageBox::warningContinueCancel( this, msg, i18n( "Remove" ), KGuiItem(i18n("Remove"),"editdelete") ,
+		if( KMessageBox::warningContinueCancel( this, msg, i18n( "Remove" ), KGuiItem(i18n("Remove"),"edit-delete") ,
 		 "askRemovingContactOrGroup" , KMessageBox::Notify | KMessageBox::Dangerous ) !=
 			KMessageBox::Continue )
 		{
@@ -1582,7 +1582,7 @@ void KopeteContactListView::slotRemove()
 		         "contacts from your contact list?" );
 
 		if( KMessageBox::warningContinueCancelList( this, msg, items, i18n("Remove"),
-			KGuiItem(i18n("Remove"),"editdelete"), "askRemovingContactOrGroup",
+			KGuiItem(i18n("Remove"),"edit-delete"), "askRemovingContactOrGroup",
 			KMessageBox::Notify | KMessageBox::Dangerous ) != KMessageBox::Continue )
 		{
 			return;

kopete/plugins/alias/aliaspreferences.cpp

@@ -466,7 +466,7 @@ void AliasPreferences::slotEditAlias()
 
 void AliasPreferences::slotDeleteAliases()
 {
-	if( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to delete the selected aliases?"), i18n("Delete Aliases"), KGuiItem(i18n("Delete"), "editdelete") ) == KMessageBox::Continue )
+	if( KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to delete the selected aliases?"), i18n("Delete Aliases"), KGuiItem(i18n("Delete"), "edit-delete") ) == KMessageBox::Continue )
 	{
 		TQPtrList< TQListViewItem > items = preferencesDialog->aliasList->selectedItems();
 		for( TQListViewItem *i = items.first(); i; i = items.next() )

kopete/plugins/history/historydialog.cpp

@@ -175,7 +175,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
 	//initActions
 	TDEActionCollection* ac = new TDEActionCollection(this);
 	mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac );
-	mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac );
+	mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac );
 
 	resize(650, 700);
 	centerOnScreen(this);

kopete/protocols/irc/ircprotocol.cpp

@@ -919,7 +919,7 @@ void IRCProtocol::slotDeleteNetwork()
 		Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the network <b>%1</b>?<br>"
 		"Any accounts which use this network will have to be modified.</qt>")
 		.arg(network), i18n("Deleting Network"),
-		KGuiItem(i18n("&Delete Network"),"editdelete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue )
+		KGuiItem(i18n("&Delete Network"),"edit-delete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue )
 	{
 		disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) );
 		disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) );
@@ -945,7 +945,7 @@ void IRCProtocol::slotDeleteHost()
 	if ( KMessageBox::warningContinueCancel(
 		Kopete::UI::Global::mainWidget(), i18n("<qt>Are you sure you want to delete the host <b>%1</b>?</qt>")
 		.arg(hostName), i18n("Deleting Host"),
-		KGuiItem(i18n("&Delete Host"),"editdelete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue )
+		KGuiItem(i18n("&Delete Host"),"edit-delete"), TQString::fromLatin1("AskIRCDeleteHost")) == KMessageBox::Continue )
 	{
 		IRCHost *host = m_hosts[ hostName ];
 		if ( host )

kopete/protocols/jabber/jabberaccount.cpp

@@ -1689,7 +1689,7 @@ bool JabberAccount::removeAccount( )
 				   			    "If you unregister, all your contact list may be removed on the server,"
 							    "And you will never be able to connect to this account with any client").arg( accountLabel() ),
 					i18n("Unregister"),
-					KGuiItem(i18n( "Remove and Unregister" ), "editdelete"),
+					KGuiItem(i18n( "Remove and Unregister" ), "edit-delete"),
 					KGuiItem(i18n( "Remove from kopete only"), "edittrash"),
 					TQString(), KMessageBox::Notify | KMessageBox::Dangerous );
 		if(result == KMessageBox::Cancel)

kpf/src/Applet.cpp

@@ -125,7 +125,7 @@ namespace KPF
     popup_ = new TQPopupMenu(this);
 
     popup_->insertItem
-      (BarIcon("filenew"), i18n("New Server..."), NewServer, NewServer);
+      (BarIcon("document-new"), i18n("New Server..."), NewServer, NewServer);
 
 //    popup_->insertItem
 //      (BarIcon("quit"), i18n("Quit"), Quit, Quit);

kpf/src/AppletItem.cpp

@@ -70,7 +70,7 @@ namespace KPF
       (SmallIcon("kpf"),          popupTitle,             Title,     Title);
 
     popup_->insertItem
-      (SmallIcon("filenew"),      i18n("New Server..."),  NewServer, NewServer);
+      (SmallIcon("document-new"),      i18n("New Server..."),  NewServer, NewServer);
 
     popup_->insertSeparator(Separator);
 

kppp/accounts.cpp

@@ -326,7 +326,7 @@ void AccountWidget::deleteaccount() {
   TQString s = i18n("Are you sure you want to delete\nthe account \"%1\"?")
     .arg(accountlist_l->text(accountlist_l->currentItem()));
 
-  if(KMessageBox::warningYesNo(this, s, i18n("Confirm"), KGuiItem(i18n("Delete"), "editdelete"), KStdGuiItem::cancel()) != KMessageBox::Yes)
+  if(KMessageBox::warningYesNo(this, s, i18n("Confirm"), KGuiItem(i18n("Delete"), "edit-delete"), KStdGuiItem::cancel()) != KMessageBox::Yes)
     return;
 
   if(gpppdata.deleteAccount(accountlist_l->text(accountlist_l->currentItem())))

kppp/miniterm.cpp

@@ -54,7 +54,7 @@ MiniTerm::MiniTerm(TQWidget *parent, const char *name)
   KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 
   m_file = new TQPopupMenu(this);
-  m_file->insertItem( SmallIcon("fileclose"), i18n("&Close"), this, TQT_SLOT(cancelbutton()) );
+  m_file->insertItem( SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(cancelbutton()) );
   m_options = new TQPopupMenu(this);
   m_options->insertItem(i18n("&Reset Modem"),this,TQT_SLOT(resetModem()));
   m_help =

ksirc/mditoplevel.cpp

@@ -54,7 +54,7 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name)
     m_addressedIcon = UserIcon( "info" );
 
     m_pop = new TDEPopupMenu(m_tab, "");
-    m_pop->insertItem( SmallIcon("fileclose"), i18n("Close"), this, TQT_SLOT( slotCloseLastWid() ));
+    m_pop->insertItem( SmallIcon("window-close"), i18n("Close"), this, TQT_SLOT( slotCloseLastWid() ));
 
 }