summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/ntqmenubar.h4
-rw-r--r--src/widgets/ntqpopupmenu.h2
-rw-r--r--src/widgets/ntqwidgetplugin.h2
-rw-r--r--src/widgets/qcheckbox.cpp2
-rw-r--r--src/widgets/qcombobox.cpp4
-rw-r--r--src/widgets/qdatetimeedit.cpp8
-rw-r--r--src/widgets/qdockwindow.cpp16
-rw-r--r--src/widgets/qeffects.cpp12
-rw-r--r--src/widgets/qiconview.cpp8
-rw-r--r--src/widgets/qlineedit.cpp20
-rw-r--r--src/widgets/qmainwindow.cpp8
-rw-r--r--src/widgets/qmenubar.cpp32
-rw-r--r--src/widgets/qpopupmenu.cpp14
-rw-r--r--src/widgets/qradiobutton.cpp2
-rw-r--r--src/widgets/qscrollview.cpp4
-rw-r--r--src/widgets/qsplashscreen.cpp2
-rw-r--r--src/widgets/qtabbar.cpp6
-rw-r--r--src/widgets/qtextedit.cpp28
-rw-r--r--src/widgets/qtitlebar.cpp8
-rw-r--r--src/widgets/qtooltip.cpp10
-rw-r--r--src/widgets/qwhatsthis.cpp14
-rw-r--r--src/widgets/qwidgetresizehandler.cpp4
22 files changed, 105 insertions, 105 deletions
diff --git a/src/widgets/ntqmenubar.h b/src/widgets/ntqmenubar.h
index 5212ca520..01b5c184c 100644
--- a/src/widgets/ntqmenubar.h
+++ b/src/widgets/ntqmenubar.h
@@ -86,7 +86,7 @@ public:
void activateItemAt( int index );
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
static void initialize();
static void cleanup();
#endif
@@ -160,7 +160,7 @@ private:
friend class TQPopupMenu;
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
friend class TQWidget;
friend class TQApplication;
friend void qt_mac_set_modal_state(bool, TQMenuBar *);
diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/ntqpopupmenu.h
index 04ae7db85..5e1a396dc 100644
--- a/src/widgets/ntqpopupmenu.h
+++ b/src/widgets/ntqpopupmenu.h
@@ -165,7 +165,7 @@ private:
TQAccel *autoaccel;
#endif
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
bool macPopupMenu(const TQPoint &, int);
uint mac_dirty_popup : 1;
#endif
diff --git a/src/widgets/ntqwidgetplugin.h b/src/widgets/ntqwidgetplugin.h
index 16c24eb26..cd40860d3 100644
--- a/src/widgets/ntqwidgetplugin.h
+++ b/src/widgets/ntqwidgetplugin.h
@@ -48,7 +48,7 @@
#endif // QT_H
#ifndef TQT_NO_WIDGETPLUGIN
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#ifdef QT_PLUGIN
#define QT_WIDGET_PLUGIN_EXPORT __declspec(dllexport)
#else
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index 0d6fdfa48..970ed5785 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -193,7 +193,7 @@ void TQCheckBox::drawButton( TQPainter *paint )
TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_CheckBoxIndicator, this), this );
const TQColorGroup &cg = colorGroup();
-#if !defined( TQT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX )
+#if !defined( TQT_NO_TEXTSTREAM ) && !defined( TQ_WS_MACX )
# define SAVE_CHECKBOX_PIXMAPS
#endif
#if defined(SAVE_CHECKBOX_PIXMAPS)
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index b75d23ed8..213ba4b91 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -444,7 +444,7 @@ void TQComboBoxData::setListBox( TQListBox *l )
lBox = l;
usingLBox = TRUE;
l->setMouseTracking( TRUE );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
l->x11SetWindowType( TQWidget::X11WindowTypeCombo );
l->x11SetWindowTransient( combo->topLevelWidget());
#endif
@@ -455,7 +455,7 @@ void TQComboBoxData::setPopupMenu( TQComboBoxPopup * pm, bool isPopup )
pop = pm;
if(isPopup)
usingLBox = FALSE;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
if( pm ) {
pm->x11SetWindowType( TQWidget::X11WindowTypeCombo );
pm->x11SetWindowTransient( combo->topLevelWidget());
diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp
index 6454bdf49..0084be77d 100644
--- a/src/widgets/qdatetimeedit.cpp
+++ b/src/widgets/qdatetimeedit.cpp
@@ -52,7 +52,7 @@
#include "ntqstring.h"
#include "ntqstyle.h"
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#endif
@@ -111,7 +111,7 @@ static void readLocaleSettings()
lDateSep = new TQString();
lTimeSep = new TQString();
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
QT_WA( {
TCHAR data[10];
GetLocaleInfo( LOCALE_USER_DEFAULT, LOCALE_SDATE, data, 10 );
@@ -170,7 +170,7 @@ static void readLocaleSettings()
// this code needs to change if new formats are added
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
TQString sep = d.mid( TQMIN( dpos, mpos ) + 2, TQABS( dpos - mpos ) - 2 );
if ( d.contains( sep ) == 2 ) {
*lDateSep = sep;
@@ -178,7 +178,7 @@ static void readLocaleSettings()
#endif
}
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
TQString t = TQTime( 11, 22, 33 ).toString( TQt::LocalDate );
dpos = t.find( "11" );
mpos = t.find( "22" );
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 93823706f..e889e5a4d 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -57,10 +57,10 @@
#include "ntqcursor.h"
#include "ntqstyle.h"
-#if defined(Q_WS_MAC9)
+#if defined(TQ_WS_MAC9)
#define MAC_DRAG_HACK
#endif
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
static bool default_opaque = TRUE;
#else
static bool default_opaque = FALSE;
@@ -393,7 +393,7 @@ TQDockWindowHandle::TQDockWindowHandle( TQDockWindow *dw )
ctrlDown = FALSE;
timer = new TQTimer( this );
connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( minimize() ) );
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
setCursor( SizeAllCursor );
#endif
}
@@ -476,7 +476,7 @@ void TQDockWindowHandle::mouseReleaseEvent( TQMouseEvent *e )
return;
dockWindow->endRectDraw( !opaque );
mousePressed = FALSE;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
releaseMouse();
#endif
if ( !hadDblClick && offset == e->pos() ) {
@@ -613,7 +613,7 @@ void TQDockWindowTitleBar::mousePressEvent( TQMouseEvent *e )
oldFocus = tqApp->focusWidget();
// setFocus activates the window, which deactivates the main window
// not what we want, and not required anyway on Windows
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
setFocus();
#endif
@@ -631,7 +631,7 @@ void TQDockWindowTitleBar::mousePressEvent( TQMouseEvent *e )
dockWindow->startRectDraw( mapToGlobal( e->pos() ), !opaque );
// grabMouse resets the Windows mouse press count, so we never receive a double click on Windows
// not required on Windows, and did work on X11, too, but no problem there in the first place
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
if(!oldPressed && dockWindow->opaqueMoving())
grabMouse();
#else
@@ -1271,7 +1271,7 @@ void TQDockWindow::updateGui()
verHandle->show();
else
verHandle->hide();
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if(horHandle->mousePressed) {
horHandle->mousePressed = FALSE;
verHandle->mousePressed = TRUE;
@@ -1285,7 +1285,7 @@ void TQDockWindow::updateGui()
else
horHandle->hide();
horHandle->updateGui();
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if(verHandle->mousePressed) {
verHandle->mousePressed = FALSE;
horHandle->mousePressed = TRUE;
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index d14164831..ddf0dd70b 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -109,7 +109,7 @@ TQAlphaWidget::TQAlphaWidget( TQWidget* w, WFlags f )
: TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)),
"qt internal alpha effect widget", f )
{
-#if 1 //ndef Q_WS_WIN
+#if 1 //ndef TQ_WS_WIN
setEnabled( FALSE );
#endif
@@ -255,7 +255,7 @@ void TQAlphaWidget::render()
if ( widget ) {
if ( !showWidget ) {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
setEnabled(TRUE);
setFocus();
#endif
@@ -381,7 +381,7 @@ TQRollEffect::TQRollEffect( TQWidget* w, WFlags f, DirFlags orient )
: TQWidget( TQApplication::desktop()->screen(TQApplication::desktop()->screenNumber(w)),
"qt internal roll effect widget", f ), orientation(orient)
{
-#if 1 //ndef Q_WS_WIN
+#if 1 //ndef TQ_WS_WIN
setEnabled( FALSE );
#endif
widget = (TQAccessWidget*) w;
@@ -584,7 +584,7 @@ void TQRollEffect::scroll()
tqApp->removeEventFilter( this );
if ( widget ) {
if ( !showWidget ) {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
setEnabled(TRUE);
setFocus();
#endif
@@ -635,7 +635,7 @@ void qScrollEffect( TQWidget* w, TQEffects::DirFlags orient, int time )
tqApp->sendPostedEvents( w, TQEvent::Move );
tqApp->sendPostedEvents( w, TQEvent::Resize );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop
| (w->isPopup() ? TQt::WType_Popup : (TQt::WX11BypassWM | TQt::WStyle_Tool));
#else
@@ -660,7 +660,7 @@ void qFadeEffect( TQWidget* w, int time )
tqApp->sendPostedEvents( w, TQEvent::Move );
tqApp->sendPostedEvents( w, TQEvent::Resize );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
uint flags = TQt::WStyle_Customize | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop
| (w->isPopup() ? TQt::WType_Popup : (TQt::WX11BypassWM | TQt::WStyle_Tool));
#else
diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp
index ce41f05bc..154702ea7 100644
--- a/src/widgets/qiconview.cpp
+++ b/src/widgets/qiconview.cpp
@@ -125,14 +125,14 @@ static const char * const unknown_xpm[] = {
static TQPixmap *unknown_icon = 0;
static TQPixmap *qiv_buffer_pixmap = 0;
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
static TQPixmap *qiv_selection = 0;
#endif
static bool optimize_layout = FALSE;
static TQCleanupHandler<TQPixmap> qiv_cleanup_pixmap;
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
static void createSelectionPixmap( const TQColorGroup &cg )
{
TQBitmap m( 2, 2 );
@@ -2022,7 +2022,7 @@ void TQIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg )
p2.end();
buffer->setMask( mask );
p2.begin( buffer );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
p2.fillRect( pix->rect(), TQBrush( cg.highlight(), TQBrush::Dense4Pattern) );
#else // in WIN32 Dense4Pattern doesn't work correctly (transparency problem), so work around it
if ( iconView()->d->drawActiveSelection ) {
@@ -2832,7 +2832,7 @@ void TQIconView::styleChange( TQStyle& old )
item->calcRect();
}
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
delete qiv_selection;
qiv_selection = 0;
#endif
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index 41ad01350..68048abcd 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -1407,7 +1407,7 @@ bool TQLineEdit::event( TQEvent * e )
case Key_Z:
case Key_Left:
case Key_Right:
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
case Key_Delete:
#endif
@@ -1591,7 +1591,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
if ( !t.isEmpty() && (!e->ascii() || e->ascii()>=32) &&
e->key() != Key_Delete &&
e->key() != Key_Backspace ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
extern bool tqt_hebrew_keyboard_hack;
if ( tqt_hebrew_keyboard_hack ) {
// the X11 keyboard layout is broken and does not reverse
@@ -1616,7 +1616,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
if ( e->state() & ControlButton ) {
switch ( e->key() ) {
case Key_A:
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
home( e->state() & ShiftButton );
#else
selectAll();
@@ -1655,7 +1655,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
d->finishChange( priorState );
}
break;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
case Key_U:
if ( !d->readOnly )
clear();
@@ -1672,7 +1672,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
del();
}
break;
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
copy();
break;
@@ -1736,20 +1736,20 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
}
break;
case Key_Home:
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
case Key_Up:
#endif
home( e->state() & ShiftButton );
break;
case Key_End:
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
case Key_Down:
#endif
end( e->state() & ShiftButton );
break;
case Key_Delete:
if ( !d->readOnly ) {
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
if ( e->state() & ShiftButton ) {
cut();
break;
@@ -1758,7 +1758,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
del();
}
break;
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
if ( !d->readOnly && e->state() & ShiftButton )
paste();
@@ -2242,7 +2242,7 @@ TQPopupMenu *TQLineEdit::createPopupMenu()
popup->insertItem( tr( "Clear" ) );
popup->insertSeparator();
popup->insertItem( tr( "Select All" )
-#ifndef Q_WS_X11
+#ifndef TQ_WS_X11
+ ACCEL_KEY( A )
#endif
);
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index ab9beba9e..69f4c16ad 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -62,7 +62,7 @@
#include "ntqdockarea.h"
#include "ntqstringlist.h"
#include "ntqstyle.h"
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
# include "qt_mac.h"
#endif
@@ -893,7 +893,7 @@ TQMainWindow::TQMainWindow( TQWidget * parent, const char * name, WFlags f )
: TQWidget( parent, name, f )
{
d = new TQMainWindowPrivate;
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
d->opaque = TRUE;
#else
d->opaque = FALSE;
@@ -1239,7 +1239,7 @@ bool TQMainWindow::isDockEnabled( TQDockWindow *tb, Dock dock ) const
void TQMainWindow::addDockWindow( TQDockWindow *dockWindow,
Dock edge, bool newLine )
{
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if(isTopLevel() && edge == DockTop)
ChangeWindowAttributes((WindowPtr)handle(), kWindowToolbarButtonAttribute, 0);
#endif
@@ -1407,7 +1407,7 @@ void TQMainWindow::moveDockWindow( TQDockWindow * dockWindow, Dock edge, bool nl
void TQMainWindow::removeDockWindow( TQDockWindow * dockWindow )
{
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if(isTopLevel() && dockWindow->area() == topDock() && !dockWindows( DockTop ).count())
ChangeWindowAttributes((WindowPtr)handle(), 0, kWindowToolbarButtonAttribute);
#endif
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index c0051ef6e..ae31bfe89 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -71,7 +71,7 @@ public:
static bool inMenu = FALSE;
#endif
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp
#endif
@@ -265,7 +265,7 @@ static const int gtkItemVMargin = 8;
TQMenuBar::TQMenuBar( TQWidget *parent, const char *name )
: TQFrame( parent, name, WNoAutoErase )
{
-#if defined( Q_WS_MAC ) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined( TQ_WS_MAC ) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
mac_eaten_menubar = FALSE;
mac_d = 0;
macCreateNativeMenubar();
@@ -334,7 +334,7 @@ TQMenuBar::~TQMenuBar()
#ifndef TQT_NO_ACCEL
delete autoaccel;
#endif
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
macRemoveNativeMenubar();
#endif
if ( irects ) // Avoid purify complaint.
@@ -354,7 +354,7 @@ void TQMenuBar::updateItem( int id )
repaint( irects[i], FALSE );
}
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
static bool fromFrameChange = FALSE;
#endif
@@ -436,7 +436,7 @@ void TQMenuBar::performDelayedStateChanged()
void TQMenuBar::performDelayedChanges()
{
-#if defined(Q_WS_MAC) && !defined(TQMAC_MENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_MENUBAR_NO_NATIVE)
// I must do this here as the values change in the function below.
bool needMacUpdate = (pendingDelayedContentsChanges || pendingDelayedStateChanges);
#endif
@@ -444,7 +444,7 @@ void TQMenuBar::performDelayedChanges()
performDelayedContentsChanged();
if( pendingDelayedStateChanges )
performDelayedStateChanged();
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if(mac_eaten_menubar && needMacUpdate) {
macDirtyNativeMenubar();
@@ -485,11 +485,11 @@ void TQMenuBar::menuDelPopup( TQPopupMenu *popup )
void TQMenuBar::frameChanged()
{
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
fromFrameChange = TRUE;
#endif
menuContentsChanged();
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
fromFrameChange = FALSE;
#endif
}
@@ -580,7 +580,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
// Start waiting for Alt release on focus widget
} else if ( ke->stateAfter() == AltButton ) {
waitforalt = 1;
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQMenuData::d->aInt = qt_xfocusout_grab_counter;
#endif
if ( f && f != object )
@@ -606,7 +606,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
(object->parent() == 0 && ((TQWidget*)object)->focusWidget() == 0) ) {
if ( waitforalt && event->type() == TQEvent::KeyRelease &&
( ke->key() == Key_Alt || ke->key() == Key_Meta )
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
&& TQMenuData::d->aInt == qt_xfocusout_grab_counter
#endif
) {
@@ -664,7 +664,7 @@ void TQMenuBar::subHighlighted( int id )
#ifndef TQT_NO_ACCEL
void TQMenuBar::accelActivated( int id )
{
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if(mac_eaten_menubar)
return;
#endif
@@ -823,7 +823,7 @@ void TQMenuBar::show()
performDelayedChanges();
calculateRects();
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if(mac_eaten_menubar) {
//If all elements are invisible no reason for me to be visible either
bool all_hidden = TRUE;
@@ -942,7 +942,7 @@ int TQMenuBar::calculateRects( int max_width )
int w=0, h=0;
if ( !mi->isVisible()
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
|| (mac_eaten_menubar && !mi->custom() && !mi->widget() )
#endif
) {
@@ -978,14 +978,14 @@ int TQMenuBar::calculateRects( int max_width )
separator = i; //### only motif?
}
if ( !mi->isSeparator() || mi->widget() ) {
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if ( !mac_eaten_menubar ) {
#endif
if ( gs == MotifStyle && mi->isVisible() ) {
w += 2*motifItemFrame;
h += 2*motifItemFrame;
}
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
}
#endif
@@ -1189,7 +1189,7 @@ void TQMenuBar::drawContents( TQPainter *p )
style().drawControl(TQStyle::CE_MenuBarEmptyArea, p, this, contentsRect(), g);
p->restore();
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if ( !mac_eaten_menubar )
#endif
{
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index 5e327d200..ec93e3a22 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -303,7 +303,7 @@ TQPopupMenu::TQPopupMenu( TQWidget *parent, const char *name )
connectModalRecursionSafety = 0;
setFocusPolicy( StrongFocus );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
x11SetWindowType( X11WindowTypePopup );
#endif
}
@@ -373,7 +373,7 @@ void TQPopupMenu::menuContentsChanged()
// here the part that can't be delayed
TQMenuData::menuContentsChanged();
badSize = TRUE; // might change the size
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
mac_dirty_popup = 1;
#endif
if( pendingDelayedContentsChanges )
@@ -404,7 +404,7 @@ void TQPopupMenu::performDelayedContentsChanged()
p->updateSize(TRUE);
p->update();
}
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
mac_dirty_popup = 1;
#endif
}
@@ -468,7 +468,7 @@ void TQPopupMenu::frameChanged()
TQRect TQPopupMenu::screenRect( const TQPoint& pos )
{
int screen_num = TQApplication::desktop()->screenNumber( pos );
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
return TQApplication::desktop()->availableGeometry( screen_num );
#else
return TQApplication::desktop()->screenGeometry( screen_num );
@@ -497,7 +497,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
if ( isVisible() || !isEnabled() )
return;
-#if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
+#if defined(TQ_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
if( macPopupMenu(pos, indexAtPoint ))
return;
#endif
@@ -553,7 +553,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
if ( y < sy )
y = sy;
}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#ifndef TQT_NO_MENUBAR
TQMenuData *top = this; // find top level
while ( top->parentMenu )
@@ -2746,7 +2746,7 @@ void TQPopupMenu::toggleTearOff()
geometry().topLeft(), FALSE );
p->mitems->setAutoDelete( FALSE );
p->tornOff = TRUE;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
p->x11SetWindowType( X11WindowTypeMenu );
#endif
for ( TQMenuItemListIt it( *mitems ); it.current(); ++it ) {
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index 4d98e8a6d..f6e48df6e 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -197,7 +197,7 @@ void TQRadioButton::drawButton( TQPainter *paint )
TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_RadioButtonIndicator, this), this );
const TQColorGroup &cg = colorGroup();
-#if !defined( TQT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX )
+#if !defined( TQT_NO_TEXTSTREAM ) && !defined( TQ_WS_MACX )
# define SAVE_RADIOBUTTON_PIXMAPS
#endif
#if defined(SAVE_RADIOBUTTON_PIXMAPS)
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index c4986c800..493b88f8b 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -52,7 +52,7 @@
#include "ntqtimer.h"
#include "ntqstyle.h"
#include "ntqlistview.h"
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
# include "qt_mac.h"
#endif
@@ -892,7 +892,7 @@ void TQScrollView::updateScrollBars()
else
showv = needv;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
bool mac_need_scroll = FALSE;
if(!parentWidget()) {
mac_need_scroll = TRUE;
diff --git a/src/widgets/qsplashscreen.cpp b/src/widgets/qsplashscreen.cpp
index a62fe7458..6468a2508 100644
--- a/src/widgets/qsplashscreen.cpp
+++ b/src/widgets/qsplashscreen.cpp
@@ -213,7 +213,7 @@ void TQSplashScreen::clear()
void TQSplashScreen::finish( TQWidget *mainWin )
{
if ( mainWin ) {
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
extern void tqt_wait_for_window_manager( TQWidget *mainWin );
tqt_wait_for_window_manager( mainWin );
#endif
diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp
index 33a19d825..1573e4e89 100644
--- a/src/widgets/qtabbar.cpp
+++ b/src/widgets/qtabbar.cpp
@@ -52,7 +52,7 @@
#include "ntqaccessible.h"
#endif
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
#include <qmacstyle_mac.h>
#endif
@@ -618,7 +618,7 @@ void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const
int w = iw + fw + 4;
int h = TQMAX(fm.height() + 4, ih );
int offset = 3;
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
if (::tqt_cast<TQMacStyle *>(&style())) {
offset = 0;
}
@@ -920,7 +920,7 @@ void TQTabBar::setCurrentTab( TQTab * tab )
if ( tab->r.intersects( r ) ) {
repaint( r.unite( tab->r ), FALSE );
} else {
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
update();
#else
repaint( r, FALSE );
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index 1205f46fe..88a727f66 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -1179,7 +1179,7 @@ bool TQTextEdit::event( TQEvent *e )
case Key_Down:
case Key_Home:
case Key_End:
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
case Key_Delete:
#endif
@@ -1191,7 +1191,7 @@ bool TQTextEdit::event( TQEvent *e )
default:
switch ( ke->key() ) {
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
case Key_Insert:
ke->accept();
#endif
@@ -1296,7 +1296,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
}
break;
case Key_Delete:
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
if ( e->state() & ShiftButton ) {
cut();
break;
@@ -1314,7 +1314,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
case Key_Insert:
if ( e->state() & ShiftButton )
paste();
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
else if ( e->state() & ControlButton )
copy();
#endif
@@ -1322,7 +1322,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
setOverwriteMode( !isOverwriteMode() );
break;
case Key_Backspace:
-#if defined (Q_WS_WIN)
+#if defined (TQ_WS_WIN)
if ( e->state() & AltButton ) {
if (e->state() & ControlButton ) {
break;
@@ -1450,7 +1450,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
clearUndoRedoInfo = FALSE;
}
TQString t = e->text();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
extern bool tqt_hebrew_keyboard_hack;
if ( tqt_hebrew_keyboard_hack ) {
// the X11 keyboard layout is broken and does not reverse
@@ -1486,7 +1486,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
indent();
break;
case Key_A:
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
moveCursor( MoveLineStart, e->state() & ShiftButton );
#else
selectAll( TRUE );
@@ -1539,7 +1539,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
case Key_K:
doKeyboardAction( ActionKill );
break;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
case Key_Insert:
copy();
break;
@@ -1942,7 +1942,7 @@ void TQTextEdit::removeSelectedText( int selNum )
ensureCursorVisible();
drawCursor( TRUE );
clearUndoRedo();
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
// there seems to be a problem with repainting or erasing the area
// of the scrollview which is not the contents on windows
if ( contentsHeight() < visibleHeight() )
@@ -1977,7 +1977,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
if ( d->optimMode )
return;
#endif
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
TQTextCursor c1 = *cursor;
TQTextCursor c2;
#endif
@@ -1986,7 +1986,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
if ( !doc->hasSelection( TQTextDocument::Standard ) )
doc->setSelectionStart( TQTextDocument::Standard, *cursor );
moveCursor( action );
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
c2 = *cursor;
if (c1 == c2)
if (action == MoveDown || action == MovePgDown)
@@ -2004,7 +2004,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
emit selectionChanged();
emit copyAvailable( doc->hasSelection( TQTextDocument::Standard ) );
} else {
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
TQTextCursor cStart = doc->selectionStartCursor( TQTextDocument::Standard );
TQTextCursor cEnd = doc->selectionEndCursor( TQTextDocument::Standard );
bool redraw = doc->removeSelection( TQTextDocument::Standard );
@@ -4932,7 +4932,7 @@ bool TQTextEdit::handleReadOnlyKeyEvent( TQKeyEvent *e )
case Key_C: case Key_F16: // Copy key on Sun keyboards
copy();
break;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
case Key_Insert:
copy();
break;
@@ -5655,7 +5655,7 @@ TQPopupMenu *TQTextEdit::createPopupMenu( const TQPoint& pos )
d->id[ IdClear ] = popup->insertItem( tr( "Clear" ) );
popup->insertSeparator();
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) );
#else
d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) + ACCEL_KEY( A ) );
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index d06e3dab5..97b2288e5 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -58,7 +58,7 @@
#ifndef TQT_NO_WORKSPACE
#include "ntqworkspace.h"
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#endif
@@ -191,7 +191,7 @@ TQTitleBar::~TQTitleBar()
d = 0;
}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
extern TQRgb qt_colorref2qrgb(COLORREF col);
#endif
@@ -201,7 +201,7 @@ void TQTitleBar::readColors()
bool colorsInitialized = FALSE;
-#ifdef Q_WS_WIN // ask system properties on windows
+#ifdef TQ_WS_WIN // ask system properties on windows
#ifndef SPI_GETGRADIENTCAPTIONS
#define SPI_GETGRADIENTCAPTIONS 0x1008
#endif
@@ -233,7 +233,7 @@ void TQTitleBar::readColors()
}
}
}
-#endif // Q_WS_WIN
+#endif // TQ_WS_WIN
if ( !colorsInitialized ) {
pal.setColor( TQPalette::Active, TQColorGroup::Highlight, palette().active().highlight() );
pal.setColor( TQPalette::Active, TQColorGroup::Base, palette().active().highlight() );
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index 118c0da6e..d576d203f 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -475,7 +475,7 @@ bool TQTipManager::eventFilter( TQObject *obj, TQEvent *e )
void TQTipManager::showTip()
{
if ( !widget || !globally_enabled
-#ifndef Q_WS_X11
+#ifndef TQ_WS_X11
|| !widget->isActiveWindow()
#endif
)
@@ -505,7 +505,7 @@ void TQTipManager::showTip()
scr = TQApplication::desktop()->screenNumber( widget );
if ( label
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
&& label->x11Screen() == widget->x11Screen()
#endif
) {
@@ -533,11 +533,11 @@ void TQTipManager::showTip()
if (!widget)
return;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
label->x11SetWindowTransient( widget->topLevelWidget());
#endif
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQRect screen = TQApplication::desktop()->availableGeometry( scr );
#else
TQRect screen = TQApplication::desktop()->screenGeometry( scr );
@@ -545,7 +545,7 @@ void TQTipManager::showTip()
TQPoint p;
if ( t->geometry == TQRect( -1, -1, -1, -1 ) ) {
p = widget->mapToGlobal( pos ) +
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
TQPoint( 2, 24 );
#else
TQPoint( 2, 16 );
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index de2b19c17..086c3f0cc 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -54,7 +54,7 @@
#if defined(QT_ACCESSIBILITY_SUPPORT)
#include "ntqaccessible.h"
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#ifndef SPI_GETDROPSHADOW
#define SPI_GETDROPSHADOW 0x1024
@@ -277,7 +277,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co
AlignAuto + AlignTop + WordBreak + ExpandTabs,
text );
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( (qWinVersion()&WV_NT_based) > WV_2000 ) {
BOOL shadow;
SystemParametersInfo( SPI_GETDROPSHADOW, 0, &shadow, 0 );
@@ -365,13 +365,13 @@ void TQWhatsThat::keyPressEvent( TQKeyEvent* )
void TQWhatsThat::paintEvent( TQPaintEvent* )
{
bool drawShadow = TRUE;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( (qWinVersion()&WV_NT_based) > WV_2000 ) {
BOOL shadow;
SystemParametersInfo( SPI_GETDROPSHADOW, 0, &shadow, 0 );
drawShadow = !shadow;
}
-#elif defined(Q_WS_MACX)
+#elif defined(TQ_WS_MACX)
drawShadow = FALSE; //never draw it on OS X we get it for free
#endif
@@ -657,7 +657,7 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP
delete whatsThat;
whatsThat = new TQWhatsThat(
widget, text,
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQApplication::desktop()->screen( widget ?
widget->x11Screen() :
TQCursor::x11Screen() ),
@@ -671,11 +671,11 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP
int scr = ( widget ?
TQApplication::desktop()->screenNumber( widget ) :
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQCursor::x11Screen()
#else
TQApplication::desktop()->screenNumber( ppos )
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
);
TQRect screen = TQApplication::desktop()->screenGeometry( scr );
diff --git a/src/widgets/qwidgetresizehandler.cpp b/src/widgets/qwidgetresizehandler.cpp
index f1bc73627..bcddde86b 100644
--- a/src/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/qwidgetresizehandler.cpp
@@ -45,7 +45,7 @@
#include "ntqapplication.h"
#include "ntqcursor.h"
#include "ntqsizegrip.h"
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include "qt_windows.h"
#endif
@@ -299,7 +299,7 @@ void TQWidgetResizeHandler::mouseMoveEvent( TQMouseEvent *e )
widget->setGeometry( geom );
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
MSG msg;
QT_WA( {
while(PeekMessageW( &msg, widget->winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE ))
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-13 08:04:25 +0000