[vlmc-devel] Removes code that will never be run
Barun Parruck
git at videolan.org
Sun Mar 6 00:12:38 CET 2016
vlmc | branch: master | Barun Parruck <barun.parruck at gmail.com> | Sun Mar 6 02:37:06 2016 +0530| [690e95d1f4d0fa8bdbd80736f0cf91a3178ff107] | committer: Hugo Beauzée-Luyssen
Removes code that will never be run
Since QT 5 is now enforced, we no longer need any checks for Qt 5.
Further patches will be released that remove code that is no longer designed to run.
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> https://code.videolan.org/videolan/vlmc/commit/690e95d1f4d0fa8bdbd80736f0cf91a3178ff107
---
src/Main/Core.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/Main/Core.cpp b/src/Main/Core.cpp
index d1fac98..31c555e 100644
--- a/src/Main/Core.cpp
+++ b/src/Main/Core.cpp
@@ -89,11 +89,7 @@ Core::~Core()
void
Core::createSettings()
{
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
- QString configDir = QStandardPaths::writableLocation( QStandardPaths::ConfigLocation );
-#else
- QString configDir = QDesktopServices::storageLocation( QDesktopServices::DataLocation );
-#endif
+ QString configDir = QStandardPaths::writableLocation( QStandardPaths::ConfigLocation );
QString configPath = configDir + QDir::separator() + qApp->organizationName()
+ QDir::separator() + qApp->applicationName() + ".conf";
m_settings = new Settings( configPath );
More information about the Vlmc-devel
mailing list