[Pkg-voip-commits] r1517 - kphone/trunk/debian/patches

Kilian Krause kilian at costa.debian.org
Thu Mar 30 19:16:00 UTC 2006


Author: kilian
Date: 2006-03-30 19:16:00 +0000 (Thu, 30 Mar 2006)
New Revision: 1517

Modified:
   kphone/trunk/debian/patches/gcc4.1.diff
Log:
fix applying of gcc4.1 patch


Modified: kphone/trunk/debian/patches/gcc4.1.diff
===================================================================
--- kphone/trunk/debian/patches/gcc4.1.diff	2006-03-30 11:11:14 UTC (rev 1516)
+++ kphone/trunk/debian/patches/gcc4.1.diff	2006-03-30 19:16:00 UTC (rev 1517)
@@ -1,22 +1,24 @@
---- kphone/kphone/kphoneview.h~      2006-03-20 13:57:59.000000000 +0000
-+++ kphone/kphone/kphoneview.h       2006-03-20 13:58:06.000000000 +0000
+diff -urN kphone-4.2.bak/kphone/kcallwidget.h kphone-4.2/kphone/kcallwidget.h
+--- kphone-4.2.bak/kphone/kcallwidget.h	2005-04-18 16:04:40.000000000 +0300
++++ kphone-4.2/kphone/kcallwidget.h	2006-03-30 22:14:48.000000000 +0300
+@@ -67,7 +67,7 @@
+ 	void clickHangup( void );
+ 	void setHide( void );
+ 	bool isHided( void ) const { return hided; }
+-	void KCallWidget::setDTMFSender( QString &s );
++	void setDTMFSender( QString &s );
+ 
+ public slots:
+ 	void pleaseDial( const SipUri &dialuri );
+diff -urN kphone-4.2.bak/kphone/kphoneview.h kphone-4.2/kphone/kphoneview.h
+--- kphone-4.2.bak/kphone/kphoneview.h	2005-04-18 16:04:40.000000000 +0300
++++ kphone-4.2/kphone/kphoneview.h	2006-03-30 22:14:18.000000000 +0300
 @@ -54,7 +54,7 @@
-        QString getStunSrv( void );
-        void kphoneQuit( void );
-        bool getState( void );
--       KCallWidget *KPhoneView::DoCall( QString num, SipCall::CallType ctype );
-+       KCallWidget *DoCall( QString num, SipCall::CallType ctype );
+ 	QString getStunSrv( void );
+ 	void kphoneQuit( void );
+ 	bool getState( void );
+-	KCallWidget *KPhoneView::DoCall( QString num, SipCall::CallType ctype );
++	KCallWidget *DoCall( QString num, SipCall::CallType ctype );
  
  signals:
-        void stateChanged( void );
---- kphone/kphone/kcallwidget.h~     2006-03-20 13:58:15.000000000 +0000
-+++ kphone/kphone/kcallwidget.h      2006-03-20 13:58:20.000000000 +0000
-@@ -67,7 +67,7 @@
-        void clickHangup( void );
-        void setHide( void );
-        bool isHided( void ) const { return hided; }
--       void KCallWidget::setDTMFSender( QString &s );
-+       void setDTMFSender( QString &s );
- 
- public slots:
-        void pleaseDial( const SipUri &dialuri );
+ 	void stateChanged( void );




More information about the Pkg-voip-commits mailing list