Re: [Tora-develop] Tora cvs and X cut paste.

[Henrik (M. J. <hp...@gl...>]

Sorry, my bad. I simply copied the legacy code from a recent Qt release.=20
Will apply the patch for the next release.

/Mauritz

Volker Goetz wrote:

>-----BEGIN PGP SIGNED MESSAGE-----
>Hash: SHA1
>
>Hi,
>
>Am Montag, 25. August 2003 09:36 schrieb Robert Lindgren:
> =20
>
>>Downloaded tora from cvs during the weekend, compiled without-kde
>>support, but now X cut paste, middleclick-paste doesn't work anymore.
>>It's possible the mark text with the mouse in another app then paste
>>with ctrl-v but not with middlemouse button.
>>   =20
>>
>
>It seems that some old code slipped into CVS since an older patch of me =
was=20
>reverted. You'll find a patch for qtlegacy/qtmultilineedit.cpp against=20
>current CVS attached that fixes the problem.
>
>- --=20
>
>Mit freundlichen Gr=FC=DFen
>
>Volker G=F6tz
>
>- ---------------------------------------------------------------
>section(one               Mail go...@se...
>Dipl.-Inform. Univ.       Web  http://www.sectionone.de/
>Volker G=F6tz               Tel. 0 30 / 40 00 67 9-0
>Rosa-Luxemburg-Stra=DFe 15  Fax  0 30 / 40 00 67 9-15
>10178 Berlin              PGP  4FEB1C34 @ wwwkeys.de.pgp.net
>- ---------------------------------------------------------------
>-----BEGIN PGP SIGNATURE-----
>Version: GnuPG v1.2.2 (GNU/Linux)
>
>iD8DBQE/SxvwWM9gHU/rHDQRAvoaAJ4nM0YvR9/asPjWGW8SWO9bq4iS3wCfQEC6
>s+qNyLoErbZpT6C7QV3p22k=3D
>=3DtDBi
>-----END PGP SIGNATURE-----
> =20
>
>------------------------------------------------------------------------
>
>Index: qtlegacy/qtmultilineedit.cpp
>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>RCS file: /cvsroot/tora/tora/qtlegacy/qtmultilineedit.cpp,v
>retrieving revision 1.6
>diff -u -r1.6 qtmultilineedit.cpp
>--- qtlegacy/qtmultilineedit.cpp	24 Jul 2003 02:26:48 -0000	1.6
>+++ qtlegacy/qtmultilineedit.cpp	26 Aug 2003 08:34:32 -0000
>@@ -1348,7 +1348,7 @@
> 	case Key_Y:
> 	    redo();
> 	    break;
>-#if defined (_WS_WIN_)
>+#if defined (Q_WS_WIN)
> 	case Key_Insert:
> 	    copy();
> #endif
>@@ -1379,7 +1379,7 @@
> 	    end( e->state() & ShiftButton );
> 	    break;
> 	case Key_Delete:
>-#if defined (_WS_WIN_)
>+#if defined (Q_WS_WIN)
> 	    if ( e->state() & ShiftButton ) {
> 		cut();
> 		break;
>@@ -1401,7 +1401,7 @@
> 	case Key_Tab:
> 	    insert( e->text() );
> 	    break;
>-#if defined (_WS_WIN_)
>+#if defined (Q_WS_WIN)
> 	case Key_Insert:
> 	    if ( e->state() & ShiftButton )
> 		paste();
>@@ -2376,13 +2376,13 @@
> 	turnMark( FALSE );
>=20
> #ifndef QT_NO_CLIPBOARD
>-#if defined(_WS_X11_)
>+#if defined(Q_WS_X11)
>     else if ( echoMode() =3D=3D Normal )
> 	copy();
> #endif
>=20
>     if ( e->button() =3D=3D MidButton && !readOnly ) {
>-#if defined(_WS_X11_)
>+#if defined(Q_WS_X11)
> 	paste();		// Will repaint the cursor line.
> #else
> #ifndef QT_NO_COMPAT
>@@ -2845,7 +2845,7 @@
>     turnMark( markDragX !=3D markAnchorX || markDragY !=3D markAnchorY =
);
>=20
> #ifndef QT_NO_CLIPBOARD
>-#if defined(_WS_X11_)
>+#if defined(Q_WS_X11)
>     if ( echoMode() =3D=3D Normal )
> 	copy();
> #endif
>@@ -2876,7 +2876,7 @@
> {
>     QString t =3D markedText();
>     if ( !t.isEmpty() && echoMode() =3D=3D Normal ) {
>-#if defined(_WS_X11_)
>+#if defined(Q_WS_X11)
> 	disconnect( QApplication::clipboard(), SIGNAL(dataChanged()), this, 0)=
;
> #endif
> #if defined(_OS_WIN32_)
>@@ -2924,7 +2924,7 @@
>=20
> void QtMultiLineEdit::clipboardChanged()
> {
>-#if defined(_WS_X11_)
>+#if defined(Q_WS_X11)
>     disconnect( QApplication::clipboard(), SIGNAL(dataChanged()),
> 		this, SLOT(clipboardChanged()) );
>     turnMark( FALSE );
>@@ -4195,7 +4195,7 @@
> 	    switch ( ke->key() ) {
> 	    case Key_A:
> 	    case Key_E:
>-#if defined (_WS_WIN_)
>+#if defined (Q_WS_WIN)
> 	    case Key_Insert:
> #endif
> 	    case Key_X:
> =20
>