Ignore:
Timestamp:
04/12/13 08:40:12 (17 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, releng/10.0.3
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-mounttray/menuItem.cpp

    r1f0939e r0cfe72f  
    7070      if(mountpoint.isEmpty()){ 
    7171        //detect the current mountpoint 
    72         QString output = Utils::runShellCommandSearch("mount",device); 
     72        QString output = pcbsd::Utils::runShellCommandSearch("mount",device); 
    7373        mountpoint = output.section(" on ",1,1).section(" (",0,0).replace(" ","-"); 
    7474      } 
     
    106106bool MenuItem::isMounted(){ 
    107107  //Check if device is mounted 
    108   QString chk = Utils::runShellCommandSearch("mount",device);   
    109   if(chk.isEmpty() ){ chk = Utils::runShellCommandSearch("mount",devLabel->text().replace(" ","-")); }  
     108  QString chk = pcbsd::Utils::runShellCommandSearch("mount",device);   
     109  if(chk.isEmpty() ){ chk = pcbsd::Utils::runShellCommandSearch("mount",devLabel->text().replace(" ","-")); }  
    110110 
    111111  if(chk.isEmpty() ){ return FALSE; } 
     
    121121    if(QFile::exists(mountpoint)){ 
    122122      qDebug() << "Removing old mountpoint:" << mountpoint; 
    123       QString output = Utils::runShellCommand("rmdir "+mountpoint).join(" "); 
     123      QString output = pcbsd::Utils::runShellCommand("rmdir "+mountpoint).join(" "); 
    124124      if(!output.isEmpty()){ qDebug() << " -Error:" <<output; } 
    125125    } 
     
    161161    QString cmd = "cat "+AMFILE; 
    162162    QString search = devLabel->text() +" "+ devType +" "+ filesystem; 
    163     QString chk = Utils::runShellCommandSearch(cmd, search); 
     163    QString chk = pcbsd::Utils::runShellCommandSearch(cmd, search); 
    164164    if( chk.isEmpty() ){ return FALSE; } 
    165165    else{ return TRUE; } 
     
    210210  QString result, title; 
    211211  //Run the mounting commands 
    212   QStringList output = Utils::runShellCommand(cmd1); 
     212  QStringList output = pcbsd::Utils::runShellCommand(cmd1); 
    213213  if( output.join(" ").simplified().isEmpty() ){ 
    214214    //directory created, run the next commands 
    215215    system(cmd3.toUtf8()); //set directory permissions before mounting device 
    216     output = Utils::runShellCommand(cmd2); 
     216    output = pcbsd::Utils::runShellCommand(cmd2); 
    217217    if( output.join(" ").simplified().isEmpty() ){ 
    218218      title = tr("Success"); 
     
    225225      result =  output.join(" "); 
    226226      //Remove the mount point just created 
    227       Utils::runShellCommand("rmdir "+mntpoint); 
     227      pcbsd::Utils::runShellCommand("rmdir "+mntpoint); 
    228228    } 
    229229  }else{ 
     
    253253    if( isMounted() ){  //double check that it is actually mounted 
    254254      //mounted someplace else - find it 
    255       QString output = Utils::runShellCommandSearch("mount",device); 
     255      QString output = pcbsd::Utils::runShellCommandSearch("mount",device); 
    256256      mountpoint = output.section(" on ",1,1).section(" (",0,0).replace(" ","-"); 
    257257    }else{ 
     
    268268  QString result, title; 
    269269  bool ok = FALSE; 
    270   output = Utils::runShellCommand(cmd1); 
     270  output = pcbsd::Utils::runShellCommand(cmd1); 
    271271  if(output.join(" ").simplified().isEmpty()){ 
    272272    //unmounting successful, remove the mount point directory 
    273     output = Utils::runShellCommand(cmd2); 
     273    output = pcbsd::Utils::runShellCommand(cmd2); 
    274274    if(!output.join(" ").simplified().isEmpty()){ 
    275275      qDebug() << "pc-mounttray: Error removing mountpoint:" << mountpoint; 
Note: See TracChangeset for help on using the changeset viewer.