Bring package_development, package_games, package_graphics, package_network, package_multimedia, package_wordprocessing, edu_science, package_utilities, input_devices_settings, kcmsystem, personal, and looknfeel icons into XDG compliance

4 files changed, 13 insertions, 13 deletions

diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index c72f15ca7..8905b6000 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -4115,10 +4115,10 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
 		ret = DesktopIcon("kcmpci", size);
 	}
 	else if (query == TDEGenericDeviceType::I2C) {
-		ret = DesktopIcon("input_devices_settings", size);
+		ret = DesktopIcon("preferences-desktop-peripherals", size);
 	}
 	else if (query == TDEGenericDeviceType::MDIO) {
-		ret = DesktopIcon("input_devices_settings", size);
+		ret = DesktopIcon("preferences-desktop-peripherals", size);
 	}
 	else if (query == TDEGenericDeviceType::Mainboard) {
 		ret = DesktopIcon("kcmpci", size);	// FIXME
@@ -4172,10 +4172,10 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
 		ret = DesktopIcon("camera-photo", size);
 	}
 	else if (query == TDEGenericDeviceType::Serial) {
-		ret = DesktopIcon("input_devices_settings", size);
+		ret = DesktopIcon("preferences-desktop-peripherals", size);
 	}
 	else if (query == TDEGenericDeviceType::Parallel) {
-		ret = DesktopIcon("input_devices_settings", size);
+		ret = DesktopIcon("preferences-desktop-peripherals", size);
 	}
 	else if (query == TDEGenericDeviceType::TextIO) {
 		ret = DesktopIcon("chardevice", size);
@@ -4208,19 +4208,19 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
 		ret = DesktopIcon("kcmpci", size);
 	}
 	else if (query == TDEGenericDeviceType::Platform) {
-		ret = DesktopIcon("kcmsystem", size);
+		ret = DesktopIcon("preferences-system", size);
 	}
 	else if (query == TDEGenericDeviceType::Cryptography) {
 		ret = DesktopIcon("password", size);
 	}
 	else if (query == TDEGenericDeviceType::Event) {
-		ret = DesktopIcon("kcmsystem", size);
+		ret = DesktopIcon("preferences-system", size);
 	}
 	else if (query == TDEGenericDeviceType::Input) {
-		ret = DesktopIcon("kcmsystem", size);
+		ret = DesktopIcon("preferences-system", size);
 	}
 	else if (query == TDEGenericDeviceType::PNP) {
-		ret = DesktopIcon("kcmsystem", size);
+		ret = DesktopIcon("preferences-system", size);
 	}
 	else if (query == TDEGenericDeviceType::OtherACPI) {
 		ret = DesktopIcon("kcmdevices", size);	// FIXME
@@ -4238,7 +4238,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
 		ret = DesktopIcon("kcmdevices", size);	// FIXME
 	}
 	else if (query == TDEGenericDeviceType::OtherVirtual) {
-		ret = DesktopIcon("kcmsystem", size);
+		ret = DesktopIcon("preferences-system", size);
 	}
 	else {
 		ret = DesktopIcon("hwinfo", size);
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 4153013d3..b0f95069e 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -272,8 +272,8 @@ void KMJobViewer::initActions()
 	TDEToggleAction	*tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed");
 	tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted);
 	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool)));
-	TDEToggleAction	*uact = new TDEToggleAction(i18n("Show Only User Jobs"), "personal", 0, actionCollection(), "view_user_jobs");
-	uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"personal"));
+	TDEToggleAction	*uact = new TDEToggleAction(i18n("Show Only User Jobs"), "preferences-desktop-personal", 0, actionCollection(), "view_user_jobs");
+	uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"preferences-desktop-personal"));
 	connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool)));
 	m_userfield = new TQLineEdit(0);
 	m_userfield->setText(getenv("USER"));
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index c9274aaa3..879c00e2b 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -227,7 +227,7 @@ void KMMainView::initActions()
 	tact->setChecked(KMManager::self()->isFilterEnabled());
 	connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
 
-	TDEActionMenu	*mact = new TDEActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool");
+	TDEActionMenu	*mact = new TDEActionMenu(i18n("Pri&nter Tools"), "applications-utilities", m_actions, "printer_tool");
 	mact->setDelayed(false);
 	connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int)));
 	TQStringList	files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop");
diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp
index 424e40100..a3180000f 100644
--- a/tdeprint/management/kmwlocal.cpp
+++ b/tdeprint/management/kmwlocal.cpp
@@ -59,7 +59,7 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name)
 	m_parents[2] = new TQListViewItem(root, m_parents[1], i18n("USB"));
 	m_parents[3] = new TQListViewItem(root, m_parents[2], i18n("Others"));
 	for (int i=0;i<4;i++)
-		m_parents[i]->setPixmap(0, SmallIcon("input_devices_settings"));
+		m_parents[i]->setPixmap(0, SmallIcon("preferences-desktop-peripherals"));
 	TQLabel	*l2 = new TQLabel(i18n("<p>Select a valid detected port, or enter directly the corresponding URI in the bottom edit field.</p>"), this);
 
 	TQVBoxLayout	*lay0 = new TQVBoxLayout(this, 0, 10);