@ -37,9 +37,7 @@
@@ -37,9 +37,7 @@
# include <boost/filesystem.hpp>
# include <boost/filesystem/fstream.hpp>
# if BOOST_FILESYSTEM_VERSION >= 3
# include <boost/filesystem/detail/utf8_codecvt_facet.hpp>
# endif
# include <boost/scoped_array.hpp>
# include <QAbstractItemView>
@ -67,9 +65,7 @@
@@ -67,9 +65,7 @@
# include <QFontDatabase>
# endif
# if BOOST_FILESYSTEM_VERSION >= 3
static boost : : filesystem : : detail : : utf8_codecvt_facet utf8 ;
# endif
# if defined(Q_OS_MAC)
extern double NSAppKitVersionNumber ;
@ -860,7 +856,6 @@ void setClipboard(const QString& str)
@@ -860,7 +856,6 @@ void setClipboard(const QString& str)
QApplication : : clipboard ( ) - > setText ( str , QClipboard : : Selection ) ;
}
# if BOOST_FILESYSTEM_VERSION >= 3
boost : : filesystem : : path qstringToBoostPath ( const QString & path )
{
return boost : : filesystem : : path ( path . toStdString ( ) , utf8 ) ;
@ -870,18 +865,6 @@ QString boostPathToQString(const boost::filesystem::path &path)
@@ -870,18 +865,6 @@ QString boostPathToQString(const boost::filesystem::path &path)
{
return QString : : fromStdString ( path . string ( utf8 ) ) ;
}
# else
# warning Conversion between boost path and QString can use invalid character encoding with boost_filesystem v2 and older
boost : : filesystem : : path qstringToBoostPath ( const QString & path )
{
return boost : : filesystem : : path ( path . toStdString ( ) ) ;
}
QString boostPathToQString ( const boost : : filesystem : : path & path )
{
return QString : : fromStdString ( path . string ( ) ) ;
}
# endif
QString formatDurationStr ( int secs )
{