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

19 files changed, 31 insertions, 31 deletions

diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index aac02610..e08ef9a3 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -58,7 +58,7 @@ AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStri
     d->problemReporter = new ProblemReporter (this);
 //    connect (core (), TQT_SIGNAL (configWidget (KDialogBase*)),
 //             d->problemReporter, TQT_SLOT (configWidget (KDialogBase*)));
-    d->problemReporter->setIcon( SmallIcon("info") );
+    d->problemReporter->setIcon( SmallIcon("application-vnd.tde.info") );
     mainWindow( )->embedOutputView( d->problemReporter, i18n("Problems"), i18n("Problem reporter"));
     TQWhatsThis::add(d->problemReporter, i18n("<b>Problem reporter</b><p>This window shows various \"problems\" in your project. "
         "It displays errors reported by a language parser."));
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index 1e97ad7c..12090860 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -253,7 +253,7 @@ void ProblemReporter::configure()
 void ProblemReporter::configWidget( KDialogBase* dlg )
 {
     kdDebug() << "ProblemReporter::configWidget()" << endl;
-    TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"),  BarIcon( "source", TDEIcon::SizeMedium ));
+    TQVBox *vbox = dlg->addVBoxPage(i18n("Ada Parsing"), i18n("Ada Parsing"),  BarIcon( "text-x-src", TDEIcon::SizeMedium ));
     ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox );
     connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
     connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure()));
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index 9f1be201..7e30b913 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -43,7 +43,7 @@ BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStr
 	setXMLFile("kdevbashsupport.rc");
 
 	TDEAction *action;
-	action = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
+	action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" );
     action->setToolTip(i18n("Run"));
     action->setWhatsThis(i18n("<b>Run</b><p>Starts an application."));
 
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
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index 154ff911..6da33030 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -62,17 +62,17 @@ CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const T
 
     TDEAction *action;
 
-    action = new TDEAction( i18n("Execute Main Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_exec" );
     action->setToolTip( i18n("Runs the CSharp program") );
 
-    action = new TDEAction( i18n("Execute String..."), "exec", 0,
+    action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecuteString()),
                           actionCollection(), "build_execstring" );
     action->setToolTip( i18n("Executes a string as CSharp code") );
 
-    action = new TDEAction( i18n("Start CSharp Interpreter"), "exec", 0,
+    action = new TDEAction( i18n("Start CSharp Interpreter"), "application-x-executable", 0,
                           this, TQT_SLOT(slotStartInterpreter()),
                           actionCollection(), "build_runinterpreter" );
     action->setToolTip( i18n("Starts the CSharp interpreter without a program") );
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 63b174fc..c4aa7390 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -147,7 +147,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr
              this, TQT_SLOT(partRemoved(KParts::Part*)));
 
     m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" );
-    m_problemReporter->setIcon( SmallIcon("info") );
+    m_problemReporter->setIcon( SmallIcon("application-vnd.tde.info") );
     mainWindow( )->embedOutputView( m_problemReporter, i18n("Problems"), i18n("Problem reporter"));
 
     connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)),
diff --git a/languages/kjssupport/kjsproblems.cpp b/languages/kjssupport/kjsproblems.cpp
index 1a13870e..d6bdeda1 100644
--- a/languages/kjssupport/kjsproblems.cpp
+++ b/languages/kjssupport/kjsproblems.cpp
@@ -53,7 +53,7 @@ KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *parent, const char *nam
 	addColumn ("File");
 	addColumn ("Line #");
 	addColumn ("Problem:");
-	setIcon( SmallIcon("info") );
+	setIcon( SmallIcon("application-vnd.tde.info") );
 }
 
 
@@ -65,7 +65,7 @@ KJSProblems::~KJSProblems()
 void KJSProblems::clearItems()
 {
 	clear();
-	setIcon( SmallIcon("info") );
+	setIcon( SmallIcon("application-vnd.tde.info") );
 }
 
 void KJSProblems::addLine(const TQString &file, int lineNo, const TQString &message)
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index 4a3dbc25..5a00e9c6 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -69,7 +69,7 @@ kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStrin
 	setXMLFile("kdevkjssupport.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" );
 	m_build->setStatusText( i18n("Test the active script.") );
 
 	kdDebug() << "Creating kjssupport Part" << endl;
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index c8379c77..3236e72e 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -62,17 +62,17 @@ PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStr
 
     TDEAction *action;
 
-    action = new TDEAction( i18n("Execute Main Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_exec" );
     action->setToolTip( i18n("Runs the Perl program") );
 
-    action = new TDEAction( i18n("Execute String..."), "exec", 0,
+    action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecuteString()),
                           actionCollection(), "build_execstring" );
     action->setToolTip( i18n("Executes a string as Perl code") );
 
-    action = new TDEAction( i18n("Start Perl Interpreter"), "exec", 0,
+    action = new TDEAction( i18n("Start Perl Interpreter"), "application-x-executable", 0,
                           this, TQT_SLOT(slotStartInterpreter()),
                           actionCollection(), "build_runinterpreter" );
     action->setToolTip( i18n("Starts the Perl interpreter without a program") );
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index 4f764f1f..c189cc5c 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -88,7 +88,7 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin
 
    TDEAction *action;
 
-   action = new TDEAction( i18n("&Run"), "exec",Key_F9,
+   action = new TDEAction( i18n("&Run"), "application-x-executable",Key_F9,
    this, TQT_SLOT(slotRun()),
    actionCollection(), "build_execute" );
    action->setToolTip(i18n("Run"));
@@ -101,7 +101,7 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin
    action->setWhatsThis(i18n("<b>New class</b><p>Runs New Class wizard."));
 
    m_phpErrorView = new PHPErrorView(this, 0, "phpErrorWidget");
-   m_phpErrorView->setIcon( SmallIcon("info") );
+   m_phpErrorView->setIcon( SmallIcon("application-vnd.tde.info") );
 
    TQWhatsThis::add(m_phpErrorView, i18n("<b>PHP problems</b><p>This view shows PHP parser warnings, errors, and fatal errors."));
    mainWindow()->embedOutputView(m_phpErrorView, i18n("Problems"), i18n("Problems"));
@@ -208,7 +208,7 @@ void PHPSupportPart::slotConfigStored() {
 }
 
 void PHPSupportPart::projectConfigWidget(KDialogBase *dlg) {
-   TQVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "source", TDEIcon::SizeMedium ));
+   TQVBox *vbox = dlg->addVBoxPage(i18n( "PHP Specific" ), i18n("PHP Settings"), BarIcon( "text-x-src", TDEIcon::SizeMedium ));
    PHPConfigWidget* w = new PHPConfigWidget(configData,vbox, "php config widget");
    connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
 }
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index 1f2c7b87..092f40b9 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -60,19 +60,19 @@ PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const T
 
     TDEAction *action;
 
-    action = new TDEAction( i18n("Execute Program"), "exec", 0,
+    action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecute()),
                           actionCollection(), "build_exec" );
     action->setToolTip( i18n("Execute program") );
     action->setWhatsThis(i18n("<b>Execute program</b><p>Runs the Python program."));
 
-    action = new TDEAction( i18n("Execute String..."), "exec", 0,
+    action = new TDEAction( i18n("Execute String..."), "application-x-executable", 0,
                           this, TQT_SLOT(slotExecuteString()),
                           actionCollection(), "build_execstring" );
     action->setToolTip( i18n("Execute string") );
     action->setWhatsThis(i18n("<b>Execute String</b><p>Executes a string as Python code."));
 
-    action = new TDEAction( i18n("Start Python Interpreter"), "exec", 0,
+    action = new TDEAction( i18n("Start Python Interpreter"), "application-x-executable", 0,
                           this, TQT_SLOT(slotStartInterpreter()),
                           actionCollection(), "build_runinterpreter" );
     action->setToolTip( i18n("Start Python interpreter") );
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index e1745a02..0b4627b9 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -48,14 +48,14 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr
   setXMLFile("kdevrubysupport.rc");
 
   TDEAction *action;
-  action = new TDEAction( i18n("&Run"), "exec", SHIFT + Key_F9,
+  action = new TDEAction( i18n("&Run"), "application-x-executable", SHIFT + Key_F9,
                         this, TQT_SLOT(slotRun()),
                         actionCollection(), "build_execute" );
   action->setToolTip(i18n("Run"));
   action->setWhatsThis(i18n("<b>Run</b><p>Starts an application."));
   action->setIcon("ruby_run.png");
 
-  action = new TDEAction( i18n("Run Test Under Cursor"), "exec", ALT + Key_F9,
+  action = new TDEAction( i18n("Run Test Under Cursor"), "application-x-executable", ALT + Key_F9,
                         this, TQT_SLOT(slotRunTestUnderCursor()),
                         actionCollection(), "build_execute_test_function" );
   action->setToolTip(i18n("Run Test Under Cursor"));
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 2ecb2ec4..e676cee5 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -40,7 +40,7 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri
     setXMLFile( "kdevsqlsupport.rc" );
 
     TDEAction *action;
-    action = new TDEAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" );
+    action = new TDEAction( i18n( "&Run" ), "application-x-executable", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" );
     action->setToolTip(i18n("Run"));
     action->setWhatsThis(i18n("<b>Run</b><p>Executes a SQL script."));
 
@@ -132,7 +132,7 @@ void SQLSupportPart::loadConfig()
 
 void SQLSupportPart::projectConfigWidget( KDialogBase *dlg )
 {
-    TQVBox *vbox = dlg->addVBoxPage( TQString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("source", TDEIcon::SizeMedium) );
+    TQVBox *vbox = dlg->addVBoxPage( TQString( "SQL" ), i18n( "Specify Your Database Connections" ), BarIcon("text-x-src", TDEIcon::SizeMedium) );
     SqlConfigWidget *w = new SqlConfigWidget( (TQWidget*)vbox, "SQL config widget" );
     w->setProjectDom( projectDom() );
     w->loadConfig();