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

akregator/src/feeditem.cpp

@@ -89,7 +89,7 @@ TQPixmap FeedItem::errorPixmap()
 
 TQPixmap FeedItem::defaultPixmap()
 {
-    return TDEGlobal::iconLoader()->loadIcon("txt", TDEIcon::Small);
+    return TDEGlobal::iconLoader()->loadIcon(""text-plain", TDEIcon::Small);
 }
 
 void FeedItem::initialize(Feed* node)

akregator/src/pageviewer.cpp

@@ -262,7 +262,7 @@ bool PageViewer::openURL(const KURL& url)
     if (!favicon.isEmpty()) 
         emit setTabIcon(TQPixmap(TDEGlobal::dirs()->findResource("cache", favicon+".png")));
     else
-        emit setTabIcon(SmallIcon("html"));
+        emit setTabIcon(SmallIcon("text-html"));
 
     return val;
 }

kaddressbook/viewmanager.cpp

@@ -497,7 +497,7 @@ void ViewManager::startDrag()
     }
   }
 
-  drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) );
+  drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( ""x-office-address-book", TDEIcon::Desktop ) );
   drag->dragCopy();
 }
 

kaddressbook/views/kaddressbookiconview.cpp

@@ -112,7 +112,7 @@ class AddresseeIconViewItem : public TDEIconViewItem
         setText( mAddressee.givenName() + " " + mAddressee.familyName() );
 
       TQPixmap icon;
-      TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) );
+      TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( ""x-office-address-book", TDEIcon::Desktop ) );
       TDEABC::Picture pic = mAddressee.photo();
       if ( pic.data().isNull() )
         pic = mAddressee.logo();

kalarm/prefdlg.cpp

@@ -122,7 +122,7 @@ KAlarmPrefDlg::KAlarmPrefDlg()
 	setWFlags(TQt::WDestructiveClose);
 	setIconListAllVisible(true);
 
-	TQVBox* frame = addVBoxPage(i18n("General"), i18n("General"), DesktopIcon("misc"));
+	TQVBox* frame = addVBoxPage(i18n("General"), i18n("General"), DesktopIcon("application-vnd.tde.misc"));
 	mMiscPage = new MiscPrefTab(frame);
 
 	frame = addVBoxPage(i18n("Email"), i18n("Email Alarm Settings"), DesktopIcon("mail_generic"));

karm/karm_part.cpp

@@ -156,7 +156,7 @@ void karmPart::makeMenus()
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new TDEAction( i18n("New &Subtask..."),
-      TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
+      TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
@@ -171,21 +171,21 @@ void karmPart::makeMenus()
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new TDEAction( i18n("&Add Comment..."),
-//      TQString::fromLatin1("document"),
+//      TQString::fromLatin1("text-x-generic"),
 //      CTRL+ALT+Key_E,
 //      TQT_TQOBJECT(_taskView),
 //      TQT_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
-      TQString::fromLatin1("document"),
+      TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
-      TQString::fromLatin1("document"),
+      TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsIncomplete() ),

karm/mainwindow.cpp

@@ -294,7 +294,7 @@ void MainWindow::makeMenus()
       TQT_SLOT( newTask() ), actionCollection(),
       "new_task");
   actionNewSub = new TDEAction( i18n("New &Subtask..."),
-      TQString::fromLatin1("tdemultiple"), CTRL+ALT+Key_N,
+      TQString::fromLatin1("application-vnd.tde.tdemultiple"), CTRL+ALT+Key_N,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( newSubTask() ), actionCollection(),
       "new_sub_task");
@@ -309,21 +309,21 @@ void MainWindow::makeMenus()
       TQT_SLOT( editTask() ), actionCollection(),
       "edit_task");
 //  actionAddComment = new TDEAction( i18n("&Add Comment..."),
-//      TQString::fromLatin1("document"),
+//      TQString::fromLatin1("text-x-generic"),
 //      CTRL+ALT+Key_E,
 //      TQT_TQOBJECT(_taskView),
 //      TQT_SLOT( addCommentToTask() ),
 //      actionCollection(),
 //      "add_comment_to_task");
   actionMarkAsComplete = new TDEAction( i18n("&Mark as Complete"),
-      TQString::fromLatin1("document"),
+      TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsComplete() ),
       actionCollection(),
       "mark_as_complete");
   actionMarkAsIncomplete = new TDEAction( i18n("&Mark as Incomplete"),
-      TQString::fromLatin1("document"),
+      TQString::fromLatin1("text-x-generic"),
       CTRL+Key_M,
       TQT_TQOBJECT(_taskView),
       TQT_SLOT( markTaskAsIncomplete() ),

kmail/kmail_config_misc.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=misc
+Icon=application-vnd.tde.misc
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 

kmail/kmheaders.cpp

@@ -2401,7 +2401,7 @@ void KMHeaders::contentsMouseMoveEvent( TQMouseEvent* e )
       if( count == 1 )
         pixmap = TQPixmap( DesktopIcon("message", TDEIcon::SizeSmall) );
       else
-        pixmap = TQPixmap( DesktopIcon("tdemultiple", TDEIcon::SizeSmall) );
+        pixmap = TQPixmap( DesktopIcon("application-vnd.tde.tdemultiple", TDEIcon::SizeSmall) );
 
       // Calculate hotspot (as in Konqueror)
       if( !pixmap.isNull() ) {

kmail/kmmimeparttree.cpp

@@ -366,11 +366,11 @@ void KMMimePartTreeItem::setIconAndTextForType( const TQString & mime )
     setPixmap( 0, SmallIcon("folder") );
   } else if ( mimetype == "application/octet-stream" ) {
     setText( 1, i18n("Unspecified Binary Data") ); // don't show "Unknown"...
-    setPixmap( 0, SmallIcon("unknown") );
+    setPixmap( 0, SmallIcon("text-x-katefilelist") );
   } else {
     KMimeType::Ptr mtp = KMimeType::mimeType( mimetype );
     setText( 1, (mtp && !mtp->comment().isEmpty()) ? mtp->comment() : mimetype );
-    setPixmap( 0, mtp ? mtp->pixmap( TDEIcon::Small) : SmallIcon("unknown") );
+    setPixmap( 0, mtp ? mtp->pixmap( TDEIcon::Small) : SmallIcon("text-x-katefilelist") );
   }
 }
 

kmail/kmmsgpartdlg.cpp

@@ -65,7 +65,7 @@ KMMsgPartDialog::KMMsgPartDialog( const TQString & caption,
 
   // mimetype icon:
   mIcon = new TQLabel( plainPage() );
-  mIcon->setPixmap( DesktopIcon("unknown") );
+  mIcon->setPixmap( DesktopIcon("text-x-katefilelist") );
   glay->addMultiCellWidget( mIcon, 0, 1, 0, 0 );
 
   // row 0: Type combobox:
@@ -325,7 +325,7 @@ void KMMsgPartDialog::slotMimeTypeChanged( const TQString & mimeType ) {
        == TQValidator::Acceptable )
     mIcon->setPixmap( KMimeType::mimeType( mimeType )->pixmap( TDEIcon::Desktop ) );
   else
-    mIcon->setPixmap( DesktopIcon("unknown") );
+    mIcon->setPixmap( DesktopIcon("text-x-katefilelist") );
 }
 
 

kmail/searchwindow.cpp

@@ -95,7 +95,7 @@ class MatchListView : public TDEListView
       if( mailList.count() == 1 )
         pixmap = TQPixmap( DesktopIcon("message", TDEIcon::SizeSmall) );
       else
-        pixmap = TQPixmap( DesktopIcon("tdemultiple", TDEIcon::SizeSmall) );
+        pixmap = TQPixmap( DesktopIcon("application-vnd.tde.tdemultiple", TDEIcon::SizeSmall) );
 
       d->setPixmap( pixmap );
       return d;

korganizer/korganizer_configfonts.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=fonts
+Icon=font-x-generics
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 

ktnef/gui/ms-tnef.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/ms-tnef
-Icon=tar
+Icon=application-x-tar
 Patterns=*.tnf;
 Comment=TNEF File
 Comment[af]=TNEF lêer

tdeabc/tdeabcdistlistupdater/tdeabcdistlistupdater.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=tdeabcdistlistupdater
 Exec=tdeabcdistlistupdater --disable-autostart
-Icon=misc
+Icon=application-vnd.tde.misc
 Type=Application
 Comment=Tool to update the old distribution lists to the new ones.
 Terminal=false