You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
100 lines
3.8 KiB
100 lines
3.8 KiB
--- 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))
|
|
{
|