##// END OF EJS Templates
Fusion with 14
jeandet -
r15:cc958c79ba09 merge default
parent child
Show More
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
@@ -0,0 +1,7
1 <RCC>
2 <qresource prefix="/img">
3 <file>Gnome-list-add.png</file>
4 <file>Gnome-user-trash.png</file>
5 <file>Gnome-emblem-unreadable.png</file>
6 </qresource>
7 </RCC>
@@ -34,6 +34,7 ElfFile::ElfFile()
34 this->elfFile = (int)NULL;
34 this->elfFile = (int)NULL;
35 this->e = NULL;
35 this->e = NULL;
36 this->data = NULL;
36 this->data = NULL;
37 this->SymbolCount = 0;
37 }
38 }
38
39
39 ElfFile::ElfFile(const QString &File)
40 ElfFile::ElfFile(const QString &File)
@@ -45,6 +46,7 ElfFile::ElfFile(const QString &File)
45 this->e = NULL;
46 this->e = NULL;
46 this->p_fileName = File;
47 this->p_fileName = File;
47 this->data = NULL;
48 this->data = NULL;
49 this->SymbolCount = 0;
48 openFile(File);
50 openFile(File);
49 }
51 }
50
52
@@ -840,7 +842,8 void ElfFile::updateSymbols()
840 for(int i=0;i<(int)SectionCount;i++)
842 for(int i=0;i<(int)SectionCount;i++)
841 {
843 {
842 //First find Symbol table
844 //First find Symbol table
843 if(this->getSectionName(i)==".symtab")
845 QString sectionName = this->getSectionName(i);
846 if(sectionName==".symtab" || sectionName == ".dynsym")
844 {
847 {
845 Elf_Section* sec = sections.at(i);
848 Elf_Section* sec = sections.at(i);
846 this->SymbolCount = sec->section_header->sh_size / sec->section_header->sh_entsize;
849 this->SymbolCount = sec->section_header->sh_size / sec->section_header->sh_entsize;
@@ -104,8 +104,8
104 <string/>
104 <string/>
105 </property>
105 </property>
106 <property name="icon">
106 <property name="icon">
107 <iconset resource="genericBinaryFiles.qrc">
107 <iconset resource="ressources/genericBinaryFiles.qrc">
108 <normaloff>:/img/ressources/Gnome-emblem-unreadable.svg</normaloff>:/img/ressources/Gnome-emblem-unreadable.svg</iconset>
108 <normaloff>:/img/Gnome-emblem-unreadable.png</normaloff>:/img/Gnome-emblem-unreadable.png</iconset>
109 </property>
109 </property>
110 </widget>
110 </widget>
111 </item>
111 </item>
@@ -157,8 +157,8
157 <string/>
157 <string/>
158 </property>
158 </property>
159 <property name="icon">
159 <property name="icon">
160 <iconset resource="genericBinaryFiles.qrc">
160 <iconset resource="ressources/genericBinaryFiles.qrc">
161 <normaloff>:/img/ressources/Gnome-user-trash.svg</normaloff>:/img/ressources/Gnome-user-trash.svg</iconset>
161 <normaloff>:/img/Gnome-user-trash.png</normaloff>:/img/Gnome-user-trash.png</iconset>
162 </property>
162 </property>
163 <property name="iconSize">
163 <property name="iconSize">
164 <size>
164 <size>
@@ -186,8 +186,8
186 <string/>
186 <string/>
187 </property>
187 </property>
188 <property name="icon">
188 <property name="icon">
189 <iconset resource="genericBinaryFiles.qrc">
189 <iconset resource="ressources/genericBinaryFiles.qrc">
190 <normaloff>:/img/ressources/Gnome-list-add.svg</normaloff>:/img/ressources/Gnome-list-add.svg</iconset>
190 <normaloff>:/img/Gnome-list-add.png</normaloff>:/img/Gnome-list-add.png</iconset>
191 </property>
191 </property>
192 <property name="iconSize">
192 <property name="iconSize">
193 <size>
193 <size>
@@ -243,7 +243,7
243 </customwidget>
243 </customwidget>
244 </customwidgets>
244 </customwidgets>
245 <resources>
245 <resources>
246 <include location="genericBinaryFiles.qrc"/>
246 <include location="ressources/genericBinaryFiles.qrc"/>
247 </resources>
247 </resources>
248 <connections/>
248 <connections/>
249 </ui>
249 </ui>
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now