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

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

SVN commit 1242963 by rkcosta:

Revert the non-CMake parts of r1242962.

*sigh* Only the changes to cmake/modules were supposed to go in, these
 ones still need more investigation.



 M  +1 -1      kopetepassword.cpp  
 M  +1 -3      kopetepassword.h  


--- trunk/KDE/kdenetwork/kopete/libkopete/kopetepassword.cpp #1242962:1242963
@@ -77,7 +77,7 @@
 {
 public:
 	KopetePasswordRequest( QObject *owner, Kopete::Password &pass )
-	 : KopetePasswordRequestBase( owner ), mPassword( pass ), mWallet( 0 )
+	 : QObject( owner ), mPassword( pass ), mWallet( 0 )
 	{
 	}
 
--- trunk/KDE/kdenetwork/kopete/libkopete/kopetepassword.h #1242962:1242963
@@ -183,11 +183,9 @@
  * @internal
  * @see KopetePassword
  */
-class KopetePasswordRequestBase : public QObject
+class KopetePasswordRequestBase : public virtual 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]