Branch: master

1774bba7 2014-10-22 11:55:00 Timothy Pearson
Repair mimetype icon usage, part 1.  The following are not fully verified in source as of this commit due to ubiquity: info, unknown
M kplato/kptconfigdialog.cc
M kspread/dialogs/link.cc
M kword/KWConfig.cpp
M lib/kofficeui/KoInsertLink.cpp
diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc
index c7f3307..404fd2b 100644
--- a/kplato/kptconfigdialog.cc
+++ b/kplato/kptconfigdialog.cc
@@ -52,10 +52,10 @@
       m_config(config)
 {
 
-/*    TQVBox *page = addVBoxPage(i18n("Behavior"), i18n("Behavior"), loadIcon(""application-vnd.tde.misc"));
+/*    TQVBox *page = addVBoxPage(i18n("Behavior"), i18n("Behavior"), loadIcon(""misc"));
     m_behaviorPage = new ConfigBehaviorPanel(config.behavior(), page);*/
     
-    TQVBox *page = addVBoxPage(i18n("Task Defaults"), i18n("Task Defaults"), loadIcon(""application-vnd.tde.misc"));
+    TQVBox *page = addVBoxPage(i18n("Task Defaults"), i18n("Task Defaults"), loadIcon(""misc"));
     m_taskDefaultPage = new TaskDefaultPanel(config.taskDefaults(), project.standardWorktime(), page);
     
     enableButtonOK(false);
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index e75e421..e0c1be2 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -67,7 +67,7 @@
     
     // link for web or ftp
     d->internetPage = addPage( i18n( "Internet" ), TQString(), 
-        BarIcon( "html",TDEIcon::SizeMedium ) );
+        BarIcon( "text-html",TDEIcon::SizeMedium ) );
     TQVBoxLayout* iLayout = new TQVBoxLayout( d->internetPage, marginHint(), spacingHint() );
     iLayout->add( new TQLabel( i18n("Text to display:" ), d->internetPage ) );
     d->internetText = new KLineEdit( d->internetPage );
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index 70665c0..505eb06 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -103,7 +103,7 @@
                                              this, KWFactory::instance()->config(), page5 );
 
   TQVBox *page3 = addVBoxPage( i18n("Misc"), i18n("Misc Settings"),
-                              loadIcon(""application-vnd.tde.misc") );
+                              loadIcon(""misc") );
   m_miscPage=new ConfigureMiscPage(parent, page3);
 
   TQVBox *page6 = addVBoxPage( i18n("Path"), i18n("Path Settings"),
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index 1e1a266..c0866e3 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -42,7 +42,7 @@
 		   KDialogBase::Ok, parent, name )
 {
   bookmarkLink = 0L;
-  TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("html",TDEIcon::SizeMedium));
+  TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("text-html",TDEIcon::SizeMedium));
   internetLink = new  internetLinkPage(page );
   connect(internetLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged (  )));