remove okular kactivities support

okular/CMakeLists.txt

@@ -30,11 +30,7 @@ add_subdirectory( tests )
 include(OkularConfigureChecks.cmake)
 include(MacroWriteBasicCMakeVersionFile)
 
-if(NOT WIN32)
- set(MATH_LIB m)
-else(NOT WIN32)
- set(MATH_LIB)
-endif(NOT WIN32)
+set(MATH_LIB m)
 
 # okularcore
 

okular/shell/CMakeLists.txt

@@ -3,16 +3,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
-# checking whether we should enable activities support
-
-macro_optional_find_package(KActivities 6.1.0)
-macro_log_feature(KActivities_FOUND "KActivities" "Activities interface library" "https://projects.kde.org/projects/kde/kdelibs/kactivities" FALSE "6.1.0" "Required for Activities integration.")
-
-if(KActivities_FOUND)
- add_definitions(-DKActivities_FOUND)
- include_directories(${KACTIVITIES_INCLUDE_DIRS})
-endif(KActivities_FOUND)
-
 # okular
 
 set(okular_SRCS
@@ -26,7 +16,7 @@ kde4_add_app_icon(okular_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../ui/data/icons/hi*-
 
 kde4_add_executable(okular ${okular_SRCS})
 
-target_link_libraries(okular ${KDE4_KPARTS_LIBS} ${KACTIVITIES_LIBRARIES})
+target_link_libraries(okular ${KDE4_KPARTS_LIBS})
 
 install(TARGETS okular ${INSTALL_TARGETS_DEFAULT_ARGS})
 

okular/shell/shell.cpp

@@ -47,10 +47,6 @@
 #include <QDragMoveEvent>
 #include <QTabBar>
 
-#ifdef KActivities_FOUND
-#include <KActivities/ResourceInstance>
-#endif
-
 // local includes
 #include "kdocumentviewer.h"
 #include "../interfaces/viewerinterface.h"
@@ -61,9 +57,6 @@ static const char *shouldShowToolBarComingFromFullScreen = "shouldShowToolBarCom
 
 Shell::Shell( const QString &serializedOptions )
   : KParts::MainWindow(), m_menuBarWasShown(true), m_toolBarWasShown(true)
-#ifdef KActivities_FOUND
-    , m_activityResource(0)
-#endif
     , m_isValid(true)
 {
   setObjectName( QLatin1String( "okular::Shell" ) );
@@ -238,12 +231,6 @@ void Shell::openUrl( const KUrl & url, const QString &serializedOptions )
             {
                 if ( openOk )
                 {
-#ifdef KActivities_FOUND
-                    if ( !m_activityResource )
-                        m_activityResource = new KActivities::ResourceInstance( window()->winId(), this );
-
-                    m_activityResource->setUri( url );
-#endif
                     m_recent->addUrl( url );
                 }
                 else

okular/shell/shell.h

@@ -1,4 +1,4 @@
-/***************************************************************************
+cccccccc/***************************************************************************
  *   Copyright (C) 2002 by Wilco Greven <greven@kde.org>                   *
  *   Copyright (C) 2003 by Benjamin Meyer <benjamin@csh.rit.edu>           *
  *   Copyright (C) 2003 by Laurent Montel <montel@kde.org>                 *
@@ -29,10 +29,6 @@ class KPluginFactory;
 class KDocumentViewer;
 class Part;
 
-#ifdef KActivities_FOUND
-namespace KActivities { class ResourceInstance; }
-#endif
-
 /**
  * This is the application "Shell".  It has a menubar and a toolbar
  * but relies on the "Part" to do all the real work.
@@ -159,9 +155,6 @@ private:
   KAction* m_nextTabAction;
   KAction* m_prevTabAction;
 
-#ifdef KActivities_FOUND
-  KActivities::ResourceInstance* m_activityResource;
-#endif
   bool m_isValid;
 };