Repair mimetype icon usage, part 1. The following are not fully verified in source as of this commit due to ubiquity: info, unknown

kate/part/katedocument.cpp

@@ -528,7 +528,7 @@ TQPixmap KateDocument::configPagePixmap (uint number, int size) const
       return BarIcon("document-save", size);
 
     case 6:
-      return BarIcon("source", size);
+      return BarIcon("text-x-src", size);
 
     case 7:
       return BarIcon("edit", size);

tdeio/bookmarks/kbookmarkmenu.cc

@@ -1057,7 +1057,7 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin
 {
   TQString _text = KStringHandler::csqueeze(text);
   _text.replace( '&', "&&" );
-  TDEAction * action = new KBookmarkAction(_text, "html", 0, 0, "", m_actionCollection, 0);
+  TDEAction * action = new KBookmarkAction(_text, "text-html", 0, 0, "", m_actionCollection, 0);
   connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
           m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
   action->setProperty( "url", url );

tdemdi/tdemdi/dockcontainer.cpp

@@ -203,7 +203,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
       connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeOverlapMode()));
     }
 
-    m_tb->appendTab(pixmap.isNull()?SmallIcon("application-vnd.tde.misc"):pixmap,tab,w->tabPageLabel());
+    m_tb->appendTab(pixmap.isNull()?SmallIcon("misc"):pixmap,tab,w->tabPageLabel());
     m_tb->tab(tab)->installEventFilter( this );
     kdDebug(760)<<"NAMENAMENAMENAME:===========================:"<<w->tabPageLabel()<<endl;
 
@@ -457,7 +457,7 @@ void DockContainer::setPixmap(KDockWidget* widget ,const TQPixmap& pixmap)
   int id=m_ws->id(widget);
   if (id==-1) return;
   KMultiTabBarTab *tab=m_tb->tab(id);
-  tab->setIcon(pixmap.isNull()?SmallIcon("application-vnd.tde.misc"):pixmap);
+  tab->setIcon(pixmap.isNull()?SmallIcon("misc"):pixmap);
 }
 
 void DockContainer::save(TDEConfig* cfg,const TQString& group_or_prefix)

tdemdi/tdemdi/mainwindow.cpp

@@ -144,10 +144,10 @@ void MainWindow::setupMainDock ()
 
 void MainWindow::setupToolViews ()
 {
-  m_leftContainer = createDockWidget("KMdiDock::leftDock",SmallIcon("application-vnd.tde.misc"),0L,"Left Dock");
+  m_leftContainer = createDockWidget("KMdiDock::leftDock",SmallIcon("misc"),0L,"Left Dock");
-  m_rightContainer = createDockWidget("KMdiDock::rightDock",SmallIcon("application-vnd.tde.misc"),0L,"Right Dock");
+  m_rightContainer = createDockWidget("KMdiDock::rightDock",SmallIcon("misc"),0L,"Right Dock");
-  m_topContainer = createDockWidget("KMdiDock::topDock",SmallIcon("application-vnd.tde.misc"),0L,"Top Dock");
+  m_topContainer = createDockWidget("KMdiDock::topDock",SmallIcon("misc"),0L,"Top Dock");
-  m_bottomContainer = createDockWidget("KMdiDock::bottomDock",SmallIcon("application-vnd.tde.misc"),0L,"Bottom Dock");
+  m_bottomContainer = createDockWidget("KMdiDock::bottomDock",SmallIcon("misc"),0L,"Bottom Dock");
 
   KDockWidget *mainDock=getMainDockWidget();
   KDockWidget *w=mainDock;

tdemdi/tdemdidockcontainer.cpp

@@ -226,7 +226,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 			connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) );
 		}
 
-		m_tb->appendTab( pixmap.isNull() ? SmallIcon( "application-vnd.tde.misc" ) : pixmap, tab, w->tabPageLabel() );
+		m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() );
 		m_tb->tab( tab )->installEventFilter( this );
 		kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() <<
 			" to the tabbar" << endl;
@@ -509,7 +509,7 @@ void KMdiDockContainer::setPixmap( KDockWidget* widget , const TQPixmap& pixmap
 	if ( id == -1 )
 		return ;
 	KMultiTabBarTab *tab = m_tb->tab( id );
-	tab->setIcon( pixmap.isNull() ? SmallIcon( "application-vnd.tde.misc" ) : pixmap );
+	tab->setIcon( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap );
 }
 
 void KMdiDockContainer::save( TQDomElement& dockEl )

tdemdi/tdemdimainfrm.cpp

@@ -1923,10 +1923,10 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
 
 void KMdiMainFrm::setupToolViewsForIDEALMode()
 {
-	m_leftContainer = createDockWidget( "KMdiDock::leftDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Left Dock" );
+	m_leftContainer = createDockWidget( "KMdiDock::leftDock", SmallIcon( "misc" ), 0L, "Left Dock" );
-	m_rightContainer = createDockWidget( "KMdiDock::rightDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Right Dock" );
+	m_rightContainer = createDockWidget( "KMdiDock::rightDock", SmallIcon( "misc" ), 0L, "Right Dock" );
-	m_topContainer = createDockWidget( "KMdiDock::topDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Top Dock" );
+	m_topContainer = createDockWidget( "KMdiDock::topDock", SmallIcon( "misc" ), 0L, "Top Dock" );
-	m_bottomContainer = createDockWidget( "KMdiDock::bottomDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Bottom Dock" );
+	m_bottomContainer = createDockWidget( "KMdiDock::bottomDock", SmallIcon( "misc" ), 0L, "Bottom Dock" );
 
 	KDockWidget *mainDock = getMainDockWidget();
 	KDockWidget *w = mainDock;