Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>pull/16/head
parent
81ede64e3e
commit
09716ffc0e
@ -0,0 +1,81 @@
|
||||
--- a/tqt/pinentrydialog.cpp
|
||||
+++ b/tqt/pinentrydialog.cpp
|
||||
@@ -84,18 +84,18 @@
|
||||
|
||||
_ok->setDefault(true);
|
||||
|
||||
- connect( _ok, SIGNAL( clicked() ),
|
||||
- this, SIGNAL( accepted() ) );
|
||||
- connect( _cancel, SIGNAL( clicked() ),
|
||||
- this, SIGNAL( rejected() ) );
|
||||
- connect( _edit, SIGNAL( textModified(const SecTQString&) ),
|
||||
- this, SLOT( updateQuality(const SecTQString&) ) );
|
||||
- connect (_edit, SIGNAL (backspacePressed()),
|
||||
- this, SLOT (onBackspace ()));
|
||||
- connect (this, SIGNAL (accepted ()),
|
||||
- this, SLOT (accept ()));
|
||||
- connect (this, SIGNAL (rejected ()),
|
||||
- this, SLOT (reject ()));
|
||||
+ connect( _ok, TQ_SIGNAL( clicked() ),
|
||||
+ this, TQ_SIGNAL( accepted() ) );
|
||||
+ connect( _cancel, TQ_SIGNAL( clicked() ),
|
||||
+ this, TQ_SIGNAL( rejected() ) );
|
||||
+ connect( _edit, TQ_SIGNAL( textModified(const SecTQString&) ),
|
||||
+ this, TQ_SLOT( updateQuality(const SecTQString&) ) );
|
||||
+ connect (_edit, TQ_SIGNAL (backspacePressed()),
|
||||
+ this, TQ_SLOT (onBackspace ()));
|
||||
+ connect (this, TQ_SIGNAL (accepted ()),
|
||||
+ this, TQ_SLOT (accept ()));
|
||||
+ connect (this, TQ_SIGNAL (rejected ()),
|
||||
+ this, TQ_SLOT (reject ()));
|
||||
_edit->setFocus();
|
||||
}
|
||||
|
||||
--- a/tqt/secqlineedit.cpp
|
||||
+++ b/tqt/secqlineedit.cpp
|
||||
@@ -1073,10 +1073,10 @@
|
||||
#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
|
||||
}
|
||||
--- a/tqt/secqstring.cpp
|
||||
+++ b/tqt/secqstring.cpp
|
||||
@@ -189,12 +189,12 @@
|
||||
*/
|
||||
|
||||
TQ_EXPORT SecTQStringData *SecTQString::shared_null = 0;
|
||||
-QT_STATIC_CONST_IMPL SecTQString SecTQString::null;
|
||||
-QT_STATIC_CONST_IMPL TQChar TQChar::null;
|
||||
-QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd);
|
||||
-QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderMark((ushort)0xfeff);
|
||||
-QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderSwapped((ushort)0xfffe);
|
||||
-QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0);
|
||||
+const SecTQString SecTQString::null;
|
||||
+const TQChar TQChar::null;
|
||||
+const TQChar TQChar::replacement((ushort)0xfffd);
|
||||
+const TQChar TQChar::byteOrderMark((ushort)0xfeff);
|
||||
+const TQChar TQChar::byteOrderSwapped((ushort)0xfffe);
|
||||
+const TQChar TQChar::nbsp((ushort)0x00a0);
|
||||
|
||||
SecTQStringData* SecTQString::makeSharedNull()
|
||||
{
|
||||
--- a/tqt/secqstring.h
|
||||
+++ b/tqt/secqstring.h
|
||||
@@ -125,7 +125,7 @@
|
||||
|
||||
SecTQString &operator=( const SecTQString & ); // impl-shared copy
|
||||
|
||||
- QT_STATIC_CONST SecTQString null;
|
||||
+ static const SecTQString null;
|
||||
|
||||
bool isNull() const;
|
||||
bool isEmpty() const;
|
@ -1,3 +1,4 @@
|
||||
0001-avoid-self-describing-as-a-beta.patch
|
||||
0002-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch
|
||||
0003-tqt-updates-2023.diff
|
||||
0004-tqt-updates-202404.diff
|
||||
|
Loading…
Reference in new issue