[PATCH] Trying to compile HEAD

Luciano Montanaro konq-e@mail.kde.org
Tue, 17 Dec 2002 12:31:28 +0100


--Boundary-00=_Qsw/9SzVRRW+S4R
Content-Type: Text/Plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Description: clearsigned data
Content-Disposition: inline

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello,
I am trying to have the HEAD-branch konqueror embedded working.
So far I managed to compile a version that crashes soon after starting.
I'll investigate on that later, but I'd like to ease the way for whoever
is trying the same. 
I made a lot of temporary changes that will need lots of cleanup,
however, so I'll send first the "obvious" patches.
Here is the first one, for the dropin/kio SlaveBase:
Add the virtual_hook() function.

- -- 
Luciano Montanaro// My public GPG key can be  /"\ ASCII RIBBON
               \X/ found at wwwkeys.pgp.net   \ /   CAMPAIGN
                                               X  AGAINST HTML 
                                              / \     MAIL
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE9/wsWaeOY6B53J4URAsRuAJ9cWO+SR+u3NdOX2zQVmhoHQw5rcwCfW/Ap
QzK2t3p+mUEwet3kOqoMysk=
=nPgV
-----END PGP SIGNATURE-----

--Boundary-00=_Qsw/9SzVRRW+S4R
Content-Type: text/x-diff;
  charset="us-ascii";
  name="slavebase.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="slavebase.patch"

Index: slavebase.cpp
===================================================================
RCS file: /home/kde/kdenox/konq-embed/dropin/kio/slavebase.cpp,v
retrieving revision 1.29
diff -u -r1.29 slavebase.cpp
--- slavebase.cpp	7 Jun 2002 18:56:15 -0000	1.29
+++ slavebase.cpp	17 Dec 2002 11:14:03 -0000
@@ -538,4 +538,6 @@
     }
 }
 
+void SlaveBase::virtual_hook( int, void* )
+{ /*BASE::virtual_hook( id, data );*/ }
 
Index: slavebase.h
===================================================================
RCS file: /home/kde/kdenox/konq-embed/dropin/kio/slavebase.h,v
retrieving revision 1.17
diff -u -r1.17 slavebase.h
--- slavebase.h	30 Oct 2001 00:17:19 -0000	1.17
+++ slavebase.h	17 Dec 2002 11:14:03 -0000
@@ -119,6 +119,7 @@
 	bool multipleAuthCaching() const { return m_multipleAuthCaching; }
 
     protected:
+        virtual void virtual_hook( int id, void* data );
         QCString mProtocol;
         DCOPClient *m_dcc;
         MetaData mOutgoingMetaData;

--Boundary-00=_Qsw/9SzVRRW+S4R--