More Qt->TQt conversion and some clean up.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 23 insertions, 23 deletions

diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index 37511d618..fe17d7a0b 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -1,7 +1,7 @@
  
 ## install the cmake files
 
-#file( GLOB cmakeFiles FindPolkitQt.cmake )
+#file( GLOB cmakeFiles FindPolkitTQt.cmake )
 #set(module_install_dir ${CMAKE_ROOT}/Modules )
 
 #install( FILES ${cmakeFiles} 
diff --git a/cmake/modules/FindPolkitQt-1.cmake b/cmake/modules/FindPolkitQt-1.cmake
index f28c494e4..2ba20aab4 100644
--- a/cmake/modules/FindPolkitQt-1.cmake
+++ b/cmake/modules/FindPolkitQt-1.cmake
@@ -1,13 +1,13 @@
 # - Try to find PolkitTQt-1
 # Once done this will define
 #
-#  POLKITQT-1_FOUND - system has Polkit-qt
-#  POLKITQT-1_INCLUDE_DIR - the Polkit-qt include directory
-#  POLKITQT-1_LIBRARIES - Link these to use all Polkit-qt libs
-#  POLKITQT-1_CORE_LIBRARY - Link this to use the polkit-qt-core library only
-#  POLKITQT-1_GUI_LIBRARY - Link this to use GUI elements in polkit-qt (polkit-qt-gui)
-#  POLKITQT-1_AGENT_LIBRARY - Link this to use the agent wrapper in polkit-qt
-#  POLKITQT-1_DEFINITIONS - Compiler switches required for using Polkit-qt
+#  POLKITTQT-1_FOUND - system has Polkit-tqt
+#  POLKITTQT-1_INCLUDE_DIR - the Polkit-tqt include directory
+#  POLKITTQT-1_LIBRARIES - Link these to use all Polkit-tqt libs
+#  POLKITTQT-1_CORE_LIBRARY - Link this to use the polkit-tqt-core library only
+#  POLKITTQT-1_GUI_LIBRARY - Link this to use GUI elements in polkit-tqt (polkit-tqt-gui)
+#  POLKITTQT-1_AGENT_LIBRARY - Link this to use the agent wrapper in polkit-tqt
+#  POLKITTQT-1_DEFINITIONS - Compiler switches required for using Polkit-tqt
 #
 # The minimum required version of PolkitTQt-1 can be specified using the
 # standard syntax, e.g. find_package(PolkitTQt-1 1.0)
@@ -17,10 +17,10 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-# Support POLKITQT-1_MIN_VERSION for compatibility:
-if ( NOT PolkitTQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION )
-  set ( PolkitTQt-1_FIND_VERSION ${POLKITQT-1_MIN_VERSION} )
-endif ( NOT PolkitTQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION )
+# Support POLKITTQT-1_MIN_VERSION for compatibility:
+if ( NOT PolkitTQt-1_FIND_VERSION AND POLKITTQT-1_MIN_VERSION )
+  set ( PolkitTQt-1_FIND_VERSION ${POLKITTQT-1_MIN_VERSION} )
+endif ( NOT PolkitTQt-1_FIND_VERSION AND POLKITTQT-1_MIN_VERSION )
 
 set( _PolkitTQt-1_FIND_QUIETLY  ${PolkitTQt-1_FIND_QUIETLY} )
 find_package( PolkitTQt-1 ${PolkitTQt-1_FIND_VERSION} TQUIET NO_MODULE PATHS ${LIB_INSTALL_DIR}/PolkitTQt-1/cmake )
@@ -29,9 +29,9 @@ set( PolkitTQt-1_FIND_QUIETLY ${_PolkitTQt-1_FIND_QUIETLY} )
 include( FindPackageHandleStandardArgs )
 find_package_handle_standard_args( PolkitTQt-1 DEFAULT_MSG PolkitTQt-1_CONFIG )
 
-if (POLKITQT-1_FOUND)
-    if (NOT POLKITQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX)
+if (POLKITTQT-1_FOUND)
+    if (NOT POLKITTQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX)
         message("WARNING: Installation prefix does not match PolicyKit install prefixes. You probably will need to move files installed "
-                "in POLICY_FILES_INSTALL_DIR and by dbus_add_activation_system_service to the ${POLKITQT-1_INSTALL_DIR} prefix")
-    endif (NOT POLKITQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX)
-endif (POLKITQT-1_FOUND)
+                "in POLICY_FILES_INSTALL_DIR and by dbus_add_activation_system_service to the ${POLKITTQT-1_INSTALL_DIR} prefix")
+    endif (NOT POLKITTQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX)
+endif (POLKITTQT-1_FOUND)
diff --git a/cmake/modules/PolkitQt-1Dist.cmake b/cmake/modules/PolkitQt-1Dist.cmake
index 99122ddfd..ea23fe5cd 100644
--- a/cmake/modules/PolkitQt-1Dist.cmake
+++ b/cmake/modules/PolkitQt-1Dist.cmake
@@ -1,13 +1,13 @@
-SET(CPACK_PACKAGE_NAME "polkit-qt-1")
-SET(CPACK_PACKAGE_VERSION_MAJOR "${POLKITQT-1_VERSION_MAJOR}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${POLKITQT-1_VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${POLKITQT-1_VERSION_PATCH}")
+SET(CPACK_PACKAGE_NAME "polkit-tqt-1")
+SET(CPACK_PACKAGE_VERSION_MAJOR "${POLKITTQT-1_VERSION_MAJOR}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${POLKITTQT-1_VERSION_MINOR}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${POLKITTQT-1_VERSION_PATCH}")
 
 set(CPACK_SOURCE_GENERATOR "TBZ2")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "polkit-qt-1-${POLKITQT-1_VERSION_MAJOR}.${POLKITQT-1_VERSION_MINOR}.${POLKITQT-1_VERSION_PATCH}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "polkit-tqt-1-${POLKITTQT-1_VERSION_MAJOR}.${POLKITTQT-1_VERSION_MINOR}.${POLKITTQT-1_VERSION_PATCH}")
 set(CPACK_SOURCE_IGNORE_FILES "/\\\\.svn/" "/\\\\.git/" "makechangelog")
 
-set(ARCHIVE_NAME ${CPACK_PACKAGE_NAME}-${POLKITQT-1_VERSION_STRING})
+set(ARCHIVE_NAME ${CPACK_PACKAGE_NAME}-${POLKITTQT-1_VERSION_STRING})
 add_custom_target(dist
     COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
         | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2