[PC-BSD Commits] r2347 - pcbsd/trunk/kcmPBSystem

[svn at pcbsd.org]

Author: tim
Date: 2008-07-15 05:58:52 -0700 (Tue, 15 Jul 2008)
New Revision: 2347

Modified:
   pcbsd/trunk/kcmPBSystem/PBSystem.pro
   pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp
Log:
Reactivate Utils functionality, since the library is now linking correctly

Modified: pcbsd/trunk/kcmPBSystem/PBSystem.pro
===================================================================
--- pcbsd/trunk/kcmPBSystem/PBSystem.pro	2008-07-15 12:56:18 UTC (rev 2346)
+++ pcbsd/trunk/kcmPBSystem/PBSystem.pro	2008-07-15 12:58:52 UTC (rev 2347)
@@ -3,7 +3,7 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -lpcbsd -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
+LIBS	+= -Ikdelibs -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -lpcbsd
 
 INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
 

Modified: pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp
===================================================================
--- pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp	2008-07-15 12:56:18 UTC (rev 2346)
+++ pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp	2008-07-15 12:58:52 UTC (rev 2347)
@@ -32,12 +32,10 @@
     CheckPBVer();
     
     //Get & Set CPU Type
-    // KPM 06252008 - These Utils:: calls are broken! Fails to link properly, even
-    // with -lpcbsd, TIM!!!
-    //labelCPU->setText(Utils::sysctl("hw.model").stripWhiteSpace());
+    labelCPU->setText(Utils::sysctl("hw.model").stripWhiteSpace());
     
     //Get & Set RAM
-    //labelMemory->setText(Utils::bytesToHumanReadable(Utils::sysctlAsInt("hw.realmem")));
+    labelMemory->setText(Utils::bytesToHumanReadable(Utils::sysctlAsInt("hw.realmem")));
     
     // Load the available kernels into the list
     CheckKernels();