From kde-commits  Sun Aug 07 04:42:29 2011
From: Jeremy Paul Whiting <jpwhiting () kde ! org>
Date: Sun, 07 Aug 2011 04:42:29 +0000
To: kde-commits
Subject: KDE/kdenetwork/kopete/libkopete
Message-Id: <20110807044229.97CF4AC873 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=131269218107434

SVN commit 1245294 by whiting:

Don't virtually inherit QObject anymore.
Fix kopete so it builds with Qt 4.8.


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


--- trunk/KDE/kdenetwork/kopete/libkopete/kopetepassword.cpp #1245293:1245294
@@ -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 #1245293:1245294
@@ -183,9 +183,12 @@
  * @internal
  * @see KopetePassword
  */
-class KopetePasswordRequestBase : public virtual QObject
+class KopetePasswordRequestBase : public QObject
 {
 	Q_OBJECT
+public:
+    KopetePasswordRequestBase(QObject *parent)
+        :QObject(parent) {};
 signals:
 	void requestFinished( const QString &password );
 public slots: