Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdevelop

9 files changed, 11 insertions, 11 deletions

diff --git a/parts/abbrev/abbrevconfigwidget.cpp b/parts/abbrev/abbrevconfigwidget.cpp
index 7019b9fb..dd38e0e8 100644
--- a/parts/abbrev/abbrevconfigwidget.cpp
+++ b/parts/abbrev/abbrevconfigwidget.cpp
@@ -42,7 +42,7 @@ AbbrevConfigWidget::AbbrevConfigWidget(AbbrevPart *part, TQWidget *parent, const
                            templ->suffixes,
                            templ->code,
                            templ->code );
-        it->setPixmap( 0, SmallIcon("template_source"));
+        it->setPixmap( 0, SmallIcon("application-vnd.tde.template_source"));
     }
 
     checkWordCompletion->setChecked( part->autoWordCompletionEnabled() );
@@ -95,7 +95,7 @@ void AbbrevConfigWidget::codeChanged()
     if( item ){
         item->setText( 3, editCode->text() );
         if (item->text(3) == item->text(4))
-            item->setPixmap( 0, SmallIcon("template_source") );
+            item->setPixmap( 0, SmallIcon("application-vnd.tde.template_source") );
         else
             item->setPixmap( 0, SmallIcon("document-save") );
     }
diff --git a/parts/abbrev/kdevabbrev.desktop b/parts/abbrev/kdevabbrev.desktop
index c13e5770..715e32dc 100644
--- a/parts/abbrev/kdevabbrev.desktop
+++ b/parts/abbrev/kdevabbrev.desktop
@@ -76,7 +76,7 @@ GenericName[tr]=Kısaltma Genişlemesi
 GenericName[zh_CN]=缩写扩展
 GenericName[zh_TW]=縮寫擴展
 X-TDE-ServiceTypes=TDevelop/Plugin
-Icon=fontsizeup
+Icon=font-x-genericsizeup
 X-TDE-Library=libkdevabbrev
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index cc7316c8..39dad5e3 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -211,7 +211,7 @@ void BookmarksWidget::createURL( EditorData * data )
 	{
 		TQListViewItem * file = new BookmarkItem( this, data->url );
 		file->setOpen( true );
-		file->setPixmap( 0, SmallIcon( "document" ) );
+		file->setPixmap( 0, SmallIcon( "text-x-generic" ) );
 
 		TQValueListIterator< TQPair<int,TQString> > it = data->marks.begin();
 		while ( it != data->marks.end() )
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index c79d22d6..74122b1f 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -76,7 +76,7 @@ void DocumentationItem::init( )
             icon = "contents";
             break;
         default:
-            icon = "document";
+            icon = "text-x-generic";
     }
     
     setPixmap(0, SmallIcon(icon));
diff --git a/parts/doxygen/input.cpp b/parts/doxygen/input.cpp
index d8a1ebc7..1194d0bc 100644
--- a/parts/doxygen/input.cpp
+++ b/parts/doxygen/input.cpp
@@ -219,7 +219,7 @@ InputString::InputString(const TQString & label,
         
         if (m == StringFile || m == StringDir) {
             br = new TQPushButton(this);
-            br->setPixmap(SmallIcon(m==StringFile? "document" : "folder"));
+            br->setPixmap(SmallIcon(m==StringFile? "text-x-generic" : "folder"));
             TQToolTip::add(br, m==StringFile? i18n("Browse to a file") : i18n("Browse to a folder"));
             layout->addWidget(br, 0, 2);
         }
@@ -362,7 +362,7 @@ InputStrList::InputStrList(const TQString & label,
     if (lm != ListString) {
         if (lm & ListFile) {
             brFile = new TQPushButton(dw);
-            brFile->setPixmap(SmallIcon("document"));
+            brFile->setPixmap(SmallIcon("text-x-generic"));
             TQToolTip::add(brFile, i18n("Browse to a file"));
             boxlayout->addWidget(brFile);
         } 
diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp
index 8a3e19b4..8400b2f1 100644
--- a/parts/fileview/filegroupswidget.cpp
+++ b/parts/fileview/filegroupswidget.cpp
@@ -145,7 +145,7 @@ private:
 FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &fileName)
     : TQListViewItem(parent), fullname(fileName)
 {
-    setPixmap(0, SmallIcon("document"));
+    setPixmap(0, SmallIcon("text-x-generic"));
     TQFileInfo fi(fileName);
     setText(0, fi.fileName());
     setText(1, "./" + fi.dirPath());
diff --git a/parts/outputviews/kdevappoutputview.desktop b/parts/outputviews/kdevappoutputview.desktop
index a5faf631..f84de45e 100644
--- a/parts/outputviews/kdevappoutputview.desktop
+++ b/parts/outputviews/kdevappoutputview.desktop
@@ -76,7 +76,7 @@ GenericName[tg]=Тирезаи хориҷ кардани гузориш
 GenericName[tr]=Uygulama Çıktı Görünümü
 GenericName[zh_CN]=应用程序输出查看器
 GenericName[zh_TW]=應用程式輸出檢視
-Icon=exec
+Icon=application-x-executable
 X-TDE-ServiceTypes=TDevelop/AppFrontend
 X-TDE-Library=libkdevappview
 X-TDevelop-Version=5
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index 9324bcb0..8b441e94 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -40,7 +40,7 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis
     m_dcop = new KDevMakeFrontendIface(this);
 
     m_widget = new MakeWidget(this);
-    m_widget->setIcon( SmallIcon("exec") );
+    m_widget->setIcon( SmallIcon("application-x-executable") );
     m_widget->setCaption(i18n("Messages Output"));
     TQWhatsThis::add(m_widget, i18n("<b>Messages output</b><p>"
                                    "The messages window shows the output of the compiler and "
diff --git a/parts/scripting/kdevscripting.desktop b/parts/scripting/kdevscripting.desktop
index ba1f4dea..ef5b56e4 100644
--- a/parts/scripting/kdevscripting.desktop
+++ b/parts/scripting/kdevscripting.desktop
@@ -61,7 +61,7 @@ Comment[sv]=Skriptinsticksprogrammet erbjuder KScript-baserad styrning av progra
 Comment[tr]=Betik Yazma eklentisi TDevelop uygulamasına KScript tabanlı betik yazmayı sunar.
 Comment[zh_CN]=脚本插件可为 TDevelop 应用程序提供基于 KScript 的脚本。
 Comment[zh_TW]=文稿外掛程式提供 TDevelop 應用程式一個 KScript 基礎的文稿機制。
-Icon=shellscript
+Icon=text-x-text-x-script
 X-TDE-ServiceTypes=TDevelop/Plugin
 
 X-TDevelop-Plugin-Version=1