Ignore:
Timestamp:
Apr 12, 2013 8:40:12 AM (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
bb72d33
Parents:
afd00d6
Message:

Add all the changes for related using of split pcbsd-utils libs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-bluetoothmanager/btmaingui.cpp

    r1f0939e r0cfe72f  
    33#include <pcbsd-hardware.h> 
    44#include <pcbsd-utils.h> 
     5#include <pcbsd-ui.h> 
    56#include <QDebug> 
    67#include <QMessageBox> 
     
    106107   //Start scanning and put the results in the listbox 
    107108   QStringList bdaddrList = Hardware::findBTdevices(); 
    108    QStringList connectionList = Utils::runShellCommand("hccontrol read_connection_list"); 
     109   QStringList connectionList = pcbsd::Utils::runShellCommand("hccontrol read_connection_list"); 
    109110   for(int i=0; i<bdaddrList.length(); i++){ 
    110111     if( !connectionList.contains(bdaddrList[i]) && !oldSaveBdaddrList.contains(bdaddrList[i]) ){ //Check if it is a new device (not connected or saved) 
     
    196197  QStringList requests; 
    197198  requests << tr("PIN Code (Examples: 0000, 1234, or none)") << tr("Link Key (Leave blank for automatic)"); 
    198   QStringList outputs = Utils::quickUserInputBox(tr("Device Configuration"),requests); 
     199  QStringList outputs = pcbsd::UI::quickUserInputBox(tr("Device Configuration"),requests); 
    199200  if( outputs.length() != requests.length() ){ //rememberempty strings are valid 
    200201    //Error/cancelled operation - do nothing 
     
    235236  //List all active connections (if any) 
    236237  currentSaveDeviceList.clear(); 
    237   QStringList connectionList = Utils::runShellCommand("hccontrol read_connection_list"); 
     238  QStringList connectionList = pcbsd::Utils::runShellCommand("hccontrol read_connection_list"); 
    238239  if(connectionList.length() > 1){ 
    239240    for(int i=1; i<connectionList.length(); i++){ //skip the first line (labels) 
     
    264265 
    265266bool btmaingui::rootPermissions(){ 
    266   QString userID = Utils::runShellCommand("id -u").join(""); 
     267  QString userID = pcbsd::Utils::runShellCommand("id -u").join(""); 
    267268  if( userID.toInt() == 0){ return TRUE; } 
    268269  else{ return FALSE; } 
     
    282283  QStringList requests; 
    283284  requests << tr("PIN Code (Examples: 0000, 1234, or none)") << tr("Link Key (Leave blank for automatic)"); 
    284   QStringList outputs = Utils::quickUserInputBox(tr("Device Configuration"),requests); 
     285  QStringList outputs = pcbsd::UI::quickUserInputBox(tr("Device Configuration"),requests); 
    285286  if( outputs.length() != requests.length() ){ //remember empty strings are valid 
    286287    //Error/cancelled operation - do nothing 
     
    358359  QStringList requests; 
    359360  requests << tr("New Bluetooth Computer name"); 
    360   QStringList outputs = Utils::quickUserInputBox(tr("New Bluetooth Name"),requests); 
     361  QStringList outputs = pcbsd::UI::quickUserInputBox(tr("New Bluetooth Name"),requests); 
    361362  //Check for invalid names 
    362363  if( outputs.join(" ").simplified().isEmpty() ){  
     
    392393  //Startup pc-bluetoothtray with sudo 
    393394  QString cmd = "sudo pc-bluetoothtray &"; 
    394   Utils::runShellCommand(cmd); 
    395 } 
    396  
     395  pcbsd::Utils::runShellCommand(cmd); 
     396} 
     397 
Note: See TracChangeset for help on using the changeset viewer.