fix : behaviors of dependency-tree on linux and macos are the same

fix : find and reset usage

Author: Alexander Bychuk

CMakeLists.txt

@@ -14,6 +14,7 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Qt5 COMPONENTS Widgets REQUIRED)
+set(Qt_PREFIX Qt5)
 
 if (APPLE)
   set(APP_ICNS "${CMAKE_SOURCE_DIR}/resources/icon.icns")

finfdialog.cpp

@@ -4,6 +4,7 @@
 
 FinfDialog::FinfDialog(QWidget *parent) : QDialog(parent), ui(new Ui::FinfDialog) {
   ui->setupUi(this);
+  setWindowTitle("Filter export table");
   shortcutClose = new QShortcut(QKeySequence(Qt::Key_Escape), this);
   connect(shortcutClose, SIGNAL(activated()), this, SLOT(close()));
 

main.cpp

@@ -7,7 +7,7 @@ int main(int argc, char *argv[]) {
   QApplication app(argc, argv);
 
   QApplication::setApplicationName("Qldd");
-  QApplication::setApplicationVersion("1.0");
+  QApplication::setApplicationVersion("1.0.0");
 
   QCommandLineParser parser;
   parser.setApplicationDescription("Qldd gui over ldd utility");

mainwindow.cpp

@@ -36,12 +36,17 @@ MainWindow::MainWindow(const QString &fileName, QWidget *parent)
 
   shortcutFind = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_F), this);
   connect(shortcutFind, SIGNAL(activated()), this, SLOT(find()));
+  ui->filterButton->setIcon(ui->filterButton->style()->standardIcon(QStyle::SP_FileDialogListView));
+  ui->resetButton->setIcon(ui->resetButton->style()->standardIcon(QStyle::SP_DialogCancelButton));
 
   createActions();
   createMenus();
 
   if (!fileName.isEmpty()) {
     reset(fileName);
+  } else {
+    QTreeWidgetItem *header = ui->treeWidget->headerItem();
+    header->setText(0, "Dependency");
   }
   ui->tabWidget->setCurrentIndex(0);
 }
@@ -52,7 +57,11 @@ MainWindow::~MainWindow() {
   delete helpMenu;
 }
 
-void MainWindow::fillExportTable(const QString &filter) { qldd->fillExportTable(*ui->listWidgetExportTable, filter); }
+void MainWindow::fillExportTable(const QString &filter) {
+  if (qldd) {
+    qldd->fillExportTable(*ui->listWidgetExportTable, filter);
+  }
+}
 
 void MainWindow::reset(const QString &fileName) {
   qldd.reset(new QLdd(fileName, qApp->applicationDirPath()));
@@ -164,3 +173,7 @@ void MainWindow::on_checkBoxOtherRead_clicked(bool checked) { ui->checkBoxOtherR
 void MainWindow::on_checkBoxOtherWrite_clicked(bool checked) { ui->checkBoxOtherWrite->setChecked(!checked); }
 
 void MainWindow::on_checkBoxOtherExec_clicked(bool checked) { ui->checkBoxOtherExec->setChecked(!checked); }
+
+void MainWindow::on_filterButton_clicked() { find(); }
+
+void MainWindow::on_resetButton_clicked() { myClose(); }

mainwindow.h

@@ -41,6 +41,10 @@ class MainWindow : public QMainWindow {
 
   void on_checkBoxOtherExec_clicked(bool checked);
 
+  void on_filterButton_clicked();
+
+  void on_resetButton_clicked();
+
  private:
   void createActions();
   void createMenus();

mainwindow.ui

@@ -556,13 +556,40 @@
         <string>Export Table</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_9">
-        <item row="0" column="0">
+        <item row="1" column="0" colspan="3">
          <widget class="QListWidget" name="listWidgetExportTable">
           <property name="sortingEnabled">
            <bool>false</bool>
           </property>
          </widget>
         </item>
+        <item row="0" column="0">
+         <widget class="QPushButton" name="filterButton">
+          <property name="text">
+           <string>Filter</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <spacer name="horizontalSpacer_7">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="0" column="1">
+         <widget class="QPushButton" name="resetButton">
+          <property name="text">
+           <string>Reset</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </widget>
@@ -575,7 +602,7 @@
      <x>0</x>
      <y>0</y>
      <width>725</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
   </widget>

qldd.cpp

@@ -94,9 +94,7 @@ void QLdd::fillDependency(QTreeWidget &treeWidget) {
   QDir::setCurrent(getPathOfBinary());
   ss << CMD_LDD << " " << _fileName.toStdString();
 
-  bool flag = false;
-
-  execAndDoOnEveryLine(ss.str(), [&flag, &treeWidget](const QString &line) {
+  execAndDoOnEveryLine(ss.str(), [this, &treeWidget](const QString &line) {
     QTreeWidgetItem *item = nullptr;
     QStringList sl;
     if (!line.contains("=>") && line.contains("(0x")) {
@@ -106,8 +104,8 @@ void QLdd::fillDependency(QTreeWidget &treeWidget) {
       sl = line.split(DEPEND_SPLITTER);
     }
     int i = 0;
-    for (const QString &v : sl) {
-      if (v.contains("(0x")) {
+    for (const QString &v : qAsConst(sl)) {
+      if (v.contains("(0x") || v.contains("(compatibility")) {
         QStringList slTmp = v.split("(");
         if (slTmp.size() > 1) {
           slTmp.removeLast();
@@ -123,35 +121,31 @@ void QLdd::fillDependency(QTreeWidget &treeWidget) {
       }
       i++;
     }
-    item = new QTreeWidgetItem();
-#ifdef __APPLE__
-    if (!flag) {
-      flag = true;
-      item->setTextColor(0, Qt::magenta);
-      item->setText(0, sl.first());
-    } else {
-      item->setText(0, "# " + sl.first());
+    if (sl.size() == 1) {
+      QFileInfo qfinf(sl.first());
+      sl.push_front(qfinf.fileName());
     }
-#else
-    item->setText(0, sl.first());
-#endif
-    item->setToolTip(0, sl.first());
-
-    treeWidget.addTopLevelItem(item);
-    sl.removeFirst();
-    QTreeWidgetItem *tmp = item;
-    QColor redC("red");
-    for (const QString &v : sl) {
-      if (!v.trimmed().isEmpty()) {
-        if (v.contains("not found")) {
-          tmp->setTextColor(0, redC);
-          tmp->setText(0, tmp->text(0) + " " + v);
-          tmp->setToolTip(0, tmp->text(0));
-        } else {
-          auto *nitm = new QTreeWidgetItem(tmp);
-          nitm->setText(0, v);
-          nitm->setToolTip(0, v);
-          tmp = nitm;
+    if (sl.first() != _fileName) {
+      item = new QTreeWidgetItem();
+      item->setText(0, sl.first());
+      item->setToolTip(0, sl.first());
+
+      treeWidget.addTopLevelItem(item);
+      sl.removeFirst();
+      QTreeWidgetItem *tmp = item;
+      QColor redC("red");
+      for (const QString &v : qAsConst(sl)) {
+        if (!v.trimmed().isEmpty()) {
+          if (v.contains("not found")) {
+            tmp->setTextColor(0, redC);
+            tmp->setText(0, tmp->text(0) + " " + v);
+            tmp->setToolTip(0, tmp->text(0));
+          } else {
+            auto *nitm = new QTreeWidgetItem(tmp);
+            nitm->setText(0, v);
+            nitm->setToolTip(0, v);
+            tmp = nitm;
+          }
         }
       }
     }
@@ -202,7 +196,7 @@ QString QLdd::getInfo() {
   execAndDoOnEveryLine(ss.str(), [&buf](const QString &line) { buf.append(line); });
   QStringList slTmp = buf.split(",");
   buf.clear();
-  for (const QString &v : slTmp) {
+  for (const QString &v : qAsConst(slTmp)) {
     buf.append(v.trimmed()).append("\n");
   }
   return buf;

qldd.h

@@ -14,7 +14,6 @@ struct QMOD {
 
 class QLdd {
  public:
-
   QLdd(QString fileName, QString lddDirPath);
   virtual ~QLdd();
 
@@ -23,7 +22,7 @@ class QLdd {
 
   void fillDependency(QTreeWidget &treeWidget);
 
-  void fillExportTable(QListWidget &listWidget, const QString& filter);
+  void fillExportTable(QListWidget &listWidget, const QString &filter);
 
   QString getPathOfBinary();
   QString getBinaryName();