Compare commits
2 Commits
fb45ef444e
...
09716ffc0e
Author | SHA1 | Date |
---|---|---|
Michele Calgaro | 09716ffc0e | 6 months ago |
Michele Calgaro | 81ede64e3e | 6 months ago |
@ -0,0 +1,99 @@
|
||||
--- a/tde/window-decorator/decorator.cpp
|
||||
+++ b/tde/window-decorator/decorator.cpp
|
||||
@@ -308,17 +308,17 @@
|
||||
mDecorActive = new KWD::Window (mCompositeWindow, tqt_xrootwin (),
|
||||
0, Window::DefaultActive);
|
||||
|
||||
- connect (mKWinModule, SIGNAL (windowAdded (WId)),
|
||||
- SLOT (handleWindowAdded (WId)));
|
||||
- connect (mKWinModule, SIGNAL (windowRemoved (WId)),
|
||||
- SLOT (handleWindowRemoved (WId)));
|
||||
- connect (mKWinModule, SIGNAL (activeWindowChanged (WId)),
|
||||
- SLOT (handleActiveWindowChanged (WId)));
|
||||
+ connect (mKWinModule, TQ_SIGNAL (windowAdded (WId)),
|
||||
+ TQ_SLOT (handleWindowAdded (WId)));
|
||||
+ connect (mKWinModule, TQ_SIGNAL (windowRemoved (WId)),
|
||||
+ TQ_SLOT (handleWindowRemoved (WId)));
|
||||
+ connect (mKWinModule, TQ_SIGNAL (activeWindowChanged (WId)),
|
||||
+ TQ_SLOT (handleActiveWindowChanged (WId)));
|
||||
connect (mKWinModule,
|
||||
- SIGNAL (windowChanged (WId, const unsigned long *)),
|
||||
- SLOT (handleWindowChanged (WId, const unsigned long *)));
|
||||
+ TQ_SIGNAL (windowChanged (WId, const unsigned long *)),
|
||||
+ TQ_SLOT (handleWindowChanged (WId, const unsigned long *)));
|
||||
|
||||
- connect (&mIdleTimer, SIGNAL (timeout ()), SLOT (processDamage ()));
|
||||
+ connect (&mIdleTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (processDamage ()));
|
||||
|
||||
mActiveId = mKWinModule->activeWindow ();
|
||||
|
||||
@@ -326,7 +326,7 @@
|
||||
for (; it != mKWinModule->windows ().end (); it++)
|
||||
handleWindowAdded ((*it));
|
||||
|
||||
- connect (this, SIGNAL (appearanceChanged ()), SLOT (reconfigure ()));
|
||||
+ connect (this, TQ_SIGNAL (appearanceChanged ()), TQ_SLOT (reconfigure ()));
|
||||
|
||||
(void) TQApplication::desktop (); // trigger creation of desktop widget
|
||||
|
||||
--- a/tde/window-decorator/window.cpp
|
||||
+++ b/tde/window-decorator/window.cpp
|
||||
@@ -345,8 +345,8 @@
|
||||
mAdvancedMenu->setCheckable (true);
|
||||
mAdvancedMenu->setFont (TDEGlobalSettings::menuFont ());
|
||||
|
||||
- connect (mAdvancedMenu, SIGNAL (activated (int)),
|
||||
- SLOT (handlePopupActivated (int)));
|
||||
+ connect (mAdvancedMenu, TQ_SIGNAL (activated (int)),
|
||||
+ TQ_SLOT (handlePopupActivated (int)));
|
||||
|
||||
mAdvancedMenu->insertItem (SmallIconSet ("up"),
|
||||
i18n ("Keep &Above Others"),
|
||||
@@ -364,8 +364,8 @@
|
||||
mDesktopMenu->setCheckable (true);
|
||||
mDesktopMenu->setFont (TDEGlobalSettings::menuFont ());
|
||||
|
||||
- connect (mDesktopMenu, SIGNAL (activated (int)),
|
||||
- SLOT (handleDesktopPopupActivated (int)));
|
||||
+ connect (mDesktopMenu, TQ_SIGNAL (activated (int)),
|
||||
+ TQ_SLOT (handleDesktopPopupActivated (int)));
|
||||
|
||||
mPopup->insertItem (i18n ("To &Desktop"), mDesktopMenu, Options::NoOp);
|
||||
|
||||
@@ -373,8 +373,8 @@
|
||||
mViewportMenu->setCheckable (true);
|
||||
mViewportMenu->setFont (TDEGlobalSettings::menuFont ());
|
||||
|
||||
- connect (mViewportMenu, SIGNAL (activated (int)),
|
||||
- SLOT (handleViewportPopupActivated (int)));
|
||||
+ connect (mViewportMenu, TQ_SIGNAL (activated (int)),
|
||||
+ TQ_SLOT (handleViewportPopupActivated (int)));
|
||||
|
||||
viewportMenuID = mPopup->insertItem (i18n ("To &Viewport"), mViewportMenu);
|
||||
|
||||
@@ -391,10 +391,10 @@
|
||||
mPopup->insertItem (SmallIconSet ("fileclose"), i18n ("&Close"),
|
||||
Options::CloseOp);
|
||||
|
||||
- connect (mPopup, SIGNAL (aboutToShow ()),
|
||||
- SLOT (handlePopupAboutToShow ()));
|
||||
- connect (mPopup, SIGNAL (activated (int)),
|
||||
- SLOT (handlePopupActivated (int)));
|
||||
+ connect (mPopup, TQ_SIGNAL (aboutToShow ()),
|
||||
+ TQ_SLOT (handlePopupAboutToShow ()));
|
||||
+ connect (mPopup, TQ_SIGNAL (activated (int)),
|
||||
+ TQ_SLOT (handlePopupActivated (int)));
|
||||
}
|
||||
|
||||
mPopup->exec (pos);
|
||||
@@ -2148,8 +2148,8 @@
|
||||
"--wid" << TQCString ().setNum (mClientId) <<
|
||||
"--timestamp" << TQCString ().setNum (timestamp);
|
||||
|
||||
- connect (mProcessKiller, SIGNAL (processExited (TDEProcess *)),
|
||||
- SLOT (handleProcessKillerExited ()));
|
||||
+ connect (mProcessKiller, TQ_SIGNAL (processExited (TDEProcess *)),
|
||||
+ TQ_SLOT (handleProcessKillerExited ()));
|
||||
|
||||
if (!mProcessKiller->start (TDEProcess::NotifyOnExit))
|
||||
{
|
@ -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