Merge pull request #252 from LePresidente/new_vfs_library

Update master to latest stable code.

1 files changed, 7 insertions, 26 deletions

diff --git a/src/lockeddialog.h b/src/lockeddialog.h
index 29ac459b..36c16429 100644
--- a/src/lockeddialog.h
+++ b/src/lockeddialog.h
@@ -17,15 +17,9 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-#ifndef LOCKEDDIALOG_H

-#define LOCKEDDIALOG_H

+#pragma once

 

-#include <QDialog>  // for QDialog

-#include <QObject>  // for Q_OBJECT, slots

-#include <QString>  // for QString

-

-class QResizeEvent;

-class QWidget;

+#include "lockeddialogbase.h"

 

 namespace Ui {

     class LockedDialog;

@@ -39,38 +33,25 @@ namespace Ui {
  * data on which Mod Organizer works. After the UI is unlocked (manually or after the

  * external application closed) MO will refresh all of its data sources

  **/

-class LockedDialog : public QDialog

+class LockedDialog : public LockedDialogBase

 {

     Q_OBJECT

 

 public:

-  explicit LockedDialog(QWidget *parent = 0, const QString &text = "", bool unlockButton = true);

+  explicit LockedDialog(QWidget *parent = 0, bool unlockByButton = false);

   ~LockedDialog();

 

-  /**

-   * @brief see if the user clicked the unlock-button

-   *

-   * @return true if the user clicked the unlock button

-   **/

-  bool unlockClicked() const { return m_UnlockClicked; }

-

-  /**

-   * @brief set the name of the process being run

-   * @param name of process

-   */

-  void setProcessName(const QString &name);

+  void setProcessName(const QString &name) override;

 

 protected:

 

-  virtual void resizeEvent(QResizeEvent *event);

+  void unlock() override;

 

 private slots:

 

   void on_unlockButton_clicked();

 

 private:

+

   Ui::LockedDialog *ui;

-  bool m_UnlockClicked;

 };

-

-#endif // LOCKEDDIALOG_H