No OneTemporary
Actions

Size

23 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index 55b9539764..9c2464ae12 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,408 +1,408 @@

	cmake_minimum_required(VERSION 2.8.7)

	project(kdelibs)

	# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
	set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")

	# Make CPack available to easy generate binary packages
	include(CPack)

	find_file(FOUND_KDE4_HEADERS kglobal.h)

	if (${FOUND_KDE4_HEADERS})
	string(REGEX MATCH ${CMAKE_INSTALL_PREFIX} COMPATIBLE_HEADERS_TEST ${FOUND_KDE4_HEADERS})

	if (NOT ${COMPATIBLE_HEADERS_TEST})
	message("Found KDE4 headers. This will cause compiling failures while developing KDE Frameworks 5. Uninstall distro installed headers if applicable")
	message("FOUND: ${FOUND_KDE4_HEADERS}")
	return()
	endif()
	endif()

	################# set KDE specific information #################

	set (KDE_VERSION_MAJOR 4)
	set (KDE_VERSION_MINOR 90)
	set (KDE_VERSION_RELEASE 00)
	set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
	set (KDE_VERSION_STRING "${KDE_VERSION} (4.90.0 (KDE Frameworks >= 20120113)")

	set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distribution in bug reports" )

	# win32: give kde home in debug mode a different name as the release home dir because the settings and caches are different
	if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
	set (_KDE_DEFAULT_HOME_POSTFIX "-debug" CACHE STRING "default KDE home directory postfix" )
	endif (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
	set (KDE_DEFAULT_HOME ".kde${_KDE_DEFAULT_HOME_POSTFIX}" CACHE STRING "The default KDE home directory" )

	# this must be before FindKDE4Internal in order to preset the result of the visibility test, so that it will be skipped
	option(KHTML_BUILD_TESTREGRESSION "Build KHTML's testregression. Note: this disables hidden visibility")
	# Disable visibility if testregression is built, because the symbols are needed then
	if (KHTML_BUILD_TESTREGRESSION)
	set (__KDE_HAVE_GCC_VISIBILITY 0)
	endif (KHTML_BUILD_TESTREGRESSION)

	option(STATIC_LIBRARY "Build kdelibs as static libraries." FALSE)

	option(QT5_BUILD "Build kdelibs against Qt5." FALSE)

	find_package(extra-cmake-modules 0.0.2 REQUIRED)
	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${EXTRA_CMAKE_MODULES_MODULE_PATH})

	if (NOT QT5_BUILD)
	add_subdirectory( libinqt5 )
	set(INQT5_LIBRARY inqt5)
	include_directories(
	${CMAKE_SOURCE_DIR}/libinqt5/src/
	${CMAKE_BINARY_DIR}/libinqt5/src/
	)
	endif()
	add_subdirectory( libqtmimetypes )
	add_subdirectory( tier1 )

	set(CMAKE_AUTOMOC ON)


	# By default don't add any linked libraries to the "exported"
	# link interfaces of shared libraries, so that executables linking
	# against these libraries will not automatically add implicit
	# dependencies to their link list.
	#
	# This reduces inter-package dependencies and makes it easier to remove
	# dependencies of shared libraries without breaking binary compatibility.
	set(CMAKE_LINK_INTERFACE_LIBRARIES "")

	################# write platform profile file which will be installed #################
	include(CreateKDEPlatformProfile.cmake)

	if(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)
	set(KDE_NO_DEPRECATED TRUE)
	endif(KDE_PLATFORM_FEATURE_DISABLE_DEPRECATED)

	############### Load the CTest options ###############
	# CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
	# in the KDE build system, this is the same as CMAKE_BINARY_DIR.
	configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake COPYONLY)

	################# now find all used packages #################

	set (QT_MIN_VERSION "4.7.0")

	find_package(KDE4Internal REQUIRED)
	include(KDE4Defaults)
	include (MacroLibrary)
	if (APPLE)
	find_package(Carbon REQUIRED)
	endif (APPLE)

	if(UNIX AND Q_WS_X11)
	#X11 Session Management (SM) is required
	#X11_SM_FOUND is set in FindX11, which is required by KDE4Internal
	if(NOT X11_SM_FOUND)
	message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.\nPlease install libSM.\n")
	endif(NOT X11_SM_FOUND)
	endif(UNIX AND Q_WS_X11)

	#required features:
	# Perl is used e.g. in khtml, kjs, kjsembed and others
	find_package(Perl)
	macro_log_feature(PERL_FOUND "Perl" "Needed for building kdelibs" "http://www.perl.org" TRUE "" "")

	find_package(ZLIB)
	macro_log_feature(ZLIB_FOUND "ZLib" "Support for gzip compressed files and data streams" "http://www.zlib.net" TRUE "" "Required by the core KDE libraries and some critical kioslaves")

	set(STRIGI_MIN_VERSION 0.6.3)
	find_package(Strigi)
	if (WIN32)
	set (STRIGI_REQUIRED FALSE)
	set (STRIGI_EXTRA_TEXT "")
	else (WIN32)
	set (STRIGI_REQUIRED TRUE)
	set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves")
	endif (WIN32)
	macro_log_feature(STRIGI_FOUND "Strigi" "Desktop indexing and search support" "http://strigi.sourceforge.net" ${STRIGI_REQUIRED} "${STRIGI_MIN_VERSION}" ${STRIGI_EXTRA_TEXT})

	set(LIBATTICA_MIN_VERSION "0.1.90")
	find_package(LibAttica)
	macro_log_feature(LIBATTICA_FOUND "libattica" "Support for Get Hot New Stuff" "git clone git://anongit.kde.org/attica" TRUE "${LIBATTICA_MIN_VERSION}" "")

	#optional features
	if(X11_FOUND)
	#X11_Xrender discovery is done by FindX11
	macro_log_feature(X11_Xrender_FOUND "X Rendering Extension (libXrender)" "Support for compositing, rendering operations, and alpha-blending" "http://www.x.org" FALSE "" "STRONGLY RECOMMENDED")
	macro_bool_to_01(X11_Xscreensaver_FOUND HAVE_XSCREENSAVER)
	macro_bool_to_01(X11_XSync_FOUND HAVE_XSYNC)
	macro_log_feature(HAVE_XSCREENSAVER "X Screensaver Extension (libXss)" "Support for KIdleTime (fallback mode)" "http://www.x.org/" FALSE "" "")
	macro_log_feature(HAVE_XSYNC "X Sync Extension (libXext)" "Efficient operation of KIdleTime" "http://www.x.org/" FALSE "" "STRONGLY RECOMMENDED")

	if(NOT HAVE_XSYNC AND NOT HAVE_XSCREENSAVER)
	message(FATAL_ERROR "\nNeither the XSync (libXext) nor XScreensaver (libXss) development package was found.\nPlease install one of them (XSync is recommended)\n")
	endif(NOT HAVE_XSYNC AND NOT HAVE_XSCREENSAVER)
	endif(X11_FOUND)


	find_package(OpenSSL)
	macro_log_feature(OPENSSL_FOUND "OpenSSL" "Support for secure network communications (SSL and TLS)" "http://openssl.org" FALSE "" "STRONGLY RECOMMENDED: KDE uses OpenSSL for the bulk of secure communications, including secure web browsing via HTTPS")

	find_package(Libintl)
	macro_log_feature(LIBINTL_FOUND "Libintl" "Support for multiple languages" "http://www.gnu.org/software/gettext" FALSE "" "STRONGLY RECOMMENDED: Enables KDE to be available in many different languages")

	find_package(QCA2)
	macro_log_feature(QCA2_FOUND "QCA2" "Support for remote plasma widgets" "http://delta.affinix.com/qca" FALSE "2.0.0" "")

	find_package(DBusMenuQt)
	macro_log_feature(DBUSMENUQT_FOUND "DBusMenuQt" "Support for notification area menus via the DBusMenu protocol" "https://launchpad.net/libdbusmenu-qt" TRUE "" "")

	################# Disallow in-source build #################

	macro_ensure_out_of_source_build("kdelibs requires an out of source build. Please create a separate build directory and run 'cmake path_to_kdelibs [options]' there.")

	# ... and warn in case of an earlier in-source build
	set(generatedFileInSourceDir EXISTS ${kdelibs_SOURCE_DIR}/kdemacros.h OR EXISTS ${kdelibs_SOURCE_DIR}/config.h)
	if(${generatedFileInSourceDir})
	message(STATUS "kdemacros.h or config.h exists in your source directory.")
	message(FATAL_ERROR "Please run svn-clean, it would seem that your source directory has generated files in it.")
	endif(${generatedFileInSourceDir})
	#########################################################################

	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
	remove_definitions(-DQT3_SUPPORT_WARNINGS -DQT3_SUPPORT)

	add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)

	################# setup the include directories #################

	# for including config.h and for includes like <kparts/foo.h>
	include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/interfaces)

	if(QCA2_FOUND)
	include_directories(
	${QCA2_INCLUDE_DIR}
	)
	endif(QCA2_FOUND)


	# Those variables for are only valid inside of kdelibs, of course.
	# Use the one variable for the lib you depend upon.
	# E.g. kdeui uses ${KDE4_KDECORE_INCLUDES}. Something that depends on kparts uses ${KDE4_KPARTS_INCLUDES}.

	set(KDE4_KJS_INCLUDES ${CMAKE_SOURCE_DIR}/kjs
	${CMAKE_BINARY_DIR}/kjs)

	if(NOT WINCE)
	set(KDE4_KDECORE_INCLUDES ${KDE4_KJS_INCLUDES} )
	endif(NOT WINCE)

	set(KDE4_KCONFIG_INCLUDES ${CMAKE_SOURCE_DIR}/kdecore/config
	${CMAKE_SOURCE_DIR}/staging/kcoreaddons/src/io # for kurl.h
	${CMAKE_BINARY_DIR}/staging/kcoreaddons/src
	)
	# kdecore depends on Qt and kcoreaddons (need only headers from kjs)
	set(KDE4_KDECORE_INCLUDES ${KDE4_KDECORE_INCLUDES}
	${CMAKE_SOURCE_DIR}/kdecore
	${CMAKE_BINARY_DIR}/kdecore
	${CMAKE_SOURCE_DIR}/kdecore/compression
	${CMAKE_SOURCE_DIR}/kdecore/config
	${CMAKE_SOURCE_DIR}/kdecore/date
	${CMAKE_SOURCE_DIR}/kdecore/io
	${CMAKE_SOURCE_DIR}/kdecore/kernel
	${CMAKE_SOURCE_DIR}/kdecore/network
	${CMAKE_SOURCE_DIR}/kdecore/services
	${CMAKE_SOURCE_DIR}/kdecore/localization
	${CMAKE_SOURCE_DIR}/kdecore/sycoca
	${CMAKE_SOURCE_DIR}/kdecore/text
	${CMAKE_SOURCE_DIR}/kdecore/util
	${CMAKE_SOURCE_DIR}/kdecore/sonnet
	${CMAKE_SOURCE_DIR}/staging/kcoreaddons/src/io
	${CMAKE_SOURCE_DIR}/staging/kcoreaddons/src/kernel
	${CMAKE_SOURCE_DIR}/staging/kcoreaddons/src/jobs
	${CMAKE_SOURCE_DIR}/staging/kcoreaddons/src/text
	${CMAKE_BINARY_DIR}/staging/kcoreaddons/src
	${CMAKE_BINARY_DIR}/staging/kde4support/src
	${CMAKE_SOURCE_DIR}/staging/kde4support/src
	${CMAKE_SOURCE_DIR}/libqtmimetypes/include/QtMimeTypes
	${QT_INCLUDES}
	${_KDE4_PLATFORM_INCLUDE_DIRS})
	# kdeui depends on kdecore
	set(KDE4_KDEUI_INCLUDES ${CMAKE_SOURCE_DIR}/kdeui
	${CMAKE_SOURCE_DIR}/kdeui/actions
	${CMAKE_SOURCE_DIR}/kdeui/colors
	${CMAKE_SOURCE_DIR}/kdeui/config
	${CMAKE_SOURCE_DIR}/kdeui/dialogs
	${CMAKE_SOURCE_DIR}/kdeui/findreplace
	${CMAKE_SOURCE_DIR}/kdeui/fonts
	${CMAKE_SOURCE_DIR}/kdeui/icons
	${CMAKE_SOURCE_DIR}/kdeui/itemviews
	${CMAKE_SOURCE_DIR}/kdeui/jobs
	${CMAKE_SOURCE_DIR}/kdeui/kernel
	${CMAKE_SOURCE_DIR}/kdeui/notifications
	${CMAKE_SOURCE_DIR}/kdeui/paged
	${CMAKE_SOURCE_DIR}/kdeui/plotting
	${CMAKE_SOURCE_DIR}/kdeui/shortcuts
	${CMAKE_SOURCE_DIR}/kdeui/sonnet
	${CMAKE_SOURCE_DIR}/kdeui/util
	${CMAKE_SOURCE_DIR}/kdeui/widgets
	${CMAKE_SOURCE_DIR}/kdeui/windowmanagement
	${CMAKE_SOURCE_DIR}/kdeui/xmlgui
	${KDE4_KDECORE_INCLUDES})

	# kio depends on kdeui
	set(KDE4_KIO_INCLUDES ${CMAKE_SOURCE_DIR}/kio
	${CMAKE_SOURCE_DIR}/kio/bookmarks
	${CMAKE_SOURCE_DIR}/kio/kio
	${CMAKE_SOURCE_DIR}/kio/kfile
	${KDE4_KDEUI_INCLUDES})

	# kpty
	set(KDE4_KPTY_INCLUDES ${CMAKE_SOURCE_DIR}/kpty ${KDE4_KIO_INCLUDES} )

	# kparts depends on kio
	set(KDE4_KPARTS_INCLUDES ${CMAKE_SOURCE_DIR}/kparts
	${KDE4_KIO_INCLUDES})

	# kde3support depends on kparts
	set(KDE4_KDE3SUPPORT_INCLUDES ${CMAKE_SOURCE_DIR}/kde3support
	${CMAKE_SOURCE_DIR}/kde3support/kdecore
	${CMAKE_SOURCE_DIR}/kde3support/kdeui
	${CMAKE_SOURCE_DIR}/kde3support/kio
	${KDE4_KPARTS_INCLUDES})

	if(NOT WINCE)
	set(KDE4_KHTML_INCLUDES ${CMAKE_SOURCE_DIR}/khtml)
	endif(NOT WINCE)


	################# configure checks and create the configured files #################

	if(WINCE)
	set(STATIC_LIBRARY ON)
	add_definitions(-DSTATIC_INSTALL_PATH=L\\\"/programme/kde\\\")
	endif(WINCE)

	if(STATIC_LIBRARY)
	set(LIBRARY_TYPE STATIC)
	add_definitions(-DKDELIBS_STATIC_LIBS)
	message(STATUS "Building kdelibs as static libraries")
	else(STATIC_LIBRARY)
	set(LIBRARY_TYPE SHARED)
	endif(STATIC_LIBRARY)

	# ACL stuff (used in kio/ and kioslaves/)
	find_package(ACL)
	macro_bool_to_01(ACL_FOUND HAVE_LIBACL HAVE_POSIX_ACL)
	macro_log_feature(ACL_FOUND "LibACL" "Support for manipulating access control lists" "ftp://oss.sgi.com/projects/xfs/cmd_tars" FALSE "" "STRONGLY RECOMMENDED")
	configure_file(config-acl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-acl.h )

	include(ConfigureChecks.cmake)

	# now create config headers
	configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
	configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h )
	configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h )
	configure_file(config-pty.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-pty.h )
	configure_file(kdemacros.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h )

	# these two calls here should go somewhere else, Alex
	check_library_exists(nsl gethostbyname "" HAVE_NSL_LIBRARY)
	check_library_exists(socket connect "" HAVE_SOCKET_LIBRARY)

	# TODO: Port away from this:
	add_definitions(-DKDE_NO_WINDOWSYSTEM)

	################# list the subdirectories #################

	add_subdirectory( cmake )
	add_subdirectory( kdecore )
	add_subdirectory( staging )
	add_subdirectory( tier2 )
	if (UNIX)
	add_subdirectory( kpty )
	add_subdirectory( kdesu )
	endif (UNIX)
	if(NOT WINCE)
	add_subdirectory( kjs )
	add_subdirectory( kjsembed )
	endif(NOT WINCE)
	add_subdirectory( kconf_update )
	add_subdirectory( licenses )
	add_subdirectory( mimetypes )
	add_subdirectory( kdeui )
	add_subdirectory( dnssd )
	add_subdirectory( security )
	add_subdirectory( kio )
	add_subdirectory( kded )
	if (QT_QT3SUPPORT_FOUND)
	add_subdirectory( kde3support )
	endif (QT_QT3SUPPORT_FOUND)
	add_subdirectory( kfile )
	if(NOT WINCE)
	add_subdirectory( kdoctools )
	endif(NOT WINCE)
	add_subdirectory( kioslave )
	add_subdirectory( kparts )
	add_subdirectory( kunitconversion )
	if(NOT WINCE)
	# TO BE SPLITTED OUT add_subdirectory( khtml )
	endif(NOT WINCE)
	add_subdirectory( interfaces )
	add_subdirectory( kdewidgets )
	add_subdirectory( kross )
	+add_subdirectory( kutils )

	if (QT5_BUILD)
	# This should be moved down and eventually removed when everything
	# can be built with Qt5.
	# The current problem is kdeui because it uses X11 stuff which is no longer in Qt.
	return()
	endif()
	add_subdirectory( knewstuff )
	-add_subdirectory( kutils )
	add_subdirectory( kinit )
	add_subdirectory( knotify )
	if(NOT WINCE)
	add_subdirectory( kimgio )
	endif(NOT WINCE)

	find_package(KdepimLibs 4.5.60)
	macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
	# Plasma needs gpgme++
	if(KDEPIMLIBS_FOUND AND NOT WINCE)
	add_subdirectory( plasma )
	endif()
	add_subdirectory( kdewebkit )
	add_subdirectory( includes )

	add_subdirectory( experimental )
	macro_optional_add_subdirectory( doc )

	################# write dependency file which will be installed #################

	# Used in configure_file() and install(EXPORT)
	set(KDE4_TARGET_PREFIX KDE4__)
	include(CreateKDELibsDependenciesFile.cmake)

	################# install files #################

	install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h DESTINATION ${INCLUDE_INSTALL_DIR} )
	install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)
	install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDEPlatformProfile.cmake DESTINATION ${DATA_INSTALL_DIR}/cmake/modules)


	# run a script before installing the exports files which deletes previously installed
	# configuration specific export files KDELibs4(Library\|Tools)Targets-<config>.cmake
	# if the main exports file KDELibs4(Library\|Tools)Targets.cmake has changed. This makes sure
	# that this main file doesn't include older and different configuration specific exports files,
	# which might have a different set of targets or targets with different names.
	# The code for installing the exports files will soon go into a macro. Alex
	install(CODE "set(EXPORT_FILES KDELibs4LibraryTargets.cmake KDELibs4ToolsTargets.cmake)"
	CODE "set(EXPORT_INSTALL_DIR \"${DATA_INSTALL_DIR}/cmake/modules\")"
	SCRIPT "${CMAKE_SOURCE_DIR}/cmake/modules/check_installed_exports_file.cmake" )
	# No longer applicable, replaced with individual frameworks
	# install( EXPORT kdelibsToolsTargets DESTINATION ${DATA_INSTALL_DIR}/cmake/modules NAMESPACE ${KDE4_TARGET_PREFIX} FILE KDELibs4ToolsTargets.cmake )
	# the following will be the correct locations once cmake has the improved FIND_PACKAGE()
	# install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KDELibsDependencies.cmake DESTINATION ${PLUGIN_INSTALL_DIR}/cmake RENAME KDE4Config.cmake)

	feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

	macro_display_feature_log()
	diff --git a/kutils/kidletime/kidletime.cpp b/kutils/kidletime/kidletime.cpp
	index 8625be9bd2..50cae90ce4 100644
	--- a/kutils/kidletime/kidletime.cpp
	+++ b/kutils/kidletime/kidletime.cpp
	@@ -1,269 +1,273 @@
	/* This file is part of the KDE libraries
	Copyright (C) 2009 Dario Freddi <drf at kde.org>

	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.

	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Library General Public License for more details.

	You should have received a copy of the GNU Library General Public License
	along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
	*/

	#include "kidletime.h"

	#include <config-kidletime.h>

	#ifdef Q_WS_X11
	#ifdef HAVE_XSCREENSAVER
	#include "xscreensaverbasedpoller.h"
	#endif
	#ifdef HAVE_XSYNC
	#include "xsyncbasedpoller.h"
	#endif
	#else
	#ifdef Q_WS_MAC
	#include "macpoller.h"
	#else
	#include "windowspoller.h"
	#endif
	#endif

	#include <QWeakPointer>
	#include <QSet>

	#include <kglobal.h>

	class KIdleTimeHelper
	{
	public:
	KIdleTimeHelper() : q(0) {}
	~KIdleTimeHelper() {
	delete q;
	}
	KIdleTime *q;
	};

	K_GLOBAL_STATIC(KIdleTimeHelper, s_globalKIdleTime)

	KIdleTime *KIdleTime::instance()
	{
	if (!s_globalKIdleTime->q) {
	new KIdleTime;
	}

	return s_globalKIdleTime->q;
	}

	class KIdleTimePrivate
	{
	Q_DECLARE_PUBLIC(KIdleTime)
	KIdleTime *q_ptr;
	public:
	KIdleTimePrivate() : catchResume(false), currentId(0) {}

	void loadSystem();
	void unloadCurrentSystem();
	void _k_resumingFromIdle();
	void _k_timeoutReached(int msec);

	QWeakPointer<AbstractSystemPoller> poller;
	bool catchResume;

	int currentId;
	QHash<int, int> associations;
	};

	KIdleTime::KIdleTime()
	: QObject(0)
	, d_ptr(new KIdleTimePrivate())
	{
	Q_ASSERT(!s_globalKIdleTime->q);
	s_globalKIdleTime->q = this;

	d_ptr->q_ptr = this;

	Q_D(KIdleTime);
	d->loadSystem();

	connect(d->poller.data(), SIGNAL(resumingFromIdle()), this, SLOT(_k_resumingFromIdle()));
	connect(d->poller.data(), SIGNAL(timeoutReached(int)), this, SLOT(_k_timeoutReached(int)));
	}

	KIdleTime::~KIdleTime()
	{
	Q_D(KIdleTime);
	d->unloadCurrentSystem();
	delete d_ptr;
	}

	void KIdleTime::catchNextResumeEvent()
	{
	Q_D(KIdleTime);

	if (!d->catchResume) {
	d->catchResume = true;
	d->poller.data()->catchIdleEvent();
	}
	}

	void KIdleTime::stopCatchingResumeEvent()
	{
	Q_D(KIdleTime);

	if (d->catchResume) {
	d->catchResume = false;
	d->poller.data()->stopCatchingIdleEvents();
	}
	}

	int KIdleTime::addIdleTimeout(int msec)
	{
	Q_D(KIdleTime);

	d->poller.data()->addTimeout(msec);

	++d->currentId;
	d->associations[d->currentId] = msec;

	return d->currentId;
	}

	void KIdleTime::removeIdleTimeout(int identifier)
	{
	Q_D(KIdleTime);

	if (!d->associations.contains(identifier)) {
	return;
	}

	int msec = d->associations[identifier];

	d->associations.remove(identifier);

	if (!d->associations.values().contains(msec)) {
	d->poller.data()->removeTimeout(msec);
	}
	}

	void KIdleTime::removeAllIdleTimeouts()
	{
	Q_D(KIdleTime);

	QHash< int, int >::iterator i = d->associations.begin();
	QSet< int > removed;
	removed.reserve(d->associations.size());

	while (i != d->associations.end()) {
	int msec = d->associations[i.key()];

	i = d->associations.erase(i);

	if (!removed.contains(msec)) {
	d->poller.data()->removeTimeout(msec);
	removed.insert(msec);
	}
	}
	}

	void KIdleTimePrivate::loadSystem()
	{
	if (!poller.isNull()) {
	unloadCurrentSystem();
	}

	// Priority order

	#ifdef Q_WS_X11
	#ifdef HAVE_XSYNC
	#ifdef HAVE_XSCREENSAVER
	if (XSyncBasedPoller::instance()->isAvailable()) {
	poller = XSyncBasedPoller::instance();
	} else {
	poller = new XScreensaverBasedPoller();
	}
	#else
	poller = XSyncBasedPoller::instance();
	#endif
	#else
	#ifdef HAVE_XSCREENSAVER
	poller = new XScreensaverBasedPoller();
	#endif
	#endif
	#else
	#ifdef Q_WS_MAC
	poller = new MacPoller();
	#else
	+#ifdef Q_WS_WIN
	poller = new WindowsPoller();
	+#else
	+#warning QT5 port to QPA
	+#endif
	#endif
	#endif

	if (!poller.isNull()) {
	poller.data()->setUpPoller();
	}
	}

	void KIdleTimePrivate::unloadCurrentSystem()
	{
	if (!poller.isNull()) {
	poller.data()->unloadPoller();
	#ifdef Q_WS_X11
	if (qobject_cast<XSyncBasedPoller*>(poller.data()) == 0) {
	#endif
	poller.data()->deleteLater();
	#ifdef Q_WS_X11
	}
	#endif
	}
	}

	void KIdleTimePrivate::_k_resumingFromIdle()
	{
	Q_Q(KIdleTime);

	if (catchResume) {
	emit q->resumingFromIdle();
	q->stopCatchingResumeEvent();
	}
	}

	void KIdleTimePrivate::_k_timeoutReached(int msec)
	{
	Q_Q(KIdleTime);

	if (associations.values().contains(msec)) {
	foreach (int key, associations.keys(msec)) {
	emit q->timeoutReached(key);
	emit q->timeoutReached(key, msec);
	}
	}
	}

	void KIdleTime::simulateUserActivity()
	{
	Q_D(KIdleTime);

	d->poller.data()->simulateUserActivity();
	}

	int KIdleTime::idleTime() const
	{
	Q_D(const KIdleTime);

	return d->poller.data()->forcePollRequest();
	}

	QHash<int, int> KIdleTime::idleTimeouts() const
	{
	Q_D(const KIdleTime);

	return d->associations;
	}

	#include "moc_kidletime.cpp"

File Metadata

Mime Type: text/x-diff
Expires: Fri, Nov 1, 8:57 AM (1 d, 12 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 10075371
Default Alt Text: (23 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions