From 3021747cb02a4521c3f9ff7e51940b531313bca7 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 20 Jan 2012 11:13:05 +1000 Subject: Fixed compile. QDir::convertSeparators -> QDir::toNativeSeparators convertSeparators was deprecated since Qt 4.2 (!) and recently was removed from Qt 5. Change-Id: I6a7dad582ed4270cfbd09defc94c73103bb2a9fe Sanity-Review: Qt Sanity Bot Reviewed-by: Jason McDonald --- src/designer/src/designer/qdesigner_actions.cpp | 6 +++--- src/designer/src/designer/qdesigner_workbench.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index a2d9deac4..e94f894e9 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -1134,7 +1134,7 @@ void QDesignerActions::backupForms() QTextStream(&formBackupName) << m_backupPath << QDir::separator() << QStringLiteral("backup") << i << QStringLiteral(".bak"); - QString fwn = QDir::convertSeparators(fwi->fileName()); + QString fwn = QDir::toNativeSeparators(fwi->fileName()); if (fwn.isEmpty()) fwn = fw->windowTitle(); @@ -1265,12 +1265,12 @@ bool QDesignerActions::ensureBackupDirectories() { m_backupPath += QStringLiteral(".designer"); m_backupPath += QDir::separator(); m_backupPath += QStringLiteral("backup"); - m_backupPath = QDir::convertSeparators(m_backupPath ); + m_backupPath = QDir::toNativeSeparators(m_backupPath); m_backupTmpPath = m_backupPath; m_backupTmpPath += QDir::separator(); m_backupTmpPath += QStringLiteral("tmp"); - m_backupTmpPath = QDir::convertSeparators(m_backupTmpPath); + m_backupTmpPath = QDir::toNativeSeparators(m_backupTmpPath); } // ensure directories diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index c2e0aabf0..2569283f2 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -839,7 +839,7 @@ bool QDesignerWorkbench::readInBackup() void QDesignerWorkbench::updateBackup(QDesignerFormWindowInterface* fwi) { - QString fwn = QDir::convertSeparators(fwi->fileName()); + QString fwn = QDir::toNativeSeparators(fwi->fileName()); if (fwn.isEmpty()) fwn = fwi->parentWidget()->windowTitle(); -- cgit v1.2.1