(qt) #5204 extra cleanups in Utils::guessMimeIcon() from rb07

diff --git a/qt/utils.cc b/qt/utils.cc
index a85c09abe29da9dd3fe1307df08a531203ecac21..9cbc81f852315867be6dc1ef35cf4fc33fad6266 100644 (file)
--- a/qt/utils.cc
+++ b/qt/utils.cc
@@ -67,46 +67,46 @@ Utils :: guessMimeIcon( const QString& filename )
     {
         fallback = QApplication::style()->standardIcon( QStyle :: SP_FileIcon );
 
-        suffixes[DISK] << QString::fromAscii("iso");
-        fileIcons[DISK]= QIcon::fromTheme( QString::fromAscii("media-optical"), fallback );
+        suffixes[DISK] << QString::fromLatin1("iso");
+        fileIcons[DISK]= QIcon::fromTheme( QString::fromLatin1("media-optical"), fallback );
 
         const char * doc_types[] = {
             "abw", "csv", "doc", "dvi", "htm", "html", "ini", "log", "odp",
             "ods", "odt", "pdf", "ppt", "ps",  "rtf", "tex", "txt", "xml" };
         for( int i=0, n=sizeof(doc_types)/sizeof(doc_types[0]); i<n; ++i )
-            suffixes[DOCUMENT] << QString::fromAscii(doc_types[i] );
-        fileIcons[DOCUMENT] = QIcon::fromTheme( QString::fromAscii("text-x-generic"), fallback );
+            suffixes[DOCUMENT] << QString::fromLatin1(doc_types[i] );
+        fileIcons[DOCUMENT] = QIcon::fromTheme( QString::fromLatin1("text-x-generic"), fallback );
 
         const char * pic_types[] = {
             "bmp", "gif", "jpg", "jpeg", "pcx", "png", "psd", "ras", "tga", "tiff" };
         for( int i=0, n=sizeof(pic_types)/sizeof(pic_types[0]); i<n; ++i )
-            suffixes[PICTURE] << QString::fromAscii(pic_types[i]);
-        fileIcons[PICTURE]  = QIcon::fromTheme( QString::fromAscii("image-x-generic"), fallback );
+            suffixes[PICTURE] << QString::fromLatin1(pic_types[i]);
+        fileIcons[PICTURE]  = QIcon::fromTheme( QString::fromLatin1("image-x-generic"), fallback );
 
         const char * vid_types[] = {
-            "3gp", "asf", "avi", "mov", "mpeg", "mpg", "mp4", "mkv", "mov",
+            "3gp", "asf", "avi", "mkv", "mov", "mpeg", "mpg", "mp4",
             "ogm", "ogv", "qt", "rm", "wmv" };
         for( int i=0, n=sizeof(vid_types)/sizeof(vid_types[0]); i<n; ++i )
-            suffixes[VIDEO] << QString::fromAscii(vid_types[i]);
-        fileIcons[VIDEO] = QIcon::fromTheme( QString::fromAscii("video-x-generic"), fallback );
+            suffixes[VIDEO] << QString::fromLatin1(vid_types[i]);
+        fileIcons[VIDEO] = QIcon::fromTheme( QString::fromLatin1("video-x-generic"), fallback );
 
         const char * arc_types[] = {
             "7z", "ace", "bz2", "cbz", "gz", "gzip", "lzma", "rar", "sft", "tar", "zip" };
         for( int i=0, n=sizeof(arc_types)/sizeof(arc_types[0]); i<n; ++i )
-            suffixes[ARCHIVE] << QString::fromAscii(arc_types[i]);
-        fileIcons[ARCHIVE]  = QIcon::fromTheme( QString::fromAscii("package-x-generic"), fallback );
+            suffixes[ARCHIVE] << QString::fromLatin1(arc_types[i]);
+        fileIcons[ARCHIVE]  = QIcon::fromTheme( QString::fromLatin1("package-x-generic"), fallback );
 
         const char * aud_types[] = {
             "aac", "ac3", "aiff", "ape", "au", "flac", "m3u", "m4a", "mid", "midi", "mp2",
             "mp3", "mpc", "nsf", "oga", "ogg", "ra", "ram", "shn", "voc", "wav", "wma" };
         for( int i=0, n=sizeof(aud_types)/sizeof(aud_types[0]); i<n; ++i )
-            suffixes[AUDIO] << QString::fromAscii(aud_types[i]);
-        fileIcons[AUDIO] = QIcon::fromTheme( QString::fromAscii("audio-x-generic"), fallback );
+            suffixes[AUDIO] << QString::fromLatin1(aud_types[i]);
+        fileIcons[AUDIO] = QIcon::fromTheme( QString::fromLatin1("audio-x-generic"), fallback );
 
         const char * exe_types[] = { "bat", "cmd", "com", "exe" };
         for( int i=0, n=sizeof(exe_types)/sizeof(exe_types[0]); i<n; ++i )
-            suffixes[APP] << QString::fromAscii(exe_types[i]);
-        fileIcons[APP] = QIcon::fromTheme( QString::fromAscii("application-x-executable"), fallback );
+            suffixes[APP] << QString::fromLatin1(exe_types[i]);
+        fileIcons[APP] = QIcon::fromTheme( QString::fromLatin1("application-x-executable"), fallback );
     }
 
     QString suffix( QFileInfo( filename ).suffix( ).toLower( ) );