[PC-BSD Commits] r16602 - in pcbsd/current/src-qt4: libpcbsd pc-softwaremanager pc-sysmanager

svn at pcbsd.org svn at pcbsd.org
Mon Apr 30 11:42:16 PDT 2012


Author: kris
Date: 2012-04-30 18:42:16 +0000 (Mon, 30 Apr 2012)
New Revision: 16602

Modified:
   pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp
   pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp
   pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
Log:

Use pbreg from CLI when getting PC-BSD version number



Modified: pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp
===================================================================
--- pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp	2012-04-30 18:35:42 UTC (rev 16601)
+++ pcbsd/current/src-qt4/libpcbsd/metaWidget.cpp	2012-04-30 18:42:16 UTC (rev 16602)
@@ -48,8 +48,7 @@
   qDebug() << "Done metaWidget...";
   PkgSet = "pcbsd";
 
-  QSettings settings("PCBSD");
-  Version = settings.value("/PC-BSD/Version", Version).toString();
+  Version = getLineFromCommandOutput("pbreg get /PC-BSD/Version");
   Arch = getLineFromCommandOutput("uname -m");
 
   populateMetaPkgs();

Modified: pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp	2012-04-30 18:35:42 UTC (rev 16601)
+++ pcbsd/current/src-qt4/pc-softwaremanager/softmanager-main.cpp	2012-04-30 18:42:16 UTC (rev 16602)
@@ -711,7 +711,7 @@
   QSettings settings("PCBSD");
 
   // Get the PC-BSD Version
-  Version = settings.value("/PC-BSD/Version", "").toString();
+  Version = getLineFromCommandOutput("pbreg get /PC-BSD/Version");
 
   // Get the system type
   QString command = "uname -m";

Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp	2012-04-30 18:35:42 UTC (rev 16601)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp	2012-04-30 18:42:16 UTC (rev 16602)
@@ -139,7 +139,7 @@
 void PBSystemTab::CheckPBVer()
 {
  QSettings settings("PCBSD");
- Version = settings.value("/PC-BSD/Version", Version).toString();
+ Version = getLineFromCommandOutput("pbreg get /PC-BSD/Version");
  labelPCBSD->setText(Version);
 
  Arch = getLineFromCommandOutput("uname -m");



More information about the Commits mailing list