Merge pull request #2298 from Jojo-Schmitz/magbox

fix build failures
musescore · Nov 24, 2015 · 7321ba6 · 7321ba6
2 parents c64cb4b + e704c0e
commit 7321ba6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libmscore/scorefile.cpp b/libmscore/scorefile.cpp
@@ -416,9 +416,9 @@ bool Score::saveFile()
                         }
                   }
 #ifdef Q_OS_WIN
-      QFileInfo fileBackup(dir, backupName);
-      QString backupNativePath = QDir::toNativeSeparators(fileBackup.absoluteFilePath());
-      SetFileAttributes((LPCTSTR)backupNativePath.toLocal8Bit(), FILE_ATTRIBUTE_HIDDEN);
+            QFileInfo fileBackup(dir, backupName);
+            QString backupNativePath = QDir::toNativeSeparators(fileBackup.absoluteFilePath());
+            SetFileAttributes((LPCTSTR)backupNativePath.toLocal8Bit(), FILE_ATTRIBUTE_HIDDEN);
 #endif
             }
       //

diff --git a/mscore/magbox.h b/mscore/magbox.h
@@ -53,7 +53,7 @@ class MagValidator : public QValidator {
 //   MagBox
 //---------------------------------------------------------
 
-class MagBox : protected QComboBox {
+class MagBox : public QComboBox {
       Q_OBJECT
 
       double freeMag;
@@ -80,7 +80,7 @@ class MagBox : protected QComboBox {
 
 } // namespace Ms
 
-Q_DECLARE_METATYPE(Ms::MagIdx)
+Q_DECLARE_METATYPE(Ms::MagIdx);
 
 #endif