From 0d88361520831ef978d105d196053d5620c2ab4a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 13 Oct 2014 20:10:12 -0500
Subject: [PATCH] Bring mail_forward, mail_new, mail_replyall, mail_reply,
 mail_send, player_pause, player_play, player_stop, player_rew, player_fwd,
 player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen,
 window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag-
 icons into XDG compliance

---
 kbabel/catalogmanager/catalogmanager.cpp | 4 ++--
 kbugbuster/gui/cwbugdetailscontainer.cpp | 4 ++--
 kbugbuster/gui/kbbmainwindow.cpp         | 6 +++---
 umbrello/umbrello/uml.cpp                | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 44840af8..ef386851 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -368,10 +368,10 @@ void CatalogManager::setupActions()
     action = new TDEAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T,
                           TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked");
     action->setEnabled(false);
-    action = new TDEAction( i18n("Mai&l"), "mail_send", CTRL+Key_A,
+    action = new TDEAction( i18n("Mai&l"), "mail-send", CTRL+Key_A,
                           TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailFiles()), actionCollection(), "mail_file");
     action->setEnabled(false);
-    action = new TDEAction( i18n("Mail Mar&ked"), "mail_send", CTRL+ALT+Key_A,
+    action = new TDEAction( i18n("Mail Mar&ked"), "mail-send", CTRL+ALT+Key_A,
                           TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailMarkedFiles()), actionCollection(),	"mail_file_marked");
     action->setEnabled(false);
 
diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp
index 625a1f80..e3bd6f37 100644
--- a/kbugbuster/gui/cwbugdetailscontainer.cpp
+++ b/kbugbuster/gui/cwbugdetailscontainer.cpp
@@ -46,8 +46,8 @@ CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *parent , const char * na
     m_bugReassignBtn->setIconSet( BarIconSet( "folder-new" ) );
     m_bugTitleBtn->setIconSet( SmallIconSet( "text_under" ) );
     m_bugSeverityBtn->setIconSet( SmallIconSet( "edit" ) );
-    m_bugReplyBtn->setIconSet( SmallIconSet( "mail_replyall" ) );
-    m_bugReplyPrivBtn->setIconSet( SmallIconSet( "mail_reply" ) );
+    m_bugReplyBtn->setIconSet( SmallIconSet( "mail-reply-all" ) );
+    m_bugReplyPrivBtn->setIconSet( SmallIconSet( "mail-reply-sender" ) );
 
     // The Bugzilla mail interface doesn't support all commands yet.
     m_bugCloseSilentlyBtn->hide();
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index 9a34f6c7..5d7203c8 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -150,7 +150,7 @@ void KBBMainWindow::initActions()
 
     new TDEAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ),
                  actionCollection(), "file_seechanges" );
-    new TDEAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ),
+    new TDEAction( i18n("&Submit Changes"), "mail-send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ),
                  actionCollection(), "file_submit" );
 
     reloadpacklist = new TDEAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ),
@@ -193,9 +193,9 @@ void KBBMainWindow::initActions()
 //                 TQT_SLOT( titleBug() ), actionCollection(), "cmd_title" );
 //    new TDEAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget),
 //                 TQT_SLOT( severityBug() ), actionCollection(), "cmd_severity" );
-    new TDEAction( i18n("&Reply..."), "mail_replyall",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget),
+    new TDEAction( i18n("&Reply..."), "mail-reply-all",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget),
                  TQT_SLOT( replyBug() ), actionCollection(), "cmd_reply" );
-    new TDEAction( i18n("Reply &Privately..."), "mail_reply", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget),
+    new TDEAction( i18n("Reply &Privately..."), "mail-reply-sender", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget),
                  TQT_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" );
 
     KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() );
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 3f0d5a74..12caf6b0 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -286,7 +286,7 @@ void UMLApp::initActions() {
     zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Key_F9,
                  TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderMoved(int)),
                  actionCollection(), "popup_zoom");
-    zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "viewmag1", 0,
+    zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "zoom-original", 0,
                                 TQT_TQOBJECT(this), TQT_SLOT( slotZoom100() ), actionCollection(),
                                 "zoom100");