Merge branch 'master' into new_vfs_library

1 files changed, 10 insertions, 16 deletions

diff --git a/src/transfersavesdialog.h b/src/transfersavesdialog.h
index 6961e8c6..dee41c72 100644
--- a/src/transfersavesdialog.h
+++ b/src/transfersavesdialog.h
@@ -37,14 +37,15 @@ namespace Ui { class TransferSavesDialog; }
 namespace MOBase { class IPluginGame; }

 namespace MOBase { class ISaveGame; }

 

-class TransferSavesDialog : public MOBase::TutorableDialog

-{

+class TransferSavesDialog : public MOBase::TutorableDialog {

   Q_OBJECT

-  

+

 public:

-  explicit TransferSavesDialog(const Profile &profile, MOBase::IPluginGame const *gamePlugin, QWidget *parent = 0);

+  explicit TransferSavesDialog(const Profile &profile,

+                               MOBase::IPluginGame const *gamePlugin,

+                               QWidget *parent = 0);

   ~TransferSavesDialog();

-  

+

 private slots:

 

   void on_moveToLocalBtn_clicked();

@@ -62,23 +63,17 @@ private slots:
   void on_copyToGlobalBtn_clicked();

 

 private:

-

-  enum OverwriteMode {

-    OVERWRITE_ASK,

-    OVERWRITE_YES,

-    OVERWRITE_NO

-  };

+  enum OverwriteMode { OVERWRITE_ASK, OVERWRITE_YES, OVERWRITE_NO };

 

 private:

-

   void refreshGlobalCharacters();

   void refreshLocalCharacters();

   void refreshGlobalSaves();

   void refreshLocalSaves();

-  bool testOverwrite(OverwriteMode &overwriteMode, const QString &destinationFile);

+  bool testOverwrite(OverwriteMode &overwriteMode,

+                     const QString &destinationFile);

 

 private:

-

   Ui::TransferSavesDialog *ui;

 

   Profile m_Profile;

@@ -93,8 +88,7 @@ private:
 

   void refreshSaves(SaveCollection &saveCollection, const QString &savedir);

   void refreshCharacters(SaveCollection const &saveCollection,

-                         QListWidget *charList,

-                         QPushButton *copy,

+                         QListWidget *charList, QPushButton *copy,

                          QPushButton *move);

 

   bool transferCharacters(