modify include, change function call to slot

Qucs · Sep 9, 2016 · b5aceda · b5aceda
1 parent 22ce541
commit b5aceda
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/qucs/qucs/dialogs/qucsshortcutdialog.cpp b/qucs/qucs/dialogs/qucsshortcutdialog.cpp
@@ -15,8 +15,6 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QtGui>
-
 #include "qucsshortcutdialog.h"
 #include "keysequenceedit.h"
 #include "main.h"
@@ -25,14 +23,19 @@
 #include <QHBoxLayout>
 #include <QWidget>
 #include <QLabel>
+#include <QPushButton>
+#include <QTableWidget>
+#include <QListWidget>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QHeaderView>
 
 #include <QDebug>
 
-QucsShortcutDialog::QucsShortcutDialog(QucsApp *parent, const char *name)
-  : QDialog(parent, name)
+QucsShortcutDialog::QucsShortcutDialog(QWidget *parent)
+  : QDialog(parent)
 {
   qDebug() << "open shortcut dialog";
-  App = parent;
   setWindowTitle(tr("Edit Qucs Shortcuts"));
   invalidKeys << "Esc";
 
@@ -99,8 +102,9 @@ QucsShortcutDialog::QucsShortcutDialog(QucsApp *parent, const char *name)
 
   this->setLayout(all);
 
-  connect(menuList, SIGNAL(itemClicked(QListWidgetItem*))
-      , this, SLOT(slotChooseMenu()));
+  connect(menuList, SIGNAL(itemClicked(QListWidgetItem*)),
+      this, SLOT(slotChooseMenu()));
+  connect(this, SIGNAL(accepted()), parent, SLOT(slotSetAllShortcut()));
 
   //fill initial value
   fillMenu();
@@ -191,7 +195,6 @@ QucsShortcutDialog::slotDefaultShortcut()
 void 
 QucsShortcutDialog::slotOK() 
 {
-  App->setAllShortcut();
   accept();
 }
 

diff --git a/qucs/qucs/dialogs/qucsshortcutdialog.h b/qucs/qucs/dialogs/qucsshortcutdialog.h
@@ -20,8 +20,6 @@
 
 #include <QDialog>
 
-#include "qucs.h"
-
 class QListWidget;
 class QTableWidget;
 class QLabel;
@@ -32,7 +30,7 @@ class QucsShortcutDialog : public QDialog
 {
   Q_OBJECT
 public:
-  QucsShortcutDialog(QucsApp *parent = 0, const char *name = 0);
+  QucsShortcutDialog(QWidget *parent = 0);
   virtual ~QucsShortcutDialog ();
 private slots:
   void slotChooseMenu();
@@ -59,8 +57,6 @@ private slots:
   QString conflictKey;
   QStringList invalidKeys;
 
-  QucsApp *App;
-
   QListWidget *menuList;
   QTableWidget *actionList;
   QLabel *messageLabel;

diff --git a/qucs/qucs/qucs.cpp b/qucs/qucs/qucs.cpp
@@ -144,7 +144,7 @@ QucsApp::QucsApp()
 
   initView();
   initActions();
-  setAllShortcut();
+  slotSetAllShortcut();
   initMenuBar();
   initToolBar();
   initStatusBar();

diff --git a/qucs/qucs/qucs.h b/qucs/qucs/qucs.h
@@ -228,14 +228,14 @@ private slots:
   void updatePathList(QStringList);
   void updateSchNameHash(void); // maps all schematic files in the path list
   void updateSpiceNameHash(void); // maps all spice files in the path list
-  void setAllShortcut();
 
 /* **************************************************
    *****  The following methods are located in  *****
    *****  "qucs_init.cpp".                      *****
    ************************************************** */
 
 public slots:
+  void slotSetAllShortcut();
   void slotShowWarnings();
   void slotResetWarnings();
   void printCursorPosition(int, int);

diff --git a/qucs/qucs/qucs_init.cpp b/qucs/qucs/qucs_init.cpp
@@ -172,7 +172,7 @@ clearShortcutMap()
 
 // set Shortcut value to each action
 void
-QucsApp::setAllShortcut()
+QucsApp::slotSetAllShortcut()
 {
   QVector<QPair<QString, QMap<QString, QString>* > >* vec = &QucsSettings.Shortcut;
   QMap<QString, QString> *map = NULL;