Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix compilation of pc-mounttray on 10.x

  • Loading branch information...
commit e020f6aef2be0029549ef39f5392b3e4008dc5ce 1 parent b7d9fad
@beanpole135 beanpole135 authored
View
4 src-qt4/pc-mounttray/devCheck.cpp
@@ -206,8 +206,8 @@ bool DevCheck::devInfo(QString dev, QString* type, QString* label, QString* file
}
}
//make sure that a device label does not contain "(" or ")"
- if(dlabel.contains("(")){ dlabel.remove("(").simplified(); }
- if(dlabel.contains(")")){ dlabel.remove(")").simplified(); }
+ if(dlabel.contains("(")){ dlabel = dlabel.remove("(").simplified(); }
+ if(dlabel.contains(")")){ dlabel = dlabel.remove(")").simplified(); }
dlabel = dlabel.simplified();
//Now perform the final checks to see if it is a good device
bool good = FALSE;
View
12 src-qt4/pc-mounttray/settingsDialog.cpp
@@ -48,9 +48,9 @@ void SettingsDialog::showDialog(){
//qDebug() << "Refresh Time:"<< QString::number(diskRefreshMS)+" ms, "+QString::number(minutes)+" min";
spinDiskRefreshMin->setValue(minutes);
//Apply signals/slots AFTER setting the values
- connect(groupDiskWatch, SIGNAL(clicked(bool)),this,SLOT(slotUpdateUI(bool)) );
- connect(checkDiskAutoTimer, SIGNAL(clicked(bool)),this,SLOT(slotUpdateUI(bool)) );
- connect(spinDiskRefreshMin, SIGNAL(valueChanged(int)),this,SLOT(slotUpdateUI(int)) );
+ connect(groupDiskWatch, SIGNAL(clicked(bool)),this,SLOT(slotUpdateUI()) );
+ connect(checkDiskAutoTimer, SIGNAL(clicked(bool)),this,SLOT(slotUpdateUI()) );
+ connect(spinDiskRefreshMin, SIGNAL(valueChanged(int)),this,SLOT(slotUpdateUI()) );
this->exec();
}
@@ -70,14 +70,10 @@ void SettingsDialog::slotCloseDialog(){
this->close();
}
-void SettingsDialog::slotUpdateUI(bool checked){
+void SettingsDialog::slotUpdateUI(){
applyButton->setEnabled(TRUE);
//Could do check for visible/invisible options here as well
}
-void SettingsDialog::slotUpdateUI(int value){
- applyButton->setEnabled(TRUE);
- //Could do check for visible/invisible options here as well
-}
View
3  src-qt4/pc-mounttray/settingsDialog.h
@@ -42,8 +42,7 @@ private slots:
void slotApply();
void slotCloseDialog();
- void slotUpdateUI(bool checked=FALSE);
- void slotUpdateUI(int);
+ void slotUpdateUI();
};
Please sign in to comment.
Something went wrong with that request. Please try again.