The removable media check never seems to have been implemented

src/Config.cpp

@@ -29,7 +29,6 @@
 
 bool Config::scanAcrossMounts;
 bool Config::scanRemoteMounts;
-bool Config::scanRemovableMedia;
 bool Config::varyLabelFontSizes;
 bool Config::showSmallFiles;
 bool Config::antialias;
@@ -47,7 +46,6 @@ Filelight::Config::read()
 
     scanAcrossMounts   = config.readEntry("scanAcrossMounts", false);
     scanRemoteMounts   = config.readEntry("scanRemoteMounts", false);
-    scanRemovableMedia = config.readEntry("scanRemovableMedia", false);
     varyLabelFontSizes = config.readEntry("varyLabelFontSizes", true);
     showSmallFiles     = config.readEntry("showSmallFiles", false);
     contrast           = config.readEntry("contrast", 75);
@@ -66,7 +64,6 @@ Filelight::Config::write()
 
     config.writeEntry("scanAcrossMounts", scanAcrossMounts);
     config.writeEntry("scanRemoteMounts", scanRemoteMounts);
-    config.writeEntry("scanRemovableMedia", scanRemovableMedia);
     config.writeEntry("varyLabelFontSizes", varyLabelFontSizes);
     config.writeEntry("showSmallFiles", showSmallFiles);
     config.writeEntry("contrast", contrast);

src/Config.h

@@ -51,7 +51,6 @@ public:
 
     static bool scanAcrossMounts;
     static bool scanRemoteMounts;
-    static bool scanRemovableMedia;
     static bool varyLabelFontSizes;
     static bool showSmallFiles;
     static uint contrast;

src/dialog.ui

@@ -185,22 +185,6 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
-          <widget class="QCheckBox" name="dontScanRemovableMedia">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="whatsThis">
-            <string>Prevents Filelight from scanning removable media (eg. CD-ROMs).</string>
-           </property>
-           <property name="text">
-            <string>E&amp;xclude removable media</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
       </layout>
@@ -403,7 +387,6 @@
   <tabstop>m_addButton</tabstop>
   <tabstop>scanAcrossMounts</tabstop>
   <tabstop>dontScanRemoteMounts</tabstop>
-  <tabstop>dontScanRemovableMedia</tabstop>
  </tabstops>
  <resources/>
  <connections/>

src/settingsDialog.cpp

@@ -70,10 +70,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent)
 
     connect(scanAcrossMounts, &QCheckBox::toggled, this, &SettingsDialog::startTimer);
     connect(dontScanRemoteMounts, &QCheckBox::toggled, this, &SettingsDialog::startTimer);
-    connect(dontScanRemovableMedia, &QCheckBox::toggled, this, &SettingsDialog::startTimer);
     connect(scanAcrossMounts, &QCheckBox::toggled, this, &SettingsDialog::toggleScanAcrossMounts);
     connect(dontScanRemoteMounts, &QCheckBox::toggled, this, &SettingsDialog::toggleDontScanRemoteMounts);
-    connect(dontScanRemovableMedia, &QCheckBox::toggled, this, &SettingsDialog::toggleDontScanRemovableMedia);
 
     connect(useAntialiasing, &QCheckBox::toggled, this, &SettingsDialog::toggleUseAntialiasing);
     connect(varyLabelFontSizes, &QCheckBox::toggled, this, &SettingsDialog::toggleVaryLabelFontSizes);
@@ -104,10 +102,8 @@ void SettingsDialog::reset()
     //tab 1
     scanAcrossMounts->setChecked(Config::scanAcrossMounts);
     dontScanRemoteMounts->setChecked(!Config::scanRemoteMounts);
-    dontScanRemovableMedia->setChecked(!Config::scanRemovableMedia);
 
     dontScanRemoteMounts->setEnabled(Config::scanAcrossMounts);
-    //  dontScanRemovableMedia.setEnabled(Config::scanAcrossMounts);
 
     m_listBox->clear();
     m_listBox->addItems(Config::skipList);
@@ -142,7 +138,6 @@ void SettingsDialog::toggleScanAcrossMounts(bool b)
     Config::scanAcrossMounts = b;
 
     dontScanRemoteMounts->setEnabled(b);
-    //dontScanRemovableMedia.setEnabled(b);
 }
 
 void SettingsDialog::toggleDontScanRemoteMounts(bool b)
@@ -150,11 +145,6 @@ void SettingsDialog::toggleDontScanRemoteMounts(bool b)
     Config::scanRemoteMounts = !b;
 }
 
-void SettingsDialog::toggleDontScanRemovableMedia(bool b)
-{
-    Config::scanRemovableMedia = !b;
-}
-
 
 
 void SettingsDialog::addFolder()

src/settingsDialog.h

@@ -48,7 +48,6 @@ public Q_SLOTS:
     void removeFolder();
     void toggleScanAcrossMounts(bool);
     void toggleDontScanRemoteMounts(bool);
-    void toggleDontScanRemovableMedia(bool);
     void reset();
     void startTimer();
     void toggleUseAntialiasing(bool = true);