summaryrefslogtreecommitdiffstats
path: root/tdeui/tdemenubar.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-02-13 11:10:37 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-02-15 10:21:34 +0900
commit03aa7238b34bb438632b6d572b008e32960f0895 (patch)
tree11395aba8fd4cb1f52f0a831c61febf61337dab7 /tdeui/tdemenubar.cpp
parent15d75fb42da10a93a9c371fea8eb0baf281e0d44 (diff)
downloadtdelibs-03aa7238b34bb438632b6d572b008e32960f0895.tar.gz
tdelibs-03aa7238b34bb438632b6d572b008e32960f0895.zip
Replace Q_WS_* defines with TQ_WS_* equivalents
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdeui/tdemenubar.cpp')
-rw-r--r--tdeui/tdemenubar.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp
index eba259b28..e7c901d56 100644
--- a/tdeui/tdemenubar.cpp
+++ b/tdeui/tdemenubar.cpp
@@ -40,7 +40,7 @@
#include <kdebug.h>
#include <kmanagerselection.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include <twin.h>
#include <twinmodule.h>
#include <qxembed.h>
@@ -74,7 +74,7 @@ public:
: forcedTopLevel( false ),
topLevel( false ),
wasTopLevel( false ),
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
selection( NULL ),
#endif
min_size( 0, 0 )
@@ -82,7 +82,7 @@ public:
}
~KMenuBarPrivate()
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
delete selection;
#endif
}
@@ -93,7 +93,7 @@ public:
int lineWidth; // dtto
int margin; // dtto
bool fallback_mode; // dtto
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TDESelectionWatcher* selection;
#endif
TQTimer selection_timer;
@@ -101,7 +101,7 @@ public:
static Atom makeSelectionAtom();
};
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
static Atom selection_atom = None;
static Atom msg_type_atom = None;
@@ -121,7 +121,7 @@ void initAtoms()
Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom()
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if( selection_atom == None )
initAtoms();
return selection_atom;
@@ -133,7 +133,7 @@ Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom()
KMenuBar::KMenuBar(TQWidget *parent, const char *name)
: TQMenuBar(parent, name)
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
QXEmbed::initialize();
#endif
d = new KMenuBarPrivate;
@@ -176,7 +176,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
d->topLevel = top_level;
if ( isTopLevelMenu() )
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
d->selection = new TDESelectionWatcher( KMenuBarPrivate::makeSelectionAtom(),
DefaultScreen( tqt_xdisplay()));
connect( d->selection, TQ_SIGNAL( newOwner( Window )),
@@ -190,7 +190,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
d->fallback_mode = false;
bool wasShown = !isHidden();
reparent( parentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
KWin::setType( winId(), NET::TopMenu );
if( parentWidget())
XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
@@ -206,7 +206,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
show();
} else
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
delete d->selection;
d->selection = NULL;
#endif
@@ -259,7 +259,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
}
if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent )
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
#else
//TODO: WIN32?
@@ -270,7 +270,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
{ // if the parent is not toplevel, KMenuBar needs to match its visibility status
if( ev->type() == TQEvent::Show )
{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
#else
//TODO: WIN32?
@@ -303,7 +303,7 @@ void KMenuBar::updateFallbackSize()
{
if( !d->topLevel )
return;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if( d->selection->owner() != None )
#endif
{ // somebody is managing us, don't mess anything, undo changes
@@ -340,7 +340,7 @@ void KMenuBar::selectionTimeout()
int margin = 0;
move(area.left() - margin, area.top() - margin);
setFixedSize(area.width() + 2* margin , heightForWidth( area.width() + 2 * margin ) );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
int strut_height = height() - margin;
if( strut_height < 0 )
strut_height = 0;
@@ -426,7 +426,7 @@ TQSize KMenuBar::sizeHint() const
return TQSize( w, h );
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
bool KMenuBar::x11Event( XEvent* ev )
{
if( ev->type == ClientMessage && ev->xclient.message_type == msg_type_atom