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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/libkopete
From:       Roman Jarosz <kedgedev () centrum ! cz>
Date:       2008-02-05 22:33:55
Message-ID: 1202250835.270724.23139.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 771428 by rjarosz:

Fix compilation on Win/Mac and GCC 3.
Please test it.



 M  +38 -36    kopeteonlinestatus.cpp  
 M  +1 -0      kopeteonlinestatusmanager.h  


--- trunk/KDE/kdenetwork/kopete/libkopete/kopeteonlinestatus.cpp #771427:771428
@@ -33,8 +33,44 @@
 #include <QIconEngineV2>
 #include <QPainter>
 
+namespace Kopete
+{
 
+class OnlineStatusIconEngine : public QIconEngineV2
+{
+public:
+	OnlineStatusIconEngine( const OnlineStatus &s , const QString& i,
+	                        const QColor &c, bool _idle )
+		: status(s) , icon(i), color(c), idle(_idle) {}
 
+	virtual QIconEngineV2 *clone() const
+	{ return new OnlineStatusIconEngine(status,icon,color,idle); }
+
+	virtual QString key () const
+	{ return OnlineStatusManager::self()->fingerprint( status, icon, 0, color, idle ); \
} +
+	QPixmap pixmap ( const QSize & size, QIcon::Mode mode, QIcon::State state )
+	{
+		const int iconSize = qMin(size.width(), size.height());
+		QIcon i(OnlineStatusManager::self()->cacheLookupByObject( status, icon, iconSize, \
color, idle )); +		return i.pixmap(size, mode, state);
+	}
+
+	void paint( QPainter * painter, const QRect & rect, QIcon::Mode mode, QIcon::State \
state ) +	{
+		QPixmap pix = pixmap(rect.size() , mode, state);
+		painter->drawPixmap(rect, pix);
+	}
+
+private:
+	OnlineStatus status;
+	QString icon;
+	QColor color;
+	bool idle;
+};
+
+}
+
 using namespace Kopete;
 
 class OnlineStatus::Private
@@ -56,40 +92,6 @@
 	{
 		return protocol ?  protocol->pluginIcon() : QString::fromLatin1( "unknown" );
 	}
-	
-	class OnlineStatusIconEngine : public QIconEngineV2
-	{
-	public:
-		OnlineStatusIconEngine( const OnlineStatus &s , const QString& i,
-				const QColor &c, bool _idle)
-			: status(s) , icon(i), color(c), idle(_idle) {}
-		
-		virtual QIconEngineV2 *clone() const
-		{ return new OnlineStatusIconEngine(status,icon,color,idle); }
-		
-		virtual QString key () const
-		{ return OnlineStatusManager::self()->fingerprint( status, icon, 0, color, idle ); \
                }
-		
-		QPixmap pixmap ( const QSize & size, QIcon::Mode mode, QIcon::State state ) 
-		{ 
-			const int iconSize = qMin(size.width(), size.height());
-			QIcon i(OnlineStatusManager::self()->cacheLookupByObject( status, icon, iconSize, \
                color, idle ));
-			return i.pixmap(size, mode, state);
-		}
-		
-		void paint( QPainter * painter, const QRect & rect, QIcon::Mode mode, QIcon::State \
                state )
-		{
-			QPixmap pix = pixmap(rect.size() , mode, state);
-			painter->drawPixmap(rect, pix);
-		}
-		
-	private:
-		OnlineStatus status;
-		QString icon;
-		QColor color;
-		bool idle;
-	};
-
 };
 
 /**
@@ -295,7 +297,7 @@
 		iconName = contact->account()->customIcon();
 	if ( iconName.isNull() )
 		iconName = d->protocolIcon();
-	return QIcon(new Private::OnlineStatusIconEngine( *this, iconName, 
+	return QIcon(new OnlineStatusIconEngine( *this, iconName,
 		     contact->account()->color(), contact->idleTime() >= 10*60));
 }
 
@@ -318,7 +320,7 @@
 	QString iconName = account->customIcon();
 	if ( iconName.isNull() )
 		iconName = d->protocolIcon();
-	return QIcon(new Private::OnlineStatusIconEngine(*this, iconName, \
account->color(),false)); +	return QIcon(new OnlineStatusIconEngine(*this, iconName, \
account->color(),false));  
 }
 
--- trunk/KDE/kdenetwork/kopete/libkopete/kopeteonlinestatusmanager.h #771427:771428
@@ -122,6 +122,7 @@
 
 private:
 	friend class OnlineStatus;
+	friend class OnlineStatusIconEngine;
 	QPixmap cacheLookupByObject( const OnlineStatus &statusFor, const QString& icon, \
int size, QColor color, bool idle = false);  QPixmap cacheLookupByMimeSource( const \
QString &mimeSource );  QString fingerprint( const OnlineStatus &statusFor, const \
QString& icon, int size, QColor color, bool idle = false);


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