summaryrefslogtreecommitdiffstats
path: root/twin/lib
diff options
context:
space:
mode:
Diffstat (limited to 'twin/lib')
-rw-r--r--twin/lib/kcommondecoration.cpp28
-rw-r--r--twin/lib/kdecoration.cpp2
-rw-r--r--twin/lib/kdecoration.h4
3 files changed, 17 insertions, 17 deletions
diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp
index 7d219ae7f..a31471611 100644
--- a/twin/lib/kcommondecoration.cpp
+++ b/twin/lib/kcommondecoration.cpp
@@ -122,8 +122,8 @@ void KCommonDecoration::init()
resetLayout();
- connect(this, TQT_SIGNAL(keepAboveChanged(bool) ), TQT_SLOT(keepAboveChange(bool) ) );
- connect(this, TQT_SIGNAL(keepBelowChanged(bool) ), TQT_SLOT(keepBelowChange(bool) ) );
+ connect(this, TQ_SIGNAL(keepAboveChanged(bool) ), TQ_SLOT(keepAboveChange(bool) ) );
+ connect(this, TQ_SIGNAL(keepBelowChanged(bool) ), TQ_SLOT(keepBelowChange(bool) ) );
updateCaption();
}
@@ -332,9 +332,9 @@ bool KCommonDecoration::isModalSystemNotification()
result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data);
if (result == Success && data != None && format == 32 )
{
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString& s, bool isLeft)
@@ -350,8 +350,8 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
if (!btn) break;
btn->setTipText(i18n("Menu") );
btn->setRealizeButtons(TQt::LeftButton|TQt::RightButton);
- connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()));
- connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased()));
+ connect(btn, TQ_SIGNAL(pressed()), TQ_SLOT(menuButtonPressed()));
+ connect(btn, TQ_SIGNAL(released()), this, TQ_SLOT(menuButtonReleased()));
m_button[MenuButton] = btn;
}
@@ -366,7 +366,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
btn->setTipText(oad?i18n("Not on all desktops"):i18n("On all desktops") );
btn->setToggleButton(true);
btn->setOn( oad );
- connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(toggleOnAllDesktops()));
+ connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(toggleOnAllDesktops()));
m_button[OnAllDesktopsButton] = btn;
}
@@ -377,7 +377,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
btn = createButton(HelpButton);
if (!btn) break;
btn->setTipText(i18n("Help") );
- connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(showContextHelp()));
+ connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(showContextHelp()));
m_button[HelpButton] = btn;
}
@@ -387,7 +387,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
btn = createButton(MinButton);
if (!btn) break;
btn->setTipText(i18n("Minimize") );
- connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(minimize()));
+ connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(minimize()));
m_button[MinButton] = btn;
}
@@ -401,7 +401,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
btn->setTipText(max?i18n("Restore"):i18n("Maximize") );
btn->setToggleButton(true);
btn->setOn( max );
- connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaximize()));
+ connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotMaximize()));
m_button[MaxButton] = btn;
}
@@ -411,7 +411,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
btn = createButton(CloseButton);
if (!btn) break;
btn->setTipText(i18n("Close") );
- connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(closeWindow()));
+ connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(closeWindow()));
m_button[CloseButton] = btn;
}
@@ -424,7 +424,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
btn->setTipText(above?i18n("Do not keep above others"):i18n("Keep above others") );
btn->setToggleButton(true);
btn->setOn( above );
- connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepAbove()));
+ connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepAbove()));
m_button[AboveButton] = btn;
}
@@ -437,7 +437,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
btn->setTipText(below?i18n("Do not keep below others"):i18n("Keep below others") );
btn->setToggleButton(true);
btn->setOn( below );
- connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBelow()));
+ connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepBelow()));
m_button[BelowButton] = btn;
}
@@ -450,7 +450,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString
btn->setTipText(shaded?i18n("Unshade"):i18n("Shade") );
btn->setToggleButton(true);
btn->setOn( shaded );
- connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotShade()));
+ connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotShade()));
m_button[ShadeButton] = btn;
}
diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp
index 622362e9e..b9a8e7a36 100644
--- a/twin/lib/kdecoration.cpp
+++ b/twin/lib/kdecoration.cpp
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqapplication.h>
#include <tdeglobal.h>
#include <assert.h>
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
#include <X11/Xlib.h>
#include <fixx11h.h>
#endif
diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h
index 03e1c863e..03daebc28 100644
--- a/twin/lib/kdecoration.h
+++ b/twin/lib/kdecoration.h
@@ -37,7 +37,7 @@ class KDecorationBridge;
class KDecorationPrivate;
class KDecorationFactory;
-#define KWIN_EXPORT KDE_EXPORT
+#define KWIN_EXPORT TDE_EXPORT
/**
* This class provides a namespace for all decoration related classes.
@@ -659,7 +659,7 @@ class KWIN_EXPORT KDecoration
* This function may be reimplemented to provide custom minimize/restore animations
* The reimplementation is allowed to perform X server grabs if necessary
* (only using the functions provided by this API, no direct Xlib calls), but no
- * futher event processing is allowed (i.e. no kapp->processEvents()).
+ * futher event processing is allowed (i.e. no tdeApp->processEvents()).
* @a False should be returned if the default implementation should be used.
* Note that you should not use this function to force disabling of the animation.
*