From da2a999dfbfc49198b0e0789c3cef49210c1e3f2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 22 Oct 2014 01:27:26 -0500
Subject: [PATCH] Bring most mimetypes in line with XDG specifications.  The
 following are not fully verified in source as of this commit due to ubiquity:
 html, empty, info, make, man, misc, source, unknown

---
 ksquirrel/ksquirrelpart/ksquirrelpart.cpp    | 2 +-
 ksquirrel/ksquirrelpart/sq_iconloader.cpp    | 2 +-
 ksquirrel/mime/ljpeg.desktop                 | 2 +-
 ksquirrel/mime/x-avs.desktop                 | 2 +-
 ksquirrel/mime/x-cut.desktop                 | 2 +-
 ksquirrel/mime/x-dicom.desktop               | 2 +-
 ksquirrel/mime/x-dxf.desktop                 | 2 +-
 ksquirrel/mime/x-iff.desktop                 | 2 +-
 ksquirrel/mime/x-jbig.desktop                | 2 +-
 ksquirrel/mime/x-koala.desktop               | 2 +-
 ksquirrel/mime/x-leaf.desktop                | 2 +-
 ksquirrel/mime/x-lif.desktop                 | 2 +-
 ksquirrel/mime/x-mac.desktop                 | 2 +-
 ksquirrel/mime/x-mdl.desktop                 | 2 +-
 ksquirrel/mime/x-msp.desktop                 | 2 +-
 ksquirrel/mime/x-mtv.desktop                 | 2 +-
 ksquirrel/mime/x-neo.desktop                 | 2 +-
 ksquirrel/mime/x-pi1.desktop                 | 2 +-
 ksquirrel/mime/x-pi3.desktop                 | 2 +-
 ksquirrel/mime/x-pict.desktop                | 2 +-
 ksquirrel/mime/x-pix.desktop                 | 2 +-
 ksquirrel/mime/x-pxr.desktop                 | 2 +-
 ksquirrel/mime/x-ras.desktop                 | 2 +-
 ksquirrel/mime/x-rawrgb.desktop              | 2 +-
 ksquirrel/mime/x-sct.desktop                 | 2 +-
 ksquirrel/mime/x-sun.desktop                 | 2 +-
 ksquirrel/mime/x-utah.desktop                | 2 +-
 ksquirrel/mime/x-wal.desktop                 | 2 +-
 ksquirrel/mime/x-wbmp.desktop                | 2 +-
 ksquirrel/mime/x-xim.desktop                 | 2 +-
 ksquirrel/mime/x-xwd.desktop                 | 2 +-
 ksquirrel/sidebar/sq_categorybrowsermenu.cpp | 4 ++--
 ksquirrel/sidebar/sq_previewwidget.cpp       | 2 +-
 ksquirrel/sq_dragprovider.cpp                | 2 +-
 ksquirrel/sq_iconloader.cpp                  | 2 +-
 35 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index 27864ed..4971ea7 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -87,7 +87,7 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
     new TDEAction(i18n("Zoom -"), "zoom-out", 0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out");
 
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P));
-    new TDEAction(i18n("Properties"), "image",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart properties");
+    new TDEAction(i18n("Properties"), "image-x-generic",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart properties");
 
     a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R));
     new TDEAction(i18n("Normalize"), "rebuild",  0, a, TQT_SLOT(activate()), actionCollection(), "ksquirrelpart normalize");
diff --git a/ksquirrel/ksquirrelpart/sq_iconloader.cpp b/ksquirrel/ksquirrelpart/sq_iconloader.cpp
index c8c9ec8..b9596b6 100644
--- a/ksquirrel/ksquirrelpart/sq_iconloader.cpp
+++ b/ksquirrel/ksquirrelpart/sq_iconloader.cpp
@@ -61,7 +61,7 @@ TQPixmap SQ_IconLoader::loadIcon(const TQString& name, TDEIcon::Group group, int
         else if(name == "edit" && size == 32)
             p = pixmap_edit;
         else
-            p = TDEGlobal::iconLoader()->loadIcon("unknown", group, size);
+            p = TDEGlobal::iconLoader()->loadIcon(""text-x-katefilelist", group, size);
     }
 
     return p;
diff --git a/ksquirrel/mime/ljpeg.desktop b/ksquirrel/mime/ljpeg.desktop
index 671d4c2..02b2f41 100644
--- a/ksquirrel/mime/ljpeg.desktop
+++ b/ksquirrel/mime/ljpeg.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/ljpeg
-Icon=image
+Icon=image-x-generic
 Patterns=*.ljpg;*.LJPG;*.ljpeg;*.LJPEG;
 Comment=Lossless JPEG
diff --git a/ksquirrel/mime/x-avs.desktop b/ksquirrel/mime/x-avs.desktop
index 99a6b11..90540f4 100644
--- a/ksquirrel/mime/x-avs.desktop
+++ b/ksquirrel/mime/x-avs.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-avs
-Icon=image
+Icon=image-x-generic
 Patterns=*.x;*.X;
 Comment=AVS X image
diff --git a/ksquirrel/mime/x-cut.desktop b/ksquirrel/mime/x-cut.desktop
index 6260eb4..fae61c6 100644
--- a/ksquirrel/mime/x-cut.desktop
+++ b/ksquirrel/mime/x-cut.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-cut
-Icon=image
+Icon=image-x-generic
 Patterns=*.cut;*.CUT;
 Comment=Dr. Halo CUT
diff --git a/ksquirrel/mime/x-dicom.desktop b/ksquirrel/mime/x-dicom.desktop
index 3323df0..1482401 100644
--- a/ksquirrel/mime/x-dicom.desktop
+++ b/ksquirrel/mime/x-dicom.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-dicom
-Icon=image
+Icon=image-x-generic
 Patterns=*.dcm;*.DCM;*.dicom;*.DICOM
 Comment=DICOM
diff --git a/ksquirrel/mime/x-dxf.desktop b/ksquirrel/mime/x-dxf.desktop
index 329ff12..9861c0b 100644
--- a/ksquirrel/mime/x-dxf.desktop
+++ b/ksquirrel/mime/x-dxf.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-dxf
-Icon=image
+Icon=image-x-generic
 Patterns=*.dxf;*.DXF;
 Comment=AutoCAD/QCAD Drawing
diff --git a/ksquirrel/mime/x-iff.desktop b/ksquirrel/mime/x-iff.desktop
index 9cca473..8c28ae0 100644
--- a/ksquirrel/mime/x-iff.desktop
+++ b/ksquirrel/mime/x-iff.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-iff
-Icon=image
+Icon=image-x-generic
 Patterns=*.iff;*.IFF;*.ilbm;*.ILBM;*.lbm;*.LBM;
 Comment=Interchange File Format
diff --git a/ksquirrel/mime/x-jbig.desktop b/ksquirrel/mime/x-jbig.desktop
index 45f06dd..6630ce5 100644
--- a/ksquirrel/mime/x-jbig.desktop
+++ b/ksquirrel/mime/x-jbig.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-jbig
-Icon=image
+Icon=image-x-generic
 Patterns=*.jbg;*.JBG;*.jbig;*.JBIG;
 Comment=JBIG
diff --git a/ksquirrel/mime/x-koala.desktop b/ksquirrel/mime/x-koala.desktop
index c95b300..0fba0e0 100644
--- a/ksquirrel/mime/x-koala.desktop
+++ b/ksquirrel/mime/x-koala.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-koala
-Icon=image
+Icon=image-x-generic
 Patterns=*.koa;*.KOA;*.kla;*.KLA
 Comment=Commodore 64 Koala
diff --git a/ksquirrel/mime/x-leaf.desktop b/ksquirrel/mime/x-leaf.desktop
index 9d68b66..0bbe3f1 100644
--- a/ksquirrel/mime/x-leaf.desktop
+++ b/ksquirrel/mime/x-leaf.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-leaf
-Icon=image
+Icon=image-x-generic
 Patterns=*.leaf;*.LEAF;
 Comment=ILEAF Image
diff --git a/ksquirrel/mime/x-lif.desktop b/ksquirrel/mime/x-lif.desktop
index 705a8cc..1293c99 100644
--- a/ksquirrel/mime/x-lif.desktop
+++ b/ksquirrel/mime/x-lif.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-lif
-Icon=image
+Icon=image-x-generic
 Patterns=*.lif;*.LIF;
 Comment=Homeworld LIF
diff --git a/ksquirrel/mime/x-mac.desktop b/ksquirrel/mime/x-mac.desktop
index 52fc8c0..ae31899 100644
--- a/ksquirrel/mime/x-mac.desktop
+++ b/ksquirrel/mime/x-mac.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-mac
-Icon=image
+Icon=image-x-generic
 Patterns=*.mac;*.MAC;
 Comment=Macintosh Paint
diff --git a/ksquirrel/mime/x-mdl.desktop b/ksquirrel/mime/x-mdl.desktop
index 876b873..5b10c57 100644
--- a/ksquirrel/mime/x-mdl.desktop
+++ b/ksquirrel/mime/x-mdl.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-mdl
-Icon=image
+Icon=image-x-generic
 Patterns=*.mdl;*.MDL;
 Comment=HalfLife Model
diff --git a/ksquirrel/mime/x-msp.desktop b/ksquirrel/mime/x-msp.desktop
index c7e5bd6..4eae799 100644
--- a/ksquirrel/mime/x-msp.desktop
+++ b/ksquirrel/mime/x-msp.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-msp
-Icon=image
+Icon=image-x-generic
 Patterns=*.msp;*.MSP;
 Comment=Microsoft Paint
diff --git a/ksquirrel/mime/x-mtv.desktop b/ksquirrel/mime/x-mtv.desktop
index 85de528..5ff5217 100644
--- a/ksquirrel/mime/x-mtv.desktop
+++ b/ksquirrel/mime/x-mtv.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-mtv
-Icon=image
+Icon=image-x-generic
 Patterns=*.mtv;*.MTV;
 Comment=MTV Ray Tracer
diff --git a/ksquirrel/mime/x-neo.desktop b/ksquirrel/mime/x-neo.desktop
index 457e1d5..358d541 100644
--- a/ksquirrel/mime/x-neo.desktop
+++ b/ksquirrel/mime/x-neo.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-neo
-Icon=image
+Icon=image-x-generic
 Patterns=*.neo;*.NEO;
 Comment=Neochrome NEO
diff --git a/ksquirrel/mime/x-pi1.desktop b/ksquirrel/mime/x-pi1.desktop
index 812a22b..208be05 100644
--- a/ksquirrel/mime/x-pi1.desktop
+++ b/ksquirrel/mime/x-pi1.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pi1
-Icon=image
+Icon=image-x-generic
 Patterns=*.pi1;*.PI1;
 Comment=Degas PI1
diff --git a/ksquirrel/mime/x-pi3.desktop b/ksquirrel/mime/x-pi3.desktop
index 20edd11..16505d9 100644
--- a/ksquirrel/mime/x-pi3.desktop
+++ b/ksquirrel/mime/x-pi3.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pi3
-Icon=image
+Icon=image-x-generic
 Patterns=*.pi3;*.PI3;
 Comment=Degas PI3
diff --git a/ksquirrel/mime/x-pict.desktop b/ksquirrel/mime/x-pict.desktop
index 0d49384..32be22d 100644
--- a/ksquirrel/mime/x-pict.desktop
+++ b/ksquirrel/mime/x-pict.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pict
-Icon=image
+Icon=image-x-generic
 Patterns=*.pict;*.PICT;
 Comment=Macintosh PICT
diff --git a/ksquirrel/mime/x-pix.desktop b/ksquirrel/mime/x-pix.desktop
index 704c241..6ba2637 100644
--- a/ksquirrel/mime/x-pix.desktop
+++ b/ksquirrel/mime/x-pix.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pix
-Icon=image
+Icon=image-x-generic
 Patterns=*.pix;*.PIX;
 Comment=Irix PIX Image
diff --git a/ksquirrel/mime/x-pxr.desktop b/ksquirrel/mime/x-pxr.desktop
index 3d99c1f..f6ca65a 100644
--- a/ksquirrel/mime/x-pxr.desktop
+++ b/ksquirrel/mime/x-pxr.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-pxr
-Icon=image
+Icon=image-x-generic
 Patterns=*.pxr;*.PXR;
 Comment=Pxrar format
diff --git a/ksquirrel/mime/x-ras.desktop b/ksquirrel/mime/x-ras.desktop
index d6eb85e..2d27b3b 100644
--- a/ksquirrel/mime/x-ras.desktop
+++ b/ksquirrel/mime/x-ras.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-ras
-Icon=image
+Icon=image-x-generic
 Patterns=*.ras;*.RAS;
 Comment=SUN Raster
diff --git a/ksquirrel/mime/x-rawrgb.desktop b/ksquirrel/mime/x-rawrgb.desktop
index e26eb32..a51d236 100644
--- a/ksquirrel/mime/x-rawrgb.desktop
+++ b/ksquirrel/mime/x-rawrgb.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-rawrgb
-Icon=image
+Icon=image-x-generic
 Patterns=*.rawrgb;*.RAWRGB;
 Comment=KSquirrel RAWRGB
diff --git a/ksquirrel/mime/x-sct.desktop b/ksquirrel/mime/x-sct.desktop
index e6ab95e..f9d1525 100644
--- a/ksquirrel/mime/x-sct.desktop
+++ b/ksquirrel/mime/x-sct.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-sct
-Icon=image
+Icon=image-x-generic
 Patterns=*.sct;*.SCT;*.ct;*.CT;
 Comment=Scitex CT
diff --git a/ksquirrel/mime/x-sun.desktop b/ksquirrel/mime/x-sun.desktop
index 5ca782b..51359e5 100644
--- a/ksquirrel/mime/x-sun.desktop
+++ b/ksquirrel/mime/x-sun.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-sun
-Icon=image
+Icon=image-x-generic
 Patterns=*.sun;*.SUN;
 Comment=SUN Icon
diff --git a/ksquirrel/mime/x-utah.desktop b/ksquirrel/mime/x-utah.desktop
index 360aade..1e0c31c 100644
--- a/ksquirrel/mime/x-utah.desktop
+++ b/ksquirrel/mime/x-utah.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-utah
-Icon=image
+Icon=image-x-generic
 Patterns=*.rle;*.RLE;
 Comment=UTAH RLE
diff --git a/ksquirrel/mime/x-wal.desktop b/ksquirrel/mime/x-wal.desktop
index 52691e4..89a681d 100644
--- a/ksquirrel/mime/x-wal.desktop
+++ b/ksquirrel/mime/x-wal.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-wal
-Icon=image
+Icon=image-x-generic
 Patterns=*.wal;*.WAL;
 Comment=Quake2 texture
diff --git a/ksquirrel/mime/x-wbmp.desktop b/ksquirrel/mime/x-wbmp.desktop
index 73fdff8..7720b4d 100644
--- a/ksquirrel/mime/x-wbmp.desktop
+++ b/ksquirrel/mime/x-wbmp.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-wbmp
-Icon=image
+Icon=image-x-generic
 Patterns=*.wbmp;*.WBMP;
 Comment=Wireless Application Protocol Bitmap
diff --git a/ksquirrel/mime/x-xim.desktop b/ksquirrel/mime/x-xim.desktop
index bd05917..7d557db 100644
--- a/ksquirrel/mime/x-xim.desktop
+++ b/ksquirrel/mime/x-xim.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-xim
-Icon=image
+Icon=image-x-generic
 Patterns=*.xim;*.XIM;
 Comment=X Image
diff --git a/ksquirrel/mime/x-xwd.desktop b/ksquirrel/mime/x-xwd.desktop
index 617ce8c..c7531ab 100644
--- a/ksquirrel/mime/x-xwd.desktop
+++ b/ksquirrel/mime/x-xwd.desktop
@@ -2,6 +2,6 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=image/x-xwd
-Icon=image
+Icon=image-x-generic
 Patterns=*.xwd;*.XWD;
 Comment=X Window Dump
diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
index e0d1cbe..a30fa85 100644
--- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
+++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp
@@ -508,12 +508,12 @@ void SQ_CategoryBrowserMenu::initIconMap()
     _icons = new TQMap<TQString, TQPixmap>;
 
     _icons->insert("folder", SmallIcon("folder"));
-    _icons->insert("unknown", SmallIcon("mime_empty"));
+    _icons->insert("unknown", SmallIcon("text-x-katefilelist"));
     _icons->insert("folder_open", SmallIcon("folder_open"));
     _icons->insert("kdisknav", SmallIcon("kdisknav"));
     _icons->insert("kfm", SmallIcon("kfm"));
     _icons->insert("terminal", SmallIcon("terminal"));
-    _icons->insert("txt", SmallIcon("txt"));
+    _icons->insert("txt", SmallIcon("text-plain"));
     _icons->insert("exec", SmallIcon("exec"));
     _icons->insert("chardevice", SmallIcon("chardevice"));
 }
diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp
index 86139f4..339f026 100644
--- a/ksquirrel/sidebar/sq_previewwidget.cpp
+++ b/ksquirrel/sidebar/sq_previewwidget.cpp
@@ -70,7 +70,7 @@ SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name)
     popup->insertSeparator();
     popup->insertItem(i18n("Execute")+"\tEnter", TQT_TQOBJECT(this), TQT_SIGNAL(execute()));
 
-    multi_pix = SQ_IconLoader::instance()->loadIcon("tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
+    multi_pix = SQ_IconLoader::instance()->loadIcon(""application-vnd.tde.tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
 
     setMinimumHeight(20);
     setFocusPolicy(TQ_WheelFocus);
diff --git a/ksquirrel/sq_dragprovider.cpp b/ksquirrel/sq_dragprovider.cpp
index 8f53f03..516d1d2 100644
--- a/ksquirrel/sq_dragprovider.cpp
+++ b/ksquirrel/sq_dragprovider.cpp
@@ -122,7 +122,7 @@ void SQ_DragProvider::start()
     TQPixmap dragIcon;
 
     if(urls.count() > 1)
-        dragIcon = SQ_IconLoader::instance()->loadIcon("tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
+        dragIcon = SQ_IconLoader::instance()->loadIcon(""application-vnd.tde.tdemultiple", TDEIcon::Desktop, TDEIcon::SizeSmall);
     else
         dragIcon = first->pixmap(TDEIcon::SizeSmall);
 
diff --git a/ksquirrel/sq_iconloader.cpp b/ksquirrel/sq_iconloader.cpp
index c8c9ec8..b9596b6 100644
--- a/ksquirrel/sq_iconloader.cpp
+++ b/ksquirrel/sq_iconloader.cpp
@@ -61,7 +61,7 @@ TQPixmap SQ_IconLoader::loadIcon(const TQString& name, TDEIcon::Group group, int
         else if(name == "edit" && size == 32)
             p = pixmap_edit;
         else
-            p = TDEGlobal::iconLoader()->loadIcon("unknown", group, size);
+            p = TDEGlobal::iconLoader()->loadIcon(""text-x-katefilelist", group, size);
     }
 
     return p;