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

7 files changed, 8 insertions, 8 deletions

diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 9751c23f..a9215cab 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -222,7 +222,7 @@ void AutoDetailsView::initActions()
 	buildTargetAction->setEnabled( false );
 
 	TQToolTip::add( m_button5, tr2i18n( "Execute Target..."));
-	executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "exec", 0,
+	executeTargetAction = new AutoToolsAction( i18n( "Execute Target..." ), "application-x-executable", 0,
 	                                           TQT_TQOBJECT(this), TQT_SLOT( slotExecuteTarget() ), actions,
 	                                   "execute target" );
 	executeTargetAction->setWhatsThis(i18n("<b>Execute target</b><p>Executes the target "
diff --git a/buildtools/autotools/autolistviewitems.cpp b/buildtools/autotools/autolistviewitems.cpp
index 971a2dbe..e69c12b1 100644
--- a/buildtools/autotools/autolistviewitems.cpp
+++ b/buildtools/autotools/autolistviewitems.cpp
@@ -102,7 +102,7 @@ TargetItem::TargetItem( TQListView *lv, bool group, const TQString &text )
 		: ProjectItem( Target, lv, text )
 {
 	sources.setAutoDelete( true );
-	setPixmap( 0, group ? SmallIcon( "tar" ) : SmallIcon( "binary" ) );
+	setPixmap( 0, group ? SmallIcon( "application-x-tar" ) : SmallIcon( "application-octet-stream" ) );
 }
 
 
@@ -115,7 +115,7 @@ FileItem::FileItem( TQListView *lv, const TQString &text, bool set_is_subst )
 {
 	if(!is_subst)
 	{
-		setPixmap( 0, SmallIcon( "document" ) );
+		setPixmap( 0, SmallIcon( "text-x-generic" ) );
 	}
 	else
 	{
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index 6b408bd0..6640a353 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -213,7 +213,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr
     TQDomDocument &dom = *projectDom();
     if (!DomUtil::readBoolEntry(dom, "/kdevautoproject/run/disable_default")) {
         //ok we handle the execute in this kpart
-        action = new TDEAction( i18n("Execute Program"), "exec", SHIFT+Key_F9,
+        action = new TDEAction( i18n("Execute Program"), "application-x-executable", SHIFT+Key_F9,
                               this, TQT_SLOT(slotExecute()),
                               actionCollection(), "build_execute" );
         action->setToolTip(i18n("Execute program"));
diff --git a/buildtools/autotools/kdevautoproject.desktop b/buildtools/autotools/kdevautoproject.desktop
index 043a6c5d..dde9db46 100644
--- a/buildtools/autotools/kdevautoproject.desktop
+++ b/buildtools/autotools/kdevautoproject.desktop
@@ -91,7 +91,7 @@ GenericName[uz@cyrillic]=Automake лойиҳаси
 GenericName[zh_CN]=Automake 工程
 GenericName[zh_TW]=Automake 專案
 X-TDE-ServiceTypes=TDevelop/Project
-Icon=make
+Icon=text-x-text-x-makefile
 X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/autotools/kdevtdeautoproject.desktop b/buildtools/autotools/kdevtdeautoproject.desktop
index 18d5364b..128eb218 100644
--- a/buildtools/autotools/kdevtdeautoproject.desktop
+++ b/buildtools/autotools/kdevtdeautoproject.desktop
@@ -86,7 +86,7 @@ GenericName[tr]=TDE Automake Projesi
 GenericName[zh_CN]=TDE Automake 工程
 GenericName[zh_TW]=TDE Automake 專案
 X-TDE-ServiceTypes=TDevelop/Project
-Icon=make
+Icon=text-x-text-x-makefile
 X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=kde
diff --git a/buildtools/autotools/tdefilednddetailview.cpp b/buildtools/autotools/tdefilednddetailview.cpp
index 74492577..c4b4f504 100644
--- a/buildtools/autotools/tdefilednddetailview.cpp
+++ b/buildtools/autotools/tdefilednddetailview.cpp
@@ -160,7 +160,7 @@ void KFileDnDDetailView::startDrag(){
 	}
 	TQPixmap pixmap;
 	if( urls.count() > 1 ){
-		pixmap = DesktopIcon( "tdemultiple", 16 );
+		pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", 16 );
 	}
 	if( pixmap.isNull() )
 		pixmap = currentFileItem()->pixmap( 16 );	
diff --git a/buildtools/autotools/tdefiledndiconview.cpp b/buildtools/autotools/tdefiledndiconview.cpp
index d192b3b0..f1f9afae 100644
--- a/buildtools/autotools/tdefiledndiconview.cpp
+++ b/buildtools/autotools/tdefiledndiconview.cpp
@@ -149,7 +149,7 @@ TQDragObject* KFileDnDIconView::dragObject() {
 	}
 	TQPixmap pixmap;
 	if( urls.count() > 1 )
-		pixmap = DesktopIcon( "tdemultiple", iconSize() );
+		pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", iconSize() );
 	if( pixmap.isNull() )
 		pixmap = currentFileItem()->pixmap( iconSize() );	
 	TQPoint hotspot;