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

7 files changed, 8 insertions, 8 deletions

diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index 559a931b..69dcd7d8 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -28,7 +28,7 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}");
 	setXMLFile("kdevlang_%{APPNAMELC}.rc");
 
 
-	m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+	m_build = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
 
 	kdDebug() << "Creating %{APPNAMELC} Part" << endl;
 
diff --git a/languages/cpp/app_templates/tdecmodule/module.desktop b/languages/cpp/app_templates/tdecmodule/module.desktop
index a1975f26..17817afe 100644
--- a/languages/cpp/app_templates/tdecmodule/module.desktop
+++ b/languages/cpp/app_templates/tdecmodule/module.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=tdecmshell %{APPNAMELC}
-Icon=misc
+Icon=application-vnd.tde.misc
 Type=Application
 
 X-TDE-ModuleType=Library
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 35739045..11a949a8 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -449,7 +449,7 @@ void CppSupportPart::configWidget( KDialogBase *dlg )
 	connect( dlg, TQT_SIGNAL( okClicked() ), w, TQT_SLOT( storeConfig() ) );
 
 	vbox = dlg->addVBoxPage(i18n("C++ Parsing"), i18n("C++ Parsing"),
-	                               BarIcon( "source_cpp", TDEIcon::SizeMedium) );
+	                               BarIcon( "text-x-c++src", TDEIcon::SizeMedium) );
 	ConfigureProblemReporter* ww = new ConfigureProblemReporter( vbox );
 	ww->setPart( this );
 	connect(dlg, TQT_SIGNAL(okClicked()), ww, TQT_SLOT(accept()));
@@ -581,7 +581,7 @@ void CppSupportPart::embedProblemReporter( bool force )
 	if ( force || m_backgroundParserConfig->useProblemReporter() )
 	{
 		m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" );
-		m_problemReporter->setIcon( SmallIcon( "info" ) );
+		m_problemReporter->setIcon( SmallIcon( "application-vnd.tde.info" ) );
 		m_problemReporter->setCaption( i18n( "Problem Reporter" ) );
 		mainWindow( ) ->embedOutputView( m_problemReporter, i18n( "Problems" ), i18n( "Problem reporter" ) );
 	}
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 61384cbd..6621cbf8 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -291,7 +291,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi
         "<b>Libraries</b>"));
 
 
-    action = new TDEAction(i18n("Examine Core File..."), "core", 0,
+    action = new TDEAction(i18n("Examine Core File..."), "application-x-core", 0,
                          this, TQT_SLOT(slotExamineCore()),
                          actionCollection(), "debug_core");
     action->setToolTip( i18n("Examine core file") );
diff --git a/languages/cpp/debugger/kdevdebugger.desktop b/languages/cpp/debugger/kdevdebugger.desktop
index bcf82469..69ff8525 100644
--- a/languages/cpp/debugger/kdevdebugger.desktop
+++ b/languages/cpp/debugger/kdevdebugger.desktop
@@ -78,7 +78,7 @@ GenericName[tg]=Интеграл ёфтани созгузор
 GenericName[tr]=Hata Ayıklayıcı Önucu
 GenericName[zh_CN]=调试器前端
 GenericName[zh_TW]=除錯器前端
-Icon=debugger
+Icon=application-x-debugger
 X-TDE-ServiceTypes=TDevelop/Plugin
 X-TDE-Library=libkdevdebugger
 X-TDevelop-Version=5
diff --git a/languages/cpp/kdevcppsupport.desktop b/languages/cpp/kdevcppsupport.desktop
index 3b78a131..cf6b0a8e 100644
--- a/languages/cpp/kdevcppsupport.desktop
+++ b/languages/cpp/kdevcppsupport.desktop
@@ -79,7 +79,7 @@ GenericName[tr]=C++ Desteği
 GenericName[zh_CN]=C++ 支持
 GenericName[zh_TW]=C++ 支援
 X-TDE-ServiceTypes=TDevelop/LanguageSupport
-Icon=source_cpp
+Icon=text-x-text-x-csrcpp
 X-TDE-Library=libkdevcppsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=C++
diff --git a/languages/cpp/kdevcsupport.desktop b/languages/cpp/kdevcsupport.desktop
index 907b97fb..e3c042c7 100644
--- a/languages/cpp/kdevcsupport.desktop
+++ b/languages/cpp/kdevcsupport.desktop
@@ -78,7 +78,7 @@ GenericName[tr]=C Desteği
 GenericName[zh_CN]=C 支持
 GenericName[zh_TW]=C 支援
 X-TDE-ServiceTypes=TDevelop/LanguageSupport
-Icon=source_cpp
+Icon=text-x-text-x-csrcpp
 X-TDE-Library=libkdevcppsupport
 X-TDevelop-Version=5
 X-TDevelop-Language=C