Fix compilation of pc-mounttray on 10.x

trueos · Nov 7, 2013 · e020f6a · e020f6a
1 parent b7d9fad
commit e020f6a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src-qt4/pc-mounttray/devCheck.cpp b/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;

diff --git a/src-qt4/pc-mounttray/settingsDialog.cpp b/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
-}
 
 
diff --git a/src-qt4/pc-mounttray/settingsDialog.h b/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();
 
 };