summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-10-23 11:48:34 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-10-23 11:48:34 +0900
commit0ffe0dfb29f3be5bb87b977b3a8ae1d9cd4346d5 (patch)
tree9d6b46524badc15e4915e37777375b31ef326068
parent91d8d752c79df1bb4db425affd34116ec1157dd7 (diff)
parentca46c5047fd0f619486b89e032c34d9a5664cdcb (diff)
downloadtdevelop-0ffe0dfb29f3be5bb87b977b3a8ae1d9cd4346d5.tar.gz
tdevelop-0ffe0dfb29f3be5bb87b977b3a8ae1d9cd4346d5.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdevelop
-rw-r--r--buildtools/ada/adaproject_part.cpp2
-rw-r--r--buildtools/autotools/autodetailsview.cpp2
-rw-r--r--buildtools/autotools/autolistviewitems.cpp4
-rw-r--r--buildtools/autotools/autoprojectpart.cpp2
-rw-r--r--buildtools/autotools/kdevautoproject.desktop2
-rw-r--r--buildtools/autotools/kdevtdeautoproject.desktop2
-rw-r--r--buildtools/autotools/tdefilednddetailview.cpp2
-rw-r--r--buildtools/autotools/tdefiledndiconview.cpp2
-rw-r--r--buildtools/custommakefiles/customprojectpart.cpp8
-rw-r--r--buildtools/pascal/pascalproject_part.cpp4
-rw-r--r--buildtools/qmake/qmakescopeitem.cpp4
-rw-r--r--buildtools/qmake/trollprojectpart.cpp10
-rw-r--r--buildtools/qmake/trollprojectwidget.cpp4
-rw-r--r--embedded/visualboyadvance/visualboyadvance_part.cpp4
-rw-r--r--languages/ada/adasupportpart.cpp2
-rw-r--r--languages/ada/problemreporter.cpp2
-rw-r--r--languages/bash/bashsupport_part.cpp2
-rw-r--r--languages/cpp/app_templates/kdevlang/kdevlang_part.cpp2
-rw-r--r--languages/cpp/app_templates/tdecmodule/module.desktop2
-rw-r--r--languages/cpp/cppsupportpart.cpp4
-rw-r--r--languages/cpp/debugger/debuggerpart.cpp2
-rw-r--r--languages/cpp/debugger/kdevdebugger.desktop2
-rw-r--r--languages/cpp/kdevcppsupport.desktop2
-rw-r--r--languages/cpp/kdevcsupport.desktop2
-rw-r--r--languages/csharp/csharpsupportpart.cpp6
-rw-r--r--languages/java/javasupportpart.cpp2
-rw-r--r--languages/kjssupport/kjsproblems.cpp4
-rw-r--r--languages/kjssupport/kjssupport_part.cpp2
-rw-r--r--languages/perl/perlsupportpart.cpp6
-rw-r--r--languages/php/phpsupportpart.cpp6
-rw-r--r--languages/python/pythonsupportpart.cpp6
-rw-r--r--languages/ruby/rubysupport_part.cpp4
-rw-r--r--languages/sql/sqlsupport_part.cpp4
-rw-r--r--mimetypes/x-fortran.desktop2
-rw-r--r--parts/abbrev/abbrevconfigwidget.cpp4
-rw-r--r--parts/abbrev/kdevabbrev.desktop2
-rw-r--r--parts/bookmarks/bookmarks_widget.cpp2
-rw-r--r--parts/documentation/interfaces/kdevdocumentationplugin.cpp2
-rw-r--r--parts/doxygen/input.cpp4
-rw-r--r--parts/fileview/filegroupswidget.cpp2
-rw-r--r--parts/outputviews/kdevappoutputview.desktop2
-rw-r--r--parts/outputviews/makeviewpart.cpp2
-rw-r--r--parts/scripting/kdevscripting.desktop2
-rw-r--r--vcs/subversion/integrator/kdevsubversionintegrator.desktop2
-rw-r--r--vcs/subversion/kdevsubversion.desktop2
45 files changed, 71 insertions, 71 deletions
diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp
index 32833dfd..5eacf5d0 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -56,7 +56,7 @@ AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStrin
action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8,
this, TQT_SLOT(slotBuild()),
actionCollection(), "build_build" );
- action = new TDEAction( i18n("Execute Program"), "exec", 0,
+ action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0,
this, TQT_SLOT(slotExecute()),
actionCollection(), "build_execute" );
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;
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index 5b41080e..c737f941 100644
--- a/buildtools/custommakefiles/customprojectpart.cpp
+++ b/buildtools/custommakefiles/customprojectpart.cpp
@@ -137,7 +137,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const
"Environment variables and make arguments can be specified "
"in the project settings dialog, <b>Build Options</b> tab." ) );
- action = new TDEAction( i18n( "Execute Program" ), "exec", 0,
+ action = new TDEAction( i18n( "Execute Program" ), "application-x-executable", 0,
this, TQT_SLOT( slotExecute() ),
actionCollection(), "build_execute" );
action->setToolTip( i18n( "Execute program" ) );
@@ -193,14 +193,14 @@ CustomProjectPart::~CustomProjectPart()
void CustomProjectPart::projectConfigWidget( KDialogBase *dlg )
{
TQVBox *vbox;
- vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "make", TDEIcon::SizeMedium ) );
+ vbox = dlg->addVBoxPage( i18n( "Custom Manager" ), i18n( "Custom Manager" ), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ) );
CustomManagerWidget *w0 = new CustomManagerWidget( this, vbox );
connect( dlg, TQT_SIGNAL( okClicked() ), w0, TQT_SLOT( accept() ) );
- vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "make", TDEIcon::SizeMedium ) );
+ vbox = dlg->addVBoxPage( i18n( "Run Options" ), i18n( "Run Options" ), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ) );
RunOptionsWidget *w1 = new RunOptionsWidget( *projectDom(), "/kdevcustomproject", buildDirectory(), vbox );
connect( dlg, TQT_SIGNAL( okClicked() ), w1, TQT_SLOT( accept() ) );
- vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "make", TDEIcon::SizeMedium ) );
+ vbox = dlg->addVBoxPage( i18n( "Build Options" ), i18n( "Build Options" ), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ) );
TQTabWidget *buildtab = new TQTabWidget( vbox );
CustomBuildOptionsWidget *w2 = new CustomBuildOptionsWidget( *projectDom(), buildtab );
diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 01b0734a..98127f0a 100644
--- a/buildtools/pascal/pascalproject_part.cpp
+++ b/buildtools/pascal/pascalproject_part.cpp
@@ -65,7 +65,7 @@ PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const T
action->setToolTip(i18n("Build project"));
action->setWhatsThis(i18n("<b>Build project</b><p>Runs the compiler on a main source file of the project. "
"The compiler and the main source file can be set in project settings, <b>Pascal Compiler</b> tab."));
- action = new TDEAction( i18n("Execute Program"), "exec", 0,
+ action = new TDEAction( i18n("Execute Program"), "application-x-executable", 0,
this, TQT_SLOT(slotExecute()),
actionCollection(), "build_execute" );
action->setToolTip(i18n("Execute program"));
@@ -400,7 +400,7 @@ void PascalProjectPart::projectConfigWidget( KDialogBase * dlg )
connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
connect( dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(loadProjectConfig()) );
- vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", TDEIcon::SizeMedium ));
+ vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ));
RunOptionsWidget *w3 = new RunOptionsWidget(*projectDom(), "/kdevpascalproject", buildDirectory(), vbox);
connect( dlg, TQT_SIGNAL(okClicked()), w3, TQT_SLOT(accept()) );
diff --git a/buildtools/qmake/qmakescopeitem.cpp b/buildtools/qmake/qmakescopeitem.cpp
index 70e9a6ba..496adad8 100644
--- a/buildtools/qmake/qmakescopeitem.cpp
+++ b/buildtools/qmake/qmakescopeitem.cpp
@@ -50,7 +50,7 @@ GroupItem::GroupItem( TQListView *lv, GroupType type, const TQString &text, QMak
this->owner = spitem;
groupType = type;
// files.setAutoDelete( true );
- setPixmap( 0, SmallIcon( "tar" ) );
+ setPixmap( 0, SmallIcon( "application-x-tar" ) );
}
GroupItem::GroupType GroupItem::groupTypeForExtension( const TQString &ext )
@@ -298,7 +298,7 @@ FileItem::FileItem( TQListView *lv, const TQString &text )
// if excluded is set the file is excluded in the subproject/project.
// by default excluded is set to false, thus file is included
// excluded = exclude;
- setPixmap( 0, SmallIcon( "document" ) );
+ setPixmap( 0, SmallIcon( "text-x-generic" ) );
}
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index c71afc30..eeccf445 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -140,7 +140,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
"project directory.<br>Environment variables and make arguments can be specified "
"in the project settings dialog, <b>Make Options</b> tab."));
- action = new TDEAction( i18n("Execute Main Program"), "exec", SHIFT+Key_F9,
+ action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", SHIFT+Key_F9,
this, TQT_SLOT(slotBuildAndExecuteProject()),
actionCollection(), "build_execute_project" );
action->setToolTip(i18n("Execute main program"));
@@ -191,7 +191,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
"Environment variables and make arguments can be specified "
"in the project settings dialog, <b>Make Options</b> tab."));
- action = new TDEAction( i18n("Execute Subproject"), "exec", 0,
+ action = new TDEAction( i18n("Execute Subproject"), "application-x-executable", 0,
this, TQT_SLOT(slotBuildAndExecuteTarget()),
actionCollection(), "build_execute_target" );
action->setToolTip(i18n("Execute subproject"));
@@ -270,13 +270,13 @@ TQString TrollProjectPart::makeEnvironment()
void TrollProjectPart::projectConfigWidget(KDialogBase *dlg)
{
TQVBox *vbox;
- vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", TDEIcon::SizeMedium ));
+ vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ));
RunOptionsWidget *optdlg = new RunOptionsWidget(*projectDom(), "/kdevtrollproject", buildDirectory(), vbox);
- vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "make", TDEIcon::SizeMedium ));
+ vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ));
MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevtrollproject", vbox);
- vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "make", TDEIcon::SizeMedium ));
+ vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ));
QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox);
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index b1253355..dd5c5d03 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -137,7 +137,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// run
executeProjectButton = new TQToolButton ( projectTools, "Run button" );
- executeProjectButton->setPixmap ( SmallIcon ( "exec" ) );
+ executeProjectButton->setPixmap ( SmallIcon ( "application-x-executable" ) );
executeProjectButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeProjectButton->sizePolicy().hasHeightForWidth() ) );
executeProjectButton->setEnabled ( true );
TQToolTip::add( executeProjectButton, i18n( "Execute main program" ) );
@@ -255,7 +255,7 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part )
// run
executeTargetButton = new TQToolButton ( fileTools, "Run sp button" );
- executeTargetButton->setPixmap ( SmallIcon ( "exec" ) );
+ executeTargetButton->setPixmap ( SmallIcon ( "application-x-executable" ) );
executeTargetButton->setSizePolicy ( TQSizePolicy ( ( TQSizePolicy::SizeType ) 0, ( TQSizePolicy::SizeType ) 0, 0, 0, executeTargetButton->sizePolicy().hasHeightForWidth() ) );
executeTargetButton->setEnabled ( true );
TQToolTip::add( executeTargetButton, i18n( "Execute subproject" ) );
diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp
index 873cd01d..6abe66c5 100644
--- a/embedded/visualboyadvance/visualboyadvance_part.cpp
+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp
@@ -30,7 +30,7 @@ VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, c
setXMLFile("kdevpart_visualboyadvance.rc");
TDEAction *action;
- action = new TDEAction( i18n("Execute Program"), "exec", Key_F9,
+ action = new TDEAction( i18n("Execute Program"), "application-x-executable", Key_F9,
this, TQT_SLOT(slotExecute()),
actionCollection(), "build_execute" );
@@ -68,7 +68,7 @@ void VisualBoyAdvancePart::slotExecute(){
void VisualBoyAdvancePart::projectConfigWidget(KDialogBase *dlg){
TQVBox *vbox;
- vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", TDEIcon::SizeMedium ));
+ vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ));
VBAConfigWidget* w = new VBAConfigWidget(this,vbox);
connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
}
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();
diff --git a/mimetypes/x-fortran.desktop b/mimetypes/x-fortran.desktop
index 2ba80ee0..241c5016 100644
--- a/mimetypes/x-fortran.desktop
+++ b/mimetypes/x-fortran.desktop
@@ -36,7 +36,7 @@ Comment[tr]=Fortran Kaynak Dosyası
Comment[zh_CN]=Fortran 源文件
Comment[zh_TW]=Fortran 程式源碼檔
Hidden=false
-Icon=source_f
+Icon=text-x-text-x-fortran
MimeType=text/x-fortran
Patterns=*.f;*.F;*.f77;*.f90;*.f95;*.for;*.ftn;*.fpp
Type=MimeType
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
diff --git a/vcs/subversion/integrator/kdevsubversionintegrator.desktop b/vcs/subversion/integrator/kdevsubversionintegrator.desktop
index 76971af6..39e6cdcd 100644
--- a/vcs/subversion/integrator/kdevsubversionintegrator.desktop
+++ b/vcs/subversion/integrator/kdevsubversionintegrator.desktop
@@ -35,7 +35,7 @@ Comment[sv]=Funktion för integrering av Subversion i projekt
Comment[tr]=Subversion Proje Bütünleştirme Aracı
Comment[zh_CN]=Subversion 工程集成功能
Comment[zh_TW]=Subversion 專案整合工具
-Icon=misc
+Icon=application-vnd.tde.misc
Exec=blubb
X-TDE-ServiceTypes=TDevelop/VCSIntegrator
X-TDE-Library=libsubversionintegrator
diff --git a/vcs/subversion/kdevsubversion.desktop b/vcs/subversion/kdevsubversion.desktop
index 3fd79b5a..4e9d2d93 100644
--- a/vcs/subversion/kdevsubversion.desktop
+++ b/vcs/subversion/kdevsubversion.desktop
@@ -27,7 +27,7 @@ GenericName[pt_BR]=Subversão
GenericName[ru]=Интеграция Subversion
GenericName[ta]=துணை பதிப்பு
GenericName[tg]=Зер-ривоят
-Icon=misc
+Icon=application-vnd.tde.misc
X-TDE-ServiceTypes=TDevelop/VersionControl
X-TDE-Library=libkdevsubversion
X-TDevelop-Version=5