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

List:       kde-commits
Subject:    branches/work/kde4/kdebase/kdcop
From:       Wilco Greven <greven () kde ! org>
Date:       2005-05-20 8:44:00
Message-ID: 1116578640.072461.15520.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 416009 by wgreven:

Change replyType type back to DCOPCString.


 M  +2 -2      branches/work/kde4/kdebase/kdcop/kdcoplistview.h  
 M  +5 -5      branches/work/kde4/kdebase/kdcop/kdcopwindow.cpp  


--- branches/work/kde4/kdebase/kdcop/kdcoplistview.h #416008:416009
@@ -71,8 +71,8 @@
   /**
    * Theses two slots are used to get the icon of the application
    */
-    void retrieveIcon(int callId, const QByteArray& replyType, const QByteArray \
                &replyData);
-    void slotGotWindowName(int callId, const QByteArray& replyType, const QByteArray \
&replyData); +    void retrieveIcon(int callId, const DCOPCString& replyType, const \
QByteArray &replyData); +    void slotGotWindowName(int callId, const DCOPCString& \
replyType, const QByteArray &replyData);  };
 
 class DCOPBrowserInterfaceItem : public QObject, public DCOPBrowserItem
--- branches/work/kde4/kdebase/kdcop/kdcopwindow.cpp #416008:416009
@@ -137,7 +137,7 @@
 	QString mainWindowName= rx.cap(1) + "-mainwindow#1" ;
 
 	QByteArray data;
-	int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", \
data, this, SLOT(retrieveIcon(int, const QByteArray&, const QByteArray&))); +	int \
callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, \
this, SLOT(retrieveIcon(int, const DCOPCString&, const QByteArray&)));  
 	if(!callId)
 	{
@@ -146,7 +146,7 @@
 		QDataStream arg(&data, QIODevice::WriteOnly);
 		arg << Q3CString( "MainWindow" );
 
-		kapp->dcopClient()->callAsync( app_, "qt", "find(QCString)", data, this, \
SLOT(slotGotWindowName(int, const QByteArray&, const QByteArray& ))); \
+		kapp->dcopClient()->callAsync( app_, "qt", "find(QCString)", data, this, \
SLOT(slotGotWindowName(int, const DCOPCString&, const QByteArray& )));  }
 }
 
@@ -183,7 +183,7 @@
   KApplication::restoreOverrideCursor();
 }
 
-void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const QByteArray& \
/*replyType*/, const QByteArray &replyData) +void \
DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const DCOPCString& \
/*replyType*/, const QByteArray &replyData)  {
 	QDataStream reply(replyData);
         /*
@@ -197,13 +197,13 @@
 		{
 			QByteArray data;
 			kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data,
-				this, SLOT(retrieveIcon(int, const QByteArray&, const QByteArray&)));
+				this, SLOT(retrieveIcon(int, const DCOPCString&, const QByteArray&)));
 		}
 	}
         */
 }
 
-void DCOPBrowserApplicationItem::retrieveIcon(int /*callId*/,const \
QByteArray&/*replyType*/, const QByteArray &replyData) +void \
DCOPBrowserApplicationItem::retrieveIcon(int /*callId*/,const \
DCOPCString&/*replyType*/, const QByteArray &replyData)  {
 	QDataStream reply(replyData);
 	QPixmap returnQPixmap;


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