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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/libkopete
From:       Jeremy Paul Whiting <jpwhiting () kde ! org>
Date:       2011-08-07 4:42:29
Message-ID: 20110807044229.97CF4AC873 () svn ! kde ! org
[Download RAW message or body]

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:
[prev in list] [next in list] [prev in thread] [next in thread]