generic: remove check for old releases unconditionlising some code

diff --git a/bluedevil/src/CMakeLists.txt b/bluedevil/src/CMakeLists.txt
index 0ffaccf..3ab1989 100644 (file)
--- a/bluedevil/src/CMakeLists.txt
+++ b/bluedevil/src/CMakeLists.txt
@@ -5,12 +5,7 @@ add_subdirectory(kcmodule)
 add_subdirectory(kio)
 add_subdirectory(wizard)
 add_subdirectory(monolithic)
-
-if(NOT KDE_VERSION VERSION_LESS "4.6.0")
-  add_subdirectory(fileitemactionplugin)
-else(NOT KDE_VERSION VERSION_LESS "4.6.0")
-  message(WARNING "Upgrade to kde-4.6 if you want \"Send via bluetooth\" action in Dolphin/Konqueror")
-endif(NOT KDE_VERSION VERSION_LESS "4.6.0")
+add_subdirectory(fileitemactionplugin)
 
 install(FILES bluedevil.notifyrc
        DESTINATION ${DATA_INSTALL_DIR}/bluedevil)

diff --git a/kdeplasma-addons/applets/icontasks/abstracttaskitem.cpp b/kdeplasma-addons/applets/icontasks/abstracttaskitem.cpp
index df5c07f..1f3a985 100644 (file)
--- a/kdeplasma-addons/applets/icontasks/abstracttaskitem.cpp
+++ b/kdeplasma-addons/applets/icontasks/abstracttaskitem.cpp
@@ -444,9 +444,7 @@ void AbstractTaskItem::clearToolTip()
         m_mediaStateTimerId = 0;
     }
     IconTasks::ToolTipContent data;
-#if KDE_IS_VERSION(4, 7, 0)
     data.setInstantPopup(m_applet->instantToolTip());
-#endif
 
     IconTasks::ToolTipManager::self()->setContent(this, data);
 }

diff --git a/kdeplasma-addons/applets/icontasks/applauncheritem.cpp b/kdeplasma-addons/applets/icontasks/applauncheritem.cpp
index f721b5a..373cb7f 100644 (file)
--- a/kdeplasma-addons/applets/icontasks/applauncheritem.cpp
+++ b/kdeplasma-addons/applets/icontasks/applauncheritem.cpp
@@ -118,9 +118,7 @@ void AppLauncherItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
 void AppLauncherItem::updateToolTip()
 {
     IconTasks::ToolTipContent data(m_launcher->name(), m_launcher->genericName(), m_launcher->icon());
-#if KDE_IS_VERSION(4, 7, 0)
     data.setInstantPopup(m_applet->instantToolTip());
-#endif
     QString key = mediaButtonKey();
     if (!key.isEmpty()) {
         data.setPlayState(MediaButtons::self()->playbackStatus(key));

diff --git a/kdeplasma-addons/applets/icontasks/dockconfig.cpp b/kdeplasma-addons/applets/icontasks/dockconfig.cpp
index 6fc1c36..8a54853 100644 (file)
--- a/kdeplasma-addons/applets/icontasks/dockconfig.cpp
+++ b/kdeplasma-addons/applets/icontasks/dockconfig.cpp
@@ -589,9 +589,7 @@ void DockConfigItemDelegate::aboutClicked()
                              (dbusName.isEmpty() ? QString() : i18n("<tr><td align=\"right\">D-Bus:</td><td>%1</td></tr>", dbusName)) +
                              QString("</table>"),
                              model->data(index, Qt::DisplayRole).toString()
-#if KDE_IS_VERSION(4, 7, 0)
                              ,QString(), KMessageBox::WindowModal
-#endif
                              );
 }
 

diff --git a/kdeplasma-addons/applets/icontasks/taskgroupitem.cpp b/kdeplasma-addons/applets/icontasks/taskgroupitem.cpp
index 86b953b..9b107e3 100644 (file)
--- a/kdeplasma-addons/applets/icontasks/taskgroupitem.cpp
+++ b/kdeplasma-addons/applets/icontasks/taskgroupitem.cpp
@@ -358,9 +358,7 @@ void TaskGroupItem::updateToolTip()
     IconTasks::ToolTipContent data;
 
     data.setClickable(true);
-#if KDE_IS_VERSION(4, 7, 0)
     data.setInstantPopup(m_applet->instantToolTip());
-#endif
     data.setHighlightWindows(m_applet->highlightWindows());
     data.setVertical(Plasma::Vertical == m_applet->formFactor());
 

diff --git a/kdeplasma-addons/applets/icontasks/windowtaskitem.cpp b/kdeplasma-addons/applets/icontasks/windowtaskitem.cpp
index 61b39ef..90c9032 100644 (file)
--- a/kdeplasma-addons/applets/icontasks/windowtaskitem.cpp
+++ b/kdeplasma-addons/applets/icontasks/windowtaskitem.cpp
@@ -282,9 +282,7 @@ void WindowTaskItem::updateToolTip()
                                        !m_applet->groupManager().showOnlyCurrentDesktop() || !m_task.data()->isOnCurrentDesktop()
                                            ? m_task.data()->desktop() : 0));
         data.setClickable(true);
-#if KDE_IS_VERSION(4, 7, 0)
         data.setInstantPopup(m_applet->instantToolTip());
-#endif
         data.setHighlightWindows(m_applet->highlightWindows());
         data.setVertical(Plasma::Vertical == m_applet->formFactor());
 

diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp
index ad40c0b..37283bc 100644 (file)
--- a/kfilereplace/kfilereplacepart.cpp
+++ b/kfilereplace/kfilereplacepart.cpp
@@ -829,11 +829,7 @@ void KFileReplacePart::loadOwnerOptions()
 void KFileReplacePart::loadLocationsList()
 {
   KConfigGroup cg( m_config,"Directories");
-  #if KDE_IS_VERSION(3,1,3)
   QString locationsEntryList = cg.readPathEntry(rcDirectoriesList, QString());
-  #else
-  QString locationsEntryList = cg.readEntry(rcDirectoriesList);
-  #endif
 
   if(locationsEntryList.isEmpty())
     locationsEntryList = QDir::current().path();
@@ -844,11 +840,7 @@ void KFileReplacePart::loadLocationsList()
 void KFileReplacePart::loadFiltersList()
 {
   KConfigGroup cg( m_config,"Filters");
-  #if KDE_IS_VERSION(3,1,3)
   QString filtersEntryList = cg.readPathEntry(rcFiltersList, QString());
-  #else
-  QString filtersEntryList = cg.readEntry(rcFiltersList);
-  #endif
 
   if(filtersEntryList.isEmpty())
     filtersEntryList = "*.htm;*.html;*.xml;*.xhtml;*.css;*.js;*.php";

diff --git a/okular/ui/pageview.cpp b/okular/ui/pageview.cpp
index ef1bd88..21b8a9b 100644 (file)
--- a/okular/ui/pageview.cpp
+++ b/okular/ui/pageview.cpp
@@ -3992,7 +3992,6 @@ void PageView::updatePageStep() {
 
 void PageView::addWebShortcutsMenu( KMenu * menu, const QString & text )
 {
-#if KDE_IS_VERSION(4,5,70)
     if ( text.isEmpty() )
     {
         return;
@@ -4043,7 +4042,6 @@ void PageView::addWebShortcutsMenu( KMenu * menu, const QString & text )
             menu->addMenu(webShortcutsMenu);
         }
     }
-#endif
 }
 
 //BEGIN private SLOTS
@@ -4535,7 +4533,6 @@ void PageView::slotShowSizeAllCursor()
 
 void PageView::slotHandleWebShortcutAction()
 {
-#if KDE_IS_VERSION(4,5,70)
     KAction *action = qobject_cast<KAction*>( sender() );
 
     if (action)
@@ -4547,7 +4544,6 @@ void PageView::slotHandleWebShortcutAction()
             KToolInvocation::invokeBrowser( filterData.uri().url() );
         }
     }
-#endif
 }
 
 void PageView::slotConfigureWebShortcuts()

diff --git a/thumbnailers/po/pocreator.h b/thumbnailers/po/pocreator.h
index f5fa0b1..b89e432 100644 (file)
--- a/thumbnailers/po/pocreator.h
+++ b/thumbnailers/po/pocreator.h
@@ -25,11 +25,7 @@
 #include <kdeversion.h>
 #include <kio/thumbcreator.h>
 
-#if KDE_IS_VERSION(4,7,0)
 class PoCreator : public ThumbCreatorV2
-#else
-class PoCreator : public ThumbCreator
-#endif
 {
     public:
         explicit PoCreator();