Hello community,
here is the log from the commit of package polkit-qt-1 for openSUSE:Factory
checked in at Tue Jul 20 20:14:18 CEST 2010.
--------
--- KDE/polkit-qt-1/polkit-qt-1.changes 2010-02-24 16:36:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/polkit-qt-1/polkit-qt-1.changes 2010-07-17 11:03:04.000000000 +0200
@@ -1,0 +2,17 @@
+Sat Jul 17 11:02:53 CEST 2010 - dmueller@suse.de
+
+- fix pedantic warnings
+
+-------------------------------------------------------------------
+Wed Jul 14 19:17:07 CEST 2010 - dmueller@suse.de
+
+- update to polkit-qt-1 0.96.1:
+ * various code cleaning changes (foreach->Q_FOREACH)
+ * merged upstreamed patch
+
+-------------------------------------------------------------------
+Thu Jul 8 09:51:50 CEST 2010 - dmueller@suse.de
+
+- update buildrequires
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
no-return-statement.diff
polkit-qt-1-0.95.1.tar.bz2
suse112-reduce-requires.diff
New:
----
polkit-qt-1-0.96.1.tar.bz2
r1150958.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ polkit-qt-1.spec ++++++
--- /var/tmp/diff_new_pack.an4Mtf/_old 2010-07-20 20:13:47.000000000 +0200
+++ /var/tmp/diff_new_pack.an4Mtf/_new 2010-07-20 20:13:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package polkit-qt-1 (Version 0.95.1)
+# spec file for package polkit-qt-1 (Version 0.96.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,19 +20,18 @@
%define debug_package_requires libpolkit-qt-1-0 = %{version}-%{release}
Name: polkit-qt-1
-BuildRequires: automoc4 cmake kde4-filesystem libqt4-devel polkit-devel
-License: GPLv2 ; LGPLv2.1+
+BuildRequires: automoc4 cmake kde4-filesystem libqt4-devel pkg-config polkit-devel
+License: LGPLv2.1+
Group: Development/Libraries/KDE
Summary: PolicyKit Library Qt Bindings
-Version: 0.95.1
-Release: 3
+Version: 0.96.1
+Release: 1
Url: http://api.kde.org/kdesupport-api/kdesupport-apidocs/polkit-qt/html/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/
Source0: %{name}-%{version}.tar.bz2
Source99: baselibs.conf
-Patch0: suse112-reduce-requires.diff
-Patch1: no-return-statement.diff
+Patch0: r1150958.diff
%description
Polkit-qt-1 aims to make it easy for Qt developers to take advantage of
@@ -92,10 +91,7 @@
%prep
%setup
-%if %suse_version < 1121
%patch0
-%endif
-%patch1
%build
%cmake_kde4 -d build
++++++ polkit-qt-1-0.95.1.tar.bz2 -> polkit-qt-1-0.96.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/CMakeLists.txt new/polkit-qt-1-0.96.1/CMakeLists.txt
--- old/polkit-qt-1-0.95.1/CMakeLists.txt 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/CMakeLists.txt 2010-07-03 12:17:13.000000000 +0200
@@ -1,111 +1,119 @@
## Polkit Qt Library
-project("Polkit-qt-1")
+project("PolkitQt-1")
cmake_minimum_required(VERSION 2.6.0)
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
find_package(Automoc4 REQUIRED)
-
-include (${QT_USE_FILE})
-include (InstallSettings)
-include (FindPkgConfig)
-
-pkg_check_modules (POLKIT-1 REQUIRED polkit-gobject-1>=0.95)
-pkg_check_modules (POLKIT-1_AGENT REQUIRED polkit-agent-1>=0.95)
-
-message(STATUS " ${POLKIT-1_INCLUDE_DIRS} ===========")
-
-include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}
- ${POLKIT-1_INCLUDE_DIRS}
- ${POLKIT-1_AGENT_INCLUDE_DIRS}
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/core
- ${CMAKE_CURRENT_SOURCE_DIR}/includes
- ${QT_QTXML_INCLUDE_DIR}
-)
-
-set(CMAKE_MAJOR_POLKITQT-1_VERSION 0 CACHE INT "PolkitQt-1's major version number" FORCE)
-set(CMAKE_MINOR_POLKITQT-1_VERSION 95 CACHE INT "PolkitQt-1's minor version number" FORCE)
-set(CMAKE_RELEASE_POLKITQT-1_VERSION 1 CACHE INT "PolkitQt-1's release version number" FORCE)
-set(CMAKE_POLKITQT-1_VERSION_STRING "${CMAKE_MAJOR_POLKITQT-1_VERSION}.${CMAKE_MINOR_POLKITQT-1_VERSION}.${CMAKE_RELEASE_POLKITQT-1_VERSION}")
-
-configure_file(polkitqt1-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkitqt1-version.h)
-
-install(FILES
- gui/polkitqt1-gui-action.h
- gui/polkitqt1-gui-actionbutton.h
- gui/polkitqt1-gui-actionbuttons.h
-
- core/polkitqt1-authority.h
- core/polkitqt1-details.h
- core/polkitqt1-identity.h
- core/polkitqt1-subject.h
- core/polkitqt1-temporaryauthorization.h
- core/polkitqt1-actiondescription.h
-
- agent/polkitqt1-agent-listener.h
- agent/polkitqt1-agent-session.h
-
- ${CMAKE_CURRENT_BINARY_DIR}/polkitqt1-version.h
- polkitqt1-export.h
-
- DESTINATION
- ${INCLUDE_INSTALL_DIR}/polkit-qt-1 COMPONENT Devel)
-
-install(FILES
- includes/PolkitQt1/Authority
- includes/PolkitQt1/Details
- includes/PolkitQt1/Identity
- includes/PolkitQt1/Subject
- includes/PolkitQt1/TemporaryAuthorization
- includes/PolkitQt1/ActionDescription
- DESTINATION
- ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1 COMPONENT Devel)
-
-install(FILES
- includes/PolkitQt1/Gui/Action
- includes/PolkitQt1/Gui/ActionButton
- includes/PolkitQt1/Gui/ActionButtons
- DESTINATION
- ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1/Gui COMPONENT Devel)
-
-install(FILES
- includes/PolkitQt1/Agent/Listener
- includes/PolkitQt1/Agent/Session
- DESTINATION
- ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1/Agent COMPONENT Devel)
-
-
-if(NOT WIN32)
-# Pkgconfig
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-1.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-core-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-core-1.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-core-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-gui-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-gui-1.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-gui-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-agent-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-agent-1.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-agent-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
-endif(NOT WIN32)
-
-option(BUILD_EXAMPLES "Builds a set of examples for polkit-qt-1" OFF)
-if (BUILD_EXAMPLES)
- add_subdirectory(examples)
-endif (BUILD_EXAMPLES)
-
-add_subdirectory(cmake)
-
-option(BUILD_TEST "Builds unit tests for polkit-qt-1" OFF)
-if (BUILD_TEST)
- add_subdirectory(test)
-endif (BUILD_TEST)
-
-add_subdirectory(core)
-add_subdirectory(gui)
-add_subdirectory(agent)
-
+find_package(Polkit)
+find_package(GObject)
+find_package(GIO)
+
+add_definitions(-DQT_NO_KEYWORDS)
+
+if(POLKIT_FOUND)
+ include (${QT_USE_FILE})
+ include (InstallSettings)
+
+ include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${POLKIT_INCLUDE_DIR}
+ ${POLKIT_AGENT_INCLUDE_DIR}
+ ${GLIB2_INCLUDE_DIR}
+ ${GOBJECT_INCLUDE_DIR}
+ ${GIO_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/core
+ ${CMAKE_CURRENT_SOURCE_DIR}/includes
+ ${QT_QTXML_INCLUDE_DIR}
+ )
+
+ set(CMAKE_MAJOR_POLKITQT-1_VERSION 0 CACHE INT "PolkitQt-1's major version number" FORCE)
+ set(CMAKE_MINOR_POLKITQT-1_VERSION 96 CACHE INT "PolkitQt-1's minor version number" FORCE)
+ set(CMAKE_RELEASE_POLKITQT-1_VERSION 1 CACHE INT "PolkitQt-1's release version number" FORCE)
+ set(CMAKE_POLKITQT-1_VERSION_STRING
+ "${CMAKE_MAJOR_POLKITQT-1_VERSION}.${CMAKE_MINOR_POLKITQT-1_VERSION}.${CMAKE_RELEASE_POLKITQT-1_VERSION}")
+
+ configure_file(polkitqt1-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkitqt1-version.h)
+
+ install(FILES
+ gui/polkitqt1-gui-action.h
+ gui/polkitqt1-gui-actionbutton.h
+ gui/polkitqt1-gui-actionbuttons.h
+
+ core/polkitqt1-authority.h
+ core/polkitqt1-details.h
+ core/polkitqt1-identity.h
+ core/polkitqt1-subject.h
+ core/polkitqt1-temporaryauthorization.h
+ core/polkitqt1-actiondescription.h
+
+ agent/polkitqt1-agent-listener.h
+ agent/polkitqt1-agent-session.h
+
+ ${CMAKE_CURRENT_BINARY_DIR}/polkitqt1-version.h
+ polkitqt1-export.h
+
+ DESTINATION
+ ${INCLUDE_INSTALL_DIR}/polkit-qt-1 COMPONENT Devel)
+
+ install(FILES
+ includes/PolkitQt1/Authority
+ includes/PolkitQt1/Details
+ includes/PolkitQt1/Identity
+ includes/PolkitQt1/Subject
+ includes/PolkitQt1/TemporaryAuthorization
+ includes/PolkitQt1/ActionDescription
+ DESTINATION
+ ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1 COMPONENT Devel)
+
+ install(FILES
+ includes/PolkitQt1/Gui/Action
+ includes/PolkitQt1/Gui/ActionButton
+ includes/PolkitQt1/Gui/ActionButtons
+ DESTINATION
+ ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1/Gui COMPONENT Devel)
+
+ install(FILES
+ includes/PolkitQt1/Agent/Listener
+ includes/PolkitQt1/Agent/Session
+ DESTINATION
+ ${INCLUDE_INSTALL_DIR}/polkit-qt-1/PolkitQt1/Agent COMPONENT Devel)
+
+
+ if(NOT WIN32)
+ # Pkgconfig
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-1.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-core-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-core-1.pc
+ @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-core-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-gui-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-gui-1.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-gui-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polkit-qt-agent-1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-agent-1.pc
+ @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/polkit-qt-agent-1.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+ endif(NOT WIN32)
+
+ option(BUILD_EXAMPLES "Builds a set of examples for polkit-qt-1" OFF)
+ if (BUILD_EXAMPLES)
+ add_subdirectory(examples)
+ endif (BUILD_EXAMPLES)
+
+ add_subdirectory(cmake)
+
+ option(BUILD_TEST "Builds unit tests for polkit-qt-1" OFF)
+ if (BUILD_TEST)
+ add_subdirectory(test)
+ endif (BUILD_TEST)
+
+ add_subdirectory(core)
+ add_subdirectory(gui)
+ add_subdirectory(agent)
+else(POLKIT_FOUND)
+ message(STATUS "polkit-1 was not found on this system. Skipping polkit-qt-1 compilation")
+endif(POLKIT_FOUND)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/Mainpage.dox new/polkit-qt-1-0.96.1/Mainpage.dox
--- old/polkit-qt-1-0.95.1/Mainpage.dox 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/Mainpage.dox 2010-07-03 12:17:13.000000000 +0200
@@ -99,7 +99,7 @@
*/
-// DOXYGEN_PROJECTVERSION=0.95.1
+// DOXYGEN_PROJECTVERSION=0.96.1
// DOXYGEN_PROJECTNAME=PolkitQt-1
// DOXYGEN_ENABLE=YES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/agent/CMakeLists.txt new/polkit-qt-1-0.96.1/agent/CMakeLists.txt
--- old/polkit-qt-1-0.95.1/agent/CMakeLists.txt 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/agent/CMakeLists.txt 2010-07-03 12:17:13.000000000 +0200
@@ -12,9 +12,9 @@
automoc4_add_library(polkit-qt-agent-1 SHARED ${polkit_qt_agent_SRCS})
target_link_libraries(polkit-qt-agent-1
- ${POLKIT-1_LIBRARIES}
+ ${POLKIT_LIBRARIES}
${QT_QTCORE_LIBRARY}
- ${POLKIT-1_AGENT_LIBRARIES}
+ ${POLKIT_AGENT_LIBRARY}
polkit-qt-core-1
)
@@ -22,5 +22,5 @@
SOVERSION ${CMAKE_MAJOR_POLKITQT-1_VERSION}
DEFINE_SYMBOL MAKE_POLKITQT1_LIB
)
-
-install(TARGETS polkit-qt-agent-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+install(TARGETS polkit-qt-agent-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/agent/listeneradapter.cpp new/polkit-qt-1-0.96.1/agent/listeneradapter.cpp
--- old/polkit-qt-1-0.95.1/agent/listeneradapter.cpp 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/agent/listeneradapter.cpp 2010-07-03 12:17:13.000000000 +0200
@@ -61,7 +61,7 @@
{
Listener *listItem;
- foreach(listItem, m_listeners) {
+ Q_FOREACH(listItem, m_listeners) {
Q_ASSERT(listItem);
if (listItem->listener() == listener)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/agent/polkitqt1-agent-session.cpp new/polkit-qt-1-0.96.1/agent/polkitqt1-agent-session.cpp
--- old/polkit-qt-1-0.95.1/agent/polkitqt1-agent-session.cpp 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/agent/polkitqt1-agent-session.cpp 2010-07-03 12:17:13.000000000 +0200
@@ -101,25 +101,25 @@
{
qDebug() << "COMPLETED";
Session *session = (Session *)user_data;
- emit((Session *)user_data)->completed(gained_authorization);
+ Q_EMIT((Session *)user_data)->completed(gained_authorization);
}
void Session::Private::request(PolkitAgentSession *s, gchar *request, gboolean echo_on, gpointer user_data)
{
qDebug() << "REQUEST";
- emit((Session *)user_data)->request(QString::fromUtf8(request), echo_on);
+ Q_EMIT((Session *)user_data)->request(QString::fromUtf8(request), echo_on);
}
void Session::Private::showError(PolkitAgentSession *s, gchar *text, gpointer user_data)
{
qDebug() << "showError";
- emit((Session *)user_data)->showError(QString::fromUtf8(text));
+ Q_EMIT((Session *)user_data)->showError(QString::fromUtf8(text));
}
void Session::Private::showInfo(PolkitAgentSession *s, gchar *text, gpointer user_data)
{
qDebug() << "showInfo";
- emit((Session *)user_data)->showInfo(QString::fromUtf8(text));
+ Q_EMIT((Session *)user_data)->showInfo(QString::fromUtf8(text));
}
//
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/cmake/modules/FindGIO.cmake new/polkit-qt-1-0.96.1/cmake/modules/FindGIO.cmake
--- old/polkit-qt-1-0.95.1/cmake/modules/FindGIO.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/polkit-qt-1-0.96.1/cmake/modules/FindGIO.cmake 2010-07-03 12:17:13.000000000 +0200
@@ -0,0 +1,66 @@
+# - Try to find the GIO libraries
+# Once done this will define
+#
+# GIO_FOUND - system has GIO
+# GIO_INCLUDE_DIR - the GIO include directory
+# GIO_LIBRARIES - GIO library
+
+if(GIO_INCLUDE_DIR AND GIO_LIBRARIES)
+ # Already in cache, be silent
+ set(GIO_FIND_QUIETLY TRUE)
+endif(GIO_INCLUDE_DIR AND GIO_LIBRARIES)
+
+if (NOT WIN32)
+ include(UsePkgConfig)
+ pkgconfig(gio-2.0 _LibGIOIncDir _LibGIOLinkDir _LibGIOLinkFlags _LibGIOCflags)
+endif(NOT WIN32)
+
+MESSAGE(STATUS "gio include dir: ${_LibGIOIncDir}")
+
+# first try without default paths to respect PKG_CONFIG_PATH
+
+find_path(GIO_MAIN_INCLUDE_DIR glib.h
+ PATH_SUFFIXES glib-2.0
+ PATHS ${_LibGIOIncDir}
+ NO_DEFAULT_PATH)
+
+find_path(GIO_MAIN_INCLUDE_DIR glib.h
+ PATH_SUFFIXES glib-2.0
+ PATHS ${_LibGIOIncDir} )
+
+MESSAGE(STATUS "found gio main include dir: ${GIO_MAIN_INCLUDE_DIR}")
+
+# search the glibconfig.h include dir under the same root where the library is found
+find_library(GIO_LIBRARIES
+ NAMES gio-2.0
+ PATHS ${_LibGIOLinkDir}
+ NO_DEFAULT_PATH)
+
+find_library(GIO_LIBRARIES
+ NAMES gio-2.0
+ PATHS ${_LibGIOLinkDir})
+
+
+get_filename_component(GIOLibDir "${GIO_LIBRARIES}" PATH)
+
+find_path(GIO_INTERNAL_INCLUDE_DIR glibconfig.h
+ PATH_SUFFIXES glib-2.0/include
+ PATHS ${_LibGIOIncDir} "${GIOLibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH}
+ NO_DEFAULT_PATH)
+
+find_path(GIO_INTERNAL_INCLUDE_DIR glibconfig.h
+ PATH_SUFFIXES glib-2.0/include
+ PATHS ${_LibGIOIncDir} "${GIOLibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
+
+set(GIO_INCLUDE_DIR "${GIO_MAIN_INCLUDE_DIR}")
+
+# not sure if this include dir is optional or required
+# for now it is optional
+if(GIO_INTERNAL_INCLUDE_DIR)
+ set(GIO_INCLUDE_DIR ${GIO_INCLUDE_DIR} "${GIO_INTERNAL_INCLUDE_DIR}")
+endif(GIO_INTERNAL_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GIO DEFAULT_MSG GIO_LIBRARIES GIO_MAIN_INCLUDE_DIR)
+
+mark_as_advanced(GIO_INCLUDE_DIR GIO_LIBRARIES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/cmake/modules/FindGLIB2.cmake new/polkit-qt-1-0.96.1/cmake/modules/FindGLIB2.cmake
--- old/polkit-qt-1-0.95.1/cmake/modules/FindGLIB2.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/polkit-qt-1-0.96.1/cmake/modules/FindGLIB2.cmake 2010-07-03 12:17:13.000000000 +0200
@@ -0,0 +1,55 @@
+# - Try to find the GLIB2 libraries
+# Once done this will define
+#
+# GLIB2_FOUND - system has glib2
+# GLIB2_INCLUDE_DIR - the glib2 include directory
+# GLIB2_LIBRARIES - glib2 library
+
+# Copyright (c) 2008 Laurent Montel,
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+if(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
+ # Already in cache, be silent
+ set(GLIB2_FIND_QUIETLY TRUE)
+endif(GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
+
+if (NOT WIN32)
+ find_package(PkgConfig)
+ if (PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_LibGLIB2 glib-2.0)
+ endif (PKG_CONFIG_FOUND)
+endif(NOT WIN32)
+
+if (PC_LibGLIB2_INCLUDEDIR)
+ set(GLIB2_MAIN_INCLUDE_DIR ${PC_LibGLIB2_INCLUDEDIR})
+else (PC_LibGLIB2_INCLUDEDIR)
+ find_path(GLIB2_MAIN_INCLUDE_DIR NAMES glib.h PATH_SUFFIXES glib-2.0)
+endif (PC_LibGLIB2_INCLUDEDIR)
+
+# search the glibconfig.h include dir under the same root where the library is found
+find_library(GLIB2_LIBRARIES
+ NAMES glib-2.0
+ HINTS ${PC_LibGLIB2_LIBDIR}
+)
+
+get_filename_component(glib2LibDir "${GLIB2_LIBRARIES}" PATH)
+
+find_path(GLIB2_INTERNAL_INCLUDE_DIR glibconfig.h
+ PATH_SUFFIXES glib-2.0/include
+ HINTS ${PC_LibGLIB2_INCLUDEDIR} "${glib2LibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH})
+
+set(GLIB2_INCLUDE_DIR "${GLIB2_MAIN_INCLUDE_DIR}")
+
+# not sure if this include dir is optional or required
+# for now it is optional
+if(GLIB2_INTERNAL_INCLUDE_DIR)
+ set(GLIB2_INCLUDE_DIR ${GLIB2_INCLUDE_DIR} "${GLIB2_INTERNAL_INCLUDE_DIR}")
+endif(GLIB2_INTERNAL_INCLUDE_DIR)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(GLIB2 DEFAULT_MSG GLIB2_LIBRARIES GLIB2_MAIN_INCLUDE_DIR)
+
+mark_as_advanced(GLIB2_INCLUDE_DIR GLIB2_LIBRARIES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/cmake/modules/FindGObject.cmake new/polkit-qt-1-0.96.1/cmake/modules/FindGObject.cmake
--- old/polkit-qt-1-0.95.1/cmake/modules/FindGObject.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/polkit-qt-1-0.96.1/cmake/modules/FindGObject.cmake 2010-07-03 12:17:13.000000000 +0200
@@ -0,0 +1,75 @@
+# - Try to find GObject
+# Once done this will define
+#
+# GOBJECT_FOUND - system has GObject
+# GOBJECT_INCLUDE_DIR - the GObject include directory
+# GOBJECT_LIBRARIES - the libraries needed to use GObject
+# GOBJECT_DEFINITIONS - Compiler switches required for using GObject
+
+# Copyright (c) 2008 Helio Chissini de Castro,
+# (c)2006, Tim Beaulen
+
+
+IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+ # in cache already
+ SET(GObject_FIND_QUIETLY TRUE)
+ELSE (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+ SET(GObject_FIND_QUIETLY FALSE)
+ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+
+IF (NOT WIN32)
+ FIND_PACKAGE(PkgConfig)
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ PKG_CHECK_MODULES(PKG_GOBJECT2 gobject-2.0)
+ SET(GOBJECT_DEFINITIONS ${PKG_GOBJECT2_CFLAGS})
+ENDIF (NOT WIN32)
+
+FIND_PATH(GOBJECT_INCLUDE_DIR gobject/gobject.h
+ PATHS
+ ${PKG_GOBJECT2_INCLUDE_DIRS}
+ /usr/include/glib-2.0/
+ PATH_SUFFIXES glib-2.0
+ )
+
+FIND_LIBRARY(_GObjectLibs NAMES gobject-2.0
+ PATHS
+ ${PKG_GOBJECT2_LIBRARY_DIRS}
+ )
+FIND_LIBRARY(_GModuleLibs NAMES gmodule-2.0
+ PATHS
+ ${PKG_GOBJECT2_LIBRARY_DIRS}
+ )
+FIND_LIBRARY(_GThreadLibs NAMES gthread-2.0
+ PATHS
+ ${PKG_GOBJECT2_LIBRARY_DIRS}
+ )
+FIND_LIBRARY(_GLibs NAMES glib-2.0
+ PATHS
+ ${PKG_GOBJECT2_LIBRARY_DIRS}
+ )
+
+IF (WIN32)
+SET (GOBJECT_LIBRARIES ${_GObjectLibs} ${_GModuleLibs} ${_GThreadLibs} ${_GLibs})
+ELSE (WIN32)
+SET (GOBJECT_LIBRARIES ${PKG_GOBJECT2_LIBRARIES})
+ENDIF (WIN32)
+
+IF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+ SET(GOBJECT_FOUND TRUE)
+ELSE (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+ SET(GOBJECT_FOUND FALSE)
+ENDIF (GOBJECT_INCLUDE_DIR AND GOBJECT_LIBRARIES)
+
+IF (GOBJECT_FOUND)
+ IF (NOT GObject_FIND_QUIETLY)
+ MESSAGE(STATUS "Found GObject libraries: ${GOBJECT_LIBRARIES}")
+ MESSAGE(STATUS "Found GObject includes : ${GOBJECT_INCLUDE_DIR}")
+ ENDIF (NOT GObject_FIND_QUIETLY)
+ELSE (GOBJECT_FOUND)
+ IF (GObject_FIND_REQUIRED)
+ MESSAGE(STATUS "Could NOT find GObject")
+ ENDIF(GObject_FIND_REQUIRED)
+ENDIF (GOBJECT_FOUND)
+
+MARK_AS_ADVANCED(GOBJECT_INCLUDE_DIR GOBJECT_LIBRARIES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/cmake/modules/FindPolkit.cmake new/polkit-qt-1-0.96.1/cmake/modules/FindPolkit.cmake
--- old/polkit-qt-1-0.95.1/cmake/modules/FindPolkit.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/polkit-qt-1-0.96.1/cmake/modules/FindPolkit.cmake 2010-07-03 12:17:13.000000000 +0200
@@ -0,0 +1,75 @@
+# - Try to find Polkit
+# Once done this will define
+#
+# POLKIT_FOUND - system has Polkit
+# POLKIT_INCLUDE_DIRS - Polkit's include directories
+# POLKIT_AGENT_INCLUDE_DIRS - Polkit-agent's include directories
+# POLKIT_LIBRARIES - Link this to use polkit's gobject library
+# POLKIT_AGENT_LIBRARY - Link this to use the agent wrapper in polkit
+# POLKIT_DEFINITIONS - Compiler switches required for using Polkit
+
+# Copyright (c) 2009, Dario Freddi,
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (POLKIT_INCLUDE_DIR AND POLKIT_LIB)
+ set(POLKIT_FIND_QUIETLY TRUE)
+endif (POLKIT_INCLUDE_DIR AND POLKIT_LIB)
+
+if (NOT WIN32)
+ # use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig)
+ pkg_check_modules(PC_POLKIT polkit-gobject-1)
+ pkg_check_modules(PC_POLKIT_AGENT polkit-agent-1)
+ set(POLKIT_DEFINITIONS ${PC_POLKIT_CFLAGS_OTHER})
+endif (NOT WIN32)
+
+# We must include glib paths too... which sucks balls
+find_package(GLIB2)
+
+find_path( GLIB_CONFIG_INCLUDE_DIR
+ NAMES glibconfig.h
+ PATH_SUFFIXES glib-2.0/include
+ HINTS ${PC_POLKIT_INCLUDE_DIRS}
+)
+
+find_path( POLKIT_INCLUDE_DIR
+ NAMES polkit/polkit.h
+ PATH_SUFFIXES polkit-1
+ HINTS ${PC_POLKIT_INCLUDE_DIRS}
+)
+
+find_path( POLKIT_AGENT_INCLUDE_DIR
+ NAMES polkitagent/polkitagent.h
+ PATH_SUFFIXES polkit-1
+ HINTS ${PC_POLKIT_AGENT_INCLUDE_DIRS}
+)
+
+#set(POLKIT_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${_POLKIT_INCLUDE_DIR})
+#set(POLKIT_AGENT_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${_POLKIT_AGENT_INCLUDE_DIR})
+
+find_library( POLKIT_LIBRARIES
+ NAMES polkit-gobject-1
+ HINTS ${PC_POLKIT_LIBDIR}
+)
+
+find_library( POLKIT_AGENT_LIBRARY
+ NAMES polkit-agent-1
+ HINTS ${PC_POLKIT_AGENT_LIBDIR}
+)
+
+#set(POLKIT_LIBRARIES ${_POLKIT_LIBRARIES} ${GLIB2_LIBRARIES})
+#set(POLKIT_AGENT_LIBRARY ${_POLKIT_AGENT_LIBRARY} ${GLIB2_LIBRARIES})
+
+include(FindPackageHandleStandardArgs)
+
+# handle the QUIETLY and REQUIRED arguments and set POLKIT_FOUND to TRUE if
+# all listed variables are TRUE
+find_package_handle_standard_args(Polkit DEFAULT_MSG POLKIT_LIBRARIES POLKIT_AGENT_LIBRARY
+ POLKIT_INCLUDE_DIR POLKIT_AGENT_INCLUDE_DIR GLIB2_FOUND)
+
+mark_as_advanced(POLKIT_INCLUDE_DIRS POLKIT_AGENT_INCLUDE_DIRS POLKIT_LIBRARIES POLKIT_AGENT_LIBRARY GLIB_INCLUDE_DIR)
+
+set(POLKIT_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/core/CMakeLists.txt new/polkit-qt-1-0.96.1/core/CMakeLists.txt
--- old/polkit-qt-1-0.95.1/core/CMakeLists.txt 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/core/CMakeLists.txt 2010-07-03 12:17:13.000000000 +0200
@@ -18,12 +18,15 @@
${QT_QTCORE_LIBRARY}
${QT_QTDBUS_LIBRARY}
${QT_QTXML_LIBRARY}
- ${POLKIT-1_LIBRARIES}
+ ${POLKIT_LIBRARIES}
+ ${GLIB2_LIBRARIES}
+ ${GOBJECT_LIBRARIES}
+ ${GIO_LIBRARIES}
)
set_target_properties(polkit-qt-core-1 PROPERTIES VERSION ${CMAKE_POLKITQT-1_VERSION_STRING}
SOVERSION ${CMAKE_MAJOR_POLKITQT-1_VERSION}
DEFINE_SYMBOL MAKE_POLKITQT1_LIB
)
-
+
install(TARGETS polkit-qt-core-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/core/polkitqt1-authority.cpp new/polkit-qt-1-0.96.1/core/polkitqt1-authority.cpp
--- old/polkit-qt-1-0.95.1/core/polkitqt1-authority.cpp 2009-12-23 12:31:13.000000000 +0100
+++ new/polkit-qt-1-0.96.1/core/polkitqt1-authority.cpp 2010-07-03 12:17:13.000000000 +0200
@@ -208,7 +208,7 @@
QList<QString> seats;
qVariantValue<QDBusArgument> (msg.arguments()[0]) >> seats;
// it can be multiple seats present so connect all their signals
- foreach(const QString &seat, seats) {
+ Q_FOREACH(const QString &seat, seats) {
seatSignalsConnect(seat);
}
}
@@ -244,7 +244,7 @@
void Authority::Private::dbusFilter(const QDBusMessage &message)
{
if (message.type() == QDBusMessage::SignalMessage) {
- emit q->consoleKitDBChanged();
+ Q_EMIT q->consoleKitDBChanged();
// TODO: Test this with the multiseat support
if (message.member() == "SeatAdded")
@@ -278,7 +278,7 @@
void Authority::Private::pk_config_changed()
{
- emit Authority::instance()->configChanged();
+ Q_EMIT Authority::instance()->configChanged();
}
PolkitAuthority *Authority::polkitAuthority() const
@@ -361,7 +361,7 @@
return;
}
if (pkResult != NULL) {
- emit authority->checkAuthorizationFinished(polkitResultToResult(pkResult));
+ Q_EMIT authority->checkAuthorizationFinished(polkitResultToResult(pkResult));
g_object_unref(pkResult);
} else {
authority->d->setError(E_UnknownResult);
@@ -421,7 +421,7 @@
return;
}
- emit authority->enumerateActionsFinished(actionsToListAndFree(list));
+ Q_EMIT authority->enumerateActionsFinished(actionsToListAndFree(list));
}
void Authority::enumerateActionsCancel()
@@ -491,7 +491,7 @@
return;
}
- emit authority->registerAuthenticationAgentFinished(res);
+ Q_EMIT authority->registerAuthenticationAgentFinished(res);
}
void Authority::registerAuthenticationAgentCancel()
@@ -559,7 +559,7 @@
return;
}
- emit authority->unregisterAuthenticationAgentFinished(res);
+ Q_EMIT authority->unregisterAuthenticationAgentFinished(res);
}
void Authority::unregisterAuthenticationAgentCancel()
@@ -626,7 +626,7 @@
return;
}
- emit authority->authenticationAgentResponseFinished(res);
+ Q_EMIT authority->authenticationAgentResponseFinished(res);
}
void Authority::authenticationAgentResponseCancel()
@@ -685,7 +685,7 @@
g_list_free(glist);
- emit authority->enumerateTemporaryAuthorizationsFinished(res);
+ Q_EMIT authority->enumerateTemporaryAuthorizationsFinished(res);
}
void Authority::enumerateTemporaryAuthorizationsCancel()
@@ -741,7 +741,7 @@
return;
}
- emit authority->revokeTemporaryAuthorizationsFinished(res);
+ Q_EMIT authority->revokeTemporaryAuthorizationsFinished(res);
}
void Authority::revokeTemporaryAuthorizationsCancel()
@@ -797,7 +797,7 @@
return;
}
- emit authority->revokeTemporaryAuthorizationFinished(res);
+ Q_EMIT authority->revokeTemporaryAuthorizationFinished(res);
}
void Authority::revokeTemporaryAuthorizationCancel()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/core/polkitqt1-temporaryauthorization.cpp new/polkit-qt-1-0.96.1/core/polkitqt1-temporaryauthorization.cpp
--- old/polkit-qt-1-0.95.1/core/polkitqt1-temporaryauthorization.cpp 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/core/polkitqt1-temporaryauthorization.cpp 2010-07-03 12:17:13.000000000 +0200
@@ -87,6 +87,7 @@
bool TemporaryAuthorization::revoke()
{
Authority::instance()->revokeTemporaryAuthorization(id());
+ return true;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/examples/PkExample.h new/polkit-qt-1-0.96.1/examples/PkExample.h
--- old/polkit-qt-1-0.95.1/examples/PkExample.h 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/examples/PkExample.h 2010-07-03 12:17:13.000000000 +0200
@@ -32,7 +32,7 @@
PkExample(QMainWindow *parent = 0);
~PkExample();
-private slots:
+private Q_SLOTS:
void activateAction();
void actionActivated();
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/examples/PkExampleHelper.h new/polkit-qt-1-0.96.1/examples/PkExampleHelper.h
--- old/polkit-qt-1-0.95.1/examples/PkExampleHelper.h 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/examples/PkExampleHelper.h 2010-07-03 12:17:13.000000000 +0200
@@ -33,7 +33,7 @@
PkExampleHelper(int &argc, char **argv);
~PkExampleHelper();
-public slots:
+public Q_SLOTS:
bool set(const QString &action);
bool setValue(const QString &action);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/examples/agent/klistener.cpp new/polkit-qt-1-0.96.1/examples/agent/klistener.cpp
--- old/polkit-qt-1-0.95.1/examples/agent/klistener.cpp 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/examples/agent/klistener.cpp 2010-07-03 12:17:13.000000000 +0200
@@ -47,9 +47,7 @@
qDebug() << details->keys();
qDebug() << "cookie" << cookie;
- PolkitQt1::Identity *identity;
-
- foreach(identity, identities) {
+ Q_FOREACH (PolkitQt1::Identity *identity, identities) {
qDebug() << identity->toString();
Session *session;
session = new Session(identity, cookie, result);
@@ -59,8 +57,6 @@
connect(session, SIGNAL(showInfo(QString)), this, SLOT(showInfo(QString)));
session->initiate();
}
-
-
}
bool KListener::initiateAuthenticationFinish()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/examples/agent/klistener.h new/polkit-qt-1-0.96.1/examples/agent/klistener.h
--- old/polkit-qt-1-0.95.1/examples/agent/klistener.h 2009-12-23 12:31:14.000000000 +0100
+++ new/polkit-qt-1-0.96.1/examples/agent/klistener.h 2010-07-03 12:17:13.000000000 +0200
@@ -36,7 +36,7 @@
public:
KListener(QObject *parent = 0);
~KListener() {};
-public slots:
+public Q_SLOTS:
void initiateAuthentication(const QString &actionId,
const QString &message,
const QString &iconName,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/gui/CMakeLists.txt new/polkit-qt-1-0.96.1/gui/CMakeLists.txt
--- old/polkit-qt-1-0.95.1/gui/CMakeLists.txt 2009-12-23 12:31:13.000000000 +0100
+++ new/polkit-qt-1-0.96.1/gui/CMakeLists.txt 2010-07-03 12:17:13.000000000 +0200
@@ -16,9 +16,9 @@
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTDBUS_LIBRARY}
- ${POLKIT-1_LIBRARIES}
+ ${POLKIT_LIBRARIES}
)
-
+
set_target_properties(polkit-qt-gui-1 PROPERTIES VERSION ${CMAKE_POLKITQT-1_VERSION_STRING}
SOVERSION ${CMAKE_MAJOR_POLKITQT-1_VERSION}
DEFINE_SYMBOL MAKE_POLKITQT1_LIB
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/gui/polkitqt1-gui-action.cpp new/polkit-qt-1-0.96.1/gui/polkitqt1-gui-action.cpp
--- old/polkit-qt-1-0.95.1/gui/polkitqt1-gui-action.cpp 2009-12-23 12:31:13.000000000 +0100
+++ new/polkit-qt-1-0.96.1/gui/polkitqt1-gui-action.cpp 2010-07-03 12:17:13.000000000 +0200
@@ -127,8 +127,8 @@
switch (d->pkResult) {
case Authority::Yes:
case Authority::Challenge:
- // just emit the 'activated' signal
- emit authorized();
+ // just Q_EMIT the 'activated' signal
+ Q_EMIT authorized();
return true;
break;
default:
@@ -141,7 +141,7 @@
* Hence, they probably have a good reason for doing
* this so do let the 'activate' signal propagate..
*/
- emit authorized();
+ Q_EMIT authorized();
return true;
}
break;
@@ -207,7 +207,7 @@
}
break;
}
- emit parent->dataChanged();
+ Q_EMIT parent->dataChanged();
}
void Action::Private::configChanged()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/gui/polkitqt1-gui-actionbutton.cpp new/polkit-qt-1-0.96.1/gui/polkitqt1-gui-actionbutton.cpp
--- old/polkit-qt-1-0.95.1/gui/polkitqt1-gui-actionbutton.cpp 2009-12-23 12:31:13.000000000 +0100
+++ new/polkit-qt-1-0.96.1/gui/polkitqt1-gui-actionbutton.cpp 2010-07-03 12:17:13.000000000 +0200
@@ -57,7 +57,7 @@
{
Q_Q(ActionButton);
- foreach(QAbstractButton *ent, buttons) {
+ Q_FOREACH(QAbstractButton *ent, buttons) {
ent->setVisible(q->isVisible());
ent->setEnabled(q->isEnabled());
ent->setText(q->text());
@@ -81,7 +81,7 @@
Q_D(ActionButton);
bool tg = false;
- foreach(QAbstractButton *ent, d->buttons) {
+ Q_FOREACH(QAbstractButton *ent, d->buttons) {
if (ent->isCheckable()) {
// we set the the current Action state
ent->setChecked(isChecked());
@@ -102,7 +102,7 @@
Q_D(ActionButton);
// First, let's clear the list
- foreach(QAbstractButton *ent, d->buttons) {
+ Q_FOREACH(QAbstractButton *ent, d->buttons) {
d->removeButton(ent);
}
@@ -124,7 +124,7 @@
// if we are not checkable BUT the button
// is (eg a QCheckBox) we should set all buttons to
// checkable.
- foreach(QAbstractButton *ent, buttons) {
+ Q_FOREACH(QAbstractButton *ent, buttons) {
ent->setCheckable(true);
}
// set the checkable state of Action to store the initial state
@@ -156,7 +156,7 @@
{
Q_Q(ActionButton);
- emit q->clicked(qobject_cast(q->sender()), c);
+ Q_EMIT q->clicked(qobject_cast(q->sender()), c);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/gui/polkitqt1-gui-actionbuttons.cpp new/polkit-qt-1-0.96.1/gui/polkitqt1-gui-actionbuttons.cpp
--- old/polkit-qt-1-0.95.1/gui/polkitqt1-gui-actionbuttons.cpp 2009-12-23 12:31:13.000000000 +0100
+++ new/polkit-qt-1-0.96.1/gui/polkitqt1-gui-actionbuttons.cpp 2010-07-03 12:17:13.000000000 +0200
@@ -40,7 +40,7 @@
void ActionButtons::setButtons(const QList &buttons)
{
- foreach(QAbstractButton *ent, buttons) {
+ Q_FOREACH(QAbstractButton *ent, buttons) {
addButton(ent);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/test/CMakeLists.txt new/polkit-qt-1-0.96.1/test/CMakeLists.txt
--- old/polkit-qt-1-0.95.1/test/CMakeLists.txt 2009-12-23 12:31:13.000000000 +0100
+++ new/polkit-qt-1-0.96.1/test/CMakeLists.txt 2010-07-03 12:17:12.000000000 +0200
@@ -2,9 +2,7 @@
FIND_PACKAGE(Qt4 REQUIRED)
include (${QT_USE_FILE})
-include (FindPkgConfig)
-pkg_check_modules (POLKIT REQUIRED polkit-gobject-1>=0.94)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/test/test.cpp new/polkit-qt-1-0.96.1/test/test.cpp
--- old/polkit-qt-1-0.95.1/test/test.cpp 2009-12-23 12:31:13.000000000 +0100
+++ new/polkit-qt-1-0.96.1/test/test.cpp 2010-07-03 12:17:12.000000000 +0200
@@ -76,7 +76,7 @@
QVERIFY(!Authority::instance()->hasError());
// Check whether enumerateAction returns at least example actions
int count = 0;
- foreach(ActionDescription *ad, list) {
+ Q_FOREACH(ActionDescription *ad, list) {
if ((ad->actionId() == "org.qt.policykit.examples.kick") ||
(ad->actionId() == "org.qt.policykit.examples.cry") ||
(ad->actionId() == "org.qt.policykit.examples.bleed"))
@@ -94,7 +94,7 @@
QCOMPARE(spy.count(), 1);
list = qVariantValuePolkitQt1::ActionDescription::List (spy.takeFirst()[0]);
QVERIFY(!Authority::instance()->hasError());
- foreach(ActionDescription *ad, list) {
+ Q_FOREACH(ActionDescription *ad, list) {
if ((ad->actionId() == "org.qt.policykit.examples.kick") ||
(ad->actionId() == "org.qt.policykit.examples.cry") ||
(ad->actionId() == "org.qt.policykit.examples.bleed"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/polkit-qt-1-0.95.1/test/test.h new/polkit-qt-1-0.96.1/test/test.h
--- old/polkit-qt-1-0.95.1/test/test.h 2009-12-23 12:31:13.000000000 +0100
+++ new/polkit-qt-1-0.96.1/test/test.h 2010-07-03 12:17:12.000000000 +0200
@@ -7,7 +7,7 @@
class TestAuth : public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void test_Auth_checkAuthorization();
void test_Auth_enumerateActions();
void test_Identity();
++++++ r1150958.diff ++++++
------------------------------------------------------------------------
r1150958 | mueller | 2010-07-17 10:59:16 +0200 (Sat, 17 Jul 2010) | 2 lines
Changed paths:
M /trunk/kdesupport/polkit-qt-1/core/polkitqt1-authority.h
remove extra ';'
------------------------------------------------------------------------
Index: core/polkitqt1-authority.h
===================================================================
--- core/polkitqt1-authority.h (revision 1150957)
+++ core/polkitqt1-authority.h (revision 1150958)
@@ -534,6 +534,6 @@ private:
}
Q_DECLARE_OPERATORS_FOR_FLAGS(PolkitQt1::Authority::AuthorizationFlags)
-Q_DECLARE_METATYPE(PolkitQt1::Authority::Result);
+Q_DECLARE_METATYPE(PolkitQt1::Authority::Result)
#endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org