[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ktorrent] ktorrent/pref: fix file:// related paths problems
From:       Nick Shaforostoff <shafff () ukr ! net>
Date:       2016-04-17 11:34:47
Message-ID: E1arkyV-0003x0-9R () scm ! kde ! org
[Download RAW message or body]

Git commit d2a0fefebe1d95fd6214693a205cdcd5567d6b8b by Nick Shaforostoff.
Committed on 17/04/2016 at 11:34.
Pushed by shaforo into branch 'master'.

fix file:// related paths problems

M  +13   -8    ktorrent/pref/generalpref.cpp

http://commits.kde.org/ktorrent/d2a0fefebe1d95fd6214693a205cdcd5567d6b8b

diff --git a/ktorrent/pref/generalpref.cpp b/ktorrent/pref/generalpref.cpp
index 1575c83..c415cdc 100644
--- a/ktorrent/pref/generalpref.cpp
+++ b/ktorrent/pref/generalpref.cpp
@@ -39,28 +39,33 @@ namespace kt
 =

     void GeneralPref::loadSettings()
     {
+        kcfg_tempDir->setProperty("kcfg_property", "text");
+        kcfg_saveDir->setProperty("kcfg_property", "text");
+        kcfg_torrentCopyDir->setProperty("kcfg_property", "text");
+        kcfg_completedDir->setProperty("kcfg_property", "text");
+
         if (Settings::tempDir().isEmpty())
-            kcfg_tempDir->setUrl(QUrl::fromLocalFile(kt::DataDir()));
+            kcfg_tempDir->setText(kt::DataDir());
         else
-            kcfg_tempDir->setUrl(QUrl::fromLocalFile(Settings::tempDir()));
+            kcfg_tempDir->setText(Settings::tempDir());
 =

         kcfg_saveDir->setEnabled(Settings::useSaveDir());
         if (Settings::saveDir().isEmpty())
-            kcfg_saveDir->setUrl(QUrl::fromLocalFile(QDir::homePath()));
+            kcfg_saveDir->setText(QDir::homePath());
         else
-            kcfg_saveDir->setUrl(QUrl::fromLocalFile(Settings::saveDir()));
+            kcfg_saveDir->setText(Settings::saveDir());
 =

         kcfg_torrentCopyDir->setEnabled(Settings::useTorrentCopyDir());
         if (Settings::torrentCopyDir().isEmpty())
-            kcfg_torrentCopyDir->setUrl(QUrl::fromLocalFile(QDir::homePath=
()));
+            kcfg_torrentCopyDir->setText(QDir::homePath());
         else
-            kcfg_torrentCopyDir->setUrl(QUrl::fromLocalFile(Settings::torr=
entCopyDir()));
+            kcfg_torrentCopyDir->setText(Settings::torrentCopyDir());
 =

         kcfg_completedDir->setEnabled(Settings::useCompletedDir());
         if (Settings::completedDir().isEmpty())
-            kcfg_completedDir->setUrl(QUrl::fromLocalFile(QDir::homePath()=
));
+            kcfg_completedDir->setText(QDir::homePath());
         else
-            kcfg_completedDir->setUrl(QUrl::fromLocalFile(Settings::comple=
tedDir()));
+            kcfg_completedDir->setText(Settings::completedDir());
 =

 //          kcfg_downloadBandwidth->setEnabled(Settings::showSpeedBarInTra=
yIcon());
 //          kcfg_uploadBandwidth->setEnabled(Settings::showSpeedBarInTrayI=
con());
[prev in list] [next in list] [prev in thread] [next in thread]