copy 1.2 branch to trunk

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/General/fileops/settingsdialog.cpp b/src/plugins/General/fileops/settingsdialog.cpp
index 702602082..2431a8ba2 100644
--- a/src/plugins/General/fileops/settingsdialog.cpp
+++ b/src/plugins/General/fileops/settingsdialog.cpp
@@ -22,7 +22,7 @@
 #include <QApplication>
 #include <QCheckBox>
 #include <QComboBox>
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include <qmmp/qmmp.h>
 #include <qmmpui/filedialog.h>
 #include <qmmpui/metadataformattermenu.h>
@@ -34,9 +34,9 @@ SettingsDialog::SettingsDialog(QWidget *parent)
         : QDialog(parent)
 {
     m_ui.setupUi(this);
-    m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+    m_ui.tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
     m_ui.tableWidget->verticalHeader()->hide();
-    m_ui.tableWidget->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+    m_ui.tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
 
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("FileOps");
@@ -135,7 +135,7 @@ void SettingsDialog::on_newButton_clicked()
     comboBox->setFocusPolicy (Qt::NoFocus);
 
     ActionItem *item = new ActionItem(tr("New action"));
-    item->setDestination(QDesktopServices::storageLocation(QDesktopServices::MusicLocation));
+    item->setDestination(QStandardPaths::writableLocation(QStandardPaths::MusicLocation));
     item->setPattern("%p - %t");
 
     connect(comboBox, SIGNAL(activated(int)), SLOT(updateLineEdits()));