[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete
From:       Raphael Kubo da Costa <kubito () gmail ! com>
Date:       2011-07-24 16:42:42
Message-ID: 20110724164242.B9C53AC74F () svn ! kde ! org
[Download RAW message or body]

SVN commit 1242962 by rkcosta:

FindIDN: Do not rely on pkg-config.

Make the file up-to-date with our current practices by using
FindPackageHandleStandardArgs and not relying on pkg-config (ie. we
always use find_path and find_libraries and use pkg-config's output
only as hints).



 M  +15 -28    cmake/modules/FindIDN.cmake  
 M  +1 -1      libkopete/kopetepassword.cpp  
 M  +3 -1      libkopete/kopetepassword.h  


--- trunk/KDE/kdenetwork/kopete/cmake/modules/FindIDN.cmake #1242961:1242962
@@ -6,42 +6,29 @@
 #  IDN_DEFINITIONS - Compiler swithces required for using IDN
 
 # Copyright (c) 2006, Will Stephenson <wstephenson@kde.org>
+# Copyright (c) 2011, Raphael Kubo da Costa <kubito@gmail.com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-if (IDN_INCLUDE_DIR AND IDN_LIBRARIES)
-    # cached
-    set(IDN_FOUND TRUE)
-else (IDN_INCLUDE_DIR AND IDN_LIBRARIES)
     if (NOT WIN32)
         find_package(PkgConfig)
-        if(PKG_CONFIG_EXECUTABLE)
-            pkg_check_modules(IDN libidn)
-        endif(PKG_CONFIG_EXECUTABLE)
+	pkg_check_modules(PC_IDN libidn)
+	set(IDN_DEFINITIONS ${PC_IDN_CFLAGS_OTHER})
     endif (NOT WIN32)
 
-    if(NOT IDN_FOUND)
-        find_path(IDN_INCLUDEDIR idna.h)
-        find_library(IDN_LIBRARIES NAMES idn libidn idn-11 libidn-11)
-        if (IDN_INCLUDEDIR AND IDN_LIBRARIES)
-            SET(IDN_FOUND TRUE)
-        endif (IDN_INCLUDEDIR AND IDN_LIBRARIES)
-    endif(NOT IDN_FOUND)
+find_path(IDN_INCLUDE_DIR idna.h
+    HINTS
+    ${PC_IDN_INCLUDEDIR}
+    ${PC_IDN_INCLUDE_DIRS}
+)
 
-    if(IDN_FOUND)
-        set(IDN_DEFINITIONS ${IDN_CFLAGS})
-        if(NOT IDN_FIND_QUIETLY)
-            message(STATUS "Found libidn: ${IDN_LIBRARIES}")
-        endif(NOT IDN_FIND_QUIETLY)
-        set(IDN_INCLUDE_DIR ${IDN_INCLUDEDIR} CACHE PATH "Include directory for using the IDN library")
-    else(IDN_FOUND)
-        if (IDN_FIND_REQUIRED)
-            message(FATAL_ERROR "Not found required libidn")
-        endif (IDN_FIND_REQUIRED)
-    endif(IDN_FOUND)
+find_library(IDN_LIBRARIES
+    NAMES idn libidn idn-11 libidn-11
+	HINTS ${PC_IDN_LIBDIR} ${PC_IDN_LIBRARY_DIRS}
+)
 
-    mark_as_advanced( IDN_INCLUDE_DIR  IDN_LIBRARIES )
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(IDN REQUIRED_VARS IDN_LIBRARIES IDN_INCLUDE_DIR)
 
-endif (IDN_INCLUDE_DIR AND IDN_LIBRARIES)
-
+mark_as_advanced(IDN_INCLUDE_DIR IDN_LIBRARIES)
--- trunk/KDE/kdenetwork/kopete/libkopete/kopetepassword.cpp #1242961:1242962
@@ -77,7 +77,7 @@
 {
 public:
 	KopetePasswordRequest( QObject *owner, Kopete::Password &pass )
-	 : QObject( owner ), mPassword( pass ), mWallet( 0 )
+	 : KopetePasswordRequestBase( owner ), mPassword( pass ), mWallet( 0 )
 	{
 	}
 
--- trunk/KDE/kdenetwork/kopete/libkopete/kopetepassword.h #1242961:1242962
@@ -183,9 +183,11 @@
  * @internal
  * @see KopetePassword
  */
-class KopetePasswordRequestBase : public virtual QObject
+class KopetePasswordRequestBase : public QObject
 {
 	Q_OBJECT
+public:
+	KopetePasswordRequestBase( QObject *parent = 0 ) : QObject( parent ) {}
 signals:
 	void requestFinished( const QString &password );
 public slots:
[prev in list] [next in list] [prev in thread] [next in thread]