Changeset e020f6a


Ignore:
Timestamp:
11/07/13 10:30:28 (9 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
395de4d
Parents:
b7d9fad
Message:

Fix compilation of pc-mounttray on 10.x

Location:
src-qt4/pc-mounttray
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-mounttray/devCheck.cpp

    r8ebea8d re020f6a  
    207207  } 
    208208  //make sure that a device label does not contain "(" or ")" 
    209   if(dlabel.contains("(")){ dlabel.remove("(").simplified(); } 
    210   if(dlabel.contains(")")){ dlabel.remove(")").simplified(); } 
     209  if(dlabel.contains("(")){ dlabel = dlabel.remove("(").simplified(); } 
     210  if(dlabel.contains(")")){ dlabel = dlabel.remove(")").simplified(); } 
    211211  dlabel = dlabel.simplified(); 
    212212  //Now perform the final checks to see if it is a good device 
  • src-qt4/pc-mounttray/settingsDialog.cpp

    r891636a re020f6a  
    4949  spinDiskRefreshMin->setValue(minutes); 
    5050    //Apply signals/slots AFTER setting the values 
    51     connect(groupDiskWatch, SIGNAL(clicked(bool)),this,SLOT(slotUpdateUI(bool)) ); 
    52     connect(checkDiskAutoTimer, SIGNAL(clicked(bool)),this,SLOT(slotUpdateUI(bool)) ); 
    53     connect(spinDiskRefreshMin, SIGNAL(valueChanged(int)),this,SLOT(slotUpdateUI(int)) ); 
     51    connect(groupDiskWatch, SIGNAL(clicked(bool)),this,SLOT(slotUpdateUI()) ); 
     52    connect(checkDiskAutoTimer, SIGNAL(clicked(bool)),this,SLOT(slotUpdateUI()) ); 
     53    connect(spinDiskRefreshMin, SIGNAL(valueChanged(int)),this,SLOT(slotUpdateUI()) ); 
    5454  this->exec(); 
    5555         
     
    7171} 
    7272 
    73 void SettingsDialog::slotUpdateUI(bool checked){ 
    74   applyButton->setEnabled(TRUE); 
    75   //Could do check for visible/invisible options here as well 
    76 } 
    77  
    78 void SettingsDialog::slotUpdateUI(int value){ 
     73void SettingsDialog::slotUpdateUI(){ 
    7974  applyButton->setEnabled(TRUE); 
    8075  //Could do check for visible/invisible options here as well 
     
    8277 
    8378 
     79 
  • src-qt4/pc-mounttray/settingsDialog.h

    r891636a re020f6a  
    4343        void slotCloseDialog(); 
    4444         
    45         void slotUpdateUI(bool checked=FALSE); 
    46         void slotUpdateUI(int); 
     45        void slotUpdateUI(); 
    4746 
    4847}; 
Note: See TracChangeset for help on using the changeset viewer.