summaryrefslogtreecommitdiffstats
path: root/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp')
-rw-r--r--freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp33
1 files changed, 22 insertions, 11 deletions
diff --git a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp
index 4fbca94ab..a95121326 100644
--- a/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp
+++ b/freebsd/dependencies/pinentry-tqt/files/patch-tqt_secqlineedit.cpp
@@ -1,5 +1,5 @@
---- tqt/secqlineedit.cpp.orig 2019-03-06 07:09:48 UTC
-+++ tqt/secqlineedit.cpp
+--- tqt/secqlineedit.cpp.orig 2019-03-06 08:09:48.000000000 +0100
++++ tqt/secqlineedit.cpp 2024-04-14 19:43:21.398488000 +0200
@@ -86,7 +86,7 @@
#include "ntqaccessible.h"
#endif
@@ -9,7 +9,7 @@
#include "ntqkeysequence.h"
#define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
#else
-@@ -235,7 +235,7 @@ struct SecTQLineEditPrivate : public TQt
+@@ -235,7 +235,7 @@
inline bool hasSelectedText() const { return !text.isEmpty() && selend > selstart; }
inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; }
void removeSelectedText();
@@ -18,7 +18,7 @@
void copy( bool clipboard = TRUE ) const;
#endif
inline bool inSelection( int x ) const
-@@ -1018,14 +1018,14 @@ bool SecTQLineEdit::isReadOnly() const
+@@ -1018,14 +1018,14 @@
void SecTQLineEdit::setReadOnly( bool enable )
{
d->readOnly = enable;
@@ -35,7 +35,18 @@
/*!
Copies the selected text to the clipboard and deletes it, if there
is any, and if echoMode() is \c Normal.
-@@ -1081,7 +1081,7 @@ void SecTQLineEditPrivate::copy( bool clipboard ) cons
+@@ -1073,15 +1073,15 @@
+ #ifndef SECURE
+ TQString t = q->selectedText();
+ if ( !t.isEmpty() && echoMode == SecTQLineEdit::Normal ) {
+- q->disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), q, 0);
++ q->disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), q, 0);
+ TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection );
+- q->connect( TQApplication::clipboard(), SIGNAL(selectionChanged()),
+- q, SLOT(clipboardChanged()) );
++ q->connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()),
++ q, TQ_SLOT(clipboardChanged()) );
+ }
#endif
}
@@ -44,7 +55,7 @@
/*!\reimp
*/
-@@ -1177,7 +1177,7 @@ void SecTQLineEdit::mousePressEvent( TQMouseEvent* e )
+@@ -1177,7 +1177,7 @@
void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e )
{
@@ -53,7 +64,7 @@
if ( ( e->state() & MouseButtonMask ) == 0 ) {
if ( !d->readOnly )
setCursor( ( d->inSelection( e->pos().x() ) ? arrowCursor : ibeamCursor ) );
-@@ -1193,7 +1193,7 @@ void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e )
+@@ -1193,7 +1193,7 @@
*/
void SecTQLineEdit::mouseReleaseEvent( TQMouseEvent* e )
{
@@ -62,7 +73,7 @@
if (TQApplication::clipboard()->supportsSelection() ) {
if ( e->button() == LeftButton ) {
d->copy( FALSE );
-@@ -1286,7 +1286,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
+@@ -1286,7 +1286,7 @@
case Key_B:
cursorForward( e->state() & ShiftButton, -1 );
break;
@@ -71,7 +82,7 @@
case Key_C:
copy();
break;
-@@ -1322,7 +1322,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
+@@ -1322,7 +1322,7 @@
clear();
break;
#endif
@@ -80,7 +91,7 @@
case Key_V:
if ( !d->readOnly )
paste();
-@@ -1431,7 +1431,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
+@@ -1431,7 +1431,7 @@
if ( !d->readOnly )
undo();
break;
@@ -89,7 +100,7 @@
case Key_F16: // Copy key on Sun keyboards
copy();
break;
-@@ -1720,7 +1720,7 @@ void SecTQLineEdit::clipboardChanged()
+@@ -1720,7 +1720,7 @@
void SecTQLineEditPrivate::init( const SecTQString& txt )
{