klipper: remove compat bits

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
index e2204ad..54afeaf 100644 (file)
--- a/klipper/klipper.cpp
+++ b/klipper/klipper.cpp
@@ -319,22 +319,6 @@ void Klipper::loadSettings()
     // this will cause it to loadSettings too
     setURLGrabberEnabled(m_bURLGrabber);
     history()->setMaxSize( KlipperSettings::maxClipItems() );
-    // Convert 4.3 settings
-    if (KlipperSettings::synchronize() != 3) {
-      // 2 was the id of "Ignore selection" radiobutton
-      m_bIgnoreSelection = KlipperSettings::synchronize() == 2;
-      // 0 was the id of "Synchronize contents" radiobutton
-      m_bSynchronize = KlipperSettings::synchronize() == 0;
-      KConfigSkeletonItem* item = KlipperSettings::self()->findItem("SyncClipboards");
-      item->setProperty(m_bSynchronize);
-      item = KlipperSettings::self()->findItem("IgnoreSelection");
-      item->setProperty(m_bIgnoreSelection);
-      item =  KlipperSettings::self()->findItem("Synchronize"); // Mark property as converted.
-      item->setProperty(3);
-      KlipperSettings::self()->writeConfig();
-      KlipperSettings::self()->readConfig();
-
-    }
 }
 
 void Klipper::saveSettings() const

diff --git a/klipper/klipper.kcfg b/klipper/klipper.kcfg
index b97ad32..bd00172 100644 (file)
--- a/klipper/klipper.kcfg
+++ b/klipper/klipper.kcfg
@@ -26,10 +26,6 @@
       <default>false</default>
       <whatsthis><qt>When an area of the screen is selected with mouse or keyboard, this is called "the selection".&lt;br/&gt;If this option is set, the selection is not entered into the clipboard history, though it is still available for pasting using the middle mouse button.</qt></whatsthis>
     </entry>
-    <entry name="Synchronize" type="Int">
-      <label comment="KDE::DoNotExtract">Backwards compatibility, don't touch.</label>
-      <default>3</default>
-    </entry>
     <entry name="SyncClipboards" type="Bool">
       <label>Synchronize clipboard and selection</label>
       <default>false</default>