From f5c6561e18e1481ea3433254c0cd0dbb70f1f874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 4 Sep 2015 20:46:26 +0200
Subject: [PATCH] GUI: Readd library editor

---
 gui/gui.pro        | 18 +++++++++++++++---
 gui/main.ui        |  5 +----
 gui/mainwindow.cpp |  6 +++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/gui/gui.pro b/gui/gui.pro
index ffa7f6c51..7f7a8d2c3 100644
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -5,6 +5,7 @@ DEPENDPATH += . \
     ../lib
 INCLUDEPATH += . \
     ../lib
+QT += xml
 greaterThan(QT_MAJOR_VERSION, 4) {
     QT += widgets # In Qt 5 widgets are in separate module
     QT += printsupport # In Qt 5 QPrinter/QPrintDialog are in separate module
@@ -49,7 +50,10 @@ FORMS = about.ui \
         resultsview.ui \
         scratchpad.ui \
         settings.ui \
-        stats.ui
+        stats.ui \
+    librarydialog.ui \
+    libraryaddfunctiondialog.ui \
+    libraryeditargdialog.ui
 
 TRANSLATIONS =  cppcheck_de.ts \
                 cppcheck_es.ts \
@@ -104,7 +108,11 @@ HEADERS += aboutdialog.h \
            txtreport.h \
            xmlreport.h \
            xmlreportv1.h \
-           xmlreportv2.h
+           xmlreportv2.h \
+    librarydialog.h \
+    cppchecklibrarydata.h \
+    libraryaddfunctiondialog.h \
+    libraryeditargdialog.h
 
 SOURCES += aboutdialog.cpp \
            application.cpp \
@@ -138,7 +146,11 @@ SOURCES += aboutdialog.cpp \
            txtreport.cpp \
            xmlreport.cpp \
            xmlreportv1.cpp \
-           xmlreportv2.cpp
+           xmlreportv2.cpp \
+    librarydialog.cpp \
+    cppchecklibrarydata.cpp \
+    libraryaddfunctiondialog.cpp \
+    libraryeditargdialog.cpp
 
 win32 {
     DEFINES += _CRT_SECURE_NO_WARNINGS
diff --git a/gui/main.ui b/gui/main.ui
index 6fdc44c7d..2e0d5942d 100644
--- a/gui/main.ui
+++ b/gui/main.ui
@@ -62,7 +62,7 @@
      <x>0</x>
      <y>0</y>
      <width>640</width>
-     <height>19</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="mMenuFile">
@@ -710,9 +710,6 @@
    <property name="toolTip">
     <string>Open library editor</string>
    </property>
-   <property name="visible">
-    <bool>false</bool>
-   </property>
   </action>
  </widget>
  <customwidgets>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 284579ec8..64bb2e949 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -44,7 +44,7 @@
 #include "logview.h"
 #include "filelist.h"
 #include "showtypes.h"
-//#include "librarydialog.h"
+#include "librarydialog.h"
 
 static const QString OnlineHelpURL("http://cppcheck.sourceforge.net/manual.html");
 
@@ -1219,8 +1219,8 @@ void MainWindow::ShowStatistics()
 
 void MainWindow::ShowLibraryEditor()
 {
-    //LibraryDialog libraryDialog(this);
-    //libraryDialog.exec();
+    LibraryDialog libraryDialog(this);
+    libraryDialog.exec();
 }
 
 void MainWindow::Log(const QString &logline)