Bring stop, lock, exit, and run icons into XDG compliance

diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index 67416c7..c06e9c2 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -239,7 +239,7 @@
    contextMenu()->insertSeparator();
 
    contextMenu()->insertItem(
-      KSystemTray::loadIcon("exit"),
+      KSystemTray::loadIcon("system-log-out"),
       KStdGuiItem::quit().text(), this, TQT_SIGNAL(quitSelected()) );
 }
 
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index f7af318..16fef06 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -404,7 +404,7 @@
         pixsignature=loader->loadIcon("signature",TDEIcon::Small,20);
         pixuserid=loader->loadIcon("kgpg_identity",TDEIcon::Small,20);
         pixuserphoto=loader->loadIcon("kgpg_photo",TDEIcon::Small,20);
-        pixRevoke=loader->loadIcon("stop",TDEIcon::Small,20);
+        pixRevoke=loader->loadIcon("process-stop",TDEIcon::Small,20);
 	TQPixmap blankFrame;
 	blankFrame.load(locate("appdata", "pics/kgpg_blank.png"));
 
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index 9886b37..ab4a211 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -143,7 +143,7 @@
   mAction.exportData = new TDEAction( i18n("E&xport..."), 0,
     TQT_TQOBJECT(editor()), TQT_SLOT(exportDialog()), actionCollection(), "export" );
   mAction.cancel     = new TDEAction( i18n("&Cancel Operation"),
-    "stop", 0, TQT_TQOBJECT(editor()), TQT_SLOT(stop()), actionCollection(), "cancel" );
+    "process-stop", 0, TQT_TQOBJECT(editor()), TQT_SLOT(stop()), actionCollection(), "cancel" );
   mAction.readOnly   = new TDEToggleAction( i18n("&Read Only"),
     0, TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" );
   mAction.resizeLock = new TDEToggleAction( i18n("&Allow Resize"),
@@ -299,7 +299,7 @@
   hexView()->setPopupMenu( popup );
 
   int id = 100;
-  toolBar(0)->insertButton( MainBarIcon("lock"), id, TQT_SIGNAL(clicked()),
+  toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQT_SIGNAL(clicked()),
     TQT_TQOBJECT(editor()), TQT_SLOT(toggleWriteProtection()), true,
     i18n("Toggle write protection") );
   toolBar(0)->alignItemRight( id );
@@ -898,7 +898,7 @@
   }
   else
   {
-    mWriteProtectButton->setIcon("lock");
+    mWriteProtectButton->setIcon("system-lock-screen");
   }
 }
 
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 7c8ace6..87c4f45 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -114,7 +114,7 @@
 
     rightPopup->insertSeparator();
     rightPopup->insertItem(i18n("&Hide Monitor"), this, TQT_SLOT(slotHide()));
-    rightPopup->insertItem(SmallIcon("exit"), KStdGuiItem::quit().text(), this, TQT_SLOT(slotQuit()));
+    rightPopup->insertItem(SmallIcon("system-log-out"), KStdGuiItem::quit().text(), this, TQT_SLOT(slotQuit()));
 }
 
 laptop_dock::~laptop_dock()
diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index 2f16f36..8627c59 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -32,7 +32,7 @@
 BrowseDialog::BrowseDialog( const HostConfig &hostConfig, const TQString &currentOid, TQWidget *parent, const char *name )
     : BrowseDialogBase( parent, name ), m_host( hostConfig )
 {
-    stop->setGuiItem( KGuiItem( i18n( "&Stop" ), "stop" ) );
+    stop->setGuiItem( KGuiItem( i18n( "&Stop" ), "process-stop" ) );
 
     browserContents->setSorting( -1 );
 
diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp
index 5ec2163..d8020a6 100644
--- a/ktimer/ktimer.cpp
+++ b/ktimer/ktimer.cpp
@@ -68,7 +68,7 @@
         setText( 0, TQString::number(m_job->value()) );
 
         if( m_error )
-            setPixmap( 0, SmallIcon("stop") );
+            setPixmap( 0, SmallIcon("process-stop") );
         else
             setPixmap( 0, TQPixmap() );
 
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 316d0f4..95c6c23 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -1713,7 +1713,7 @@
   //tqDebug("karamba::slotToggleLocked");
   if(toggleLocked->isChecked())
   {
-    toggleLocked->setIconSet(SmallIconSet("lock"));
+    toggleLocked->setIconSet(SmallIconSet("system-lock-screen"));
   }
   else
   {
@@ -2042,7 +2042,7 @@
                                         i18n("&Manage Themes..."), this,
                                         TQT_SLOT(slotShowTheme()), CTRL+Key_M);
 
-  trayMenuQuitId = kglobal->insertItem(SmallIconSet("exit"),
+  trayMenuQuitId = kglobal->insertItem(SmallIconSet("system-log-out"),
                                        i18n("&Quit SuperKaramba"), this,
                                        TQT_SLOT(slotQuit()), CTRL+Key_Q);
 

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdeutils

diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c