summaryrefslogtreecommitdiffstats
path: root/src/workspace
diff options
context:
space:
mode:
Diffstat (limited to 'src/workspace')
-rw-r--r--src/workspace/ntqworkspace.h8
-rw-r--r--src/workspace/qworkspace.cpp58
2 files changed, 33 insertions, 33 deletions
diff --git a/src/workspace/ntqworkspace.h b/src/workspace/ntqworkspace.h
index 8a53303e8..45ba1dd24 100644
--- a/src/workspace/ntqworkspace.h
+++ b/src/workspace/ntqworkspace.h
@@ -46,7 +46,7 @@
#include "ntqwidgetlist.h"
#endif // QT_H
-#ifndef QT_NO_WORKSPACE
+#ifndef TQT_NO_WORKSPACE
#if !defined( TQT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE )
#define TQM_EXPORT_WORKSPACE
@@ -108,7 +108,7 @@ public slots:
void activatePrevWindow();
protected:
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
void styleChange( TQStyle& );
#endif
void childEvent( TQChildEvent * );
@@ -116,7 +116,7 @@ protected:
bool eventFilter( TQObject *, TQEvent * );
void showEvent( TQShowEvent *e );
void hideEvent( TQHideEvent *e );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
void wheelEvent( TQWheelEvent *e );
#endif
@@ -164,6 +164,6 @@ private: // Disabled copy constructor and operator=
};
-#endif // QT_NO_WORKSPACE
+#endif // TQT_NO_WORKSPACE
#endif // TQWORKSPACE_H
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index 08d356d1a..7df816511 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "ntqworkspace.h"
-#ifndef QT_NO_WORKSPACE
+#ifndef TQT_NO_WORKSPACE
#include "ntqapplication.h"
#include "../widgets/qtitlebar_p.h"
#include "ntqobjectlist.h"
@@ -323,7 +323,7 @@ TQWorkspace::init()
d->popup->insertSeparator();
d->popup->insertItem(TQIconSet(style().stylePixmap(TQStyle::SP_TitleBarCloseButton)),
tr("&Close")
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
+"\t"+TQAccel::keyToString(CTRL+Key_F4)
#endif
, this, SLOT( closeActiveWindow() ) );
@@ -339,12 +339,12 @@ TQWorkspace::init()
d->toolPopup->insertItem(TQIconSet(style().stylePixmap(TQStyle::SP_TitleBarShadeButton)), tr("Sh&ade"), 6);
d->toolPopup->insertItem(TQIconSet(style().stylePixmap(TQStyle::SP_TitleBarCloseButton)),
tr("&Close")
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
+"\t"+TQAccel::keyToString( CTRL+Key_F4)
#endif
, this, SLOT( closeActiveWindow() ) );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
TQAccel* a = new TQAccel( this );
a->connectItem( a->insertItem( ALT + Key_Minus),
this, SLOT( showOperationMenu() ) );
@@ -370,7 +370,7 @@ TQWorkspace::init()
setBackgroundMode( PaletteDark );
setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
d->topCaption = topLevelWidget()->caption();
#endif
@@ -478,7 +478,7 @@ void TQWorkspace::childEvent( TQChildEvent * e)
/*! \reimp
*/
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
void TQWorkspace::wheelEvent( TQWheelEvent *e )
{
if ( !scrollBarsEnabled() )
@@ -537,7 +537,7 @@ void TQWorkspace::activateWindow( TQWidget* w, bool change_focus )
!d->active->windowWidget()->testWFlags( WStyle_Tool ) ) {
d->active->showMaximized();
if ( d->maxtools ) {
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
if ( w->icon() ) {
TQPixmap pm(*w->icon());
int iconSize = d->maxtools->size().height();
@@ -992,7 +992,7 @@ void TQWorkspace::showEvent( TQShowEvent *e )
dw->setResizeEnabled(TRUE);
dw->setCloseMode( TQDockWindow::Always );
dw->setResizeEnabled(FALSE);
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
dw->setCaption(o->caption());
#endif
TQSize os(w->size());
@@ -1099,7 +1099,7 @@ void TQWorkspace::minimizeWindow( TQWidget* w)
wasMax = TRUE;
d->maxWindow = 0;
inCaptionChange = TRUE;
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
if ( !!d->topCaption )
topLevelWidget()->setCaption( d->topCaption );
#endif
@@ -1154,7 +1154,7 @@ void TQWorkspace::normalizeWindow( TQWidget* w)
if ( c == d->maxWindow ) {
c->setGeometry( d->maxRestore );
d->maxWindow = 0;
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
inCaptionChange = TRUE;
if ( !!d->topCaption )
topLevelWidget()->setCaption( d->topCaption );
@@ -1215,7 +1215,7 @@ void TQWorkspace::maximizeWindow( TQWidget* w)
if ( c->titlebar )
c->titlebar->setMovable( FALSE );
}
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
inCaptionChange = TRUE;
if ( !!d->topCaption )
topLevelWidget()->setCaption( tr("%1 - [%2]")
@@ -1336,7 +1336,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e)
static TQTime* t = 0;
static TQWorkspace* tc = 0;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
if ( o == d->maxtools && d->menuId != -1 ) {
switch ( e->type() ) {
case TQEvent::MouseButtonPress:
@@ -1406,7 +1406,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e)
} else {
hideMaximizeControls();
}
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
inCaptionChange = TRUE;
if ( !!d->topCaption )
topLevelWidget()->setCaption( d->topCaption );
@@ -1425,7 +1425,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e)
if ( inCaptionChange )
break;
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
inCaptionChange = TRUE;
if ( o == topLevelWidget() ) {
TQWidget *tlw = (TQWidget*)o;
@@ -1464,7 +1464,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e)
void TQWorkspace::showMaximizeControls()
{
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
Q_ASSERT(d->maxWindow);
TQMenuBar* b = 0;
@@ -1501,7 +1501,7 @@ void TQWorkspace::showMaximizeControls()
if ( d->maxWindow->windowWidget() &&
d->maxWindow->windowWidget()->testWFlags(WStyle_Minimize) ) {
TQToolButton* iconB = new TQToolButton( d->maxcontrols, "iconify" );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
TQToolTip::add( iconB, tr( "Minimize" ) );
#endif
l->addWidget( iconB );
@@ -1513,7 +1513,7 @@ void TQWorkspace::showMaximizeControls()
}
TQToolButton* restoreB = new TQToolButton( d->maxcontrols, "restore" );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
TQToolTip::add( restoreB, tr( "Restore Down" ) );
#endif
l->addWidget( restoreB );
@@ -1525,7 +1525,7 @@ void TQWorkspace::showMaximizeControls()
l->addSpacing( 2 );
TQToolButton* closeB = new TQToolButton( d->maxcontrols, "close" );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
TQToolTip::add( closeB, tr( "Close" ) );
#endif
l->addWidget( closeB );
@@ -1553,7 +1553,7 @@ void TQWorkspace::showMaximizeControls()
d->maxtools = new TQLabel( topLevelWidget(), "qt_maxtools" );
d->maxtools->installEventFilter( this );
}
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
if ( d->active->windowWidget() && d->active->windowWidget()->icon() ) {
TQPixmap pm(*d->active->windowWidget()->icon());
int iconSize = d->maxcontrols->size().height();
@@ -1579,7 +1579,7 @@ void TQWorkspace::showMaximizeControls()
void TQWorkspace::hideMaximizeControls()
{
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
if ( d->maxmenubar ) {
int mi = d->menuId;
if ( mi != -1 ) {
@@ -2078,7 +2078,7 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *parent,
if (!childWidget)
return;
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
setCaption( childWidget->caption() );
#endif
@@ -2095,7 +2095,7 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *parent,
int th = titlebar ? titlebar->sizeHint().height() : 0;
if ( titlebar ) {
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
int iconSize = th;
if( childWidget->icon() ) {
TQPixmap pm(*childWidget->icon());
@@ -2372,7 +2372,7 @@ bool TQWorkspaceChild::eventFilter( TQObject * o, TQEvent * e)
}
break;
case TQEvent::CaptionChange:
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
setCaption( childWidget->caption() );
if ( iconw )
iconw->setCaption( childWidget->caption() );
@@ -2386,7 +2386,7 @@ bool TQWorkspaceChild::eventFilter( TQObject * o, TQEvent * e)
TQPixmap pm;
int iconSize = titlebar->size().height();
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
if ( childWidget->icon() ) {
pm = *childWidget->icon();
if(pm.width() > iconSize || pm.height() > iconSize) {
@@ -2515,7 +2515,7 @@ void TQWorkspaceChild::enterEvent( TQEvent * )
void TQWorkspaceChild::leaveEvent( TQEvent * )
{
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
if ( !widgetResizeHandler->isButtonDown() )
setCursor( arrowCursor );
#endif
@@ -2645,7 +2645,7 @@ TQWidget* TQWorkspaceChild::iconWidget() const
connect( iconw, SIGNAL( doubleClicked() ),
this, SLOT( titleBarDoubleClicked() ) );
}
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
if ( windowWidget() ) {
iconw->setCaption( windowWidget()->caption() );
if ( windowWidget()->icon() ) {
@@ -2751,7 +2751,7 @@ void TQWorkspaceChild::setCaption( const TQString& cap )
{
if ( titlebar )
titlebar->setCaption( cap );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
TQWidget::setCaption( cap );
#endif
}
@@ -3003,7 +3003,7 @@ TQWorkspace::WindowMode TQWorkspace::windowMode() const
return d->wmode;
}
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
/*!\reimp */
void TQWorkspace::styleChange( TQStyle &olds )
{
@@ -3023,4 +3023,4 @@ void TQWorkspace::styleChange( TQStyle &olds )
#include "qworkspace.moc"
-#endif // QT_NO_WORKSPACE
+#endif // TQT_NO_WORKSPACE
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 22:06:10 +0000