1 files changed, 37 insertions, 54 deletions

diff --git a/tdefile-plugins/elf/tdefile_elf.cpp b/tdefile-plugins/elf/tdefile_elf.cpp
index f87b536ed..0a344313b 100644
--- a/tdefile-plugins/elf/tdefile_elf.cpp
+++ b/tdefile-plugins/elf/tdefile_elf.cpp
@@ -20,7 +20,7 @@
 #include <config.h>
 #include "tdefile_elf.h"
 
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kstringvalidator.h>
@@ -34,12 +34,7 @@
 
 #include "tdelficon.h"
 
-#if !defined(__osf__)
 #include <inttypes.h>
-#else
-typedef unsigned long uint32_t;
-typedef unsigned short uint16_t;
-#endif
 
 typedef KGenericFactory<KElfPlugin> ElfFactory;
 
@@ -50,54 +45,41 @@ KElfPlugin::KElfPlugin(TQObject *parent, const char *name,
 
     : KFilePlugin(parent, name, args)
 {
-    // Executables
-    KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-executable" );
-
-    KFileMimeTypeInfo::GroupInfo* group = 0L;
-    KFileMimeTypeInfo::GroupInfo* group2 = 0L;
-
-    group = addGroupInfo(info, "Technical", i18n("Embedded Metadata"));
-    group2 = addGroupInfo(info, "Icon", i18n("Embedded Icon(s)"));
-
-    KFileMimeTypeInfo::ItemInfo* item;
-
-    item = addItemInfo(group, "Name", i18n("Internal Name"), TQVariant::String);
-    item = addItemInfo(group, "Description", i18n("Description"), TQVariant::String);
-    item = addItemInfo(group, "License", i18n("License"), TQVariant::String);
-    item = addItemInfo(group, "Copyright", i18n("Copyright"), TQVariant::String);
-    item = addItemInfo(group, "Authors", i18n("Author(s)"), TQVariant::String);
-    item = addItemInfo(group, "Product", i18n("Product"), TQVariant::String);
-    item = addItemInfo(group, "Organization", i18n("Organization"), TQVariant::String);
-    item = addItemInfo(group, "Version", i18n("Version"), TQVariant::String);
-    item = addItemInfo(group, "DateTime", i18n("Compilation Date/Time"), TQVariant::String);
-    item = addItemInfo(group, "SystemIcon", i18n("Requested Icon"), TQVariant::String);
-    item = addItemInfo(group, "SCMModule", i18n("SCM Module"), TQVariant::String);
-    item = addItemInfo(group, "SCMRevision", i18n("SCM Revision"), TQVariant::String);
-    item = addItemInfo(group, "Notes", i18n("Comments"), TQVariant::String);
-
-    item = addItemInfo(group2, "EmbeddedIcon", i18n("Icon Name(s)"), TQVariant::String);
-
-    // Shared libraries
-    info = addMimeTypeInfo( "application/x-sharedlib" );
-
-    group = addGroupInfo(info, "Technical", i18n("Embedded Metadata"));
-    group2 = addGroupInfo(info, "Icon", i18n("Embedded Icon(s)"));
-
-    item = addItemInfo(group, "Name", i18n("Internal Name"), TQVariant::String);
-    item = addItemInfo(group, "Description", i18n("Description"), TQVariant::String);
-    item = addItemInfo(group, "License", i18n("License"), TQVariant::String);
-    item = addItemInfo(group, "Copyright", i18n("Copyright"), TQVariant::String);
-    item = addItemInfo(group, "Authors", i18n("Author(s)"), TQVariant::String);
-    item = addItemInfo(group, "Product", i18n("Product"), TQVariant::String);
-    item = addItemInfo(group, "Organization", i18n("Organization"), TQVariant::String);
-    item = addItemInfo(group, "Version", i18n("Version"), TQVariant::String);
-    item = addItemInfo(group, "DateTime", i18n("Compilation Date/Time"), TQVariant::String);
-    item = addItemInfo(group, "SystemIcon", i18n("Requested Icon"), TQVariant::String);
-    item = addItemInfo(group, "SCMModule", i18n("SCM Module"), TQVariant::String);
-    item = addItemInfo(group, "SCMRevision", i18n("SCM Revision"), TQVariant::String);
-    item = addItemInfo(group, "Notes", i18n("Comments"), TQVariant::String);
-
-    item = addItemInfo(group2, "EmbeddedIcon", i18n("Icon Name(s)"), TQVariant::String);
+    const TQCString elfMimeTypes[]= {
+        "application/x-executable",
+        "application/x-pie-executable",
+        "application/x-sharedlib"
+    };
+    const int elfMimeTypesCount = sizeof(elfMimeTypes)/sizeof(elfMimeTypes[0]);
+
+    for (int i = 0; i < elfMimeTypesCount; i++)
+    {
+        KFileMimeTypeInfo* info = addMimeTypeInfo(elfMimeTypes[i]);
+
+        KFileMimeTypeInfo::GroupInfo* group = 0L;
+        KFileMimeTypeInfo::GroupInfo* group2 = 0L;
+
+        group = addGroupInfo(info, "Technical", i18n("Embedded Metadata"));
+        group2 = addGroupInfo(info, "Icon", i18n("Embedded Icon(s)"));
+
+        KFileMimeTypeInfo::ItemInfo* item;
+
+        item = addItemInfo(group, "Name", i18n("Internal Name"), TQVariant::String);
+        item = addItemInfo(group, "Description", i18n("Description"), TQVariant::String);
+        item = addItemInfo(group, "License", i18n("License"), TQVariant::String);
+        item = addItemInfo(group, "Copyright", i18n("Copyright"), TQVariant::String);
+        item = addItemInfo(group, "Authors", i18n("Author(s)"), TQVariant::String);
+        item = addItemInfo(group, "Product", i18n("Product"), TQVariant::String);
+        item = addItemInfo(group, "Organization", i18n("Organization"), TQVariant::String);
+        item = addItemInfo(group, "Version", i18n("Version"), TQVariant::String);
+        item = addItemInfo(group, "DateTime", i18n("Compilation Date/Time"), TQVariant::String);
+        item = addItemInfo(group, "SystemIcon", i18n("Requested Icon"), TQVariant::String);
+        item = addItemInfo(group, "SCMModule", i18n("SCM Module"), TQVariant::String);
+        item = addItemInfo(group, "SCMRevision", i18n("SCM Revision"), TQVariant::String);
+        item = addItemInfo(group, "Notes", i18n("Comments"), TQVariant::String);
+
+        item = addItemInfo(group2, "EmbeddedIcon", i18n("Icon Name(s)"), TQVariant::String);
+    }
 }
 
 
@@ -110,6 +92,7 @@ bool KElfPlugin::readInfo( KFileMetaInfo& info, uint what)
 	if((handle = libr_open(const_cast<char*>(info.path().ascii()), access)) == NULL)
 	{
 		kdWarning() << "failed to open file" << info.path() << endl;
+		return false;
 	}
 
 	KFileMetaInfoGroup group = appendGroup(info, "Technical");